made a copyReDaC_01

3430 files changed, 52443 insertions, 118537 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 8208ee37113..2820390793b 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -49,7 +49,7 @@ report process</a>.<p>
   </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 Subversion</a>
+  </li><li><a href="#power">Building from subversion</a>
 </li></ul>
 
 
@@ -153,12 +153,11 @@ document</a>.</p><p>
   <tr>
     <th>Remedy IT</th>
     <td>Maintains ACE on many platforms required for their ACE and
-        TAO service offerings. We support AIX, Borland C++ Builder 6/2006,
-        CBuilderX 1.0, MinGW, Microsoft Visual C++, GCC,
-        Cygwin, VxWorks 5.5.x & 6.x, OpenVMS 8.2-1 & 8.3 on Alpha and IA64,
-        BlueCAT Linux, RedHat, Fedora,
-        Tru64, SuSE Linux on Alpha/IA32/EM64T/IA64, RTEMS, QNX, LynxOS 4.0/4.2,
-        HPUX 11i v1/v2 32/64 bit on PA-RISC, and
+        TAO service offerings. Besides the standard DOC group platforms
+        we also support AIX, Borland C++ Builder 6/2006, CBuilderX 1.0, MinGW,
+        Cygwin, VxWorks 5.5.x & 6.x, OpenVMS 8.2-1 & 8.3,
+        Tru64, SuSE Linux on Alpha/IA32/EM64T, RTEMS, LynxOS, 
+        HPUX 11i v2/v2 32/64 bit on PA-RISC, and
         HPUX 11i v2 on Itanium. The Intel C++ compiler is supported on
         Windows 32/64bit, Linux IA32/EM64T/Itanium2.
     </td>
@@ -182,7 +181,7 @@ document</a>.</p><p>
         IRIX 6.x; UnixWare 7.1.0;
         Linux on PPC; OpenMVS;
         Tandem; SCO; FreeBSD; NetBSD; OpenBSD;
-        Macintosh OS X; OS/9; PharLap TNT Embedded ToolSuite 13;
+        Macintosh OS X; OS/9; PharLap TNT Embedded ToolSuite 9.1;
         QNX RTP and Neutrino 2.0; Interix (Windows Services for Unix)
     </td>
   </tr><tr>
@@ -624,6 +623,15 @@ https://msdn.microsoft.com/visualc/downloads/default.aspx</a> for information.
   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.)
+      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>
+      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, ...
       as defined by the C++ Standard Draft 2) that comes with MSVC,
       then add the line: <br>
@@ -775,6 +783,15 @@ to check <a href="#win32nonic">here</a> first. <p>
       <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>
+      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
@@ -918,6 +935,15 @@ For our build we require the packages
        <blockquote><code></code><pre>       #include "ace/config-win32.h"
        </pre></blockquote>
 
+       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>
+
+       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:
 
@@ -1727,7 +1753,59 @@ 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>
 
-<p></p><hr align="left" width="50%">
+<p></p><hr align="left" width="50%"><p>
+</p><h2><a name="rtems">Building and Installing ACE on RTEMS</a></h2>
+
+<pre>export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP
+# setup the build structure
+cd ACE_wrappers
+
+# create the host (e.g. Linux in this case) build tree
+bin/create_ace_build.pl Linux_g++
+cd build/Linux_g++/ace
+ln -s ../../../ace/config-linux.h config.h
+cd ../include/makeinclude
+ln -s ../../../../include/makeinclude/platform_linux.GNU platform_macros.GNU
+cd ../../../..
+
+# create the target build tree
+bin/create_ace_build.pl rtems
+cd build/rtems/TAO
+/bin/rm -r TAO_IDL
+ln -s ../../Linux_g++/TAO/TAO_IDL .
+cd ../ace
+ln -s ../../../ace/config-rtems.h config.h
+cd ../include/makeinclude
+ln -s ../../../../include/makeinclude/platform_rtems.x_g++.GNU platform_macros.GNU
+cd ../../../..
+
+# build the host side of things
+cd build/Linux_g++
+export ACE_ROOT=`pwd`; export LD_LIBRARY_PATH=`pwd`/ace:`pwd`/lib:$LD_LIBRARY_PATH
+cd ace
+make
+
+# optionally build the ACE tests
+cd ../tests
+make
+
+cd ../TAO
+make
+
+# build the target side of things
+cd ../rtems
+export ACE_ROOT=`pwd`
+cd ace
+make
+cd ../tests
+# build rtems_init.o by hand
+make -f  ../include/makeinclude/Makefile.rtems rtems_init.o
+make
+cd ../TAO
+make
+</pre>
+
+
 <hr>
 <h1><a name="svcsinstall">Building and Installing ACE Network Services</a></h1>
 
@@ -2362,45 +2440,15 @@ libraries.
       Under the current version of QNX RTP ACE fails if compiled with
       inline=0 . </p><p>
 
-  </p></li><li><strong><a name="rtems">RTEMS</a></strong><p>
+  </p></li><li><strong>PharLap TNT Embedded ToolSuite (ETS)</strong><p>
 
-      The support for RTEMS has been reviVed from version x.5.4. This version
-      was the first version that build again out of the box on RTEMS. Compilation
-      and testing was done for RTEMS with and without networking support. The
-      ACE GNU makefiles do automatically detect whether networking support
-      is available or not.
-
-      Besides the standard config.h/platform_macros.GNU file you will need
-      to set <code>RTEMS_MAKEFILE_PATH</code> to point to the location
-      of your RTEMS installation, see below for an example.</p>
-      <p><code>export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP</code></p>
-      <p>
-      When building without network support you will need the ace_for_tao
-      subsetting functionality enabled. For this add <code>ace_for_tao = 1</code>
-      to your <code>bin/MakeProjectCreator/config</code> file and regenerate the
-      GNU makefiles as described <a href="#power">here</a>.</p><p>
-
-  </p></li><li><strong>PharLap ETS</strong><p>
-
-      ACE has been ported to Ardence's
-      <a href="http://www.ardence.com/embedded/products.aspx?ID=71">PharLap ETS</a>
-      version 13. The port was originally done for Pharlap 9.1 and MSVC 6,
-      but has been updated to Pharlap ETS 13 with Visual Studio .NET 2003
-      (VC7.1).</p><p> To build for PharLap, you'll need to use MPC to
-      generate .sln/.vcproj files with the ETS configurations. For example:
-      <pre>
-cd \ace\ACE_wrappers
-perl bin/mwc.pl  -type vc71 -relative ACE_ROOT=C:/ace/ACE_wrappers -relative TAO_ROOT=C:/ace/ACE_wrappers/TAO -value_template configurations='"ETS Debug"' -value_template configurations+='"ETS Release"' -name_modifier *_ETS TAO_ACE.mwc
-      </pre>
-      That command will generate the same .sln and .vproj files as for
-      regular Windows builds with VC7.1, but they'll have names with an
-      <code>_ETS</code> suffix and will include the "ETS Debug" and
-      "ETS Release" configurations.</p><p>
-      After generating the needed VC7.1 files, use the ace/config-pharlap.h
-      configuration file, and the instructions
+      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
+      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
-      ETS configurations to build within Visual Studio. Only static
+      ETS configurations to build within Visual C++. Only static
       library configurations are available for PharLap at this time.
       For an example of how to build
       binaries, see the tests directory. The tests_pharlap_msvc.lnk
@@ -2903,27 +2951,17 @@ show_uninit        Lists all uninitialized in object files built for
 </pre>
 
 </p><hr><p>
-</p><h2><a name="power">Building from Subversion (anonymous access)</a></h2>
-If users are building from our <a href="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/">Subversion repository</a> the
+</p><h2><a name="power">Building from anonymous subversion</a></h2>
+If users are building from our <a href="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/"> svn</a> the
 GNUmakefiles, and project files for building on various platforms will
-not be available.  Subversion users are expected to <a href="#generate_using_mpc">generate them</a>
+not be available. Users from subversion are expected to generate them
 using <a href="https://svn.dre.vanderbilt.edu/viewvc/MPC/trunk/docs/README?revision=HEAD">MPC</a> before building ACE, TAO or
 CIAO. We point out some suggestions below to get bootstrapped
 quickly.
 
 <ul>
-	<li>You can checkout different subsets from the Subversion repository.
-	<ul>
-	<li>To checkout ACE with MPC:<p>
-	<code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE .</code>
-	</li>
-	<li>To checkout ACE+TAO with MPC:<p>
-	<code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE+TAO .</code>
-	</li>
-	<li>To checkout ACE+TAO+CIAO with MPC:<p>
+	<li>You can checkout ACE+TAO+CIAO together with MPC with the following command: <p>
 	<code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE+TAO+CIAO .</code>
-	</li>
-	</ul>
   </p></li><li>Please make sure that you have <a href="http://www.perl.org/">
   perl</a> installed, preferably perl
   5.8 or higher. Users on Win32 based platforms are recommended to use
@@ -2931,19 +2969,18 @@ quickly.
   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>
-  <a name="generate_using_mpc"></a>
-  <li>To build ACE and associated tests, examples,
-  and associated utility libraries with GNUmakefiles, you must
-  generate GNUmakefiles with MPC:<p>
-  <code> $ACE_ROOT/bin/mwc.pl -type gnuace ACE.mwc</code> </p>
-  <p>On Windows, with Visual C++ 8, you must generate solution and project files with MPC:<p>
+  </p></li><li>If you just want to build ACE and associated tests, examples,
+  and associated utility libraries, we recommend that you do <p>
+  <code> $ACE_ROOT/bin/mwc.pl -type gnuace ACE.mwc</code> </p><p>
+
+  from <code> $ACE_ROOT </code> to generate GNUmakefiles. Please use
 
   <code> $ACE_ROOT/bin/mwc.pl -type vc8 ACE.mwc </code> </p><p>
 
-  On Windows, with Visual C++ 7, you must generate solution and project files with MPC:<p>
-  <code> $ACE_ROOT/bin/mwc.pl -type vc71 ACE.mwc </code> </p>
-  </li><li>If you want to build TAO+CIAO and its associated libraries
+  to generate VC8 project and solution files. Please use <code>-type
+  vc71</code> to generate VC71 project and solution files.
+
+  </p></li><li>If you want to build TAO+CIAO and its associated libraries
   please see <a href="TAO/TAO-INSTALL.html">TAO-INSTALL</a><a> and
   </a><a href="TAO/CIAO/CIAO-INSTALL.html">CIAO-INSTALL</a> for details.
 </li></ul>
diff --git a/ACE/ACEXML/ChangeLog b/ACE/ACEXML/ChangeLog
index a75cf4f65a1..2047d310a51 100644
--- a/ACE/ACEXML/ChangeLog
+++ b/ACE/ACEXML/ChangeLog
@@ -1,8 +1,3 @@
-Wed Jan 03 14:20:00 UTC 2007  Simon Massey  <sma@prismtech.com>
-
-        * common/XML_Macros.h:
-          With MFC, must delete any caught and eaten "out of memory" exceptions.
-
 Fri Oct 28 02:29:57 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
         From Russell Mora <russell_mora at symantec dot com>
diff --git a/ACE/ACEXML/Makefile.am b/ACE/ACEXML/Makefile.am
index 5e025e19d26..f0541d979c7 100644
--- a/ACE/ACEXML/Makefile.am
+++ b/ACE/ACEXML/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         common \
diff --git a/ACE/ACEXML/apps/Makefile.am b/ACE/ACEXML/apps/Makefile.am
index 7f7bf963687..81f0c9cbd88 100644
--- a/ACE/ACEXML/apps/Makefile.am
+++ b/ACE/ACEXML/apps/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         svcconf
diff --git a/ACE/ACEXML/apps/svcconf/Makefile.am b/ACE/ACEXML/apps/svcconf/Makefile.am
index 2464ab3ad33..88cef2d99a5 100644
--- a/ACE/ACEXML/apps/svcconf/Makefile.am
+++ b/ACE/ACEXML/apps/svcconf/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 includedir = @includedir@/ACEXML/apps/svcconf
 
@@ -26,14 +26,6 @@ libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \
   Svcconf.cpp \
   Svcconf_Handler.cpp
@@ -41,27 +33,11 @@ libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \
 libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 libACEXML_XML_Svc_Conf_Parser_la_LIBADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libACEXML_XML_Svc_Conf_Parser_la_LIBADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 nobase_include_HEADERS = \
   Svcconf.h \
   Svcconf_Handler.h \
diff --git a/ACE/ACEXML/apps/svcconf/svcconf.mpc b/ACE/ACEXML/apps/svcconf/svcconf.mpc
index 128e2e961e4..9b9f84b5413 100644
--- a/ACE/ACEXML/apps/svcconf/svcconf.mpc
+++ b/ACE/ACEXML/apps/svcconf/svcconf.mpc
@@ -1,6 +1,6 @@
 //  -*- MPC -*-
 // $Id$
 
-project(ACEXML_XML_Svc_Conf_Parser): acelib, acexml, install {
+project(ACEXML_XML_Svc_Conf_Parser): acelib, acexml, core {
   sharedname = ACEXML_XML_Svc_Conf_Parser
 }
diff --git a/ACE/ACEXML/common/Makefile.am b/ACE/ACEXML/common/Makefile.am
index f08574ae905..d2f2e33a28e 100644
--- a/ACE/ACEXML/common/Makefile.am
+++ b/ACE/ACEXML/common/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 includedir = @includedir@/ACEXML/common
 pkgconfigdir = @libdir@/pkgconfig
@@ -26,14 +26,6 @@ libACEXML_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -DACEXML_BUILD_DLL
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libACEXML_la_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 libACEXML_la_SOURCES = \
   Attributes.cpp \
   AttributesImpl.cpp \
@@ -71,25 +63,9 @@ libACEXML_la_SOURCES = \
 libACEXML_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libACEXML_la_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 libACEXML_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libACEXML_la_LIBADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 nobase_include_HEADERS = \
   ACEXML_Export.h \
   Attributes.h \
@@ -142,7 +118,7 @@ CLEANFILES = \
   ACEXML.pc
 
 ACEXML.pc: ${top_builddir}/config.status ${srcdir}/ACEXML.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ACEXML.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACEXML.pc.in
 
 endif !BUILD_ACE_FOR_TAO
 
diff --git a/ACE/ACEXML/common/XML_Macros.h b/ACE/ACEXML/common/XML_Macros.h
index 3941c0f2e7c..50ec6857b3a 100644
--- a/ACE/ACEXML/common/XML_Macros.h
+++ b/ACE/ACEXML/common/XML_Macros.h
@@ -32,19 +32,6 @@
 
 #include "ace/Exception_Macros.h"
 
-// The Windows MFC exception mechanism requires that a caught CException
-// (including the CMemoryException in use here) be freed using its Delete()
-// method. Thus, when MFC is in use and we're catching exceptions as a result
-// of new(), the exception's Delete() method has to be called. No other
-// platform imposes this sort of restriction/requirement. The Windows
-// config stuff (at least for MSVC/MFC) defines a ACE_del_bad_alloc macro
-// that works with its ACE_bad_alloc macro to implement this cleanup
-// requirement. Since no other platform requires this, define it as
-// empty here.
-#if !defined (ACE_del_bad_alloc)
-#  define ACE_del_bad_alloc
-#endif
-
 // The following macros assume that an environment variable is passed
 // in/out of each function that can throw an exception. The type of the
 // environment variable is defined by ACEXML_ENV_TYPE.
@@ -344,7 +331,7 @@
 
 #   define ACEXML_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \
      do { try { POINTER = new CONSTRUCTOR; } \
-       catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; ACEXML_THROW_R_INT (EXCEPTION); } \
+       catch (ACE_bad_alloc) { errno = ENOMEM; ACEXML_THROW_R_INT (EXCEPTION); } \
      } while (0)
 
 #else /* ! ACE_NEW_THROWS_EXCEPTIONS */
diff --git a/ACE/ACEXML/common/common.mpc b/ACE/ACEXML/common/common.mpc
index 52fe9a39704..bd496a82123 100644
--- a/ACE/ACEXML/common/common.mpc
+++ b/ACE/ACEXML/common/common.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project(ACEXML): acelib, codecs, install, zzip, zlib {
+project(ACEXML): acelib, codecs, core {
   avoids       += ace_for_tao
   sharedname    = ACEXML
   dynamicflags += ACEXML_BUILD_DLL
diff --git a/ACE/ACEXML/examples/Makefile.am b/ACE/ACEXML/examples/Makefile.am
index 0ddb642570a..8a2494ea586 100644
--- a/ACE/ACEXML/examples/Makefile.am
+++ b/ACE/ACEXML/examples/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         SAXPrint
diff --git a/ACE/ACEXML/examples/SAXPrint/Makefile.am b/ACE/ACEXML/examples/SAXPrint/Makefile.am
index d196510359f..e8098217c3e 100644
--- a/ACE/ACEXML/examples/SAXPrint/Makefile.am
+++ b/ACE/ACEXML/examples/SAXPrint/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ ACE_ROOT = $(top_srcdir)
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = SAXPrint
 
 SAXPrint_CPPFLAGS = \
@@ -24,14 +23,6 @@ SAXPrint_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-SAXPrint_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 SAXPrint_SOURCES = \
   Print_Handler.cpp \
   SAXPrint_Handler.cpp \
@@ -40,29 +31,11 @@ SAXPrint_SOURCES = \
   SAXPrint_Handler.h \
   SAXPrint_Handler.inl
 
-SAXPrint_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-SAXPrint_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 SAXPrint_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-SAXPrint_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
diff --git a/ACE/ACEXML/parser/Makefile.am b/ACE/ACEXML/parser/Makefile.am
index 35c60abcb8d..de38e543937 100644
--- a/ACE/ACEXML/parser/Makefile.am
+++ b/ACE/ACEXML/parser/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         parser
diff --git a/ACE/ACEXML/parser/parser/Makefile.am b/ACE/ACEXML/parser/parser/Makefile.am
index f4440e30faf..942e6a22bb4 100644
--- a/ACE/ACEXML/parser/parser/Makefile.am
+++ b/ACE/ACEXML/parser/parser/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 includedir = @includedir@/ACEXML/parser/parser
 pkgconfigdir = @libdir@/pkgconfig
@@ -56,7 +56,7 @@ CLEANFILES = \
   ACEXML_Parser.pc
 
 ACEXML_Parser.pc: ${top_builddir}/config.status ${srcdir}/ACEXML_Parser.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ACEXML_Parser.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACEXML_Parser.pc.in
 
 endif !BUILD_ACE_FOR_TAO
 
diff --git a/ACE/ACEXML/parser/parser/parser.mpc b/ACE/ACEXML/parser/parser/parser.mpc
index 520ea962b9d..9732f03fe76 100644
--- a/ACE/ACEXML/parser/parser/parser.mpc
+++ b/ACE/ACEXML/parser/parser/parser.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project(ACEXML_Parser): acelib, install {
+project(ACEXML_Parser): acelib, core {
   avoids       += ace_for_tao
   sharedname    = ACEXML_Parser
   after        += ACEXML
diff --git a/ACE/ACEXML/tests/Makefile.am b/ACE/ACEXML/tests/Makefile.am
index e8f43fdc317..926a3fd9212 100644
--- a/ACE/ACEXML/tests/Makefile.am
+++ b/ACE/ACEXML/tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += ContentHandler_Test
 
 ContentHandler_Test_CPPFLAGS = \
@@ -29,40 +28,14 @@ ContentHandler_Test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-ContentHandler_Test_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 ContentHandler_Test_SOURCES = \
   ContentHandler_Test.cpp
 
-ContentHandler_Test_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-ContentHandler_Test_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 ContentHandler_Test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-ContentHandler_Test_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
@@ -70,7 +43,6 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += HttpCharStream_Test
 
 HttpCharStream_Test_CPPFLAGS = \
@@ -78,40 +50,14 @@ HttpCharStream_Test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-HttpCharStream_Test_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 HttpCharStream_Test_SOURCES = \
   HttpCharStream_Test.cpp
 
-HttpCharStream_Test_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-HttpCharStream_Test_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 HttpCharStream_Test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-HttpCharStream_Test_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
@@ -119,7 +65,6 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += NamespaceSupport_Test
 
 NamespaceSupport_Test_CPPFLAGS = \
@@ -127,40 +72,14 @@ NamespaceSupport_Test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-NamespaceSupport_Test_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 NamespaceSupport_Test_SOURCES = \
   NamespaceSupport_Test.cpp
 
-NamespaceSupport_Test_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-NamespaceSupport_Test_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 NamespaceSupport_Test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-NamespaceSupport_Test_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
@@ -168,7 +87,6 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Transcoder_Test
 
 Transcoder_Test_CPPFLAGS = \
@@ -176,40 +94,14 @@ Transcoder_Test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-Transcoder_Test_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 Transcoder_Test_SOURCES = \
   Transcoder_Test.cpp
 
-Transcoder_Test_LDFLAGS = 
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-Transcoder_Test_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 Transcoder_Test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-Transcoder_Test_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
diff --git a/ACE/ACEXML/tests/util/Makefile.am b/ACE/ACEXML/tests/util/Makefile.am
index b2d79bef425..486d37c1902 100644
--- a/ACE/ACEXML/tests/util/Makefile.am
+++ b/ACE/ACEXML/tests/util/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ ACE_ROOT = $(top_srcdir)
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = test
 
 test_CPPFLAGS = \
@@ -24,40 +23,14 @@ test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-test_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 test_SOURCES = \
   test.cpp
 
-test_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-test_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-test_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
diff --git a/ACE/ASNMP/Makefile.am b/ACE/ASNMP/Makefile.am
index 7ff1160c8a3..fa06f83a3c9 100644
--- a/ACE/ASNMP/Makefile.am
+++ b/ACE/ASNMP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         asnmp \
diff --git a/ACE/ASNMP/agent/Makefile.am b/ACE/ASNMP/agent/Makefile.am
index afb76da40ed..b37fe7aec9e 100644
--- a/ACE/ASNMP/agent/Makefile.am
+++ b/ACE/ASNMP/agent/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.asnmp_agent.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS = agent
 
 agent_CPPFLAGS = \
diff --git a/ACE/ASNMP/asnmp/Makefile.am b/ACE/ASNMP/asnmp/Makefile.am
index 7b117dab9f6..71347a6d858 100644
--- a/ACE/ASNMP/asnmp/Makefile.am
+++ b/ACE/ASNMP/asnmp/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/ASNMP/examples/Makefile.am b/ACE/ASNMP/examples/Makefile.am
index ba48f01c667..1855938d914 100644
--- a/ACE/ASNMP/examples/Makefile.am
+++ b/ACE/ASNMP/examples/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         get \
diff --git a/ACE/ASNMP/examples/get/Makefile.am b/ACE/ASNMP/examples/get/Makefile.am
index 0c3a6e4ea95..c691338b998 100644
--- a/ACE/ASNMP/examples/get/Makefile.am
+++ b/ACE/ASNMP/examples/get/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.asnmp_example_get.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += get
 
 get_CPPFLAGS = \
@@ -36,7 +35,6 @@ endif !BUILD_USES_WCHAR
 ## Makefile.asnmp_example_get_async.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += get_async
 
 get_async_CPPFLAGS = \
diff --git a/ACE/ASNMP/examples/next/Makefile.am b/ACE/ASNMP/examples/next/Makefile.am
index a7b4c2a1256..dae95eaeaba 100644
--- a/ACE/ASNMP/examples/next/Makefile.am
+++ b/ACE/ASNMP/examples/next/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.asnmp_example_next.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS = next
 
 next_CPPFLAGS = \
diff --git a/ACE/ASNMP/examples/set/Makefile.am b/ACE/ASNMP/examples/set/Makefile.am
index 94f708ec8e1..7810a658eed 100644
--- a/ACE/ASNMP/examples/set/Makefile.am
+++ b/ACE/ASNMP/examples/set/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.asnmp_example_set.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS = set
 
 set_CPPFLAGS = \
diff --git a/ACE/ASNMP/examples/trap/Makefile.am b/ACE/ASNMP/examples/trap/Makefile.am
index a60adce7d30..52307634b67 100644
--- a/ACE/ASNMP/examples/trap/Makefile.am
+++ b/ACE/ASNMP/examples/trap/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.asnmp_example_trap.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS = trap
 
 trap_CPPFLAGS = \
diff --git a/ACE/ASNMP/examples/walk/Makefile.am b/ACE/ASNMP/examples/walk/Makefile.am
index 9cff32a49de..f0bc64a36cf 100644
--- a/ACE/ASNMP/examples/walk/Makefile.am
+++ b/ACE/ASNMP/examples/walk/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.asnmp_example_walk.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS = walk
 
 walk_CPPFLAGS = \
diff --git a/ACE/ASNMP/tests/Makefile.am b/ACE/ASNMP/tests/Makefile.am
index b8ac30972bf..0b9ae3d1ce7 100644
--- a/ACE/ASNMP/tests/Makefile.am
+++ b/ACE/ASNMP/tests/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.asnmp_tests_Address_Test.am
-
 noinst_PROGRAMS = Address_Test
 
 Address_Test_CPPFLAGS = \
@@ -29,7 +28,6 @@ Address_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.asnmp_tests_Counter64_Test.am
-
 noinst_PROGRAMS += Counter64_Test
 
 Counter64_Test_CPPFLAGS = \
@@ -46,7 +44,6 @@ Counter64_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.asnmp_tests_Counter_Test.am
-
 noinst_PROGRAMS += Counter_Test
 
 Counter_Test_CPPFLAGS = \
@@ -63,7 +60,6 @@ Counter_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.asnmp_tests_Gauge_Test.am
-
 noinst_PROGRAMS += Gauge_Test
 
 Gauge_Test_CPPFLAGS = \
@@ -80,7 +76,6 @@ Gauge_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.asnmp_tests_Integer_Test.am
-
 noinst_PROGRAMS += Integer_Test
 
 Integer_Test_CPPFLAGS = \
@@ -97,7 +92,6 @@ Integer_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.asnmp_tests_Octet_Test.am
-
 noinst_PROGRAMS += Octet_Test
 
 Octet_Test_CPPFLAGS = \
@@ -114,7 +108,6 @@ Octet_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.asnmp_tests_Oid_Test.am
-
 noinst_PROGRAMS += Oid_Test
 
 Oid_Test_CPPFLAGS = \
@@ -131,7 +124,6 @@ Oid_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.asnmp_tests_Target_Test.am
-
 noinst_PROGRAMS += Target_Test
 
 Target_Test_CPPFLAGS = \
@@ -148,7 +140,6 @@ Target_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.asnmp_tests_Varbind_Test.am
-
 noinst_PROGRAMS += Varbind_Test
 
 Varbind_Test_CPPFLAGS = \
diff --git a/ACE/ASNMP/tests/test_config.h b/ACE/ASNMP/tests/test_config.h
index a0d2bab7aa8..887fa5cec8a 100644
--- a/ACE/ASNMP/tests/test_config.h
+++ b/ACE/ASNMP/tests/test_config.h
@@ -25,6 +25,32 @@
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
+#if !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
+class KEY
+// ============================================================================
+// = TITLE
+//    Define a key for use with the Map_Manager_Test.
+//
+// = DESCRIPTION
+//    This class is put into the test_config.h header file to work
+//    around AIX C++ compiler "features" related to template
+//    instantiation...  It is only used by Map_Manager_Test.cpp
+// ============================================================================
+{
+public:
+  KEY (size_t v = 0): value_ (v)
+  { }
+
+  size_t hash (void) const { return this->value_; }
+  operator size_t () const { return this->value_; }
+
+private:
+  size_t value_;
+};
+#else
+typedef size_t KEY;
+#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
+
 #if defined (ACE_WIN32)
 
 #define ACE_DEFAULT_TEST_FILE ACE_TEXT ("C:\\temp\\ace_test_file")
@@ -41,20 +67,16 @@
 
 #endif /* ACE_WIN32 */
 
-#ifndef ACE_START_TEST
 #define ACE_START_TEST(NAME) \
   const ACE_TCHAR *program = NAME; \
   ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
   if (ace_file_stream.set_output (program) != 0) \
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) starting %s test at %D\n"), program));
-#endif /* ACE_START_TEST */
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) starting %s test at %T\n"), program));
 
-#ifndef ACE_END_TEST
 #define ACE_END_TEST \
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %D\n"), program)); \
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %T\n"), program)); \
   ace_file_stream.close ();
-#endif /* ACE_END_TEST */
 
 #define ACE_NEW_THREAD \
 do {\
@@ -68,10 +90,10 @@ do {\
   ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
   if (ace_file_stream.set_output (program, 1) != 0) \
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %D\n"), program));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %T\n"), program));
 
 #define ACE_END_LOG \
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %D\n\n"), program)); \
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %T\n\n"), program)); \
   ace_file_stream.close ();
 
 #define ACE_INIT_LOG(NAME) \
diff --git a/ACE/COPYING b/ACE/COPYING
index 2a8822bc2a8..1645f46c517 100644
--- a/ACE/COPYING
+++ b/ACE/COPYING
@@ -8,7 +8,7 @@
    referred to as "DOC software") are copyrighted by [5]Douglas C.
    Schmidt and his [6]research group at [7]Washington University,
    [8]University of California, Irvine, and [9]Vanderbilt University,
-   Copyright (c) 1993-2007, all rights reserved. Since DOC software is
+   Copyright (c) 1993-2006, all rights reserved. Since DOC software is
    open-source, freely available software, you are free to use, modify,
    copy, and distribute--perpetually and irrevocably--the DOC software
    source code and object code produced from the source, as well as copy
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 0412b314429..1904c98a8fc 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,2918 +1,8719 @@
-Mon Jan  8 17:58:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+Thu Nov  9 19:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Bug_1890_Regression_Test.cpp:
+        * include/makeinclude/platform_aix4_cset++.GNU:
+        * include/makeinclude/platform_integrity_ghs.GNU:
+        * include/makeinclude/platform_irix6.x_sgic++.GNU:
+        * include/makeinclude/platform_linux_pgi.GNU:
+        * include/makeinclude/platform_macosx_panther.GNU:
+        * include/makeinclude/platform_macosx_tiger.GNU:
+        * include/makeinclude/platform_netbsd.GNU:
+        * include/makeinclude/platform_openbsd.GNU:
+        * include/makeinclude/platform_osf1_4.x_rcc.GNU:
+        * include/makeinclude/platform_vxworks5.x_ghs.GNU:
+          Simplified these files using the ?= operator
 
-          Bug 1890 is specifically targeted for the Select Reactor.  So,
-          instead of relying on ACE_Reactor::instance() being an
-          ACE_Select_Reactor, explicitly use the ACE_Select_Reactor impl.
-          This will fix this test on Windows.
+Thu Nov 09 16:10:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-Mon Jan  8 16:51:55 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+        * ace/Service_Config.cpp:
 
-        * tests/Bug_2368_Regression_Test.cpp:
+          Reverted my earlier change of Nov 6 and additionally removed
+          the ACE_Reactor::instance() call from the ACE_Service_Config
+          CTOR since it seems to be unnecessary here.
 
-          Improved the test output to show the failure caused by the
-          unresolved bug is expected.
+Thu Nov  9 15:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Jan  8 13:48:17 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+        * include/makeinclude/wrapper_macros.GNU:
+          Default threads to 1 if not set, thanks to Chad for helping out
+          with finding out why I had a problem in the rtems build
 
-        * examples/APG/Logging/Trace.h:
+Thu Nov  9 12:46:54 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Undefine TRACE before defining it to avoid warnings from vc71.
+        * bin/MakeProjectCreator/config/acedefaults.mpb:
+        * bin/MakeProjectCreator/config/taodefaults.mpb:
 
-Mon Jan  8 12:41:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Add automake specific section to subtract out $(ACE_ROOT)/lib
+          from libpaths, as libraries are not copied to, or linked from,
+          there in automake builds.  This removes unnecessary -L's from
+          being added to *_LDFLAGS, sometimes eliminating the need for
+          that automake variable altogether.
 
-        * ace/TP_Reactor.cpp:
-          Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT in the constructors
+Thu Nov  9 10:48:52 UTC 2006  Olli Savia  <ops@iki.fi>
 
-Mon Jan  8 12:00:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * examples/IPC_SAP/DEV_SAP/reader/reader.cpp:
+        * examples/IPC_SAP/DEV_SAP/writer/writer.cpp:
+          Changed used baudrate to 19200. Extended reader example to handle
+          timeout.
 
-        * ace/Select_Reactor_T.cpp:
-          Const improvement
+Thu Nov  9 10:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Select_Reactor_T.h :
-          Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT in the constructors
+        * ace/Timer_Heap_T.{h,cpp}:
+          Changed the preallocated constructor from int to bool.
 
-Mon Jan  8 11:23:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Nov  9 09:25:48 UTC 2006  Olli Savia  <ops@iki.fi>
 
-        * ace/Select_Reactor_T.h (open):
-          Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT as default for disable_notify_pipe
+        * ace/TTY_IO.cpp:
+          Removed LynxOS 3.x specific workaround.
 
-        * ace/Select_Reactor_T.h:
-          Doxygen improvements
+Wed Nov  8 22:22:27 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Mon Jan  8 10:45:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/make_release: Re-applied this:
+          Sat Oct 28 20:10:42 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * ace/Select_Reactor_Base.h:
-          Doxygen improvements
+Wed Nov  8 22:12:46 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * ace/Select_Reactor_Base.h:
-          Changed the way we set the default for the
-          ACE_Select_Reactor_Notify::open call, instead of just hardcoding
-          the default 0, use the ACE_DISABLE_NOTIFY_PIPE_DEFAULT define
-          which is set by default to 0, but which we can set from a
-          config file to 1 to disable the notification pipe.
+        * ace/Service_Config.cpp:
+        * ace/Service_Gestalt.cpp:
 
-        * ace/config-posix-nonetworking.h:
-          Set ACE_DISABLE_NOTIFY_PIPE_DEFAULT to 1. The notification pipe
-          doesn't work when networking is fully disabled.
+        This resolves a problem with shutting down the Service
+        Configurator via the static ACE_Service_Config::close () method,
+        where the registered services' fini() methods were not being
+        called. For full details, see bugzilla# 2701. Thanks to Aaron
+        Scamehorn <Aaron dot Scamehorn at cogcap dot com> for discovering
+        it an providing a test case.
 
-Mon Jan  8 00:10:52 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Wed Nov  8 19:21:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * bin/tao_orb_tests.lst:
+        * bin/make_release:
 
-          Adding "!MINIMUM" for the TransportCurrent tests, since it
-          precludes the use of the TC functionality.
+          Updates to the release script to work with Subversion.
 
-Sun Jan  7 19:02:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Nov  6 16:07:43 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/config-hpux-11.00.h:
-          Don't set ACE_SIZEOF_WCHAR, let Basic_Types just do this. Fixes
-          the difference between ACE_SIZEOF_WCHAR and sizeof(wchar_t) on
-          the HP aCC test on the IA64 aCC build which runs on the Sep 2006
-          version of HPUX
+        * ace/SOCK_IO.h (ACE_SOCK_IO): Clarified the behavior of
+          non-blocking I/O.  Thanks to Robert Neumann <robert dot neumann
+          at gmail dot com> for motivating this change.
 
-Sat Jan  6 04:41:30 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+Tue Nov 08 15:40:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * include/makeinclude/macros.GNU:
-        * include/makeinclude/rules.common.GNU:
-        * include/makeinclude/rules.local.GNU:
+        * ace/INET_Addr.inl:
 
-          Added new phony target, "svnignore", which takes a good guess at
-          what files are generated in a directory and adds them to
-          svn:ignore property on the containing directory.
-
-        * apps/gperf/src:
-        * apps/gperf/tests:
-        * bin:
-        * examples/APG/Active_Objects:
-        * examples/APG/Config:
-        * examples/APG/Containers:
-        * examples/APG/Logging:
-        * examples/APG/Misc_IPC:
-        * examples/APG/Naming:
-        * examples/APG/Proactor:
-        * examples/APG/Processes:
-        * examples/APG/Reactor:
-        * examples/APG/Shared_Memory:
-        * examples/APG/Signals:
-        * examples/APG/Sockets:
-        * examples/APG/Streams:
-        * examples/APG/Svc_Config:
-        * examples/APG/ThreadManagement:
-        * examples/APG/ThreadPools:
-        * examples/APG/ThreadSafety:
-        * examples/APG/Threads:
-        * examples/APG/Timers:
-        * examples/ASX:
-        * examples/ASX/CCM_App:
-        * examples/ASX/Message_Queue:
-        * examples/Bounded_Packet_Relay:
-        * examples/C++NPv1:
-        * examples/C++NPv2:
-        * examples/Connection/blocking:
-        * examples/Connection/misc:
-        * examples/Connection/non_blocking:
-        * examples/DLL:
-        * examples/Export:
-        * examples/IOStream/client:
-        * examples/IOStream/server:
-        * examples/IPC_SAP/ATM_SAP:
-        * examples/IPC_SAP/DEV_SAP/reader:
-        * examples/IPC_SAP/DEV_SAP/writer:
-        * examples/IPC_SAP/FIFO_SAP:
-        * examples/IPC_SAP/FILE_SAP:
-        * examples/IPC_SAP/SOCK_SAP:
-        * examples/IPC_SAP/SPIPE_SAP:
-        * examples/IPC_SAP/TLI_SAP:
-        * examples/IPC_SAP/UPIPE_SAP:
-        * examples/Log_Msg:
-        * examples/Logger/Acceptor-server:
-        * examples/Logger/client:
-        * examples/Logger/simple-server:
-        * examples/Mem_Map/IO-tests:
-        * examples/Mem_Map/file-reverse:
-        * examples/Misc:
-        * examples/Naming:
-        * examples/OS/Process:
-        * examples/Reactor/Dgram:
-        * examples/Reactor/FIFO:
-        * examples/Reactor/Misc:
-        * examples/Reactor/Multicast:
-        * examples/Reactor/Ntalker:
-        * examples/Reactor/Proactor:
-        * examples/Service_Configurator/IPC-tests/client:
-        * examples/Service_Configurator/IPC-tests/server:
-        * examples/Service_Configurator/Misc:
-        * examples/Shared_Malloc:
-        * examples/Shared_Memory:
-        * examples/Smart_Pointers:
-        * examples/Synch:
-        * examples/System_V_IPC/SV_Message_Queues:
-        * examples/System_V_IPC/SV_Semaphores:
-        * examples/Threads:
-        * examples/Timer_Queue:
-        * examples/Web_Crawler:
-        * protocols/examples/RMCast/Send_Msg:
-        * protocols/examples/TMCast/Member:
-        * protocols/tests/HTBP/Reactor_Tests:
-        * protocols/tests/HTBP/Send_Large_Msg:
-        * protocols/tests/HTBP/Send_Recv_Tests:
-        * protocols/tests/HTBP/ping:
-        * protocols/tests/RMCast:
-        * tests:
-        * tests/log:
-
-          Added subversion svn:ignore properties on all these directories
-          comparable to the values previously in the vertigial .cvsignore
-          files, as well as updated them commensurate with the new svnignore
-          gnuace make target.
-
-        * apps/gperf/src/.cvsignore:
-        * apps/gperf/tests/.cvsignore:
-        * examples/APG/Active_Objects/.cvsignore:
-        * examples/APG/Config/.cvsignore:
-        * examples/APG/Containers/.cvsignore:
-        * examples/APG/Logging/.cvsignore:
-        * examples/APG/Misc_IPC/.cvsignore:
-        * examples/APG/Naming/.cvsignore:
-        * examples/APG/Proactor/.cvsignore:
-        * examples/APG/Processes/.cvsignore:
-        * examples/APG/Reactor/.cvsignore:
-        * examples/APG/Shared_Memory/.cvsignore:
-        * examples/APG/Signals/.cvsignore:
-        * examples/APG/Sockets/.cvsignore:
-        * examples/APG/Streams/.cvsignore:
-        * examples/APG/Svc_Config/.cvsignore:
-        * examples/APG/ThreadManagement/.cvsignore:
-        * examples/APG/ThreadPools/.cvsignore:
-        * examples/APG/ThreadSafety/.cvsignore:
-        * examples/APG/Threads/.cvsignore:
-        * examples/APG/Timers/.cvsignore:
-        * examples/ASX/.cvsignore:
-        * examples/ASX/CCM_App/.cvsignore:
-        * examples/ASX/Message_Queue/.cvsignore:
-        * examples/Bounded_Packet_Relay/.cvsignore:
-        * examples/C++NPv1/.cvsignore:
-        * examples/C++NPv2/.cvsignore:
-        * examples/Connection/blocking/.cvsignore:
-        * examples/Connection/misc/.cvsignore:
-        * examples/Connection/non_blocking/.cvsignore:
-        * examples/DLL/.cvsignore:
-        * examples/Export/.cvsignore:
-        * examples/IOStream/client/.cvsignore:
-        * examples/IOStream/server/.cvsignore:
-        * examples/IPC_SAP/ATM_SAP/.cvsignore:
-        * examples/IPC_SAP/DEV_SAP/reader/.cvsignore:
-        * examples/IPC_SAP/DEV_SAP/writer/.cvsignore:
-        * examples/IPC_SAP/FIFO_SAP/.cvsignore:
-        * examples/IPC_SAP/FILE_SAP/.cvsignore:
-        * examples/IPC_SAP/SOCK_SAP/.cvsignore:
-        * examples/IPC_SAP/SPIPE_SAP/.cvsignore:
-        * examples/IPC_SAP/TLI_SAP/.cvsignore:
-        * examples/IPC_SAP/UPIPE_SAP/.cvsignore:
-        * examples/Log_Msg/.cvsignore:
-        * examples/Logger/Acceptor-server/.cvsignore:
-        * examples/Logger/client/.cvsignore:
-        * examples/Logger/simple-server/.cvsignore:
-        * examples/Mem_Map/IO-tests/.cvsignore:
-        * examples/Mem_Map/file-reverse/.cvsignore:
-        * examples/Misc/.cvsignore:
-        * examples/Naming/.cvsignore:
-        * examples/OS/Process/.cvsignore:
-        * examples/Reactor/Dgram/.cvsignore:
-        * examples/Reactor/FIFO/.cvsignore:
-        * examples/Reactor/Misc/.cvsignore:
-        * examples/Reactor/Multicast/.cvsignore:
-        * examples/Reactor/Ntalker/.cvsignore:
-        * examples/Reactor/Proactor/.cvsignore:
-        * examples/Service_Configurator/IPC-tests/client/.cvsignore:
-        * examples/Service_Configurator/IPC-tests/server/.cvsignore:
-        * examples/Service_Configurator/Misc/.cvsignore:
-        * examples/Shared_Malloc/.cvsignore:
-        * examples/Shared_Memory/.cvsignore:
-        * examples/Smart_Pointers/.cvsignore:
-        * examples/Synch/.cvsignore:
-        * examples/System_V_IPC/SV_Message_Queues/.cvsignore:
-        * examples/System_V_IPC/SV_Semaphores/.cvsignore:
-        * examples/Threads/.cvsignore:
-        * examples/Timer_Queue/.cvsignore:
-        * examples/Web_Crawler/.cvsignore:
-        * protocols/examples/TMCast/Member/.cvsignore:
-        * protocols/tests/HTBP/Reactor_Tests/.cvsignore:
-        * protocols/tests/HTBP/Send_Large_Msg/.cvsignore:
-        * protocols/tests/HTBP/Send_Recv_Tests/.cvsignore:
-        * protocols/tests/HTBP/ping/.cvsignore:
-        * tests/.cvsignore:
-        * tests/log/.cvsignore:
-
-          Removed these files in favor of svn:ignore properties on the
-          parent directory.
-
-Sat Jan  6 00:06:52 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-WinCE.h: Removed the ACE_HAS_WINNT4 stuff.
-
-        * ace/config-pharlap.h: Removed the ACE_HAS_WINNT4 stuff and added
-          ACE_LACKS_WIN32_SECURITY_DESCRIPTORS and ACE_LACKS_WIN32_MOVEFILEEX.
-          Added ACE_HAS_IP_MULTICAST.
-          Thanks to David Hauck for helping with these changes.
-
-        * ace/config-lite.h: Removed another vestige of MSVC 6 support.
+          Enhanced operator <() to support IPv6 addresses as well.
+          Thanks to Andre Kostur (akostur at incognito dot com) for
+          submitting a patch for this.
 
-        * ace/Default_Constants.h:
-        * ace/config-win32-common.h: Moved the Win32 ACE_DEFAULT_FILE_PERMS
-          settings to config-win32-common.h
-          Also removed all the pre-NT4 stuff from config-win32-common.h.
-
-        * ace/Asynch_Acceptor.{h cpp}:
-        * ace/Asynch_IO.{h cpp}:
-        * ace/Asynch_IO_Impl.{h cpp}:
-        * ace/Message_Queue.{h cpp inl}:
-        * ace/Message_Queue_T.{h cpp}:
-        * ace/Proactor.{h cpp}:
-        * ace/Proactor_Impl.{h cpp}:
-        * ace/WIN32_Asynch_IO.{h cpp}:
-        * ace/WIN32_Proactor.{h cpp}:
-          ACE_Message_Queue_NT and ACE_Asynch_IO switched from using
-          ACE_HAS_WINNT4==1 and maybe some other platforms to using the new
-          ACE_HAS_WIN32_OVERLAPPED_IO setting. It's now incumbent on the
-          config maintainer to keep config-win32-*.h, config-WinCE.h,
-          config-pharlap.h, etc. up to date on these features as the
-          various versions do or don't support them.
-
-        * ace/config-win32-mingw.h: Removed ACE_HAS_WINNT4 section.
-
-        * ace/Configuration.cpp (ACE_Configuration_Win32Registry::remove_section):
-          Removed the pre-NT4 section that checked for non-empty section.
-
-        * ace/Mem_Map.cpp: Removed all the support for ACE_USE_MAPPING_NAME
-          since it was used only for pre-NT4 Windows.
-
-        * ace/Msg_WFMO_Reactor.cpp (wait_for_multiple_events): Removed the
-          pre-NT4 code block that switched to MsgWaitForMultipleObjectsEx.
-          All Win platforms without ACE_LACKS_MSG_WMFO can do this now.
-
-        * ace/OS_NS_stdio.inl (rename):
-        * tests/OS_Test.cpp: The ability to rename a file to one that exists
-          without removing the 'to' file first is now detected by the new
-          feature macro ACE_LACKS_WIN32_MOVEFILEEX instead of ACE_HAS_WINNT4.
-
-        * ace/OS_NS_unistd.cpp (pread, pwrite): The Windows code that can do
-          overlapped is now built based on ACE_HAS_WIN32_OVERLAPPED_IO instead
-          of ACE_HAS_WINNT4.
-
-        * ace/Pagefile_Memory_Pool.cpp: Setting up a security descriptor for
-          the file mapping is now determined by the lack of
-          ACE_LACKS_WIN32_SECURITY_DESCRIPTORS, not ACE_HAS_WINNT4.
-
-        * ace/README: Added descriptions for ACE_HAS_WIN32_OVERLAPPED_IO,
-          ACE_HAS_WIN32_NAMED_PIPES, ACE_LACKS_WIN32_SECURITY_DESCRIPTORS,
-          ACE_LACKS_WIN32_MOVEFILEEX.
-
-        * ace/Sock_Connect.cpp: Removed all the code that rummaged through
-          the registry looking for net interfaces on Windows. Getting
-          interface info now requires WinCE, Pharlap, or Winsock2. This removes
-          support for Win95, Win98, etc.
-
-        * ace/SPIPE_Acceptor.{cpp h} (ACE_SPIPE_Acceptor): Now useable on
-          Windows when ACE_HAS_WIN32_NAMED_PIPES is set, not ACE_HAS_WINNT4.
-          Similar to above with ACE_HAS_WIN32_OVERLAPPED_IO - config
-          maintainers need to manage this setting.
-
-        * ace/OS_NS_Thread.cpp (sched_params): Fix mis-aligned #if block
-          for ACE_HAS_PHARLAP_RT. Also, for scope == ACE_SCOPE_PROCESS, return
-          -1, ENOTSUP for Pharlap; it doesn't have SetPriorityClass().
-
-        * ACE-INSTALL.html: Removed mention of ACE_HAS_WINNT4 and building
-          for Win95/98/Me - ACE now requires WinNT 4 or later.
-          Updated the information for building for Pharlap ETS.
+Wed Nov  8 14:24:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tests/CDR_File_Test.cpp:
-        * tests/Svc_Handler_Test.cpp: Removed the check for NT4 or better when
-          setting TEST_CAN_UNLINK_IN_ADVANCE. VxWorks is the only case
-          remaining where this needs to be set.
+        * configure.ac:
 
-        * tests/Malloc_Test.cpp: Removed the Win NT4 case checks for setting
-          ACE_TEST_REMAP_ON_FAULT; Win9x is no longer supported. Also, when
-          deciding address ranges for testing, decide at run time based on
-          GetVersionInfo() on Windows, not on preprocessor checks.
+          Change ACE_LACKS_NET_IF_H feature test to #include <sys/types.h>
+          (if present).
 
-        * tests/Message_Queue_Test.cpp: Use ACE_HAS_WIN32_OVERLAPPED_IO to
-          decide whether or not to test ACE_Message_Queue_NT.
+Wed Nov  8 13:45:07 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * tests/Proactor_Scatter_Gather_Test.cpp: Decide whether or not to
-          run this test based on ACE_HAS_WIN32_OVERLAPPED_IO instead of
-          ACE_HAS_WINNT4.
+        * examples/C++NPv2/C++NPv2.mpc:
 
-        * ace/Proactor_Timer_Test.cpp: Run this test on Windows based on
-          ACE_HAS_WIN32_OVERLAPPED_IO instead of !ACE_HAS_WINCE.
+          The AC_CLD project requires threads in order to build and run
+          correctly.
 
-        * tests/SPIPE_Test.cpp:
-        * tests/UPIPE_SAP_Test.cpp: Manage which features to test on Windows
-          based on ACE_HAS_WIN32_NAMED_PIPES instead of ACE_HAS_WINNT4.
+Tue Nov 07 15:49:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * ace/Dev_Poll_Reactor.cpp: Fixed spelling error in a comment.
+        * ace/OS_NS_netdb.inl:
 
-Fri Jan  5 21:46:16 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+          Changes to accomodate VxWorks 6.x versions of gethostbyname and
+          gethostbyaddr. These are threadsafe as the x_r versions are but
+          require deallocating the returned hostent structure.
 
-        * ace/Process.cpp:
+Tue Nov  7 15:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-         Improved the implementation of ACE_Process_Options::setenv(...)
-         to address the potential buffer overflow when invoking
-         sprintf and/or vsprintf. This fixes bug 2660 and 2762. More
-         discussions have been accumulated in RT 9198.
+        * ace/Sock_Connect.cpp:
+          With VxWorks 6.3 in rtp mode with IPv6 enabled declare the
+          in6addr_ constants explicitly, these are exported by the
+          VxWorks 6.3 rtp header files but not implemented
 
-Fri Jan  5 19:06:17 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+Tue Nov 07 13:31:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * bin/msvc_static_order.lst:
+        * include/makeinclude/platform_vxworks6.3.GNU:
 
-          Added project names to correct the build order for
-          TAO/tests/Collocation and TAO/tests/TransportCurrent.
+          Fixed build settings for PPC32 builds with softfloat.
 
-Fri Jan  5 14:03:12 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+Tue Nov  7 10:38:25 UTC 2006  Simon McQueen  <sm@prismtech.com>
 
-        * apps/JAWS2/HTTPU/http_headers.h:
+        * tests/Naming_Test.cpp:
 
-          For the sake of compiling on HP-UX, #undef SERVER if it's defined.
+          Moved an ::open out of an ACE_ASSERT. It wasn't getting performed on
+          some builds.
 
-Fri Jan  5 13:34:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Nov  7 09:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_stdio.cpp:
-        * ace/config-hpux-11.00.h:
-          Disable ACE_HAS_VFWPRINTF again for HPUX, takes more time,
-          something for the future
+        * performance-tests/Misc/basic_func.{h,cpp}:
+          Renamed B to BB to resolve compile problems on rtems where we
+          have also a typedef B
 
-Fri Jan  5 13:15:16 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+Tue Nov  7 07:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/INET_Addr.cpp:
+        * ace/ACE.h:
+          Also rtems defines log2, use the same workaround as with cygwin
 
-          Replaced #if ACE_HAS_IPV6 with #if defined () to avoid confusing
-          doxygen.
+        * include/makeinclude/platform_rtems.x_g++.GNU:
+          Removed -ansi
 
-Fri Jan  5 12:59:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Nov  7 01:47:46 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/Manual_Event_Test.cpp:
-          Removed n_iterations variable, it is not used at all
+        * ace/Sock_Connect.cpp (count_interfaces):
+          Another scoreboard fix.
 
-Fri Jan  5 12:44:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Nov  6 20:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_stdio.cpp:
-          When ACE_HAS_WCHAR is defined include os_wchar.h to get the
-          wchar methods which is needed on for example HPUX
+        * apps/Gateway/Gateway/Config_Files.{h,cpp}:
+        * apps/Gateway/Gateway/File_Parser.{h,cpp}:
+        * apps/Gateway/Gateway/Gateway.cpp:
+          Renamed class FP to FPRT. This resolves the compile errors on
+          rtems where a struct FP does exist
+
+Mon Nov  6 16:52:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Sock_Connect.cpp:
+          My fix for Solaris x86 broke HPUX. The trouble is that the
+          method ACE::count_interfaces() is only used by the "generic"
+          implementation of get_ip_interfaces(). Probably a better
+          solution is to remove count_interfaces() and move its
+          functionality into the get_ip_interfaces() implementation, but
+          that is a bigger change than I care to make at the moment. I
+          think it should be possible to do so in a way that also reduces
+          the footprint and improves performance by eliminating the
+          effectively duplicated code in count_interfaces().
+
+Mon Nov 06 14:14:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * ace/config-linux-common.h:
-        * ace/config-vxworks6.2.h:
         * ace/config-vxworks6.3.h:
-        * ace/config-vxworks6.4.h:
-          Added ACE_HAS_VFWPRINTF
 
-        * ace/config-win32-common.h:
-          Removed ACE_HAS_VSWPRINTF, isn't used anymore
+          Fixed incorrect definition of IOV_MAX.
 
-Fri Jan  5 11:09:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Nov  6 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-hpux-11.00.h:
-          Moved ACE_SIZEOF_LONG outside the aCC specific block, this is
-          also needed with GCC
+        * ace/config-sunos5.5.h:
+          Added ACE_HAS_GETRUSAGE, thanks to Michael Klein
+          <michael dot klein at fazi dot de> for reporting that SunOS has
+          this method, fixes bugzilla 2694.
 
-Fri Jan  5 10:40:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Nov  6 12:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Thread_Creation_Threshold_Test.cpp:
-          Removed not needed semicolon after namespace closure
+        * examples/Service_Configurator/Misc/main.cpp:
+        * examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc:
+        * examples/Service_Configurator/Misc/svc.conf1
+          Fixed shared library name, make working for embedded platforms.
+          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
+          for reporting this, fixes bugzilla bug 2698
 
-Fri Jan  5 10:30:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Nov 06 11:17:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * contrib/minizip/unzip.c:
-        * contrib/minizip/zip.c:
-          Fixed unitialized warnings
+        * ace/Service_Config.cpp:
 
-Fri Jan  5 10:04:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Implemented a fix for runtime problems in case
+          ACE_HAS_NONSTATIC_OBJECT_MANAGER is defined (seen on VxWorks 6.3 RTP).
 
-        * ace/config-g++-common.h:
-          A change related to my commit of:
-          Thu Jan  4 08:55:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-          With FC6 a bug in GCC has been fixed. This is then fixed in
-          GCC 4.1.1 but only in the RedHat codebase, not in other
-          GCC 4.x compilers. The HP GCC 4.1.1 compiler hasn't this
-          fix but also the SuSE 10.2 GCC 4.1.2 compiler has not this
-          fix. We assume at this moment that GCC 4.2 will have this
-          fix. If you have FC6 you must add the following define to
-          your config.h file:
-          ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
+Sun Nov  5 14:14:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Fri Jan  5 07:05:18 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/Sock_Connect.cpp:
+          Fix for Solaris x86.
 
-        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
+Sat Nov  4 12:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Remove "-Ge 1" from initial TAO_IDLFLAGS definition.
+        * ace/config-sunos4*.h:
+          Removed these files, these are ancient and not supported anymore
 
-Fri Jan  5 03:34:00 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+Fri Nov  3 18:12:36 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/INET_Addr.cpp:
+        * tests/Unload_libACE.cpp (main): Reverted the ACE_OS::exit() from
+          this since it's not supposed to be an ACE test.  Thanks to Simon
+          Massey for reporting this.
 
-          Refactored the addr_to_string() method to format numeric IPv6
-          addresses using [addr]:port to disambiguate addresses such as
-          [fe80::1:2:3]:12345. This should be benign as string_to_addr()
-          already parses [ipv6addr]:port formatted strings.
+Fri Nov 03 15:52:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-Fri Jan  5 00:51:22 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+        * bin/PerlACE/ProcessVX_Unix.pm:
 
-        * ace/INET_Addr.h:
-        * ace/INET_Addr.inl:
+          Bugfix in cmdline composition.
 
-          Added a new method, is_multicast(), to assist applications in
-          determining if the inet address is or is not a multicast address
-          regardless of it being an IPv4 or IPv6 format.
+Fri Nov  3 15:15:43 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * ace/Timer_Queue_Adapters.cpp:
+        * ace/Sock_Connect.cpp:
+          Scoreboard cleanup.
 
-          Fixed a bug in
-          ACE_Async_Timer_Queue_Adapter<TQ>::schedule_ualarm() wherein the
-          time value for the alarm was computed using
-          ACE_OS::gettimeofday() rather than using the timer queue's
-          gettimeofday implementation. Thus situations where an alternate
-          time source were used, the scheduled alarm would be wrong.
+Fri Nov 03 10:54:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-Thu Jan  4 15:51:41 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+        * ace/OS_NS_sys_time.inl:
 
-        * tests/Thread_Creation_Threshold_Test.cpp: Changed name of
-          anonymous namespace constant from DEBUG to PRINT_DEBUG_MSGS to
-          avoid potential conflicts with #defines.  This should clean up
-          at least one Windows build, and possibly others as well.
+          Fixed conversion warning on OpenVMS.
 
-Thu Jan  4 15:33:08 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+Fri Nov  3 00:39:04 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * configure.ac:
+        * ace/Sock_Connect.cpp:
+          One more optimization, this one to combine the methods for
+          evaluating the IPv6 or IPv4 enabled status.
+
+Fri Nov  3 00:32:27 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Select_Reactor_Base.inl:
+        * ace/Select_Reactor_Base.cpp:
+          Additional optimization for finding and unbinding event
+          handlers. The solution moves the test for handles in range into
+          the top-level find and unbind methods to allow the fix for bug
+          2653 to continue to work in unbind while avoiding a double check
+          for handles in range during a find.
+
+Thu Nov  2 20:33:55 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/SOCK_Test_IPv6.cpp (spawn):
+        * tests/Pipe_Test.cpp (run_main):
+        * tests/SPIPE_Test.cpp (client):
+        * tests/TkReactor_Test.cpp (run_main):
+        * tests/MT_SOCK_Test.cpp (spawn):
+        * tests/Process_Strategy_Test.cpp (run_main):
+        * tests/Unload_libACE.cpp (main):
+        * tests/SOCK_Test.cpp (spawn):
+        * tests/Priority_Reactor_Test.cpp (run_main):
+        * tests/SOCK_Dgram_Test.cpp (spawn):
+        * tests/SOCK_SEQPACK_SCTP_Test.cpp (spawn_test):
+        * examples/Map_Manager/test_hash_map_manager.cpp (ACE_TMAIN):
+        * apps/mkcsregdb/mkcsregdb.cpp (fail): Replaced exit() with
+          ACE_OS::exit().
+
+Wed Nov 01 20:04:00 US Central Time 2006 Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * Bronson Royce Schmidt checked in at 7 pounds, 15 ounces and
+          21.25 inches long.
+
+Thu Nov  2 16:10:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Check <sys/time.h> instead of <time.h> for gettimeofday()
-          prototype.  Also use AC_CHECK_DECL instead of AC_EGREP_CPP.
-          This fixes bugzilla bug 2764.
+        * ace/Sock_Connect.cpp:
+          Cleaned up debugging code left in my previous premature commit.
 
-Thu Jan  4 13:53:33 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Nov  2 15:42:29 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * ACEXML/tests/Makefile.am:
-        * ACEXML/tests/util/Makefile.am:
-        * ACEXML/apps/svcconf/Makefile.am:
-        * ACEXML/common/Makefile.am:
-        * ACEXML/examples/SAXPrint/Makefile.am:
+        * ace/Sock_Connect.cpp:
+        * ace/Sock_Connect.h:
+          Added support for IPv6 detection on HPUX, AIX, Solaris, WinCE,
+          and VxWorks 5.5.x.
 
-          Tweak to use ACE_{ZLIB,ZZIP}_{CPPFLAGS,LDFLAGS,LIBS}
-          instead of -I${ZLIB_ROOT}/include, etc.  The former
-          are substituted by the configure script.
+Wed Nov 01 09:05:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * m4/ace.m4:
+        * ace/OS_NS_stdlib.inl:
 
-          Add ACE_PATH_ZLIB and ACE_PATH_ZZIP autoconf macros.
-          zlib and zzip can now be enabled at configure time
-          with --with-zlib and --with-zzip.
+          Fixed conversion warnings in atop() on OpenVMS.
 
-Thu Jan  4 12:45:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+Wed Nov 01 08:35:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * ace/Basic_Stats.cpp:
-        * ace/Parse_Node.cpp:
-        * ace/Sample_History.cpp:
-        * ace/Service_Repository.cpp:
+        * ace/OS_NS_sys_stat.h:
 
-          Remove build warnings when ACE_NLOGGING is defined.
+          Fixed Borland compile failure over def of ACE_Stat.
 
-Thu Jan  4 08:55:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Oct 31 23:08:32 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * ace/config-g++-common.h:
-          With gcc 4.{0,1} we couldn't use visibility attributes for singletons
-          because of a bug in GCC. This has been fixed in GCC 4.1.1 that
-          gets shipped with FC6. This change enables the visibily
-          attributes again for GCC 4.1.1 or newer.
+        * ace/Dev_Poll_Reactor.h: Note that the Linux epoll code implementation
+          is supported, but the /dev/poll implementation is still
+          experimental.
 
-        * ace/Obstack.h:
-          Reverted the change below, it is an incorrect change
-          Wed Nov 22 09:07:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
-          on FC6. Thanks to Ken Sedgwick <ken at bonsai dot com> for
-          reporting this and testing out the patch.
+Tue Oct 31 10:31:10 UTC 2006  Ossama Othman  <ossama_othman at symantec.com>
 
-Wed Jan  3 22:31:05 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+        * ace/OS_NS_sys_stat.h (ACE_WSTAT_FUNC_NAME):
 
-          This entry merges in changes from OCITAO 1.4a which were
-          originally part of RT 8678.
+          Corrected wstat() function name for Borland.
 
-        * ace/README:
-        * ace/config-sunos5.9.h:
+Mon Oct 30 19:57:20 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Added new compiler macro, ACE_LACKS_THR_CONCURRENCY_FUNCS, to
-          accomodate the deprecation of thr_concurrency() in Solaris 9
-          onwards.  The functions still exist, but the call semantics have
-          changed slightly such that values for which they would
-          previously succeed now fail despite the fact that they are
-          effectively no-ops in Solaris >= 9.  This would cause
-          thr_create(THR_NEW_LWP) to fail in a process when invoked for
-          the 65536th (or greater) time.
+        * bin/ciao_tests.lst:
 
-          Currently this macro is only defined on Solaris 9+, but, since I
-          believ this function was only ever present on Solaris anyway, it
-          could probably be defined in general, and simply #undef'd on
-          Solaris 8 and prior.
+          Added run_test.pl in CIAO/tests/IDL3/Events/Any to the list of
+          CIAO tests to be run automatically.
 
-        * ace/OS_NS_Thread.cpp (thr_create):
+Mon Oct 30 17:34:35 UTC 2006  Ossama Othman  <ossama_othman at symantec.com>
 
-          Conditionally removed THR_NEW_LWP section when
-          ACE_LACKS_THR_CONCURRENCY_FUNCS is defined.
+        * ace/config-win32-common.h:
 
-        * tests/Thread_Creation_Threshold_Test.cpp:
-        * tests/run_test.lst:
-        * tests/tests.mpc:
+          Use 64-bit file offsets by default in the WIN64 case, similar to
+          what 64-bit UNIX systems do.
+
+Mon Oct 30 17:23:15 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-          Added a new test to check the threshold of thread creation.
-          This simply verifies that more than 2^15 threads can be created
-          sequentially (not simultaneously).
+        * include/makeinclude/wrapper_macros.GNU: Added 2 new build options,
+          dmalloc and mtrace. When specified at build time (e.g. make mtrace=1)
+          the PLATFORM_DMALLOC_CPPFLAGS and/or PLATFORM_MTRACE_CPPFLAGS values
+          are added to CPPFLAGS. For dmalloc, the PLATFORM_DMALLOC_LDFLAGS and
+          PLATFORM_DMALLOC_LIBS are added to LDFLAGS and LIBS, respectively.
+          Also added the ability to specify additional purify and quantify
+          command-line options by setting PLATFORM_PURIFY_OPTIONS and
+          PLATFORM_QUANTIFY_OPTIONS, respectively. Thank you to Howard
+          Finer for supplying these additions.
 
-Wed Jan  3 22:10:54 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+Mon Oct 30 16:56:28 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/CDR_Stream.inl (adjust):
+        * bin/MakeProjectCreator/templates/gnu.mpd:
 
-          Reverted one-line change committed in r76279 and as part of
-          entry from "Wed Jan 3 05:53:04 UTC 2007 Chris Cleeland
-          <cleeland_c@ociweb.com>".  After getting some questions from
-          Johnny and posing them to the originators of the change, the
-          originators indicated that, over time, the problem may have been
-          application-related as they could never isolate a test case that
-          provoked it.
+          The implementation for the 'targetoutdir' template variable was
+          incorrect.  Libraries and executables were not symbolically linked
+          to the output location correctly.  Also, 'targetoutdir' was not
+          taken into account for the 'libpaths' setting.
 
-Wed Jan  3 19:52:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Oct 30 15:30:47 UTC 2006  Simon McQueen  <sm@prismtech.com>
 
         * bin/tao_orb_tests.lst:
-          Run the compression test when ZLIB is part of the config list
 
-Wed Jan  3 19:34:47 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+          Scheduled regression test for bug #2669.
+
+Mon Oct 30 14:31:42 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Select_Reactor_Base.inl:
+          Reverting the functional part of my previous commit until I
+          learn the correct way to manage the upper bound test portably.
 
         * bin/tao_orb_tests.lst:
+          Make the Bug 2654 test be ignored for minimum CORBA builds.
 
-          TAO/tests/Any/Recursive also does not work when the build is
-          static.  It uses ACE_Dynamic_Service to locate the
-          TAO_TypeCodeFactory_Adapter which fails.
+Mon Oct 30 12:18:03 UTC 2006 Phil Mesnier  <mesnier_p@ociweb.com>
 
-Wed Jan  3 18:35:02 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+        * ace/Select_Reactor_Base.inl (unbind):
+          Added an additional validity check and a comment to ward off
+          future optimizations.
 
-        * bin/tao_orb_tests.lst:
+Mon Oct 30 09:24:42 UTC 2006  Ossama Othman  <ossama_othman at symantec.com>
 
-          Do not run TAO/tests/Any/Recursive if minimum_corba,
-          corba_e_compact or corba_e_micro are enabled.  Not all portions of
-          the test build with any one of these enabled.
+        * ace/OS_NS_sys_stat.h (ACE_stat):
+        * ace/OS_NS_sys_stat.inl (stat, wstat):
 
-Wed Jan  3 15:50:39 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+          Only use Windows 64-bit stat structures and functions when
+          _FILE_OFFSET_BITS=64 is defined.  Addresses 64-bit conversion
+          warnings.
 
-        * ACEXML/apps/svcconf/svcconf.mpc:
-        * ACEXML/common/common.mpc:
-        * ACEXML/parser/parser/parser.mpc:
-        * Kokyu/Kokyu.mpc:
-        * ace/QoS/qos.mpc:
-        * ace/SSL/ssl.mpc:
-        * ace/SSL/ssl_for_tao.mpc:
-        * ace/ace.mpc:
-        * ace/ace_flreactor.mpc:
-        * ace/ace_for_tao.mpc:
-        * ace/ace_qtreactor.mpc:
-        * ace/ace_tkreactor.mpc:
-        * ace/ace_xtreactor.mpc:
-        * apps/gperf/src/gperf.mpc:
-        * protocols/ace/HTBP/HTBP.mpc:
-        * protocols/ace/RMCast/RMCast.mpc:
-        * protocols/ace/TMCast/TMCast.mpc:
+Sun Oct 30 05:31:01 UTC 2006  Ossama Othman  <ossama_othman at symantec.com>
+
+        * ace/Auto_Ptr.h (ACE_auto_ptr_reset):
 
-          Use the install base project instead of the deprecated core base
-          project.
+          Adjusted function template arguments to handle case where the
+          auto_ptr element type and pointer type passed to this function
+          are not the same.  Addresses argument deduction failures.
 
-Wed Jan  3 15:25:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/FILE.h (ACE_FILE):
+
+          64-bit file offset fixes.  s/off_t/ACE_OFF_T.
+
+        * ace/Truncate.h (Truncator):
+
+          Added explicit specializations for int and long for Borland.
+          Relying on ACE_{U}INT32 specializations is not sufficient.
+
+        * tests/CDR_File_Test.cpp (run_test):
+
+          A 64-bit file offset is not always enabled.  Corrected offset
+          type.  s/ACE_LOFF_T/ACE_OFF_T.
+
+Sun Oct 29 17:10:39 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * bin/tao_orb_tests.lst:
-          Added new PI test
+          Added Bug 2654 regression test to suite.
 
-Wed Jan  3 14:57:49 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+Sat Oct 28 20:50:56 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * bin/MakeProjectCreator/config/ipv6.mpb:
+        * examples/Threads/thread_specific.cpp: Need to reinterpret_cast a
+          pointer back to an intptr_t.
 
-          The cbx project type was replaced by the bds4 project type.
+Sat Oct 28 20:10:42 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Wed Jan 03 14:20:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+        * bin/make_release: Added Smartphone configurations to the WinCE
+          project files generated at release time.
 
-        * ace/CORBA_macros.h:
-          With MFC, must delete any caught and eaten "out of memory" exceptions.
+Sat Oct 28 13:50:01 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Wed Jan  3 13:25:06 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+        * ace/Select_Reactor_Base.cpp:
 
-        * bin/msvc_static_order.lst:
+          Fix to address Win32-specific problems in bug 2653 fix.
 
-          Build the TAO/tests/Smart_Proxies/Collocation/SP_Collocation_Idl
-          project before SP_Collocation_TestStubsLib.
+Sat Oct 28 01:48:27 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Wed Jan  3 13:16:16 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+        * include/makeinclude/wrapper_macros.GNU: Add -L$(INSLIB) to LDFLAGS
+          if it was not there already. Allows link to work when built libraries
+          are moved to locations other than the default $(ACE_ROOT)/lib
+          location.
 
-        * bin/tao_other_tests.lst:
+Fri Oct 28 03:23:18 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * apps/JAWS2/JAWS/FILE.cpp:
+        * apps/JAWS2/JAWS/FILE.h:
+        * apps/JAWS2/JAWS/IO.cpp:
+        * apps/JAWS3/jaws3/FILE.cpp:
+        * apps/JAWS3/jaws3/FILE.h:
+        * examples/Threads/thread_manager.cpp:
+        * examples/Threads/cancel.cpp:
+        * examples/Threads/thread_specific.cpp:
+        * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp:
+        * performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp
+          Addressed 64-bit conversion warnings.
+
+Fri Oct 28 02:49:11 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * examples/APG/Shared_Memory/Mem_Map.cpp:
+        * examples/Mem_Map/file-reverse/file-reverse.cpp:
+        * examples/Web_Crawler/Mem_Map_Stream.cpp:
+
+          Addressed 64-bit conversion warnings.
+
+Fri Oct 27 21:41:25 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * THANKS:
+        * ace/Select_Reactor_Base.inl:
+        * ace/Select_Reactor_Base.cpp:
+        * ace/TP_Reactor.inl:
+        * ace/TP_Reactor.cpp:
+        * tests/run_test.lst:
 
-          Added !NO_MCAST to those tests that use multicast.
+          The fix for bug 2653. Thanks to Scott Mitchell <rsm at progress
+          dot com> and Chris Reed <cr at progress dot com> for the
+          considerable effort they put in helping to isolate this problem.
 
-        * tests/Unload_libACE.cpp:
+Fri Oct 27 21:28:36 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Bug_2653_Regression_Test.cpp:
         * tests/tests.mpc:
-        * tests/unload_libace.mpb:
 
-          Added support for running this test when ace_for_tao is enabled.
+          Added a new regression test. Without the accompaning fix, the
+          test coredump. If you comment out the call to test_for_crash,
+          the test will spin madly for 5 seconds, then abort. With the
+          pending fix to the TP reactor, the test has no errors.
 
-Wed Jan  3 12:33:33 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+Fri Oct 27 19:48:23 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * include/makeinclude/wrapper_macros.GNU:
+        * ace/Filecache.cpp (ACE_Filecache_Object):
 
-          Since the zzip base project now 'requires' zlib, we can default
-          zlib to 1.  This will cause no harm to those that do not have zlib
-          since zlib is a "feature" project and will not be included in any
-          project unless it is explicitly enabled.
+          Cast -1 to size_t.  Ugly (and works), but currently necessary.
+          Addresses "passing negative value" warnings.
 
-Wed Jan  3 09:36:13 UTC 2007  Olli Savia  <ops@iki.fi>
+Fri Oct 27 19:28:16 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * include/makeinclude/wrapper_macros.GNU:
+        * ace/OS_NS_stdio.inl (flock_adjust_params):
+        * ace/OS_NS_sys_stat.inl (filesize):
+
+          Fixed comparison of signed/unsigned warnings.
+
+Fri Oct 27 09:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Configuration_Import_Export.cpp:
+          Explicitly initialise pointer to 0 to silence warning in
+          gcc cygwi build
+
+Fri Oct 27 01:58:09 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        From Russell Mora <russell_mora at symantec dot com>
+        * ace/ACE.cpp:
+        * ace/ACE.h:
+        * ace/FILE.cpp:
+        * ace/File_Lock.h:
+        * ace/File_Lock.inl:
+        * ace/Filecache.cpp:
+        * ace/Filecache.h:
+        * ace/Local_Memory_Pool.cpp:
+        * ace/MEM_Acceptor.h:
+        * ace/MEM_Acceptor.inl:
+        * ace/MEM_IO.cpp:
+        * ace/MEM_IO.inl:
+        * ace/MEM_IO.h:
+        * ace/MMAP_Memory_Pool.cpp:
+        * ace/MMAP_Memory_Pool.h:
+        * ace/Mem_Map.cpp:
+        * ace/Mem_Map.h:
+        * ace/Mem_Map.inl:
+        * ace/OS_NS_macros.h:
+        * ace/OS_NS_stdio.cpp:
         * ace/OS_NS_stdio.inl:
-        * tests/OS_Test.cpp:
+        * ace/OS_NS_stdio.h:
+        * ace/OS_NS_sys_mman.h:
+        * ace/OS_NS_sys_mman.inl:
+        * ace/OS_NS_sys_stat.h:
+        * ace/OS_NS_sys_stat.inl:
+        * ace/OS_NS_unistd.cpp:
+        * ace/OS_NS_unistd.inl:
+        * ace/OS_NS_unistd.h:
+        * ace/Pagefile_Memory_Pool.inl:
+        * ace/Shared_Memory_MM.cpp:
+        * ace/Shared_Memory_MM.h:
+        * ace/Shared_Memory_MM.inl:
+        * ace/Shared_Memory_Pool.cpp:
+        * ace/Shared_Memory_Pool.h:
+        * ace/os_include/sys/os_types.h:
+        * ace/os_include/sys/os_stat.h:
+        * ace/os_include/os_unistd.h:
+        * examples/Web_Crawler/Iterators.cpp:
+        * examples/Web_Crawler/Mem_Map_Stream.cpp:
+        * examples/Web_Crawler/Mem_Map_Stream.h:
+        * examples/IPC_SAP/FILE_SAP/client.cpp:
 
-          Added the ability to use trio (http://sourceforge.net/projects/ctrio/)
-          if platform lacks decent support for vsnprintf. trio support is
-          enabled by defining trio=1 in plaform_macros.GNU
+          Added support for 64-bit file offsets on 32-bit platforms that
+          support the _FILE_OFFSET_BITS preprocessor symbol, as well as
+          Windows.  Enable by defining the _FILE_OFFSET_BITS=64
+          preprocessor symbol.  ACE provides the necessary support on
+          Windows when it is defined with the assistance of a new
+          ACE_OFF_T typedef.
 
-Wed Jan  3 07:52:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Oct 26 24:44:55 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        Reverted my change below, it breaks the singleton on windows, the EXPORT
-        should not be there, seems we need a different way to resolve this
-        problem with FC6.
+        * ace/Truncate.h (Truncator):
 
-        Tue Jan  2 14:27:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-        * ace/Based_Pointer_Repository.h:
-          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
-          on FC6. Thanks to Olli Savia  <ops@iki.fi> for
-          reporting this and testing out the patch.
+          Removed ACE_Export macros in the Borland case.  They shouldn't
+          be necessary.
 
-Wed Jan  3 07:47:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Oct 26 14:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ASNMP/tests/test_config.h:
-          Only define ACE_START_TEST and ACE_END_TEST when they are not
-          defined yet. Removed some old code at the same time
+        * bin/tao_other_tests.lst:
+          Added orbsvcs/tests/Event/UDP test which tests the rtec
+          udp federation
 
-Wed Jan  3 06:47:58 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Oct 26 11:19:45 UTC 2006  Olli Savia  <ops@iki.fi>
 
-        * configure.ac:
+        * ace/config-lynxos.h:
+          Added include "ace/config-posix.h" and removed defines
+          that are already defined by config-posix.h.
+
+Thu Oct 26 10:29:49 UTC 2006  Olli Savia  <ops@iki.fi>
 
-          Added feature test for ACE_LACKS_REALPATH.  Fixes bugzilla bug
-          2613.
+        * ace/config-posix.h:
+          Removed duplicate check of _POSIX_MESSAGE_PASSING.
 
-Wed Jan  3 06:09:39 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Oct 26 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * configure.ac:
+        * ace/Truncate.h:
 
-          Added feature test for ACE_HAS_SIGVAL_SIGVAL_INT and, for
-          completeness, ACE_HAS_SIGVAL_SIGVAL_PTR.  Fixes bugzilla bug
-          2716.
+          Added partial specialization for when types are the same, fixes
+          compile problems in the ACE lib with Borland
 
-Wed Jan  3 05:53:04 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+Thu Oct 26 07:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          This entry documents the merge of several small bug fixes from
-          the OCI distribution.
+        * ace/config-vxworks5.x.h:
+          Added ACE_LACKS_INTPTR_T, VxWorks 5.5.x seems not to deliver this
+          type
 
-        * ace/QtReactor/QtReactor.cpp:
+Thu Oct 26 00:31:56 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-          Merged in a change from OCITAO 1.4a that fixed a bug in
-          ACE_QtReactor::QtWaitForMultipleEvents() where
-          the two select() calls in that function might select on different
-          handler sets. The problem is the dispatch_set/wait_set can be
-          changed during the two select() calls. This could happen while
-          waiting for an event, another event is handled and dispatched
-          which changes the dispatch_set/wait_set.
+        * ace/Auto_Ptr.h:
 
-          This bug was found on a single thread Qt application [RT 8751].
+          Added missing "element_type" typedef.
 
-        * ace/CDR_Stream.inl (adjust):
+          (ACE_auto_ptr_reset):
 
-          Applied a one-line change from Dan Troesser <troesser_d at
-          ociweb dot com>, originally committed to OCITAO 1.4a.  VC8
-          detected that memory around a buffer was being modified.
-          Changed a boundary check from <= check to < that some believed
-          was causing a write past the end of the buffer.  After the
-          change, there were no compilation problems with VC8 and all the
-          ACE CDR-related tests passed.
+          Introduced this new function template to simplify the
+          ACE_AUTO_PTR_RESET macro implementation, to support
+          ACE's other auto_ptr-like class templates
+          (e.g. ACE_Auto_Array_Ptr<>), and to make auto_ptr
+          reset() operations convenient and easy for those needing the
+          ACE_AUTO_PTR_RESET functionality to.  Users now need only
+          perform a call like:
 
-        * bin/tao_orb_tests.lst:
+            ACE_auto_ptr_reset (my_auto_ptr_instance, new foo);
 
-          Add in Bug_2702_Regression test.
+          Note that ACE_AUTO_PTR_RESET support for ACE's other
+          auto_ptr-like classes isn't strictly necessary since they all
+          support the reset() method.
 
-        * bin/auto_run_tests.pl:
+          Addresses build failures on platforms that define
+          ACE_LACKS_AUTO_PTR_RESET and in code that expects to use
+          ACE_AUTO_PTR_RESET on ACE_Auto_{Basic_}_Array<> instances.
 
-          Change the search logic for listed tests so that the script
-          "finds" tests even when the layout isn't using the "traditional"
-          layout where $TAO_ROOT == $ACE_ROOT/TAO.
+Wed Oct 25 22:42:03 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * NEWS: Updated to reflect these changes.
+        * tests/Integer_Truncate_Test.cpp:
 
-Wed Jan  3 05:26:07 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+          Remove "const" qualifiers from types used in
+          ACE_Utils::Truncate<>() function template parameters that are
+          deduced using argument dependent lookup.  Borland appears to get
+          confused, and can't find the non-const template parameter
+          Truncate<>() specializations.
 
-        * configure.ac:
+Wed Oct 25 20:17:13 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-          Added feature test for ACE_LACKS_SIGVAL_T.  Fixes bugzilla bug
-          2761.
+        * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex):
 
-Tue Jan  2 16:02:25 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+          Removed commented ACE_TRACE macro entirely.  Fuzz parses
+          commented out code, and still incorrectly reports an ACE_TRACE
+          mismatch.
 
-        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
+        * ace/Truncate.h:
+
+          Yet another attempt at placating Borland C++.  Removed the
+          partial specialization for truncating values of the same type.
+          Typedefed the underlying Truncator structure template to further
+          simplify the function call.
 
-          Use the MakeWorkspaceBase module to reduce the amount of
-          duplicated code.
+Wed Oct 25 18:31:47 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-Tue Jan  2 14:27:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * examples/C++NPv1/Reactive_Logging_Server.h:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
 
-        * ace/Based_Pointer_Repository.h:
-          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
-          on FC6. Thanks to Olli Savia  <ops@iki.fi> for
-          reporting this and testing out the patch.
+          Include "ace/Basic_Types.h" to pull in intptr_t typedef.
 
-Tue Jan  2 12:38:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Oct 25 15:05:42 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_stdlib.inl (atop): s/intptr/intptr_t/ in ACE_WIN64 case.
+
+Wed Oct 25 09:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/SOCK_Dgram.cpp:
+          Fixed compile error in non win32 part
+
+Wed Oct 25 09:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ace_for_tao.mpc:
+          Added Rtems_init.c, for rtems without network support we
+          also use the ace_for_tao base project
+
+Wed Oct 25 08:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-rtems.h:
-          Added ACE_LACKS_THREAD_PROCESS_SCOPING, rtems only supports
-          PTHREAD_SCOPE_PROCESS, setting another value will result in a
-          notsup error
+        * ace/OS_NS_netdb.inl:
+          Added ACE_LACKS_GETHOSTBYADDR_R
 
-        * ace/OS_NS_Thread.cpp:
-          Removed some old FSU thread code
+Wed Oct 25 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Jan  2 11:38:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/config-rtems.h:
+        * ace/OS_NS_sys_socket.inl:
+          Added ACE_LACKS_GETSOCKOPT, ACE_LACKS_RECV, ACE_LACKS_SEND,
+          and ACE_LACKS_SENDTO
+
+Wed Oct 25 08:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Priority_Buffer_Test.cpp:
+          Fixed compile problem with gcc 2.96
+
+Wed Oct 25 07:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-rtems.h:
-          Removed ACE_LACKS_MKFIFO, rtems has this API
+        * ace/OS_NS_sys_socket.inl:
+          Added ACE_LACKS_ACCEPT, ACE_LACKS_CONNECT, ACE_LACKS_GETPEERNAME,
+          ACE_LACKS_GETSOCKNAME
 
-        * ace/config-win32-borland.h:
-        * ace/OS_NS_stdio.inl:
-          Removed support for the Borland C++ preview compiler that shipped
-          with CBuilderX
+Wed Oct 25 06:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/os_include/os_signal.h:
-          Removed Borland C++ preview support and fixed ACE_NSIG define
-          for rtems
+        * ace/TTY_IO.cpp:
+          Fixed compile error on Vxworks
 
-Tue Jan  2 11:18:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Oct 24 23:53:08 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * ace/config-macosx-panther.h:
-        * ace/config-macosx-tiger.h:
-          Added ACE_LACKS_SIGVAL_T
+        * ace/config-aix-4.x.h: Changed ACE_HAS_PTHREAD_CONTINUE to
+          ACE_HAS_PTHREAD_CONTINUE_NP and ACE_HAS_PTHREAD_SUSPEND to
+          ACE_HAS_PTHREAD_SUSPEND_NP. The non-_NP varieties return ENOTSUP;
+          the _NP varieties are the only documented APIs through AIX 5.3.
+          Thanks to Guy Peleg for raising this issue.
 
-Tue Jan  2 11:15:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Thread_Manager_Test.cpp: Altered the suspend/resume tests to
+          only allow ENOTSUP as a legit result if the config.h file does not
+          include ACE_HAS_... settings that indicate it should work.
 
-        * config-rtems.h:
-          Removed ACE_LACKS_PUTENV, rtems has this method, fixes the
-          Env_Value_Test failure
+Tue Oct 24 23:59:10 UTC 2006  Ossama othman  <ossama_othman at symantec dot com>
 
-Tue Jan  2 11:06:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl
+          (init):
+        * examples/Shared_Malloc/test_position_independent_malloc.cpp
+          (parse_args):
 
-        * ace/ARGV.cpp:
-          Fixed constructor that combines two argv arrays to handle
-          an empty array as we can have with embedded platforms like
-          VxWorks and RTEMS
+          Use intptr_t instead of int when casting to void*.  Addresses
+          "sizes do not match" warnings in 64-bit Intel compiler builds.
 
-Tue Jan  2 10:49:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Oct 24 23:49:25 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * tests/run_test.lst:
-          Added missing ARGV_Test
+        * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex):
+
+          Commented out use of ACE_TRACE macro.  The regular expression in
+          the bin/fuzz.pl script used to detect ACE_TRACE mismatch
+          incorrectly identifies a mismatch the ACE_TRACE question.  Once
+          the fuzz script is fixed, the ACE_TRACE can be uncommented.
+
+Tue Oct 24 22:20:38 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Truncate.h:
+
+          Rename truncate to trunc.  Yet another attempt at fixing Borland
+          compiler brain damage.
+
+Tue Oct 24 22:01:41 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/OS_NS_stdlib.inl (atop):
+
+          Use intptr_t type to fix 64-bit conversion to void* warnings.
+
+        * ace/Select_Reactor_Base.h (max_handlep1):
+        * ace/Select_Reactor_Base.inl (max_handlep1):
+
+          Changed return type to be ACE_HANDLE on UNIX platforms instead
+          of size_t.  Addresses "loss of significant bits" warnings in
+          64-bit Intel compiler builds.
+
+        * ace/Select_Reactor_Base.cpp (dump):
+
+          Corrected format specifiers for Windows configuration.
+
+        * ace/Select_Reactor_T.cpp (work_pending):
+          (wait_for_multiple_events):
+
+          Removed unnecessary casts and corrected type of "width" variable
+          that is passed to select().
+
+        * tests/Map_Manager_Test.cpp (test_cache_map_manager):
+
+          Fixed "might be used uninitialized" warning.
+
+Tue Oct 24 17:46:40 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Truncate.h (Truncator):
+
+          Export the Borland-specific specializations from the DLL.  This
+          should address the "undefined symbol" link-time problem.
+
+        * bin/MakeProjectCreator/config/acexml.mpb:
 
-Tue Jan  2 10:23:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Re-disabled ACEXML when ace_for_tao is enabled.  ACEXML needs
+          the ACE_Configuration and memory map classes that are not found
+          in the ace_for_tao subset.
 
+Tue Oct 24 14:44:09 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * ace/TTY_IO.cpp:
+
+          Changed the default constructor to always initialise member
+          variables regardless of ACE_HAS_TERMIOS or ACE_HAS_TERMIO setting.
+
+Tue Oct 24 14:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ACE.cpp:
+          Use some bools instead of int
+
+        * ace/INET_Addr.cpp (set_port_number):
+          Added check for ACE_LACKS_HTONS
+
+        * ace/INET_Addr.inl (get_port_number):
+          Added check for ACE_LACKS_NTOHS
+
+Tue Oct 24 13:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/netinet/os_in.h:
         * ace/config-rtems.h:
-          RTEMS does have aio support but there are several errors in the
-          rtems header files and it looks also that the behaviour is not
-          correct, reported this to the rtems maintainers and for the
-          rtems 4.6 version we disable the AIO support in ACE
+          Added ACE_LACKS_IP_MREQ
 
-Tue Jan  2 09:44:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/INET_Addr.cpp (get_port_number_from_name):
+          Added ACE_LACKS_HTONS check
 
-        * tests/ARGV_Test.cpp:
-          Fixed compile errors in unicode build
+Tue Oct 24 13:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Jan  1 21:56:50 UTC 2007  James H. Hill  <hillj@isis.vanderbilt.edu>
+        * ace/Reactor.h:
+          Added an include of Time_Value.h, this is included implicitly
+          but this implicit include is not there when using FOCUS with
+          tp-reactor specialization
 
-        * docs/ace_guidelines.vsmacros:
+Tue Oct 24 13:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed bug that was causing the previous find and replace
-          values to be used when the current document is being saved.
+        * ace/Sock_Connect.cpp:
+        * ace/config-rtems.h:
+          Added ACE_LACKS_GET_BCAST_ADDR
 
-Mon Jan  1 18:51:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Oct 24 13:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/os_include/os_errno.h:
-          Defined ECANCELED when it has not been defined yet, fixes problems
-          with rtems
+        * ace/os_include/os_socket.h:
+        * ace/config-rtems.h:
+          Added ACE_LACKS_SOCKADDR
 
-Mon Jan  1 18:39:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Oct 24 12:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/POSIX_CB_Proactor.h:
-          Introduced new ACE_LACKS_SIGVAL_T, when this is defined then ACE
-          does a typedef for sigval_t
+        * ace/os_include/os_netdb.h:
+        * ace/config-rtems.h:
+          Added ACE_LACKS_HOSTENT
 
-        * ace/config-aix-5.x.h:
-        * ace/config-macosx.h:
+Tue Oct 24 12:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_arpa_inet.inl:
         * ace/config-rtems.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos5.4-sunc++-4.x.h:
-        * ace/config-sunos5.5.h:
-        * ace/config-vxworks5.x.h:
-        * ace/config-vxworks6.2.h:
-        * ace/config-vxworks6.3.h:
-        * ace/config-vxworks6.4.h:
-          Added ACE_LACKS_SIGVAL_T
+          Added ACE_LACKS_INET_ADDR and ACE_LACKS_INET_NTOA
 
-        * ace/POSIX_Asynch_IO.h:
-          Doxygen improvement
+Tue Oct 24 12:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sun Dec 31 22:33:14 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/os_include/sys/os_socket.h:
+          Define MSG_OOB when it is not defined
 
-        * tests/SV_Shared_Memory_Test.cpp:
+Tue Oct 24 11:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Check and exit if allocator was not successfully initialized
-          (other processes could be using all the kernel's SysV shared
-          memory pages).  Otherwise the test's child process will be stuck
-          in a spinloop while filling up the filesystem with log messages.
+        * ace/OS_NS_sys_socket.inl:
+        * ace/config-rtems.h:
+          Added ACE_LACKS_SOCKET, ACE_LACKS_SHUTDOWN and ACE_LACKS_SETSOCKOPT
 
-Sun Dec 31 18:56:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Oct 24 11:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * docs/svn/config:
-        * docs/svn/svn-prefs.reg:
-          Added some more file extensions
+        * ace/OS_NS_sys_select.inl:
+        * ace/config-rtems.h:
+          Added ACE_LACKS_SELECT
 
-        * bin/generate_doxygen.pl:
-        * etc/tao_compression.doxygen:
-        * etc/tao_transportcurrent.doxygen:
-        * html/index.html:
-          Added doxygen generations for transport current and compression
+Tue Oct 24 10:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sun Dec 31 16:11:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/os_include/netinet/os_in.h:
+        * ace/config-rtems.h:
+          Added ACE_LACKS_IN_ADDR and ACE_LACKS_SOCKADDR_IN
 
-        * ACEXML/common/Makefile.am:
+Tue Oct 24 06:31:05 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-          Fix stray trailing \ introduced in:
-          Sat Dec 30 06:20:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/Numeric_Limits.h (ACE_Numeric_Limits):
 
-Sat Dec 30 06:23:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Added missing "char" specialization for the
+          ACE_LACKS_NUMERIC_LIMITS case.  The "signed char" and
+          "unsigned char" specializations are not always suitable.
 
-        * */Makefile.am:
+Tue Oct 24 04:04:26 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-          Baseline regeneration to match recent MPC, *.mpc, and *.mpb
-          changes.
+        * ace/Hash_Map_Manager_T.h (lock_):
 
-Sat Dec 30 06:20:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Placed "mutable" keyword to beginning of declaration.  It is a
+          storage class specifier, not a CV qualifier, and belongs at the
+          beginning.  Addresses g++ warnings.
 
-        * ACEXML/tests/Makefile.am:
-        * ACEXML/tests/util/Makefile.am:
-        * ACEXML/apps/svcconf/Makefile.am:
-        * ACEXML/common/Makefile.am:
-        * ACEXML/examples/SAXPrint/Makefile.am:
+        * ace/Sock_Connect.cpp (get_fqdn):
 
-          Hand-add automake conditionals for BUILD_ZZIP and BUILD_ZLIB.
-          Unfortunately MPC resolves options, files, etc. set by
-          "features" at project generation time, but we want them to be
-          configure time options.
+          Addressed "might be used uninitialized warnings.
 
-Sat Dec 30 06:16:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Mon Oct 23 02:28:42 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * configure.ac:
+        * ace/Array_Base.cpp:
+        * ace/Array_Base.h:
+        * ace/Array_Base.inl:
 
-          Configure Makefiles for new subdirectory.
+          Added STL-style traits, iterators and swap() method.
 
-        * apps/JAWS2/Makefile.am:
+          (operator=):
 
-          Regenerate to descend into HTTPU subdirectory.
+          Improved exception-safety.
 
-        * apps/JAWS2/HTTPU/Makefile.am:
+        * ace/Array_Map.h:
+        * ace/config-lite.h:
 
-          New Makefile.am.
+          Moved reverse_iterator declarations to a new
+          ACE_DECLARE_STL_REVERSE_ITERATORS so that other ACE containers
+          may use them in a way that minimizes platform-specific
+          declaration duplication.
 
-Sat Dec 30 06:12:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/CDR_Stream.cpp (read_boolean_array):
 
-        * m4/ace.m4:
+          Addressed a Coverity CHECKED_RETURN error.  There's no need to
+          check the return value of read_boolean() in this case.
+          Explicitly cast the return value to "void".
 
-          Add placeholder automake conditionals for BUILD_ZLIB and
-          BUILD_ZZIP.
+          Addressed Coverity DEADCODE error.  No need to check for zero
+          "cont" pointer since the ACE_NEW_RETURN() call that initializes
+          it will return immediately.  "cont" cannot be zero if the latter
+          call succeeds.
 
-        * bin/MakeProjectCreator/acexml.mpb:
+        * ace/CDR_Stream.inl (operator>>):
 
-          Derive from both zlib and zzip.
+          Explicitly check return value of input stream read operations.
+          Addressed a Coverity CHECKED_RETURN errors.
 
-Fri Dec 29 16:57:10 UTC 2006  Steve Huston  <shuston@riverace.com>
+        * ace/Configuration.cpp (new_section):
 
-        * ace/SOCK_Dgram.cpp (recv): Corrected a "can't delete void*" warning
-          that entered with
-          Thu Dec 28 22:47:05 UTC 2006  Steve Huston  <shuston@riverace.com>
+          Fixed Coverity USE_AFTER_FREE error.  Memory was being accessed
+          after it was freed.
 
-Fri Dec 29 08:41:35 UTC 2006  Olli Savia  <ops@iki.fi>
+        * ace/Configuration_Import_Export.cpp:
 
-        * tests/Proactor_Timer_Test.cpp:
-          Fixed compile error on LynxOS with 2.95.3.
+          Addressed Coverity RESOURCE_LEAK errors.
 
-Fri Dec 29 08:31:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Default_Constants.h (ACE_DEFAULT_CLOSE_ALL_HANDLES):
 
-        * ace/os_include/os_signal.h:
-          Did some cleanup in this file, removed old stuff
+          This symbol represents a boolean value.  s/1/true.
 
-Fri Dec 29 07:33:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/Dev_Poll_Reactor.cpp (bind):
+        * ace/WFMO_Reactor.cpp (bind_i):
 
-        * bin/MakeProjectCreator/config/automake.features:
+          Disallow binding of a nil event handler pointer to the
+          repository.  It is deferenced later on this method.
 
-          Set java, zlib, and zzip.  We'll use automake conditionals to
-          defer these options to configure time.
+        * ace/Hash_Map_Manager_T.h:
+        * ace/Hash_Map_Manager_T.inl:
 
-Thu Dec 28 22:47:05 UTC 2006  Steve Huston  <shuston@riverace.com>
+          Added STL-style traits and iterator accessors.
 
-        * ace/SOCK_IO.{h, inl}: Changed the
-          recvv(iovec[], size_t, const ACE_Time_Value* = 0) and
-          sendv (const iovec[], size_t, const ACE_Time_Value*=0) methods
-          to specify the iovec count argument as int instead of size_t
-          since it gets reduced to int in the underlying OS calls (usually).
-          Removed the following deprecated methods:
+          (find):
 
-            ssize_t recv (iovec iov[],
-                          size_t n,
-                          const ACE_Time_Value *timeout = 0) const;
+          New method that returns an iterator as an "out" parameter.  An
+          iterator return value could not be used due a conflict with an
+          existing find() method.
 
-            ssize_t recv (iovec *io_vec,
-                          const ACE_Time_Value *timeout = 0) const;
+          (unbind):
 
-            ssize_t send (const iovec iov[],
-                          size_t n,
-                          const ACE_Time_Value *timeout = 0) const;
+          New method that unbinds the value pointed to by the given
+          iterator.
 
-          These were previously replaced with more specific ...v() methods.
+          (ACE_Hash_Map_Iterator_Base_Ex, ACE_Hash_Map_Iterator_Ex):
 
-        * ace/SOCK_Dgram.cpp (recv): Resolved ssize_t to u_long truncation
-          warning.
+          New constructors that position the iterator at the given
+          ACE_Hash_Map_Entry.
 
-        * ace/Service_Repository.{h cpp} (find, find_i): Changed the
-          ignore_suspended argument from int to bool to reflect it's true/false
-          nature.
-          Changed find_i() to return the located name's index in a size_t
-          argument when located - this allows it to pass indices as big as the
-          table can hold. The return value -1, -2 is not changed, but >= 0
-          is no longer returned; it's == 0 for success, and the caller needs
-          to get the index from the 'slot' argument. This should cause no
-          issues since find_i() is private and internal use has been adjusted
-          to match; callers of find() have no use for an index value for a
-          table internal to ACE_Service_Repository.
+        * ace/Lib_Find.cpp (ldfind):
 
-        * ace/Service_Gestalt.cpp (~ACE_Service_Type_Dynamic_Guard): Use of
-          ACE_Service_Repository::find_i() adjusted per above.
+          Place parentheses around ternary operator "?:" conditional to
+          address an operator precedence problem.  In this case, an
+          expression such as "a + b ? 0 : 1" was used, which is equivalent
+          to "(a + b) ? 0 : 1" instead of the desired "a + (b ? 0 : 1)".
 
-        * ace/Msg_WFMO_Reactor.cpp: Resolve truncation warning for 64-bit.
+          Changed local variable name from "got_suffix" to "has_suffix" to
+          clarify how the variable is being used.
 
-        * NEWS: Updated with API changes noted above.
+        * ace/OS_NS_Thread.inl (rw_unlock):
 
-Thu Dec 28 20:56:28 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Fixed potential deadlock in case where reference count is one.
+          Addresses a Coverity DEADLOCK error.
 
-        * bin/tao_orb_tests.lst:
+        * ace/OS_NS_dirent.cpp (scandir_emulation):
 
-          Updated to enable TAO/tests/TransportCurrent/Framework for
-          static builds.
+          Fixed potential dereferencing of zero pointer reported by the
+          Coverity FORWARD_NULL checker.
 
-Thu Dec 28 19:11:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/OS_NS_fcntl.cpp (open):
 
-        Reverted my change below this broke a lot of builds, seems
-        the settings in MPC are not used for ACE/TAO/CIAO so we need
-        to have them also in ACE duplicated
+          Return if SetFilePointer() call fails.  Addresses Coverity
+          CHECKED_RETURN error.
 
-        Thu Dec 28 12:57:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added support for large files SetFilePointer() calls.  Thanks to
+          Russell Mora for this fix.
 
-        * bin/MakeProjectCreator/config/global.features:
-          Removed the settings that are already set in the MPC
-          global.features file, no need to duplicate that info.
+        * ace/OS_NS_stdio.cpp (fopen):
 
-Thu Dec 28 15:35:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Fixed potential crash if null mode string is passed to this
+          method.
 
-        * configure.ac:
+        * ace/OS_NS_stdio.inl (fdopen):
+        * ace/OS_NS_unistd.inl (isatty):
 
-          Add ACE_HAS_3_PARAM_READDIR_R feature test.
+          No need to check for ACE_LACKS_INTPTR_T.  Just use intptr_t in
+          all cases.  ACE now supplies this typedef if the platform
+          doesn't.
 
-Thu Dec 28 14:54:00 UTC 2006  Pavel Zaichenko <zpf at ivl dot ua>
+        * ace/OS_TLI.h (t_bind):
+        * ace/OS_TLI.inl (t_bind):
 
-        * ace/OS_NS_unistd.cpp,
-        * ace/ARGV.cpp,
-        * ace/ARGV.h: Completed the integration of the quote_args feature
-          throughout the code.
+          Work around HP aCC 3.63 namespace scoping problem using typedef
+          hack in use for other structures.
 
-Thu Dec 28 14:49:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+        * ace/Select_Reactor_Base.cpp:
+        * ace/Select_Reactor_Base.h:
+        * ace/Select_Reactor_Base.inl:
 
-        * ace/ARGV.inl (argc): This method now first calls argv() before
-          returning the argc count.
+          Changed underlying event handler container from a simple array
+          to an ACE_Hash_Map_Manager<> on Windows, and to an
+          ACE_Array_Base<> on UNIX-like platforms.
 
-Thu Dec 28 12:57:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Use of an ACE_Hash_Map_Manager<> on Windows allows for faster
+          event handler searches.
 
-        * bin/MakeProjectCreator/config/global.features:
-          Removed the settings that are already set in the MPC
-          global.features file, no need to duplicate that info.
+          Use of an ACE_Array_Base<> on UNIX-like platforms allows us to
+          leverage advantages using a container (improved
+          exception-safety, container interface, etc), while still
+          retaining the direct file descriptor to event handler mapping at
+          essentially no cost to footprint relative to the previous
+          implementation.
 
-Thu Dec 28 12:37:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          (bind):
 
-        * ace/DLL_Manager.cpp (get_handle):
-          Simplified this method a little
+          Disallow binding of a nil event handler pointer to the
+          repository.  It is deferenced later on this method.  Addresses a
+          potential crash.
 
-        * ace/Dynamic_Service_Base.cpp:
-          Layout change
+        * ace/Service_Config.cpp (current):
 
-        * ace/os_include/net/os_if.h:
-          Include ws2tcpip.h on windows as we do in the other files, this
-          way we don't get redefinitions on windows
+          Simplified these methods.
 
-        * ace/Service_Gestalt.cpp (process_directive):
-          No need to use an intermediate variable
+          Removed global lock that was held when accessing TSS.  Only
+          initialization of global implementation needs to synchronized
+          with that lock.
 
-        * tests/ARGV_Test.cpp:
-          Fixed deprecated conversion warnings
+          Removed redundant accesses to TSS.
 
-        * tests/Time_Value_Test.cpp:
-          Added another test
+        * ace/Service_Config.h:
 
-Thu Dec 28 11:13:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Removed stray semi-colon.
 
-        * ace/config-aix-5.x.h:
-          Define ACE_HAS_3_PARAM_READDIR_R always independent of the compiler
-          used.
+          (impl_):
 
-Wed Dec 27 21:15:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+          This method no longer needs to return the pointer by reference.
 
-        * ace/ARGV.{h,cpp} Generalized the constructor for ACE_ARGV_T so
-          that it can optionally be directed to quote args or not, which
-          is consistent with the ACE_ARGV_T<CHAR_TYPE>::add() method
-          described below.
+        * ace/Service_Repository.cpp:
 
-        * ace/OS_NS_unistd.{h,cpp}: ACE_OS::argv_to_string() was updated
-          to implement the feature described above.
+          Changed loop index type so that it matches repository size type
+          (an unsigned integer), and updated loop decrement to take into
+          account the index type is now unsigned.
 
-Wed Dec 27 21:19:57 UTC 2006  Pavel Zaichenko <zpf at ivl dot ua>
+        * ace/Sock_Connect.h (ipv4_enabled):
+        * ace/Sock_Connect.cpp (ipv4_enabled):
 
-        * ace/OS_NS_stdlib.cpp: ACE_OS::strenvdup() now correctly expands
-          environment variables are correctly expanded in strings of form
-          "$ACE_ROOT/subdir", "/some/dir/$ARCH/subdir" as well as
-          "$ACE_ROOT".
+          New run-time check for existence IPv4 stack.  Some hosts only
+          contain IPv6 stacks.
 
-        * ace/OS_NS_unistd.cpp: ACE_OS::argv_to_string() and
-          ACE_OS::string_to_argv() now converts arguments list argv[] to
-          string and vice versa. Double quotes (") are correctly
-          quoted/unquoted during conversion.
+          From Sriram Chandramouli <sriram_chandramouli at symantec dot com>
+          (get_fqdn):
 
-        * ace/ARGV.{h,inl,cpp}: Made the following enhancements:
+          New method that retrieves fully qualified domain.  getaddrinfo()
+          doesn't always provide the desired results.
 
-          ACE_ARGV_T<CHAR_TYPE>::add(const CHAR_TYPE *next_arg, bool quote_arg = false)
-          Now takes an additional argument
-          * @param quote_arg   The argument @a next_arg need to be quoted while
-          *                    adding to the vector.
-          which is queued in the queue_ as well as next_arg for farther usage.
+        * ace/Svc_Conf.y (ace_get_module):
+        * ace/Svc_Conf_y.cpp (ace_get_module):
 
-          ACE_ARGV_T<CHAR_TYPE>::add(CHAR_TYPE *argv[])
-          Each entry argv[i] of the argument list is interpreted as a single argument
-          (white spaces are preserved).
+          Simplified explicit casts.
 
-          ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue()
-          Creates a command line using arguments (next_arg, quote_arg) queued
-          with add() method. Quotes double quote symbols (") if needed.
+          Prevent dereferencing of potentially null pointer.
 
-Wed Dec 27 21:14:34 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+        * ace/System_Time.cpp:
+        * ace/System_Time.h:
 
-        * ace/ARGV.{h,cpp}: Removed the
+          No need to include "ace/Malloc_T.h", "ace/MMAP_Memory_Pool.h"
+          and "ace/Null_Mutex.h".  Forward declarations are sufficient.
 
-          int argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf);
+          Use time_t type instead of ACE_UINT32 when returning times, such
+          as those returned from ACE_OS::time().  Addresses lack of
+          precision issues.
 
-          method since it's redundant with what's in ACE_OS::argv_to_string().
+        * ace/Thread_Manager.cpp (wait):
 
-Wed Dec 27 20:27:29 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+          Addressed a Coverity CHECKED_RETURN error.  There's no need to
+          check the return value of ACE_Thread::join() in this case.
+          Explicitly cast the return value to "void".
 
-        * ace/OS_NS_stdlib.{h,inl,cpp}: There's no need for the
-          strenvdup() method to be defined as
-          ACE_NAMESPACE_INLINE_FUNCTION.
+        * ace/Time_Value.h (ACE_ONE_SECOND_IN_USECONDS):
 
-Wed Dec 27 15:12:12 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+          Made this constant type-safe.  It is now of type suseconds_t,
+          instead of a preprocessor symbol definition.
 
-        * ace/Map_Manager.{h,inl}: Added a default constructor for
-          ACE_Map_Entry to initialize the data members.  Thanks to Dieter
-          Knueppel <Dieter dot Knueppel at batm dot de> for this fix.
+        * ace/UUID.cpp (lock):
 
-Wed Dec 27 16:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Addressed USE_AFTER_FREE Coverity error.  Do not return a
+          pointer to the previous lock.  It may have been destroyed.
 
-        * ace/os_include/netinet/os_in.h:
-          Define IPPROTO_TCP when not defined yet
+        * ace/UUID.h (lock):
 
-        * ace/os_include/netinet/os_tcp.h:
-          Define TCP_NODELAY when not defined yet
+          Changed return type from "ACE_SYNCH_MUTEX*" to "void".  The
+          interface/implementation does not provide a means to safely
+          return the previous lock instance.
 
-Wed Dec 27 16:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/ace_wchar.inl (convert):
 
-        * ace/os_include/net/os_if.h:
-          Only define the IFF_x defines when ACE_LACKS_NETWORKING is
-          defined to resolve redefinition warnings on windows
+          Corrected calculation of wide string length.
 
-Wed Dec 27 14:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/MakeProjectCreator/config/acexml.mpb:
 
-        * ace/config-posix-nonetworking.h:
-          Added ACE_LACKS_GETHOSTENT
+          No longer any need to explicitly disable ACEXML in the
+          ace_for_tao configuration.
 
-Wed Dec 27 12:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * include/makeinclude/platform_irix6.x_sgic++.GNU:
 
-        * ace/Atomic_Op_T.h:
-          Doxygen improvements
+          SGI 7.3.x compiler doesn't have the 3506 error code.  Do not
+          attempt to supress it.
 
-Wed Dec 27 11:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Oct 23 22:24:01 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * ace/os_include/sys/os_socket.h:
-          Define SO_ERROR when it is not defined yet
+        * ace/Unbounded_Queue.cpp (set):
 
-Wed Dec 27 10:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Explicitly initialize dummy value.  Addresses "use of
+          uninitialized variable" g++ 4.1 warning when the variable is a
+          POD type.
 
-        * ace/os_include/sys/os_socket.h:
-          Added ACE_LACKS_LINGER support
+        * ace/ace_for_tao.mpc:
 
-        * ace/config-posix-nonetworking.h:
-          Added ACE_LACKS_LINGER
+          Removed unnecessary semaphore related files.
 
-Wed Dec 27 10:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added missing ace/Truncate.h header.
 
-        * ace/os_include/sys/os_socket.h:
-          Define SOCK_SEQPACKET when it is not defined yet
+Mon Oct 23 21:44:32 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-Wed Dec 27 10:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Truncate.h (Truncator):
 
-        * ace/config-posix-nonetworking.h:
-          Added ACE_LACKS_IFCONF
+          Borland doesn't appear to be able to grok the use of the
+          function call operator in the ACE_Utils::Truncate<> function
+          template.  Replaced the Truncator<>::operator() function call
+          operator with a static Truncator<>::truncate() method instead.
 
-        * ace/os_include/net/os_if.h:
-          Added some more types that need to be defined by ACE when
-          we compile without network support
+Mon Oct 23 13:29:15 UTC 2006  Olli Savia  <ops@iki.fi>
 
-        * ace/SOCK_Dgram.cpp:
-          Removed check for ACE_LACKS_IFREQ
+        * ACE-INSTALL.html:
+        * ace/Mem_Map.h:
+        * ace/Mem_Map.inl:
+        * ace/Mem_Map.cpp:
+        * ace/OS_NS_Thread.inl:
+        * ace/OS_NS_sys_mman.inl:
+        * ace/Reverse_Lock_T.h:
+        * ace/Task_Ex_T.h:
+        * ace/Task_T.h:
+        * ace/config-lynxos.h:
+        * include/makeinclude/platform_lynxos.GNU:
 
-        * ace/SOCK_Dgram_Bcast.cpp:
-          Layout changes
+          Removed LynxOS 3.x support.
+
+Mon Oct 23 12:59:35 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/generate_compile_stats.sh:
+
+          Corrected a bug with my previous change.  If config.h or
+          platform_macros.GNU were not present, the html would be incorrect.
+          I also added default.features to the list of configuration files
+          that are displayed.
+
+Mon Oct 23 06:34:24 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/os_include/os_pthread.h: Changed
+
+          #      if !defined (ACE_LACKS_RWLOCK_T)
+
+          to
+
+          #      if !defined (ACE_LACKS_RWLOCK_T) && !defined (ACE_HAS_PTHREADS_UNIX98_EXT)
+
+          to stop a compile error on Solaris after SunOS 5.8.  Thanks to
+          Boris Kaminer <boris dot kaminer at gmail dot com> for reporting
+          this fix.
+
+Sun Oct 23 00:29:55 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Truncate.h:
+
+          In the Borland-specific workaround, explicitly cast return value
+          of ACE_Numeric_Limits::max() of the smaller unsigned type to the
+          unsigned larger type to which it is being compared.  Addresses
+          non-intuitive "comparison of signed and unsigned types" warning
+          issued by Borland compiler.  Borland promotes unsigned char to
+          int, instead of unsigned int, when comparing to unsigned int.
+          This implicit type promotion behavior complies with the C++
+          standard, but is a bit awkward nonetheless (IMHO :)).  Thanks to
+          Johnny for pointing out Borland's explanation of the
+          non-intuitive warning.
+
+Sun Oct 22 08:11:25 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-Wed Dec 27 10:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Token_Request_Reply.inl (token_name):
+
+          Simplified use of ACE_Utils::Truncate<> function template.  Only
+          the "TO" type must be explicitly specified.  The "FROM" type is
+          deduced automatically by the compiler.  Note that explicitly
+          specifying both template parameters is perfectly valid, too.
+
+        * ace/Truncate.h (Truncator):
+
+          Added char/int specializations for Borland to allow the
+          Integer_Truncate_Test to compile.  All of the Borland-specific
+          Truncator specializations are meant to be a temporary workaround
+          until Borland C++ is capable of supporting the generalized
+          implementation.
+
+Sat Oct 21 14:49:21 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/TSS_T.{h cpp}: Added "volatile" keyword to once_ member
+          since it can be changed by other threads. Removed the lock
+          acquiring from the ts_object() methods - after once_ is checked,
+          there are no further needs for locks. When needed, the key_ is
+          set up by ts_init() which does acquire a lock. This avoids a lock
+          acquire/release cycle on all calls when initialization of the
+          ACE_TSS object is not required, speeding up performance. Thanks to
+          Guy Peleg <guy dot peleg at amdocs dot com> for reporting this and
+          to Russell Mora <russell_mora at symantec dot com> for assisting in
+          analyzing the situation and recommending the particular fixes.
+
+        * ace/Logging_Strategy.h: Minor doxygen improvements.
+
+        * ace/Sock_Connect.cpp: When checking for IPv6 interfaces on Windows,
+          there's two conditionally compiled blocks of code. One block was
+          built if ACE_HAS_IPV6 SIO_ADDRESS_LIST_QUERY are both defined; the
+          other was built if ACE_HAS_IPV6 is defined. Added the check for
+          SIO_ADDRESS_LIST_QUERY to the second case as well since it makes
+          no sense to run it if the first isn't built. Thanks to Andre
+          Kostur for this fix. Also see:
+          Mon Oct 16 14:24:25 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Task_T.h (reply): Clarified what happens on a reply(). Thanks
+          to Doug Schmidt for explaining the rationale for this.
+
+        * ace/Token_Request_Reply.inl (token_name): VC7.1 had trouble grokking
+          the ACE_Utils::Truncate arguments in this case, so add the types
+          to a more complete specification of what template is desired.
+
+Sat Oct 21 15:19:46 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * configure.ac: Removed the check for LINUX_VERSION that disabled
+          the check for epoll on Linux. Just let the check run - the macros
+          used checked the kernel/C version used to build the kernel instead
+          of the running kernel itself (I think...). In any event, the
+          use of the macros to disable the check prevented the check from
+          running on systems (such as RHEL 4) that do have epoll. Thank you
+          to Brian Campbell <becampbel at hotmail dot com> for researching
+          this area.
+
+Sat Oct 21 10:48:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * bin/PerlACE/RunTest.pm:
+        * bin/PerlACE/ProcessVX.pm:
+        * bin/PerlACE/ProcessVX_Unix.pm:
+
+          Changes to accomodate running autotests for VxWorks RTPs on
+          Linux hosts.
+
+Sat Oct 21 04:34:33 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/OS_NS_stdlib.cpp:
+
+          Always include "ace/Numeric_Limits.h" in the ACE_LACKS_MKSTEMP
+          case.  There is no need to conditionally include it when "max"
+          is undefined.  Addresses VxWorks build errors.
+
+        * ace/Truncate.h:
+
+          Only use workaround for Borland compiler versions less than or
+          equal to 0x582.  Thanks to Johnny for the suggestion.
+
+        * tests/Integer_Truncate_Test.cpp (sizeof_from_lt_sizeof_to):
+
+          Explicitly cast types in inequality comparison to silence
+          comparison of signed and unsigned warnings.  It's not clear why
+          the warning is occuring since both types are unsigned.
+
+          Removed remaining set of redundant parentheses that were
+          missed in a previous commit.
+
+Fri Oct 20 12:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Service_Manger.{h,cpp}:
+          Changed debug_ member to a real bool
+
+Fri Oct 20 12:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_socket.inl (bind):
+        * ace/config-rtems.h:
+          Added ACE_LACKS_BIND
+
+        * ace/Basic_Types.h:
+          Fixed compile problems with BCB6
+
+Fri Oct 20 12:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Record.inl:
+          Added check for ACE_LACKS_NTOHL and ACE_LACKS_HTONL
+
+        * ace/config-rtems.h:
+          Added ACE_LACKS_NTOHL and ACE_LACKS_HTONL when no networking
+          is available
+
+Fri Oct 20 09:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/INET_Addr.h:
+          Small change to improve doxygen documentation
+
+        * ace/OS_NS_sys_socket.inl (listen):
+          Added ACE_LACKS_LISTEN
+
+        * ace/config-rtems.h:
+          Added ACE_LACKS_LISTEN
+
+Fri Oct 20 09:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb:
+        * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb:
+        * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb:
+          New base projects
+
+        * bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb:
+          Use the new base projects above
+
+          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
+          for delivering these files
+
+Fri Oct 20 09:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/os_include/sys/os_socket.h:
-          Define SO_BROADCAST when it is not defined yet
+          Defined AF_UNSPEC and PF_UNSPEC when these are not defined by the
+          OS header files.
 
-Wed Dec 27 10:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Oct 20 08:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/os_include/netinet/os_in.h:
-          Add sockaddr_un when ACE_LACKS_SOCKADDR_UN is defined
+        * ace/os_include/sys/os_uio.h:
+          When INADDR_ANY is not defined, then define it, we need it in several
+          of the ACE header files
 
-        * ace/config-posix-nonetworking.h:
-          Added ACE_LACKS_SOCKADDR_UN
+Fri Oct 20 08:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Dec 27 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/os_include/sys/os_uio.h:
+          We define iovec when ACE_WIN32 was defined, changed this to a new
+          define, ACE_LACKS_IOVEC to make it easier to use with other platforms
 
-        * ace/Name_Request_Reply.cpp:
-          Use ACE_NTOHS so that this file compiles without network support
+        * ace/config-win32-common.h:
+          Added ACE_LACKS_IOVEC
 
-Wed Dec 27 09:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/config-rtems.h:
+          When no networking has been configured, also define ACE_LACKS_IOVEC
 
-        * tests/ARGV_Test.cpp:
-          Fixed deprecated conversion warnings
+Thu Oct 19 22:28:59 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-Wed Dec 27 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * contrib/minizip/iowin32.c
+        * contrib/minizip/iowin32.h
+          Removed these files.
 
-        * ace/OS_NS_dirent.cpp:
-          Removed workaround for vc6
+Thu Oct 19 23:20:26 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * ace/OS_NS_dirent.inl:
-          Layout change
+        * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
+        * examples/C++NPv1/Reactive_Logging_Server.h:
 
-Wed Dec 27 09:27:06 UTC 2006  Olli Savia  <ops@iki.fi>
+          Fixed integer/void* conversion related warnings by using
+          the "intptr_t" type instead of "int" or "long".
 
-        * tests/Log_Msg_Test.cpp:
-          Updated comment.
+Thu Oct 19 22:58:02 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-Wed Dec 27 09:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Truncate.h:
 
-        * ace/OS_NS_dirent.inl (readdir_r):
-          Simplified the OS checks in this method, use the new
-          define ACE_HAS_3_PARAM_READDIR_R. This is then set in the
-          config files below, maybe it has to be set in more, but the
-          scoreboard will show that.
+          Borland compilers currently cannot handle the template
+          meta-programming in this header.  Work around the limitation by
+          explicitly specializing the ACE_Utils::Truncator<> structure
+          template for a select few 32- and 64-bit integers.  More will be
+          added as needed.
+
+Thu Oct 19 17:25:16 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tests/Integer_Truncate_Test.cpp:
+
+          Removed redundant parentheses.
+
+Thu Oct 19 15:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_rel_manpages:
+          Updated doxygen version
+
+        * bin/MakeProjectCreator/templates/gnu.mpb:
+          Removed kylix support
+
+Thu Oct 19 13:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_main.h:
+          Added main for rtems
+
+Thu Oct 19 11:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Rtems_init.c:
+          Fixed empty translation unit warnings
+
+Thu Oct 19 08:27:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * include/makeinclude/platform_openvms.GNU:
+          Small change to create hardlinks for produced executables.
+
+Wed Oct 18 16:19:38 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * contrib/minizip/minizip.suo
+        * contrib/minizip/miniziplibrarycode.suo
+          Removed these files.
+
+Wed Oct 18 13:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_rtems.x_g++.GNU:
+          Major cleanup of old stuff and always define ACE_HAS_RTEMS
+
+        * etc/rtems_init.c:
+        * ace/rtems_init.c:
+          Another move, for rtems we require some functions to always
+          be available, this defines our network settings and much more.
+          Because we always build static, we moved this to the ACE lib,
+          on rtems we define ACE_HAS_RTEMS and then compile the contents
+          of this file. This way the functions in this file are available
+          in any executable we link
+
+        * ace/OS.h:
+        * ace/os_include/os_signal.h:
+        * ace/os_include/sys/os_types.h:
+        * ace/OS_NS_stdio.h:
+        * ace/OS_NS_time.inl:
+          Replaced __rtems__ with ACE_HAS_RTEMS
+
+        * ace/ace.mpc:
+          Added rtems_init.c
+
+Wed Oct 18 13:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeincludes/rules.bin.GNU:
+        * include/makeincludes/rules.lib.GNU:
+        * include/makeincludes/wrapper_macros.GNU:
+        * include/makeincludes/platform_linux_borland.GNU:
+          Removed kylix support
+
+Wed Oct 18 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/Gateway/Gateway/File_Parser.cpp:
+          Removed egcs workaround
+
+Wed Oct 18 08:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/rtems_init.c:
+        * etc/rtems_init.c:
+          Moved from tests to etc
+
+Tue Oct 18 06:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Reactor/Misc/test_signals_1.cpp:
+        * performance-tests/Misc/context_switch_time.cpp:
+          Renamed the global count variables to another name. These triggered
+          a bug in the VxWorks 5.5.2 compiler which we reported to windriver.
+          By renaming these we will get an error free compilation.
+
+Tue Oct 18 06:02:28 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Basic_Types.h (intptr_t, uintptr_t):
+
+          Provided suitable typedefs for these standard types when
+          ACE_LACKS_INTPTR_T is defined.
+
+        * ace/Event_Handler.cpp (~ACE_Event_Handler_var):
+
+          Only use an ACE_Errno_Guard if the underlying ACE_Event_Handler
+          pointer is non-zero.  Saves a TSS access in the zero
+          ACE_Event_Handler pointer case.
+
+          (operator=):
+
+          Made strongly exception safe.
+
+        * ace/FILE_IO.cpp (send, recv):
+        * ace/Message_Queue.cpp (enqueue, dequeue):
+        * ace/Message_Queue_T.cpp:
+        * ace/OS_NS_unistd.inl (hostname):
+
+          Explicitly supply the "int" "TO" type to the
+          ACE_Utils::Truncate<> function template.  It must now be
+          explicitly specified since ACE_Utils::Truncate<> now supports
+          truncation to all integer types, not just "int".
+
+        * ace/Global_Macros.h (ACE_STATIC_CONSTANT):
+
+          New macro for in-class static integral constant initialization
+          that works around compilers that don't like such initialization.
+          In-class integral constants in this case are meant to be
+          compile-time constants so that they may be used as template
+          arguments, for example.  BOOST provides a similar macro.
+
+        * ace/OS_NS_stdlib.inl (atop):
+        * ace/OS_NS_stdio.cpp (fopen):
+
+          Removed ACE_LACKS_INTPTR_T check.  It is no longer needed.
+
+        * ace/Truncate.h:
+
+          Generalized the ACE_Utils::Truncate<> function template
+          implementation for all integer types.
+
+        * tests/run_test.lst:
+        * tests/tests.mpc:
+
+          Added new "Integer_Truncate_Test" test that verifies the
+          ACE_Utils::Truncate<> function template works for all type
+          size/sign scenarios.
+
+Tue Oct 17 21:28:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.cpp (parse_args_i):
+
+          Checking for no arguments was missed inadvertently in the
+          original change-set from "Tue Oct 17 16:27:27 UTC 2006 ..."
+
+Tue Oct 17 21:09:36 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * contrib/minizip/ChangeLogUnzip
+        * contrib/minizip/crypt.h
+        * contrib/minizip/ioapi.c
+        * contrib/minizip/ioapi.h
+        * contrib/minizip/iowin32.c
+        * contrib/minizip/iowin32.h
+        * contrib/minizip/miniunz.c
+        * contrib/minizip/minizip.c
+        * contrib/minizip/minizip.mpc
+        * contrib/minizip/minizip_export.h
+        * contrib/minizip/mztools.c
+        * contrib/minizip/mztools.h
+        * contrib/minizip/unzip.c
+        * contrib/minizip/unzip.h
+        * contrib/minizip/zip.c
+        * contrib/minizip/zip.h
+          Added the minizip project. Thanks to Krishnakumar Balasubramanian
+          <kitty at dre dot vanderbilt dot edu> for providing this.
+
+Tue Oct 17 17:17:36 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/OS_NS_unistd.inl (truncate): SetFilePointerEx() returns a
+          BOOL not a DWORD (unlike SetFilePointer()..).  Thanks to Boris
+          Kaminer <boris dot kaminer at gmail dot com> for reporting this.
+
+Tue Oct 17 16:27:27 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/DLL_Manager.cpp:
+        * ace/Parse_Node.cpp:
+
+          Updated logging messages.
+
+        * ace/Service_Gestalt.cpp:
+
+          Updated logging messages to exclude the "e-word" causing false
+          positives in the Service_Config_Test. Updated comments.
+
+Tue Oct 17 12:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/soreduce/Library.cpp:
+          taoversion is not a valid base project. Thanks to Manuel Traut
+          <manut dot de at googlemail dot com> for reporting this.
+
+Tue Oct 17 12:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+          Updated supported platforms by Remedy IT. New are VxWorks 5.5.2,
+          OpenVMS 8.3, RTEMS and LynxOS.
+
+Tue Oct 17 12:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-aix-5.x.h:
-        * ace/config-cygwin32.h:
-        * ace/config-freebsd.h:
-        * ace/config-hpux-11.00.h:
-        * ace/config-linux-common.h:
-        * ace/config-netbsd.h:
         * ace/config-rtems.h:
-        * ace/config-sunos5.5.h:
-        * ace/config-vxworks6.4.h:
-          Added ACE_HAS_3_PARAM_READDIR_R
+          Cleanup
 
-        * ace/config-linux-common.h:
-          Added new ACE_LACKS_LINUX_VERSION_H around include of linux/version.h.
-          This file isn't present with BlueCAT 4 Linux from LynuxWorks.
+        * include/makeinclude/plaform_rtems.x_g++.GNU:
+          Improved for rtems 4.6.6
 
-        * ace/config-posix.h:
-          Layout changes
+Tue Oct 17 07:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-rtems.h:
+        * ace/OS_NS_unistd.inl:
+          Added support for ACE_LACKS_FDOPEN
+
+Mon Oct 16 21:29:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * THANKS: Updated Chris Reed's entry in the list.
+
+Mon Oct 16 20:04:59 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          This change fixes bug#2612. See the description for the gory
+          details. In a nutshell, the problem is caused by the fact that
+          static services, loaded from a DLL, as part of a dynamic service
+          initialization can not be safely finalized when the dynamic
+          service's DLL gets unloaded. This was historically handled by
+          simply not unloading DLLs, and by finalizing all services at
+          process exit. With the introduction of the local configurations
+          feature, this changed.
+
+          The finalization order was supposed to be guaranteed by the
+          ordering of the services in the repository. It really was a
+          kludge, because when dynamically loading and removing services
+          the order can change.  Then whenever the process tries to clean
+          up, the dynamic service's DLL can be unloaded (because it gets
+          finalized first), and the static services' destructor code would
+          become inaccessible. The situation results in a SEGV at exit().
+
+        * ace/DLL.h:
+        * ace/DLL.cpp:
+
+          Made assignment operator return a non-const reference to make it
+          well-formed. See C++ Standard, section "[special]".
+
+        * ace/DLL_Manager.cpp:
+        * ace/Dynamic_Service_Base.cpp (instance):
+        * ace/Parse_Node.cpp:
+
+          Fixed formatting and logging
+
+        * ace/Service_Config.cpp (parse_args_i):
+
+          Fixing a bug related to parsing the command line options that
+          take arguments. Thanks to Aaron Scamehorn <Aaron dot Scamehorn
+          at cogcap dot com> for reporting it.
+
+        * ace/Service_Gestalt.cpp:
+
+          Added ACE_Service_Dynamic_Guard (formerly
+          ACE_Service_Type_Forward_Declaration_Guard) which helps to
+          resolve an issue with hybrid services, i.e. dynamic services,
+          accompanied by static services in the same DLL.  Only automatic
+          instances of SDG are supposed to exist. Those are created during
+          (dynamic) service initialization and serve to:
+
+          (a) Ensure the service we are loading is ordered last in the
+          repository, following any other services it may cause to
+          register, as part of its own registration. This is a common case
+          when loading dynamic services from DLLs - there are often static
+          initializers, which register static services.
+
+          (b) The SDG instance destructor detects if the dynamic service
+          initialized successfully and "fixes-up" all the newly registered
+          static services, so that each holds a reference to the DLL, from
+          which they have originated.
+
+          Updated comments and formatting.
+
+        * ace/Service_Object.h (dll):
+        * ace/Service_Object.inl (dll):
+
+          Added void dll (const ACE_DLL&) to make it possible to
+          "relocate" services registered through static initializers found
+          in DLL's code segment(s).
+
+        * ace/Service_Object.cpp (fini):
+
+          Modified ACE_Service_Type::fini() to ensure the DLL associated
+          with the service is properly closed. This in conjunction with
+          the gestalt changes above, makes it possible to safely and
+          completely unload a service.
+
+        * ace/Service_Repository.h:
+        * ace/Service_Repository.cpp (remove_i,relocate_i,relocate):
+
+          Added relocate(), which allows association of a (static) service
+          objects with a DLL. Per changes to ACE_Service_Gestalt,
+          above. Added a counterpart private relocate_i(), which does not
+          obtain locks.
+
+        * tests/Service_Config_Test.cpp:
+
+          Added a test that combines more than one argument-taking command
+          line option to guard against regression for the bug fixed in
+          ACE_Service_Config::parse_args_i (see above).
+
+Mon Oct 16 19:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-rtems.h:
+          Updated with more changes needed for rtems
+
+        * ace/os_include/os_signal.h:
+          Added specific defines for rtems
+
+        * ace/OS_NS_time.cpp (difftime):
+          Removed not used variable and get gmtime/gmtime_r from the
+          global scope
+
+        * ace/OS_NS_string.{h,cpp,inl}:
+          Added ACE_LACKS_STRTOK_R to make the rtems port easier
+
+Mon Oct 16 14:24:25 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_netdb.{cpp inl} (gethostbyname[_r], gethostbyaddr[_r]):
+          Check the specified string (name or addr) for unspecified or of
+          0 length and return 0 if so - bypasses a system call and a possible
+          memory leak. Thanks to Howard Finer <hfiner at sonusnet dot com>
+          for these fixes.
+
+        * ace/Sock_Connect.cpp (get_ip_interfaces): Don't report an error if
+          we can't find IPv6 addresses. It may be on a system with ACE_HAS_IPV6
+          support compiled but IPv6 not configured/enabled. Thanks to Andre
+          Kostur <akostur at incognito dot com> for reporting this.
+
+        * ace/WFMO_Reactor.cpp (ok_to_wait): In the ACE_HAS_WINCE block,
+          change fwaitAll arg from TRUE to FALSE - it must be FALSE on
+          WinCE (thru WinMobile 5) per MSDN. Thanks to Drew Reynaud
+          <drewreynaud at hotmail dot com> for this fix.
+
+        * THANKS: Added Drew Reynaud to the Hall of Fame.
+
+Mon Oct 16 14:21:48 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/generate_compile_stats.sh:
+
+          I accidentally deleted a letter in my previous commit.
+
+Mon Oct 16 14:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-rtems.h:
+          Added first set of missing defines
+
+        * ace/os_include/sys/os_select.h:
+        * ace/os_include/sys/os_uio.h:
+          Removed rtems specific part, not needed anymore
+
+        * ace/os_include/sys/os_types.h:
+          Added rtems check
+
+        * include/makeinclude/plaform_rtems.x_g++.GNU:
+          Updated
+
+Mon Oct 16 13:47:25 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
+
+          Use the create_command_line_string() method instead of printing
+          the command line directly.  This opens the door for disabling this
+          functionality.
+
+Mon Oct 16 12:18:14 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/OS_NS_Thread.inl:
+        * ace/os_include/os_semaphore.h:
+
+          The feature that I put in for Gottwald Port on Mon Mar  6 18:25:41
+          UTC 2006 causes a performance overhead for semaphores where
+          ACE_HAS_POSIX_SEM is defined (SunOS, HP-UX, MacOS X, etc.).  For
+          those that are not interested in timed semaphores, this feature
+          provides nothing and is detemental to performance.  Now, this
+          feature is disabled by default and must be manually enabled by
+          defining the ACE_HAS_POSIX_SEM_TIMEOUT_EMULATION macro.
+
+Mon Oct 16 12:06:10 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/generate_compile_stats.sh:
+
+          Added some changes to make this script usable for software other
+          than ACE+TAO+CIAO.
+
+          - Enhanced the usage message.
+          - Fixed minor HTML errors.
+          - Added options to set the base root directory and software title.
+
+Mon Oct 16 11:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/IOStream/client/IOStream_Client.mpc:
+        * examples/IOStream/server/IOStream_Server.mpc:
+          Added exename so that we create an exe, not a dll
+
+        * examples/IOStream/client/.cvsignore:
+        * examples/IOStream/server/.cvsignore:
+          Removed duplicate lines
+
+        * examples/IOStream/server/iostream_server.cpp:
+          Added needed include for building with VxWorks 5.5.2
+
+Mon Oct 16 08:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/templates/ciao_static_dnc_app.mpb:
+          New base project for static dnc.
+          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
+          for creating this file
+
+Sun Oct 15 23:22:52 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+          Added Bug_2683_Regression to the test suite.
+
+Fri Oct 13 18:26:19 UTC 2006  Andy Stafford  <ajs3@cec.wustl.edu>
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Added 'lksctp' as recognized option to sctp documentation.
+
+Fri Oct 13 18:13:00 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/cle.pl (getDefaultDomain):
+
+          Fixed a bug where extra text would be part of the domain name when
+          the /etc/hosts file contains an alias after the fully qualified
+          host name.
+
+Fri Oct 13 12:32:35 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/PerlACE/Process_Unix.pm:
+
+          Added support for remote testing on UNIX only.  Currently, ssh or
+          rsh is used to run an executable on the remote machine.  The
+          remote test capability is only enabled if the RemoteInformation
+          method is called on the PerlACE::Process object.  For more
+          details, see the RemoteInformation method in this module.
+
+Fri Oct 13 10:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/soreduce/Library.cpp:
+          aceversion is not a valid base project. Thanks to Manuel Traut
+          <manut dot de at googlemail dot com> for reporting this.
+
+Thu Oct 12 16:44:34 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Record.cpp (operator<<): Zapped the nonconst_record and
+          const_cast since this is no longer needed as per the following
+          change:
+
+         Sun Aug 12 00:34:42 2001  Steve Huston  <shuston@riverace.com>
+         * ace/Log_Record.h:
+         * ace/Log_Record.i (msg_data()): Changed ACE_TCHAR *msg_data()
+           to:  const ACE_TCHAR *msg_data (void) const. Makes it safer,
+           and conforms to all current usage inside ACE. Also makes
+           C++ Network Programming examples simpler :-)
+
+          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
+          for reporting this.
+
+Thu Oct 12 15:45:24 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          If a custom definition has an 'output_option' set, the order of
+          listing the input file changes such that it is listed before the
+          output_option setting in the build rule.
+
+        * bin/auto_run_tests.pl:
+
+          Added a new option, -l, which can be used to specify an arbitrary
+          list of tests.
+
+Thu Oct 12 12:20:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Svc_Conf.h:
+          Fixed incorrect placed ACE_BEGIN_VERSIONED_NAMESPACE_DECL macro.
+          Thanks to Alexander Libman <alexander dot libman at earthlink dot net>
+          for reporting this
+
+Wed Oct 11 15:24:04 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Log_Record.{h inl cpp}: Removed the set_msg_data_ptr()
+          method - it opens the possibility of putting a buffer in place
+          that can't be freed properly. All of the memory allocating and
+          deleting should be done internally to this class. The removed
+          method was only used internally.
+          Added a private msg_data_size_ member that keeps the allocated size
+          of msg_data_ in ACE_TCHARs (not bytes) to tell if the buffer needs
+          to be resized. Comparing to the string length is incorrect - it
+          causes buffer reallocating whenever a short logged message is
+          followed by a longer one, even if both are much shorter than the
+          allocated length of msg_data_. When a ctor allocates a msg_data_
+          area, set the first spot to '\0' to a call to msg_data_len() won't
+          get random answers or a crash.
+          (msg_data (const ACE_TCHAR *)): Changed this method to return int,
+          not void. It also will now reallocate the msg_data_ buffer if needed
+          to hold the specified string. operator<< now uses msg_data() to set
+          the string instead of the now removed set_msg_data_ptr() method,
+          keeping all msg_data_ allocation and release in the same class.
+          (operator<<): Fix memory leak when setting a new msg_data_
+          buffer. Thanks to Arturo Montes for letting us know about the leak.
+
+        * docs/ACE-guidelines.html: Clarify the format of ChangeLog entries.
+          Remove the recommendation to always test on egcs; things should be
+          tested on at least Windows and Linux, but egcs is outdated.
+
+Tue Oct 10 18:46:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ACE-INSTALL.html:
-          Updated supported platforms by Remedy IT
+          Document how to get a current copy from subversion
 
-        * ace/INET_Addr.cpp:
-          Use the ACE_NTOHL macro and remove the check for ACE_LACKS_NTOHL
+Tue Oct 10 14:16:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Map_Manager.{h,cpp}:
-          Changed free_ to a real bool
+        * ace/CDR_Stream.cpp:
+          Fixed incorrect comment
 
-        * ace/Name_Proxy.cpp:
-        * ace/Name_Request_Reply.cpp:
-        * ace/Time_Request_Reply.cpp
-          Use the ACE_NTOHL macro so that this file compiles without networking
-          support
+Tue Oct 10 12:54:00 UTC 2006  Simon Massey  <sma@prismtech.com>
 
-Wed Dec 27 09:10:27 UTC 2006  Olli Savia  <ops@iki.fi>
+        * ace/config-win32-msvc.h:
+          Changed the MFC build run-time dll decorators to match
+          the current build system settings.
 
-        * ace/Process.cpp:
-          Changed to use ACE_LACKS_VSNPRINTF instead of ACE_HAS_SNPRINTF.
+Tue Oct 10 06:08:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Dec 26 22:47:57 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+        * bin/fuzz.pl:
+          Changed check for empty inline files to also check for empty
+          source files
 
-        * ace/OS_NS_unistd.cpp: Reverted the changes to ACE_OS::argv_to_string()
-          from here:
+        * bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb:
+        * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb:
+          New avoids projects
 
-          Sun Dec 24 22:29:24 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+        * etc/ace.doxygen:
+          Expand some more macros, should improve documentatation
 
-          so that Signal_Test.cpp tests don't break.  In a nutshell, each
-          argv[i] argument to ACE_ARGV is not supposed to be quoted.
-          Thanks to Steve Huston for reporting this.
+        * html/README:
+          Updated download location to ISIS
 
-Tue Dec 26 22:46:34 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+Tue Oct 10 06:03:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/ARGV_Test.cpp (run_main): Updated the test to test how the
-          conversion from char *argv[] to a char * works.
+        * docs/ACE-bug-process.html:
+          Updated to mention svn
 
-Mon Dec 25 16:19:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+        * docs/Download.html:
+          Commented out the source packages that are not complete at this moment
 
-        * Merry Christmas everyone!!!
+Mon Oct 09 09:07:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sun Dec 24 23:13:37 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+        * bin/generate_rel_manpages:
+          Fixed an error in this script and updated the location to which the
+          generated packages should be copied to
 
-        * tests/ARGV_Test.cpp: Updated the test to ensure that Pavel's
-          patches work properly.
+Mon Oct 09 09:03:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sun Dec 24 22:29:24 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+        * docs/Download.html:
+          Updated with the new download locations
 
-        * ace/OS_NS_stdlib.inl,
-        * ace/OS_NS_unistd.cpp: Modified ACE_OS::strenvdup() and
-          ACE_OS::argv_to_string() so they split the arguments containing
-          spaces in accordance with the documentation.  Thanks to Pavel
-          Zaichenko <zpf at ivl dot ua> for these patches.
+        * docs/bczar/bczar.html:
+          Updated documentation generation instructions
 
-Fri Dec 22 17:35:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Oct 05 00:35:37 2006  William R. Otte  wotte@dre.vanderbilt.edu
 
-        * ace/OS_NS_dirent.inl:
+        * ACE version 5.5.3 released.
 
-          Add a __NetBSD__ to the preprocessor conditional to select the
-          three argument version of readdir_r.  While this what was done
-          for FreeBSD, HPUX, etc., it really points out a need for a new
-          feature test macro.
+Tue Oct  3 16:45:35 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-        * ace/config-netbsd.h:
+        * NEWS
+          Updated the NEWS to add the changes for ACE_Hash_MultiMap_Manager
+          class and executionmanager_stub and plan_generator base projects.
 
-          Only define thread-related feature test macros if ACE_MT_SAFE is
-          defined (with a non-zero value).
+Tue Oct  3 15:02:14 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Fri Dec 22 13:56:15 UTC 2006  Steve Huston  <shuston@riverace.com>
+        * NEWS: Described the ACE_Refcounted_Auto_Ptr effects of
+          Thu Jul  6 20:45:15 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * apps/JAWS2/HTTPU/http_heders.cpp:
-        * apps/JAWS2/HTTPU/http_status.cpp: Specify type and class separately
-          for each static member instance to allow HP aC++ 03.* (PA-RISC
-          compiler) to grok it. At least the Itanium compilers could handle
-          this... there's hope.
+Mon Oct  2 12:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Dec 22 12:52:05 UTC 2006  Olli Savia  <ops@iki.fi>
+        * ace/Log_Msg.cpp:
+          Const/bool improvements
 
-        * include/makeinclude/platform_lynxos.GNU:
-          Build shared libs by default.
+Mon Oct  2 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Dec 22 09:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Log_Msg.{h,cpp}:
+          Changed is_set_ conditional values member to bool
 
-        * ace/Service_Manager.h:
-          Improved doxygen documentation, thanks to Stefan Naewe
-          <stefan at naewe dot de> for delivering the patch
+Sat Sep 30 14:00:33 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Thu Dec 21 21:54:51 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+        * tests/Cached_Allocator_Test.cpp:
+        * tests/Codecs_Test.cpp:
+        * tests/Enum_Interfaces_Test.cpp:
+        * tests/Get_Opt_Test.cpp (run_test):
+        * tests/Naming_Test.cpp:
+        * tests/Reactor_Notification_Queue_Test.cpp:
+        * tests/Reference_Counted_Event_Handler_Test.cpp:
+        * tests/Timer_Queue_Reference_Counting_Test.cpp:
+          Correct logging format for wide-char build.
 
-        * ace/config-freebsd.h: Added support for SCTP in FreeBSD version
-          700028 and greater.  Thanks to Craig Rodrigues <rodrigc at
-          crodrigues dot org> for reporting this.
+Fri Sep 29 18:54:29 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Thu Dec 21 20:19:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/OS_NS_signal.inl (sigaction): In the !ACE_HAS_SIGACTION_CONSTP2
+          case, use ACE_SIGACTION instead of "struct sigaction" to pick up
+          the funky HP hack. Also see:
+          Mon Jan 23 22:08:56 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * ace/Sock_Connect.cpp:
-          Use prefix increment and made get_interfaces working with rtems
+Fri Sep 29 10:00:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Web_Crawler/Web_Crawler.mpc:
+          Added avoids+=uses_wchar for borland and bmake, the Borland
+          compiler gives a warning which can't be easily suppressed and
+          by not building this project we do get a few new green builds
+
+Thu Sep 28 19:37:13 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/diff-builds.pl:
+          Fixed the finding of the nearest earlier build for a given date.
+
+Thu Sep 28 16:53:14 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * bin\MakeProjectCreator\config\ciao_executionmanager_stub.mpb
+        * bin\MakeProjectCreator\config\ciao_plan_generator.mpb
+        Added the base projects for executionmanager_stub and plan_generator.
+
+Thu Sep 28 14:46:43 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/diff-builds.pl:
+
+          Updated to fix temporary files creation. Now all those are put
+          in the temporary files directory. Fixed the ability to compare
+          just two dates.
+
+Thu Sep 28 13:35:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-hpux-11.00.h:
+          Removed ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION that
+          was set for gcc, with this define set the ACE library doesn't
+          build.
+
+        * ace/CDR_Stream.cpp:
+          Initialise pointer with 0
+
+        * ace/TP_Reactor.{h,inl}:
+          Changed owner from int to bool.
+
+Wed Sep 27 21:18:04 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Synch_Options.h: Corrected the table of possible Use_Reactor,
+          Timeout combinations - it was reversed.
+
+        * ace/WFMO_Reactor.{h cpp}: Change the delete_signal_handler_,
+          delete_timer_queue_, delete_handler_rep_, delete_notify_handler_,
+          and open_for_business_ members from int to bool to more
+          accurately reflect their nature as yes/no indicators.
+          Also, initialize notify_handler_ to 0 in constructors to avoid
+          a UMR warning from Purify.
+
+Wed Sep 27 06:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/msvc_static_compile.pl:
+          Added protocols directory
+
+Tue Sep 26 09:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/dynamicany.mpb:
+          Derive from valuetype, needed to get AbstractBase::_nil() in a no
+          inline build.
+
+Mon Sep 25 16:29:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/ACE.cpp (send_n_i): Conditionally removed the check for
+          errno == ENOBUFS because Winsock send, or WSASend will try to
+          enqueue all buffer at once (to the kernel) and if not it will
+          return ENOBUFS, in which case the socket is always ready for
+          writing but actually winsock can never perform such write and we
+          have endless loop.  Thanks to Aleksandar Vukajlovic <vukajlo at
+          finsoft dot co dot yu> for reporting this and suggesting a fix.
+
+Mon Sep 25 11:39:35 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * ace/Bound_Ptr.inl:
+        * ace/Bound_Ptr.h:
+
+          Applied workarounds that should fix compile errors on BCB6.
+          Thanks to Martin Corino <mcorino at remedy.nl> for providing
+          the patch.
+
+        * protocols/ace/TMCast/Messaging.hpp:
+        * protocols/ace/TMCast/TransactionController.hpp:
+
+          Updated to use ACE_Strong_Bound_Ptr.
+
+Fri Sep 22 12:42:37 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * docs/index.html: Added a link to the http://www.acejoy.com ACE
+          developers website in China.  Thanks to Winston Zhang <webmaster
+          at acejoy dot com> for creating this website.
+
+Tue Sep 19 12:27:47 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Unload_libACE.cpp: Fixed the formatting of this file so it
+          conformed to ACE guidelines.
+
+Tue Sep 19 02:54:20 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/FILE_Connector.h: Changed the documentation to reflect the fact
+          that mkstemp() is used, not mktemp().
+
+Thu Sep 21 16:51:34 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * ace/TP_Reactor.h:
+        * ace/TP_Reactor.cpp:
+          The TP_Reactor signal handling implementation is
+          incomplete. In the current implementation under certain
+          circumstances (event loop breaks out if interrupted. This is
+          controlled via ACE_Select_Reactor_T::restart()), a properly
+          handled OS signal can break the reactor event loop in
+          an unpredictable manner. This is due to the fact that we cannot
+          predict which thread will receive the OS signal. Untill the
+          TP_Reactor signal handling is fixed, I am commenting it out.
+
+Thu Sep 21 15:13:19 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+          Added new bug 2188 regression test.
+
+Mon Sep 18 10:56:29 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU: Add buildbits=64
+          branch for Sun Studio 11 (Sun C++ 5.8). Thanks to Aleksandar
+          Vukajlovic <vukajlo at finsoft dot co dot yu> for this.
+
+        * THANKS: Added Aleksandar Vukajlovic to the Hall of Fame.
+
+Thu Sep 14 23:01:16 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Bound_Ptr.inl: Tweak syntax to try and work around apparant
+          issues with BCB6.
+
+Thu Sep 14 21:48:39 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_Thread.inl (thr_getspecific): Removed the ACE_Errno_Guard
+          around ::TlsGetValue() in the ACE_HAS_WTHREADS case. The comments
+          near the code said (paraphrasing) "...it was to protect against
+          ACE_Log_Msg::instance() overwriting the error value before it had a
+          chance to be logged; although ACE_ERROR et al already store the
+          error value before calling ACE_Log_Msg::instance(), there may be a
+          chance that other uses of ACE_Log_Msg don't protect this way."
+          I have a report that having the errno guard in place is taking
+          over 10% CPU during a customer system's run-time. This is way too
+          much to have in a hot path, especially for a mis-placed guard.
+          It seems a little random to be picking on ACE_OS::thr_getspecific()
+          when there are many more OS calls in the ACE_Log_Msg::instance()
+          call path.
+          If there are really cases outside of ACE_ERROR... et al, then the
+          guard should be worked into ACE_Log_Msg::instance() method. However,
+          rather than try that now, let's see if there are any real issues,
+          since OS-level calls should be setting errno when errors are
+          noticed, propagating from GetLastError() via
+          ACE_OS::set_errno_to_last_error () as needed.
+          Thanks to Kelly Hickel <kfh at mqsoftware dot com> for raising
+          this point.
+
+Wed Sep 13 18:25:37 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
 
-Thu Dec 21 16:12:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * ace/Bound_Ptr.h:
+        * protocols/ace/RMCast/Reassemble.cpp:
+
+          Re-applied my changes (Wed Sep  6) on build czar's (Steve
+          Huston) request.
+
+Tue Sep 12 18:07:57 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/svn/svn-prefs.reg
+        * docs/svn/config
+
+          Added pdf,eps,ps as binary file types.
+
+Tue Sep 12 13:56:22 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * apps/JAWS3/small/SS_Service_Handler.h: Added #include
+          "ace/svc_export.h".  Thanks to Andy Wang <ypwangandy at gmail
+          dot com> for reporting this.
+
+Tue Sep 12 13:56:09 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * apps/JAWS3/small/SS_State_DONE.h:
+        * apps/JAWS3/small/SS_State_READ.h: Added #include
+          "ace/Synch_Traits.h".  Thanks to Andy Wang <ypwangandy at gmail
+          dot com> for reporting this.
+
+Thu Sep  7 19:43:02 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/FILE_Connector.h (ACE_FILE_Connector): Updated the
+          documentation to remove mention of the return values.  Thanks to
+          Hieu Ngyuen <hieu dot t dot nguyen at vanderbilt dot edu> for
+          reporting this.
+
+Mon Sep 11 13:03:17 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * ace/Bound_Ptr.h:
+        * protocols/ace/RMCast/Reassemble.cpp:
+
+          Reverted my previous changes (Wed Sep  6) since BCB2006
+          is unable to handle the required C++ constructs.
+
+Sun Sep 10 09:23:04 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * include/makeinclude/platform_g++_common.GNU
+
+          Committing a fix provided by Ossama Othman (Ossama_Othman at symantec dot com)
+          to fix a problem with symbol visibility when building static libraries.
+
+Fri Sep  8 21:11:20 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/CDR_Stream.cpp (ACE_OutputCDR::replace()): Fixed compile error
+          from apparant cut/paste error in ACE_ENABLE_SWAP_ON_WRITE path.
+          Thanks to JR Andreassen for reporting this.
+
+        * ace/Bound_Ptr.h: Changed new constructor/assignment to use
+          dynamic_cast in order to be able to transport pointers through
+          that can go both up and down a class hierarchy.
+          (See Wed Sep  6 07:40:03 UTC 2006  Boris Kolpackov
+          <boris@codesynthesis.com>).
+
+        * protocols/ace/RMCast/Protocol.h (clone(), clone_()): Replaced use of
+          naked pointers returned from clone_() with ACE_Strong_Bound_Ptr and
+          used new ACE_Strong_Bound_Ptr ctor to facilitate carrying a more-
+          refined type through a Profile_ptr and back. Closes up a window
+          for exception unsafeness noticed by Boris Kolpackov. Also see
+          Tue Aug 22 22:52:41 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+Fri Sep  8 18:25:17 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Synch_Options.{h cpp}: Improved the documentation for this
+          class, particularly the table that explains the behavior for the
+          valid combinations of reactor-usage and timeout. Thank you to
+          Andriy Gapon <avg at icyb dot net dot ua> for motivating this.
+
+          Also changed the return type of operator[] from int to bool; its
+          meaning was always 1/0 but was overlooked in the sweep for this
+          type of thing last year.
+
+        * NEWS: Added the ACE_Synch_Options::operator[] return type change.
+
+        * THANKS: Added Andriy Gapon to the Hall of Fame.
+
+Wed Sep  6 07:40:03 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * ace/Bound_Ptr.h:
+
+          Added new constructor and assignment operator templates that
+          support the naked pointer-like implicit conversion.
+
+        * protocols/ace/RMCast/Reassemble.cpp:
+
+          Use the new constructor to get rid of reinterpret_cast.
+
+Tue Sep  5 21:28:02 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * bin/MakeProjectCreator/config/ciao_race_component.mpb:
+        * bin/MakeProjectCreator/config/ciao_race_default.mpb:
+        * bin/MakeProjectCreator/config/ciao_race_monitor.mpb: Added new
+          RACE specific base projects.
+
+Fri Sep  1 19:58:06 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+          Turn on nightly regression test for bug 1476.
+
+Fri Sep 1 13:49:12 UTC 2006  Martin Corino <mcorino@remedy.nl>
+
+        * bin/PerlACE/Run_Test.pm:
+          Increased process creation timeout for tests on openVMS.
+
+Thu Aug 31 01:45:06 UTC 2006  Sumant Tambe  <sutambe@nospam>
+
+        Added .xml files to it.
+        * docs/svn/config:
+        * docs/svn/svn-prefs.reg:
+
+Wed Aug 30 17:45:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        This change fixes bug#2648
+
+        * ace/Service_Object.cpp:
+
+          Fixed formatting.
+
+        * ace/Service_Repository.cpp:
+
+          Updated logging.
+
+        * ace/Service_Types.h:
+        * ace/Service_Types.cpp:
+
+          Added ACE_Service_Object_Type::initialized_ member variable to
+          hold the result of calling init() on the ACE_Service_Object. The
+          value is later consulted in ACE_Service_Object_Type::fini() to
+          determine if ACE_Service_Object::fini() should be
+          called. C++NPv2 (page 120) says that fini() must be called if
+          and only if, init() succeeded, i.e. returned 0.
+
+Wed Aug 30 17:18:52 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb
+          Modified this file to fixed the "reference to `ACE_Singleton<CIAO
+          ::Config_Handlers::XML_Helper, ACE_Null_Mutex>::instance()'"warnings
+          with FC5_Static build.
+
+Wed Aug 30 13:34:50 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/make_release
+
+          Updates to the make_release script to make it subversion compatible.
+          major updates to be aware of:
+            . Assumes the working copy it uses is flattened
+            . Must have DOC_ROOT set
+            . Script should be started from DOC_ROOT.
+            . Produces traditional (nested) releases
+            . Now produces a set of source-only kits in addition to
+              the traditional kits.
+
+          IMPORTANT: The release makefiles have not been updated, and are
+          most likely broken.
+
+          Producing a release is a two step process:
+          make_release -u  # Update version numbers
+          make_release -k ace+tao+ciao # Create all kits.
+
+Wed Aug 30 12:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CDR_Stream.{h,cpp}:
+          Use true/false consistently for the good_bit
+
+Wed Aug 30 05:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Service_Config_Test.cpp:
+          Fixed argument not used warnings
+
+Tue Aug 29 21:17:26 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Service_Config_DLL.{h cpp}:
+        * tests/Service_Config_Test.cpp: Added a test for ACE_Service_Config's
+          behavior when a dynamic service's init() hook returns -1 (failure).
+          This was precipitated by Bugzilla #2648.
+
+Tue Aug 29 18:07:39 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc:
+        * tests/SSL/tests.mpc:
+
+          Disable MPC projects in these files that depend on features not
+          found in the "ACE for TAO" subset", i.e. ACE_Profile_Timer and
+          asynch I/O.
+
+Tue Aug 29 13:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/tao_orb_tests.lst:
+          Added bug 2560 regression. It runs fine on windows but seem to
+          crash on linux exhibiting a bug that isn't fixed yet.
+
+Tue Aug 29 13:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixing the condition for running the Transport::Current tests
-          (note that ST = Single Threaded, not STATIC).
+        * bin/PerlACE/ProcessVX.pm:
+          Commented out the ProcessVX_Unix require, it resulted in
+          errors on test systems when they don't have Net::Telnet ()
+          available.
 
-Thu Dec 21 14:31:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Aug 29 11:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
+        * bin/PerlACE/Run_Test.pm:
+        * bin/PerlACE/ProcessVX_Unix.pm:
+        * tests/run_test.pl:
+          Changes for running tests on linux with vxworks 6.3 rtp model target
+
+Tue Aug 29 08:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          Don't run UUIDTest in ACE_FOR_TAO configuration
+
+        * bin/ace-tests.lst:
+          Don't run wfmo reactor tests in ACE_FOR_TAO configuration
+
+Tue Aug 29 00:24:48 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * docs/run_test.txt:
+          Fixed Perl bug in example (needed "" instead of '' to get $ variable
+          expansion) and added explanatory text on using $PerlACE::ACE_ROOT
+          and $PerlACE::TAO_ROOT.
+
+Tue Aug 29 00:26:56 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/SSL/ssl.mpc
+        * ace/SSL/ssl_for_tao.mpc
+        * bin/MakeProjectCreator/config/ssl_full.mpb:
+        * bin/MakeProjectCreator/config/ssl.mpb:
+        * bin/MakeProjectCreator/config/ssl_for_tao.mpb:
+
+          Added support for new ACE_SSL subset "ACE_SSL_FOR_TAO" for
+          "ace_for_tao" configuration.  The ACE_SSL_FOR_TAO subset merely
+          lacks asychronous I/O support.
+
+Tue Aug 29 00:04:29 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/ACE_export.h:
+
+          SGI C++ 7.3 compiler does not support standard C++ "extern
+          inline" declarations.
+
+        * ace/Log_Msg.cpp (log):
+
+          Corrected scalar/vector operator delete() mismatch.  The wide
+          string buffer was allocated as an array.  Destroy it
+          accordingly.
+
+        * ace/MMAP_Memory_Pool.cpp (ACE_MMAP_Memory_Pool):
+
+          Prevent potential dereferencing of null pointer.
+
+        * ace/Svc_Conf_Param.h:
+
+          Corrected author information.
+
+Mon Aug 28 23:59:50 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        From Amnon Berger <AmnonAB at gmail dot com>
+        * ace/SSL/SSL_Context.h (ACE_SSL_Context):
+        * ace/SSL/SSL_Context.cpp (certificate):
+
+          Added support for reading an X.509 certificate from memory
+          instead of a file.
+
+Mon Aug 28 19:33:50 UTC 2006  Sumant Tambe  <sutambe@nospam>
+
+        A quick perl script to create a change-log-entry date and time.
+        * bin/cltime.pl:
+
+        Added *.cidl *.pcd *.cdd
+        * docs/svn/config:
+        * docs/svn/svn-prefs.reg:
+
+Mon Aug 28 14:14:39 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+          Added TAO/orbsvcs/tests/Security/Big_Request/run_test.pl to the
+          list of SSL-based tests. Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for pointig out that it was missing.
+
+Mon Aug 28 13:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Svc_Conf_Lexer.cpp:
+          Fixed variable not used warning when ACE_USES_WCHAR is not
+          defined
+
+        * ace/Min_Max.h:
+          Removed ACE_LACKS_MIN_MAX_TEMPLATES and the code that was
+          there when this define was set, this define wasn't enabled
+          in any configuration file.
+
+Mon Aug 28 11:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taodefaults.mpb:
+          Added exceptions as base project, TAO requires native C++ exceptions.
+
+Mon Aug 28 11:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * protocols/tests/RMCast/RMCast.mpc:
+          Removed avoids usage, that is already in the base projects
+
+Mon Aug 28 11:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/*.doxygen:
+          Set ignore prefix in several files to improve generated
+          documentation
+
+Mon Aug 28 11:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/acexml.doxygen:
+          Ignore ACEXML_ as prefix
+
+Mon Aug 28 10:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/run_test.txt:
+          Updated to explain how the script works on VxWorks and extended
+          the exampl in such a way that if there is not an executable
+          it returns directly
+
+Mon Aug 28 10:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          Added UUIDTest, was just not listed in this file
+
+        * bin/PerlACE/ProcessVX_Unix.pm:
+          New initial file for running tests for VxWorks from an unix host
+
+        * bin/PerlACE/ProcessVX.pm:
+          On unix use the new file above
+
+Mon Aug 28 09:05:20 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * bin/ace_tests.lst:
+
+          Copied test exclusion list from the Multicast_Test entry.
+
+        * protocols/tests/RMCast/Protocol.h:
+        * protocols/tests/RMCast/run_test.pl:
+
+          Adjusted the timeout value and message size.
+
+Sun Aug 27 11:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added twoway DII collocation test
+
+Sun Aug 27 00:03:07 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Filecache.cpp (ACE_Filecache_Object): Added a call to
+
+          this->lock_.release ();
+
+          to release the lock and so the same file can be fetched again.
+          Thanks to Liu Qian <qianliu dot gmail at com> for reporting
+          this.
+
+Sat Aug 26 17:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/ACE-porting.html:
+          ACE_VXWORKS is the define for VxWorks, exceptions are required
+          for TAO.
+
+Sat Aug 26 17:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/ACE-guidelines.html:
+          Updated some parts to mention svn instead of cvs
+
+Sat Aug 26 03:11:01 UTC 2006  Krishnakumar B  <kitty@spam.invalid.domain>
+
+        * docs/svn/svn-prefs.reg:
+        * docs/svn/config:
+
+          Updates to add even more file types.
+
+Sat Aug 26 02:32:18 UTC 2006  Krishnakumar B  <kitty@spam.invalid.domain>
+
+        * docs/svn/svn-prefs.reg:
+        * docs/svn/config:
+
+          Updated these files to add more entries to the list of globally
+          ignored extensions, and also to the list of file types which
+          should have automatic properties set.  Also synced up the config and
+          svn-prefs.reg file.
+
+Fri Aug 25 22:01:38 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Sock_Connect.cpp (get_ip_interfaces, count_interfaces):
+          Corrected to extract IPv6 information correctly from ioctl()-
+          returned structures.
+
+        * tests/Enum_Interfaces_Test.cpp: On error condition ACE_HAS_IPV6 but
+          no ipv6 interfaces, do the log as LM_ERROR so the scoreboard picks
+          it up.
+
+Fri Aug 24 12:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-vxworks6.3.h:
+        * ace/Process.cpp:
+        * ace/Task.cpp:
+          Fixes for building on vxworks 6.3 with diab 5.4 compiler
+
+Fri Aug 24 11:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CDR_Size.cpp:
+          Added include of OS_Memory.h to get ACE_align_binary
+
+Thu Aug 24 21:40:24 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Process_Manual_Event_Test.cpp (acquire_release): Fixed a race
+          condition whereby while a parent and child were ping-ponging, it
+          was possible for one process to signal event1, wait on event2, then
+          signal event1 again before the other process could respond to
+          event1 being signaled and reset it. Thus, event1 was being reset
+          after the other process signaled it, ensuring a never-ending
+          wait at the end of the iterations. I changed the code to quickly
+          reset the event before printing the debug message, thereby closing
+          the window of opportunity a lot. But probably not completely
+          removing it... we'll have to see.
+
+Thu Aug 24 16:40:54 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-aix-4.x.h: Only need to set
+          ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION for g++
+          prior to g++ 4.1 (have only heard report of this for g++ 4.1;
+          it may need adjustment for 4.0). Thanks to Nzer Zaidenberg
+          <scipioenterprises at yahoo dot com> for reporting the original
+          problem and testing this fix.
+
+        * THANKS: Added Nzer Zaidenberg to the Hall of Fame.
+
+Thu Aug 24 16:33:22 UTC 2006  James H. Hill     <hillj@isis.vanderbilt.edu>
+
+        * docs/svn/config:
+        * docs/svn/svn-prefs.reg:
+
+          Added auto-props for *.tex and *.cls files.
+
+Thu Aug 24 13:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-openvms.h
+          Removed ACE_HAS_SOCK_BUF_SIZE_MAX, not needed anymore with the
+          latest OpenVMS versions
+
+Thu Aug 24 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/DLL.h
+        * ace/Service_Repository.h
+        * ace/Service_Object.cpp
+        * ace/Parse_Node.cpp
+        * ace/Service_Object.inl
+        * ace/Parse_Node.h
+        * ace/Service_Repository.cpp
+        * ace/Service_Object.h
+        * ace/Service_Gestalt.h
+        * ace/Service_Gestalt.cpp
+        * ace/DLL_Manager.cpp
+        * ace/DLL.cpp
+          Reverted change from below on request of Iliyan because it broke
+          a set of tests that spawn a thread in init.
+          Tue Aug 22 21:43:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+Wed Aug 23 08:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Sock_Connect.{h,cpp}:
+          Reverted the change below, VxWorks/OpenVMS/AIX all have problems
+          after this change
+
+        Tue Aug 22 15:19:46 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+        * ace/Sock_Connect.h:
         * ace/Sock_Connect.cpp:
-          Added support for get_interfaces for rtems
 
-Thu Dec 21 13:32:08 UTC 2006  Olli Savia  <ops@iki.fi>
+Tue Aug 22 22:52:41 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * include/makeinclude/platform_lynxos.GNU:
-          Moved macro definitions from CFLAGS to CPPFLAGS.
+        * protocols/ace/RMCast/Protocol.h: Replaced use of
+          ACE_Refcounted_Auto_Ptr with ACE_Strong_Bound_Ptr. Code formerly used
+          ACE_Refcounted_Auto_Ptr::release() with the assumption it had the
+          same semantics as auto_ptr::release() - stealing the pointer away.
+          This used to work by accident. The fixed ACE_Refcounted_Auto_Ptr's
+          release() method decrements the reference count which may cause the
+          object to be deleted, which is what happened all the time in the
+          RMCast protocol's clone() methods. Because all the clone() methods
+          relied on being able to take a more-derived pointer and use it as
+          a Profile*, changing the refcounted pointer type necessitated
+          changing the protected clone_() methods to return a naked pointer
+          rather than a refcounted one. This is acceptable because the naked
+          pointer is not exposed to class users; the public methods insert
+          the naked pointer into a ACE_Strong_Bound_Ptr before giving access
+          to it externally.
+
+        * protocols/ace/RMCast/Acknowledge.cpp:
+        * protocols/ace/RMCast/Reassemble.cpp: With properly functioning
+          refcounted pointers (see above) these needed a few changes to
+          make proper use of the pointers while maintaining correct reference
+          counts.
+
+Tue Aug 22 21:43:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          This change fixes bug#2612.
+
+        * ace/DLL.h:
+        * ace/DLL.cpp:
+
+          Made assignment return 'T&' instead of 'const T&'. Adjusted code
+          formatting and logging messages.
+
+        * ace/DLL_Manager.cpp:
+
+          Fixed formatting.
+
+        * ace/Parse_Node.h:
+        * ace/Parse_Node.cpp:
+
+          Added accessor for the underlying ACE_DLL and adjusted logging.
+
+        * ace/Service_Gestalt.h:
+        * ace/Service_Gestalt.cpp:
+
+          Introduced ACE_Service_Type_DLL_Guard class. As dynamic service
+          objects are loaded, static service objects that come with the
+          same DLL code, may also be registered. The static services
+          however, have no information about the context in which their
+          registration takes place and their relation with the DLL is
+          lost. A situation can easily arise where the dynamic service
+          object is finalized and its DLL - unmapped, but some of the
+          DLL's static services may still be around. Their finalization
+          would not be possible, if the DLL counting that code is gone.
+
+          The guard, when instantiated (on the stack) swaps out the
+          current Gestalt and its service repository, and replaces them
+          with a "sandbox" Gestalt, which has lifetime sufficient for just
+          the current service initialization. Note that this mechanism is
+          effective even in the case where a service initialization causes
+          re-entry into the Gestalt to load and initialize another service
+          as part of the initialization.
+
+          If no action is taken (in case of an error, for instance) the
+          guard destructor will simply finalize all newly initialized
+          service(s) from the sandbox. On the other hand, if
+          initialization is successful the service object descriptors are
+          "relocated" to the original Gestalt.
+
+          During the relocation, all static services are "fixed-up" to
+          hold a reference to the DLL they belong to. Effectively, a
+          static service, initialized via loading of a particular DLL,
+          becomes a dynamic service. Thus the order of service
+          finalization does not matter anymore because the DLL will be
+          help in memory until the last service object it provides is
+          finalized.
+
+        * ace/Service_Object.h:
+        * ace/Service_Object.inl:
+        * ace/Service_Object.cpp:
+
+          Added a relocate method to modify the ACE_DLL each SO has.
+
+        * ace/Service_Repository.h:
+        * ace/Service_Repository.cpp:
+
+          Befrended ACE_Service_Type_DLL_Guard. Adjusted logging.
+
+        * tests/Service_Config_Test.cpp:
+
+          Simplified test case.
+
+Tue Aug 22 18:37:48 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * bin/MakeProjectCreator/config/ipv6.mpb:
+
+          Building with IPv6 for WinCE requires an additional library for
+          rtti that is not required for the windows builds.
+
+        * bin/ciao_tests.lst:
+        * bin/tao_orb_tests.lst:
+        * bin/tao_other_tests.lst:
+          Added ACE_FOR_TAO exclusions as necessary
+
+Tue Aug 22 15:19:46 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Sock_Connect.h:
+        * ace/Sock_Connect.cpp:
+
+          Refactored interface discovery code. The methods used to find
+          IPv6 interface addresses is highly platform specific. So much so
+          that the single method was too confusing to maintain. With this
+          patch, the code has been refactored to put each
+          platform-specific variation in its own method, then only compile
+          the method needed by any given platform. I'm not sure this will
+          yield much of a footprint reduction, as all the existing code is
+          still present, it is just easier to keep track of what is going on.
+
+          Also, when IPv6 is enabled, it might be on a platform that is
+          using IPv6 exclusively, ie, with no IPv4 enabled. At least one
+          third-party user of ACE requested a specific test for IPv4
+          enablement status, thus I have added a new method for that test.
+
+        * ace/config-linux.h:
+          Linux supplies the getipaddrs system call.
+
+        * tests/Enum_Interfaces_Test.cpp:
+          Extended the test so that if ACE is built with ACE_HAS_IPV6
+          defined, the test will expect at least one IPv6 endpoint or it
+          will fail.
+
+Tue Aug 22 11:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/UUID.{h,cpp}:
+          Implemented copy constructor
+
+        * tests/UUIDTest.cpp:
+          Test copy constructor
+
+Tue Aug 22 09:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/UUID.{h,inl}:
+          Made the accessors const and reimplemented operator == and
+          operator !=.
+
+        * tests/UUIDTest.cpp:
+          Test the operator != and ==.
+
+Mon Aug 21 20:46:43 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * configure.ac: Modified the check for the net/if.h header file
+          to do a #include <sys/socket.h> if it exists. Allows the compile
+          of net/if.h to succeed, fixing a configure warning for a file that
+          exists but won't compile. Thanks to Don Meek <Don dot Meek at
+          windstream dot com> for reporting this problem.
+
+        * THANKS: Added Don Meek to the Hall of Fame.
+
+Mon Aug 21 20:43:59 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.inl:
+
+          Added the missing implementation of the static process_file ()
+          method. Thanks to Lothar Werzinger <lothar@tradescape.biz> for
+          pointing that out.
+
+Mon Aug 21 20:06:38 Pacific Daylight Time 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        From Russell Mora <russell_mora at symantec dot com>:
+        * ace/Thread_Exit.cpp (instance):
+
+          Fixed race condition in generated code by stopping optimizer
+          from re-ordering static variable initializations by declaring
+          static "instance_" variable as "volatile".  This problem was
+          observed on a quad-CPU Solaris 8 box.
+
+Mon Aug 21 18:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/*.doxygen:
+          In all files except ace.doxygen added SHORT_NAMES=YES to let
+          doxygen generate shorter filenames, this should fix the problems
+          we had during the release with cpio not capable of handling
+          long filenames
 
-Thu Dec 21 12:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Aug 21 17:46:55 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * include/makeinclude/rules.bin.GNU:
-          Removed old chorus rules
+        * ace/Numeric_Limits.h (ACE_Numeric_Limits):
 
-Thu Dec 21 10:17:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          The Microsoft Platform SDK does not provide
+          std::numeric_limits<> specializations for 64 bit integers so we
+          need to explicitly provide ACE_Numeric_Limits<> specializations
+          to compensate for this deficiency.  [Bug 2639]
 
-        * ace/UUID.cpp:
-          Fixed initialisation warning
+          Unfortunately there is no way to tell if the platform SDK is
+          being used so we specialize for the ACE_WIN64 + MSVC++ 7.1 case,
+          which is the configuration that exhibits this problem.  It also
+          happens to be a fairly isolated configuration since 64-bit
+          support in MSVC++ 7.1 was not very good to begin with.
 
-Thu Dec 21 09:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+Mon Aug 21 15:35:26 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/OS_TLI.inl:
-        * ace/OS_NS_signal.h:
+        * ace/Timeprobe_T.cpp (print_times): More fixed for timestamp
+          inversion due to recording time from different threads.  This
+          prints a warning message the first time it detects a timestamp
+          inversion.  It also fixes various minor problems in the
+          timeprobe reports whenever the total number of timeprobes
+          exceeds 8192.  Thanks to Patrick Rabau for contributing this.
 
-          Updated some HPUX Acc version bug fixes.....
+        * ace/INET_Addr.h: Updated the documentation of the non-reentrant
+          versions of get_host_addr() and get_host_name() to clarify how
+          they can be used correctly (or better yet not used at all..).
+          Thanks to Ephy Levy <EphyLevy at gmail dot com> for motivating
+          this.
+
+        * ace/Logging_Strategy.cpp: Added a destructor to delete
+          this->filename_, which is allocated in the constructor.  Thanks
+          to Amnon AB <AmnonAB at gmail dot com> for reporting this.
+
+        * ace/Acceptor.h: Made the suspend()/resume() methods of
+          ACE_Strategy_Acceptor public rather than protected.  Thanks to
+          Amnon AB <AmnonAB at gmail dot com> for reporting this.
+
+        * docs/Symbol_Versioning.html (HREF): Added a link to the Riverace
+          webpage that describes symbol versioning in ACE.  Thanks to
+          Steve Huston for contributing this.
+
+        * ace/Timeprobe_T.cpp (print_times): Revised the code so that if
+          there is a timestamp inversion due to recording time from
+          different threads, the time difference will be displayed as a
+          negative value instead of a gigantic positive value.  Also
+          compute the time difference correctly when the timeprobe array
+          wraps around.  Thanks to Patrick Rabau <pr2345 at gmail dot com>
+          for this fix.
+
+        * ace/Containers_T.cpp,
+        * ace/Log_Msg.cpp,
+        * ace/CDR_Size.cpp,
+        * ace/CDR_Size.inl,
+        * ace/CDR_Stream.cpp: Fixed a bunch of problems with type punning.
+          Thanks to Thomas Girard <thomas.g.girard at free dot fr> for
+          reporting this.
+
+        * ace/TSS_T.cpp (tryacquire): There was a missing '&' in
+
+          ACE_Thread::getspecific (this->key_, temp);
+
+          Thanks to Thomas Girard <thomas.g.girard at free dot fr> for
+          reporting this.
+
+Mon Aug 21 10:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/UUID.{h,cpp,inl}:
+          Extended UUID to make it possible to assign a string to a UUID
+          to set it a new value.
+
+        * tests/UUIDTest.cpp:
+          Extended this test to test the new functionality above.
+
+Mon Aug 21 10:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/UUID.{h,cpp,inl}:
+          Changed node_release_ to a real bool and use ACE_ERROR instead
+          of ACE_DEBUG for a real error message
+
+        * ace/OS_NS_unistd.cpp:
+          Const improvement
+
+Sat Aug 19 22:03:03 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * bin/tao_orb_tests.lst
 
-Thu Dec 21 08:47:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Excluded the DII collocation oneway test from running in the minimum
+          CORBA build.
 
-        * apps/JAWS2/HPPTU/http_headers.{h,inl}:
-          Fixed const warnings with Intel C++
+Fri Aug 18 20:38:35 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Wed Dec 20 22:06:14 UTC 2006  Olli Savia  <ops@iki.fi>
+        * examples/APG/Logging/Trace.h: Further changed use of __VA_ARGS__
+          to remove the comma and the fixed FMT arg from the macros. This
+          may still trigger the same ISO C99 warning, but it doesn't fail.
 
-        * tests/OS_Test.cpp:
-          HP-UX has broken vsnprintf function. Changed the test not
-          to fail on HP-UX.
+Fri Aug 18 17:22:08 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Wed Dec 20 16:35:53 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * ace/OS_NS_unistd.cpp (pwrite): Corrected the large-file-offset
+          logic to build correctly for Windows. Also moved the explicit
+          SetFilePointerEx() before WriteFile() to the non-ACE_HAS_WINNT4
+          section - for ACE_HAS_WINNT4 the supplied OVERLAPPED structure
+          carries the file offset to write at.
 
-          These are fixes correcting scoreboard issues pertaining to the
-          checkin from Tue Dec 19 22:09:34 UTC 2006.
+Fri Aug 18 17:08:35 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * bin/tao_orb_tests.lst
+
+          Added DII collocation oneway test. This is the regression test
+          for bugzilla #2545.
+
+Fri Aug 18 15:49:01 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * examples/APG/Logging/Trace.h: Changed the varargs form used in the
+          macros from ##__VA_ARGS__ to ,__VA_ARGS__ in an effort to conform
+          to C99 and clear some compile warnings from gcc4. This effectively
+          prohibits leaving the varargs out completely from the macro
+          invocation but that use-case isn't exercised anyway.
+
+        * bin/ace_tests.lst: Add protocols/tests/RMCast/run_test.pl to run
+          RMCast tests, except ACE_FOR_TAO builds.
+
+Fri Aug 18 12:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/tao_orb_tests.lst:
+          Don't run Bug_2510_Regression in a ST build, it uses threading
+
+        * bin/MakeProjectCreator/templates/bor.mpd:
+          Don't print a message with the dummy realclean
+
+Thu Aug 17 14:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * apps/drwho/Binary_Search.cpp:
+        * apps/drwho/CM_Client.cpp:
+        * apps/drwho/CM_Server.cpp:
+        * apps/drwho/Hash_Table.cpp:
+        * apps/drwho/Options.cpp:
+        * apps/drwho/Options.h:
+        * apps/drwho/PMC_All.cpp:
+        * apps/drwho/PMC_Flo.cpp:
+        * apps/drwho/PMC_Ruser.cpp:
+        * apps/drwho/PMC_Usr.cpp:
+        * apps/drwho/PMS_All.cpp:
+        * apps/drwho/PMS_Flo.cpp:
+        * apps/drwho/PMS_Ruser.cpp:
+        * apps/drwho/PMS_Usr.cpp:
+        * apps/drwho/Protocol_Manger.cpp:
+        * apps/drwho/Protocol_Record.cpp:
+        * apps/drwho/Rwho_DB_Manager.cpp:
+        * apps/drwho/Search_Struct.cpp:
+        * apps/drwho/Single_Lookup.cpp:
+        * apps/Gateway/Gateway/Gateway.cpp:
+        * apps/Gateway/Gateway/Options.cpp:
+        * apps/Gateway/Gateway/Options.h:
+
+          Renamed the enum ID "DEBUG" to "DEBUGGING", was causing problems
+          with MFC builds.
+
+Thu Aug 17 12:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/SString_Test.cpp:
+          Added a check whether npos is zero, if it is print an error,
+          with Intel C++ 9.0 with the Microsoft platform SDK this seems
+          to be zero
+
+Thu Aug 17 08:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb:
+        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
+        * bin/MakeProjectCreator/config/ciao_events_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb:
+          Removed -Sc form the taoidlflags, it is deprecated already sometime
+          ago
+
+Wed Aug 16 22:19:47 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Acceptor.h: Doxygen improvements.
+
+Wed Aug 16 17:42:02 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Numeric_Limits.h:
+
+          Explicitly #undef min and max before including <limits> in the
+          Mingw case to address global namespace pollution induced
+          conflicts.  The previous attempt to address this problem where
+          the Windows-specific NOMINMAX preprocessor symbol was defined in
+          this header didn't work since the min and max macros were
+          already defined beforehand.  In order for NOMINMAX to work as
+          expected, it would be have to be defined before any Windows
+          headers are included, or more preferrably on the
+          preprocessor/compiler command line.  Unfortunately, that would
+          probably break some applications.
+
+Wed Aug 16 14:51:58 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/svn/svn-prefs.reg
+        * docs/svn/config
+
+          Updated to correct keywords values, and add use-commit-times
+          as a default option.
+
+Wed Aug 16 10:19:41 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Obstack_T.{cpp,inl}:
+          Moved grow_fast and freeze methods from inl to cpp file,
+          should fix the link problems with the RHAS IPv6 build
+
+Wed Aug 16 09:50:41 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Misc/Misc.mpc:
+        * examples/Misc/test_timestamp.cpp:
+          Simple small test for ACE::timestamp()
+
+Wed Aug 16 08:37:41 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/build_lib.bor:
+        * include/makeinclude/clean.bor:
+        * include/makeinclude/compiler.bor:
+          Removed support for the CBuilderX preview compiler, it has never
+          become more then preview and we don't test with it anymore
+
+        * include/makeinclude/recurse.bor:
+          Removed from the repo, seems not to be used anymore
+
+Tue Aug 15 17:47:11 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Numeric_Limits.h:
+
+          Windows defines min/max macros that interfere with the
+          numeric_limits::min/max() traits.  Prevent those macros from
+          being defined by defining the Windows-specific NOMINMAX symbol
+          before any Windows headers are included.  This is currently
+          only done for Mingw builds since the problem is not exhibited by
+          other Windows builds (e.g. MSVC++, Borland, etc).
+
+Tue Aug 15 16:17:56 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * ace/Hash_MultiMap_Manager_T.h
+          Made some minor changes to the documentation to use @a to refer to
+          argument names.
+
+Tue Aug 15 15:00:00 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/Event_Handler.cpp:
+
+          Updated Event_Handler_var to use an ACE_Errno_Guard to
+          prevent overwriting the errno.
+
+        * bin/tao_orb_tests.lst
+
+          Added new test: TAO/tests/Oneway_Timeouts/run_test.pl
+
+Tue Aug 15 14:22:53 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * ace/Hash_MultiMap_Manager_T.h
+          Address the "unsupported xml/html tag" warnings in doxygen build.
+
+Tue Aug 15 08:36:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * bin/MakeProjectCreator/config/acedefaults.mpb
+
+          Backout all of the recent MFC changes.
+
+        * bin/MakeProjectCreator/config/ace_opt_mfc.mpb:
+
+          DELETED.
+
+Mon Aug 14 23:34:11 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ace/TP_Reactor.cpp
+        * ace/TP_Reactor.h
+
+          Removed all register_handler member functions from these files.
+          This essentially enables the ability to register signal handlers in
+          the TP Reactor by implicitly delegating to the select reactor base
+          class.
+
+          Other register_handler methods (not relating to signal handling)
+          were explicit delegations to the select reactor base class, present
+          only to silence virtual function hiding warnings created by
+          disabling the signal related methods.
+
+Mon Aug 14 16:14:56 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * test/Hash_Multi_Map_Manager_Test.cpp
+          Address the "no matching function for call" errors.
+
+        * ace/Hash_MultiMap_Manager_T.h
+          Address the "unsupported xml/html tag" warnings in doxygen build.
+
+Mon Aug 14 16:00:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * bin/MakeProjectCreator/config/ace_mfc.mpb:
+        * bin/MakeProjectCreator/config/ace_opt_mfc.mpb:
 
-          Added the two Transport::Current tests to the scoreboard.
+          Backout the "Specific" guards.
 
-        * bin/MakeProjectCreator/config/tc.mpb:
+Mon Aug 14 15:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
 
-          Moved this file to $TAO_ROOT/MPC/config where it belongs.
+        * bin/MakeProjectCreator/config/ace_mfc.mpb:
+        * bin/MakeProjectCreator/config/ace_opt_mfc.mpb:
 
-Wed Dec 20 12:31:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Specific the macro and don't inherit from mfc for opt.
 
-        * tests/test_config.h:
-          Only define ACE_START_TEST and ACE_END_TEST when they are not
-          defined yet. This way we can set our own define in the config.h
-          file and for example just do logging to stdout instead of a file
-          which can be problematic when the test target doesn't have a
-          file system
+Mon Aug 14 15:43:12 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Wed Dec 20 04:52:04 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+        * tests/Makefile.am: Added Hash_Multi_Map_Manager_Test.
+
+Mon Aug 14 13:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/clean.bor:
+          Use .inl as file extension to clean instead of .i
+
+        * bin/MakeProjectCreator/templates/bor.mpd:
+          Added empty realclean target
+
+Mon Aug 14 12:52:19 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
         * ACE-INSTALL.html:
-        * docs/Download.html:
 
-          Fleshed out SVN instructions a bit more, corrected link mistake in
-          Download.html.
+          I added "-type gnuace" to the options where the default project
+          type was assumed.  Eventually, MPC will not have a default project
+          type.
+
+        * include/makeinclude/macros.GNU:
+        * include/makeinclude/rules.common.GNU:
+        * include/makeinclude/rules.local.GNU:
+
+          Added a new target to remove only the binaries (executables and
+          shared libraries).
+
+Mon Aug 14 11:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/*.h:
+          Added /**/ to the include of config-all.h and ACE_export.h, this
+          way doxygen doesn't add these files to the include graphs which
+          make them much easier to read
+
+Sun Aug 13 23:30:02 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+
+          Excluded TAO POAManagerFactory and EndpointPolicy tests from
+          running in a minimum CORBA configuration.
+
+Sun Aug 13 22:21:55 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * test/Hash_Multi_Map_Manager_Test.cpp
+          Address the "Implicit conversion of string literal to char * is
+          deprecated" warnings.
+
+Sun Aug 13 15:25:17 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * bin/MakeProjectCreator/config/ciaocidldefaults.mpb:
+
+          Removed '--' from the cidlc command line.
+
+Sun Aug 13 000:02:00 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * ace/Hash_MultiMap_Manager_T.inl
+        * ace/Hash_MultiMap_Manager_T.cpp
+        * ace/Hash_MultiMap_Manager_T.h
+          Change the name of these files into Hash_Multi_Map_Manager.*.
+          Add some comments to explain in brief the purpose of using
+          ACE_Hash_Multi_Map_Manager class and how to use it.
+          Remove the backward compatibility of ACE_Hash_Multi_Map_Manager class
+          and its associated iterator classes.
+          Remove "_Ex" on the names of ACE_Hash_Multi_Map_Manager class and its
+          associated iterator classes.
+
+        * ace/Hash_MultiMap_Manager.h
+          Remove this file since it simply includes the
+          Hash_MultiMap_Manager_T.h file.
+
+        * test/Hash_MultiMap_Manager_Test.cpp
+          Change the name of this file into Hash_Multi_Map_Manager_Test.cpp.
+          Address the "convert const char* to ACE_TCHAR*" errors.
+
+        * ace/ace.mpc
+          Change the name of Hash_MultiMap_Manager project into
+          Hash_Multi_Map_Manager.
+
+        * test/run_test.lst
+        * test/tests.mpc
+          Change the name of Hash_MultiMap_Manager_Test project into
+          Hash_Multi_Map_Manager_Test.
+
+Fri Aug 11 16:46:56 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * ace/Hash_MultiMap_Manager.h
+        * ace/Hash_MultiMap_Manager_T.cpp
+        * ace/Hash_MultiMap_Manager_T.h
+        * ace/Hash_MultiMap_Manager_T.inl
+          Add these files which implement Hash_MultiMap_Manager.
+
+        * test/Hash_MultiMap_Manager_Test.cpp
+          Add this test file for Hash_MultiMap_Manager.
+
+        * ace/ace.mpc
+          Modify this file to include Hash_MultiMap_Manager.
+
+        * test/run_test.lst
+        * test/tests.mpc
+          Modify these files to include Hash_MultiMap_Manager_Test.
+
+Fri Aug 11 16:37:34 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/CDR_File_Test.cpp: Corrected a signed/unsigned compare.
+
+Fri Aug 11 13:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CDR_Size.cpp:
+          Add include of OS_Memory.h to get ACE_align_binary
+
+        * ace/Sig_Handler.cpp:
+          Add include of Guard_T.h to get the guards
+
+        * ace/config-vxworks6.3.h:
+          Add some code for the diab compiler but this is not complete
+          support, just some testing results.
+
+Fri Aug 11 07:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/svn/config:
+        * docs/svn/svn-prefs.reg:
+          Added settings for .idl and .pidl
+
+Thu Aug 10 13:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_other_tests.lst:
+          Disabled the performance tests on OpenVMS for the moment, they
+          result in too much error logs
+
+Thu Aug 10 10:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+          Updated for -GX
+
+Thu Aug 10 09:38:13 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * bin/tao_other_tests.lst:
+
+          Exclude Bug_2615_Regression from running on 'ACE for TAO' builds.
+
+Thu Aug 10 01:52:34 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-aix-4.x.h: Added ACE_HAS_TEMPLATE_TYPEDEFS for Visual
+          Age C++ 6 and higher.
+
+Wed Aug  9 14:15:18 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * bin/MakeProjectCreator/config/csd_threadpool.mpb:
+
+          Added a dependency upon threads.mpb as this project shouldn't be
+          built if thread support is not going to be built into TAO.
+
+Wed Aug  9 13:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * bin/MakeProjectCreator/config/acedefaults.mpb
+
+          Typo, Remove the + character that came with the patch file.
+
+Wed Aug  9 12:17:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * bin/MakeProjectCreator/config/ace_opt_mfc.mpb
+        * bin/MakeProjectCreator/config/acedefaults.mpb
+
+          Chad's new fix for MPC building MFC projects.
+
+Tue Aug  8 14:00:06 UTC 2006  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * Merged in all the changes from the fix_bug_2540 branch, that is,
+          from revision 73857 to revision 73859.
+
+        Thu Aug  3 21:49:27 UTC 2006  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * ace/TP_Reactor.cpp:
+        * ace/Select_Reactor_T.cpp:
+          Avoid the problems described in bug 2540 by detecting the
+          infinite loop and recomputing the number of active handlers.
+          Thanks to Jody Hagins for correcting my original "fix."
+
+Tue Aug  8 14:05:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * bin/MakeProjectCreator/config/ace_mfc.mpb
+        * bin/MakeProjectCreator/config/acedefaults.mpb
+
+          Reverted Chad's fix for MPC building MFC projects.
+          It seems that this causes non MFC builds to build as MFC
+          breaking the scoreboard.
+
+Tue Aug  8 09:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Thanks to Craig Rodrigues <rodrigc at crodrigues dot org> for the patch.
+        * ACE.mwc:
+          Removed several directories which aren't existing anymore
 
-Tue Dec 19 22:09:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Tue Aug  8 09:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/tc.mpb:
+        * ACE-INSTALL.html:
+          Removed some parts of the VxWorks building instructions because
+          it was really wrong what was said
+
+Tue Aug  8 09:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * ace/OS_Memory.h
+        * ace/config-win32-msvc.h
+        * bin/MakeProjectCreator/config/ace_mfc.mpb
+        * bin/MakeProjectCreator/config/acedefaults.mpb
+
+          Chad's fix for MPC building MFC projects. Correction for
+          Thu Apr 27 21:04:08 UTC 2006  Steve Huston  <shuston@riverace.com>
+          throw CMemoryException on out-of-memory condition. These
+          exceptions must be caught by pointer and thrown via calling
+          AfxThrowMemoryException ().
+
+Tue Aug  8 08:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Select_Reactor_Base.cpp:
+        * ace/Select_Reactor_T.cpp:
+          Const improvements, use bool when possible
+
+Tue Aug  8 07:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_rel_manpages:
+        * bin/make_release:
+          Did a little bit of cleanup removing old things
+
+Tue Aug  8 07:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Select_Reactor_T.cpp (dump):
+          Removed usage of not needed operator++ on the handle set
+
+Mon Aug  7 08:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Handle_Set.{h,cpp}:
+          Removed operator++, it is deprecated and nothing more then a noop
+
+Fri Aug  4 07:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Asynch_IO.h:
+        * ace/Event_Handler.h:
+        * ace/Framework_Component_T.h:
+        * ace/Hash_Map_Manager_T.h:
+        * ace/IO_SAP.h:
+        * ace/Local_Tokens.h:
+        * ace/LSOCK_Connector.h:
+        * ace/Map_Manager.h:
+        * ace/Map_T.h:
+        * ace/WFM_Reactor.h:
+          Doxygen improvements
+
+Thu Aug  3 10:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Connector.h:
+          Improved documentation
+
+Wed Aug  2 22:54:24 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * THANKS: Added Eric Danielou to the hall of fame.
+
+Wed Aug  2 21:27:59 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/PerlACE/Run_Test.pm:
+
+          Added two new packaged-scoped variables, $PerlACE::ACE_ROOT and
+          $PerlACE::TAO_ROOT.  $PerlACE::TAO_ROOT is set to the TAO_ROOT
+          environment variable, if one exists.  If not it is set to
+          $ACE_ROOT/TAO.  $PerlACE::ACE_ROOT is the same as the ACE_ROOT
+          envrionment variable so it's just there for convenience and for
+          symmetry.
+
+Wed Aug  2 20:19:04 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+          Added new test (TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression).
+
+Wed Aug  2 18:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Connector.cpp:
+          Const improvements
+
+        * ace/Caching_Utility_T.h:
+        * ace/config-lite.h:
+        * ace/Event_Handler.h:
+        * ace/Framework_Component.h:
+        * ace/Lock.h:
+        * ace/Lock_Adapter_T.h:
+        * ace/Null_Mutex.h:
+        * ace/Object_Manager.h:
+        * ace/Object_Manager_Base.h:
+        * ace/Proactor.cpp:
+        * ace/Process_Manager.h:
+        * ace/Semaphore.h:
+        * ace/Thread_Exit.h:
+          Doxygen improvements
+
+Wed Aug  2 15:50:48 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * bin/tao_other_tests.lst:
+
+          Schedule bugzilla #2615 regression test.
+
+Wed Aug  2 14:55:45 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ACE-INSTALL.html:
+
+          Updated the location of the MPC documentation.  It was moved from
+          the MPC root directory to a docs directory.
+
+        * bin/ChangeLogEditor/CVSFileLocator.pm:
+        * bin/ChangeLogEditor/ChangeLogEdit.pm:
+        * bin/ChangeLogEditor/ChangeLogEntry.pm:
+        * bin/ChangeLogEditor/FileLocator.pm:
+        * bin/ChangeLogEditor/SVNFileLocator.pm:
+        * bin/cle.pl:
 
-          Added a new project type for projects using the Transport
-          Current functionality.
+          Added better support for subversion and it now reports errors from
+          cvs/svn.
 
-Tue Dec 19 20:05:42 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+        * bin/MakeProjectCreator/README:
+
+          Updated to provide information on anonymously checking out MPC
+          using Subversion.
+
+        * bin/make_release:
+
+          I added "-type gnuace" to the options where the default project
+          type was assumed.  Eventually, MPC will not have a default project
+          type.
+
+Wed Aug  2 13:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/ACE-development-process.html:
+          Document the fact that people should test on at least two
+          platforms and should be available for some days after they
+          commit a change.
+
+Wed Aug  2 11:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * docs/Download.html:
-          Added link to SVN documentation.
+          Also put the download page from deuce.doc under svn control
+          so that we can update it for the svn conversion
 
-Tue Dec 19 14:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Aug  2 11:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * include/makeinclude/platform_rtems.x_g++.GNU:
-          Set load address
+        * docs/bczar/bczar.html:
+        * docs/bczar/privileges.html:
+          Added documents that where on deuce.doc, the documentation
+          for the bczar how to create a release should really be handled
+          with care, so put them under svn control
+
+Tue Aug  1 20:23:50 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/config-macosx-tiger.h:
+          Added preliminary support for Mac OS X 10.4 on Intel CPU's.
+
+Tue Aug  1 20:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-vxworks6.3.h:
+          Enabled some features in ACE because vxworks 6.3 delivers more system
+          api's
+
+Mon Jul 31 19:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_stropts.inl (ioctl):
+          Check for ACE_HAS_IOCTL_INT_3_PARAM to make it easier to handle
+          the different VxWorks versions
+
+        * config-vxworks5.x.h:
+        * config-vxworks6.2.h:
+        * config-vxworks6.3.h:
+          Added ACE_HAS_IOCTL_INT_3_PARAM
+
+Mon Jul 31 18:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Containers_T.{h,cpp}:
+        * Hash_Map_Manager_T.{h,cpp}:
+        * Map_Manager.{h,inl}:
+        * Node.{h,cpp}:
+          Removed check for !ACE_HAS_BROKEN_NOOP_DTORS, this define is
+          not in any config file
+
+        * config-unixware-7.1.0.udk.h:
+          Removed commented out define
+
+        * Token_Collection.{h,cpp}:
+        * Token_Manager.{h,inl}:
+          Changed debug flag to be a bool
+
+        * SOCK_Dgram_Bcast.h
+        * TP_Reactor.h
+        * Signal.h
+        * Thread.h
+        * Thread_Adapter.h
+          Documentation updates
+
+Mon Jul 31 14:57:08 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * apps/Makefile.am: Removed hard-coded inclusion of gperf in the
+          SUBDIRS list; it's an optional piece; see also
+          Tue Jun 20 20:19:37 UTC 2006  Steve Huston  <shuston@riverace.com>
+          Thanks to Robert Schwebel <robert at schwebel dot de> for this fix.
+
+Mon Jul 31 14:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/*.doxygen:
+          Cleanup of these files
+
+Sat Jul 29 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-icc-common.h:
+          Added fix for Intel C++ 9.1
+
+Fri Jul 28 15:32:27 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ace/SSL/Makefile.am
+        * ace/QoS/Makefile.am
+        * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
+        * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
+        * Kokyu/Makefile.am
+        * apps/JAWS/clients/Caching/Makefile.am
+        * ACEXML/apps/svcconf/Makefile.am
+        * ACEXML/common/Makefile.am
+        * ACEXML/parser/parser/Makefile.am
+        * ACEXML/examples/SAXPrint/Makefile.am
+        * websvcs/lib/Makefile.am
+        * examples/ASX/Event_Server/Event_Server/Makefile.am
+        * examples/ASX/UPIPE_Event_Server/Makefile.am
+        * examples/Service_Configurator/IPC-tests/server/Makefile.am
+
+        Updated to comply with the .i->.inl changes from:
+        Thu Jul 27 20:30:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+Fri Jul 28 12:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Kokyu/DSRT_Dispatch_Item_T.inl:
+        * ACEXML/parser/parser/Parser.inl:
+          Fixed file tag
+
+Thu Jul 27 20:30:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ace/SSL/SSL_SOCK_Connector.h
+        * ace/SSL/SSL_SOCK_Acceptor.inl
+        * ace/SSL/SSL_SOCK_Acceptor.cpp
+        * ace/SSL/SSL_SOCK_Connector.i
+        * ace/SSL/SSL_SOCK_Stream.h
+        * ace/SSL/SSL_SOCK_Stream.i
+        * ace/SSL/SSL_SOCK_Acceptor.h
+        * ace/SSL/SSL_SOCK_Acceptor.i
+        * ace/SSL/SSL_SOCK.cpp
+        * ace/SSL/SSL_SOCK.inl
+        * ace/SSL/SSL_SOCK.h
+        * ace/SSL/SSL_SOCK.i
+        * ace/SSL/SSL_SOCK_Connector.cpp
+        * ace/SSL/SSL_SOCK_Connector.inl
+        * ace/SSL/SSL_SOCK_Stream.cpp
+        * ace/SSL/SSL_SOCK_Stream.inl
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.inl
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+        * ace/QoS/QoS_Session_Impl.cpp
+        * ace/QoS/QoS_Session_Impl.inl
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.h
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.i
+        * ace/QoS/QoS_Session_Impl.h
+        * ace/QoS/QoS_Session_Impl.i
+        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.inl
+        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
+        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i
+        * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.inl
+        * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
+        * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.i
+        * Kokyu/Kokyu_dsrt.cpp
+        * Kokyu/Kokyu_dsrt.inl
+        * Kokyu/Kokyu.cpp
+        * Kokyu/Kokyu.inl
+        * Kokyu/Kokyu_defs.h
+        * Kokyu/Kokyu_defs.i
+        * Kokyu/Dispatcher_Impl.h
+        * Kokyu/Dispatcher_Impl.i
+        * Kokyu/Default_Dispatcher_Impl.h
+        * Kokyu/Default_Dispatcher_Impl.i
+        * Kokyu/Dispatch_Deferrer.h
+        * Kokyu/Dispatch_Deferrer.i
+        * Kokyu/DSRT_Dispatcher_Impl_T.h
+        * Kokyu/DSRT_Dispatcher_Impl_T.i
+        * Kokyu/DSRT_Dispatch_Item_T.h
+        * Kokyu/DSRT_Dispatch_Item_T.i
+        * Kokyu/Kokyu_dsrt.h
+        * Kokyu/Kokyu_defs.cpp
+        * Kokyu/Kokyu_defs.inl
+        * Kokyu/Kokyu_dsrt.i
+        * Kokyu/Kokyu.h
+        * Kokyu/Dispatcher_Impl.cpp
+        * Kokyu/Dispatcher_Impl.inl
+        * Kokyu/Kokyu.i
+        * Kokyu/Default_Dispatcher_Impl.cpp
+        * Kokyu/Default_Dispatcher_Impl.inl
+        * Kokyu/Dispatch_Deferrer.cpp
+        * Kokyu/Dispatch_Deferrer.inl
+        * Kokyu/DSRT_Dispatcher_Impl_T.cpp
+        * Kokyu/DSRT_Dispatcher_Impl_T.inl
+        * Kokyu/DSRT_Dispatch_Item_T.cpp
+        * Kokyu/DSRT_Dispatch_Item_T.inl
+        * apps/JAWS/clients/Caching/Local_Locator.inl
+        * apps/JAWS/clients/Caching/Local_Locator.cpp
+        * apps/JAWS/clients/Caching/URL_Properties.inl
+        * apps/JAWS/clients/Caching/URL_Properties.cpp
+        * apps/JAWS/clients/Caching/Local_Locator.h
+        * apps/JAWS/clients/Caching/Local_Locator.i
+        * apps/JAWS/clients/Caching/URL_Properties.h
+        * apps/JAWS/clients/Caching/URL_Properties.i
+        * apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
+        * apps/JAWS/clients/Caching/Locator_Request_Reply.inl
+        * apps/JAWS/clients/Caching/Locator_Request_Reply.h
+        * apps/JAWS/clients/Caching/Locator_Request_Reply.i
+        * apps/JAWS2/HTTPU/http_response.h
+        * apps/JAWS2/HTTPU/http_response.i
+        * apps/JAWS2/HTTPU/http_base.inl
+        * apps/JAWS2/HTTPU/http_base.cpp
+        * apps/JAWS2/HTTPU/http_headers.h
+        * apps/JAWS2/HTTPU/http_headers.i
+        * apps/JAWS2/HTTPU/http_status.inl
+        * apps/JAWS2/HTTPU/http_status.cpp
+        * apps/JAWS2/HTTPU/parse_http_request.h
+        * apps/JAWS2/HTTPU/http_request.inl
+        * apps/JAWS2/HTTPU/parse_http_request.i
+        * apps/JAWS2/HTTPU/http_request.cpp
+        * apps/JAWS2/HTTPU/parse_http_response.h
+        * apps/JAWS2/HTTPU/http_response.cpp
+        * apps/JAWS2/HTTPU/parse_http_response.i
+        * apps/JAWS2/HTTPU/http_response.inl
+        * apps/JAWS2/HTTPU/http_headers.inl
+        * apps/JAWS2/HTTPU/http_headers.cpp
+        * apps/JAWS2/HTTPU/http_base.h
+        * apps/JAWS2/HTTPU/http_base.i
+        * apps/JAWS2/HTTPU/parse_http_request.inl
+        * apps/JAWS2/HTTPU/parse_http_request.cpp
+        * apps/JAWS2/HTTPU/http_status.h
+        * apps/JAWS2/HTTPU/parse_http_response.cpp
+        * apps/JAWS2/HTTPU/parse_http_response.inl
+        * apps/JAWS2/HTTPU/http_status.i
+        * apps/JAWS2/HTTPU/http_request.h
+        * apps/JAWS2/HTTPU/http_request.i
+        * ACEXML/apps/svcconf/Svcconf_Handler.cpp
+        * ACEXML/apps/svcconf/Svcconf_Handler.inl
+        * ACEXML/apps/svcconf/Svcconf_Handler.h
+        * ACEXML/apps/svcconf/Svcconf_Handler.i
+        * ACEXML/common/AttributesImpl.cpp
+        * ACEXML/common/LocatorImpl.cpp
+        * ACEXML/common/Env.cpp
+        * ACEXML/common/Exception.cpp
+        * ACEXML/common/SAXExceptions.h
+        * ACEXML/common/SAXExceptions.i
+        * ACEXML/common/AttributesImpl.h
+        * ACEXML/common/AttributesImpl.i
+        * ACEXML/common/XMLFilterImpl.cpp
+        * ACEXML/common/Env.h
+        * ACEXML/common/SAXExceptions.cpp
+        * ACEXML/common/Env.i
+        * ACEXML/common/Exception.h
+        * ACEXML/common/Exception.i
+        * ACEXML/common/AttributesImpl.inl
+        * ACEXML/common/LocatorImpl.inl
+        * ACEXML/common/Env.inl
+        * ACEXML/common/XMLFilterImpl.h
+        * ACEXML/common/XMLFilterImpl.i
+        * ACEXML/common/Exception.inl
+        * ACEXML/common/XMLFilterImpl.inl
+        * ACEXML/common/LocatorImpl.h
+        * ACEXML/common/LocatorImpl.i
+        * ACEXML/common/SAXExceptions.inl
+        * ACEXML/parser/debug_validator/Element_Tree.i
+        * ACEXML/parser/debug_validator/Element_Tree.cpp
+        * ACEXML/parser/debug_validator/Element_Tree.inl
+        * ACEXML/parser/debug_validator/Element_Tree.h
+        * ACEXML/parser/parser/Parser.h
+        * ACEXML/parser/parser/Parser.i
+        * ACEXML/parser/parser/Entity_Manager.cpp
+        * ACEXML/parser/parser/Entity_Manager.inl
+        * ACEXML/parser/parser/Entity_Manager.h
+        * ACEXML/parser/parser/Entity_Manager.i
+        * ACEXML/parser/parser/Parser.cpp
+        * ACEXML/parser/parser/Parser.inl
+        * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp
+        * ACEXML/examples/SAXPrint/SAXPrint_Handler.inl
+        * ACEXML/examples/SAXPrint/SAXPrint_Handler.h
+        * ACEXML/examples/SAXPrint/SAXPrint_Handler.i
+        * websvcs/lib/URL_Addr.h
+        * websvcs/lib/URL_Addr.i
+        * websvcs/lib/URL_Addr.cpp
+        * websvcs/lib/URL_Addr.inl
+        * examples/ASX/Event_Server/Event_Server/Options.h
+        * examples/ASX/Event_Server/Event_Server/Options.i
+        * examples/ASX/Event_Server/Event_Server/Options.inl
+        * examples/ASX/UPIPE_Event_Server/Options.h
+        * examples/ASX/UPIPE_Event_Server/Options.i
+        * examples/ASX/UPIPE_Event_Server/Options.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
+        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.cpp
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.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_Broadcast.h
+        * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.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_R_Stream.h
+        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp
+        * 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_L_FIFO.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
+        * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
+        * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
+        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
+
+          Moved the .i file to .inl (with history), changed the includes in the
+          .cpp and .h files to match, removed the .i file.
+
+Thu Jul 27 18:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+          Some more updates to refer to the subversion archive
+
+Thu Jul 27 13:57:31 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/svn/config
+
+          Fixed syntax errors.  thanks to Adam Mitz for reporting them.
+
+Thu Jul 27 10:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Committing some small changes I had pending to see how svn behaves now
+        with updates and status info on the build systems.
+
+        * ace/Recursive_Thread_Mutex.{h,cpp}:
+          Changed removed_ to a bool
+
+        * ace/Thread_Mutex.{h,cpp,inl}:
+          Changed removed_ to a bool and removed ACE_USES_OBSOLETE_GUARD_CLASSES
+          support.
+
+Thu Jul 27 07:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/tao.doxygen:
+        * etc/tao_portableserver.doxygen:
+          Set ignore prefix
+
+        * Kokyu/Dispatcher_Task.i
+        * Kokyu/Dispatcher_Task.inl
+          Renamed .i to .inl so that we can have a look how subversion stores
+          this in the history
+
+        * Kokyu/Dispatcher_Task.cpp
+        * Kokyu/Dispatcher_Task.h
+        * Kokyu/Makefile.am
+          Updated for the change above.
+
+Wed Jul 26 07:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/sets-manager.py:
+          Fixed typo
+
+Wed Jul 26 07:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+        * html/Stats/index.shtml:
+        * docs/ACE-bug-process.html:
+          Updated documentation to point to the new svn repository
+
+Tue Jul 25 21:51:07 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/PythonACE/fuzz/max_project_len.py
+        * bin/PythonACE/fuzz/inline.py
+
+          Fixed errors in these checks.
+
+Tue Jul 25 20:52:51 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/PythonACE/fuzz/cpp_inline.py
+
+          Fixed this check, it was incorrectly matching ACE_INLINES inside
+          defines and comments.
+
+Tue Jul 25 20:16:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/svn/svn-prefs.reg
+        * docs/svn/config
+
+          Updated to add global-ignores to mimic .cvsignore functionality.
+
+Tue Jul 25 19:40:54 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/PythonACE/__init__.py
+
+          This enables PythonACE to be loaded as a module.
+
+        * bin/PythonACE/fuzz/check_includes.py
+        * bin/PythonACE/fuzz/no_conflict_markers.py
+
+          Fixed these checks, they were incorrectly flagging errors.
+
+        * bin/fuzz.py
+
+          Command line fuzz client that uses the PythonACE fuzz module.
+
+        * bin/sets-manager.py
+
+          Corrected this file to point at DOC/Middleware instead of ACE/Middleware.
+
+Mon Jul 24 23:58:33 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/svn/svn-prefs.reg
+        * docs/svn/config
+
+          Updated these files to add svn:keywords to most text types.
+
+Mon Jul 24 23:53:53 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/create_ace_build.pl
+
+          Fix provided by Steve Huston to prevent this script from building
+          links from .svn directories.
+
+Mon Jul 24 19:17:37 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/fuzz.pl
+
+          Disabled the ID string check until the script can be fixed to ignore
+          .svn directories.
+
+Mon Jul 24 15:45:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Subversion conversion completed at revision 73730
+
+Sun Jul 23 15:44:43 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Repository frozen for repository conversion
+
+Sun Jul 23 11:17:31 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/make_release:
+          Don't exclude the other mwc files for vc71/vc8, this will create then
+          some more workspace files which just contain a subset of the projects
+
+Sun Jul 23 09:25:12 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * NEWS:
+          Added a note about TTY_IO API change.
+
+Sat Jul 22 19:12:10 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/svn/config
+        * docs/svn/svn-prefs.reg
+
+          These are client side configuration files for Subversion. Currently,
+          the automate setting svn:eol-style and svn:executable properties on
+          newly added files.
+
+Sat Jul 22 18:28:33 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/sets-manager.py
+
+          First cut of a branching script for subverion.  Pass --help
+          to get documentation.
+
+Fri Jul 21 13:28:31 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+          Updated because of -oS addition to tao_idl
+
+Fri Jul 21 13:17:31 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_unistd.cpp:
+          Const improvements and initialise pointer with 0
+
+Thu Jul 20 21:44:31 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/Service_Config_Test.cpp:
+
+          In testLimits (), surrounded string literals with ACE_TEXT to
+          fix a build error on wchar builds.
+
+Thu Jul 20 16:42:04 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Basic_Types.h:
+
+          Removed ACE_NTOHLL function.  It was experimental, untested and
+          not ready for the ACE sources just yet.
+
+          Removed "ace/os_include/netinet/os_in.h" include directive.  Now
+          that ACE_NTOHLL has been removed it is no longer necessary.
+
+        * ace/Numeric_Limits.h:
+
+          Commented out "{unsigned} long long" specializations in the
+          ACE_LACKS_NUMERIC_LIMITS case.  They're currently not used, and
+          we need
+
+Thu Jul 20 15:19:30 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Basic_Types.h: Added
+
+          # include "ace/os_include/netinet/os_in.h" // Get ntohl()
+
+          and added the inline keyword to ACE_NTOHLL() to fix the problems
+          introduced with
+
+          Wed Jul 19 22:46:51 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+Thu Jul 20 15:01:32 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Configuration.cpp: Made
+          ACE_Configuration_ExtId::operator==() and
+          ACE_Configuration_ExtId::operator!=() case insensitive.  Thanks
+          to Domingos Monteiro <d dot monteiro at netia dot net> for this
+          contribution.
+
+Thu Jul 20 09:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/tao_no_iiop.mpb:
+          New feature to disable iiop in TAO
+
+        * bin/MakeProjectCreator/config/global.features:
+          Set tao_no_iiop to 0 by default
+
+Thu Jul 20 09:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_Thread.h:
+          Doxygen improvements
+
+Thu Jul 20 08:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Mutex.{h,cpp,inl}:
+          Made the removed_ member a bool instead of an int
+
+Thu Jul 20 08:37:17 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * ace/TTY_IO.cpp:
+          Fixed compile error on VxWorks. Thanks to Johnny for pointing
+          out the problem.
+
+Wed Jul 19 23:39:05 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/PythonACE/fuzz/__init__.py
+        * bin/PythonACE/fuzz/_generic_handler.py
+        * bin/PythonACE/fuzz/_mailer.py
+        * bin/PythonACE/fuzz/_singleton.py
+        * bin/PythonACE/fuzz/_warning_handler.py
+        * bin/PythonACE/fuzz/streams_include.py
+
+          Changes necessary to support mailing (non-fatal) Fuzz errors to
+          the user that attempts a commit.  streams_include is an example
+          of a fuzz check that sends warnings instead of stopping commits.
 
-Tue Dec 19 14:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jul 19 22:46:51 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * ace/Object_Manager_Base.cpp (print_error_message):
-          Fixed invalid filename
+        * ace/Basic_Types.h (ACE_INT64, ACE_UINT64):
 
-Tue Dec 19 13:16:38 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+          Silence g++ "-pedantic" warnings regarding use of "long long"
+          type by preceding the typedef with the g++ __extension__
+          keyword.
 
-        * ace/Log_Msg_NT_Event_Log.cpp (log): Changed the loop iterator to
-          be size_t rather than long to silence a warning about comparing
-          signed and unsigned values.  Thanks to Johnny for reporting
+Wed Jul 19 21:15:51 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * NEWS:
+
+          Updated the file with a note announcing the interface change
+          from "Wed Jul 19 20:11:52 UTC 2006".
+
+Wed Jul 19 20:11:52 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/ACE.h:
+        * ace/ACE.cpp:
+
+          Changing ACE::debug () to use boolean instead of char.
+
+        * ace/Acceptor.cpp:
+        * ace/DLL_Manager.cpp:
+        * ace/Dynamic_Service_Dependency.cpp:
+        * ace/SOCK_Dgram_Bcast.cpp:
+        * ace/Service_Gestalt.cpp:
+        * ace/Service_Object.cpp:
+        * ace/Service_Repository.cpp:
+        * ace/Service_Types.cpp:
+
+          Updating places where ACE::debug() return value is interpreted
+          as a integral type.
+
+        * tests/Service_Config_Test.cpp:
+
+          Fixing the test to correctly account for XML-based service
+          configurations.
+
+Wed Jul 19 15:53:09 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/PythonACE/fuzz/__init__.py
+        * bin/PythonACE/fuzz/_fuzz.py
+        * bin/PythonACE/fuzz/_generic_handler.py
+        * bin/PythonACE/fuzz/_path.py
+        * bin/PythonACE/fuzz/_types.py
+        * bin/PythonACE/fuzz/check_includes.py
+        * bin/PythonACE/fuzz/cpp_inline.py
+        * bin/PythonACE/fuzz/inline.py
+        * bin/PythonACE/fuzz/math_include.py
+        * bin/PythonACE/fuzz/max_filename.py
+        * bin/PythonACE/fuzz/max_project_len.py
+        * bin/PythonACE/fuzz/newline.py
+        * bin/PythonACE/fuzz/no_conflict_markers.py
+        * bin/PythonACE/fuzz/noncvs.py
+        * bin/PythonACE/fuzz/ptr_arith_t.py
+        * bin/PythonACE/fuzz/refcountservantbase.py
+        * bin/PythonACE/fuzz/verify_changelog.py
+
+          This is a python module designed to eventually replace the
+          bin/fuzz.pl script.  Each .py file in the fuzz directory that
+          does not have a _ at the beginning of its filename contains a
+          single check.  New fuzz checks can be added to the system simply
+          by creating a new file in the fuzz directory.  Care should be
+          taken to select a filename that does not conflict with an
+          existing python module.
+
+          ptr_arith_t.py and inline.py are good examples that use the
+          generic handler to implement their checks, max_project_len is a
+          good example of a check that does not use the generic handler.
+
+Wed Jul 19 15:07:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/DLL_Manager.cpp:
+
+          Fixing a build problem on HP and Windows, as a consequence of my
+          earlier change: "Tue Jul 18 19:17:54 UTC 2006". Moral: use
+          ACE_TEXT around literal expressions only.
+
+Wed Jul 19 13:55:39 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * examples/IPC_SAP/DEV_SAP/reader/reader.cpp:
+        * examples/IPC_SAP/DEV_SAP/writer/writer.cpp:
+          Updated to reflect changes below.
+
+Wed Jul 19 13:39:13 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * ace/TTY_IO.h:
+          Changed type of rtsenb from 'int' to 'unsigned char'.
+          Updated documentation to note that 'parityenb' member is
+          now deprecated.
+
+        * ace/TTY_IO.cpp:
+          Changed constructor of Serial_Params class to assign sensible
+          values to class members.
+
+Wed Jul 19 10:47:31 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Proactor_Timer_Test.cpp: Corrected compile warning re static.
+
+Wed Jul 19 08:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb:
+          Use exceptions as base project
+
+Wed Jul 19 7:14:10 UTC 2006  Ossama Othman  <ossama_othman@symantec.com>
+
+        * ace/String_Base.h (size_type):
+
+          Explicitly bring the ACE_String_Base_Const::size_type typedef
+          into the ACE_String_Base<> scope through a "using" declaration.
+          IBM Visual Age 6 and Sun Studio 10 have difficulty resolving the
+          name otherwise.
+
+        * ace/SString.cpp:
+
+          Replaced std::numeric_limits<>::max() call that was
+          inadvertently introduced with its ACE_Numeric_Limits<>
+          counterpart.  The former is not available on VxWorks.
+
+Tue Jul 18 22:52:38 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Message_Queue_Test_Ex.cpp: Rearranged the pieces left out of
+          single-threaded builds; should correct single-threaded builds.
+
+Tue Jul 18 20:50:49 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * Happy Birthday to me!!
+
+Tue Jul 18 19:17:54 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          This change is in response to bug#2602, which was reported by
+          Lothar Werzinger <lothar at tradescape dot biz>. It fixes a
+          problem with trying to use XML as the service configuration file
+          format.  The change also includes additional comments and
+          in-line documentation on the new ability to use local service
+          repositories.
+
+        * ace/DLL_Manager.cpp:
+
+          Updated the debugging output of DLL_Handle::open() to be able to
+          see _why_ a DLL open failed.  For example, the errno message is
+          'not found' in a case where one tries to open library A, which
+          in turn depends on library B, but B is missing.  This change
+          allows one to see the underlying cause for the error
+          (via DLL_Handle::error(), if ACE_DEBUG=2, or greater is
+          present).
+
+        * ace/Parse_Node.h:
+        * ace/Parse_Node.cpp:
+
+          Moving the ACE_Service_Type_Factory here, from
+          Service_Config.{h,cpp} This class is only needed when
+          ACE_USES_CLASSIC_SVC_CONF is 1, i.e. when ACE is using the
+          non-XML configuration file format.  Therefore, moving it to
+          Parse_Node.{h,cpp} causes it to compile only if needed.
+
+        * ace/Service_Config.h:
+
+          Removed the static get_xml_svc_conf() method, as it already has
+          the required implementation in the base class.
+
+        * ace/Service_Gestalt.h:
+        * ace/Service_Gestalt.cpp:
+
+          Moved the ACE_Service_Type_Factory class to Parse_Node.{h,cpp}.
+          Updated the documentation with a more clear description of the
+          class responsibilities. Corrected minor omissions.
+
+Tue Jul 18 18:12:17 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ACE-INSTALL.html: Updated the description of how to build
+          ACE+TAO using MPC.  Thanks to Steve Totten for helping with
           this.
 
-Tue Dec 19 09:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jul 18 19:04:42 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * ace/OS_NS_unistd.inl (readdir_r):
-          Refactored this method to make it easier to maintain and at the
-          same moment fixed compile error when building ACE on VxWorks 6.4
-          in kernel mode without pthread support
+        * ace/Numeric_Limits.h:
 
-Mon Dec 18 22:28:48 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+          Corrected short integer limit constants, i.e. "s/SHORT/SHRT/g".
 
-        * ace/Log_Msg_NT_Event_Log.cpp (log): Iterate for i <
-          log_record.msg_data_len() rather than i < log_record.length ()
-          to avoid nasty overrun errors.  Thanks to Paxton Mason <PMason
-          at wolve dot com> for reporting this.  This fixes bugid 2754.
+          Try other known "long long" integer constants if
+          "{U}LLONG_{MIN,MAX}" are not available.  Issue a preprocessor
+          error if all known cases have been exhausted.
 
-Mon Dec 18 22:28:18 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+Tue Jul 18 16:55:31 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * ace/Log_Record.h: Clarify the meaning of length() in the
-          comments.  Thanks to Paxton Mason <PMason at wolve dot com> for
-          motivating this.
+        * ace/Makefile.am (libACE_la_SOURCES, nobase_include_HEADERS):
 
-Mon Dec 18 13:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added new Sig_{Adapter,Handler}.* source and header files.
 
-        * ACEXML/common/common.mpc:
-        * bin/MakeProjectCreator/configs/acexml.mpb:
-          Added zzip as base, this project really uses zzip
+Mon Jul 17 23:18:52 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * bin/MakeProjectCreator/configs/acedefaults.mpb:
-          Removed zzip and zlib as base projects. Any project that uses
-          zzip or zlib should derive from the correct project, but not
-          acedefaults. When making them a base from acedefaults any
-          project links with zzip/zlib even when they don't use it.
+        * ace/README: Documented the ACE_TIMEPROBE_ASSERTS_FIXED_SIZE macro.
 
-          This fixes bugzilla bug 2751.
+Mon Jul 17 23:16:55 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-Mon Dec 18 10:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Timeprobe_T.cpp (timeprobe): Added a check to guard against
+          segfaults by wrapping the index around when it reaches the end
+          of the buffer.  Thanks to Patrick Rabau <pr2345 at gmail dot
+          com> for this fix.
 
-        * apps/JAWS2/HTTPU/parse_url.h:
-          Added prefix to the members of the URL_ERROR enum, NONE is a macro
-          on some platforms like VxWorks
+Tue Jul 18 13:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Dec 18 10:04:19 UTC 2006  Olli Savia  <ops@iki.fi>
+        * bin/tao_orb_tests.lst:
+          Added Bug_2595_Regression
 
-        * tests/OS_Test.cpp:
-          Do not execute snprintf test if ACE_LACKS_VSNPRINTF is defined.
+Tue Jul 18 12:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Dec 15 23:09:29 UTC 2006  Steve Huston  <shuston@riverace.com>
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+          Fixed the rules to decide whether a .inl file should be added
+          or not. Thanks to Chad Elliot for noticing this incorrect
+          rule.
 
-        * apps/JAWS2/JAWS/Makefile.am: Removed JAWS.h; see
-          Thu Dec 14 21:08:19 UTC 2006  Steve Huston  <shuston@riverace.com>
+Tue Jul 18 09:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Dec 15 15:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/PerlACE/ProcessVX_Win32.pm:
+          Increased delay factor from 2 to 3, downloading executables
+          seems to take longer now
+
+Tue Jul 18 09:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/Process_Unix.pm:
+          Removed chorus support
+
+Mon Jul 17 22:52:19 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Proactor.cpp (schedule_timer): Record the ACE_Proactor instance
+          that the timer is scheduled on in the ACE_Handler; makes this
+          behavior analogous to that in ACE_Reactor::schedule_timer().
+
+        * tests/Proactor_Timer_Test.cpp: Add a test for repeating timers and
+          canceling a repeating timer when it's likely that an expiration for
+          the timer is already queued when it's canceled.
+
+Mon Jul 17 16:06:57 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Unload_libACE.cpp: Alter the libACE suffix for HP-UX on
+          PA-RISC only. Also see:
+          Fri Jul 14 19:44:03 UTC 2006  john_c  <johnc@ociweb.com>
+
+Mon Jul 17 22:11:42 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/Threads/process_semaphore.cpp:
+
+          Added #include of ace/OS_NS_stdlib.h to get ACE_OS::atoi().
+
+Mon Jul 19 11:21:56 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/String_Base.cpp:
+        * ace/String_Base.inl:
+
+          Explicitly qualify size_type parameters with "typename" to force
+          some compilers (Sun Studio 10) to recognize it as a type.
+
+Mon Jul 17 17:49:41 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * include/makeinclude/platform_hpux_aCC.GNU (SOFLAGS):
+
+          Corrected shared library path for Itanium builds.
+
+        * protocols/ace/HTBP/HTBP_ID_Requestor.cpp (get_HTID):
+
+          Use new ACE_CString::size_type type to hold string
+          position/index value, instead of "int".  Addresses "comparison
+          between signed and unsigned" warnings.
+
+Mon Jul 17 16:04:07 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * NEWS:
+
+          Added information about the use of atomic operations on SPARC
+          Solaris.
+
+Mon Jul 17 15:09:21 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Refcounted_Auto_Ptr.{h inl} (null): Changed the return type
+          of the null() method from int to bool in order to more accurately
+          reflect the true/false nature of the returned value.
+
+        * NEWS: Noted the above change.
+
+Mon Jul 17 15:05:05 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: Added
+          include "ace/Log_Msg.h" in the "non-supported platform" case.
+          Fixes compile error on Windows.
+
+Mon Jul 17 13:03:09 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/ace_for_tao.mpc:
+
+          Sig_Handler.cpp and Sig_Adapter.cpp are needed to link gperf.
+
+Mon Jul 17 12:49:34 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * netsvcs/servers/main.cpp:
+
+          Added a missing #include for ace/Sig_Adapter.h.
+
+Mon Jul 17 11:57:26 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/qt_reactor.mpb:
+
+          Removed this file.  It was no longer referenced by ace and it's
+          functionality was replaced by ace_qtreactor.mpc.
+
+Mon Jul 17 10:41:14 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Message_Queue_Test_Ex.cpp: Removed the VxWorks-specific
+          section from MQ_Ex_N_Tester::receiver() - it was apparantly
+          pulled in from another test example and didn't need to be here.
+          Should resolve compile errors on VxWorks.
+
+Mon Jul 18 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * include/makeinclude/platform_vxworks6.3.GNU:
-        * include/makeinclude/platform_vxworks6.4.GNU:
-        * ace/config-vxworks6.4.h:
         * ace/config-vxworks6.3.h:
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          New files for VxWorks 6.3
+
+        * ace/os_include/sys/os_types.h:
+        * ace/os_include/os_stdio.h:
         * ace/OS_NS_unistd.inl:
         * ace/OS_NS_arpa_inet.cpp:
-        * ace/os_include/os_stdio.h:
-        * ace/os_include/sys/os_types.h:
-          Added support for VxWorks 6.4
+          Updated for VxWorks 6.3
 
-Thu Dec 14 21:08:19 UTC 2006  Steve Huston  <shuston@riverace.com>
+Sun Jul 17 06:49:21 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * apps/JAWS2/JAWS/jaws2.mpc: Corrected compiler defines to add
-          JAWS_BUILD_DLL, not replace previous.
+        * apps/soreduce/Library.cpp (set_path):
+        * apps/soreduce/Obj_Module.cpp (add_source):
+        * examples/Misc/test_sstring.cpp:
+        * examples/Web_Crawler/Command_Processor.cpp:
+        * examples/Web_Crawler/URL_Visitor.cpp:
 
-        * apps/JAWS2/JAWS/Export.h: Replaced contents with new content
-          generated from generate_export_file.pl. Previous content was
-          generated from GenerateExportH.BAT and was missing lots of
-          stuff, some of which prevented generation of .lib, .exp files.
+          Use new ACE_CString::size_type type to hold string
+          position/index value, instead of "int".  Addresses "comparison
+          between signed and unsigned" warnings.
 
-        * apps/JAWS2/JAWS/JAWS.h: Removed; it only had JAWS_TRACE defined
-          which is properly defined in Export.h now.
+        * examples/APG/Signals/SigAction.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp:
 
-        * apps/JAWS2/JAWS/Pipeline_Tasks.cpp:
-        * apps/JAWS2/JAWS/IO_Handler.cpp:
-        * apps/JAWS2/JAWS/IO.cpp:
-        * apps/JAWS2/JAWS/Concurrency.cpp: Removed #include "JAWS/JAWS.h"
+          Include "ace/OS_NS_stdlib.h" to pull in ACE_OS::exit()
+          prototype.
+
+        * examples/APG/Signals/SigGuard.cpp:
+        * examples/APG/Signals/SigHandler.cpp:
+        * examples/APG/Signals/SigHandlers.cpp:
+        * examples/APG/ThreadManagement/Signals.cpp:
+        * examples/APG/ThreadManagement/Signals2.cpp:
+        * examples/ASX/CCM_App/SC_Server.cpp:
+        * examples/ASX/Event_Server/Event_Server/event_server.cpp:
+        * examples/ASX/UPIPE_Event_Server/event_server.cpp:
+        * examples/Connection/blocking/SPIPE-connector.h:
+        * examples/Connection/misc/Connection_Handler.cpp:
+        * examples/Connection/non_blocking/CPP-acceptor.h:
+        * examples/Connection/non_blocking/CPP-connector.h:
+        * examples/Service_Configurator/IPC-tests/server/server_test.cpp:
+        * netsvcs/lib/TS_Clerk_Handler.cpp:
+
+          Include "ace/Sig_Handler.h" or "ace/Sig_Adapter.h" to pull in
+          ACE_Sig_Handler or ACE_Sig_Adapter class declaration,
+          respectively.  Necessitated by "ace/Signal.h" refactoring.
+
+Sun Jul 16 23:14:53 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * ace/String_Base_Const.cpp:
+
+          Took out an extra sem-colon. It seems to make the
+          FC4_Versioned_Namespace build grumpy.
+
+Sat Jul 15 16:14:05 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * NEWS:
+
+          Added entry on HPUX library extension changes.
+
+Fri Jul 14 22:10:02 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Sig_Handler.cpp:
+
+          Removed explicit template instantiations.  They snuck back in
+          when Signal.* was refactored.  Thanks to Johnny for pointing
+          this out.
+
+Fri Jul 14 21:32:02 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Numeric_Limits.h:
+
+          "ace/ACE_Export.h" -> "ace/ACE_export.h".  Darn Windows case
+          insensitivity.
 
-Thu Dec 14 12:36:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Removed unnecessary "ACE_Export" from ACE_Numeric_Limits primary
+          template.
 
-        * ace/config-qnx-neutrino.h:
-          Added several missing defines to build with QNX
+        * ace/Registry.cpp (make_name):
 
-Thu Dec 14 11:57:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Use ACE_TString::size_type, not ssize_t, to hold string position
+          values.  Addresses signed/unsigned comparison warnings.
 
-        * include/makeinclude/platform_qnx_neutrino.GNU:
-          Set all tools using ?= so that we can override the name
-          from the platform_macros.GNU file
+        * ace/Shared_Memory_Pool.h:
+
+          Include new "ace/Sig_Handler.h" header to pull in
+          ACE_Sig_Handler class declaration.
+
+        * ace/String_Base.h:
+
+          Added tips to documentation related to potentially user visible
+          changes.
+
+Fri Jul 14 21:10:11 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Atomic_Op.h (ACE_Atomic_Op):
+        * ace/Atomic_Op.inl (ACE_Atomic_Op):
+
+          Reverted change that made the constructor parameters for the
+          "long" type specialization be passed in by reference to const
+          instead of by value.  Explicit template instantiation is no
+          longer performed by ACE so there is no need for the
+          specialization constructor parameters to match the primary
+          template constructor parameters.
+
+        * ace/CDR_Base.cpp:
+        * ace/CDR_Stream.h:
+        * ace/CDR_Stream.inl:
+
+          Const-correctness improvements.
+
+        * ace/CDR_Base.h:
+
+          Minor const related cosmetic changes.
+
+        * ace/CDR_Base.inl (first_size, next_size):
+
+          Quickly multiply by two using a bit shift.  This is guaranteed
+          to work since the variable is an unsigned integer.
+
+        * ace/CORBA_macros.h:
+
+          Removed unnecessary instantiation of emulated exception
+          environment variable from native exception case.  Reduces
+          footprint in code that uses the ACE emulated exception macros in
+          a native C++ exception configuration, and provides a slight
+          performance increase due to resulting tighter binaries.
+
+        * ace/DLL_Manager.cpp (get_dll_names):
+
+          ACE_TString::rfind() now return an ACE_TString::size_type type.
+          Use ACE_TString::size_type, not ssize_t, to hold the return
+          value of ACE_TString::rfind().
+
+        * ace/Dev_Poll_Reactor.cpp:
+
+          Include new "ace/Sig_Handler.h" header to pull in
+          ACE_Sig_Handler class declaration.
+
+          Added support for HP-UX devpoll headers.
+
+        * ace/Event_Handler.cpp:
+
+          No need to include "ace/Message_Block.h".
+
+        * ace/MMAP_Memory_Pool.h:
+        * ace/Select_Reactor_T.cpp:
+        * ace/TP_Reactor.cpp:
+        * ace/WFMO_Reactor.inl:
+
+          Include new "ace/Sig_Handler.h" header to pull in
+          ACE_Sig_Handler class declaration.
+
+        * ace/Malloc_Base.h (ACE_Allocator):
+
+          Defined a new "size_type" typedef (currently a "size_t") to
+          simplify potential allocator size type changes in the future.
+          It's introduction was motivated by the ACE string class size
+          type fixes described below.  Analogous to the STL
+          std::allocator<>::size_type typedef.
+
+        * ace/Numeric_Limits.h:
+
+          Traits containing basic integer limits.  Useful for
+          template-based code on platforms that lack
+          std::numeric_limits<>.  These traits are not meant to be a
+          replacement for std::numeric_limits<>.  Rather they are a crutch
+          until all ACE-supported platforms support
+          std::numeric_limits<>.  [Bug 2451]
+
+        * ace/OS_NS_dirent.inl:
+
+          "__USE_POSIX" -> "_POSIX_SOURCE".  The former is a C library
+          implementation-specific feature test macro/symbol.
+
+        * ace/OS_NS_stdio.cpp:
+        * ace/OS_NS_stdio.h:
+        * ace/OS_NS_stdio.inl (get_win32_versioninfo):
 
-Thu Dec 14 00:12:49 UTC 2006  Steve Huston  <shuston@riverace.com>
+          Fixed/added missing wide character support.
 
-        * ace/OS_NS_Thread.cpp (event_init): Solaris's shm_open() requires a
-          single '/' on the name argument. I opted to put that logic here
-          rather than the lower-level ACE_OS::shm_open(), but that point
-          is debatable. In any case, look for a leading / on the name if
-          ACE_SHM_OPEN_REQUIRES_ONE_SLASH is defined; if it's not there,
-          add it.
+        * ace/OS_NS_stdlib.cpp (mkstemp_emulation):
 
-        * ace/config-sunos5.8.h: Added ACE_SHM_OPEN_REQUIRES_ONE_SLASH.
+          Clean up preprocessor conditional blocks by taking advantage of
+          new ACE_Numeric_Limits<> trait templates.
 
-        * ace/README: Add description of ACE_SHM_OPEN_REQUIRES_ONE_SLASH.
+        * ace/OS_NS_stdlib.inl (atop):
 
-        * configure.ac: Added check for ACE_SHM_OPEN_REQUIRES_ONE_SLASH.
-          Fixed check for ACE_LACKS_NUMERIC_LIMITS to display the findings
-          when configuring.
+          Address VC++ 64-bit warnings by taking advantage of standard
+          intptr_t type, if available.
 
-        * m4/config_h.m4: Added ACE_SHM_OPEN_REQUIRES_ONE_SLASH and
-          ACE_LACKS_NUMERIC_LIMITS.
+        * ace/OS_NS_sys_socket.inl (closesocket):
 
-Wed Dec 13 15:04:57 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Do not shutdown the write end here.  Doing so will break
+          applications that duplicate a handle on fork(), for example, and
+          expect to continue writing in the fork()ed process.
+
+        * ace/OS_NS_sys_utsname.cpp (uname):
+
+          Fixed garbage in wide string output.
+
+        * ace/Object_Manager.cpp:
+
+          No need to include "ace/Containers.h".
+
+          Include newly refactored "ace/Sig_Adapter.h" instead of old
+          "ace/Signal.h".  Removes dependency on the ACE_Reactor.  Allows
+          service configurator-disabled subset containing
+          ACE_Object_Manager support to be built, e,g, MPC ace_svcconf=0
+          configuration.
+
+        * ace/Object_Manager_Base.cpp (init):
+        * ace/Process.cpp (pass_handle):
+
+          Fixed Windows version info handling in wide string
+          configurations.
+
+        * ace/Process_Manager.h (wait):
+
+          Clarified that the timeout value is a relative time, not
+          absolute, in the documentation.
+
+        * ace/SOCK_Acceptor.cpp (shared_open):
+
+          Removed assertion that assumes all protocol families are
+          internet related.  This method is invoked by some non-internet
+          protocol subclasses, such as ACE_LSOCK_Acceptor.
+
+        * ace/SOCK_Stream.cpp (close):
+
+          Reinstituted explicit close_writer() method call for the
+          ACE_WIN32 case since ACE_OS::close() no longer causes the writer
+          to be shutdown on Windows (nor should it!).
+
+        * ace/Service_Config.cpp:
+
+          Replaced old "ace/Signal.h" include directive with
+          "ace/Sig_Adapter.h".  ACE_Sig_Handler support is unnecessary.
+
+          Removed redundant "ace/Service_Config.h" include directive.
+
+        * ace/Sig_Adapter.cpp:
+        * ace/Sig_Adapter.h:
+        * ace/Sig_Handler.cpp:
+        * ace/Sig_Handler.h:
+        * ace/Sig_Handler.inl:
+        * ace/Signal.cpp:
+        * ace/Signal.h:
+        * ace/Signal.inl:
+
+          Refactored ACE_Sig_Adapter and ACE_Sig_Handler classes from
+          "ace/Signal.*" into their own dedicated source files.  Allows
+          ACE_Sig_{Guard,Set} to be used without introducing a dependency
+          on the ACE_Reactor framework.
+
+        * ace/String_Base_Const.cpp (npos):
+        * ace/String_Base_Const.h (npos):
+
+          Introduced a new "size_type" typedef.  This is consistent with
+          the standard C++ string class typdef/trait.
+
+          The "no position" constant is now an unsigned integer of the
+          same "size" type used by the underlying ACE string allocator.
+          It is defined to be the maximum value the unsigned type can
+          handle (e.g. ACE_Numeric_Limits<size_type>::max()).  This works
+          since a string length will always be less than or equal to
+          "max() - 1" since the final character in the string is the null
+          terminator.  [Bug 2598]
+
+        * ace/String_Base.cpp:
+        * ace/String_Base.h:
+        * ace/String_Base.inl:
+        * ace/SString.cpp:
+        * ace/SString.h:
+        * ace/SString.inl:
+
+          All size parameter and return value types are now consistent
+          with the size type of the underlying allocator
+          (i.e. ACE_Allocator::size_type).  Addresses inability of ACE
+          string classes to provide valid search index for string lengths
+          greater than the maximum value of ssize_t, a signed type.  In
+          particular, the find(), rfind() and strstr() methods now return
+          an unsigned integer (size_t) instead of a signed one
+          (ssize_t). Affected classes include:
+
+              ACE_CString
+              ACE_WString
+              ACE_TString
+              ACE_NS_WString
+
+         Unless you have been explicitly using -1 instead of npos when
+         comparing the return value of find(), rfind() and strstr(),
+         and/or assigning the return value to ssize_t you should not see
+         any difference. A new size_type typedef has been added to the ACE
+         string class to aid developers.
+
+         The ACE_String_Base<>::strstr() documentation as well as a
+         default rfind() argument erroneously referred to -1 instead of
+         npos. Those instances have been corrected.
+
+         To summarize, a "no position" condition is denoted using the npos
+         constant, not -1. It can be referred directly by scoping it with
+         the appropriate string class (e.g. ACE_CString::npos,
+         ACE_WString::npos, etc).  [Bug 2598]
+
+        * ace/Task_T.h:
+
+          Include "ace/IO_Cntl_Msg.h" to pull in ACE_IO_Cntl_Msg class
+          declaration.
+
+        * ace/Time_Value.cpp (max_time):
+
+          Cleaned up preprocessor conditional blocks by taking advantage
+          of ACE_Numeric_Limits trait templates.
+
+        * ace/Timer_Queue_Adapters.cpp:
+
+          Include "ace/Signal.h" to pull in ACE_Sig_Guard class
+          declaration.
+
+        * ace/Timer_Queue_Adapters.h:
+
+          Forward declare ACE_Sig_Set class.  No need for the full blown
+          declaration.
+
+        * ace/Token.cpp:
+
+          Minor cosmetic change.
+
+        * ace/ace_wchar.h (ACE_GetVersionEx):
+
+          New wide string support for Windows "GetVersionEx{A,W}()"
+          functions.
+
+        * ace/ace_wchar.inl:
+
+          Improved const-correctness.
+
+        * ace/config-aix-4.x.h:
+        * ace/config-macosx-panther.h:
+        * ace/config-macosx-tiger.h:
+        * ace/config-macosx.h:
+
+          Fixed single-threaded configuration so that all multi-thread
+          support is disabled.
+
+        * ace/ace.mpc:
+
+          Added missing DLL_Manager.cpp source file, and newly refactored
+          Sig_{Adapter,Handler}.cpp source files.
+
+        * ace/ace_for_tao.mpc:
+
+          Explicitly require the ace_svcconf MPC feature.
+
+          Added missing ACE_LACKS_ACE_TOKEN macro.  The ace_for_tao subset
+          does not support ACE's token collections.
+
+        * ace/svcconf.mpb:
+
+          Do not define ACE_HAS_ACE_SVCCONF.  There is no such macro in
+          the ACE sources.
+
+          Explicitly remove ACE_LACKS_ACE_SVCCONF from the macro list.
+
+          Moved "DLL_Manager.cpp" to the core ACE library source file
+          list.  "DLL_Manager.cpp" is not an optional component, and must
+          always exist in ACE regardless of whether or not ACE's service
+          configurator support is enabled.
+
+        * ace/token.mpb:
+
+          Do not define ACE_HAS_ACE_TOKEN.  There is no such macro in
+          the ACE sources.
+
+          Explicitly remove ACE_LACKS_ACE_TOKEN from the macro list.
+
+        * bin/MakeProjectCreator/config/ace_for_tao.mpb:
+
+          Added missing ACE_LACKS_ACE_TOKEN macro.  The ace_for_tao subset
+          does not support ACE's token collections.
+
+        * tests/SString_Test.cpp:
+
+          Corrected checks for "no position" return values to compare
+          against "npos" constant, not "-1".
+
+Fri Jul 14 20:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/INET_Addr.cpp:
+          Initialise some pointers explicitly with 0
+
+Fri Jul 14 20:41:23 UTC 2006  john_c  <johnc@ociweb.com>
 
         * bin/tao_orb_tests.lst:
 
-          Updated the configuration for ORB_Local_Config/Bug_2612 to
-          require a multithreaded build to reflect the design goals of the
-          test.
+          Add new test TAO/tests/Optimized_Connection to nightly builds.
 
-Tue Dec 12 23:50:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Fri Jul 14 20:39:41 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * NEWS:
+        * ace/config-vxworks6.2.h: Reverted this change:
+          Fri Jul 14 10:34:43 UTC 2006  Steve Huston  <shuston@riverace.com>
+          It appears to not work, and I can't test anything else here.
+
+Fri Jul 14 18:53:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/MakeProjectCreator/config/global.features
+        * bin/MakeProjectCreator/config/stl.mpb
 
-          Document --enable-ace-reactor-notification-queue.
+          Added an stl feature/base project for projects that use portions
+          of the STL that may not be universally supported.
 
-        * m4/ace.m4:
+Fri Jul 14 19:44:03 UTC 2006  john_c  <johnc@ociweb.com>
 
-          Add autoconf support for --enable-ace-reactor-notification-queue.
-          Configuring with this option sets ACE_HAS_REACTOR_NOTIFICATION_QUEUE
-          in config.h.
+        * ace/config-hpux-11.00.h:
+        * include/makeinclude/platform_hpux_aCC.GNU:
 
-Wed Dec 13 01:41:19 UTC 2006  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+          Changing the shared library extension for hpux ia64 to ".so". On
+          HP-UX 11i Version 1.5 the naming scheme is lib*.sl for PA and
+          lib*.so on IPF.
 
-        * ace/UUID.cpp:
+Fri Jul 14 19:29:59 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-          Fixed a potential memory leak. Dynamic memory was allocated but
-          not freed under special circumstances. For details, check BUGID
-          2746. This closes BUGID 2746.
+        * ace/OS_NS_stdio.cpp (DllMain): Add extern "C" to the DllMain
+          signature - enables it to be located and called at startup.
+          Thanks to Hubert Talbot <Hubert dot Talbot at criq dot qc dot ca>
+          for this fix.
 
-Tue Dec 12 22:38:06 UTC 2006  Steve Huston  <shuston@riverace.com>
+Fri Jul 14 19:13:06 UTC 2006  john_c  <john@ociweb.com>
 
-        * apps/JAWS2/HTTPU/parse_url.h: Made the char* members const to
-          resolve compile warnings about assignment of char* literals.
+        * ace/Timer_Queue_Adapters.cpp:
 
-Tue Dec 12 19:54:05 UTC 2006  Steve Huston  <shuston@riverace.com>
+          Include file was missing. Fixes compile error when
+          ACE_HAS_DEFERRED_TIMER_COMMANDS is defined.
 
-        * apps/JAWS2/HTTPU/httpu.mpc: Must build HTTPU after JAWS2.
+Fri Jul 14 19:05:15 UTC 2006  Ciju John  <john_c@ociweb.com>
 
-Tue Dec 12 19:54:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+        * bin/tao_other_tests.lst:
 
-        * bin/fuzz.pl:
+          Adding the TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated
+          test to nightly builds.
 
-          Changed the regular expression to recognize #include's of files
-          with double quotes within a version block.
+Fri Jul 14 16:25:00 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Tue Dec 12 19:31:39 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+        * bin/tao_orb_tests.lst:
+          Added exclusions for Bug_2593_Regression test.
 
-        * bin/fuzz.pl:
+Fri Jul 14 15:50:34 UTC 2006  Adam Mitz  <mitza@ociweb.com>
 
-          Corrected a bug where a non-ACE/TAO/CIAO file included within a
-          version block was being marked as an error.
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/Process_Win32.pm:
 
-Tue Dec 12 17:01:42 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Added an optional parameter to Process->Kill().  If the parameter is
+          true then the return value from the process is ignored.
 
-        * bin/MakeProjectCreator/config/MPC.cfg:
+Fri Jul 14 15:45:04 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-          Added $DDS_ROOT/MPC/config to the includes, since the
-          .mpb files in DDS have been moved to this location, making
-          them consistent with the location of similar files in
-          TAO and CIAO.
+        * tests/Message_Queue_Test_Ex.{h cpp}: Corrected for !ACE_HAS_THREADS.
 
-Tue Dec 12 15:08:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+Fri Jul 14 15:39:53 UTC 2006  Adam Mitz  <mitza@ociweb.com>
 
         * bin/tao_other_tests.lst:
+          Added new test (TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl).
 
-          Added the Trading unit test to the list.
+Fri Jul 14 10:34:43 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Tue Dec 12 13:47:44 UTC 2006  Steve Huston  <shuston@riverace.com>
+        * ace/config-vxworks6.2.h: Added ACE_LACKS_USECONDS_T to fix a
+          compile error. It's in the non-__RTP__ section since that's where
+          ACE_LACKS_SUSECONDS_T was, but I'm not sure this is correct.
 
-        * apps/JAWS2/HTTPU/httpu.mpc: Corrected build flags and added required
-          link library JAWS2.
+Fri Jul 14 07:26:46 UTC 2006  Olli Savia  <ops@iki.fi>
 
-Tue Dec 12 06:05:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/Thread_Mutex.h:
+        * ace/ace_wchar.h:
+        * tests/SOCK_Dgram_Bcast_Test.cpp:
+          Fixed typos in comments.
 
-        * configure.ac:
+        * m4/config_h.m4:
+          Removed references to ACE_HAS_TERM_IOCTLS. It's no longer
+          used in ACE/TAO/CIAO code.
 
-          Add ACE_HAS_ISASTREAM_PROTOTYPE feature test.
+Fri Jul 14 02:11:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Tue Dec 12 06:00:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * bin/tao_orb_tests.lst:
+          Added new test for Bug 2593 to nightly suite.
+
+Thu Jul 13 20:40:10 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * ace/config-integritySCA.h:
+          Removed references to ACE_HAS_ATTR_SETSCHED. It's no longer
+          used in ACE/TAO/CIAO code.
+
+        * ace/config-rtems.h:
+          Removed references to ACE_HAS_SIGNAL_SAFE_OS_CALLS. It's no longer
+          used in ACE/TAO/CIAO code.
+
+        * ace/config-sco-5.0.0-mit-pthread.h:
+          Removed references to ACE_HAS_T_OPMGMT. It's no longer
+          used in ACE/TAO/CIAO code.
+
+Thu Jul 13 10:35:39 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * ace/Base_Thread_Adapter.cpp:
+        * ace/Cleanup.cpp:
+        * ace/OS.cpp:
+        * ace/OS_Errno.cpp:
+        * ace/OS_Log_Msg_Attributes.cpp:
+        * ace/OS_NS_Thread.cpp:
+        * ace/OS_NS_arpa_inet.cpp:
+        * ace/OS_NS_ctype.cpp:
+        * ace/OS_NS_dirent.cpp:
+        * ace/OS_NS_dlfcn.cpp:
+        * ace/OS_NS_errno.cpp:
+        * ace/OS_NS_fcntl.cpp:
+        * ace/OS_NS_math.cpp:
+        * ace/OS_NS_netdb.cpp:
+        * ace/OS_NS_poll.cpp:
+        * ace/OS_NS_pwd.cpp:
+        * ace/OS_NS_regex.cpp:
+        * ace/OS_NS_signal.cpp:
+        * ace/OS_NS_stdio.cpp:
+        * ace/OS_NS_stdlib.cpp:
+        * ace/OS_NS_string.cpp:
+        * ace/OS_NS_strings.cpp:
+        * ace/OS_NS_stropts.cpp:
+        * ace/OS_NS_sys_mman.cpp:
+        * ace/OS_NS_sys_msg.cpp:
+        * ace/OS_NS_sys_resource.cpp:
+        * ace/OS_NS_sys_select.cpp:
+        * ace/OS_NS_sys_sendfile.cpp:
+        * ace/OS_NS_sys_shm.cpp:
+        * ace/OS_NS_sys_socket.cpp:
+        * ace/OS_NS_sys_stat.cpp:
+        * ace/OS_NS_sys_time.cpp:
+        * ace/OS_NS_sys_uio.cpp:
+        * ace/OS_NS_sys_wait.cpp:
+        * ace/OS_NS_time.cpp:
+        * ace/OS_NS_unistd.cpp:
+        * ace/OS_NS_wchar.cpp:
+        * ace/OS_TLI.cpp:
+        * ace/Thread_Adapter.cpp:
+        * ace/Thread_Control.cpp:
+        * apps/JAWS2/HTTPU/parse_http_request.cpp:
+        * apps/JAWS2/HTTPU/parse_http_response.cpp:
+
+          Fixed typo in comment.
+
+Thu Jul 13 09:51:33 UTC 2006  Olli Savia  <ops@iki.fi>
 
         * configure.ac:
+          Removed references to ACE_HAS_EXCEPTION_H. It's no longer
+          used in ACE/TAO/CIAO code.
+
+Thu Jul 13 09:48:10 UTC 2006  Olli Savia  <ops@iki.fi>
 
-          Add ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE feature test.
+        * ace/os_include/os_string.h:
+        * ace/os_include/os_stropts.h:
+          Fixed typo in comment.
 
-Tue Dec 12 05:13:33 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Jul 13 09:32:54 UTC 2006  Olli Savia  <ops@iki.fi>
 
+        * ace/config-vxworks6.2.h:
         * configure.ac:
+        * m4/config_h.m4:
+          Removed references to ACE_HAS_USING_KEYWORD. It's no longer
+          used in ACE/TAO/CIAO code.
+
+Thu Jul  6 20:45:15 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Refcounted_Auto_Ptr.{h inl}: Repaired the ACE_Refcounted_Auto_Ptr
+          reset() and release() methods per Bugzilla #1925. They will both now
+          detach from the underlying ACE_Refcounted_Auto_Ptr_Rep object;
+          reset() will create a new one for the new pointer specified as its
+          argument. Generally modified the class to not make changes to the
+          underlying ACE_Refcounted_Auto_Ptr_Rep (such as with reset()). This
+          safely allows the get() method to avoid using the lock for reading
+          the pointer value since there's no way to change the underlying
+          rep's pointer.
+          Also cleaned up the Doxygen stuff for these classes.
+
+          This work resulted in removal of the following methods in
+          ACE_Refcounted_Auto_Ptr_Rep (not ACE_Refcounted_Auto_Ptr):
+            - null ()
+            - assign ()
+            - release ()
+            - reset ()
+
+          This significantly improves ACE_Refcounted_Auto_Ptr. This is not
+          a recommendation to [not] use it over ACE_Strong_Bound_Ptr. Just
+          responding to user reports. It may still be possibly/adviseable to
+          work further on this class, though I have no specific ideas or
+          reports at this time.
+
+        * tests/Refcounted_Auto_Ptr_Test.{h cpp}: Added tests for release()
+          and reset() per code supplied in Bugzilla #1925. Removed code in
+          ACE_ASSERT since it doesn't run in Release builds; replaced with
+          explicit checks and ACE_ERROR.
+
+Wed Jul 12 20:32:49 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Message_Queue_Test_Ex.{h cpp}: Fixed compile errors on Linux.
+
+Wed Jul 12 19:15:58 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue_T.{h cpp}: Added a new class,
+          ACE_Message_Queue_Ex_N<class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL>, that
+          is similar to ACE_Message_Queue_Ex in that the object queued is a
+          template parameter. However, ACE_Message_Queue_Ex_N allows the
+          enqueueing and dequeueing of multiple chained objects at once. This
+          wasn't added to ACE_Message_Queue_Ex because the chained object
+          functionality requires the ACE_MESSAGE_TYPE class to have a
+          ACE_MESSAGE_TYPE *next (void) const method, analogous to
+          ACE_Message_Block::next(), to follow the chain and this would
+          probably break existing applications using ACE_Message_Queue_Ex.
+
+        * tests/Message_Queue_Test_Ex.{h cpp}: Added test capability for
+          ACE_Message_Queue_Ex_N.
+
+        * NEWS: Added description of the new class.
+
+          Thanks to Guy Peleg <guy dot peleg at amdocs dot com> for
+          contributing this new class and its tests.
+
+Wed Jul 12 16:37:40 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * etc/ace.doxygen:
+        * etc/ace_qos.doxygen:
+        * etc/ace_ssl.doxygen: Use the IGNORE_PREFIX directive to have Doxygen
+          ignore the ACE_, ACE_QoS_, ACE_SSL_ prefixes when alphabetizing
+          the class index. Thanks to Stefan Naewe <naewe dot s at atlas dot de>
+          for this idea.
+
+        * THANKS: Added Stefan Naewe to the Hall of Fame.
+
+Wed Jul 12 14:30:16 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-          Add ACE_LACKS_MKTEMP_PROTOTYPE and ACE_LACKS_MKSTEMP_PROTOTYPE
-          feature tests.
+        * ace/config-lynxos.h:
+        * ace/config-netbsd.h: Changed ACE_SCANDIR_CMP_USES_VOIDPTR to
+          ACE_SCANDIR_CMP_USES_CONST_VOIDPTR - makes it match the decl in
+          ace/os_include/os_dirent.h and should resolve a compile error.
 
-        * ace/README:
+Wed Jul 12 13:55:09 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-          Document ACE_LACKS_MKSTEMP feature test macro.
+        * ace/Message_Queue.inl: Move the #include out of the namespace; see
+          Tue Jul 11 13:38:10 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Mon Dec 11 20:51:59 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+Wed Jul 12 10:15:12 UTC 2006  Martin Corino <mcorino@remedy.nl>
 
-        * apps/JAWS2/HTTPU/httpu.mpc: Added a new MPC file.  Thanks to
-          Sergey for this.
+        * include/makeinclude/platform_openvms.GNU:
+          Added fixes for SSL support.
 
-        * apps/JAWS2/HTTPU/http_base.cpp (receive): Made this work with
-          HTTPU.  Thanks to Sergey Kosenko <sergey dot kosenko at gmail
-          dot com> for these patches.
+        * ace/config-openvms.h:
+          Added ACE_HAS_PTHREAD_SCHEDPARAM.
 
-Mon Dec 11 20:21:14 UTC 2006  Steve Huston  <shuston@riverace.com>
+        * ace/Global_Macros.h:
+        * ace/Lib_Find.cpp:
+        * ace/Service_Config.cpp:
+        * ace/Service_Config.h:
+        * ace/Service_Object.cpp:
+        * ace/Service_Object.h:
+          Moved OpenVMS specific dynamic service support class to a
+          better place.
 
-        * ace/CDR_Stream.{h cpp} (ACE_OutputCDR): Added a new method, int
-          consolidate (void) which consolidates any continuation message
-          blocks into the start block, ensuring that all data is located
-          in one block on return. This is useful for situations which
-          require the entire encoded stream to be available in one buffer,
-          regardless of length.
+Wed Jul 12 07:13:01 UTC 2006  Olli Savia  <ops@iki.fi>
 
-        * tests/CDR_Test.cpp: Added a test for consolidate().
+        * ace/FILE_Connector.cpp:
+          It is safe to use ACE_OS::mkstemp() on all platforms.
 
-        * NEWS: Added notice for new consolidate() method.
+Wed Jul 12 02:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Thanks to Howard Finer <hfiner at sonusnet dot com> for supplying
-        the new ACE_OutputCDR::consolidate() method.
+        * bin/msvc_static_order.lst:
+          Build ObjRefTemplate before IORInterceptor
 
-Mon Dec 11 20:03:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+Tue Jul 11 23:09:28 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * bin/MakeProjectCreator/templates/gnu.mpd:
+        * include/makeinclude/platform_hpux_aCC.GNU:
 
-          Changed the template to use the words "make macros" instead of
-          features.  There may have be some confusion with MPC features.
+          The C compiler doesn't support the -mt option.  So, add -mt to
+          CC_THR_DEFS and then later add CC_THR_DEFS to CCFLAGS.  CCFLAGS
+          isn't used when compiling C files.
 
-Mon Dec 11 17:39:46 UTC 2006  James H. Hill  <hillj@isis.vanderbilt.edu>
+Tue Jul 11 22:30:21 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * docs/ace_guidelines.vsmacros:
+        * ace/config-win32-common.h:
+        * ace/config-WinCE.h: Break the tight tie between UNICODE and
+          ACE_USES_WCHAR I introduced in
+          Thu Oct  6 17:56:19 2005  Steve Huston  <shuston@riverace.com>
+          Now ACE_USES_WCHAR is always on for CE; non-CE Windows builds must
+          explicitly set ACE_USES_WCHAR independent of UNICODE. Thanks to
+          Russell Morra <russell_mora at symantec dot com> for explaining
+          the situation and submitting this fix.
+
+Tue Jul 11 22:20:14 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * bin/generate_doxygen.pl: Add the ability to put the generated
+          HTML output in a specified location using the new -html_output
+          command line option. It alters the path specified for the
+          HTML_OUTPUT and GENERATE_TAGFILE Doxygen options.
+
+Tue Jul 11 22:09:56 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_linux.GNU: Added support for the
+          "buildbits=64" and "buildbits=32" make settings to target
+          32- and 64-bit build targets, respectively. Thanks to Boris
+          Kaminer <boris dor kaminer at gmail dot com> for this addition.
+
+Tue Jul 11 22:22:04 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * configure.ac: Change the minimum automake version to 1.9.6; this is
+          required to generate Makefiles that work properly on AIX.
+
+        * m4/compiler.m4: For AIX, replace ACE_AIX_MAJOR_VERS and
+          ACE_AIX_MINOR_VERS compile macros with ACE_AIX_VERS as the
+          hand-edited platform_aix_ibm.GNU has and the code expects.
+          Also removed the AIX 3 and 4 code since AIX 3 and 4 are no longer
+          supported. Also, turned on -qtemplateregistry for xlC-type
+          compilers (Visual Age C++ 6 and XL C++ 7).
+
+Tue Jul 11 21:37:51 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_stdio.cpp (snprintf, sprintf): In the wchar versions,
+          adjust the preprocessor checks to pick up the way that Solaris
+          indicates the presence of XPG5 capability. Allows these functions
+          to work, which allows ACE_Log_Msg to work also.
+
+        * ace/OS_NS_unistd.{h inl} (ualarm): Changed u_long arguments and
+          return value to useconds_t to gain portability.
+
+        * ace/OS_NS_dirent.{h inl cpp}: Made the selector and comparator
+          function pointer arguments to ACE_OS::scandir() and
+          scandir_emulation() be extern "C" to enforce their use with a
+          C RTL function. This resolves warnings from Solaris and makes usage
+          correct across all platforms. The function types are now in
+          typedefs ACE_SCANDIR_SELECTOR and ACE_SCANDIR_COMPARATOR,
+          respectively. The typedef was used previously only for Windows/MSVC
+          where the calling convention change had bit someone - now it's
+          uniform for all.
+          Also, folded in the ACE_SCANDIR_CMP_USES_VOIDPTR def here to
+          set up the proper typing with extern "C" for when it's needed to
+          cast inside the ACE_OS::scandir() implementation. The interface
+          offered by ACE_OS::scandir() is always defined in terms of
+          ACE_SCANDIR_SELECTOR and ACE_SCANDIR_COMPARATOR.
+
+        * ace/Dirent_Selector.{h cpp}: Use the extern "C"-containing typedefs
+          for selector/comparator functions set up for ACE_OS::scandir() in
+          ACE_Dirent_Selector as well since they get passed through to ACE_OS.
+
+        * apps/soreduce/Library.cpp:
+        * tests/Dirent_Test.cpp: Mark selector/comparator functions that'll be
+          passed to ACE_OS::scandir() as extern "C" to match new param types.
+
+        * ace/config-aix-5.x.h: Added ACE_HAS_SCANDIR since AIX has scandir(),
+          as well as the needed ACE_SCANDIR_SEL_LACKS_CONST and
+          ACE_SCANDIR_CMP_USES_VOIDPTR to adjust to it's differences from
+          the common way scandir() is usually defined.
+
+        * ace/config-hpux-11.00.h: Added ACE_HAS_SCANDIR.
+
+        * ace/config-linux-common.h: Clarify that, despite the man page,
+          ACE_SCANDIR_CMP_USES_CONST_VOIDPTR is needed, at least on RHEL 3
+          and 4.
+
+        * ace/README: Added descriptions for ACE_HAS_SCANDIR and
+          ACE_SCANDIR_CMP_USES_VOIDPTR as well as the new settings
+          ACE_SCANDIR_SEL_LACKS_CONST and ACE_SCANDIR_CMP_USES_CONST_VOIDPTR.
+
+        * NEWS: Summarize the above user-visible selector/comparator changes.
+
+Tue Jul 11 17:39:00 UTC 2006  Olli Savia  <ops@iki.fi>
 
-          Fixed macros specification so the same file can be used
-          with both VS.NET 2003 and VS.NET 2005 development
-          environments.
+        * ace/Basic_Types.h:
+        * ace/OS.h:
+          Removed unnecessary includes.
 
-Mon Dec 11 15:23:08 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+Tue Jul 11 17:25:06 UTC 2006  Olli Savia  <ops@iki.fi>
 
-        * bin/MakeProjectCreator/config/MPC.cfg:
-        * bin/mpc.pl:
-        * bin/mwc.pl:
+        * include/makeinclude/platform_rtems.x_g++.GNU:
+        * include/makeinclude/wrapper_macros.GNU:
 
-          Removed the code that specifically added the gnuace and borland
-          project types and rely on the dynamic_types directive in the
-          MPC.cfg to have the MPC core add them.
+          Removed references to obsolete ACE_HAS_GNUG_PRE_2_8 make
+          variable. Removed egcs checks.
 
-Sat Dec  9 19:13:52 UTC 2006  Olli Savia  <ops@iki.fi>
+Tue Jul 11 16:55:57 UTC 2006  Olli Savia  <ops@iki.fi>
 
-        * ace/config-vxworks5.x.h:
-          Added ACE_LACKS_VSNPRINTF.
+        * ace/TTY_IO.cpp:
+          Enable raw mode correctly on POSIX systems. Accept "none" as
+          valid parity value. Thanks to hongxing <hongxing777 at gmail dot com>
+          for the patch.
 
-Fri Dec  8 20:20:09 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * ace/TTY_IO.h:
+          Updated documentation to reflect changes above.
 
-        * ace/Service_Config.cpp (parse_args_i):
+        * ace/os_include/sys/os_resource.h:
+          Fixed typo in comment.
 
-          Moving the "default:" label outside the block that handles the
-          "case 's':". Even though it should work correctly on allmost any
-          compiler, things like this are bad form. Thanks to Aaron
-          Scamehorn <Aaron dot Scamehorn at cogcap dot com> for noticing.
+Tue Jul 11 16:38:29 UTC 2006  Olli Savia  <ops@iki.fi>
 
-Fri Dec  8 20:15:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/config-linux-common.h:
+        * ace/os_include/os_signal.h:
+        * ace/os_include/os_stropts.h:
 
-        * THANKS: Add Ray Lischner.
+          Changed ACE_HAS_ISASTREAM_PROTO to ACE_HAS_ISASTREAM_PROTOTYPE and
+          ACE_HAS_PTHREAD_SIGMASK_PROTO to ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
+          to better follow ACE naming conventions.
 
-Fri Dec  8 16:39:51 UTC 2006  Steve Huston  <shuston@riverace.com>
+Tue Jul 11 13:38:10 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * ace/Null_Mutex.h: Added ACE_Export to the class declarations.
-          Although they are probably inlined, VS .NET 2005 (VC8) complains
-          in some cases when a dll-interface class inherits from a
-          non-dll-interface class.
+        * ace/Message_Queue.inl: Include "ace/Guard_T.h" in the ACE_WIN32
+          section to avoid compile errors with Release builds.
 
-Fri Dec  8 15:36:23 UTC 2006  Ciju John  <johnc@ociweb.com>
+        * ace/TSS_T.h: Improved documentation.
 
-        * tests/run_test.lst:
-          Bug_2659_Regression_Test cannot run in a single threaded build.
+        * tests/ACE_Init_TestDlg.cpp: Added comment block at the top to explain
+          the file's purpose.
 
-Fri Dec  8 05:21:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/Task_Test.cpp: Added a smoke test for the new
+          ACE_Task::last_thread() method.
 
-        * configure.ac:
+Thu Jul  6 12:48:58 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-          Changed code to extract version number from ace/Version.h to be
-          more resilient to leading whitespace like was added by a bug in
-          the release script in the last beta.  Thanks to Ray Lischner
-          <rlischner at proteus-technologies dot com> for this patch.
-          Also thanks to Paul Riley <paul at riley dot net> for reporting
-          this problem.
+        * ace/OS_NS_sys_socket.inl (sendto): Initialize "bytes_sent" to 0
+          to avoid random values.  Thanks to Winston Zhang <winston_ace at
+          kubao-inc dot com> for reporting this.
 
-Thu Dec  7 14:13:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jul  5 20:32:20 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/DLL_Manager.cpp:
-          Made error message dependent on ACE::debug. Thanks to David Faure
-          <dfaure at klaralvdalens-datakonsult dot se> for reporting this.
+        * ace/WFMO_Reactor.cpp (open): Added some more code to prevent
+          memory leaks when the ACE_WFMO_Reactor is reopened.  Thanks to
+          Sonicfly Zhou <zhoucn at txsec dot com> for this fix.
 
-Thu Dec  7 14:09:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jul 11 12:19:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/ciao_tests.lst:
-          Added RTCMM test
+        * etc/tao.doxygen:
+          Added .idl to FILE_PATTERNS
 
-Thu Dec  7 12:47:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jul 11 12:01:12 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/Read_Buffer.h:
-          Doxygen improvements
+        * ace/Atomic_Op.cpp:
+        * ace/Atomic_Op_Sparc.h:
+        * ace/Atomic_Op_Sparc.c:
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
 
-        * ace/Read_Buffer.cpp:
-          Initialise pointer with 0 and use prefix increment
+          Added a SPARC assembler implementation of functions needed for use
+          within the ACE_Atomic_Op specializations.  The implementation will
+          only be used if atomic_ops_sparc is set to 1 in
+          platform_macros.GNU.  It also requires that v8plus or higher be
+          used with SunCC.
 
-Thu Dec  7 09:47:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Makefile.am:
+        * ace/ace.mpc:
 
-        * ACE-INSTALL.html:
-          Improved rtems documentation
+          Added the new Atomic_Op_Sparc.c.
 
-        * MakeProjectCreator/config/avoids_ace_for_tao.mpb:
-          New base project for avoids ace_for_tao
+        * ace/CDR_Base.cpp:
 
-        * bin/ciao_tests.lst
-        * bin/tao_orb_tests.lst
-        * bin/tao_other_tests.lst
-          Disabled all tests that are disabled in a minimum_corba build also
-          when using CORBA/e compact and micro
+          In grow(), call the clone_nocopy() method on the ACE_Data_Block
+          with the new size.  Previously, the clone_nocopy() would be called
+          and then directly after that, size() would be called on the cloned
+          data block which would re-allocate to the new size and copy the
+          previous contents.
 
-Thu Dec  7 07:49:24 UTC 2006  Olli Savia  <ops@iki.fi>
+          In the same method, we avoid constructing an ACE_Message_Block to
+          avoid reference count manipulating the data block's reference
+          count.
 
-        * ace/OS_NS_stdio.h:
-        * ace/OS_NS_stdio.inl:
-        * ace/OS_NS_stdio.cpp:
+          Also, in consolidate(), avoid attempting to copy data if the
+          destination and source are the same. [RT 8372]
+
+        * ace/CDR_Stream.h:
+        * ace/CDR_Stream.cpp:
+
+          Added a constructor that takes an ACE_Data_Block* which can be
+          used to avoid an allocation while constructing the
+          ACE_Message_Block held by the ACE_OutputCDR. [RT 8372]
+
+        * ace/Message_Block.h:
+        * ace/Message_Block.cpp:
+        * ace/Message_Block_T.h:
+        * ace/Message_Block_T.cpp:
+
+          Added a new parameter to the ACE_Data_Block::clone_nocopy() method
+          that allows the user copy the data block, but increase the size
+          all in one step. [RT 8372]
+
+        * ace/OS_NS_string.inl:
+
+          Added an unrolled implementation of memset, only active if
+          ACE_HAS_SLOW_MEMSET is defined, that supports up to 16 bytes
+          without calling into the memset() C function.
+
+        * ace/config-sunos5.5.h:
+
+          SunCC 5.x supports new(nothrow_t).  So, I have enable the use of
+          it when exceptions are enabled. [RT 8372]
+
+        * ace/OS_NS_Thread.h:
+        * ace/os_include/os_pthread.h:
+
+          Added macro definitions required to build ACE and TAO on Solaris
+          without using the pthreads library.
+
+        * include/makeinclude/platform_aix_ibm.GNU:
+        * include/makeinclude/platform_hpux_aCC.GNU:
+        * include/makeinclude/platform_irix6.x_sgic++.GNU:
+
+          Added 64-bit options to the CFLAGS macros to deal with the newly
+          added C file in ACE. [RT 8372]
+
+Tue Jul 11 01:47:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Log_Msg_Test.cpp:
+          initialise pointer with 0
+
+Tue Jul 11 01:37:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Implemented ACE_OS::snprintf() by using ACE_OS::vsnprintf().
-          Removed duplicate code and made maintaining easier.
+        * ace/OS_NS_unistd.h:
+          Layout change
+
+Tue Jul 11 01:09:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+          If -oA has been used as idlflags, don't add the A files
+
+Tue Jul 11 00:50:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_compile_stats.sh:
+          Updated to also handle redhat version information
+
+Sun Jul 09 05:53:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 5.5.2 released.
+
+Fri Jul  7 08:07:50 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html: Small improvements
+
+Thu Jul  6 19:57:50 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ACE-INSTALL.html: Improvements and corrections motivated by
+          Abdul Sowayan <abdullah dot sowayan at lmco dot com>.
+
+Wed Jul  5 19:15:37 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ACE-INSTALL.html: Cleaned up further; clarified role of DOC and
+          support companies and use of PROBLEM-REPORT-FORM.
+
+        * NEWS: Noted removal of Chorus and pSOS.
+
+Tue Jul  4 04:10:11 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Memcpy_Test.cpp: Added a short summary of this test.
+          Thanks to Arvind Krishna for contributing it.
+
+Tue Jul  4 01:05:47 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Memcpy_Test.cpp (testit): ACE-ified this test.
+
+Tue Jul  4 01:03:52 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/CE_fostream.cpp:
+        * tests/Service_Config_Test.cpp: Improved the description of these
+          tests.
+
+Mon Jul  3 14:42:45 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * NEWS: Updated the NEWS file with information about using multiple
+          service repositories.
+
+Mon Jul  3 03:25:43 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * examples/APG/Svc_Config/HA_Configurable_Server_Dynamic.cpp
+          (ACE_TMAIN): Changed the reactor event loop to explicitly pass
+          in ACE_Reactor::check_reconfiguration().  Thanks to Michael Reed
+          <mnr102 at yahoo dot com> for reporting this.
+
+Mon Jul  3 03:15:14 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * examples/Service_Configurator/IPC-tests/server/server_test.cpp
+          (ACE_TMAIN): Changed the reactor event loop to explicitly pass
+          in ACE_Reactor::check_reconfiguration().
+
+Fri Jun 30 13:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/msvc_static_order.lst:
+          Added CSD_Framework and CSD_ThreadPool
+
+Fri Jun 30 09:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_rel_manpages:
+          Updated doxygen version we are using for the release
+
+Fri Jun 30 07:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taoexe.mpb:
+          Added corba/e and core_minimum_corba as base projects so that
+          the executables that can be build with CORBA/e and minimum
+          corba do have set the correct flags during compilation
+
+Thu Jun 29 17:30:52 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * NEWS: Added a note about the logging changes from
+          Tue May 16 22:23:55 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+Thu Jun 29 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Signal_Test.cpp:
+          Layout changes
+
+Thu Jun 29 09:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Containers_T.cpp:
+          Initialise pointer with 0
+
+Thu Jun 29 08:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_g++_common.GNU:
+        * include/makeinclude/platform_osf1_4.x_cxx.GNU:
+        * include/makeinclude/platform_sunos5_ghs.GNU:
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+        * include/makeinclude/wrapper_macros.GNU:
+          Removed support for explicit templates, we don't support that
+          anymore
+
+Thu Jun 29 08:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/ACE-guidelines.html:
+          Document that the STL generic algorithms are safe to be used and
+          made some other small updates
+
+Wed Jun 28 10:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ace_for_tao.mpc:
+          Added missing file because of the sendfile addition to TAO
+
+Wed Jun 28 09:20:08 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
+
+        * protocols/ace/RMCast/Link.cpp:
+        * protocols/ace/RMCast/Link.h:
+        * protocols/ace/RMCast/Socket.cpp:
+          Added explicit calls to close functions for sockets and pipes.
+          Thanks to finalpatch <fengli@gmail.com> for reporting this.
+
+Wed Jun 28 07:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/ACE-guidelines.html:
+          Document that template template arguments are not possible to
+          be used because HP aCC 3.70 doesn't support it.
+
+Tue Jun 27 13:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Unbounded_Queue.cpp:
+          Explicitly initialise pointers with 0
+
+Tue Jun 27 08:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ace_for_tao.mpc:
+          Added MMAP_Memory_Pool.* because TAO uses these for sendfile
+          support
+
+Tue Jun 27 06:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_unistd.inl:
+        * ace/config-WinCE.h:
+          WinCE doesn't seem to have SetFilePointerEx, so introduced
+          ACE_LACKS_SETFILEPOINTEREX which we check in OS_NS_unistd.inl,
+          if this is set we fallback to SetFilePointer
+
+Tue Jun 27 06:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CDR_File_Test.cpp:
+          Fixed 64bit conversion warning
+
+Tue Jun 27 06:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taolib.mpb:
+          Added tao_versioning_idl_defaults as base
+
+Mon Jun 26 13:27:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * NEWS:
+          Added PICurrent refactoring note. Moved from NEWS to TAO/NEWS
+
+Mon Jun 26 08:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/DLL_Manager.h:
+          Reexport ACE_DLL_Handle, the ACE_DLL_Manager returns a pointer
+          to this type in its interfaces. Thanks to Patrick Bennett
+          <Patrick dot Bennett at inin dot com> for reporting this
+
+Mon Jun 26 08:17:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
+        * include/makeinclude/platform_openvms.GNU:
+          Some compileswitch changes.
+
+        * ace/config-openvms.h:
+          Added multicast filtering setting.
+
+Sun Jun 25 11:54:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * include/makeinclude/platform_openvms.GNU:
+          Some compileswitch changes.
+
+Sun Jun 25 08:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/msvc_mpc_auto_compile.pl:
+          Build gperf and TAO_IDL before tao
+
+Sat Jun 24 14:02:15 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Lib_Find.cpp (open_temp_file): In the ACE_WIN32 section,
+          'perm' is not used, so use ACE_UNUSED_ARG on it.
+
+        * tests/Hash_Map_Manager_Test.cpp: Use const ACE_TCHAR with literal
+          string, not non-const. Resolves compile warning on some compilers.
+
+Fri Jun 23 21:03:37 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/Lib_Find.cpp (open_temp_file):
+
+          Added FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE
+          for the 'perms' argument of the Windows version, which
+          eliminates a open_temp_file() failure in the IDL compiler
+          on a file that was previously opened/closed with fopen/fclose.
+          Thanks to Krishnakumar Balasubramanian <kitty@dre.vanderbilt.edu>
+          for figuring out the fix.
+
+Fri Jun 23 16:01:31 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/test_proactor.cpp (open): When calling
+          ACE_OS::open(), don't supply a very UNIXy-looking 0644 value for
+          the 'perms' argument. Let it default to something reasonable for
+          the platform. Using 0644 on Windows passes something Windows doesn't
+          like, and the test fails. Thanks very much to William Cote
+          <William dot Cote at hp dot com> for fixing this.
+
+        * THANKS: Added William Cote to the Hall of Fame.
+
+Fri Jun 23 13:20:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Reverted the change below, it triggers pidl recompilation for all pidl files
+        Fri Jun 23 07:36:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+          Added .pidl to the inputext. This should be the way how things should
+          run fine again in TAO but it seems somewhere ther is something missing.
+
+Fri Jun 23 07:36:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+          Added .pidl to the inputext. This should be the way how things should
+          run fine again in TAO but it seems somewhere ther is something missing.
+
+Thu Jun 22 21:05:20 UTC 2006  Krishnakumar B  <kitty@dre.vanderbilt.edu>
+
+        * ace/OS_NS_fcntl.h (ACE_DEFAULT_OPEN_PERMS): Set the value of
+          ACE_DEFAULT_OPEN_PERMS from ACE_DEFAULT_FILE_PERMS instead of
+          0.  This ensures that users of ACE_OS::open() who don't override
+          the default argument get a sensible default.
+
+Thu Jun 22 15:08:01 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/SSL/SSL_Context.{h cpp} (load_trusted_ca): Added a third
+          argument, bool use_env_defaults, which defaults to true. If false,
+          the ca_file and ca_dir arguments do not get ACE defaults applied
+          to them if passed as 0. This allows a user to specify a 0 file or
+          directory to the underlying SSL_CTX_load_verify_locations() function.
+          If a ca_dir is supplied, attempt to add its CA list to the
+          X509 names in addition to that of ca_file.
+
+          (seed_file): If the file loads ok, check RAND_status() to see if
+          there's "enough" entropy.
+
+        * ace/SSL/SSL_Context.inl:
+        * ace/SSL/SSL_Asynch_Stream.cpp:
+        * ace/SSL/SSL_SOCK_Stream.cpp: When setting up SSL_CTX, set the verify
+          mode as well. When creating a new socket object, let it inherit the
+          verify mode from the SSL context rather than making a call back to
+          the context to retrieve the verify mode and setting it with a
+          separate SSL call.
+
+Thu Jun 22 14:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/msvc_static_order.lst:
+          Build the portableserver earlier in the list of libs
+
+Thu Jun 22 05:29:48 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.cpp:
+
+          The initialize_i() method would not remove a service, which
+          failed to initialize, in case the ACE_NOLOGGING is defined. For
+          some reason the two blocks of code were switched around.  Thanks
+          to Martin Corino <mcorino at remedy dot nl> for pointing out the
+          problem.
+
+Wed Jun 21 21:29:04 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-lynxos.h: Added ACE_LACKS_STRPTIME. This should fix a
+          compile error on LynxOS.
+
+Wed Jun 21 15:45:32 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Hash_Map_Manager_Test.cpp: Fix incorrect concatenating of
+          text literals.
+
+Wed Jun 21 07:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Misc/test_trace.cpp:
+          Fixed fuzz error
+
+Tue Jun 20 23:20:17 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Framework_Component_DLL.cpp: Added a description of this test.
+
+Tue Jun 20 22:34:43 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Service_Config_DLL.cpp: Added a comment block at the top
+          to describe this file's purpose.
+
+Tue Jun 20 22:09:54 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_time.cpp (strptime): Added a const_cast<char*> wherever
+          a return of something based on the const char *buf was done; related
+          to:
+          Tue Jun 20 20:19:37 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * NEWS: Noted that the signature of ACE_OS::strptime() changed, also
+          related to the entry above.
+
+Tue Jun 20 20:19:37 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * configure.ac:
         * ace/README:
+        * ace/OS_NS_time.h:
+        * ace/OS_NS_time.inl:
+        * ace/OS_NS_time.cpp:
+        * m4/config_h.m4: The ACE_OS::strptime() wrapper was previously not
+          compiled in unless ACE_HAS_STRPTIME was set. If this was set and
+          ACE_LACKS_NATIVE_STRPTIME was also set, an emulation was supplied.
+          This has been changed so that:
+             - ACE_OS::strptime() is always supplied.
+             - The emulation is used if ACE_LACKS_STRPTIME is set.
+             - The first arg to ACE_OS::strptime() is now "const char *"
+               instead of "char *" as the native strptime() is.
+             - ACE_OS::strptime() is inlineable.
+          ACE_HAS_STRPTIME is no longer used, and ACE_LACKS_NATIVE_STRPTIME
+          is changed to ACE_LACKS_STRPTIME. If ACE_LACKS_STRPTIME is set
+          and the user decides not to include the emulation, then
+          ACE_REFUSE_STRPTIME_EMULATION should be set, which will cause
+          ACE_NOTSUP_RETURN to be used instead of the emulation.
+
+        * ace/config-borland-common.h:
+        * ace/config-vxworks5.x.h:
+        * ace/config-vxworks6.2.h:
+        * ace/config-win32-dmc.h:
+        * ace/config-win32-ghs.h:
+        * ace/config-win32-mingw.h:
+        * ace/config-win32-msvc-7.h:
+        * ace/config-win32-msvc-8.h:
+        * ace/config-win32-visualage.h: Removed ACE_HAS_STRPTIME; changed
+          ACE_LACKS_NATIVE_STRPTIME to ACE_LACKS_STRPTIME.
+
         * ace/config-cygwin32.h:
-        * ace/config-freebsd.h:
-        * ace/config-hpux-11.00.h:
+        * ace/config-doxygen.h:
         * ace/config-irix6.x-common.h:
         * ace/config-linux-common.h:
-        * ace/config-lynxos.h:
-        * ace/config-macosx-panther.h:
-        * ace/config-macosx-tiger.h:
-        * ace/config-macosx.h:
         * ace/config-netbsd.h:
-        * ace/config-openbsd.h:
         * ace/config-openvms.h:
-        * ace/config-posix.h:
-        * ace/config-qnx-rtp-62x.h:
-        * ace/config-sunos5.7.h:
-        * ace/config-tru64.h:
-        * ace/config-vxworks6.2.h:
-        * ace/config-vxworks6.3.h:
-        * ace/config-win32-common.h:
-        * ace/config-win32-interix.h:
+        * ace/config-sunos5.5.h:
+        * ace/config-tandem-nsk-mips-v3.h: Removed ACE_HAS_STRPTIME.
 
-          Removed ACE_HAS_SNPRINTF and added ACE_LACKS_VSNPRINTF
-          if necessary (I probably missed some platforms, need to recheck
-          after next scoreboard round).
+        * ace/config-rtems.h: Changed ACE_LACKS_NATIVE_STRPTIME to
+          ACE_LACKS_STRPTIME.
+          NOTE!! RTEMS users should add #define ACE_REFUSE_STRPTIME_EMULATION
+          to the local config.h file to avoid bringing in the emulation,
+          maintaining behavior in previous ACE versions.
 
-Thu Dec  7 00:27:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        For additional background on why this arrangement was put in place
+        originally, please see:
+        Tue Aug 10 14:46:12 1999  David L. Levine  <levine@cs.wustl.edu>
+        It makes sense, but adds a unique requirement for porting to new
+        platforms that one must know to explicitly enable an existing wrapper,
+        even if its natively available. This has tripped up a number of porting
+        efforts (including mine) and now it's consistent with other wrappers.
 
-        * m4/config_h.m4:
-        * configure.ac:
+        * m4/ace.m4: Add --enable-wince to set up the BUILD_WINCE setting
+          that's inserted into the Makefile.am files for the wince MPC setting.
 
-          Remove obsolete ACE_HAS_UNION_WAIT feature test.
+        * ace/ace.mpc: Replace config-win32-msvc-6.h with config-win32-msvc-8.h
 
-Wed Dec  6 21:06:37 UTC 2006  Ciju John  <johnc@ociweb.com>
+        * bin/bin/mpc: Removed the verbatim for automake that adds
+          TESTS=auto_run_tests.pl - it was an early attempt at getting the
+          test ability to work that never was right.
 
-        * tests/Bug_2659_Regression_Test.cpp:
-          Compile failure on RTEMS due to non-ANSI signal API on the
-          platform. Fixed by casting function ptr to proper type.
+        * */Makefile.am: Regenerated with MPC. This effectively changes the
+          version scheme based on the changes in:
+          Thu May 18 16:37:46 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Wed Dec  6 14:49:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * apps/Makefile.am: Hand-added code to avoid building gperf if
+          --disable-gperf was specified to configure. Thanks to Robert Schwebel
+          <robert at schwebel dot de> for this fix.
 
-        * m4/config_h.m4:
-        * configure.ac:
+        * apps/gperf/tests/Makefile.am: This one doesn't get close to being
+          regenerated with MPC. The "stamp" items require hand-tweaking as
+          given in previous entries for this file.
 
-          Remove obsolete ACE_LACKS_CMSG_DATA_MACRO and
-          ACE_LACKS_CMSG_DATA_MEMBER feature test.
+        * ace/Makefile.am: Regenerated with MPC and hand-tweaked to add needed
+          "nobase_include_HEADERS =" line.
 
-Wed Dec  6 11:07:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * configure.ac: Added the following new AC_CONFIG_FILES entries:
 
-        * ace/config-mit-pthread.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-          Removed MIT pthread config files, not supported for years
-          anymore
+        * ACEXML/tests/util/Makefile.am:
+        * apps/JAWS2/Makefile.am:
+        * apps/JAWS2/JAWS/Makefile.am:
+        * examples/ASX/Event_Server/Makefile.am:
+        * examples/ASX/Event_Server/Event_Server/Makefile.am:
+        * examples/ASX/Event_Server/Transceiver/Makefile.am:
+        * examples/ASX/UPIPE_Event_Server/Makefile.am:
+        * examples/Map_Manager/Makefile.am:
+        * examples/Reactor/TP_Reactor/Makefile.am:
+        * protocols/tests/Makefile.am:
+        * protocols/tests/RMCast/Makefile.am: New files, generated with MPC.
+
+        * THANKS: Added Robert Schwebel to the Hall of Fame.
+
+Tue Jun 20 19:25:20 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Task.{h inl cpp}: Moved the public data members (thr_count_,
+          thr_mgr_, flags_, grp_id_, lock_) from public to a new protected
+          section. There was a comment that said these should be private, but
+          no reason given why they weren't.
+          Removed the thr_count_dec() method since it is no longer used
+          anywhere in ACE. Moved its functionality into cleanup() where it
+          also sets the new last_thread_id_ member (see below).
+          Added a new member last_thread_id_ which holds the thread ID
+          (ACE_thread_t) of the last thread to exit svc() processing. Before
+          any threads exit, the value is 0; it's set to 0 in the constructor
+          and in activate().
+          The new accessor, ACE_thread_t last_thread (void) const, retrieves
+          the value of last_thread_id_. It's recommended that a thread in
+          close() check the last_thread_id_ value, rather than the thr_count(),
+          when deciding if it's safe to destroy the object. Since thr_count
+          can be seen as 0 in multiple threads concurrently, it's not safe
+          to rely on for destroying a thread. This fixes Bugzilla #2339.
+          Thanks to Howard Finer <hfiner@sonusnet.com> for this idea.
+
+        * NEWS: Added a note about the new ACE_Task::last_thread() method.
+
+Tue Jun 20 18:55:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Based_Pointer_Test.cpp:
+        * tests/Based_Pointer_Test_Lib.cpp:
+        * tests/CDR_File_Test.cpp:
+        * tests/DLL_Test.cpp:
+        * tests/Malloc_Test.cpp:
+        * tests/Process_Manager_Test.cpp:
+          Several fixes to make OpenVMS happy.
 
-        * ace/config-mklinux.h:
-          Removed, this linux version hasn't been maintained for years
+Tue Jun 20 18:04:45 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/ACE.cpp:
-          Removed all mit-pthread specific code
+        * examples/Log_Msg/test_ostream.cpp (ACE_TMAIN): Couldn't used
+          std::getline() for some odd reason..  Fixed by using
+          ifstream::getline() instead.  Thanks to Johnny for reporting
+          this.
 
-        * configure.ac:
-          Removed mit-pthread checks
+Tue Jun 20 14:31:05 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/WFMO_Reactor.cpp:
-          Const/bool change
+        * examples/Misc/test_trace.cpp (recursive): Simplified the
+          ACE_TRACE method name to make fuzz happy.
 
-Wed Dec  6 07:57:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jun 20 13:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/ciao_tests.lst:
-        * bin/tao_orb_tests.lst:
-        * bin/tao_other_tests.lst:
-          Disabled all tests that are disabled in a minimum_corba build also
-          when using CORBA/e compact and micro
+        * tests/Hash_Map_Manager_Test.cpp:
+          Fixed unicode compile problems
 
-Tue Dec  5 23:53:34 UTC 2006  Ciju John  <johnc@ociweb.com>
+Tue Jun 20 12:51:19 UTC 2006  James H. Hill  <hillj@isis.vanderbilt.edu>
+
+        * bin/ChangeLogEditor/FileLocatorFactory.pm:
+
+          Now supports the standard hack for subversion on Windows when
+          SVN_ASP_DOT_NET_HACK environment variable is set. Instead
+          of placing repo info in a .svn file, it is placed in _svn.
+
+Tue Jun 20 12:31:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/os_include/os_time.h:
+        * ace/os_include/sys/os_types.h:
+          Fixed type definitions for OpenVMS.
+
+        * ace/config-openvms.h:
+          Updated build configuration for OpenVMS.
+
+        * ace/Lib_Find{.h .cpp}:
+        * ace/DLL_Manager.cpp:
+        * ace/Service_Config{.h .cpp}:
+        * ace/Global_Macros.h:
+        * ace/Strategies_T.cpp:
+        * ace/Logging_Strategy.cpp:
+          Added support for dynamic loading scheme of service configurator
+          framework under OpenVMS.
+
+        * ace/OS_NS_stdio.h:
+          Additional include for OpenVMS.
+
+Tue Jun 20 08:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taolib.mpb:
+          Add corba subset projects as base
+
+        * bin/MakeProjectCreator/config/core_minimum_corba.mpb:
+          New file for usage within the core libs
+
+        * bin/MakeProjectCreator/config/core_minimum_corba.mpb:
+          Make minimum corba a feature
+
+Tue Jun 20 07:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Log_Msg/test_callback.cpp:
+          Fixed typo
+
+Tue Jun 20 07:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/global.features:
+          CORBA subset configurations are disabled by default
+
+Mon Jun 19 18:03:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * include/makeinclude/platform_openvms.GNU:
+          Changed template instantiation model.
+
+        * include/makeinclude/rules.local.GNU:
+          Change to enable adding custom REALCLEAN_FILES in platform file.
+
+Mon Jun 19 15:11:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * bin/auto_run_tests.pl:
+          Changed to enable spawning Perl testscripts on OpenVMS.
+
+Mon Jun 19 14:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+          Replaced dsp/dsw with sln/vcproj. Thanks to Abdullah Sowayan
+          <abdullah dot sowayan at lmco dot com> for reporting this
+
+Mon Jun 19 13:14:54 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Fixed a typo.
+          Thanks to Abdul for reporting this.
+
+        * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Added a
+          test for the two allocator version of ACE_Hash_Map_Manager.
+          Thanks to Jarek for contributing this.
+
+Mon Jun 19 02:55:48 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * examples/Log_Msg/test_ostream.cpp (ACE_TMAIN): Enhanced the test to
+          show the ofstream output better.
+
+Mon Jun 19 01:31:46 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * examples/Log_Msg/test_callback.cpp (ACE_TMAIN): Zapped the
+          extraneous '\n' from the messages.
+
+Mon Jun 19 01:06:49 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * examples/Misc/test_trace.cpp: Enhanced to the the ACE_TRACE macro.
+
+Sun Jun 18 16:58:20 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * netsvcs/clients/Logger/indirect_logging.cpp (ACE_TMAIN): Cleaned
+          up the test to work if none of the daemons are running.
+
+Sun Jun 18 16:44:14 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Signal.{inl,cpp}: Moved the destructors out of the *.inl
+          file into the *.cpp file since inline destructors aren't really
+          a good idea.
+
+Sun Jun 18 16:35:13 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * netsvcs/lib/Client_Logging_Handler.cpp (send): Printout the type
+          of log message as a diagnostic to make it easier to see the
+          filtering that's going on!
+
+Fri Jun 16 17:48:18 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/CDR_Size.cpp (adjust): Added a fix for the case where
+          ACE_LACKS_CDR_ALIGNMENT is undefined.  Thanks to Aleksandar
+          Vukajlovic <vukajlo at finsoft dot co dot yu> for contributing
+          this.
+
+Fri Jun 16 13:57:53 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Ping_Socket.cpp: Replaced the use of char, short, int,
+          etc. for struct ip and icmp with the equivalent
+          ACE_UNIT[8,12,32] types to ensure a fixed size.  Thanks to Paul
+          Daugherty <Paul at nextalk dot com> and Robert S. Iakobashvili
+          <coroberti at gmail dot com> for reporting this and contributing
+          a fix.
+
+Mon Jun 19 11:37:17 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_unistd.{h,cpp,inl}:
+          Changed the (f)truncate method to use ACE_LOFF_T and use
+          SetFilePointerEx on windows to fix 64bit warnings
+
+Mon Jun 19 10:08:17 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/diff-builds.pl:
+          Changed this script not to die when we can't find results for
+          a certain date, then just take the closest results.
+
+Mon Jun 19 10:00:17 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Service_Gestalt.cpp:
+        * ace/Acceptor.cpp:
+          Const improvement
+
+Mon Jun 19 09:56:17 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/OS_NS_sys_sendfile.cpp (sendfile_emulation):
+
+          Verify the ACE_OS::mmap() call succeeded prior to continuing.
+
+          Use ACE_OS::send() instead of ACE_OS::write() on Windows.  The
+          latter doesn't provide the same semantics on Windows as on
+          Unix.  Addresses an ACE_OS::sendfile() failure on Windows.
+
+Tue Jun 13 02:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_tests.lst:
+          Don't run netlink test in ACE_FOR_TAO configuration
+
+Mon Jun 12 17:00:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Set winnt to 0 if not explicitly set by a platform_*.GNU
+          makefile.
+
+Mon Jun 12 16:48:19 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/SV_Shared_Memory_Test.cpp (run_main): Moved a couple of
+          calls outside of ACE_ASSERT since they don't belong in there.
+
+Mon Jun 12 14:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_stat.h:
+          Fixed mingw definition of ACE_stat
+
+Mon Jun 12 10:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/vc6.features:
+          Removed this file, wer don't support vc6 anymore
+
+Mon Jun 12 01:30:03 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Thread_Manager.cpp (wait): Changed the flag parameters to be
+          bool rathet than int.  Thanks to Johnny for this suggestion.
+
+Sat Jun 10 22:32:03 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ACE-INSTALL.html: Corrected a bunch of platform build things and
+          hopefully clarified the sections a bit.
+
+        * bin/make_release: Removed the search for, and chmod for, dsp/dsw
+          files - they're for MSVC6 which is no longer generated.
+
+Sat Jun 10 10:07:32 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Thread_Manager.cpp:
+          Fix for compiler errors.
+
+Sat Jun 10 04:31:54 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * bin/MakeProjectCreator/config/automake.features:
+
+          Define MPC feature variable "wxWindows" to 1.
+
+        * bin/MakeProjectCreator/config/wxwindows.mpb:
+
+          Add automake specific definitions for compile_flags,
+          linkflags, and pure_libs.
+
+Fri Jun  9 19:25:19 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Thread_Manager.h: Added a new parameter to wait() that
+          determines whether relative or absolute time is used.  Thanks to
+          Sonicfly Zhou <zhoucn at txsec dot com> for this idea.
+
+Fri Jun  9 14:06:52 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Hash_Map_With_Allocator_T.{h,inl,cpp}: Enhanced this class
+          so that it compiles with the new "two allocator"
+          ACE_Hash_Map_Manager_Ex class.  This class needs to be improved
+          so that it actually leverages the two allocator features, but
+          that's something for the future.
+
+Fri Jun  9 13:15:38 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Hash_Map_Manager_T.h: Clarified the meaning of the
+          constructor and open() parameters.
+
+Fri Jun  9 13:07:40 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Hash_Map_Manager_T.cpp (open): If the user doesn't supply an
+          entry_alloc pointer then use the table_alloc pointer.
+
+Fri Jun  9 13:00:22 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Hash_Map_Manager_T.cpp (open): Zapped the use of ACE_ASSERT
+          and replaced it with and if statement.  We shouldn't be using
+          ACE_ASSERT in ACE library code..
+
+Fri Jun  9 12:53:48 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Hash_Map_Manager_T.{h,inl,cpp}: Added support for a separate
+          allocator for creating the entries in the chain of
+          ACE_Hash_Map_Entry objects in the buckets.  There are now two
+          allocators, one for the bucket table and the other for the
+          entries in the buckets.  Thanks to Jaroslaw Nozderko <jaroslaw
+          dot nozderko at polkomtel dot com dot pl> for this fix.
+
+Fri Jun  9 14:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ace_for_tao.mpc:
+          Updated because ARGV and Arg_Shifter are template files now
+
+Fri Jun  9 13:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/FILE_IO.cpp:
+          Const improvements
+
+        * ace/MMAP_Memory_Pool.cpp:
+          Added static cast from ACE_LOFF_T to size_t and const improvements
+
+Fri Jun  9 13:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/FILE_IO.cpp:
+          Added static cast from ACE_LOFF_T to size_t
+
+Fri Jun  9 13:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_stat.inl:
+          Use special stat call for vc71
+
+Fri Jun  9 13:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Connection_Recycling_Strategy.h:
+          Doxygen improvement
+
+Fri Jun  9 13:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_unistd.{h,cpp}:
+          Use ACE_LOFF_T in the pwrite interface
+
+Fri Jun  9 12:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_stat.h:
+          With vc71 use _stati64 for ACE_stat, not __stat64. The first has
+          time as 32bit, the second time as 64 bit (__time64_t) which causes
+          problems because the time interfaces of ACE use time_t which is
+          32bit with vc71 but 64bit with vc8.
+
+Fri Jun  9 10:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Configuration_Import_Export.cpp:
+          Initialise pointer with 0
+
+Fri Jun  9 10:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Arg_Shifter.{h,cpp}:
+          Also refactored ACE_Arg_Shifter to ACE_Arg_Shifter<CHAR_TYPE> and
+          made ACE_Arg_Shifter a typedef. The refactoring fo ACE_ARGV resulted
+          in a drop of the TAO Hello client executable of about 2.5Kb which is
+          nice for such a small change.
+
+        * ace/ace.mpc:
+        * ace/Makefile.am:
+          Updated because Arg_Shifter.cpp is not a template file
+
+Fri Jun  9 09:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-linux-common.h:
+          Added ACE_HAS_NETLINK, all linux versions do support netlink sockets.
+          This closes bugzilla bug 2317. Thanks to Robert Iakobashvili
+          <coroberti at gmail dot com> and Razi Ben-Yehuda
+          <raziebe at gmail dot com> for creating the netlink wrappers
+
+Fri Jun  9 08:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/SOCK_Netlink_Test.cpp:
+          New test for netlink sockets. Thanks to Robert Iakobashvili
+          <coroberti at gmail dot com> for creating this test.
 
-        * tests/Bug_2659_Regression_Test.cpp:
-        * tests/run_test.lst:
         * tests/tests.mpc:
-          Adding regression test for Bug 2659.
+        * tests/run_test.lst:
+          Added new netlink test
 
-Tue Dec  5 19:44:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Jun  9 07:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-freebsd.h:
-          Simplified ACE_HAS_SNPRINTF setting
+        * ace/ARGV.{h,cpp,inl}:
 
-        * ace/config-irix6.x-common.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-        * ace/config-tru64.h:
-          Removed commented out defines, makes it easier to search whether
-          a macro is defined in any config file or not
+          Refactored ACE_ARGV to ACE_ARGV_T which is a template, where
+          ACE_ARGV is now a typedef of ACE_ARGV_T<ACE_TCHAR>. Taken the
+          idea from the wchar work of David Giovannini <giovannd at ociweb
+          dot com>
 
-        * ace/config-tru64.h:
-          Use config-posix.h
+        * ace/ace.mpc:
+        * ace/Makefile.am:
 
-        * ace/Read_Buffer.{h,cpp}:
-          Changed close_on_delete to a real bool
+          ARGV.cpp added to the template files, added the new netlink files
+
+        * ace/OS_NS_sys_stat.{h,inl}:
+        * ace/MMAP_Memory_Pool{h,cpp}:
+        * ace/Mem_Map.{h,cpp,inl}:
+        * ace/Filecache.{h,cpp}:
+        * ace/FILE_IO.cpp:
+        * ace/FILE.h:
+
+          Use ACE_LOFF_T for the filesize so that we can support files
+          bigger then 2Gb on windows and other platforms. Also use for
+          Borland the 64bit stat structure and api's. This fixes bugzilla
+          bug 1286, thanks to Ruslan Zasukhin <sunshine at public dot
+          kherson dot ua> for reporting this. Also fixes part of bugzilla
+          bug 2359, thanks to Olivier Brunet <o dot brunet at free dot fr>
+          for reporting this.
 
-        * ace/Service_Config.{h,inl}:
-        * ace/Service_Gestalt.{h,cpp,inl}:
-          Use bool for the ignore arguments
+Thu Jun  8 17:13:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/SOCK_Dgram.inl:
-          Const change
+        * ace/String_Base.h,
+          ace/Array_Map.h: Removed the @deprecated
+          comments to make Ossama happy ;-)  This fixes bugid 2558.
 
-Tue Dec  5 15:47:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jun  8 12:44:46 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * include/makeinclude/makeinclude/platform_osf1_3.2_cxx.GNU:
-        * include/makeinclude/makeinclude/platform_osf1_4.x_cxx.GNU:
-        * include/makeinclude/makeinclude/platform_osf1_4.x_g++.GNU:
-        * include/makeinclude/makeinclude/platform_osf1_4.x_rcc.GNU:
-          Removed, very old
+        * ace/OS_NS_Thread.inl (recursive_mutex_lock): Cleaned up the
+          structure of the code here so that we don't try to release the
+          nesting lock unless it was acquired successfully.  Thanks to
+          J.T. for reporting this.
 
-        * include/makeinclude/makeinclude/platform_tru64_cxx.GNU:
-        * include/makeinclude/makeinclude/platform_tru64_g++.GNU:
-          We should be able to build on tru64 but it isn't really maintained,
-          moved the contents of the osf files into these files
+Thu Jun  8 12:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Dec  5 15:22:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/MakeProjectCreator/config/corba_e_compact.mpb:
+        * bin/MakeProjectCreator/config/corba_e_micro.mpb:
+          New base projects for CORBA/e micro and compact
 
-        * include/makeinclude/makeinclude/platform_aix4_cset++.GNU:
-        * include/makeinclude/makeinclude/platform_aix.GNU:
-          Moved contents of cset++ method into the aix one, the aix
-          file just included the first one
+Thu Jun  8 12:28:49 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * include/makeinclude/makeinclude/platform_aix4.2.GNU:
-          Removed, old
+        * bin/DependencyGenerator/DependencyEditor.pm:
+        * bin/DependencyGenerator/DependencyGenerator.pm:
+        * bin/DependencyGenerator/GNUDependencyWriter.pm:
+        * bin/DependencyGenerator/GNUObjectGenerator.pm:
+        * bin/DependencyGenerator/Preprocessor.pm:
+        * bin/depgen.pl:
 
-        * ace/config-aix-4.x.h:
-        * ace/config-aix-5.x.h:
-          Moved contents of 4.x.h file into the 5.x.h file. Removed a lot
-          of old checks for AIX 4 so that we can maintain things easier.
+          Committing performance improvements which take off about 7% from
+          the dependency generation time for the whole ACE_wrappers tree.
 
-        * ace/ACE.cpp:
-        * ace/OS_NS_sys_wait.inl:
-          Removed ACE_HAS_UNION_WAIT, was only set for aix4
+Thu Jun  8 11:57:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/Log_Msg.cpp:
-        * ace/OS_NS_Thread.cpp:
-          Removed code for AIX 4.x to handle pthread_t
+        * ace/OS_NS_dirent.cpp:
+        * ace/OS_NS_dirent.h:
+
+          Don't compile the {opendir,readir,closedir,scandir}_emulation()
+          functions if {opendir,readir,closedir,scandir} are provided by
+          the OS.
+
+Thu Jun  8 11:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Netlink_Addr.h:
+        * ace/SOCK_SEQPACK_Association.h:
+          Doxygen fixes
+
+        * ace/OS_NS_Thread.inl:
+          Const improvement
+
+Thu Jun  8 11:37:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ace/config-netbsd.h:
+
+          Define ACE_HAS_SCANDIR and ACE_SCANDIR_CMP_VOIDPTR.
+
+Wed Jun  7 23:02:53 UTC 2006  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * tests/Recursive_Mutex_Test.cpp: Use ACE_TEST_MUTEX instead of
+          ACE_Recursive_Thread_Mutex so that we use the right version of
+          mutex (ACE_Process_Mutex) on Windows.  Thanks to Doug for the
+          suggestion.  This should fix the Recursive_Mutex_Test failing on
+          Windows.
+
+Wed Jun  7 21:42:36 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb
+
+          Fixed static library ordering problem.
+
+Wed Jun  7 13:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-doxygen.h:
+          Added ACE_HAS_NETLINK so that we get documentation for the new
+          netlink classes
+
+Wed Jun  7 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          Removed chorus
+
+Wed Jun  7 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/os_include/sys/os_socket.h:
-          Removed ACE_HAS_AIX_BROKEN_SOCKET_HEADER, was only set for aix 4
+          When ACE_HAS_NETLINK is defined, include more files specific
+          for this protocol.
+
+Wed Jun  7 12:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Netlink_Addr.{h,cpp,inl}:
+        * ace/SOCK_Netlink.{h,cpp,inl}:
+          New files for netlink sockets. Thanks to Robert Iakobashvili
+          <coroberti at gmail dot com> and Razi Ben-Yehuda
+          <raziebe at gmail dot com> for creating these new files.
+          These files will be added to the ACE mpc later this week, with
+          the files in the repo it is much easier to test them on
+          multiple linux version. See bugzilla bug 2317 for more info.
+
+Wed Jun  7 12:28:18 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Changed the message displayed when a project isn't build when a
+          particular feature is disabled.  Many users thought that this
+          message was an error, I believe, because of the word 'missing'.
+
+Wed Jun  7 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-suncc-common.h:
+          New config file for the SunCC compiler, idea is to refactor
+          all things related to the Sun C++ compiler to this file. This is
+          to make it easier to support Sun C++ on Linux
+
+Wed Jun  7 10:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_linux_suncc.GNU:
+          First version for using the Sun compiler on Linux. The compiler
+          itself is an alpha version, so no guarantees at this moment
 
-Tue Dec  5 15:08:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jun  7 10:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-aix-4.1.x.h:
-        * ace/config-aix-4.2.x.h:
-        * ace/config-aix-4.3.x.h:
-          Removed, these AIX versions aren't supported anymore
+        * ace/Strategies_T.cpp:
+          Initialise pointer with 0 and const improvement
 
-Tue Dec  5 14:33:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jun  7 09:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-irix6.x-sgic++-nothreads.h:
-          Removed
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+          When using -SS we do generate an empty S.h file, so add S
+          to the header_outputext so that we zap this file during a clean
 
-Tue Dec  5 14:30:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jun  7 09:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-sunos5.4-centerline-2.x.h:
-        * include/makeinclude/platform_sunos5_centerline.GNU:
-          Removed centerline support
+        * include/makeinclude/platform_aix_g++.GNU:
+          Set X11 and Xt defines, thanks to Peter Grotrian
+          <peter dot grotrian at pdv-fs dot de> for reporting this. This fixes
+          bugzilla 2556
 
-Tue Dec  5 14:07:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/config-sunos5.5.h:
+          Added fixes to build with threads=0, this fixes bugzilla bug 2555. Thanks
+          to Peter Grotrian <peter dot grotrian at pdv-fs dot de> for reporting
+          this.
+
+        * ace/config-aix-4.x.h:
+          Added fixes to build with threads=0, this fixes bugzilla bug 2553. Thanks
+          to Peter Grotrian <peter dot grotrian at pdv-fs dot de> for reporting
+          this.
 
-        * include/makeinclude/platform_sunos4_g++.GNU:
-        * include/makeinclude/platform_sunos4_lucid.GNU:
-        * include/makeinclude/platform_sunos4_sunc++3.x.GNU:
-        * include/makeinclude/platform_sunos4_sunc++4.x.GNU:
-          Removed, not supported anymore
+        * include/makeinclude/platform_chorus.GNU:
+        * include/makeinclude/platform_chorus4.x_g++.GNU:
+        * include/makeinclude/platform_chorus_ghs.GNU:
+        * include/makeinclude/platform_psos_diab.GNU:
+        * include/makeinclude/platform_psos_diab_ppc.GNU:
+        * include/makeinclude/platform_psos_tm.GNU:
+        * include/makeinclude/platform_psosim_g++.GNU:
+          Removed these files, psos and chorus are not supported anymore
 
-Tue Dec  5 13:59:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jun  7 08:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-sco-5.0.0-fsu-pthread.h:
-          Deleted, fsu pthread is already removed some time ago.
+        * ace/OS_NS_Thread.cpp:
+          Added needed check for VxWorks with task api
+
+        * ace/os_include/sys/os_stat.h:
+          Removed workarounds for old Borland compiler versions
 
-Tue Dec  5 13:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jun  7 03:25:00 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * ace/config-sco-4.2-nothread.h:
-          Deleted, ancient
+        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb
+        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpc
 
-Tue Dec  5 13:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Corrected the file extension.
 
-        * ace/config-dgux-4.11-epc.h:
-        * ace/config-dgux-4.x-ghs.h:
-        * include/makeinclude/platform_dgux4_epc.GNU:
-        * include/makeinclude/platform_dgux4_ghs.GNU:
-          Deleted
+Tue Jun  6 21:11:37 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/WFMO_Reactor.cpp (open): make sure we delete the
+          notify_handler_ before reassigning it to prevent resource leaks.
+          Thanks to Sonicfly Zhou <zhoucn at txsec dot com> for suggesting
+          this.
+
+Tue Jun  6 21:41:02 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Service_Gestalt.{h cpp}:
+        * ace/Dynamic_Service_Base.cpp:
+        * ace/Dynamic_Service_Dependency.cpp:
+        * ace/Service_Config.cpp:
+        * ace/Service_Object.cpp:
+        * ace/Svc_Conf_Lexer.cpp: Add missing #include directives.
+
+Tue Jun  6 18:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/OS_NS_Thread.cpp:
-          Removed dgux support. Fixes bugzilla 2011
+          Reverted a change for VxWorks, broke other platforms, will make
+          a new change tomorrow.
 
-Tue Dec  5 13:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jun  6 17:14:51 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/config-irix5.2.h:
-        * ace/config-irix5.3-g++.h:
-        * ace/config-irix5.3-sgic++.h:
-        * include/makeinclude/platform_irix5.2.GNU:
-        * include/makeinclude/platform_irix5.3_g++.GNU:
-        * include/makeinclude/platform_irix5.3_sgic++.GNU:
-          Deleted
+        * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
 
-        * include/makeinclude/platform_irix6.x_common.GNU:
-          Use operator ?=
+          Cleaned up the fill_value() method and removed an unused method.
 
-        * ace/os_include/os_signal.h:
-          Removed Irix 5 support, fixes bugzilla 2013.
+        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
 
-Tue Dec  5 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Use DirectoryManager::mpc_basename() instead of
+          File::Basename::basename().
 
-        * ace/config-m88k.h:
-        * include/makeinclude/platform_m88k.GNU:
-          Deleted
+Tue Jun  6 15:43:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * ace/os_include/os_signal.h:
-        * ace/os_include/sys/os_resource.h:
-        * ace/os_include/sys/os_time.h:
-          Removed support for m88k which isn't maintained for years now.
-          Fixes bugzilla 2012
+        * bin/MakeProjectCreator/templates/gnu.mpd
+
+          Modified to explicitly state the name of a project being skipped
+          due to missing features or libraries.
+
+Tue Jun  6 03:57:08 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ace/Hash_Map_Manager_T.cpp:
+        * ace/Hash_Map_Manager_T.h:
+
+          Added key() and item() methods to ACE_Hash_Map_Entry<>, to be
+          like ACE_RB_Tree_Node<>.  This makes it easier to switch code
+          to and from Hash_Maps and RB_Trees.  Mark direct access to
+          the ext_id_ and int_id_ fields @deprecated.
+
+        * ace/Hash_Map_Manager_T.cpp:
+        * ace/Hash_Map_Manager_T.h:
+        * ace/Hash_Map_Manager_T.inl:
+        * ace/RB_Tree.h:
+        * ace/RB_Tree.inl:
+
+          Added operator->() for iterators to be more like STL API.
+
+Mon Jun  5 20:27:42 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb
+        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpc
+
+          Restructured to clean up config handlers MPC files.
+
+Sun Jun  4 13:38:21 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Array_Map_Test.cpp: Fixed all uses of empty() to be
+          is_empty().
+
+Sun Jun  4 13:35:25 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Array_Map.{h,inl},
+        * ace/Intrusive_List.{h,inl},
+        * ace/String_Base.{h,inl}: Changed empty() to is_empty(), which
+          makes more sense.  Kept empty() around for the time being as a
+          @deprecated method.  Thanks to Domingos Monteiro <d dot monteiro
+          at netia dot net> for this suggestion.
+
+Sun Jun  4 00:51:38 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/CString.{h,inl,cpp}: Added some performance improvements for ACE_CString:
+
+          . Introduced new operators == and != to compare ACE_CString
+            and const char *.  This results in at least a 10-fold performance
+            improvement, due to avoiding dynamic memory allocation.
+
+          . Streamlined the existing operator == between two ACE_CString's.
+            (15% improvement in some cases, due to avoiding some of the
+            overhead of compare())
+
+          Also cleaned up some of the doxygen comments, e.g., the
+          ACE_CString comparison operators must have been returning an
+          integer at some point (?), but it's not the case anymore.
+          Thanks to Patrick Rabau <pr2345 at gmail dot com> for these
+          patches.
+
+Fri Jun  2 19:52:19 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
-Tue Dec  5 13:28:10 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+        * bin/tao_orb_tests.lst:
+
+          Removed DII_Collocation_Tests.
+
+Fri Jun  2 16:29:55 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Select_Reactor_T.cpp (open): Added an error message
+          explicitly noting that the notification pipe open failed, which
+          should make debugging easier when this occurs, e.g., due to a
+          disabled network interface.  Thanks to David Highley <dhighley
+          at highley-recommended dot com> for this suggestion.
+
+Fri Jun  2 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb:
+          Updated to make cross compilation possible
+
+Fri Jun  2 12:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/MakeProjectCreator/templates/gnu.mpd:
+          Added TAO_IDL3_TO_IDL2 and TAO_IDL3_TO_IDL2_DEP as first step to
+          run idl3_to_idl2 in a cross build environment
 
-          If the gendir setting for the custom file is '.', then ommit the
-          gendir setting.  This is required for version 3.4.45 of MPC.
+Fri Jun  2 11:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Dec  5 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * include/makeinclude/platform_vxworks6.2.GNU:
+          Updated for VxWorks 6.2
 
-        * ace/os_include/sys/os_socket.h:
-          Removed check for ACE_LACKS_CMSG_DATA_MACRO which wasn't
-          set in any configuration file. This also resulted in the
-          removal of ACE_LACKS_CMSG_DATA_MEMBER because this define
-          was never checked
+Fri Jun  2 11:33:36 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/config-qnx-neutrino.h:
-        * ace/config-qnx-rtp-62x.h:
-        * ace/config-qnx-rtp-pre62x.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-tandem-nsk-mips-v3.h:
-          Removed ACE_LACKS_CMSG_DATA_MEMBER, it has no impact at all
+        * tests/Recursive_Mutex_Test.cpp (test_recursion_depth): The
+          get_nesting_level() only works on certain OS platforms, so don't
+          use it as part of the test.
 
-Tue Dec  5 11:25:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+Fri Jun  2 10:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/SStringfwd.h:
+        * ace/Configuration.cpp:
+          Fixed operator==
 
-          Provide for annoying HP aCC 3.xx template bug.
+        * tests/Config_Test.{h,cpp}:
+          Added an explicit test for operator==. Thanks to Popeye Cai
+          <popeye dot cai at utstar dot com> for reporting this. This
+          fixes bugzilla bug 2550
 
-Tue Dec  5 10:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Jun  2 10:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-lynxos.h:
+        * ace/OS_NS_Thread.cpp:
+          Improved VxWorks 6.2 support
 
-          Improved LynxOS 4.2 support
+        * ace/Svc_Handler.cpp:
+          64bit change and initialise pointer with 0
 
-Mon Dec  4 23:13:12 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * ace/Process.cpp:
+          Added support for VxWorks 6.x in rtp mode
 
-        * ace/Service_Gestalt.cpp (init_i):
+Fri Jun  2 09:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed bug#2735 and eliminated a potential memory leak of the
-          list of already processed static services. The failure scenario
-          is based on a case where static initializers register a bunch of
-          service objects and then later the gestalt::open() is called. At
-          that point, the abovementioned list is reinitialized and its
-          contents was lost. See also the other failure scenario
-          (bug#2701) for which a fix was put in on Nov 9 2006.
+        * ace/OS_NS_Thread.inl:
+          Added necessary code for VxWorks 6.2
 
-Mon Dec  4 18:00:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Thu Jun  1 23:13:58 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
         * bin/tao_orb_tests.lst:
 
-          Added a regression test for bug#2612
+          Added oneway and twoway DII_Collocation_Tests.
 
-Mon Dec  4 15:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jun  1 20:53:31 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * bin/MakeProjectCreator/config:
-          Moved TAO base projects to $TAO_ROOT/MPC/config
+        * tests/Recursive_Mutex_Test.cpp (run_main):
 
-Mon Dec  4 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added ACE_UNUSED_ARG macros to eliminate 'unused parameter'
+          warnings on single threaded builds.
 
-        * bin/MakeProjectCreator/config/MPC.cfg:
-          Set includes so that TAO and CIAO base projects could be
-          under TAO_ROOT and CIAO_ROOT
+Thu Jun  1 16:54:56 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Added new DII_Collocation_Tests.
+
+Thu Jun  1 13:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/FILE.cpp:
+          Const improvement
+
+Thu Jun  1 12:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Dirent_Test.cpp:
+          Updated VxWorks specific checks, removed chorus checks
+
+Thu Jun  1 11:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Threads/thread_pool.cpp:
+          Fixed 64bit conversion warnings
+
+Thu Jun  1 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/diff-builds.pl:
+          Corrected usage of strftime
+
+Thu Jun  1 09:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Default_Constants.h:
+          Define the platform suffix for vxworks
+
+        * ace/Sock_Connect.cpp:
+          Added include for VxWorks and removed some unneeded checks
+          for vxworks >= 0x600
+
+        * ace/ACE.h:
+          Doxygen improvement
+
+        * ace/config-vxworks6.2.h:
+          Updated with more settings to better match vxworks 6.2
+
+        * ace/Process_Manager.cpp:
+          Added specific check for vxworks
+
+        * ace/OS_NS_stdlib.inl:
+          Emulate putenv with setenv when putenv is not available but
+          setenv is.
+
+Thu Jun  1 02:26:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Service_Gestalt.h:
+        * ace/Service_Gestalt.cpp:
+
+          Reworked the way static svc descriptors are kept so that if DLLs
+          include static initializers, they won't cause a problem if the
+          DLL is later unloaded and reloaded. There is currently no
+          dependency replationship between these "static" services and the
+          DLL that contains them, so there is still a slight risk that
+          pointers held after the DLL is unloaded might be referenced. But
+          the only thing that actually uses these pointers is the service
+          gestalt itself if it is processing an explicit static directive
+          and the desired service object had not yet been loaded in that
+          configuration context.
+
+Wed May 31 20:49:03 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * examples/APG/Logging/Trace.h:
+
+          Added '##' to several macro definitions in this file, at the
+          suggestion of Steve Huston <shuston@riverace.com> to get
+          rid of warnings on GCC4 platforms.
+
+Wed May 31 18:18:37 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_component_dnc.mpb:
         * bin/MakeProjectCreator/config/ciao_config_handlers.mpb:
-        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb:
-        * bin/MakeProjectCreator/config/ciao_container_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_events_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodeapplication.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_noop_configurator.mpb:
-        * bin/MakeProjectCreator/config/ciao_plan_generator.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_component.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_default.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_monitor.mpb:
-        * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb:
-        * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_xml_utils.mpb:
-        * bin/MakeProjectCreator/config/ciaocidldefaults.mpb:
-        * bin/MakeProjectCreator/config/cidlc.mpb:
-        * bin/MakeProjectCreator/config/dance_extension_stub.mpb:
-          Moved to $CIAO_ROOT/MPC/config
 
-Mon Dec  4 13:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Shortened some line lengths, to make the file more readable.
+
+Wed May 31 16:36:43 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/tests.mpc:
+        * tests/run_test.lst: Don't build or run Unload_libACE on WinCE. The
+          code is purposely leaving out ACE stuff and the ACE stuff is needed
+          for WinCE, unless there's lots of conditional code added to duplicate
+          the workings on ACE_TMAIN on CE.
+
+Wed May 31 14:33:16 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/OS_NS_Thread.inl (recursive_mutex_lock):
+
+          Added additional ACE_UNUSED_ARG for the timeout parameter, to
+          eliminate warnings in single-threaded builds.
+
+Wed May 31 13:05:05 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Argv_Type_Converter.cpp (align_char_with_wchar): ACE-ified this code.
+
+Wed May 31 14:00:16 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Recursive_Mutex_Test.cpp (run_main):
+
+          Moved '#if defined (ACE_HAS_THREADS)' up a few lines to include
+          a variable defined inside the same guard at the top of the file,
+          to eliminate an 'undefined' error on single-threaded builds.
+
+Wed May 31 13:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/tao_orb_tests.lst:
-          Don't run Bug_2709_Regression with ACE_FOR_TAO
+          Added Bug_2542_Regression, this should run without problems
 
-Mon Dec  4 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed May 31 11:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Basic_Types.h:
-          Added check for __ia64__, then we assume we have little endian,
-          this define is set by the HP OpenVMS compiler
+        * ace/OS_NS_time.inl:
+          Fixed unreachable code warning
 
-Mon Dec  4 12:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed May 31 09:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb:
-          New base project
+        * tests/run_test.lst:
+          Changes for ACE_FOR_TAO configuration
 
-Mon Dec  4 11:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed May 31 08:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/ciao_nodeapplication.mpb:
-          New base project for nodeapplication library
+        * tests/Bound_Ptr_Test.cpp:
+          Initalise pointers with 0
 
-        * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb:
-          Derive from ciao_nodeapplication
+Wed May 31 08:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_default.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_monitor.mpb:
-        * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb:
-          Fixed incorrect id tag
+        * tests/Recursive_Mutex_Test.cpp:
+          Added missing include to get ACE_OS::sleep
 
-        * bin/MakeProjectCreator/config/ciao_noop_configurator.mpb:
-          New base project
+Tue May 30 21:56:52 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-Mon Dec  4 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ACE-INSTALL.html: Corrected the AIX section; removed descriptions of
+          old compilers that are no longer supported and suggested the config
+          and platform_macros files to use. Thanks to Michelle Zheng
+          <Michelle dot Zheng at dowjones dot com> for motivating this.
 
-        * bin/fuzz.pl:
-          Corrected the expression to fill the files_mpc array and
-          enabled the Id check again
+        * THANKS: Added Michelle Zheng to the Hall of Fame.
 
-Fri Dec  1 13:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue May 30 19:17:40 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * Kokyu/docs/Kokyu.html:
-          Updated download location of ACE/TAO/CIAO
+        * ace/Dynamic_Service.h:
+        * ace/Dynamic_Service.inl:
+        * ace/Dynamic_Service.cpp:
+        * ace/Dynamic_Service_Base.h:
+        * ace/Dynamic_Service_Base.cpp:
+        * ace/Dynamic_Service_Dependency.cpp:
 
-Wed Nov 29 15:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          In order to ensure proper separation of contexts, this patch
+          gives the dynamic service instance lookup the ability to
+          optionally exclude the global configuration context.
 
-        * ace/OS_NS_unistd.cpp (num_processors*):
-          Check the return value of sysctl, if it returns -1 then
-          also return the method with -1
+        * ace/Service_Gestalt.h:
+        * ace/Service_Gestalt.cpp:
 
-Wed Nov 29 12:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          To allow explicitly configured static service objects, those for
+          which a directive such as 'static XYZ "foo bar"', to be
+          independently configured in different configuration contexts,
+          these changes retain any static service descriptor for service
+          XYZ, then looks for a previous instance of XYZ in the local
+          context only, otherwise it uses the previously retained static
+          service descriptor to create a new instance.
 
-        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
-          Simplified this file
 
-Wed Nov 29 11:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue May 30 18:24:54 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/Malloc_T.{h,cpp}:
-          Changed delete_lock_ to a real bool
+        * ace/DLL.h (ACE_DLL): Updated the documentation of open() to explain the
+         lookup scheme when a filename is given.  Thanks to Phlip
+          <phlip2005 at gmail dot com> for motivating this.
 
-Wed Nov 29 07:09:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue May 30 13:06:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * Makefile.am:
-        * configure.ac:
+        * ace/ACE.inl:
+        * ace/Base_Thread_Adapter.cpp:
+        * ace/Default_Constants.h:
+        * ace/Global_Macros.h:
+        * ace/OS.h:
+        * ace/OS_NS_Thread.cpp:
+        * ace/OS_NS_Thread.h:
+        * ace/OS_NS_netdb.inl:
+        * ace/OS_NS_signal.inl:
+        * ace/OS_NS_sys_socket.inl:
+        * ace/OS_NS_time.inl:
+        * ace/OS_main.cpp:
+        * ace/OS_main.h:
+        * ace/Object_Manager_Base.h:
+        * ace/Process_Manager.cpp:
+        * ace/Process_Semaphore.cpp:
+        * ace/Process_Semaphore.h:
+        * ace/Process_Semaphore.inl:
+        * ace/Recursive_Thread_Mutex.cpp:
+        * ace/SV_Semaphore_Simple.h:
+        * ace/TLI_Acceptor.cpp:
+        * ace/Thread_Adapter.cpp:
+        * ace/Token.h:
+        * ace/config-macros.h: Removed all vestiges of PSOS.
+
+Tue May 30 12:22:53 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-          If ACEXML, ASNMP, or protocols subdirectories are not present,
-          don't try to configure or build them.  Thanks to Stephen Torri
-          <storri at cse dot wustl dot edu> for reporting this.
+        * bin/mpc.pl:
+        * bin/mwc.pl:
 
-Tue Nov 28 21:02:25 UTC 2006  Steve Huston  <shuston@riverace.com>
+          Added a load-time check for the minimum perl version (5.6).
 
-        * ace/WIN32_Asynch_IO.cpp (ACE_WIN32_Asynch_Connect::post_result):
-          The 'result' pointer is invalid upon return from post_completion()
-          regardless of whether or not it succeeds. This fix prevents
-          dereferencing result on failure of post_completion(), such as at
-          proactor shutdown. Thank you to Ken Kane <kenneth dot kane at
-          ironmountain dot com> for the analysis and fix.
+Tue May 30 12:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * THANKS: Updated Ken Kane's email address.
+        * ace/Log_Msg.cpp:
+        * ace/OS_NS_dirent.inl:
+        * ace/OS_NS_netdb.inl:
+        * ace/OS_NS_pwd.inl:
+        * ace/OS_NS_stdlib.inl:
+        * ace/OS_NS_Thread.cpp:
+        * ace/OS_NS_Thread.inl:
+        * ace/OS_NS_time.cpp:
+        * ace/OS_NS_time.inl:
+        * ace/Thread_Manager.cpp:
+        * ace/os_include/os_pthread.h:
+        * ace/os_include/os_stdlib.h:
+          Removed support for HPUX 10.20
 
-Tue Nov 28 20:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/os_include/net/os_if.h:
+        * ace/os_include/netinet/os_tcp.h:
+          Removed psos support
 
-        * bin/auto_run_tests.pl:
-          Added \n after the message when we can't chdir to a certain
-          directory to prevent detecting the wrong test because this
-          message is then on the same line as the next test.
+        * ace/os_include/sys/os_types.h:
+          Removed ACE_LACKS_FLOATING_POINT
 
-Tue Nov 28 20:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue May 30 11:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
-          Removed include path that didn't exist anymore
+        * ace/config-hpux-10.x-g++.h
+        * ace/config-hpux-10.x-hpc++.h
+        * ace/config-hpux-10.x.h
+          Removed these files, not supported anymore
 
-Tue Nov 28 16:04:45 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+        * ace/OS_NS_time.inl:
+          Removed check for ACE_CTIME_R_RETURNS_INT, it was for hpux 10.20
 
-        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb
-        * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb
+Tue May 30 11:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fix for linker warnings/errors on OS X.
+        * ace/config-osf1-4.0.h:
+          Removed, contents merged to tru64 file
 
-Tue Nov 28 14:08:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/config-tru64.h:
+          Added osf1-4.0 file contents, be aware that tru64 support hasn't
+          been tested for a long time.
 
-        * bin/msvc_mpc_auto_compile.pl:
+Tue May 30 11:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Reorder @ace_core_dirs so that protocols follows tests, as
-          the HTBP protocol tests depend on the Test_Output library.
+        * tests/Recursive_Mutex_Test.cpp:
+          Fixed compile error
 
-Tue Nov 28 13:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue May 30 11:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/event.mpb:
-        * bin/MakeProjectCreator/config/event_serv.mpb:
-        * bin/MakeProjectCreator/config/event_skel.mpb:
-        * bin/MakeProjectCreator/config/ftorbutils.mpb:
-        * bin/MakeProjectCreator/config/ftrtevent.mpb:
-        * bin/MakeProjectCreator/config/ifrservice.mpb:
-        * bin/MakeProjectCreator/config/imr_locator.mpb:
-        * bin/MakeProjectCreator/config/portablegroup.mpb:
-        * bin/MakeProjectCreator/config/rtcorbacommon.mpb:
-          Added avoids_corba_e_compact as base project, if we have CORBA/e
-          compact we don't have the needed features available to build these
-          projects.
+        * ace/os_include/os_stdio.h:
+          Removed psos support
 
-Tue Nov 28 13:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/IOStream.h:
+          Removed checks for ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS, that was only
+          set for chorus which is removed
 
-        * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb:
-        * bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb:
-          Fixed incorrect feature name
+        * ace/Basic_Types.h:
+        * ace/Log_Msg.cpp:
+        * ace/Profile_Timer.{h,cpp}:
+          Removed checks for ACE_LACKS_FLOATING_POINT. Was only set for chorus
+          which is now removed.
 
-        * bin/MakeProjectCreator/config/global.features:
-          Removed duplicate minimum_corba
+        * ace/OS_NS_Thread.cpp:
+          Removed chorus support
 
-Tue Nov 28 09:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/config-chorus.h:
+          Removed.
 
-        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_events_dnc.mpb:
-          Removed security as base, for the moment we decoupled from
-          the security service.
+        * ace/INET_Addr.cpp
+        * ace/Lib_Find.cpp
+        * ace/Local_Tokens.cpp
+        * ace/Log_Record.cpp
+        * ace/Parse_Node.cpp
+          Removed check for ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS, is only
+          set for psos which we don't support anymore
 
-Tue Nov 28 00:28:28 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/os_include/os_signal.h:
+          Removed check for ACE_SIGINFO_IS_SIGINFO_T, only set for psos
 
-        * protocols/tests/HTBP/htbptest.mpb:
+        * 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
+          Removed from the repo, psos support has been removed
 
-          Add dependency on Test_Output.
+Tue May 30 10:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Nov 27 12:30:28 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+        * ace/CDR_Stream.cpp:
+          Use true/false, when demarshaling a string, check the result of the
+          demarshaling of the length of the string, if that failed, just return
+          directly instead of trying to demarshal a random lenght string
 
-        * tests/Bug_2653_Regression_Test.cpp:
+        * ace/Task.h:
+        * ace/System_Time.h:
+          Doxygen improvement
 
-          When a thread is started, you must wait() on it before exiting the
-          process to avoid a core dump.
+        * ace/ACE.cpp:
+        * ace/SOCK_Dgram_Bcast.cpp:
+        * ace/Sock_Connect.cpp:
+        * ace/Process.cpp:
+        * ace/OS_NS_unistd.cpp:
+        * ace/Mem_Map.cpp:
+          Removed chorus support
 
-        * tests/run_test.pl:
+        * ace/config-fsu-pthread.h:
+          Removed this file, this configuration isn't supported and used for
+          ages
 
-          Print out the test header before checking for the executable.  If
-          the executable is not there, it will appear as if the previous
-          test failed.
+        * ace/Condition_Thread_Mutex.cpp:
+        * ace/Recursive_Thread_Mutex.cpp:
+          Removed fsu pthread support
 
-Mon Nov 27 08:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Process_Manager.cpp:
+          Const improvement
 
-        * ace/config-sunos5.5.h:
-          Fixed compile problem on solaris x86 when _FILE_OFFSET_BITS=64
-          is set. Thanks to Michael Klein <michael dot klein at fazi dot de>
-          for reporting this. Fixed bugzilla bug 2693.
+        * ace/OS.inl:
+        * ace/OS_NS_sys_socket.inl:
+        * ace/OS_NS_stdlib.cpp:
+        * ace/OS_NS_stdlib.inl:
+        * ace/OS_NS_Thread.cpp:
+          Removed psos support
 
-Mon Nov 27 08:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/OS_NS_unistd.inl:
+        * ace/OS_NS_stdio.{h,cpp,inl}:
+        * ace/Handle_Set.h:
+        * ace/OS_NS_Thread.{h,inl}:
+          Removed psos and chorus support
 
-        * bin/MakeProjectCreator/config/minimum_corba.mpb:
-        * bin/MakeProjectCreator/config/avoids_minimum_corba.mpb:
-          Renames minimum_corba to avoids_minimum_corba. Fixes bugzilla
-          2589.
+        * ace/Thread_Manager.{h,cpp,inl}:
+          Made terminated_ a real bool, removed chorus support, check for
+          ACE_VXWORKS instead of VXWORKS
 
-        * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb:
-          Fixed this file and made corba_e_compact its parent, when
-          we can't build a project in corba_e_compact then corba_e_micro
-          is also not an option.
+        * ace/OS_NS_sys_time.inl:
+          Check for ACE_VXWORKS instead of VXWORKS
 
-        * bin/MakeProjectCreator/config/event.mpb:
-        * bin/MakeProjectCreator/config/event_serv.mpb:
-        * bin/MakeProjectCreator/config/event_skel.mpb:
-        * bin/MakeProjectCreator/config/ftorbutils.mpb:
-        * bin/MakeProjectCreator/config/ftrtevent.mpb:
-        * bin/MakeProjectCreator/config/ifrservice.mpb:
-        * bin/MakeProjectCreator/config/imr_locator.mpb:
-        * bin/MakeProjectCreator/config/portablegroup.mpb:
-        * bin/MakeProjectCreator/config/rtcorbacommon.mpb:
-          Updated for rename of minimum_corba
+        * ace/MMAP_Memory_Pool.{h,cpp}:
+          Removed chorus support, use bool internally and added an option to
+          get each time an unique mmap filename
 
-Mon Nov 27 06:05:38 UTC 2006  Olli Savia  <ops@iki.fi>
+        * ace/config-linux-common.h:
+          Added ACE_HAS_VOIDPTR_MMAP and removed KCC support
 
-        * tests/OS_Test.cpp:
-          Fixed compile error on VxWorks. Thanks to Johnny Willemsen
-          for pointing out the problem and suggesting a fix.
+        * ace/ace_wchar.inl
+        * ace/Default_Constants.h
+        * ace/INET_Addr.h
+        * ace/IPC_SAP.cpp
+        * ace/Message_Queue.cpp
+        * ace/Message_Queue.h
+        * ace/Message_Queue.inl
+        * ace/Message_Queue_T.cpp
+        * ace/Message_Queue_T.h
+        * ace/OS.h
+        * ace/OS_NS_macros.h
+        * ace/OS_NS_stdio.h
+        * ace/OS_NS_stdio.inl
+        * ace/OS_NS_stdlib.inl
+        * ace/OS_NS_Thread.cpp
+        * ace/OS_NS_Thread.h
+        * ace/OS_NS_Thread.inl
+        * ace/OS_NS_time.inl
+        * ace/Recursive_Thread_Mutex.cpp
+        * ace/Sched_Params.cpp
+        * ace/Select_Reactor_T.cpp
+        * ace/SOCK_Dgram_Bcast.cpp
+        * ace/Thread_Manager.h
+        * ace/Token.h
+          Check for ACE_VXWORKS instead of VXWORKS
 
-Fri Nov 24 13:27:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Mon May 29 22:08:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * bin/MakeProjectCreator/config/automake.features:
+        * ace/OS_NS_Thread.inl (recursive_mutex_lock): *Really* make the compiler
+          happy now.  Thanks Olli!
 
-          Set stl and boost.  We'll use automake conditionals to defer
-          these options to configure time.
+Mon May 29 21:12:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-Fri Nov 24 13:05:01 UTC 2006  Olli Savia  <ops@iki.fi>
+        * ace/OS_NS_Thread.inl (recursive_mutex_lock): Added a const_cast
+          for ACE_Time_Value * to make the compiler happy when passing the
+          timeout parameter to ACE_OS::cond_timed_wait().  Thanks to Olli
+          Savia for helping here.
 
-        * tests/OS_Test.cpp:
-          Added ACE_OS::snprintf test.
+Mon May 29 20:30:44 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-Fri Nov 24 10:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * We recently added the 2100th contributor to ACE+TAO+CIAO!!!  The
+          2000th contributor was added in August of 2005, this means that
+          over 100 different people have contributed to the project in the
+          past 9 months!
 
-        * ace/Sock_Connect.cpp:
-          Fixed compile errors when building on linux with no
-          networking support
+Mon May 29 19:50:54 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-Thu Nov 23 17:06:17 UTC 2006  Simon McQueen  <sm@prismtech.com>
+        * examples/Service_Configurator/IPC-tests/server/server_test.cpp (ACE_TMAIN):
+          Changed
 
-        * ace/OS_Errno.h:
-        * ace/OS_Errno.cpp:
+          ACE_Reactor::instance ()->run_reactor_event_loop ()
 
-          Fix compile errors with g++ on Solaris with NDEBUG.
+          to
 
-Thu Nov 23 14:09:17 UTC 2006  Steve Huston  <shuston@riverace.com>
+          ACE_Reactor::run_event_loop ()
 
-        * include/makeinclude/rules.lib.GNU: Corrected error introduced by
-          Wed Nov 22 21:53:17 UTC 2006  Steve Huston  <shuston@riverace.com>.
+          so that reconfiguration happens properly after a SIGHUP or
+          SIGINT occurs.  Thanks to Kevin Hu <Xiaotao dot Hu at ge dot
+          com> for motivating this.
 
-Thu Nov 23 06:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon May 29 18:10:50 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * bin/MakeProjectCreator/config/ace_for_tao.mpb:
-          Added ACE_LACKS_MSG_WFMO as define, that prevents other projects
-          to try to use the msg wfmo reactor which is not available in the
-          ace_for_tao configuration
+        * tests/Signal_Test.cpp:
+        * tests/Thread_Manager_Test.cpp: Add missing ACE_TEXT to a string.
 
-Thu Nov 23 03:14:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Mon May 29 18:44:05 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * tests/Integer_Truncate_Test.cpp:
-        * apps/JAWS/clients/WebSTONE/src/README:
+        * tests/Recursive_Mutex_Test.cpp: Enhanced this test to exercise
+          the new timed feature of ACE_Recursive_Thread_Mutex.
 
-          Removed svn:executable property.
+Mon May 29 18:16:31 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-Wed Nov 22 23:16:22 UTC 2006  Steve Huston  <shuston@riverace.com>
+        * ace/Recursive_Thread_Mutex.h: Clarified that get_nesting_level()
+          may return -1 on some platforms when ACE_HAS_RECURSIVE_MUTEXES
+          is enabled.
 
-        * examples/Timer_Queue/Async_Timer_Queue_Test.cpp: Ignore SIGQUIT code
-          for platforms with ACE_LACKS_UNIX_SIGNALS. Fixes WinCE build error.
+Mon May 29 17:45:02 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-Wed Nov 22 21:58:16 UTC 2006  Steve Huston  <shuston@riverace.com>
+        * ace/Recursive_Thread_Mutex.inl: Moved some of the short accessor
+          methods from the Recursive_Thread_Mutex.cpp file to here.
 
-        * tests/RB_Tree_Test.cpp: Don't use ACE_ASSERT for code - it doesn't
-          get executed in Release builds.
+        * ace/Recursive_Thread_Mutex.h,
+          ace/Recursive_Thread_Mutex.inl: Added support for time recursive
+          mutexes, thanks also to Abdullah.
 
-        Pulled these in from the 5.5 stream:
+        * ace/OS_NS_Thread.h,
+        * ace/OS_NS_Thread.inl: Added support for timed recursive mutexes.
+          Thanks to Abdullah Sowayan <abdullah dot sowayan at lmco dot
+          com> for contributing this.
 
-        Mon Nov 20 21:26:24 UTC 2006  Steve Huston  <shuston@riverace.com>
+Mon May 29 17:30:52 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/config-win32-msvc.h:
-        * ace/OS_Memory.h:
-          The MFC new/exception code needed the ability to delete a caught
-          CMemoryException object to prevent memory leaks (see
-          http://msdn2.microsoft.com/de-de/library/0e5twxsh(VS.80).aspx).
-          This necessitates that every platform other than Windows/MFC gets
-          an empty define for ACE_del_bad_alloc, and the ACE_NEW... macros
-          have ACE_del_bad_alloc expanded in the catch block.
-          For past history of this issue, see the trail starting at:
-          Tue Aug  8 09:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+        * ace/OS_NS_Thread.h: Updated the documentation to clarify why
+          recursive mutexes can't be used for ACE_OS::mutex_lock().
 
-        Thu Nov 16 16:14:32 UTC 2006  Steve Huston  <shuston@riverace.com>
+Mon May 29 18:27:08 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * ace/String_Base.{h inl}: Added a capacity() method that returns
-          the number of allocated CHAR units in the string object. Thanks to
-          Kelly Hickel <kfh at mqsoftware dot com> for supplying this.
+        * examples/DLL/test_dll.cpp:
 
-        * NEWS: Updated with recent ACE_String_Base and build additions.
+          Changed instances of a C-style cast from void* to
+          pointer-to-function to a two-step reinterpret_cast
+          using ptrdiff_t as an intermediate. C++ forbids casting
+          directly between pointer-to-object and pointer-to-function,
+          and some of the newer compilers are catching it.
 
-        Mon Nov 13 17:40:58 UTC 2006  Steve Huston  <shuston@riverace.com>
+Sat May 27 15:03:07 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/String_Base.{h cpp}: Added a fast_resize(size_t) method to
-          manage the sizing/reallocating of the string, but doesn't do the
-          memory setting of resize(). Changed resize() to call fast_resize()
-          then do the memory setting.
-          Thank you to Kelly Hickel <kfh at mqsoftware dot com> for these
-          additions.
+        * netsvcs/servers/main.cpp (ACE_TMAIN): Removed the following code:
 
+          if (ACE::debug () == 0)
+            ACE_LOG_MSG->priority_mask (~LM_DEBUG, ACE_Log_Msg::PROCESS);
 
-Wed Nov 22 21:53:17 UTC 2006  Steve Huston  <shuston@riverace.com>
+          since (1) it makes debugging hard and (2) it's simply wrong
+          since it's blowing away anything that's set by the
+          ACE_Logging_Strategy in the svc.conf file.
 
-        Pulled these in from the 5.5 stream:
+Sat May 27 14:37:14 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        Thu Nov 16 21:56:37 UTC 2006  Steve Huston  <shuston@riverace.com>
+        * ace/Log_Record.cpp (print): Only print out the log records if the
+          corresponding type is enabled for logging.
 
-        * include/makeinclude/rules.local.GNU: For creating the object file
-          directories (e.g., VDIR and VSHDIR, and their subdirectories), change
-          from using the directory as a prerequisite and make that prereq
-          a PHONY target to embed the command(s) to check and create the
-          directory if needed. This accomplishes two things: 1) allows the
-          make to work with clearmake in GNU compatibility mode (clearmake
-          always saw the PHONY target as remade and remade every file in the
-          project), and 2) avoids using a PHONY target as a prerequisite,
-          something the GNU make manual says to avoid. Thank you to Howard
-          Finer <hfiner at sonusnet dot com> for motivating and assisting
-          in this effort.
+Sat May 27 14:35:21 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        Tue Nov 14 22:33:03 UTC 2006  Steve Huston  <shuston@riverace.com>
+        * netsvcs/servers/main.cpp: Enable the ignore_debug_flag in the
+          ACE_Service_Config::open() call so that we can override the
+          default ACE_Log_Priority settings in the svc.conf file.
 
-        * include/makeinclude/rules.lib.GNU: Change VLOBJS and VSHOBJS to
-          use $(patsubst) instead of $(if) to look for entries that have
-          relative directories in them (../). Avoids $(if) which does not
-          work in Clearcase's clearmake GNU compatibility mode.
+Sat May 27 11:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Nov 22 19:52:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * performance-tests/SCTP/hist.cpp:
+          Fixed compile error
 
-        * ace/Select_Reactor_T.inl:
+Fri May 26 22:02:48 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-          Add #include of "Log_Msg.h".  This is required to bring things
-          into scope on systems where ACE_TEMPLATES_REQUIRE_SOURCE isn't
-          defined/needed.
+        * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/server.cpp: Wide-char fixes; there's no
+          wide-char variant for ACE_OS::fdetach().
 
-Wed Nov 22 18:27:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * examples/IPC_SAP/TLI_SAP/CPP-client.cpp:
+        * examples/IPC_SAP/TLI_SAP/db-client.cpp:
+        * examples/IPC_SAP/TLI_SAP/ftp-client.cpp:
+        * examples/Connection/non_blocking/test_tli_acceptor.cpp:
+        * examples/Connection/non_blocking/test_tli_connector.cpp:
+          Wide-char/narrow-char fixes.
 
-        * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am:
+Fri May 26 21:47:56 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-          Regenerated.
+        * netsvcs/lib/Client_Logging_Handler.cpp,
+        * netsvcs/lib/Server_Logging_Handler_T.cpp,
+        * ace/Log_Msg_IPC.cpp: Removed the special case code for Windows
+          since it seems like ACE (or Windows) now handles this properly.
 
-        * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc:
+Fri May 26 21:20:35 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Record.cpp (operator>>): Add one when allocating the buffer.
+
+Fri May 26 13:16:48 UTC 2006  Nanbor Wang  <nanbor@exothermic.txcorp.com>
+
+        * ace/DLL_Manager.cpp:
+
+          Fixed incorrect usage of ACE::debug check.  Thanks to Johnny for
+          reporting this.
+
+Fri May 26 15:04:55 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ASNMP/tests/Counter_Test.cpp:
+        * ASNMP/tests/Gauge_Test.cpp:
+        * performance-tests/SCTP/hist.cpp:
+
+          Added static_cast<>s to eliminate implicit conversion warnings.
+
+Fri May 26 12:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Naming_Test.cpp:
+          Replaced assert with if statement, resolved argument not used
+          warning in BCB6 release builds
+
+Fri May 26 10:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1890_Regression_Test.cpp:
+        * tests/Bug_2540_Regression_Test.cpp:
+          New tests made by Carlos O'Ryan for the given bug numbers.
+
+        * tests/run_test.lst:
+        * tests/tests.mpc:
+          Added the new tests above
+
+Fri May 26 09:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/Run_Test.pm:
+          Increased wait_interval_for_process_creation from 5 to 10 seconds.
+          On the slower systems some tests failed because the startup time
+          is longer then 5 seconds, especially if several configuration files
+          are read and saved during startup
+
+Fri May 26 08:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/diff-builds.pl:
+          Fixed typo in comment
+
+Thu May 25 04:58:44 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Tokens_Test.cpp (run_main): Don't try to spawn the
+          netsvcs/server/main if it's not built.
+
+Thu May 25 03:53:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * m4/config_h.m4:
 
-          Add automake specific includes definition to find headers
-          relative to source directory.
+          Removed AH_TEMPLATE for ACE_LACKS_TCP_H.  This was replaced
+          with ACE_LACKS_NETINET_TCP_H long ago.
 
-Wed Nov 22 16:57:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Wed May 24 22:19:43 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am:
+        * ace/Service_Repository.{h, inl, cpp}:
 
-          Regenerated.
+          Changed size arguments type to size_t in ctor, open,
+          current_size, total_size and the corresponding members.
+          ACE_Service_Repository_Iterator::next_ now starts from 0 instead
+          of -1 to avoid warnings about signed/unsigned comparisons.
 
+        * ace/Service_Gestalt.cpp:
+
+          Reverted the change "Wed May 24 14:00:43 UTC 2006 Iliyan
+          Jeliazkov <iliyan@ociweb.com>", since now the
+          Service_repository::instance() takes size_t argument.
+
+        * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc:
         * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc:
 
-          Add automake specific includes definition to find headers
-          relative to source directory.
+          Fixed and error whereby the DLL's generated by this two project
+          files did not match the name used in the svc configuration
+          files, causing the test to crash because of missing DLL.
+
+Wed May 24 13:08:08 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue.h: Added #include "ace/Thread_Mutex.h" on platforms
+          that have ACE_Message_Queue_NT available; that class has a
+          ACE_Thread_Mutex member so the include is needed to see the class.
+          Thanks to Guy Peleg <guype at amdocs dot com> for this fix.
 
-Wed Nov 22 16:48:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Wed May 24 17:39:47 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * Makefile.am:
+        * ace/Remote_Tokens.cpp (request_reply): Added a helpful error
+          message to make it easy to track down problems with TSS.
 
-          Hand tweak, HTBP tests depend on Test_Output library.  This
-          requires changing the build order so that the protocols dir
-          is built after tests.
+Wed May 24 17:22:31 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * apps/gperf/tests/Makefile.am:
+        * configure.ac:
 
-          Hand tweak to find gperf executable on automake builds.  Chad
-          has given me info to make MPC generation work, which I'll add
-          in the near future.
+          Change feature test to define ACE_LACKS_NATIVE_STRPTIME if
+          system doesn't support strptime(), as it seems ACE doesn't
+          follow its feature test macro naming conventions when it comes
+          to strptime().
 
-        * m4/ace.m4:
+          Changed ACE_LACKS_STRPTIME_PROTOTYPE feature test to use
+          AC_CHECK_DECL instead of AC_EGREP_HEADER.
 
-          Placeholder for a BUILD_WXWINDOWS feature test.  For now it
-          always returns false.
+Wed May 24 16:33:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * configure.ac:
+        * m4/config_h.m4:
 
-          Configure examples/ConfigViewer/Makefile.
+          Changed ACE_LACKS_STRPTIME and ACE_LACKS_STRPTIME_PROTOTYPE
+          feature tests to use the same idiom as similar tests.  This
+          Avoids requiring an AH_TEMPLATE for each feature test macro
+          in config_h.m4.
 
-Wed Nov 22 15:34:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Wed May 24 09:07:53 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-        * ace/Version.h:
+        * ace/Activation_Queue.cpp,
+        * ace/Activation_Queue.inl: Fixed the queue() "setter" method
+          so that it doesn't leak memory.  Thanks to David Chu <beyonddc
+          dot storage at gmail dot com> for providing this fix.
 
-          Remove extraneous whitespace from ACE_VERSION macro definition.
+Wed May 24 14:00:43 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * ace/Makefile.am:
+        * ace/Service_Gestalt.cpp:
 
-          Hand tweak.
+          Added a cast from size_t to int in the ctor to match the
+          interface of ::instance() and to quiet the 64bit compilers,
+          complaining about loss of precision in the implicit conversion.
 
-        * ace/QoS/Makefile.am:
+Tue May 23 19:21:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Revert to earlier version until MPC generation issues are
-          resolved.
+        * tests/Signal_Test.cpp:
 
-        * apps/JAWS2/JAWS/Makefile.am:
-        * apps/JAWS3/jaws3/Makefile.am:
+          Reset SIGHUP handler to SIG_DFL to support cases where SIGHUP
+          is ignored (running under nohup(1), etc.).
 
-          Regenerated.
+Tue May 23 10:55:59 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-        * apps/JAWS2/JAWS/jaws2.mpc:
-        * apps/JAWS3/jaws3/jaws3.mpc:
+        * netsvcs/lib/Client_Logging_Handler.cpp (handle_input):
+        * netsvcs/lib/Server_Logging_Handler_T.cpp
+          (handle_logging_record): Cleaned up the code so that it should
+          have no memory leaks and will also build cleanly on all the OS
+          platforms.
 
-          Add automake specific includes definition to find headers
-          relative to source directory.
+        * ace/Log_Msg_IPC.cpp: Fix support for ACE_HAS_STREAM_PIPES.
 
-Wed Nov 22 14:24:31 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue May 23 13:05:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * ace/Makefile.am:
+        * ace/Log_Msg.cpp:
+          Fixing a memory leak found by valgrind.
 
-          Regenerated.
+        * ace/Timeprobe.cpp:
+          Added missing include - this wouldn't comple with both noinline
+          and ACE_COMPILE_TIMEPROPE set.
 
-        * ace/ace_xtreactor.mpc:
-        * ace/ace_tkreactor.mpc:
-        * ace/ace_flreactor.mpc:
-        * ace/ace_qtreactor.mpc:
+Mon May 22 21:13:15 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-          Changed to specify full name of pkgconfig template file,
-          the MPC Custom spec does not automatically match *.pc.in
-          files.
+        * bin/diff-builds.pl:
 
-Wed Nov 22 14:16:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Updated to allow diff between the tests failures today and on a
+          specified date, for the clean builds (or, all the builds from
+          the build score).
 
-        * examples/ConfigViewer/Makefile.am:
+Mon May 22 19:06:41 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-          New file.
+        * ace/Log_Record.cpp (operator<<, operator>>): Have to use a different
+          CDR array method when ACE_USES_WCHAR.
 
-Wed Nov 22 14:10:08 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Mon May 22 09:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * protocols/tests/RMCast/Makefile.am:
-        * protocols/tests/Makefile.am:
-        * protocols/tests/HTBP/Reactor_Tests/Makefile.am:
-        * protocols/tests/HTBP/Send_Large_Msg/Makefile.am:
-        * protocols/tests/HTBP/Makefile.am:
-        * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am:
-        * protocols/tests/HTBP/ping/Makefile.am:
-        * protocols/ace/RMCast/Makefile.am:
-        * protocols/ace/Makefile.am:
-        * protocols/ace/TMCast/Makefile.am:
-        * protocols/ace/HTBP/Makefile.am:
-        * protocols/examples/RMCast/Send_Msg/Makefile.am:
-        * protocols/examples/RMCast/Makefile.am:
-        * protocols/examples/Makefile.am:
-        * protocols/examples/TMCast/Member/Makefile.am:
-        * protocols/examples/TMCast/Makefile.am:
-        * ace/Makefile.am:
-        * ace/SSL/Makefile.am:
-        * ace/QoS/Makefile.am:
-        * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am:
-        * performance-tests/Synch-Benchmarks/Makefile.am:
-        * performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am:
-        * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am:
-        * performance-tests/Server_Concurrency/Leader_Follower/Makefile.am:
-        * performance-tests/Server_Concurrency/Makefile.am:
-        * performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am:
-        * performance-tests/TCP/Makefile.am:
-        * performance-tests/UDP/Makefile.am:
-        * performance-tests/SCTP/Makefile.am:
-        * performance-tests/Makefile.am:
-        * performance-tests/Misc/Makefile.am:
-        * Kokyu/tests/FIFO/Makefile.am:
-        * Kokyu/tests/DSRT_MIF/Makefile.am:
-        * Kokyu/tests/Makefile.am:
-        * Kokyu/tests/EDF/Makefile.am:
-        * Kokyu/Makefile.am:
-        * tests/SSL/Makefile.am:
-        * tests/Makefile.am:
-        * apps/Gateway/Gateway/Makefile.am:
-        * apps/Gateway/Makefile.am:
-        * apps/Gateway/Peer/Makefile.am:
-        * apps/mkcsregdb/Makefile.am:
-        * apps/drwho/Makefile.am:
-        * apps/gperf/tests/Makefile.am:
-        * apps/gperf/src/Makefile.am:
-        * apps/gperf/Makefile.am:
-        * apps/JAWS/clients/Blobby/Makefile.am:
-        * apps/JAWS/clients/Makefile.am:
-        * apps/JAWS/clients/Caching/Makefile.am:
-        * apps/JAWS/server/Makefile.am:
-        * apps/JAWS/Makefile.am:
-        * apps/JAWS2/JAWS/Makefile.am:
-        * apps/JAWS2/Makefile.am:
-        * apps/JAWS3/jaws3/Makefile.am:
-        * apps/JAWS3/Makefile.am:
-        * apps/soreduce/Makefile.am:
-        * bin/Makefile.am:
-        * ACEXML/tests/Makefile.am:
-        * ACEXML/tests/util/Makefile.am:
-        * ACEXML/apps/svcconf/Makefile.am:
-        * ACEXML/apps/Makefile.am:
-        * ACEXML/common/Makefile.am:
-        * ACEXML/Makefile.am:
-        * ACEXML/parser/Makefile.am:
-        * ACEXML/parser/parser/Makefile.am:
-        * ACEXML/examples/SAXPrint/Makefile.am:
-        * ACEXML/examples/Makefile.am:
-        * websvcs/tests/Makefile.am:
-        * websvcs/lib/Makefile.am:
-        * websvcs/Makefile.am:
-        * netsvcs/clients/Logger/Makefile.am:
-        * netsvcs/clients/Tokens/rw_lock/Makefile.am:
-        * netsvcs/clients/Tokens/mutex/Makefile.am:
-        * netsvcs/clients/Tokens/deadlock/Makefile.am:
-        * netsvcs/clients/Tokens/collection/Makefile.am:
-        * netsvcs/clients/Tokens/invariant/Makefile.am:
-        * netsvcs/clients/Tokens/manual/Makefile.am:
-        * netsvcs/clients/Naming/Dump_Restore/Makefile.am:
-        * netsvcs/clients/Naming/Makefile.am:
-        * netsvcs/clients/Naming/Client/Makefile.am:
-        * netsvcs/clients/Makefile.am:
-        * netsvcs/lib/Makefile.am:
-        * netsvcs/servers/Makefile.am:
-        * netsvcs/Makefile.am:
-        * ASNMP/tests/Makefile.am:
-        * ASNMP/Makefile.am:
-        * ASNMP/agent/Makefile.am:
-        * ASNMP/asnmp/Makefile.am:
-        * ASNMP/examples/get/Makefile.am:
-        * ASNMP/examples/trap/Makefile.am:
-        * ASNMP/examples/Makefile.am:
-        * ASNMP/examples/set/Makefile.am:
-        * ASNMP/examples/next/Makefile.am:
-        * ASNMP/examples/walk/Makefile.am:
-        * examples/OS/Makefile.am:
-        * examples/OS/Process/Makefile.am:
-        * examples/Synch/Makefile.am:
-        * examples/Timer_Queue/Makefile.am:
-        * examples/Log_Msg/Makefile.am:
-        * examples/Misc/Makefile.am:
-        * examples/ASX/CCM_App/Makefile.am:
-        * examples/ASX/Event_Server/Transceiver/Makefile.am:
-        * examples/ASX/Event_Server/Event_Server/Makefile.am:
-        * examples/ASX/Event_Server/Makefile.am:
-        * examples/ASX/Message_Queue/Makefile.am:
-        * examples/ASX/UPIPE_Event_Server/Makefile.am:
-        * examples/ASX/Makefile.am:
-        * examples/Web_Crawler/Makefile.am:
-        * examples/Shared_Malloc/Makefile.am:
-        * examples/QOS/Change_Sender_TSpec/Makefile.am:
-        * examples/QOS/Diffserv/Makefile.am:
-        * examples/QOS/Simple/Makefile.am:
-        * examples/QOS/Change_Receiver_FlowSpec/Makefile.am:
-        * examples/Bounded_Packet_Relay/Makefile.am:
-        * examples/System_V_IPC/SV_Message_Queues/Makefile.am:
-        * examples/System_V_IPC/Makefile.am:
-        * examples/System_V_IPC/SV_Semaphores/Makefile.am:
-        * examples/Map_Manager/Makefile.am:
-        * examples/APG/Svc_Config/Makefile.am:
-        * examples/APG/ThreadSafety/Makefile.am:
-        * examples/APG/ThreadPools/Makefile.am:
-        * examples/APG/Active_Objects/Makefile.am:
-        * examples/APG/Logging/Makefile.am:
-        * examples/APG/Misc_IPC/Makefile.am:
-        * examples/APG/Proactor/Makefile.am:
-        * examples/APG/Threads/Makefile.am:
-        * examples/APG/Shared_Memory/Makefile.am:
-        * examples/APG/Reactor/Makefile.am:
-        * examples/APG/Signals/Makefile.am:
-        * examples/APG/Timers/Makefile.am:
-        * examples/APG/ThreadManagement/Makefile.am:
-        * examples/APG/Config/Makefile.am:
-        * examples/APG/Containers/Makefile.am:
-        * examples/APG/Processes/Makefile.am:
-        * examples/APG/Naming/Makefile.am:
-        * examples/APG/Makefile.am:
-        * examples/APG/Sockets/Makefile.am:
-        * examples/APG/Streams/Makefile.am:
-        * examples/Registry/Makefile.am:
-        * examples/Smart_Pointers/Makefile.am:
-        * examples/DLL/Makefile.am:
-        * examples/IPC_SAP/DEV_SAP/reader/Makefile.am:
-        * examples/IPC_SAP/DEV_SAP/Makefile.am:
-        * examples/IPC_SAP/DEV_SAP/writer/Makefile.am:
-        * examples/IPC_SAP/FILE_SAP/Makefile.am:
-        * examples/IPC_SAP/SOCK_SAP/Makefile.am:
-        * examples/IPC_SAP/SPIPE_SAP/Makefile.am:
-        * examples/IPC_SAP/ATM_SAP/Makefile.am:
-        * examples/IPC_SAP/SSL_SAP/Makefile.am:
-        * examples/IPC_SAP/UPIPE_SAP/Makefile.am:
-        * examples/IPC_SAP/FIFO_SAP/Makefile.am:
-        * examples/IPC_SAP/Makefile.am:
-        * examples/IPC_SAP/TLI_SAP/Makefile.am:
-        * examples/Logger/Acceptor-server/Makefile.am:
-        * examples/Logger/Makefile.am:
-        * examples/Logger/simple-server/Makefile.am:
-        * examples/Logger/client/Makefile.am:
-        * examples/Export/Makefile.am:
-        * examples/Service_Configurator/Makefile.am:
-        * examples/Service_Configurator/IPC-tests/server/Makefile.am:
-        * examples/Service_Configurator/IPC-tests/Makefile.am:
-        * examples/Service_Configurator/IPC-tests/client/Makefile.am:
-        * examples/Service_Configurator/Misc/Makefile.am:
-        * examples/IOStream/server/Makefile.am:
-        * examples/IOStream/Makefile.am:
-        * examples/IOStream/client/Makefile.am:
-        * examples/Threads/Makefile.am:
-        * examples/Shared_Memory/Makefile.am:
-        * examples/Reactor/Ntalker/Makefile.am:
-        * examples/Reactor/TP_Reactor/Makefile.am:
-        * examples/Reactor/FIFO/Makefile.am:
-        * examples/Reactor/Multicast/Makefile.am:
-        * examples/Reactor/WFMO_Reactor/Makefile.am:
-        * examples/Reactor/Proactor/Makefile.am:
-        * examples/Reactor/Makefile.am:
-        * examples/Reactor/Dgram/Makefile.am:
-        * examples/Reactor/Misc/Makefile.am:
-        * examples/Connection/non_blocking/Makefile.am:
-        * examples/Connection/blocking/Makefile.am:
-        * examples/Connection/Makefile.am:
-        * examples/Connection/misc/Makefile.am:
-        * examples/NT_Service/Makefile.am:
-        * examples/Naming/Makefile.am:
-        * examples/Makefile.am:
-        * examples/Mem_Map/IO-tests/Makefile.am:
-        * examples/Mem_Map/file-reverse/Makefile.am:
-        * examples/Mem_Map/Makefile.am:
-        * examples/C++NPv1/Makefile.am:
-        * examples/C++NPv2/Makefile.am:
-
-          Regenerated.
-
-Wed Nov 22 13:45:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * netsvcs/lib/Client_Logging_Handler.cpp:
+          Fixed compile error on Solaris
+
+Mon May 22 04:53:29 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Signal_Test.cpp:
+
+          The change:
+          Sat May 20 15:10:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+          Was not enough to get this test working on all platforms.
+
+          Revert to using ACE_Sig_Guard in worker_child().  Handle the
+          SIGINT race condition by raising it if and only if the child
+          was not shut down by the parent.
+
+Sun May 21 13:46:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/Service_Config_Test.cpp:
+
+          Fixing Windows test failures, because errno gets overriden
+          between Service Repository::insert() and testLimits(). Most
+          likely, it happens in ace_yyparse (), however the existing
+          mechanism for reporting parser errors does not allow for
+          reliably propagating the cause of the error. Removing the test
+          for the cause of the error and simply reporting the error, if it
+          had occured.
+
+Sat May 20 15:10:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Signal_Test.cpp:
+
+          Changed synchronous tests to block signals at the top level.
+          This had been done with a ACE_Sig_Guard, but that lead to a race
+          condition between when the guard was release and the delivery of
+          the SIGINT the client sends to itself.  The SIGINT would then be
+          handled by the default handler, which terminated the process
+          before the "Ending" message was written to the log.
+
+          #if'd out the ACE_DEBUG, etc. invocations from handle_signal().
+          These result in signal-unsafe functions being called when the
+          handler is called asynchronously.  A braver person would have
+          just removed them entirely.
+
+Fri May 19 20:08:29 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-sunos5.6.h:
+        * ace/os_include/sys/os_mman.h: Moved the declaration of ::madvise()
+          from config-sunos5.6.h to os_mman.h, to be compiled only when
+          ACE_LACKS_MADVISE_PROTOTYPE is defined. Set
+          ACE_LACKS_MADVISE_PROTOTYPE in config-sunos5.6.h where it used to
+          declare madvise(). This allows autoconf-detected
+          ACE_LACKS_MADVISE_PROTOTYPE platforms (such as Solaris 9) to
+          compile correctly.
+
+Fri May 19 17:53:51 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.cpp:
+
+          Fixed a defect in process_directive () which was replacing the
+          ENOSPC errno with EINVAL. Added #ifndef ACE_NLOGGING / #endif
+          around logging statements.
+
+        * ace/Service_Repository.cpp:
+
+          Minor reformating.
+
+        * tests/Service_Config_DLL.cpp:
+
+          Added two independent service objects, to be used in the
+          testLimits test. See testLimits().
+
+        * tests/Service_Config_Test.cpp:
+
+          Reworked the testLimits() to avoid printing the word "error",
+          which confuses the test driver into thinking the test failed.
+
+Fri May 19 17:51:33 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Service_Gestalt.cpp:
+
+          Elminated memory leak found by valgrind.
+
+Fri May 19 17:09:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Service_Config_Test.cpp:
+
+          Fixed a warning due to assignment of a string literal to a
+          non-const variable.
+
+Thu May 18 17:42:09 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/diff-builds.pl:
+
+          Contributing a little tool to find the difference in the failing
+          tests between two dates, on the same build. Or between two
+          builds, on a particular date. Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for mining and hosting the data used by
+          this script.
+
+Thu May 18 17:33:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * configure.ac:
+        * m4/config_h.m4:
 
-          Update for HTBP unit test and TMCast example move.
-
-        * protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc:
-        * protocols/tests/HTBP/Reactor_Tests/client.cpp:
-        * protocols/tests/HTBP/Reactor_Tests/inside.conf:
-        * protocols/tests/HTBP/Reactor_Tests/server.cpp:
-        * protocols/tests/HTBP/Reactor_Tests/Makefile.am:
-        * protocols/tests/HTBP/Reactor_Tests/test_config.h:
-        * protocols/tests/HTBP/Reactor_Tests/run_test.pl:
-        * protocols/tests/HTBP/HTBP_Config.conf:
-        * protocols/tests/HTBP/Send_Large_Msg/client.cpp:
-        * protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc:
-        * protocols/tests/HTBP/Send_Large_Msg/server.cpp:
-        * protocols/tests/HTBP/Send_Large_Msg/Makefile.am:
-        * protocols/tests/HTBP/Send_Large_Msg/run_test.pl:
-        * protocols/tests/HTBP/Makefile.am:
-        * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc:
-        * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am:
-        * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp:
-        * protocols/tests/HTBP/htbptest.mpb:
-        * protocols/tests/HTBP/ping/client.cpp:
-        * protocols/tests/HTBP/ping/server.cpp:
-        * protocols/tests/HTBP/ping/Makefile.am:
-        * protocols/tests/HTBP/ping/ping.mpc:
-        * protocols/tests/HTBP/ping/run_test.pl:
-        * protocols/tests/HTBP/README:
-
-          Move HTBP unit tests to protocols/tests/HTBP...
-
-        * tests/HTBP/Reactor_Tests/Reactor_Tests.mpc:
-        * tests/HTBP/Reactor_Tests/client.cpp:
-        * tests/HTBP/Reactor_Tests/inside.conf:
-        * tests/HTBP/Reactor_Tests/server.cpp:
-        * tests/HTBP/Reactor_Tests/Makefile.am:
-        * tests/HTBP/Reactor_Tests/test_config.h:
-        * tests/HTBP/Reactor_Tests/run_test.pl:
-        * tests/HTBP/HTBP_Config.conf:
-        * tests/HTBP/Send_Large_Msg/client.cpp:
-        * tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc:
-        * tests/HTBP/Send_Large_Msg/server.cpp:
-        * tests/HTBP/Send_Large_Msg/Makefile.am:
-        * tests/HTBP/Send_Large_Msg/run_test.pl:
-        * tests/HTBP/Makefile.am:
-        * tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc:
-        * tests/HTBP/Send_Recv_Tests/Makefile.am:
-        * tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp:
-        * tests/HTBP/htbptest.mpb:
-        * tests/HTBP/ping/client.cpp:
-        * tests/HTBP/ping/server.cpp:
-        * tests/HTBP/ping/Makefile.am:
-        * tests/HTBP/ping/ping.mpc:
-        * tests/HTBP/ping/run_test.pl:
-        * tests/HTBP/README:
-
-          ...from tests/HTBP.
-
-        * protocols/examples/TMCast/Member/Member.mpc:
-        * protocols/examples/TMCast/Member/member.cpp:
-        * protocols/examples/TMCast/Member/Makefile.am:
-        * protocols/examples/TMCast/Member/README:
-        * protocols/examples/TMCast/Makefile.am:
-
-          Moved TMCast examples to protocols/examples/TMCast...
-
-        * examples/TMCast/Member/Member.mpc:
-        * examples/TMCast/Member/member.cpp:
-        * examples/TMCast/Member/Makefile.am:
-        * examples/TMCast/Member/README:
-        * examples/TMCast/Makefile.am:
-
-          ...from examples/TMCast.
-
-Wed Nov 22 13:25:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Changed feature test for socklen_t to #include <sys/types.h>
+          before <sys/socket.h>.  Use cannonical AC_CHECK_TYPE and
+          AC_DEFINE with a third argument instead of a AH_TEMPLATE for
+          ACE_HAS_SOCKLEN_T.  Fixes configuration on OpenBSD.  Thanks to
+          Vladimir Panov <gbr at voidland dot org> for reporting this bug.
 
-        * ace/ace_for_tao.mpc:
-          Add uuid as base project. For building COIOP as part of the
-          TAO strategies library we need uuid. The nicest solution would
-          be to make the uuid feature dependent on the ace_for_tao
-          feature and let the user overrule this but that is not
-          possible yet. If you are using ace_for_tao and don't want
-          to have uuid pulled in, set uuid explicitly to 0 in your
-          default.features file.
+Thu May 18 16:37:46 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * configure.ac: Set a ACE_VERSION_NAME variable with the version
+          string (canonical major.minor.beta), which may include a fix kit id.
+
+        * bin/MakeProjectCreator/config/acedefaults.mpb: Change am_version from
+          libtool's -version-info format (current:revision:age) to the ACE
+          release number format (major.minor.beta) and rename it am_release.
+          This is intended for use with the libtool's -release option and will
+          result in library names that correspond to the ACE kit number.
+          The -version-info option uses interface numbers meant to indicate a
+          series of public API numbers. However, with ACE, things change
+          pretty often. Rather than try to come up with a way of managing
+          interface numbers, just use the release numbering that users know
+          and are used to.
+
+Thu May 18 15:15:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Removed Limits from the list of ORB tests because it is now part
+          of ACE.
+
+        * tests/Service_Config_Test.cpp:
+
+          Added functionality to test gestalt size limits.
+
+Thu May 18 15:21:33 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * NEWS:
+        * ace/Task.{h inl cpp}: Reverted the changes from:
+          Fri Apr 14 15:53:21 UTC 2006  Steve Huston  <shuston@riverace.com>
+          Tasks that delete themselves from within close() would invalidate
+          the lock that ACE_Task held across the close() call and perform
+          undefined and illegal actions on the deleted lock upon return.
+          Bugzilla #2339 remains unresolved.
+
+Wed May 17 20:31:11 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com>
+
+        * ace/DLL_Manager.cpp:
+        * ace/DLL_Manager.h:
+          The dll handle is added to the to the
+          handle_vector_ only after the library is opened
+          successfully. This way, the vector does not have redundant
+          handles.
+
+        * ace/Object_Manager.cpp:
+          ACE_DLL_Manager::close_singleton is called explicitly from the
+          ACE_Object_Manager to make sure ACE_DLL_Manager gets cleaned up,
+          even if there was an error while opening a lib file.
+
+          Thanks to Timo Kuosmanen <ttkuosma at cc dot jyu dot fi> for
+          reporting this.
 
-Wed Nov 22 10:48:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed May 17 14:07:33 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
+
+        * netsvcs/lib/Server_Logging_Handler_T.cpp: Improved the code so
+          that it should compile and run properly on Windows.  Thanks to
+          Phil Mesnier for reporting this.
+
+Wed May 17 19:07:43 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Dynamic_Service_Dependency.h: Doxygen correction; use @c to
+          set a word in "typewriter" font, but for known class names, there's
+          no need to do this.
+
+Wed May 17 17:56:49 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * examples/C++NPv1/Logging_Client.cpp
+        * examples/C++NPv1/Logging_Handler.cpp
+        * examples/C++NPv2/Logging_Handler.cpp
+
+          Removed now-redundant CDR insertion/extration operators now
+          defined in ace/Log_Record.{h,cpp}
+
+Wed May 17 09:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_ipc.h:
+        * ace/os_include/sys/os_socket.h:
+        * ace/os_include/sys/os_stat.h:
+        * ace/os_include/sys/os_types.h:
+          Removed psos support
+
+        * ace/os_include/sys/os_mman.h:
+          Removed madvice prototype and ACE_LACKS_MADVISE_PROTOTYPE, it
+          is not set in any config file
+
+Wed May 17 02:23:31 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Log_Msg_IPC.cpp:
+
+          Fix typo exposed on systems with ACE_HAS_STREAM_PIPES defined.
+          I'll leave it to Will & Doug to do whatever the TO DO said to do.
+
+Tue May 16 22:23:55 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ace/Log_Msg_IPC.cpp
+        * ace/Log_Record.cpp
+        * ace/Log_Record.h
+        * ace/Log_Record.inl
+        * netsvcs/lib/Client_Logging_Handler.cpp
+        * netsvcs/lib/Server_Logging_Handler_T.cpp
+
+          Fixed some problems that stemmed from changing ACE_Log_Msg
+          msg_data_ from a fixed-size array to a dynamically-sized array.
+          Thanks to Keith Muzzioli <Keith_W_Muzzioli at raytheon dot com>,
+          John Black <John_K_Black at Raytheon dot com>, and Mitsuo
+          Fukasawa <fukasawa_mitsuo at nifty dot com> for reporting this
+          and to Doug Schmidt for helping to fix it!
+
+Tue May 16 13:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_time.inl:
+        * ace/OS_NS_time.{h,cpp,inl}:
+          Removed chorus and psos support
+
+        * ace/OS_Thread_Adapter.cpp:
+          Removed psos support
+
+Tue May 16 13:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_wait.{h,inl}:
+          Remove chorus support
+
+        * ace/OS_NS_stropts.inl:
+        * ace/OS_NS_sys_stat.inl:
+        * ace/OS_NS_string.inl:
+          Removed psos support
+
+Tue May 16 13:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Log_Msg.cpp:
-          Refactored handling of %W. Added a check for a nill pointer
-          as we have for ascii strings. Fixes bugzilla 2277.
+        * ace/OS_NS_arpa_inet.{h,cpp,inl}:
+        * ace/OS_NS_dirent.inl:
+          Removed psos support
 
-        * tests/Log_Msg_Test.cpp:
-          Added test for %W with a string as argument and with a
-          nill pointer. Fixes bugzilla 2715.
+        * ace/INET_Addr.cpp:
+        * ace/config-macros.h:
+          Removed chorus support
+
+        * ace/Unbounded_Queue.h:
+          Removed remark about chorus
+
+        * ace/config-cray.h:
+          Removed explicit template instantiation define, we don't have that
+          anymore
+
+        * ace/config-hpux-11.00.h:
+        * ace/config-sunos5.7.h:
+        * ace/config-rtems.h:
+        * ace/config-osf1-4.0.h:
+          Removed kcc support
+
+Mon May 15 11:30:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+          Added more tests that can't run in ACE_FOR_TAO configations due
+          to dependency on something that avoids ACE_FOR_TAO.
+
+Mon May 15 01:15:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+        * bin/tao_other_tests.lst:
+          Added !ACE_FOR_TAO to those tests for which MPC skips generating
+          executables because it directly or indirectly avoids ACE_FOR_TAO.
+          Indirect avoidance occurs when a project derives from a base
+          project that avoids ACE_FOR_TAO.
 
-Wed Nov 22 10:38:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu May 11 12:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * examples/Misc/test_XtReactor1.cpp:
-        * examples/Misc/test_XtReactor2.cpp:
-        * tests/FlReactor_Test.cpp:
-        * tests/XtReactor_Test.cpp:
-        * tests/TkReactor_Test.cpp:
-        * tests/QtReactor_Test.cpp:
-          Updated because of move below.
+        * ace/Message_Block.h:
+          Doxygen improvements
+
+Thu May 11 11:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Nov 22 10:35:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Dev_Poll_Reactor.cpp:
+          Removed chorus support
 
-        * ace/QtReactor*.*:
-        * ace/FlReactor*.*:
-        * ace/XtReactor*.*:
-        * ace/TkReactor*.*:
-          Moved these reactors to their own subdirectories to make
-          maintenance a lot easier.
+Thu May 11 07:19:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
 
-Wed Nov 22 10:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/tao_orb_tests.lst:
+          Added Bug_1254_Regression
 
-        * bin/MakeProjectCreator/config/core_anytypecode.mpb:
-          Removed svn:executable property
+Wed May 10 14:10:02 UTC 2006  Steve Huston  <shuston@riverace.com>
 
-        * bin/MakeProjectCreator/config/core_strategies.mpb
-          New base project for the strategies library when build in
-          ace_for_tao configuration
+        * ace/config-win32-msvc-7.h: MSVC 7.1 operator new throws an exception
+          on an out-of-memory condition, but only when the standard C++
+          library is used; the older CRT new() doesn't.
+
+Tue May  9 11:38:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/MakeProjectCreator/config/orbsvcslib.mpb:
-          Removed -GT so that we also don't generate TIE files for the
-          orbsvcs anymore. Will speedup builds and simplify other mpc
-          files
+          Add -GT to the idlflags, all orbsvcs then do generate the TIE files,
+          if people then use them, they get them out of the box.
 
-        * bin/MakeProjectCreator/config/strategies.mpb
-          Derive from core_strategies. Now the strategies library
-          does get build in an ace_for_tao configuration but
-          shmiop and uiop are not build at all, other protocols
-          can be build. This way we can build COIOP in an ace_for_tao
-          setup
+Tue May  9 07:36:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/make_release:
-          Removed dsp/dsw reference, corrected naming of the ACE
-          packages when the version number gets added.
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+          Removed -Sc, added -GT, see bugzilla bug 2525 for more info
 
-        * include/makeinclude/platform_hpux_aCC.GNU:
-          Removed HPUX 10.20 support
+Tue May  9 07:25:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * include/makeinclude/platform_lynxos.GNU:
-          ACE_HAS_BROKEN_THREAD_KEYFREE is now set in the config file
+        * ace/Condition_T.{h,cpp,inl}:
+        * ace/Local_Name_Space_T.cpp:
+        * ace/Configuration.cpp:
+        * ace/Sched_Params.cpp:
+        * ace/Mutex.{h,cpp,inl}:
+        * ace/Select_Reactor_T.cpp:
+        * ace/Signal.cpp:
+          Removed Chorus support
 
-        * include/makeinclude/wrapper_macros.GNU:
-          Removed ACE_HAS_GNUG_PRE_2_8 checks
+        * ace/CDR_Stream.cpp:
+          Small layout change
 
-Wed Nov 22 09:07:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Event_Handler.cpp:
+          Removed psos support
 
-        * docs/run_test.txt:
-          Document ACE_RUN_VX_TGT_HOST
+        * ace/Message_Block.h:
+          Doxygen improvements
 
-        * docs/bczar/bczar.html:
-          Updated this file
+        * ace/Message_Block.cpp:
+          Const improvement
 
-        * ace/config-freebsd.h:
-        * ace/POSIX_Proactor.cpp:
-          Added ACE_HAS_SIGVAL_SIGVAL_INT, this fixes bugzilla
-          bug 2716. Thanks to Craig Rodrigues
-          <rodrigc at crodrigues dot org> for reporting this.
+Sun May  7 21:03:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * ace/ace.mpc:
-          Added missing OS.inl. This fixes bugzilla bug 2705.
-          Thanks to Daniel Black <dragonheart at gentoo dot org>
-          for reporting this.
+        * ace/Service_Config.{h,cpp}:
 
-        * Release:
-          Removed dsw files
+          Weeding out the remaining issues with single threaded
+          builds. The implementation now relies on the ACE_TSS_* macros to
+          abstract from the differences among build styles and platform
+          support for TSS.
 
-        * ace/config-rtems.h:
-        * ace/config-posix-nonetworking.h:
-          Moved the configuration to build without no networking
-          support to its own file so that we can reuse this for
-          example on linux
+        * ace/Service_Gestalt.{h,cpp}:
 
-        * ace/config-rtems.h:
-          Added support for rtems 4.7
+          Eliminated commented out code. Minor reformatting in places.
 
-        * ace/config-unixware-7.1.0.udk.h:
-          Cleanup
+        * ace/TSS_T.{h,inl,cpp}:
 
-        * ace/config-lyxos.h:
-          Added support for LynxOS 4.2
+          Added some comments to help others avoid a few pitfalls. Made
+          ts_init() a non-const, which eliminates a few const_cast's.
 
-        * ace/config-linux.h:
-        * ace/config-linux-common.h:
-          Moved ACE_HAS_GETIFADDRS to the common file and added
-          support for ACE_LACKS_NETWORKING on linux
+Sun May  7 07:02:51 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * ace/INET_Addr.cpp:
-        * ace/OS_NS_netdb.cpp
-          Fixed compile problem when using ACE_LACKS_NETWORKING on
-          linux
+        * ace/Service_Config.h:
+        * ace/Service_Config.cpp:
 
-        * ace/Obstack.h:
-          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
-          on FC6. Thanks to Ken Sedgwick <ken at bonsai dot com> for
-          reporting this and testing out the patch.
+          Refactored the TSS usage (again) to fix a nasty
+          order-of-initialization problem. The gist of which is that, if
+          the ptr (to a template class instance) is a static member, in
+          static builds, it will be initialized by the process prologue
+          code *after* another static initializer has had the chance to
+          use and assign it a value. The solution was to use a method
+          scope static instance, which C++ guarantees to be initialized by
+          the (first) exit from that method.
 
-        * ace/OS_NS_string.inl:
-          Initialise pointer with 0
+        * ace/Service_Gestalt.h:
+        * ace/Service_Gestalt.cpp:
+
+          Refactored the construction to avoid using straight new in
+          constructor initializer lists. Replaced new with ACE_NEW_* where
+          appropriate.
+
+Sat May  6 18:08:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Add feature tests for ACE_LACKS_ASCTIME, ACE_LACKS_ACSTIME_R,
+          ACE_LACKS_GETCWD, ACE_LACKS_GMTIME, ACE_LACKS_GMTIME_R,
+          ACE_LACKS_LOCALTIME, and ACE_LACKS_STRFTIME.
+
+Sat May  6 09:52:06 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
+
+        * examples/DLL/test_dll.cpp: Renamed the DLLs and removed the "./"
+          from the pathname.  Thanks to Sam and Roopa for reporting this
+          and tracking it down, respectively.
+
+Sat May  6 10:23:13 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU: Add -lrt -laio to
+          the LIBS. The Proactor framework needs this; I'm not sure why it
+          never showed up until static builds were run.
+
+Tue Apr 25 10:22:16 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
+
+        * ace/OS_NS_string.cpp (strerror): Do a sanity check to make sure
+          errnum >= 0 and < _sys_nerr and set errno to EINVAL if things
+          are not sane.  Thanks to Aleksandar Vukajlovic <vukajlo at
+          finsoft dot co dot yu> for this fix.
+
+Fri May  5 19:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Default_Constants.h:
+          Added a compile time check that ACE_DEFAULT_CDR_BUFSIZE must be
+          defined to a value bigger then 0, it is 0 we get in a never ending
+          loop in the CDR code
+
+Fri May  5 17:01:32 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp:
+        * examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.{cpp i h}:
+          Wide-char corrections.
+
+Fri May  5 13:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/FIFO.cpp:
+        * ace/os_include/os_stddef.h:
+          Removed psos support
+
+        * ace/config-WinCE.h:
+        * ace/os_include/os_stddef.h:
+          Moved setting of ACE_LACKS_STDDEF_H and ACE_LACKS_PTRDIFF_T to the
+          WinCE file
+
+Fri May  5 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_openvms.GNU:
+          Changed the way templates are handled
+
+Fri May  5 11:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Reactor_Token_T.h:
+          Removed workaround for vc6
+
+Fri May  5 08:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/MMAP_Memory_Pool.{h,cpp}:
+          Made guess_on_fault_ a real bool
+
+Fri May  5 08:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/os_dirent.h:
+        * ace/os_include/os_errno.h:
+        * ace/os_include/os_netdb.h:
+        * ace/os_include/os_stdint.h:
+        * ace/os_include/os_time.h:
+        * ace/os_include/os_string.h:
+        * ace/os_include/os_stdlib.h:
+          Removed psos support
+
+        * ace/os_include/os_dlfcn.h:
+        * ace/os_include/os_signal.h:
+          Removed psos and kcc support
+
+        * ace/os_include/os_pthread.h:
+          Removed chorus support
+
+        * ace/os_include/os_unistd.h:
+          Removed chorus and psos support
+
+Fri May  5 07:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_utsname.cpp:
+        * ace/OS.h
+          Removed psos and chorus support
+
+        * ace/OS_NS_fcntl.cpp:
+        * ace/Lib_Find.cpp:
+        * ace/OS_NS_netdb.inl:
+          Removed psos support
+
+        * ace/Mem_Map.cpp:
+          Removed chorus support
+
+        * ace/IOStream.h:
+          Removed checks for KCC compiler
+
+Fri May  5 07:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Base_Thread_Adapter.h:
+        * ace/SPIPE_Connector.cpp:
+        * ace/SOCK_Dgram.cpp:
+        * ace/Select_Reactor_T.cpp:
+        * ace/Handle_Set.cpp:
+          Removed code for psos, support for this platform will be removed
+
+        * ace/CDR_Base.h:
+          Removed check for KCC compiler
+
+        * ace/Malloc_Allocator.h:
+          Doxygen improvement
+
+Thu May  4 22:11:06 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Block.h: Made ACE_Data_Block::release_i() virtual.
+          Thanks to Gary Fernandez <gary dot fernandez at ironmountain dot
+          com> for this change.
+
+Thu May  4 21:07:10 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/SPIPE_Acceptor.cpp (create_new_instance, close): Have to use
+          ACE_TEXT_ALWAYS_CHAR to pass pipe name on wide-char w/
+          ACE_HAS_STREAM_PIPES. Thanks to Gary Fernandez <gary dot
+          fernandez at ironmountain dot com> for this fix and to Yasser
+          Zabuair <yzabuair at hotmail dot com> for also reporting it.  This
+          fixes bugid 2541.
+
+        * THANKS: Added Gary and Yasser to the Hall of Fame.
+
+Thu May  4 08:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Reverted the change below, broke the sendfile test and Steve
+        Huston changed things in such a way that sendfile is only
+        used on Solaris 9 and newer
+
+        Tue May  2 09:34:54 Pacific Daylight Time 2006    <ossama_othman at symantec dot com>
+        * ace/OS_NS_sys_sendfile.inl (sendfile):
+          Removed "::" global scope qualifier from platform sendfile()
+          call.  It caused problem on Solaris 8.  Thanks to Simon Massey
+          and Johnny Willemsen for analyzing the problem and suggesting
+          this fix.
+
+Thu May  4 08:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ace_for_tao.mpc:
+          Added OS_NS_sys_sendfile
+
+Thu May  4 00:43:32 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ace/Makefile.am:
+
+          Add Dynamic_Service_Dependency.{cpp,h} to appropriate lists.
+
+Wed May  3 16:02:10 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.h:
+        * ace/Service_Config.cpp:
+
+          Fixed a problem due to an attempt to access current_ before it
+          has been initialized (a static ACE_TSS instance). The current_
+          is now just a pointer to an ACE_TSS instance, which gets
+          dynamicaly allocated upon invoking the current() method. The
+          deallocation of that instance is left up to the Object Manager
+          with which the dynamic ACE_TSS instance is registered.
+
+        * ace/TSS_T.h:
+
+          Added a ACE_TSS_SET () to complete the set of TSS access
+          operations, which should work regardless of threading, TSS
+          emulation and TSS availability.
+
+Wed May  3 11:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Mem_Map.inl:
+          Small const improvements
+
+Wed May  3 10:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Mem_Map.{h,cpp,inl}:
+          Made close_handle_ a bool
+
+Wed May  3 08:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-macros.h:
+          Removed support for KCC
+
+Wed May  3 08:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_sendfile.h:
+          Export sendfile_emulation to resolve link problems in the
+          windows builds
+
+Wed May  3 03:36:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Svc_Conf_y.cpp:
+
+          Moved the ACE_BEGIN_VERSIONED_NAMESPACE_DECL macro to include
+          ace_yyparse.
+
+Tue May  2 09:34:54 Pacific Daylight Time 2006    <ossama_othman at symantec dot com>
+
+        * ace/OS_NS_sys_sendfile.inl (sendfile):
+
+          Removed "::" global scope qualifier from platform sendfile()
+          call.  It caused problem on Solaris 8.  Thanks to Simon Massey
+          and Johnny Willemsen for analyzing the problem and suggesting
+          this fix.
+
+Tue May  2 10:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-WinCE.h:
+          Added ACE_LACKS_GETCWD, ACE_LACKS_ASCTIME, ACE_LACKS_ASCTIME_R,
+          ACE_LACKS_GMTIME, ACE_LACKS_GMTIME_R, ACE_LACKS_LOCALTIME and
+          ACE_LACKS_STRFTIME. These macros are new and will be used soon
+          in the ACE_OS layer.
+
+Mon May  1 19:49:45 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/ARGV.{h i cpp}: Filled out more of the documentation in this
+          class, specifically mentioning that the class will enforce the
+          "whitespace separates tokens, except when quoted" rule of command
+          line parsing that's consistent with ACE_Get_Opt, etc. Also removed
+          documentation of non-existant restrictions such as after using
+          add(), can't use buf().
+          Removed the State enum since the only value ever used was ITERATIVE,
+          and changed "int state_" to "bool iterative_" (and removed the
+          state() accessor). Changed substitute_env_args_ from int to bool.
+
+        * ace/OS_NS_unistd.{h cpp} (argv_to_string, string_to_argv): Changed
+          the substitute_env_args parameter from "int" to "bool" to better
+          reflect what it is, a yes/no indicator.
+
+Mon May  1 06:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_sunos5_g++.GNU:
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+          Also for solaris 10 link the sendfile lib
+
+Sun Apr 30 04:21:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Svc_Conf_y.cpp:
+          What I meant to commit last time.
+
+Sun Apr 30 02:21:16 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Svc_Conf_y.cpp:
+          Eliminating more warnings from the scoreboard. I'm not sure the
+          best way to add this patch to ace/svcconf.mpb, since it affects
+          more than just gnuace targets. The easiest would be to store the
+          diff between this commit and the previous version and run patch,
+          but I'm not sure how to integrate that solution.
+
+Sat Apr 29 13:58:28 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.cpp:
+          More fuzz cleanup.
+
+Sat Apr 29 13:17:24 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/ACE.cpp:
+          Fuzz cleanup.
+
+        * THANKS:
+          Added credits.
+
+Fri Apr 28 22:31:52 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.cpp:
+
+          Removed an ';' after ACE_TRACE, which was confusing GCC4 with
+          "hidden visibility" enabled.
+
+Fri Apr 28 21:22:53 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.cpp:
+        * ace/Service_Gestalt.cpp:
+
+          More re-formatting to weed out those pesky tabs.
+
+Fri Apr 28 20:57:19 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-sunos5.8.h:
+        * ace/config-sunos5.9.h: Moved ACE_HAS_SENDFILE from Solaris 8 to
+          Solaris 9. Solaris 8 supports sendfilev[64] but not sendfile,
+          at least not without some patches I don't know about.
+
+Fri Apr 28 20:13:41 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_sunos5_g++.GNU:
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+          Solaris 9 puts sendfile() is a separate library, so LIBS needs
+          -lsendfile on Solaris 9.
+
+Fri Apr 28 18:03:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/ACE.cpp:
+        * ace/DLL.cpp:
+        * ace/DLL_Manager.cpp:
+        * ace/Dynamic_Service_Base.cpp:
+        * ace/Dynamic_Service_Dependency.cpp:
+        * ace/Parse_Node.cpp:
+        * ace/Service_Config.inl:
+        * ace/Service_Config.cpp:
+        * ace/Service_Gestalt.cpp:
+        * ace/Service_Object.cpp:
+        * ace/Service_Repository.cpp:
+        * ace/Service_Types.cpp:
+        * ace/Shared_Object.cpp:
+
+          Applied formatting style consistent with ACE convention.
+
+Fri Apr 28 15:48:25 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Service_Config.cpp (open_i): ACE_DEFAULT_SVC_CONF shouldn't
+          be enclosed in ACE_LIB_TEXT since it's defined in terms of
+          ACE_LIB_TEXT already.
+
+Fri Apr 28 15:49:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Makefile.am:
+          Added new Service_Gestalt files to the appropriate lists.
+
+Fri Apr 28 15:42:59 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Service_Config.cpp:
+          Fixed a problem killing some wchar builds.
+
+        * ace/Service_Gestalt.h:
+          Cleaned up the long-lines of the UNIMPLEMENTED functions.
+
+Fri Apr 28 15:26:53 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Timer_Queue_Adapters.h: Clarified the use and restrictions with
+          ACE_Async_Timer_Queue_Adapter.
+
+Fri Apr 28 15:22:35 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS2/JAWS/Concurrency.cpp: Removed unused variables.
+
+Fri Apr 28 14:54:04 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-macros.h: HP aC++ needs to see the statement in
+          ACE_NOTREACHED up to the version 6 series (Integrity). Also see
+          Tue Apr 11 13:12:36 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+Fri Apr 28 14:31:48 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Service_Gestalt.h: Removed extraneous ';' from
+          ACE_UNIMPLEMENTED_FUNC usage.
+
+        * m4/ace.m4: Fixed incorrect variable referenced in case during
+          --enable-uses-wchar.  Thanks to Paul Robinson <probinson at
+          gmail dot com> for reporting this.
+
+Fri Apr 28 14:03:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Dynamic_Service.h:
+        * ace/Parse_Node.h:
+
+          Fixed the usage of ACE_UNIMPLEMENTED_FUNC to remove the trailing
+          semicolon. It was causing build errors on compilers that define
+          the macro as empty.
+
+Fri Apr 28 13:55:01 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.h:
+
+          Fixed the usage of ACE_UNIMPLEMENTED_FUNC to remove the trailing
+          semicolon. It was causing build errors on compilers that define
+          the macro as empty.
+
+Fri Apr 28 13:29:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Updated the conditions for running the ORB-specific service
+          repository tests.
+
+Fri Apr 28 13:23:57 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.h:
+
+          Updated the declaration of current_ to match the definition in
+          its use of ACE_TSS_TYPE macro, as they are not equivalent for
+          a single-threaded builds.
+
+Fri Apr 28 13:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Process_Mutex_Test.cpp:
+          When spawn fails log an error and exit instead of using an assert
+          which causes an abort of the exe
+
+Fri Apr 28 13:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Pipe_Test.cpp:
+          When spawn fails log an error and exit instead of using an assert
+          which causes an abort of the exe
+
+Fri Apr 28 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-openvms.h:
+          Added __SIGNED_INT_TIME_T so that we get a signed time_t that
+          matches the POSIX spec that ACE expects.
+
+Fri Apr 28 12:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-openvms.h:
+          Removed comments, macros are documented in generally, added
+          ACE_LACKS_PERFECT_MULTICAST_FILTERING
+
+Fri Apr 28 11:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/Process_VMS.pm:
+          New file to be able to run the tests automatically on OpenVMS
+
+        * bin/PerlACE/Process.pm:
+          When running on OpenVMS use Process_VMS
+
+        * ace/config-openvms.h:
+          Added ACE_HAS_SIGISMEMBER_BUG
+
+        * tests/run_test.pl:
+          If ACE_ROOT is not set, add ../bin to lib
+
+Fri Apr 28 09:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Process_Manager_Test.cpp:
+          Also create a logfile for each child process started
+
+Fri Apr 28 08:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          Added Sendfile_Test
+
+Fri Apr 28 08:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sendfile_Test.cpp:
+          Added missing include
+
+Thu Apr 27 21:04:08 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_Memory.h: Allow configs to set ACE_bad_alloc to avoid
+          extending the if-elif chain here further.
+
+        * ace/config-win32-msvc.h: Regardless of MSVC version, MFC changes
+          operator new to throw CMemoryException on out-of-memory condition.
+          Version-specific settings still control the setting of
+          ACE_HAS_NEW_NOTHROW. Thanks to Mohit Kapoor <Mohit dot Kapoor at
+          siemens dot com> for this fix.
+
+        * ace/Select_Reactor_T.cpp (handle_error): HACK ALERT! Some Linux
+          kernels will return from select() with an "invalid" errno value,
+          ERESTARTNOHAND, when compiled with profiling enabled. This works
+          around the problem. This is a known kernel bug; see Red Hat Bugzilla
+          https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=161468 and
+          https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=123648 as well
+          as Riverace support issue #167 and Riverace's complaint to Red Hat,
+          support issue #17841808.
+
+        * THANKS: Added Mohit Kapoor to the Hall of Fame.
+
+Thu Apr 27 20:14:52 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.cpp:
+
+          Fixed a complaint from a ACE_NDEBUG builds about unrefrenced
+          variable (only used in ACE_ASSERT).
+
+Thu Apr 27 18:33:18 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Aio_Platform_Test.cpp:
+          When AIO is not available, just print an info message and exit
+
+        * tests/run_test.lst:
+          Added Aio_Platform_Test, it was not in this file at all
+
+Thu Apr 27 18:21:17 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-aix-5.x.h: Added ACE_HAS_SIGSUSPEND.
+
+Thu Apr 27 14:57:10 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Svc_Conf.y:
+        * ace/Svc_Conf_Tokens.h:
+        * ace/Svc_Conf_y.cpp:
+
+          Fixed fuzz complaint about #include inside a versioned namespace
+          in Svc_Conf_y.cpp. It was due to a code that Bison generates a
+          part of the parser, from Svc_Conf.y. Changed the versioned
+          namespace to encloses the non-generated code only, while the
+          rest of the parser seems to be designed so that multiple parses
+          can coexist without name clashes.
+
+Thu Apr 27 14:29:07 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Dynamic_Service_Dependency.h:
+        * ace/Dynamic_Service_Dependency.cpp:
+
+          Updated to remove an empty inl file.
+
+        * ace/Dynamic_Service_Dependency.inl:
+
+          Removed this file.
+
+Thu Apr 27 14:00:18 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Sock_Connect.cpp:
+          Implemented get_ip_interfaces for OpenVMS
+
+Thu Apr 27 11:19:18 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Array_Map.h:
+        * ace/ATM_Addr.h:
+        * ace/Atomic_Op_T.h:
+        * ace/Base_Thread_Adapter.h:
+        * ace/Cached_Connect_Strategy_T.h:
+        * ace/Capabilities.h:
+        * ace/Default_Constants.h:
+        * ace/Hash_Map_Manager_T.h:
+        * ace/Log_Msg_Callback.h:
+        * ace/Log_Msg_IPC.h:
+        * ace/Map_Manager.h:
+        * ace/POSIX_Asynch_IO.h:
+        * ace/POSIX_Proactor.h:
+        * ace/RB_Tree.h:
+        * ace/Strategies_T.h:
+        * ace/Timer_Heap_T.h:
+        * ace/Timer_List_T.h:
+        * ace/Timer_Queue_Adapters.h:
+        * ace/Timer_Queue_T.h:
+        * ace/Timer_Wheel_T.h:
+          Fixed doxygen warnings
+
+Thu Apr 27 01:49:18 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * ace/OS_NS_sys_sendfile.h (sendfile, sendfile_emulation):
+        * ace/OS_NS_sys_sendfile.cpp (sendfile_emulation):
+
+          ACE_LOFF_T -> off_t.  Expected ACE_LOFF_T behavior is still
+          under scrutiny.
+
+        * ace/OS_NS_sys_sendfile.inl:
+
+          Added missing <sys/sendfile.h> include directive.  Addresses
+          infinite recursion at run-time when ACE_HAS_SENDFILE is defined.
+
+          (sendfile):
+
+          ACE_LOFF_T -> off_t, as above.
+
+Wed Apr 26 22:00:21 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Parse_Node.h:
+        * ace/Service_Gestalt.h:
+
+          Correcting a build problem, caused by the extraneous semicolons
+          after ACE_UNIMPLEMENTED_FUNC
+
+Wed Apr 26 20:21:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          The motivation for these changes was to enable support in ACE
+          for multiple instances of Service Configuration Repository, or
+          more appropriately - "Gestalt" (from the German word, meaning
+          something that's more than the sum of its parts).  This is
+          feature is necessary to enable support for ORB-specific, or more
+          generally - service-specific sets of services, i.e. to be able
+          to have dynamically loaded services to use their own private set
+          of service objects. In the context of the implementation I will
+          use "gestalt" as a synonym for service configuration context or
+          service configuration repository.
+
+          In order to accomplish this, the "instance"-related
+          functionality of the former ACE_Service_Config class has been
+          moved to another class - ACE_Service_Gestalt. The
+          ACE_Service_Config retains all static interfaces and those
+          members, pertaining to the concept of process-wide configuration
+          state. The service config, as known today has been retained as a
+          concept, but in its specialized semantics as holding a
+          process-wide configuration state. The primary concept expressing
+          an instance of configuration context is the gestalt. The
+          implementation actually uses a specialization of
+          ACE_Service_Gestalt in order to implement ACE_Service_Config as
+          a singleton, special case of configuration context.
+
+          The static methods in ACE_Service_Config provide access to
+          process-wide gestalt (ubergestalt, anyone?) instance.
+
+          For more details, here is the history of all included changes,
+          with their motivation and explanation. It is ordered
+          alphabetically, by the names of the changed files:
+
+        * ace/ACE.cpp:
+
+          Added to the condition evaluating ACE::debug() to include a
+          check if environmental variable ACE_DEBUG has been set.
+
+          Updated the debug() function to call getenv() only once by using
+          a method-local static variable to hold the value from the
+          environment.
+
+        * ace/DLL.h:
+        * ace/DLL.cpp:
+
+          Implemented an operator=, needed in order to implement the
+          ACE_Service_Configuration_Guard class.
+
+        * ace/DLL_Manager.cpp:
+
+          Improved the error diagnostics so that a "file not found" would
+          not mask a "symbol not defined" error when loading a DLL.
+
+        * ace/Dynamic_Service.h:
+
+          "Privatized" copy ctor and operator= for ACE_Dynamic_Service
+          objects since it is not designed for such operations.
+
+        * ace/Dynamic_Service.inl:
+
+          Added overloaded method instance() for ACE_ANTI_TCHAR.
+
+        * ace/Dynamic_Service.cpp:
+
+          Changes to enable instantiation of a service, based on the
+          registration in a particular service repository. Adding a method
+          that takes ACE_Service_Gestalt* additional parameter.
+
+        * ace/Dynamic_Service_Base.h:
+        * ace/Dynamic_Service_Base.cpp:
+
+          Factored out a find_i() method to be used by the friend
+          ACE_Dynamic_Service_Dependency class. It implements the specific
+          lookup policy that extends the search to the global repository
+          if the named service object can not be found locally.
+
+          Added instance method, allowing the caller to explicitly specify
+          the gestalt.
+
+        * ace/Dynamic_Service_Dependency.h:
+        * ace/Dynamic_Service_Dependency.inl:
+        * ace/Dynamic_Service_Dependency.cpp:
+
+          A newly introduced class, whose instances are designed to be
+          embedded inside instances of other classes, typically created by
+          DLL-based factories (service objects). This provides a way to
+          declare dependency on a specific service, thus avoiding order of
+          initialization issues with objects whose implementation code
+          resides in dynamically loaded services.
+
+          It is disastrous to have dynamically loadable services create
+          and give away ownership of objects and then be unloaded before
+          all those instances have been deleted. Normally the code for
+          such objects classes resides within the TEXT segment of the DLL,
+          which implements the service. If a service gets removed, its DLL
+          may be unmapped from memory and then any attempt to invoke a
+          method on the said objects will cause SEGV.
+
+          Such instances must contain a member of
+          ACE_Dynamic_Service_Dependency initialized with the service they
+          depend on. @code ACE_Dynamic_Service_Dependency's constructor
+          and destructor are "magical" - they work by maintaining the
+          underlying dynamic service's DLL reference count.
+
+          The problem was not present before because the one Service
+          Repository outlived any other user objects. Now that an
+          un-loadable service can own its configuration, the sequence of
+          service finalization has been reversed.
+
+          Updated the implementation of ACE_Dynamic_Service_Dependency
+          class to ease debugging. ACE_Dynamic_Service_Dependency gets
+          initialized whenever a dependent service gets loaded, to help us
+          keep our access to dependent instances after their DLL is gone
+          (by upping the ref count on the DLL).
+
+          Updated usage of gestalt's instance() to current(). Removed
+          unnecessary comments.
+
+        * ace/Global_Macros.h:
+
+          Changed the ACE_STATIC_SVC_DEFINE to use the new
+          ACE_Service_Config::insert () method, which allows to streamline
+          the Service Configuration interface and promote hiding the
+          storage used for the static service descriptors.
+
+        * ace/Parse_Node.h:
+        * ace/Parse_Node.cpp:
+
+          Changes to aid in keeping track of the gestalt, while deep in
+          the guts of the svc.conf parser.
+
+          Replaced the ACE_Service_Gestalt & in the method signatures with
+          ACE_Service_Gestalt * to unify the interfaces.
+
+          Updated the static function node's logic to use only
+          ACE_Service_Gestalt public members and to no longer rely on
+          knowledge about the internal storage representation of service
+          repository.
+
+          Removed a static_cast<> in ACE_Static_Function_Node::symbol()
+          that was causing problems on some platforms. It was not even
+          necessary as both sides were of the same type.
+
+        * ace/Service_Config.{h,inl,cpp}:
+
+          This separates the responsibilities between the service gestalt,
+          which represents an _instance_ of configuration information, and
+          the service config, which represents a special, process-wide,
+          global configuration repository. Since both these entities
+          represent the same concept - service configuration state, but
+          from different aspects, the ACE_Service_Config now inherits
+          (publicly) from ACE_Service_Gestalt.
+
+          Lots of instance-related code moved to ACE_Service_Gestalt
+          Replaced the use of char with ACE_ANTI_TCHAR and the appropriate
+          ACE_TEXT_* macros.
+
+          Moved the parsing of command-line options, pertaining to the
+          process as a whole, here - in the parse_args_i () (protected,
+          virtual).
+
+          In order to resolve a problem caused by the inability of a
+          dependent static service to determine which gestalt they need to
+          register with, the concept of "current" was separated from the
+          "global" gestalt. The current gestalt is pointed to by a
+          pointer, stored in thread-specific storage (TSS) and manipulated
+          by the ACE_Service_Config_Guard class that implements the
+          "resource acquisition is initialization" idiom.
+
+          Fixed an error in the separation of responsibilities between the
+          instance gestalt and the global (ubergestalt), during
+          initialization.  The bug can cause infinite recursion, when
+          initializing an ORB, housed in a dynamic service. The singleton
+          gestalt (i.e. ACE_Service_Config) must be initialized through
+          open_i(), before open_i() can proceed initializing the specific
+          gestalt instance. The difficulty is in that some use cases
+          reverse the order of initialization by calling
+          ACE_Service_Config::open () first and then, at some point call
+          the instance gestalt open_i(). The solution is to use the
+          is_initialized_ member together with an explicit call to
+          ACE_Service_Config::global()->open_i().  To ease debugging of
+          the process of registering static service, I have changes the
+          ACE_Service_Config::static_svcs() to return
+          ACE_Service_Gestalt::instance (), instead. Thus all the
+          ACE_STATIC_SVC* macros are still working (no need to change
+          existing code), but now there is a convenient place to debug -
+          see the newly added ACE_Service_Gestalt::insert () method.  The
+          header file no longer declares ACE_STATIC_SVCS,
+          ACE_STATIC_SVCS_ITERATOR, ACE_SVC_QUEUE and
+          ACE_SVC_QUEUE_ITERATOR. Those are now protected typedefs in
+          ACE_Service_Gestalt, where they are actually used.
+
+          Added new insert () method to use instead of the sequence
+          static_svc ()->insert () which unnecessary exposes the internal
+          storage structure of Service Configurator.  Made no_static_svcs_
+          an instance member, instead of a class (static) member, thus
+          providing for ability to set it per instance, not globally.
+
+          Added default values for open_i() and declared private copy ctor
+          and assignment operator for ACE_Service_Config_Guard, since it
+          is not intended to be copied.
+
+          Similarly, moved the parts of the open_i() functionality that
+          did not belong in every instance of the gestalt.
+          ACE_Service_Config is again a process-wide Singleton,registered
+          with ACE_Object_Manager.
+
+          Eliminated old #if 0-ed code in Service_Config.cpp.
+
+        * ace/Service_Gestalt.h:
+        * ace/Service_Gestalt.inl:
+        * ace/Service_Gestalt.cpp:
+
+          Encapsulates the idea of Service Configuration repository, or
+          configuration context.
+
+          Changed open_i to be able to detect if it is working on the
+          special, process-wide instance (ubergestalt) or a "plain"
+          gestalt instance, since there are things that must only be done
+          once per process - like signal handler, logging key and
+          daemon-ization of the whole process.
+
+          Added an ignore_static_svcs parameter to
+          ACE_Service_Gestalt::open_i in order to preserve the prior
+          behavior of the singleton ACE_Service_Gestalt instance. Even
+          though its no_static_svcs_ member was being initialized with 1,
+          some clients (TAO) needs to be able to override it. Since now a
+          call to open_i on an instance gestalt may precede in time the
+          call to open_i on the ubergestalt, we need a mechanism to allow
+          the no_static_svcs_ value to be overridden.
+
+          Added the insert()'s implementation (described above).  Added a
+          singleton() method to return the process-wide gestalt singleton
+          (or ubergestalt?:). Used in open_i() to account for the fact
+          that now a Service Gestalt may be called to open () prior to
+          open () on the singleton instance, which would typically contain
+          the bulk of the static service object descriptors.
+
+          There was a problem with "hybrid" service objects, i.e. dynamic
+          SO which contains static SO (dependent services).  The dependent
+          services are typically registered via static ctor or static
+          initializer at the point of loading of the dynamic SO's DLL.  As
+          such, they end up registering before the dynamic SO.  Upon
+          finalization of the service repository, the dynamic SO is
+          finalized first, thus unloading its DLL and unmapping the TEXT
+          segment, where the dependent static services code is.  When
+          next, the static SO is to be finalized its memory is no longer
+          at valid address.  The change ensures the dynamic service is
+          registered *before* its dependent static services and will
+          therefore be finalized last.  The solution is based upon the
+          concept of forward declaring a dynamic service, named after the
+          configuration file being processed.  Before processing a file,
+          we simply check for an existing service with the same name and
+          "pass" if we find one.
+
+          Fixed the ACE_Service_Config_Guard's detection of the case where
+          the forward service declaration was not replaced by a proper
+          declaration as expected. It now properly removes the forward
+          decl, not the "good" instance.
+
+          Cleared up the TSS management issue, causing executable to crash
+          on startup. The problem was due to an order-of-instantiation
+          issue, involving the TSS-based pointer to the current
+          gestalt. Used ACE_Object_Manager's shutting_down and starting_up
+          methods to determine if it is safe to use the static ACE_TSS
+          instance.
+
+          Added const-ness for find().  Removed prototypes for initialize,
+          resume, suspend and remove that used plain char type and
+          conditionally compiled in only for WinCE and
+          ACE_USES_WCHAR. Service_Config still declares and defines these
+          (using ACE_ANTI_TCHAR). Updated to resolve problems when built
+          with ACE_USES_WCHAR.
+
+          Declared private copy ctor and assignment operator for
+          ACE_Service_Gestalt and ACE_Service_Type_Factory, since their
+          instances are not intended to be copied.  Added an
+          ACE_UNIMPLEMENTED_FUNC macro for the copy-ctor and assignment
+          operator of ACE_Service_Type_Factory.
+
+          Reorganized to streamline the header file and remove unnecessary
+          declarations and to add a decl for find_static_svc_descriptor().
+
+          Changed the open() method's implementation to incorporate the
+          additional parameter for open_i().
+
+          Added the new find_static_svc_descriptor() member, which allows
+          ACE_Static_Function_Node to not need to know how the static
+          services are registered in the service repository.
+
+        * ace/Service_Object.h:
+        * ace/Service_Object.inl:
+        * ace/Service_Object.cpp:
+
+          Exposed the dll_ member through dll () const method because the
+          reference is needed by the new ACE_Dynamic_Service_Dependency
+          class. Fixed the dump () method.
+
+        * ace/Service_Repository.h:
+        * ace/Service_Repository.cpp:
+
+          Added const-ness for the find* () methods. Added debugging.  The
+          remove method changes the order of services registrations in the
+          repository, which may break the Service Repository's invariant,
+          imposed by the need to correctly finalize dynamic services with
+          their own static services.
+
+          For example, consider a case where a static service (S0) is
+          registered in the repository. Then a DLL-based service (D1)
+          registers its own static service (S1). So far the order is
+          "finalization-compatible": S0 < D1 < S1, i.e. services will be
+          finalized in reverse order and D1's DLL will still be available
+          when finalizing S1.  Now let's remove (S0). Currently, after
+          this operation the repository end up in this order: S1 < D1,
+          which is trivially not finalization-compatible.
+
+          Instead of replacing the pointer with the last ptr to a svc in
+          the array (repository) and then decrementing the current size of
+          the repo, the solution actually shifts left the rest of the
+          array.
+
+        * ace/Service_Types.cpp:
+        * ace/Shared_Object.cpp:
+
+          Removed some and updated existing debug statements. Eliminated
+          dead partial instantiation code.
+
+        * ace/Svc_Conf.y:
+        * ace/Svc_Conf.h:
+        * ace/Svc_Conf_Tokens.h:
+        * ace/Svc_Conf_y.cpp:
+
+          Changed to allow propagation of the knowledge about which
+          gestalt is currently being used for service registrations.
+
+          Factored the ACE_Svc_Conf_Param class out in its own translation
+          unit.
+
+        * ace/Svc_Conf_Param.h:
+
+          Replaced the ACE_Service_Gestalt & in the method signatures with
+          ACE_Service_Gestalt *
+
+        * ace/svcconf.mpb:
+
+          Updated the svcconf.mpb rule to allow building with Bison 2.0
+          and up. The change adds #ifdef/#endif around the generated
+          header file. A YYSTYPE_IS_DECLARED define is added in order to
+          make sure the token declarations from the Svc_Conf_Tokens.h are
+          used instead of those generated in the Svc_Conf_y.cpp file.
+
+          Added the new Dynamic_Service_Dependency.* files.
+
+        * bin/tao_orb_tests.lst:
+
+          Adding the new tests to the automated test suite to run during
+          the nightly builds.
+
+Wed Apr 26 17:13:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+          Added test for Parallel_Connect_Strategy. This test will take
+          about 9 minutes to run to completion.
+
+Wed Apr 26 14:22:31 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+          Added tests for new POA features.
+
+        * bin/MakeProjectCreator/config/endpointpolicy.mpb:
+          Applications wishing to use the TAO EndpointPolicy should add
+          this base project to their MPC files. This will include
+          libTAO_EndpointPolicy in their link lines.
+
+Wed Apr 26 14:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_hpux_kcc.GNU:
+        * include/makeinclude/platform_irix6.x_kcc.GNU:
+        * include/makeinclude/platform_linux_kcc.GNU:
+        * include/makeinclude/platform_osf1_4.x_kcc.GNU:
+        * include/makeinclude/platform_sunos5_kcc.GNU:
+        * include/makeinclude/platform_tru64_kcc.GNU:
+          Removed these files which are for the KAI C++ compiler. This
+          compiler doesn't exist anymore and full support for KAI C++
+          has been removed now from ACE/TAO. See bugzilla bug 2007
+
+Wed Apr 26 13:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added TAO/tests/POA/Bug_2511_Regression
+
+Wed Apr 26 12:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Process_Manager.cpp:
+          Fixed fuzz errors and use const when possible
+
+Wed Apr 26 12:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CDR_Test.cpp:
+          Boolean is now size 1 or bigger, the marshaling code will take
+          care that a Boolean is marshaled as octet of size 1
+
+Wed Apr 26 11:28:28 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+          Added TAO/tests/OBV/truncatable.
+
+Wed Apr 26 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added TAO/tests/OBV
+
+Wed Apr 26 09:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added TAO/tests/Portable_Interceptors/Bug_2510_Regression
+
+Wed Apr 26 07:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks5.5.x.GNU:
+          Increased template-depth to 50, hopefully this is large enough to
+          also build CIAO
+
+Tue Apr 25 16:44:04 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/CDR_Stream.h:
+        * ace/CDR_Stream.cpp:
+          Added code to support rewinding the output CDR to some previous
+          location and updating a value there. This is required to support
+          marshaling offset values were the target of the offset is not
+          known until the final offset target is actually reached.
+
+Tue Apr 25 13:50:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Signal_Test.cpp:
+          Fixed this test for (modern) Linux and Solaris at least.
+          The crux is blocking signals before calling sigwait() when doing
+          synchronous signal handling.
+
+Tue Apr 25 09:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Base_Thread_Adapter.h:
+        * ace/Cleanup.h:
+          Fixed some errors I made
+
+Tue Apr 25 09:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+          Updated supported platforms and use vc8 for the MPC examples
+
+Tue Apr 25 08:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CDR_Base.h:
+          Always use bool for Boolean, see bugzilla 2514 for more info
+
+Tue Apr 25 06:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Msg.h:
+          Put back ACE_TSS_CLEANUP_NAME that got lost by accident with the
+          vc6 cleanup. Thanks to Olli Savia for reporting this.
+
+Mon Apr 24 17:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          Added Signal_Test. Thanks to Martin Corino for notificing that
+          we don't run this test on any platform.
+
+Mon Apr 24 10:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added TAO/tests/Bug_1676_Regression
+
+Mon Apr 24 09:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks5.5.x.GNU:
+          Increase template depth to resolve compile errors when building
+          TAO with the new sequence implementation
+
+Mon Apr 24 09:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_types.h:
+          Added ACE_LOFF_T for LynxOS. Thanks to Simon Massey for delivering
+          the patch
+
+Fri Apr 21 16:28:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+         Merge from ARMS Escher repository.
+
+        * ace/OS_NS_Thread.cpp
+
+          Updated sched_params() to not ignore the process id passed in.
+          Also enhanced the Windows implementation to get a handle to the
+          process specified before applying the priority class changes.
+
+        * ace/Process_Manager.cpp
+        * ace/Process_Manager.h
+
+           Added methods set_scheduler and set_scheduler_all
+           to set scheduling parameters for process(es) managed by this
+           class.
+
+        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb
+
+          Fixed build ordering problem in CIAO.
+
+Fri Apr 21 07:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Caching_Utility_T.cpp:
+          Removed invalid added const
+
+Thu Apr 20 19:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_types.h:
+          Added ACE_LOFF_T for the BSD variants, thanks to J.T. Conklin
+          for delivering the patch
+
+Thu Apr 20 18:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-macros.h:
+          Removed setting of ACE_ANY_OPS_USE_NAMESPACE again. This causes
+          problems when building CIAO. Thanks to Jeff Parsons for finding
+          this.
+
+Thu Apr 20 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/ACE_Init_Test.rc:
+          Removed another msvc specific part
+
+Thu Apr 20 11:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Added a check for deprecated macros, first one to check is
+          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+
+        * tests/*.cpp:
+        * protocols/*.cpp:
+        * ACEXML/*.cpp:
+        * performance-tests/*.cpp
+        * netsvcs/*.cpp
+          Removed all explicit template instantiations
+
+        * ace/os_include/sys/os_types.h:
+          Added ACE_LOFF_T typedef for VxWorks 6.2 and newer
+
+Thu Apr 20 07:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_types.h:
+          Always define ACE_LOFF_T so that we can use it in the sendfile
+          wrapper
+
+Thu Apr 20 07:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/svcconf.mpb:
+          Removed Service_Templates.cpp
+
+Wed Apr 19 19:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/*:
+          Removed explicit template support
+
+Wed Apr 19 15:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2368_Regression_Test.cpp:
+          Fixed compile error and compile warning
+
+Wed Apr 19 14:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_sendfile.h:
+          Updated include to get size_t and ACE_LOFF_T to fix compile
+          errors on Solaris
+
+Wed Apr 19 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/APG/Logging/Use_Multiple_Sinks.cpp:
+        * examples/APG/Logging/Use_Ostream.cpp:
+        * examples/APG/Logging/LogManager.h:
+          Removed vc6 workarounds
+
+Wed Apr 19 13:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2368_Regression_Test.cpp:
+        * tests/run_test.lst:
+        * tests/tests.mpc:
+          Added regression for bug 2368, this will fail because this bug
+          isn't addressed yet
+
+Wed Apr 19 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_sunos5_g++.GNU:
+          Use -shared instead of -G when building shared libraries. Thanks to
+          Alan L Batongbacal <alanlb at vt dot edu> for reporting this. This
+          fixes bugzilla bug 1848.
+
+Wed Apr 19 12:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/ACE_Init_Test.rc:
+          Removed msvc specific lines
+
+        * tests/tests.mpc:
+          The ACE_Init_Test should use its resource file. Fixes bugzilla
+          2495
+
+        * ace/Capabilities.{h,cpp}:
+          Prefix increment instead of postfix
+
+        * ace/Hash_Map_Manager_T.{h,cpp}:
+          Removed workaround for suncc 4.2
+
+        * ace/Object_Manager.h:
+        * ace/Parse_Node.h:
+        * ace/POSIX_Proactor.h:
+        * ace/Thread_Mutex.h:
+          Doxygen improvements
+
+        * ace/Parse_Node.cpp:
+          Use prefix increment, initialise pointers with 0 and don't print
+          an error message when we can't a dll, this gives false messages
+          when using TAO. This fixes bugzilla 2383. Thanks to Ming Xiong
+          for making a patch.
+
+        * ace/Proactor.h:
+          Removed all virtual keywords, not needed for this class. Fixes
+          bugzilla 2178.
+
+        * ace/Thread_Manager.h:
+          Removed virtual keywords, not needed and safes footprint. Fixes
+          bugzilla 2179.
+
+        * bin/fuzz.pl:
+          Added more msvc checks to detect code constructors for vc6 or
+          vc7.0
+
+Wed Apr 19 11:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Merged ACE changes from sendfile branch. Also made a lot of const
+        improvements throughout ACE.
+
+        Tue Apr  4 10:20:36 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * ace/Mem_Map.cpp (open):
+
+        Only copy the filename to the ACE_Mem_Map::filename_ member
+        if the call to open() succeeds.
+
+        * ace/PI_Malloc.h (ACE_Malloc_Header):
+
+        Added missing private and undefined copy constructor.  The
+        corresponding assignment operator was already there.
+
+        Wed Mar 29 14:51:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-sunos5.8.h:
+        Solaris 8 and newer also support sendfile. It seems HPUX also
+        supports it but with a different signature and semantics, so just
+        don't try it there yet.
+
+        Wed Mar 29 13:06:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/MMAP_Memory_Pool.{h,cpp,inl}:
+        Added new .inl file to implement the new mmap accessors, include
+        this new file in the header and implementation file
+
+        Wed Mar 29 08:00:12 2006  Ossama Othman <ossama@dre.vanderbilt.edu>
+
+        * ace/OS_NS_sys_sendfile.cpp
+        * ace/OS_NS_sys_sendfile.h
+        * ace/OS_NS_sys_sendfile.inl
+        New sendfile wrapper
+
+        * ace/MMAP_Memory_Pool.h:
+        Added accessors for mmap
+
+        * ace/ace.mpc
+        Added OS_NS_sys_sendfile
+
+        * ace/config-linux-common.h
+        Added ACE_HAS_SENDFILE
+
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Merged ACE changes from sequpdate3 branch
+
+        * ace/config-osf1-3.2.h:
+          Removed, very old
+
+        * ace/config-tru64.h:
+          Removed include of config-osf1-3.2.h
+
+        * ace/OS_Dirent.cpp:
+        * ace/OS_Memory.{cpp,inl}:
+        * ace/OS_String.{cpp,inl}:
+        * ace/Sync.cpp:
+          Removed these files, where not build for a long time already
+
+        * ace/ace.mpc:
+          Removed files above
+
+        * ace/OS_Memory.h:
+        * ace/OS_String.h:
+          Removed include of inline files
+
+        * ace/config-win32-msvc6.h:
+        * ace/config-kcc-common.h:
+          Removed these files, vc6 and kcc are deprecated
+
+        * ace/config-irix6.x-kcc.h:
+        * ace/config-osf1-4.0.h:
+        * ace/config-sunos5.5.h:
+          Removed support for KCC
+
+        * ace/Asynch_IO_Impl.h:
+          Removed workarounds for KCC
+
+        * ace/config-win32-msvc.h:
+          Removed support for vc6 and vc7.0
+
+        * ace/Array_Base.cpp:
+        * ace/Array_Map.{h,cpp}:
+        * ace/Base_Thread_Adapter.h:
+        * ace/Cleanup.h:
+        * ace/Log_Msg.h:
+        * ace/Versioned_Namespace.h:
+        * ace/Get_Opt.cpp:
+        * ace/WIN32_Proactor.cpp:
+        * ace/Message_Queue.cpp:
+        * ace/CDR_Base.h:
+          Removed work arounds for vc6
+
+        * ace/README
+        * ace/config-win32-msvc6.h:
+        * ace/Global_Macros.h:
+          Deprecated ACE_HAS_BROKEN_NAMESPACES, we drop msvc6 and I am
+          removing the workarounds for this compiler one by one as part of the
+          new sequence implementation. Because we deprecate this also
+          ACE_NESTED_CLASS is deprecated
+
+        * ace/config-win32-msvc6.h:
+        * ace/config-win32-msvc7.h:
+        * ace/config-win32-msvc8.h:
+          Removed ACE_HAS_BROKEN_IMPLICIT_CONST_CAST, not used in ACE
+
+        * ace/config-win32-msvc6.h:
+        * ace/config-win32-visualage.h:
+        * ace/Registry.h
+          Removed ACE_HAS_BROKEN_NESTED_TEMPLATES, only used for msvc6 and
+          visual age, both are being dropped
+
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added Bug_2503_Regression
 
-Mon Nov 20 08:16:34 2006  Simon McQueen  <sm@prismtech.com>
+Tue Apr 18 20:49:16 2006  Wallace Zhang  <zhangw@ociweb.com>
 
-        * ACE version 5.5.4 released.
+        * ACE version 5.5.1 released.
 
 Local Variables:
 mode: change-log
diff --git a/ACE/ChangeLogs/ChangeLog-06b b/ACE/ChangeLogs/ChangeLog-06b
deleted file mode 100644
index 2212ce3f6f0..00000000000
--- a/ACE/ChangeLogs/ChangeLog-06b
+++ /dev/null
@@ -1,8927 +0,0 @@
-Fri Nov 17 07:06:10 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added another RTScheduling example library project
-
-Fri Nov 17 06:47:10 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          Updated this file because tao_idl doesn't generate a S_T.inl
-          file anymore
-
-Thu Nov 16 20:38:10 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added new RTScheduling example library projects to fix compile
-          errors in the msvc static builds
-
-Wed Nov 15 23:23:10 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * protocols/Makefile.am:
-
-          Add lost support for --disable-ace-tests and --disable-ace-examples
-
-Wed Nov 15 21:55:01 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Makefile.am:
-
-          Add OS.inl to nobase_include_HEADERS.
-
-Wed Nov 15 19:08:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-lite.h:
-
-          Changed to not include <Cstd/stdcomp.h> on Solaris systems
-          when using the stlport4 C++ library.
-
-Wed Nov 15 15:33:10 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * apps/JAWS/clients/Caching/caching.mpc:
-
-          Add exename definition so that an executable, rather than
-          a shared library, is built.
-
-Wed Nov 15 10:35:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-
-          Added entry for Iliyan Jeliazkov.
-
-Wed Nov 15 01:56:28 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * protocols/ace/HTBP/Makefile.am:
-        * protocols/ace/RMCast/Makefile.am:
-        * protocols/ace/TMCast/Makefile.am:
-
-          Change includedir to omit the "protocols" subdirectory.
-
-          The header files for these libraries are intended to be
-          installed in ${prefix}/include/ace/{HTBP,RMCast,TMCast}
-          not ${prefix}/include/protocols/ace/{HTBP,RMCast,TMCast}.
-
-Wed Nov 15 01:11:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Makefile.am:
-
-          Add Numeric_Limits.h to nobase_include_HEADERS.
-
-Tue Nov 14 18:42:18 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.inl:
-        * ace/Service_Gestalt.cpp:
-
-          After a gestalt gets close()-ed it is still a valid instance
-          however, because it is disassociated from its service repository
-          the situation becomes another special case the gestalt
-          implementation must account for.  This change is in addition to
-          the bug fix introduced with the change from "Thu Nov 9 20:07:42
-          UTC 2006".
-
-Tue Nov 14 14:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Select_Reactor_T.cpp:
-          Removed some not used macros that did cause problems when running
-          FOCUS
-
-Tue Nov 14 11:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Timer_Queue_T.cpp:
-          Added hook for FOCUS, const improvement
-
-Tue Nov 14 07:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Updated rtems information
-
-Mon Nov 13 00:17:19 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.cpp:
-
-          Calling close() on a gestalt must not obliterate any static
-          service registrations. Those may still be needed if the gestalts
-          gets re-opened again, before its destructor runs.  This change
-          fixes a problem (introduced with "Thu Nov 9 20:07:42 UTC 2006")
-          which broke this invariant.
-
-Sat Nov 11 18:37:12 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * ace/Service_Gestalt.cpp (find_processed_static_svc):
-
-          Added a check at the beginning of this function that drops out
-          if processed_static_svcs_ or the arg is a zero pointer.  This
-          gets ride of core dumps in scoreboard builds running tests like
-          some of the TAO EC tests (basically anything which has a static
-          service defined and expects to find it), but there is still the
-          more fundamental problem as to why the static services aren't
-          there in the first place.
-
-Fri Nov 10 22:30:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_vxworks6.3.GNU:
-
-          Fixes for VxWorks 6.3 PPC builds.
-
-Fri Nov 10 21:26:41 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * ace/OS_NS_Thread.h (THR_HAS_WTHREADS):
-
-          Added THR_EXPLICIT_SCHED definition to ACE_HAS_WTHREADS clause
-          so that application-level code doesn't have to have #ifdefs to
-          figure out whether it's okay to use THR_EXPLICIT_SCHED.
-
-          This change is part of a change to TAO from
-          Thu Nov  9 15:42:32 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-Fri Nov 10 15:02:26 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.cpp (close):
-
-          Removing a forgotten debug statetement.
-
-Fri Nov 10 13:42:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/vx_repo_link.pl:
-
-          New perl 'program' to handle link phase for VxWorks 5.5.x
-          builds using -frepo option.
-
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-        * include/makeinclude/rules.lib.GNU:
-
-          Changes to enable building ACE/TAO apps for VxWorks 5.5.x SIMNT
-          targets using -frepo option.
-
-Fri Nov 10 12:53:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/make_release:
-        * docs/bczar/bczar.html:
-
-        Minor update to bczar documentation to correct install paths,
-        minor bugfix to release script to correct PRF generation.
-
-Fri Nov 10 12:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/INET_Addr.cpp:
-          Fixed argument not used warnings in rtems no network build
-
-Fri Nov 10 10:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Reactor_Impl.h:
-        * ace/Dev_Poll_Reactor.{h,cpp}:
-        * ace/Select_Reactor_T.{h,cpp}:
-        * ace/WFMO_Reactor.{h,inl}:
-          Changed initialized to return a bool, that is the type we store
-          as member.
-
-Fri Nov 10 10:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.cpp:
-          Const changes and use prefix operators instead of postfix
-
-        * ace/Process.cpp:
-          Use prefix increment instead of postfix
-
-        * ace/Reactor.cpp (timer_queue):
-          No need to use an intermediate variable
-
-Fri Nov 10 05:47:15 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/bczar/bczar.html
-
-          Updates to release script documentation.
-
-Thu Nov  9 20:07:42 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.cpp:
-        * ace/Service_Gestalt.h:
-        * ace/Service_Gestalt.cpp:
-
-          A follow up to my change from "Wed Nov 8 22:12:46". Adding the
-          close_svcs() call in ACE_Service_Config::close() ensured that
-          the repository and its contents gets properly finalized, but it
-          did not account for the potential subsequent re-opening of the
-          Service Config. This causes failures in open/close/open
-          scenarios, like Framework_Component_Test.
-
-Thu Nov  9 19:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_aix4_cset++.GNU:
-        * include/makeinclude/platform_integrity_ghs.GNU:
-        * include/makeinclude/platform_irix6.x_sgic++.GNU:
-        * include/makeinclude/platform_linux_pgi.GNU:
-        * include/makeinclude/platform_macosx_panther.GNU:
-        * include/makeinclude/platform_macosx_tiger.GNU:
-        * include/makeinclude/platform_netbsd.GNU:
-        * include/makeinclude/platform_openbsd.GNU:
-        * include/makeinclude/platform_osf1_4.x_rcc.GNU:
-        * include/makeinclude/platform_vxworks5.x_ghs.GNU:
-          Simplified these files using the ?= operator
-
-Thu Nov 09 16:10:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Service_Config.cpp:
-
-          Reverted my earlier change of Nov 6 and additionally removed
-          the ACE_Reactor::instance() call from the ACE_Service_Config
-          CTOR since it seems to be unnecessary here.
-
-Thu Nov  9 15:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/wrapper_macros.GNU:
-          Default threads to 1 if not set, thanks to Chad for helping out
-          with finding out why I had a problem in the rtems build
-
-Thu Nov  9 12:46:54 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
-        * bin/MakeProjectCreator/config/taodefaults.mpb:
-
-          Add automake specific section to subtract out $(ACE_ROOT)/lib
-          from libpaths, as libraries are not copied to, or linked from,
-          there in automake builds.  This removes unnecessary -L's from
-          being added to *_LDFLAGS, sometimes eliminating the need for
-          that automake variable altogether.
-
-Thu Nov  9 10:48:52 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * examples/IPC_SAP/DEV_SAP/reader/reader.cpp:
-        * examples/IPC_SAP/DEV_SAP/writer/writer.cpp:
-          Changed used baudrate to 19200. Extended reader example to handle
-          timeout.
-
-Thu Nov  9 10:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Timer_Heap_T.{h,cpp}:
-          Changed the preallocated constructor from int to bool.
-
-Thu Nov  9 09:25:48 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          Removed LynxOS 3.x specific workaround.
-
-Wed Nov  8 22:22:27 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * bin/make_release: Re-applied this:
-          Sat Oct 28 20:10:42 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-Wed Nov  8 22:12:46 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.cpp:
-        * ace/Service_Gestalt.cpp:
-
-        This resolves a problem with shutting down the Service
-        Configurator via the static ACE_Service_Config::close () method,
-        where the registered services' fini() methods were not being
-        called. For full details, see bugzilla# 2701. Thanks to Aaron
-        Scamehorn <Aaron dot Scamehorn at cogcap dot com> for discovering
-        it an providing a test case.
-
-Wed Nov  8 19:21:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/make_release:
-
-          Updates to the release script to work with Subversion.
-
-Mon Nov  6 16:07:43 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/SOCK_IO.h (ACE_SOCK_IO): Clarified the behavior of
-          non-blocking I/O.  Thanks to Robert Neumann <robert dot neumann
-          at gmail dot com> for motivating this change.
-
-Tue Nov 08 15:40:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/INET_Addr.inl:
-
-          Enhanced operator <() to support IPv6 addresses as well.
-          Thanks to Andre Kostur (akostur at incognito dot com) for
-          submitting a patch for this.
-
-Wed Nov  8 14:24:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Change ACE_LACKS_NET_IF_H feature test to #include <sys/types.h>
-          (if present).
-
-Wed Nov  8 13:45:07 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * examples/C++NPv2/C++NPv2.mpc:
-
-          The AC_CLD project requires threads in order to build and run
-          correctly.
-
-Tue Nov 07 15:49:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_netdb.inl:
-
-          Changes to accomodate VxWorks 6.x versions of gethostbyname and
-          gethostbyaddr. These are threadsafe as the x_r versions are but
-          require deallocating the returned hostent structure.
-
-Tue Nov  7 15:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          With VxWorks 6.3 in rtp mode with IPv6 enabled declare the
-          in6addr_ constants explicitly, these are exported by the
-          VxWorks 6.3 rtp header files but not implemented
-
-Tue Nov 07 13:31:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_vxworks6.3.GNU:
-
-          Fixed build settings for PPC32 builds with softfloat.
-
-Tue Nov  7 10:38:25 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * tests/Naming_Test.cpp:
-
-          Moved an ::open out of an ACE_ASSERT. It wasn't getting performed on
-          some builds.
-
-Tue Nov  7 09:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Misc/basic_func.{h,cpp}:
-          Renamed B to BB to resolve compile problems on rtems where we
-          have also a typedef B
-
-Tue Nov  7 07:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ACE.h:
-          Also rtems defines log2, use the same workaround as with cygwin
-
-        * include/makeinclude/platform_rtems.x_g++.GNU:
-          Removed -ansi
-
-Tue Nov  7 01:47:46 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp (count_interfaces):
-          Another scoreboard fix.
-
-Mon Nov  6 20:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/Gateway/Gateway/Config_Files.{h,cpp}:
-        * apps/Gateway/Gateway/File_Parser.{h,cpp}:
-        * apps/Gateway/Gateway/Gateway.cpp:
-          Renamed class FP to FPRT. This resolves the compile errors on
-          rtems where a struct FP does exist
-
-Mon Nov  6 16:52:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp:
-          My fix for Solaris x86 broke HPUX. The trouble is that the
-          method ACE::count_interfaces() is only used by the "generic"
-          implementation of get_ip_interfaces(). Probably a better
-          solution is to remove count_interfaces() and move its
-          functionality into the get_ip_interfaces() implementation, but
-          that is a bigger change than I care to make at the moment. I
-          think it should be possible to do so in a way that also reduces
-          the footprint and improves performance by eliminating the
-          effectively duplicated code in count_interfaces().
-
-Mon Nov 06 14:14:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-vxworks6.3.h:
-
-          Fixed incorrect definition of IOV_MAX.
-
-Mon Nov  6 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-sunos5.5.h:
-          Added ACE_HAS_GETRUSAGE, thanks to Michael Klein
-          <michael dot klein at fazi dot de> for reporting that SunOS has
-          this method, fixes bugzilla 2694.
-
-Mon Nov  6 12:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Service_Configurator/Misc/main.cpp:
-        * examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc:
-        * examples/Service_Configurator/Misc/svc.conf1
-          Fixed shared library name, make working for embedded platforms.
-          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
-          for reporting this, fixes bugzilla bug 2698
-
-Mon Nov 06 11:17:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Service_Config.cpp:
-
-          Implemented a fix for runtime problems in case
-          ACE_HAS_NONSTATIC_OBJECT_MANAGER is defined (seen on VxWorks 6.3 RTP).
-
-Sun Nov  5 14:14:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp:
-          Fix for Solaris x86.
-
-Sat Nov  4 12:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-sunos4*.h:
-          Removed these files, these are ancient and not supported anymore
-
-Fri Nov  3 18:12:36 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Unload_libACE.cpp (main): Reverted the ACE_OS::exit() from
-          this since it's not supposed to be an ACE test.  Thanks to Simon
-          Massey for reporting this.
-
-Fri Nov 03 15:52:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/PerlACE/ProcessVX_Unix.pm:
-
-          Bugfix in cmdline composition.
-
-Fri Nov  3 15:15:43 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp:
-          Scoreboard cleanup.
-
-Fri Nov 03 10:54:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_sys_time.inl:
-
-          Fixed conversion warning on OpenVMS.
-
-Fri Nov  3 00:39:04 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp:
-          One more optimization, this one to combine the methods for
-          evaluating the IPv6 or IPv4 enabled status.
-
-Fri Nov  3 00:32:27 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Select_Reactor_Base.inl:
-        * ace/Select_Reactor_Base.cpp:
-          Additional optimization for finding and unbinding event
-          handlers. The solution moves the test for handles in range into
-          the top-level find and unbind methods to allow the fix for bug
-          2653 to continue to work in unbind while avoiding a double check
-          for handles in range during a find.
-
-Thu Nov  2 20:33:55 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/SOCK_Test_IPv6.cpp (spawn):
-        * tests/Pipe_Test.cpp (run_main):
-        * tests/SPIPE_Test.cpp (client):
-        * tests/TkReactor_Test.cpp (run_main):
-        * tests/MT_SOCK_Test.cpp (spawn):
-        * tests/Process_Strategy_Test.cpp (run_main):
-        * tests/Unload_libACE.cpp (main):
-        * tests/SOCK_Test.cpp (spawn):
-        * tests/Priority_Reactor_Test.cpp (run_main):
-        * tests/SOCK_Dgram_Test.cpp (spawn):
-        * tests/SOCK_SEQPACK_SCTP_Test.cpp (spawn_test):
-        * examples/Map_Manager/test_hash_map_manager.cpp (ACE_TMAIN):
-        * apps/mkcsregdb/mkcsregdb.cpp (fail): Replaced exit() with
-          ACE_OS::exit().
-
-Wed Nov 01 20:04:00 US Central Time 2006 Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * Bronson Royce Schmidt checked in at 7 pounds, 15 ounces and
-          21.25 inches long.
-
-Thu Nov  2 16:10:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp:
-          Cleaned up debugging code left in my previous premature commit.
-
-Thu Nov  2 15:42:29 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp:
-        * ace/Sock_Connect.h:
-          Added support for IPv6 detection on HPUX, AIX, Solaris, WinCE,
-          and VxWorks 5.5.x.
-
-Wed Nov 01 09:05:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_stdlib.inl:
-
-          Fixed conversion warnings in atop() on OpenVMS.
-
-Wed Nov 01 08:35:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_sys_stat.h:
-
-          Fixed Borland compile failure over def of ACE_Stat.
-
-Tue Oct 31 23:08:32 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Dev_Poll_Reactor.h: Note that the Linux epoll code implementation
-          is supported, but the /dev/poll implementation is still
-          experimental.
-
-Tue Oct 31 10:31:10 UTC 2006  Ossama Othman  <ossama_othman at symantec.com>
-
-        * ace/OS_NS_sys_stat.h (ACE_WSTAT_FUNC_NAME):
-
-          Corrected wstat() function name for Borland.
-
-Mon Oct 30 19:57:20 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * bin/ciao_tests.lst:
-
-          Added run_test.pl in CIAO/tests/IDL3/Events/Any to the list of
-          CIAO tests to be run automatically.
-
-Mon Oct 30 17:34:35 UTC 2006  Ossama Othman  <ossama_othman at symantec.com>
-
-        * ace/config-win32-common.h:
-
-          Use 64-bit file offsets by default in the WIN64 case, similar to
-          what 64-bit UNIX systems do.
-
-Mon Oct 30 17:23:15 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/wrapper_macros.GNU: Added 2 new build options,
-          dmalloc and mtrace. When specified at build time (e.g. make mtrace=1)
-          the PLATFORM_DMALLOC_CPPFLAGS and/or PLATFORM_MTRACE_CPPFLAGS values
-          are added to CPPFLAGS. For dmalloc, the PLATFORM_DMALLOC_LDFLAGS and
-          PLATFORM_DMALLOC_LIBS are added to LDFLAGS and LIBS, respectively.
-          Also added the ability to specify additional purify and quantify
-          command-line options by setting PLATFORM_PURIFY_OPTIONS and
-          PLATFORM_QUANTIFY_OPTIONS, respectively. Thank you to Howard
-          Finer for supplying these additions.
-
-Mon Oct 30 16:56:28 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          The implementation for the 'targetoutdir' template variable was
-          incorrect.  Libraries and executables were not symbolically linked
-          to the output location correctly.  Also, 'targetoutdir' was not
-          taken into account for the 'libpaths' setting.
-
-Mon Oct 30 15:30:47 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Scheduled regression test for bug #2669.
-
-Mon Oct 30 14:31:42 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Select_Reactor_Base.inl:
-          Reverting the functional part of my previous commit until I
-          learn the correct way to manage the upper bound test portably.
-
-        * bin/tao_orb_tests.lst:
-          Make the Bug 2654 test be ignored for minimum CORBA builds.
-
-Mon Oct 30 12:18:03 UTC 2006 Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Select_Reactor_Base.inl (unbind):
-          Added an additional validity check and a comment to ward off
-          future optimizations.
-
-Mon Oct 30 09:24:42 UTC 2006  Ossama Othman  <ossama_othman at symantec.com>
-
-        * ace/OS_NS_sys_stat.h (ACE_stat):
-        * ace/OS_NS_sys_stat.inl (stat, wstat):
-
-          Only use Windows 64-bit stat structures and functions when
-          _FILE_OFFSET_BITS=64 is defined.  Addresses 64-bit conversion
-          warnings.
-
-Sun Oct 30 05:31:01 UTC 2006  Ossama Othman  <ossama_othman at symantec.com>
-
-        * ace/Auto_Ptr.h (ACE_auto_ptr_reset):
-
-          Adjusted function template arguments to handle case where the
-          auto_ptr element type and pointer type passed to this function
-          are not the same.  Addresses argument deduction failures.
-
-        * ace/FILE.h (ACE_FILE):
-
-          64-bit file offset fixes.  s/off_t/ACE_OFF_T.
-
-        * ace/Truncate.h (Truncator):
-
-          Added explicit specializations for int and long for Borland.
-          Relying on ACE_{U}INT32 specializations is not sufficient.
-
-        * tests/CDR_File_Test.cpp (run_test):
-
-          A 64-bit file offset is not always enabled.  Corrected offset
-          type.  s/ACE_LOFF_T/ACE_OFF_T.
-
-Sun Oct 29 17:10:39 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added Bug 2654 regression test to suite.
-
-Sat Oct 28 20:50:56 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * examples/Threads/thread_specific.cpp: Need to reinterpret_cast a
-          pointer back to an intptr_t.
-
-Sat Oct 28 20:10:42 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * bin/make_release: Added Smartphone configurations to the WinCE
-          project files generated at release time.
-
-Sat Oct 28 13:50:01 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Select_Reactor_Base.cpp:
-
-          Fix to address Win32-specific problems in bug 2653 fix.
-
-Sat Oct 28 01:48:27 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/wrapper_macros.GNU: Add -L$(INSLIB) to LDFLAGS
-          if it was not there already. Allows link to work when built libraries
-          are moved to locations other than the default $(ACE_ROOT)/lib
-          location.
-
-Fri Oct 28 03:23:18 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * apps/JAWS2/JAWS/FILE.cpp:
-        * apps/JAWS2/JAWS/FILE.h:
-        * apps/JAWS2/JAWS/IO.cpp:
-        * apps/JAWS3/jaws3/FILE.cpp:
-        * apps/JAWS3/jaws3/FILE.h:
-        * examples/Threads/thread_manager.cpp:
-        * examples/Threads/cancel.cpp:
-        * examples/Threads/thread_specific.cpp:
-        * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp:
-        * performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp
-          Addressed 64-bit conversion warnings.
-
-Fri Oct 28 02:49:11 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * examples/APG/Shared_Memory/Mem_Map.cpp:
-        * examples/Mem_Map/file-reverse/file-reverse.cpp:
-        * examples/Web_Crawler/Mem_Map_Stream.cpp:
-
-          Addressed 64-bit conversion warnings.
-
-Fri Oct 27 21:41:25 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * THANKS:
-        * ace/Select_Reactor_Base.inl:
-        * ace/Select_Reactor_Base.cpp:
-        * ace/TP_Reactor.inl:
-        * ace/TP_Reactor.cpp:
-        * tests/run_test.lst:
-
-          The fix for bug 2653. Thanks to Scott Mitchell <rsm at progress
-          dot com> and Chris Reed <cr at progress dot com> for the
-          considerable effort they put in helping to isolate this problem.
-
-Fri Oct 27 21:28:36 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2653_Regression_Test.cpp:
-        * tests/tests.mpc:
-
-          Added a new regression test. Without the accompaning fix, the
-          test coredump. If you comment out the call to test_for_crash,
-          the test will spin madly for 5 seconds, then abort. With the
-          pending fix to the TP reactor, the test has no errors.
-
-Fri Oct 27 19:48:23 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Filecache.cpp (ACE_Filecache_Object):
-
-          Cast -1 to size_t.  Ugly (and works), but currently necessary.
-          Addresses "passing negative value" warnings.
-
-Fri Oct 27 19:28:16 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/OS_NS_stdio.inl (flock_adjust_params):
-        * ace/OS_NS_sys_stat.inl (filesize):
-
-          Fixed comparison of signed/unsigned warnings.
-
-Fri Oct 27 09:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Configuration_Import_Export.cpp:
-          Explicitly initialise pointer to 0 to silence warning in
-          gcc cygwi build
-
-Fri Oct 27 01:58:09 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        From Russell Mora <russell_mora at symantec dot com>
-        * ace/ACE.cpp:
-        * ace/ACE.h:
-        * ace/FILE.cpp:
-        * ace/File_Lock.h:
-        * ace/File_Lock.inl:
-        * ace/Filecache.cpp:
-        * ace/Filecache.h:
-        * ace/Local_Memory_Pool.cpp:
-        * ace/MEM_Acceptor.h:
-        * ace/MEM_Acceptor.inl:
-        * ace/MEM_IO.cpp:
-        * ace/MEM_IO.inl:
-        * ace/MEM_IO.h:
-        * ace/MMAP_Memory_Pool.cpp:
-        * ace/MMAP_Memory_Pool.h:
-        * ace/Mem_Map.cpp:
-        * ace/Mem_Map.h:
-        * ace/Mem_Map.inl:
-        * ace/OS_NS_macros.h:
-        * ace/OS_NS_stdio.cpp:
-        * ace/OS_NS_stdio.inl:
-        * ace/OS_NS_stdio.h:
-        * ace/OS_NS_sys_mman.h:
-        * ace/OS_NS_sys_mman.inl:
-        * ace/OS_NS_sys_stat.h:
-        * ace/OS_NS_sys_stat.inl:
-        * ace/OS_NS_unistd.cpp:
-        * ace/OS_NS_unistd.inl:
-        * ace/OS_NS_unistd.h:
-        * ace/Pagefile_Memory_Pool.inl:
-        * ace/Shared_Memory_MM.cpp:
-        * ace/Shared_Memory_MM.h:
-        * ace/Shared_Memory_MM.inl:
-        * ace/Shared_Memory_Pool.cpp:
-        * ace/Shared_Memory_Pool.h:
-        * ace/os_include/sys/os_types.h:
-        * ace/os_include/sys/os_stat.h:
-        * ace/os_include/os_unistd.h:
-        * examples/Web_Crawler/Iterators.cpp:
-        * examples/Web_Crawler/Mem_Map_Stream.cpp:
-        * examples/Web_Crawler/Mem_Map_Stream.h:
-        * examples/IPC_SAP/FILE_SAP/client.cpp:
-
-          Added support for 64-bit file offsets on 32-bit platforms that
-          support the _FILE_OFFSET_BITS preprocessor symbol, as well as
-          Windows.  Enable by defining the _FILE_OFFSET_BITS=64
-          preprocessor symbol.  ACE provides the necessary support on
-          Windows when it is defined with the assistance of a new
-          ACE_OFF_T typedef.
-
-Thu Oct 26 24:44:55 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Truncate.h (Truncator):
-
-          Removed ACE_Export macros in the Borland case.  They shouldn't
-          be necessary.
-
-Thu Oct 26 14:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_other_tests.lst:
-          Added orbsvcs/tests/Event/UDP test which tests the rtec
-          udp federation
-
-Thu Oct 26 11:19:45 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/config-lynxos.h:
-          Added include "ace/config-posix.h" and removed defines
-          that are already defined by config-posix.h.
-
-Thu Oct 26 10:29:49 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/config-posix.h:
-          Removed duplicate check of _POSIX_MESSAGE_PASSING.
-
-Thu Oct 26 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Truncate.h:
-
-          Added partial specialization for when types are the same, fixes
-          compile problems in the ACE lib with Borland
-
-Thu Oct 26 07:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-vxworks5.x.h:
-          Added ACE_LACKS_INTPTR_T, VxWorks 5.5.x seems not to deliver this
-          type
-
-Thu Oct 26 00:31:56 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Auto_Ptr.h:
-
-          Added missing "element_type" typedef.
-
-          (ACE_auto_ptr_reset):
-
-          Introduced this new function template to simplify the
-          ACE_AUTO_PTR_RESET macro implementation, to support
-          ACE's other auto_ptr-like class templates
-          (e.g. ACE_Auto_Array_Ptr<>), and to make auto_ptr
-          reset() operations convenient and easy for those needing the
-          ACE_AUTO_PTR_RESET functionality to.  Users now need only
-          perform a call like:
-
-            ACE_auto_ptr_reset (my_auto_ptr_instance, new foo);
-
-          Note that ACE_AUTO_PTR_RESET support for ACE's other
-          auto_ptr-like classes isn't strictly necessary since they all
-          support the reset() method.
-
-          Addresses build failures on platforms that define
-          ACE_LACKS_AUTO_PTR_RESET and in code that expects to use
-          ACE_AUTO_PTR_RESET on ACE_Auto_{Basic_}_Array<> instances.
-
-Wed Oct 25 22:42:03 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tests/Integer_Truncate_Test.cpp:
-
-          Remove "const" qualifiers from types used in
-          ACE_Utils::Truncate<>() function template parameters that are
-          deduced using argument dependent lookup.  Borland appears to get
-          confused, and can't find the non-const template parameter
-          Truncate<>() specializations.
-
-Wed Oct 25 20:17:13 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex):
-
-          Removed commented ACE_TRACE macro entirely.  Fuzz parses
-          commented out code, and still incorrectly reports an ACE_TRACE
-          mismatch.
-
-        * ace/Truncate.h:
-
-          Yet another attempt at placating Borland C++.  Removed the
-          partial specialization for truncating values of the same type.
-          Typedefed the underlying Truncator structure template to further
-          simplify the function call.
-
-Wed Oct 25 18:31:47 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * examples/C++NPv1/Reactive_Logging_Server.h:
-        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
-
-          Include "ace/Basic_Types.h" to pull in intptr_t typedef.
-
-Wed Oct 25 15:05:42 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_stdlib.inl (atop): s/intptr/intptr_t/ in ACE_WIN64 case.
-
-Wed Oct 25 09:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/SOCK_Dgram.cpp:
-          Fixed compile error in non win32 part
-
-Wed Oct 25 09:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ace_for_tao.mpc:
-          Added Rtems_init.c, for rtems without network support we
-          also use the ace_for_tao base project
-
-Wed Oct 25 08:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-rtems.h:
-        * ace/OS_NS_netdb.inl:
-          Added ACE_LACKS_GETHOSTBYADDR_R
-
-Wed Oct 25 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-rtems.h:
-        * ace/OS_NS_sys_socket.inl:
-          Added ACE_LACKS_GETSOCKOPT, ACE_LACKS_RECV, ACE_LACKS_SEND,
-          and ACE_LACKS_SENDTO
-
-Wed Oct 25 08:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Priority_Buffer_Test.cpp:
-          Fixed compile problem with gcc 2.96
-
-Wed Oct 25 07:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-rtems.h:
-        * ace/OS_NS_sys_socket.inl:
-          Added ACE_LACKS_ACCEPT, ACE_LACKS_CONNECT, ACE_LACKS_GETPEERNAME,
-          ACE_LACKS_GETSOCKNAME
-
-Wed Oct 25 06:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/TTY_IO.cpp:
-          Fixed compile error on Vxworks
-
-Tue Oct 24 23:53:08 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Changed ACE_HAS_PTHREAD_CONTINUE to
-          ACE_HAS_PTHREAD_CONTINUE_NP and ACE_HAS_PTHREAD_SUSPEND to
-          ACE_HAS_PTHREAD_SUSPEND_NP. The non-_NP varieties return ENOTSUP;
-          the _NP varieties are the only documented APIs through AIX 5.3.
-          Thanks to Guy Peleg for raising this issue.
-
-        * tests/Thread_Manager_Test.cpp: Altered the suspend/resume tests to
-          only allow ENOTSUP as a legit result if the config.h file does not
-          include ACE_HAS_... settings that indicate it should work.
-
-Tue Oct 24 23:59:10 UTC 2006  Ossama othman  <ossama_othman at symantec dot com>
-
-        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl
-          (init):
-        * examples/Shared_Malloc/test_position_independent_malloc.cpp
-          (parse_args):
-
-          Use intptr_t instead of int when casting to void*.  Addresses
-          "sizes do not match" warnings in 64-bit Intel compiler builds.
-
-Tue Oct 24 23:49:25 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex):
-
-          Commented out use of ACE_TRACE macro.  The regular expression in
-          the bin/fuzz.pl script used to detect ACE_TRACE mismatch
-          incorrectly identifies a mismatch the ACE_TRACE question.  Once
-          the fuzz script is fixed, the ACE_TRACE can be uncommented.
-
-Tue Oct 24 22:20:38 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Truncate.h:
-
-          Rename truncate to trunc.  Yet another attempt at fixing Borland
-          compiler brain damage.
-
-Tue Oct 24 22:01:41 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/OS_NS_stdlib.inl (atop):
-
-          Use intptr_t type to fix 64-bit conversion to void* warnings.
-
-        * ace/Select_Reactor_Base.h (max_handlep1):
-        * ace/Select_Reactor_Base.inl (max_handlep1):
-
-          Changed return type to be ACE_HANDLE on UNIX platforms instead
-          of size_t.  Addresses "loss of significant bits" warnings in
-          64-bit Intel compiler builds.
-
-        * ace/Select_Reactor_Base.cpp (dump):
-
-          Corrected format specifiers for Windows configuration.
-
-        * ace/Select_Reactor_T.cpp (work_pending):
-          (wait_for_multiple_events):
-
-          Removed unnecessary casts and corrected type of "width" variable
-          that is passed to select().
-
-        * tests/Map_Manager_Test.cpp (test_cache_map_manager):
-
-          Fixed "might be used uninitialized" warning.
-
-Tue Oct 24 17:46:40 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Truncate.h (Truncator):
-
-          Export the Borland-specific specializations from the DLL.  This
-          should address the "undefined symbol" link-time problem.
-
-        * bin/MakeProjectCreator/config/acexml.mpb:
-
-          Re-disabled ACEXML when ace_for_tao is enabled.  ACEXML needs
-          the ACE_Configuration and memory map classes that are not found
-          in the ace_for_tao subset.
-
-Tue Oct 24 14:44:09 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-
-          Changed the default constructor to always initialise member
-          variables regardless of ACE_HAS_TERMIOS or ACE_HAS_TERMIO setting.
-
-Tue Oct 24 14:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ACE.cpp:
-          Use some bools instead of int
-
-        * ace/INET_Addr.cpp (set_port_number):
-          Added check for ACE_LACKS_HTONS
-
-        * ace/INET_Addr.inl (get_port_number):
-          Added check for ACE_LACKS_NTOHS
-
-Tue Oct 24 13:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/netinet/os_in.h:
-        * ace/config-rtems.h:
-          Added ACE_LACKS_IP_MREQ
-
-        * ace/INET_Addr.cpp (get_port_number_from_name):
-          Added ACE_LACKS_HTONS check
-
-Tue Oct 24 13:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Reactor.h:
-          Added an include of Time_Value.h, this is included implicitly
-          but this implicit include is not there when using FOCUS with
-          tp-reactor specialization
-
-Tue Oct 24 13:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-        * ace/config-rtems.h:
-          Added ACE_LACKS_GET_BCAST_ADDR
-
-Tue Oct 24 13:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/os_socket.h:
-        * ace/config-rtems.h:
-          Added ACE_LACKS_SOCKADDR
-
-Tue Oct 24 12:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/os_netdb.h:
-        * ace/config-rtems.h:
-          Added ACE_LACKS_HOSTENT
-
-Tue Oct 24 12:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_arpa_inet.inl:
-        * ace/config-rtems.h:
-          Added ACE_LACKS_INET_ADDR and ACE_LACKS_INET_NTOA
-
-Tue Oct 24 12:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_socket.h:
-          Define MSG_OOB when it is not defined
-
-Tue Oct 24 11:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_socket.inl:
-        * ace/config-rtems.h:
-          Added ACE_LACKS_SOCKET, ACE_LACKS_SHUTDOWN and ACE_LACKS_SETSOCKOPT
-
-Tue Oct 24 11:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_select.inl:
-        * ace/config-rtems.h:
-          Added ACE_LACKS_SELECT
-
-Tue Oct 24 10:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/netinet/os_in.h:
-        * ace/config-rtems.h:
-          Added ACE_LACKS_IN_ADDR and ACE_LACKS_SOCKADDR_IN
-
-Tue Oct 24 06:31:05 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Numeric_Limits.h (ACE_Numeric_Limits):
-
-          Added missing "char" specialization for the
-          ACE_LACKS_NUMERIC_LIMITS case.  The "signed char" and
-          "unsigned char" specializations are not always suitable.
-
-Tue Oct 24 04:04:26 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Hash_Map_Manager_T.h (lock_):
-
-          Placed "mutable" keyword to beginning of declaration.  It is a
-          storage class specifier, not a CV qualifier, and belongs at the
-          beginning.  Addresses g++ warnings.
-
-        * ace/Sock_Connect.cpp (get_fqdn):
-
-          Addressed "might be used uninitialized warnings.
-
-Mon Oct 23 02:28:42 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Array_Base.cpp:
-        * ace/Array_Base.h:
-        * ace/Array_Base.inl:
-
-          Added STL-style traits, iterators and swap() method.
-
-          (operator=):
-
-          Improved exception-safety.
-
-        * ace/Array_Map.h:
-        * ace/config-lite.h:
-
-          Moved reverse_iterator declarations to a new
-          ACE_DECLARE_STL_REVERSE_ITERATORS so that other ACE containers
-          may use them in a way that minimizes platform-specific
-          declaration duplication.
-
-        * ace/CDR_Stream.cpp (read_boolean_array):
-
-          Addressed a Coverity CHECKED_RETURN error.  There's no need to
-          check the return value of read_boolean() in this case.
-          Explicitly cast the return value to "void".
-
-          Addressed Coverity DEADCODE error.  No need to check for zero
-          "cont" pointer since the ACE_NEW_RETURN() call that initializes
-          it will return immediately.  "cont" cannot be zero if the latter
-          call succeeds.
-
-        * ace/CDR_Stream.inl (operator>>):
-
-          Explicitly check return value of input stream read operations.
-          Addressed a Coverity CHECKED_RETURN errors.
-
-        * ace/Configuration.cpp (new_section):
-
-          Fixed Coverity USE_AFTER_FREE error.  Memory was being accessed
-          after it was freed.
-
-        * ace/Configuration_Import_Export.cpp:
-
-          Addressed Coverity RESOURCE_LEAK errors.
-
-        * ace/Default_Constants.h (ACE_DEFAULT_CLOSE_ALL_HANDLES):
-
-          This symbol represents a boolean value.  s/1/true.
-
-        * ace/Dev_Poll_Reactor.cpp (bind):
-        * ace/WFMO_Reactor.cpp (bind_i):
-
-          Disallow binding of a nil event handler pointer to the
-          repository.  It is deferenced later on this method.
-
-        * ace/Hash_Map_Manager_T.h:
-        * ace/Hash_Map_Manager_T.inl:
-
-          Added STL-style traits and iterator accessors.
-
-          (find):
-
-          New method that returns an iterator as an "out" parameter.  An
-          iterator return value could not be used due a conflict with an
-          existing find() method.
-
-          (unbind):
-
-          New method that unbinds the value pointed to by the given
-          iterator.
-
-          (ACE_Hash_Map_Iterator_Base_Ex, ACE_Hash_Map_Iterator_Ex):
-
-          New constructors that position the iterator at the given
-          ACE_Hash_Map_Entry.
-
-        * ace/Lib_Find.cpp (ldfind):
-
-          Place parentheses around ternary operator "?:" conditional to
-          address an operator precedence problem.  In this case, an
-          expression such as "a + b ? 0 : 1" was used, which is equivalent
-          to "(a + b) ? 0 : 1" instead of the desired "a + (b ? 0 : 1)".
-
-          Changed local variable name from "got_suffix" to "has_suffix" to
-          clarify how the variable is being used.
-
-        * ace/OS_NS_Thread.inl (rw_unlock):
-
-          Fixed potential deadlock in case where reference count is one.
-          Addresses a Coverity DEADLOCK error.
-
-        * ace/OS_NS_dirent.cpp (scandir_emulation):
-
-          Fixed potential dereferencing of zero pointer reported by the
-          Coverity FORWARD_NULL checker.
-
-        * ace/OS_NS_fcntl.cpp (open):
-
-          Return if SetFilePointer() call fails.  Addresses Coverity
-          CHECKED_RETURN error.
-
-          Added support for large files SetFilePointer() calls.  Thanks to
-          Russell Mora for this fix.
-
-        * ace/OS_NS_stdio.cpp (fopen):
-
-          Fixed potential crash if null mode string is passed to this
-          method.
-
-        * ace/OS_NS_stdio.inl (fdopen):
-        * ace/OS_NS_unistd.inl (isatty):
-
-          No need to check for ACE_LACKS_INTPTR_T.  Just use intptr_t in
-          all cases.  ACE now supplies this typedef if the platform
-          doesn't.
-
-        * ace/OS_TLI.h (t_bind):
-        * ace/OS_TLI.inl (t_bind):
-
-          Work around HP aCC 3.63 namespace scoping problem using typedef
-          hack in use for other structures.
-
-        * ace/Select_Reactor_Base.cpp:
-        * ace/Select_Reactor_Base.h:
-        * ace/Select_Reactor_Base.inl:
-
-          Changed underlying event handler container from a simple array
-          to an ACE_Hash_Map_Manager<> on Windows, and to an
-          ACE_Array_Base<> on UNIX-like platforms.
-
-          Use of an ACE_Hash_Map_Manager<> on Windows allows for faster
-          event handler searches.
-
-          Use of an ACE_Array_Base<> on UNIX-like platforms allows us to
-          leverage advantages using a container (improved
-          exception-safety, container interface, etc), while still
-          retaining the direct file descriptor to event handler mapping at
-          essentially no cost to footprint relative to the previous
-          implementation.
-
-          (bind):
-
-          Disallow binding of a nil event handler pointer to the
-          repository.  It is deferenced later on this method.  Addresses a
-          potential crash.
-
-        * ace/Service_Config.cpp (current):
-
-          Simplified these methods.
-
-          Removed global lock that was held when accessing TSS.  Only
-          initialization of global implementation needs to synchronized
-          with that lock.
-
-          Removed redundant accesses to TSS.
-
-        * ace/Service_Config.h:
-
-          Removed stray semi-colon.
-
-          (impl_):
-
-          This method no longer needs to return the pointer by reference.
-
-        * ace/Service_Repository.cpp:
-
-          Changed loop index type so that it matches repository size type
-          (an unsigned integer), and updated loop decrement to take into
-          account the index type is now unsigned.
-
-        * ace/Sock_Connect.h (ipv4_enabled):
-        * ace/Sock_Connect.cpp (ipv4_enabled):
-
-          New run-time check for existence IPv4 stack.  Some hosts only
-          contain IPv6 stacks.
-
-          From Sriram Chandramouli <sriram_chandramouli at symantec dot com>
-          (get_fqdn):
-
-          New method that retrieves fully qualified domain.  getaddrinfo()
-          doesn't always provide the desired results.
-
-        * ace/Svc_Conf.y (ace_get_module):
-        * ace/Svc_Conf_y.cpp (ace_get_module):
-
-          Simplified explicit casts.
-
-          Prevent dereferencing of potentially null pointer.
-
-        * ace/System_Time.cpp:
-        * ace/System_Time.h:
-
-          No need to include "ace/Malloc_T.h", "ace/MMAP_Memory_Pool.h"
-          and "ace/Null_Mutex.h".  Forward declarations are sufficient.
-
-          Use time_t type instead of ACE_UINT32 when returning times, such
-          as those returned from ACE_OS::time().  Addresses lack of
-          precision issues.
-
-        * ace/Thread_Manager.cpp (wait):
-
-          Addressed a Coverity CHECKED_RETURN error.  There's no need to
-          check the return value of ACE_Thread::join() in this case.
-          Explicitly cast the return value to "void".
-
-        * ace/Time_Value.h (ACE_ONE_SECOND_IN_USECONDS):
-
-          Made this constant type-safe.  It is now of type suseconds_t,
-          instead of a preprocessor symbol definition.
-
-        * ace/UUID.cpp (lock):
-
-          Addressed USE_AFTER_FREE Coverity error.  Do not return a
-          pointer to the previous lock.  It may have been destroyed.
-
-        * ace/UUID.h (lock):
-
-          Changed return type from "ACE_SYNCH_MUTEX*" to "void".  The
-          interface/implementation does not provide a means to safely
-          return the previous lock instance.
-
-        * ace/ace_wchar.inl (convert):
-
-          Corrected calculation of wide string length.
-
-        * bin/MakeProjectCreator/config/acexml.mpb:
-
-          No longer any need to explicitly disable ACEXML in the
-          ace_for_tao configuration.
-
-        * include/makeinclude/platform_irix6.x_sgic++.GNU:
-
-          SGI 7.3.x compiler doesn't have the 3506 error code.  Do not
-          attempt to supress it.
-
-Mon Oct 23 22:24:01 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Unbounded_Queue.cpp (set):
-
-          Explicitly initialize dummy value.  Addresses "use of
-          uninitialized variable" g++ 4.1 warning when the variable is a
-          POD type.
-
-        * ace/ace_for_tao.mpc:
-
-          Removed unnecessary semaphore related files.
-
-          Added missing ace/Truncate.h header.
-
-Mon Oct 23 21:44:32 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Truncate.h (Truncator):
-
-          Borland doesn't appear to be able to grok the use of the
-          function call operator in the ACE_Utils::Truncate<> function
-          template.  Replaced the Truncator<>::operator() function call
-          operator with a static Truncator<>::truncate() method instead.
-
-Mon Oct 23 13:29:15 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ACE-INSTALL.html:
-        * ace/Mem_Map.h:
-        * ace/Mem_Map.inl:
-        * ace/Mem_Map.cpp:
-        * ace/OS_NS_Thread.inl:
-        * ace/OS_NS_sys_mman.inl:
-        * ace/Reverse_Lock_T.h:
-        * ace/Task_Ex_T.h:
-        * ace/Task_T.h:
-        * ace/config-lynxos.h:
-        * include/makeinclude/platform_lynxos.GNU:
-
-          Removed LynxOS 3.x support.
-
-Mon Oct 23 12:59:35 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/generate_compile_stats.sh:
-
-          Corrected a bug with my previous change.  If config.h or
-          platform_macros.GNU were not present, the html would be incorrect.
-          I also added default.features to the list of configuration files
-          that are displayed.
-
-Mon Oct 23 06:34:24 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/os_include/os_pthread.h: Changed
-
-          #      if !defined (ACE_LACKS_RWLOCK_T)
-
-          to
-
-          #      if !defined (ACE_LACKS_RWLOCK_T) && !defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-
-          to stop a compile error on Solaris after SunOS 5.8.  Thanks to
-          Boris Kaminer <boris dot kaminer at gmail dot com> for reporting
-          this fix.
-
-Sun Oct 23 00:29:55 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Truncate.h:
-
-          In the Borland-specific workaround, explicitly cast return value
-          of ACE_Numeric_Limits::max() of the smaller unsigned type to the
-          unsigned larger type to which it is being compared.  Addresses
-          non-intuitive "comparison of signed and unsigned types" warning
-          issued by Borland compiler.  Borland promotes unsigned char to
-          int, instead of unsigned int, when comparing to unsigned int.
-          This implicit type promotion behavior complies with the C++
-          standard, but is a bit awkward nonetheless (IMHO :)).  Thanks to
-          Johnny for pointing out Borland's explanation of the
-          non-intuitive warning.
-
-Sun Oct 22 08:11:25 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Token_Request_Reply.inl (token_name):
-
-          Simplified use of ACE_Utils::Truncate<> function template.  Only
-          the "TO" type must be explicitly specified.  The "FROM" type is
-          deduced automatically by the compiler.  Note that explicitly
-          specifying both template parameters is perfectly valid, too.
-
-        * ace/Truncate.h (Truncator):
-
-          Added char/int specializations for Borland to allow the
-          Integer_Truncate_Test to compile.  All of the Borland-specific
-          Truncator specializations are meant to be a temporary workaround
-          until Borland C++ is capable of supporting the generalized
-          implementation.
-
-Sat Oct 21 14:49:21 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/TSS_T.{h cpp}: Added "volatile" keyword to once_ member
-          since it can be changed by other threads. Removed the lock
-          acquiring from the ts_object() methods - after once_ is checked,
-          there are no further needs for locks. When needed, the key_ is
-          set up by ts_init() which does acquire a lock. This avoids a lock
-          acquire/release cycle on all calls when initialization of the
-          ACE_TSS object is not required, speeding up performance. Thanks to
-          Guy Peleg <guy dot peleg at amdocs dot com> for reporting this and
-          to Russell Mora <russell_mora at symantec dot com> for assisting in
-          analyzing the situation and recommending the particular fixes.
-
-        * ace/Logging_Strategy.h: Minor doxygen improvements.
-
-        * ace/Sock_Connect.cpp: When checking for IPv6 interfaces on Windows,
-          there's two conditionally compiled blocks of code. One block was
-          built if ACE_HAS_IPV6 SIO_ADDRESS_LIST_QUERY are both defined; the
-          other was built if ACE_HAS_IPV6 is defined. Added the check for
-          SIO_ADDRESS_LIST_QUERY to the second case as well since it makes
-          no sense to run it if the first isn't built. Thanks to Andre
-          Kostur for this fix. Also see:
-          Mon Oct 16 14:24:25 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Task_T.h (reply): Clarified what happens on a reply(). Thanks
-          to Doug Schmidt for explaining the rationale for this.
-
-        * ace/Token_Request_Reply.inl (token_name): VC7.1 had trouble grokking
-          the ACE_Utils::Truncate arguments in this case, so add the types
-          to a more complete specification of what template is desired.
-
-Sat Oct 21 15:19:46 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * configure.ac: Removed the check for LINUX_VERSION that disabled
-          the check for epoll on Linux. Just let the check run - the macros
-          used checked the kernel/C version used to build the kernel instead
-          of the running kernel itself (I think...). In any event, the
-          use of the macros to disable the check prevented the check from
-          running on systems (such as RHEL 4) that do have epoll. Thank you
-          to Brian Campbell <becampbel at hotmail dot com> for researching
-          this area.
-
-Sat Oct 21 10:48:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/PerlACE/RunTest.pm:
-        * bin/PerlACE/ProcessVX.pm:
-        * bin/PerlACE/ProcessVX_Unix.pm:
-
-          Changes to accomodate running autotests for VxWorks RTPs on
-          Linux hosts.
-
-Sat Oct 21 04:34:33 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/OS_NS_stdlib.cpp:
-
-          Always include "ace/Numeric_Limits.h" in the ACE_LACKS_MKSTEMP
-          case.  There is no need to conditionally include it when "max"
-          is undefined.  Addresses VxWorks build errors.
-
-        * ace/Truncate.h:
-
-          Only use workaround for Borland compiler versions less than or
-          equal to 0x582.  Thanks to Johnny for the suggestion.
-
-        * tests/Integer_Truncate_Test.cpp (sizeof_from_lt_sizeof_to):
-
-          Explicitly cast types in inequality comparison to silence
-          comparison of signed and unsigned warnings.  It's not clear why
-          the warning is occuring since both types are unsigned.
-
-          Removed remaining set of redundant parentheses that were
-          missed in a previous commit.
-
-Fri Oct 20 12:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Service_Manger.{h,cpp}:
-          Changed debug_ member to a real bool
-
-Fri Oct 20 12:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_socket.inl (bind):
-        * ace/config-rtems.h:
-          Added ACE_LACKS_BIND
-
-        * ace/Basic_Types.h:
-          Fixed compile problems with BCB6
-
-Fri Oct 20 12:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Record.inl:
-          Added check for ACE_LACKS_NTOHL and ACE_LACKS_HTONL
-
-        * ace/config-rtems.h:
-          Added ACE_LACKS_NTOHL and ACE_LACKS_HTONL when no networking
-          is available
-
-Fri Oct 20 09:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/INET_Addr.h:
-          Small change to improve doxygen documentation
-
-        * ace/OS_NS_sys_socket.inl (listen):
-          Added ACE_LACKS_LISTEN
-
-        * ace/config-rtems.h:
-          Added ACE_LACKS_LISTEN
-
-Fri Oct 20 09:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb:
-          New base projects
-
-        * bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb:
-          Use the new base projects above
-
-          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
-          for delivering these files
-
-Fri Oct 20 09:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_socket.h:
-          Defined AF_UNSPEC and PF_UNSPEC when these are not defined by the
-          OS header files.
-
-Fri Oct 20 08:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_uio.h:
-          When INADDR_ANY is not defined, then define it, we need it in several
-          of the ACE header files
-
-Fri Oct 20 08:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_uio.h:
-          We define iovec when ACE_WIN32 was defined, changed this to a new
-          define, ACE_LACKS_IOVEC to make it easier to use with other platforms
-
-        * ace/config-win32-common.h:
-          Added ACE_LACKS_IOVEC
-
-        * ace/config-rtems.h:
-          When no networking has been configured, also define ACE_LACKS_IOVEC
-
-Thu Oct 19 22:28:59 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * contrib/minizip/iowin32.c
-        * contrib/minizip/iowin32.h
-          Removed these files.
-
-Thu Oct 19 23:20:26 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp:
-        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
-        * examples/C++NPv1/Reactive_Logging_Server.h:
-
-          Fixed integer/void* conversion related warnings by using
-          the "intptr_t" type instead of "int" or "long".
-
-Thu Oct 19 22:58:02 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Truncate.h:
-
-          Borland compilers currently cannot handle the template
-          meta-programming in this header.  Work around the limitation by
-          explicitly specializing the ACE_Utils::Truncator<> structure
-          template for a select few 32- and 64-bit integers.  More will be
-          added as needed.
-
-Thu Oct 19 17:25:16 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tests/Integer_Truncate_Test.cpp:
-
-          Removed redundant parentheses.
-
-Thu Oct 19 15:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_rel_manpages:
-          Updated doxygen version
-
-        * bin/MakeProjectCreator/templates/gnu.mpb:
-          Removed kylix support
-
-Thu Oct 19 13:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_main.h:
-          Added main for rtems
-
-Thu Oct 19 11:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Rtems_init.c:
-          Fixed empty translation unit warnings
-
-Thu Oct 19 08:27:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_openvms.GNU:
-          Small change to create hardlinks for produced executables.
-
-Wed Oct 18 16:19:38 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * contrib/minizip/minizip.suo
-        * contrib/minizip/miniziplibrarycode.suo
-          Removed these files.
-
-Wed Oct 18 13:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_rtems.x_g++.GNU:
-          Major cleanup of old stuff and always define ACE_HAS_RTEMS
-
-        * etc/rtems_init.c:
-        * ace/rtems_init.c:
-          Another move, for rtems we require some functions to always
-          be available, this defines our network settings and much more.
-          Because we always build static, we moved this to the ACE lib,
-          on rtems we define ACE_HAS_RTEMS and then compile the contents
-          of this file. This way the functions in this file are available
-          in any executable we link
-
-        * ace/OS.h:
-        * ace/os_include/os_signal.h:
-        * ace/os_include/sys/os_types.h:
-        * ace/OS_NS_stdio.h:
-        * ace/OS_NS_time.inl:
-          Replaced __rtems__ with ACE_HAS_RTEMS
-
-        * ace/ace.mpc:
-          Added rtems_init.c
-
-Wed Oct 18 13:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeincludes/rules.bin.GNU:
-        * include/makeincludes/rules.lib.GNU:
-        * include/makeincludes/wrapper_macros.GNU:
-        * include/makeincludes/platform_linux_borland.GNU:
-          Removed kylix support
-
-Wed Oct 18 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/Gateway/Gateway/File_Parser.cpp:
-          Removed egcs workaround
-
-Wed Oct 18 08:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/rtems_init.c:
-        * etc/rtems_init.c:
-          Moved from tests to etc
-
-Tue Oct 18 06:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Reactor/Misc/test_signals_1.cpp:
-        * performance-tests/Misc/context_switch_time.cpp:
-          Renamed the global count variables to another name. These triggered
-          a bug in the VxWorks 5.5.2 compiler which we reported to windriver.
-          By renaming these we will get an error free compilation.
-
-Tue Oct 18 06:02:28 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Basic_Types.h (intptr_t, uintptr_t):
-
-          Provided suitable typedefs for these standard types when
-          ACE_LACKS_INTPTR_T is defined.
-
-        * ace/Event_Handler.cpp (~ACE_Event_Handler_var):
-
-          Only use an ACE_Errno_Guard if the underlying ACE_Event_Handler
-          pointer is non-zero.  Saves a TSS access in the zero
-          ACE_Event_Handler pointer case.
-
-          (operator=):
-
-          Made strongly exception safe.
-
-        * ace/FILE_IO.cpp (send, recv):
-        * ace/Message_Queue.cpp (enqueue, dequeue):
-        * ace/Message_Queue_T.cpp:
-        * ace/OS_NS_unistd.inl (hostname):
-
-          Explicitly supply the "int" "TO" type to the
-          ACE_Utils::Truncate<> function template.  It must now be
-          explicitly specified since ACE_Utils::Truncate<> now supports
-          truncation to all integer types, not just "int".
-
-        * ace/Global_Macros.h (ACE_STATIC_CONSTANT):
-
-          New macro for in-class static integral constant initialization
-          that works around compilers that don't like such initialization.
-          In-class integral constants in this case are meant to be
-          compile-time constants so that they may be used as template
-          arguments, for example.  BOOST provides a similar macro.
-
-        * ace/OS_NS_stdlib.inl (atop):
-        * ace/OS_NS_stdio.cpp (fopen):
-
-          Removed ACE_LACKS_INTPTR_T check.  It is no longer needed.
-
-        * ace/Truncate.h:
-
-          Generalized the ACE_Utils::Truncate<> function template
-          implementation for all integer types.
-
-        * tests/run_test.lst:
-        * tests/tests.mpc:
-
-          Added new "Integer_Truncate_Test" test that verifies the
-          ACE_Utils::Truncate<> function template works for all type
-          size/sign scenarios.
-
-Tue Oct 17 21:28:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.cpp (parse_args_i):
-
-          Checking for no arguments was missed inadvertently in the
-          original change-set from "Tue Oct 17 16:27:27 UTC 2006 ..."
-
-Tue Oct 17 21:09:36 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * contrib/minizip/ChangeLogUnzip
-        * contrib/minizip/crypt.h
-        * contrib/minizip/ioapi.c
-        * contrib/minizip/ioapi.h
-        * contrib/minizip/iowin32.c
-        * contrib/minizip/iowin32.h
-        * contrib/minizip/miniunz.c
-        * contrib/minizip/minizip.c
-        * contrib/minizip/minizip.mpc
-        * contrib/minizip/minizip_export.h
-        * contrib/minizip/mztools.c
-        * contrib/minizip/mztools.h
-        * contrib/minizip/unzip.c
-        * contrib/minizip/unzip.h
-        * contrib/minizip/zip.c
-        * contrib/minizip/zip.h
-          Added the minizip project. Thanks to Krishnakumar Balasubramanian
-          <kitty at dre dot vanderbilt dot edu> for providing this.
-
-Tue Oct 17 17:17:36 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_unistd.inl (truncate): SetFilePointerEx() returns a
-          BOOL not a DWORD (unlike SetFilePointer()..).  Thanks to Boris
-          Kaminer <boris dot kaminer at gmail dot com> for reporting this.
-
-Tue Oct 17 16:27:27 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/DLL_Manager.cpp:
-        * ace/Parse_Node.cpp:
-
-          Updated logging messages.
-
-        * ace/Service_Gestalt.cpp:
-
-          Updated logging messages to exclude the "e-word" causing false
-          positives in the Service_Config_Test. Updated comments.
-
-Tue Oct 17 12:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/soreduce/Library.cpp:
-          taoversion is not a valid base project. Thanks to Manuel Traut
-          <manut dot de at googlemail dot com> for reporting this.
-
-Tue Oct 17 12:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Updated supported platforms by Remedy IT. New are VxWorks 5.5.2,
-          OpenVMS 8.3, RTEMS and LynxOS.
-
-Tue Oct 17 12:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-rtems.h:
-          Cleanup
-
-        * include/makeinclude/plaform_rtems.x_g++.GNU:
-          Improved for rtems 4.6.6
-
-Tue Oct 17 07:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-rtems.h:
-        * ace/OS_NS_unistd.inl:
-          Added support for ACE_LACKS_FDOPEN
-
-Mon Oct 16 21:29:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * THANKS: Updated Chris Reed's entry in the list.
-
-Mon Oct 16 20:04:59 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          This change fixes bug#2612. See the description for the gory
-          details. In a nutshell, the problem is caused by the fact that
-          static services, loaded from a DLL, as part of a dynamic service
-          initialization can not be safely finalized when the dynamic
-          service's DLL gets unloaded. This was historically handled by
-          simply not unloading DLLs, and by finalizing all services at
-          process exit. With the introduction of the local configurations
-          feature, this changed.
-
-          The finalization order was supposed to be guaranteed by the
-          ordering of the services in the repository. It really was a
-          kludge, because when dynamically loading and removing services
-          the order can change.  Then whenever the process tries to clean
-          up, the dynamic service's DLL can be unloaded (because it gets
-          finalized first), and the static services' destructor code would
-          become inaccessible. The situation results in a SEGV at exit().
-
-        * ace/DLL.h:
-        * ace/DLL.cpp:
-
-          Made assignment operator return a non-const reference to make it
-          well-formed. See C++ Standard, section "[special]".
-
-        * ace/DLL_Manager.cpp:
-        * ace/Dynamic_Service_Base.cpp (instance):
-        * ace/Parse_Node.cpp:
-
-          Fixed formatting and logging
-
-        * ace/Service_Config.cpp (parse_args_i):
-
-          Fixing a bug related to parsing the command line options that
-          take arguments. Thanks to Aaron Scamehorn <Aaron dot Scamehorn
-          at cogcap dot com> for reporting it.
-
-        * ace/Service_Gestalt.cpp:
-
-          Added ACE_Service_Dynamic_Guard (formerly
-          ACE_Service_Type_Forward_Declaration_Guard) which helps to
-          resolve an issue with hybrid services, i.e. dynamic services,
-          accompanied by static services in the same DLL.  Only automatic
-          instances of SDG are supposed to exist. Those are created during
-          (dynamic) service initialization and serve to:
-
-          (a) Ensure the service we are loading is ordered last in the
-          repository, following any other services it may cause to
-          register, as part of its own registration. This is a common case
-          when loading dynamic services from DLLs - there are often static
-          initializers, which register static services.
-
-          (b) The SDG instance destructor detects if the dynamic service
-          initialized successfully and "fixes-up" all the newly registered
-          static services, so that each holds a reference to the DLL, from
-          which they have originated.
-
-          Updated comments and formatting.
-
-        * ace/Service_Object.h (dll):
-        * ace/Service_Object.inl (dll):
-
-          Added void dll (const ACE_DLL&) to make it possible to
-          "relocate" services registered through static initializers found
-          in DLL's code segment(s).
-
-        * ace/Service_Object.cpp (fini):
-
-          Modified ACE_Service_Type::fini() to ensure the DLL associated
-          with the service is properly closed. This in conjunction with
-          the gestalt changes above, makes it possible to safely and
-          completely unload a service.
-
-        * ace/Service_Repository.h:
-        * ace/Service_Repository.cpp (remove_i,relocate_i,relocate):
-
-          Added relocate(), which allows association of a (static) service
-          objects with a DLL. Per changes to ACE_Service_Gestalt,
-          above. Added a counterpart private relocate_i(), which does not
-          obtain locks.
-
-        * tests/Service_Config_Test.cpp:
-
-          Added a test that combines more than one argument-taking command
-          line option to guard against regression for the bug fixed in
-          ACE_Service_Config::parse_args_i (see above).
-
-Mon Oct 16 19:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-rtems.h:
-          Updated with more changes needed for rtems
-
-        * ace/os_include/os_signal.h:
-          Added specific defines for rtems
-
-        * ace/OS_NS_time.cpp (difftime):
-          Removed not used variable and get gmtime/gmtime_r from the
-          global scope
-
-        * ace/OS_NS_string.{h,cpp,inl}:
-          Added ACE_LACKS_STRTOK_R to make the rtems port easier
-
-Mon Oct 16 14:24:25 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_netdb.{cpp inl} (gethostbyname[_r], gethostbyaddr[_r]):
-          Check the specified string (name or addr) for unspecified or of
-          0 length and return 0 if so - bypasses a system call and a possible
-          memory leak. Thanks to Howard Finer <hfiner at sonusnet dot com>
-          for these fixes.
-
-        * ace/Sock_Connect.cpp (get_ip_interfaces): Don't report an error if
-          we can't find IPv6 addresses. It may be on a system with ACE_HAS_IPV6
-          support compiled but IPv6 not configured/enabled. Thanks to Andre
-          Kostur <akostur at incognito dot com> for reporting this.
-
-        * ace/WFMO_Reactor.cpp (ok_to_wait): In the ACE_HAS_WINCE block,
-          change fwaitAll arg from TRUE to FALSE - it must be FALSE on
-          WinCE (thru WinMobile 5) per MSDN. Thanks to Drew Reynaud
-          <drewreynaud at hotmail dot com> for this fix.
-
-        * THANKS: Added Drew Reynaud to the Hall of Fame.
-
-Mon Oct 16 14:21:48 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/generate_compile_stats.sh:
-
-          I accidentally deleted a letter in my previous commit.
-
-Mon Oct 16 14:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-rtems.h:
-          Added first set of missing defines
-
-        * ace/os_include/sys/os_select.h:
-        * ace/os_include/sys/os_uio.h:
-          Removed rtems specific part, not needed anymore
-
-        * ace/os_include/sys/os_types.h:
-          Added rtems check
-
-        * include/makeinclude/plaform_rtems.x_g++.GNU:
-          Updated
-
-Mon Oct 16 13:47:25 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
-
-          Use the create_command_line_string() method instead of printing
-          the command line directly.  This opens the door for disabling this
-          functionality.
-
-Mon Oct 16 12:18:14 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ace/OS_NS_Thread.inl:
-        * ace/os_include/os_semaphore.h:
-
-          The feature that I put in for Gottwald Port on Mon Mar  6 18:25:41
-          UTC 2006 causes a performance overhead for semaphores where
-          ACE_HAS_POSIX_SEM is defined (SunOS, HP-UX, MacOS X, etc.).  For
-          those that are not interested in timed semaphores, this feature
-          provides nothing and is detemental to performance.  Now, this
-          feature is disabled by default and must be manually enabled by
-          defining the ACE_HAS_POSIX_SEM_TIMEOUT_EMULATION macro.
-
-Mon Oct 16 12:06:10 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/generate_compile_stats.sh:
-
-          Added some changes to make this script usable for software other
-          than ACE+TAO+CIAO.
-
-          - Enhanced the usage message.
-          - Fixed minor HTML errors.
-          - Added options to set the base root directory and software title.
-
-Mon Oct 16 11:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/IOStream/client/IOStream_Client.mpc:
-        * examples/IOStream/server/IOStream_Server.mpc:
-          Added exename so that we create an exe, not a dll
-
-        * examples/IOStream/client/.cvsignore:
-        * examples/IOStream/server/.cvsignore:
-          Removed duplicate lines
-
-        * examples/IOStream/server/iostream_server.cpp:
-          Added needed include for building with VxWorks 5.5.2
-
-Mon Oct 16 08:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/ciao_static_dnc_app.mpb:
-          New base project for static dnc.
-          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
-          for creating this file
-
-Sun Oct 15 23:22:52 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added Bug_2683_Regression to the test suite.
-
-Fri Oct 13 18:26:19 UTC 2006  Andy Stafford  <ajs3@cec.wustl.edu>
-
-        * include/makeinclude/wrapper_macros.GNU:
-
-          Added 'lksctp' as recognized option to sctp documentation.
-
-Fri Oct 13 18:13:00 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/cle.pl (getDefaultDomain):
-
-          Fixed a bug where extra text would be part of the domain name when
-          the /etc/hosts file contains an alias after the fully qualified
-          host name.
-
-Fri Oct 13 12:32:35 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/PerlACE/Process_Unix.pm:
-
-          Added support for remote testing on UNIX only.  Currently, ssh or
-          rsh is used to run an executable on the remote machine.  The
-          remote test capability is only enabled if the RemoteInformation
-          method is called on the PerlACE::Process object.  For more
-          details, see the RemoteInformation method in this module.
-
-Fri Oct 13 10:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/soreduce/Library.cpp:
-          aceversion is not a valid base project. Thanks to Manuel Traut
-          <manut dot de at googlemail dot com> for reporting this.
-
-Thu Oct 12 16:44:34 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Log_Record.cpp (operator<<): Zapped the nonconst_record and
-          const_cast since this is no longer needed as per the following
-          change:
-
-         Sun Aug 12 00:34:42 2001  Steve Huston  <shuston@riverace.com>
-         * ace/Log_Record.h:
-         * ace/Log_Record.i (msg_data()): Changed ACE_TCHAR *msg_data()
-           to:  const ACE_TCHAR *msg_data (void) const. Makes it safer,
-           and conforms to all current usage inside ACE. Also makes
-           C++ Network Programming examples simpler :-)
-
-          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
-          for reporting this.
-
-Thu Oct 12 15:45:24 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          If a custom definition has an 'output_option' set, the order of
-          listing the input file changes such that it is listed before the
-          output_option setting in the build rule.
-
-        * bin/auto_run_tests.pl:
-
-          Added a new option, -l, which can be used to specify an arbitrary
-          list of tests.
-
-Thu Oct 12 12:20:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Svc_Conf.h:
-          Fixed incorrect placed ACE_BEGIN_VERSIONED_NAMESPACE_DECL macro.
-          Thanks to Alexander Libman <alexander dot libman at earthlink dot net>
-          for reporting this
-
-Wed Oct 11 15:24:04 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Log_Record.{h inl cpp}: Removed the set_msg_data_ptr()
-          method - it opens the possibility of putting a buffer in place
-          that can't be freed properly. All of the memory allocating and
-          deleting should be done internally to this class. The removed
-          method was only used internally.
-          Added a private msg_data_size_ member that keeps the allocated size
-          of msg_data_ in ACE_TCHARs (not bytes) to tell if the buffer needs
-          to be resized. Comparing to the string length is incorrect - it
-          causes buffer reallocating whenever a short logged message is
-          followed by a longer one, even if both are much shorter than the
-          allocated length of msg_data_. When a ctor allocates a msg_data_
-          area, set the first spot to '\0' to a call to msg_data_len() won't
-          get random answers or a crash.
-          (msg_data (const ACE_TCHAR *)): Changed this method to return int,
-          not void. It also will now reallocate the msg_data_ buffer if needed
-          to hold the specified string. operator<< now uses msg_data() to set
-          the string instead of the now removed set_msg_data_ptr() method,
-          keeping all msg_data_ allocation and release in the same class.
-          (operator<<): Fix memory leak when setting a new msg_data_
-          buffer. Thanks to Arturo Montes for letting us know about the leak.
-
-        * docs/ACE-guidelines.html: Clarify the format of ChangeLog entries.
-          Remove the recommendation to always test on egcs; things should be
-          tested on at least Windows and Linux, but egcs is outdated.
-
-Tue Oct 10 18:46:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Document how to get a current copy from subversion
-
-Tue Oct 10 14:16:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Stream.cpp:
-          Fixed incorrect comment
-
-Tue Oct 10 12:54:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * ace/config-win32-msvc.h:
-          Changed the MFC build run-time dll decorators to match
-          the current build system settings.
-
-Tue Oct 10 06:08:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Changed check for empty inline files to also check for empty
-          source files
-
-        * bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb:
-        * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb:
-          New avoids projects
-
-        * etc/ace.doxygen:
-          Expand some more macros, should improve documentatation
-
-        * html/README:
-          Updated download location to ISIS
-
-Tue Oct 10 06:03:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/ACE-bug-process.html:
-          Updated to mention svn
-
-        * docs/Download.html:
-          Commented out the source packages that are not complete at this moment
-
-Mon Oct 09 09:07:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_rel_manpages:
-          Fixed an error in this script and updated the location to which the
-          generated packages should be copied to
-
-Mon Oct 09 09:03:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Updated with the new download locations
-
-        * docs/bczar/bczar.html:
-          Updated documentation generation instructions
-
-Thu Oct 05 00:35:37 2006  William R. Otte  wotte@dre.vanderbilt.edu
-
-        * ACE version 5.5.3 released.
-
-Tue Oct  3 16:45:35 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * NEWS
-          Updated the NEWS to add the changes for ACE_Hash_MultiMap_Manager
-          class and executionmanager_stub and plan_generator base projects.
-
-Tue Oct  3 15:02:14 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * NEWS: Described the ACE_Refcounted_Auto_Ptr effects of
-          Thu Jul  6 20:45:15 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-Mon Oct  2 12:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.cpp:
-          Const/bool improvements
-
-Mon Oct  2 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.{h,cpp}:
-          Changed is_set_ conditional values member to bool
-
-Sat Sep 30 14:00:33 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Cached_Allocator_Test.cpp:
-        * tests/Codecs_Test.cpp:
-        * tests/Enum_Interfaces_Test.cpp:
-        * tests/Get_Opt_Test.cpp (run_test):
-        * tests/Naming_Test.cpp:
-        * tests/Reactor_Notification_Queue_Test.cpp:
-        * tests/Reference_Counted_Event_Handler_Test.cpp:
-        * tests/Timer_Queue_Reference_Counting_Test.cpp:
-          Correct logging format for wide-char build.
-
-Fri Sep 29 18:54:29 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_signal.inl (sigaction): In the !ACE_HAS_SIGACTION_CONSTP2
-          case, use ACE_SIGACTION instead of "struct sigaction" to pick up
-          the funky HP hack. Also see:
-          Mon Jan 23 22:08:56 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-Fri Sep 29 10:00:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Web_Crawler/Web_Crawler.mpc:
-          Added avoids+=uses_wchar for borland and bmake, the Borland
-          compiler gives a warning which can't be easily suppressed and
-          by not building this project we do get a few new green builds
-
-Thu Sep 28 19:37:13 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/diff-builds.pl:
-          Fixed the finding of the nearest earlier build for a given date.
-
-Thu Sep 28 16:53:14 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * bin\MakeProjectCreator\config\ciao_executionmanager_stub.mpb
-        * bin\MakeProjectCreator\config\ciao_plan_generator.mpb
-        Added the base projects for executionmanager_stub and plan_generator.
-
-Thu Sep 28 14:46:43 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/diff-builds.pl:
-
-          Updated to fix temporary files creation. Now all those are put
-          in the temporary files directory. Fixed the ability to compare
-          just two dates.
-
-Thu Sep 28 13:35:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-hpux-11.00.h:
-          Removed ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION that
-          was set for gcc, with this define set the ACE library doesn't
-          build.
-
-        * ace/CDR_Stream.cpp:
-          Initialise pointer with 0
-
-        * ace/TP_Reactor.{h,inl}:
-          Changed owner from int to bool.
-
-Wed Sep 27 21:18:04 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Synch_Options.h: Corrected the table of possible Use_Reactor,
-          Timeout combinations - it was reversed.
-
-        * ace/WFMO_Reactor.{h cpp}: Change the delete_signal_handler_,
-          delete_timer_queue_, delete_handler_rep_, delete_notify_handler_,
-          and open_for_business_ members from int to bool to more
-          accurately reflect their nature as yes/no indicators.
-          Also, initialize notify_handler_ to 0 in constructors to avoid
-          a UMR warning from Purify.
-
-Wed Sep 27 06:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_compile.pl:
-          Added protocols directory
-
-Tue Sep 26 09:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/dynamicany.mpb:
-          Derive from valuetype, needed to get AbstractBase::_nil() in a no
-          inline build.
-
-Mon Sep 25 16:29:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/ACE.cpp (send_n_i): Conditionally removed the check for
-          errno == ENOBUFS because Winsock send, or WSASend will try to
-          enqueue all buffer at once (to the kernel) and if not it will
-          return ENOBUFS, in which case the socket is always ready for
-          writing but actually winsock can never perform such write and we
-          have endless loop.  Thanks to Aleksandar Vukajlovic <vukajlo at
-          finsoft dot co dot yu> for reporting this and suggesting a fix.
-
-Mon Sep 25 11:39:35 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * ace/Bound_Ptr.inl:
-        * ace/Bound_Ptr.h:
-
-          Applied workarounds that should fix compile errors on BCB6.
-          Thanks to Martin Corino <mcorino at remedy.nl> for providing
-          the patch.
-
-        * protocols/ace/TMCast/Messaging.hpp:
-        * protocols/ace/TMCast/TransactionController.hpp:
-
-          Updated to use ACE_Strong_Bound_Ptr.
-
-Fri Sep 22 12:42:37 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * docs/index.html: Added a link to the http://www.acejoy.com ACE
-          developers website in China.  Thanks to Winston Zhang <webmaster
-          at acejoy dot com> for creating this website.
-
-Tue Sep 19 12:27:47 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Unload_libACE.cpp: Fixed the formatting of this file so it
-          conformed to ACE guidelines.
-
-Tue Sep 19 02:54:20 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/FILE_Connector.h: Changed the documentation to reflect the fact
-          that mkstemp() is used, not mktemp().
-
-Thu Sep 21 16:51:34 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * ace/TP_Reactor.h:
-        * ace/TP_Reactor.cpp:
-          The TP_Reactor signal handling implementation is
-          incomplete. In the current implementation under certain
-          circumstances (event loop breaks out if interrupted. This is
-          controlled via ACE_Select_Reactor_T::restart()), a properly
-          handled OS signal can break the reactor event loop in
-          an unpredictable manner. This is due to the fact that we cannot
-          predict which thread will receive the OS signal. Untill the
-          TP_Reactor signal handling is fixed, I am commenting it out.
-
-Thu Sep 21 15:13:19 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added new bug 2188 regression test.
-
-Mon Sep 18 10:56:29 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: Add buildbits=64
-          branch for Sun Studio 11 (Sun C++ 5.8). Thanks to Aleksandar
-          Vukajlovic <vukajlo at finsoft dot co dot yu> for this.
-
-        * THANKS: Added Aleksandar Vukajlovic to the Hall of Fame.
-
-Thu Sep 14 23:01:16 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Bound_Ptr.inl: Tweak syntax to try and work around apparant
-          issues with BCB6.
-
-Thu Sep 14 21:48:39 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_Thread.inl (thr_getspecific): Removed the ACE_Errno_Guard
-          around ::TlsGetValue() in the ACE_HAS_WTHREADS case. The comments
-          near the code said (paraphrasing) "...it was to protect against
-          ACE_Log_Msg::instance() overwriting the error value before it had a
-          chance to be logged; although ACE_ERROR et al already store the
-          error value before calling ACE_Log_Msg::instance(), there may be a
-          chance that other uses of ACE_Log_Msg don't protect this way."
-          I have a report that having the errno guard in place is taking
-          over 10% CPU during a customer system's run-time. This is way too
-          much to have in a hot path, especially for a mis-placed guard.
-          It seems a little random to be picking on ACE_OS::thr_getspecific()
-          when there are many more OS calls in the ACE_Log_Msg::instance()
-          call path.
-          If there are really cases outside of ACE_ERROR... et al, then the
-          guard should be worked into ACE_Log_Msg::instance() method. However,
-          rather than try that now, let's see if there are any real issues,
-          since OS-level calls should be setting errno when errors are
-          noticed, propagating from GetLastError() via
-          ACE_OS::set_errno_to_last_error () as needed.
-          Thanks to Kelly Hickel <kfh at mqsoftware dot com> for raising
-          this point.
-
-Wed Sep 13 18:25:37 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * ace/Bound_Ptr.h:
-        * protocols/ace/RMCast/Reassemble.cpp:
-
-          Re-applied my changes (Wed Sep  6) on build czar's (Steve
-          Huston) request.
-
-Tue Sep 12 18:07:57 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/svn/svn-prefs.reg
-        * docs/svn/config
-
-          Added pdf,eps,ps as binary file types.
-
-Tue Sep 12 13:56:22 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * apps/JAWS3/small/SS_Service_Handler.h: Added #include
-          "ace/svc_export.h".  Thanks to Andy Wang <ypwangandy at gmail
-          dot com> for reporting this.
-
-Tue Sep 12 13:56:09 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * apps/JAWS3/small/SS_State_DONE.h:
-        * apps/JAWS3/small/SS_State_READ.h: Added #include
-          "ace/Synch_Traits.h".  Thanks to Andy Wang <ypwangandy at gmail
-          dot com> for reporting this.
-
-Thu Sep  7 19:43:02 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/FILE_Connector.h (ACE_FILE_Connector): Updated the
-          documentation to remove mention of the return values.  Thanks to
-          Hieu Ngyuen <hieu dot t dot nguyen at vanderbilt dot edu> for
-          reporting this.
-
-Mon Sep 11 13:03:17 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * ace/Bound_Ptr.h:
-        * protocols/ace/RMCast/Reassemble.cpp:
-
-          Reverted my previous changes (Wed Sep  6) since BCB2006
-          is unable to handle the required C++ constructs.
-
-Sun Sep 10 09:23:04 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * include/makeinclude/platform_g++_common.GNU
-
-          Committing a fix provided by Ossama Othman (Ossama_Othman at symantec dot com)
-          to fix a problem with symbol visibility when building static libraries.
-
-Fri Sep  8 21:11:20 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/CDR_Stream.cpp (ACE_OutputCDR::replace()): Fixed compile error
-          from apparant cut/paste error in ACE_ENABLE_SWAP_ON_WRITE path.
-          Thanks to JR Andreassen for reporting this.
-
-        * ace/Bound_Ptr.h: Changed new constructor/assignment to use
-          dynamic_cast in order to be able to transport pointers through
-          that can go both up and down a class hierarchy.
-          (See Wed Sep  6 07:40:03 UTC 2006  Boris Kolpackov
-          <boris@codesynthesis.com>).
-
-        * protocols/ace/RMCast/Protocol.h (clone(), clone_()): Replaced use of
-          naked pointers returned from clone_() with ACE_Strong_Bound_Ptr and
-          used new ACE_Strong_Bound_Ptr ctor to facilitate carrying a more-
-          refined type through a Profile_ptr and back. Closes up a window
-          for exception unsafeness noticed by Boris Kolpackov. Also see
-          Tue Aug 22 22:52:41 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-Fri Sep  8 18:25:17 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Synch_Options.{h cpp}: Improved the documentation for this
-          class, particularly the table that explains the behavior for the
-          valid combinations of reactor-usage and timeout. Thank you to
-          Andriy Gapon <avg at icyb dot net dot ua> for motivating this.
-
-          Also changed the return type of operator[] from int to bool; its
-          meaning was always 1/0 but was overlooked in the sweep for this
-          type of thing last year.
-
-        * NEWS: Added the ACE_Synch_Options::operator[] return type change.
-
-        * THANKS: Added Andriy Gapon to the Hall of Fame.
-
-Wed Sep  6 07:40:03 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * ace/Bound_Ptr.h:
-
-          Added new constructor and assignment operator templates that
-          support the naked pointer-like implicit conversion.
-
-        * protocols/ace/RMCast/Reassemble.cpp:
-
-          Use the new constructor to get rid of reinterpret_cast.
-
-Tue Sep  5 21:28:02 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_race_component.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_default.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_monitor.mpb: Added new
-          RACE specific base projects.
-
-Fri Sep  1 19:58:06 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Turn on nightly regression test for bug 1476.
-
-Fri Sep 1 13:49:12 UTC 2006  Martin Corino <mcorino@remedy.nl>
-
-        * bin/PerlACE/Run_Test.pm:
-          Increased process creation timeout for tests on openVMS.
-
-Thu Aug 31 01:45:06 UTC 2006  Sumant Tambe  <sutambe@nospam>
-
-        Added .xml files to it.
-        * docs/svn/config:
-        * docs/svn/svn-prefs.reg:
-
-Wed Aug 30 17:45:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        This change fixes bug#2648
-
-        * ace/Service_Object.cpp:
-
-          Fixed formatting.
-
-        * ace/Service_Repository.cpp:
-
-          Updated logging.
-
-        * ace/Service_Types.h:
-        * ace/Service_Types.cpp:
-
-          Added ACE_Service_Object_Type::initialized_ member variable to
-          hold the result of calling init() on the ACE_Service_Object. The
-          value is later consulted in ACE_Service_Object_Type::fini() to
-          determine if ACE_Service_Object::fini() should be
-          called. C++NPv2 (page 120) says that fini() must be called if
-          and only if, init() succeeded, i.e. returned 0.
-
-Wed Aug 30 17:18:52 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb
-          Modified this file to fixed the "reference to `ACE_Singleton<CIAO
-          ::Config_Handlers::XML_Helper, ACE_Null_Mutex>::instance()'"warnings
-          with FC5_Static build.
-
-Wed Aug 30 13:34:50 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/make_release
-
-          Updates to the make_release script to make it subversion compatible.
-          major updates to be aware of:
-            . Assumes the working copy it uses is flattened
-            . Must have DOC_ROOT set
-            . Script should be started from DOC_ROOT.
-            . Produces traditional (nested) releases
-            . Now produces a set of source-only kits in addition to
-              the traditional kits.
-
-          IMPORTANT: The release makefiles have not been updated, and are
-          most likely broken.
-
-          Producing a release is a two step process:
-          make_release -u  # Update version numbers
-          make_release -k ace+tao+ciao # Create all kits.
-
-Wed Aug 30 12:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Stream.{h,cpp}:
-          Use true/false consistently for the good_bit
-
-Wed Aug 30 05:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Service_Config_Test.cpp:
-          Fixed argument not used warnings
-
-Tue Aug 29 21:17:26 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Service_Config_DLL.{h cpp}:
-        * tests/Service_Config_Test.cpp: Added a test for ACE_Service_Config's
-          behavior when a dynamic service's init() hook returns -1 (failure).
-          This was precipitated by Bugzilla #2648.
-
-Tue Aug 29 18:07:39 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc:
-        * tests/SSL/tests.mpc:
-
-          Disable MPC projects in these files that depend on features not
-          found in the "ACE for TAO" subset", i.e. ACE_Profile_Timer and
-          asynch I/O.
-
-Tue Aug 29 13:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added bug 2560 regression. It runs fine on windows but seem to
-          crash on linux exhibiting a bug that isn't fixed yet.
-
-Tue Aug 29 13:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/ProcessVX.pm:
-          Commented out the ProcessVX_Unix require, it resulted in
-          errors on test systems when they don't have Net::Telnet ()
-          available.
-
-Tue Aug 29 11:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/Run_Test.pm:
-        * bin/PerlACE/ProcessVX_Unix.pm:
-        * tests/run_test.pl:
-          Changes for running tests on linux with vxworks 6.3 rtp model target
-
-Tue Aug 29 08:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          Don't run UUIDTest in ACE_FOR_TAO configuration
-
-        * bin/ace-tests.lst:
-          Don't run wfmo reactor tests in ACE_FOR_TAO configuration
-
-Tue Aug 29 00:24:48 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * docs/run_test.txt:
-          Fixed Perl bug in example (needed "" instead of '' to get $ variable
-          expansion) and added explanatory text on using $PerlACE::ACE_ROOT
-          and $PerlACE::TAO_ROOT.
-
-Tue Aug 29 00:26:56 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/SSL/ssl.mpc
-        * ace/SSL/ssl_for_tao.mpc
-        * bin/MakeProjectCreator/config/ssl_full.mpb:
-        * bin/MakeProjectCreator/config/ssl.mpb:
-        * bin/MakeProjectCreator/config/ssl_for_tao.mpb:
-
-          Added support for new ACE_SSL subset "ACE_SSL_FOR_TAO" for
-          "ace_for_tao" configuration.  The ACE_SSL_FOR_TAO subset merely
-          lacks asychronous I/O support.
-
-Tue Aug 29 00:04:29 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/ACE_export.h:
-
-          SGI C++ 7.3 compiler does not support standard C++ "extern
-          inline" declarations.
-
-        * ace/Log_Msg.cpp (log):
-
-          Corrected scalar/vector operator delete() mismatch.  The wide
-          string buffer was allocated as an array.  Destroy it
-          accordingly.
-
-        * ace/MMAP_Memory_Pool.cpp (ACE_MMAP_Memory_Pool):
-
-          Prevent potential dereferencing of null pointer.
-
-        * ace/Svc_Conf_Param.h:
-
-          Corrected author information.
-
-Mon Aug 28 23:59:50 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        From Amnon Berger <AmnonAB at gmail dot com>
-        * ace/SSL/SSL_Context.h (ACE_SSL_Context):
-        * ace/SSL/SSL_Context.cpp (certificate):
-
-          Added support for reading an X.509 certificate from memory
-          instead of a file.
-
-Mon Aug 28 19:33:50 UTC 2006  Sumant Tambe  <sutambe@nospam>
-
-        A quick perl script to create a change-log-entry date and time.
-        * bin/cltime.pl:
-
-        Added *.cidl *.pcd *.cdd
-        * docs/svn/config:
-        * docs/svn/svn-prefs.reg:
-
-Mon Aug 28 14:14:39 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-          Added TAO/orbsvcs/tests/Security/Big_Request/run_test.pl to the
-          list of SSL-based tests. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for pointig out that it was missing.
-
-Mon Aug 28 13:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Svc_Conf_Lexer.cpp:
-          Fixed variable not used warning when ACE_USES_WCHAR is not
-          defined
-
-        * ace/Min_Max.h:
-          Removed ACE_LACKS_MIN_MAX_TEMPLATES and the code that was
-          there when this define was set, this define wasn't enabled
-          in any configuration file.
-
-Mon Aug 28 11:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taodefaults.mpb:
-          Added exceptions as base project, TAO requires native C++ exceptions.
-
-Mon Aug 28 11:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * protocols/tests/RMCast/RMCast.mpc:
-          Removed avoids usage, that is already in the base projects
-
-Mon Aug 28 11:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/*.doxygen:
-          Set ignore prefix in several files to improve generated
-          documentation
-
-Mon Aug 28 11:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/acexml.doxygen:
-          Ignore ACEXML_ as prefix
-
-Mon Aug 28 10:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/run_test.txt:
-          Updated to explain how the script works on VxWorks and extended
-          the exampl in such a way that if there is not an executable
-          it returns directly
-
-Mon Aug 28 10:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          Added UUIDTest, was just not listed in this file
-
-        * bin/PerlACE/ProcessVX_Unix.pm:
-          New initial file for running tests for VxWorks from an unix host
-
-        * bin/PerlACE/ProcessVX.pm:
-          On unix use the new file above
-
-Mon Aug 28 09:05:20 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * bin/ace_tests.lst:
-
-          Copied test exclusion list from the Multicast_Test entry.
-
-        * protocols/tests/RMCast/Protocol.h:
-        * protocols/tests/RMCast/run_test.pl:
-
-          Adjusted the timeout value and message size.
-
-Sun Aug 27 11:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added twoway DII collocation test
-
-Sun Aug 27 00:03:07 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Filecache.cpp (ACE_Filecache_Object): Added a call to
-
-          this->lock_.release ();
-
-          to release the lock and so the same file can be fetched again.
-          Thanks to Liu Qian <qianliu dot gmail at com> for reporting
-          this.
-
-Sat Aug 26 17:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/ACE-porting.html:
-          ACE_VXWORKS is the define for VxWorks, exceptions are required
-          for TAO.
-
-Sat Aug 26 17:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/ACE-guidelines.html:
-          Updated some parts to mention svn instead of cvs
-
-Sat Aug 26 03:11:01 UTC 2006  Krishnakumar B  <kitty@spam.invalid.domain>
-
-        * docs/svn/svn-prefs.reg:
-        * docs/svn/config:
-
-          Updates to add even more file types.
-
-Sat Aug 26 02:32:18 UTC 2006  Krishnakumar B  <kitty@spam.invalid.domain>
-
-        * docs/svn/svn-prefs.reg:
-        * docs/svn/config:
-
-          Updated these files to add more entries to the list of globally
-          ignored extensions, and also to the list of file types which
-          should have automatic properties set.  Also synced up the config and
-          svn-prefs.reg file.
-
-Fri Aug 25 22:01:38 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Sock_Connect.cpp (get_ip_interfaces, count_interfaces):
-          Corrected to extract IPv6 information correctly from ioctl()-
-          returned structures.
-
-        * tests/Enum_Interfaces_Test.cpp: On error condition ACE_HAS_IPV6 but
-          no ipv6 interfaces, do the log as LM_ERROR so the scoreboard picks
-          it up.
-
-Fri Aug 24 12:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-vxworks6.3.h:
-        * ace/Process.cpp:
-        * ace/Task.cpp:
-          Fixes for building on vxworks 6.3 with diab 5.4 compiler
-
-Fri Aug 24 11:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Size.cpp:
-          Added include of OS_Memory.h to get ACE_align_binary
-
-Thu Aug 24 21:40:24 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Process_Manual_Event_Test.cpp (acquire_release): Fixed a race
-          condition whereby while a parent and child were ping-ponging, it
-          was possible for one process to signal event1, wait on event2, then
-          signal event1 again before the other process could respond to
-          event1 being signaled and reset it. Thus, event1 was being reset
-          after the other process signaled it, ensuring a never-ending
-          wait at the end of the iterations. I changed the code to quickly
-          reset the event before printing the debug message, thereby closing
-          the window of opportunity a lot. But probably not completely
-          removing it... we'll have to see.
-
-Thu Aug 24 16:40:54 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Only need to set
-          ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION for g++
-          prior to g++ 4.1 (have only heard report of this for g++ 4.1;
-          it may need adjustment for 4.0). Thanks to Nzer Zaidenberg
-          <scipioenterprises at yahoo dot com> for reporting the original
-          problem and testing this fix.
-
-        * THANKS: Added Nzer Zaidenberg to the Hall of Fame.
-
-Thu Aug 24 16:33:22 UTC 2006  James H. Hill     <hillj@isis.vanderbilt.edu>
-
-        * docs/svn/config:
-        * docs/svn/svn-prefs.reg:
-
-          Added auto-props for *.tex and *.cls files.
-
-Thu Aug 24 13:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-openvms.h
-          Removed ACE_HAS_SOCK_BUF_SIZE_MAX, not needed anymore with the
-          latest OpenVMS versions
-
-Thu Aug 24 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/DLL.h
-        * ace/Service_Repository.h
-        * ace/Service_Object.cpp
-        * ace/Parse_Node.cpp
-        * ace/Service_Object.inl
-        * ace/Parse_Node.h
-        * ace/Service_Repository.cpp
-        * ace/Service_Object.h
-        * ace/Service_Gestalt.h
-        * ace/Service_Gestalt.cpp
-        * ace/DLL_Manager.cpp
-        * ace/DLL.cpp
-          Reverted change from below on request of Iliyan because it broke
-          a set of tests that spawn a thread in init.
-          Tue Aug 22 21:43:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-Wed Aug 23 08:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Sock_Connect.{h,cpp}:
-          Reverted the change below, VxWorks/OpenVMS/AIX all have problems
-          after this change
-
-        Tue Aug 22 15:19:46 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-        * ace/Sock_Connect.h:
-        * ace/Sock_Connect.cpp:
-
-Tue Aug 22 22:52:41 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * protocols/ace/RMCast/Protocol.h: Replaced use of
-          ACE_Refcounted_Auto_Ptr with ACE_Strong_Bound_Ptr. Code formerly used
-          ACE_Refcounted_Auto_Ptr::release() with the assumption it had the
-          same semantics as auto_ptr::release() - stealing the pointer away.
-          This used to work by accident. The fixed ACE_Refcounted_Auto_Ptr's
-          release() method decrements the reference count which may cause the
-          object to be deleted, which is what happened all the time in the
-          RMCast protocol's clone() methods. Because all the clone() methods
-          relied on being able to take a more-derived pointer and use it as
-          a Profile*, changing the refcounted pointer type necessitated
-          changing the protected clone_() methods to return a naked pointer
-          rather than a refcounted one. This is acceptable because the naked
-          pointer is not exposed to class users; the public methods insert
-          the naked pointer into a ACE_Strong_Bound_Ptr before giving access
-          to it externally.
-
-        * protocols/ace/RMCast/Acknowledge.cpp:
-        * protocols/ace/RMCast/Reassemble.cpp: With properly functioning
-          refcounted pointers (see above) these needed a few changes to
-          make proper use of the pointers while maintaining correct reference
-          counts.
-
-Tue Aug 22 21:43:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          This change fixes bug#2612.
-
-        * ace/DLL.h:
-        * ace/DLL.cpp:
-
-          Made assignment return 'T&' instead of 'const T&'. Adjusted code
-          formatting and logging messages.
-
-        * ace/DLL_Manager.cpp:
-
-          Fixed formatting.
-
-        * ace/Parse_Node.h:
-        * ace/Parse_Node.cpp:
-
-          Added accessor for the underlying ACE_DLL and adjusted logging.
-
-        * ace/Service_Gestalt.h:
-        * ace/Service_Gestalt.cpp:
-
-          Introduced ACE_Service_Type_DLL_Guard class. As dynamic service
-          objects are loaded, static service objects that come with the
-          same DLL code, may also be registered. The static services
-          however, have no information about the context in which their
-          registration takes place and their relation with the DLL is
-          lost. A situation can easily arise where the dynamic service
-          object is finalized and its DLL - unmapped, but some of the
-          DLL's static services may still be around. Their finalization
-          would not be possible, if the DLL counting that code is gone.
-
-          The guard, when instantiated (on the stack) swaps out the
-          current Gestalt and its service repository, and replaces them
-          with a "sandbox" Gestalt, which has lifetime sufficient for just
-          the current service initialization. Note that this mechanism is
-          effective even in the case where a service initialization causes
-          re-entry into the Gestalt to load and initialize another service
-          as part of the initialization.
-
-          If no action is taken (in case of an error, for instance) the
-          guard destructor will simply finalize all newly initialized
-          service(s) from the sandbox. On the other hand, if
-          initialization is successful the service object descriptors are
-          "relocated" to the original Gestalt.
-
-          During the relocation, all static services are "fixed-up" to
-          hold a reference to the DLL they belong to. Effectively, a
-          static service, initialized via loading of a particular DLL,
-          becomes a dynamic service. Thus the order of service
-          finalization does not matter anymore because the DLL will be
-          help in memory until the last service object it provides is
-          finalized.
-
-        * ace/Service_Object.h:
-        * ace/Service_Object.inl:
-        * ace/Service_Object.cpp:
-
-          Added a relocate method to modify the ACE_DLL each SO has.
-
-        * ace/Service_Repository.h:
-        * ace/Service_Repository.cpp:
-
-          Befrended ACE_Service_Type_DLL_Guard. Adjusted logging.
-
-        * tests/Service_Config_Test.cpp:
-
-          Simplified test case.
-
-Tue Aug 22 18:37:48 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/MakeProjectCreator/config/ipv6.mpb:
-
-          Building with IPv6 for WinCE requires an additional library for
-          rtti that is not required for the windows builds.
-
-        * bin/ciao_tests.lst:
-        * bin/tao_orb_tests.lst:
-        * bin/tao_other_tests.lst:
-          Added ACE_FOR_TAO exclusions as necessary
-
-Tue Aug 22 15:19:46 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.h:
-        * ace/Sock_Connect.cpp:
-
-          Refactored interface discovery code. The methods used to find
-          IPv6 interface addresses is highly platform specific. So much so
-          that the single method was too confusing to maintain. With this
-          patch, the code has been refactored to put each
-          platform-specific variation in its own method, then only compile
-          the method needed by any given platform. I'm not sure this will
-          yield much of a footprint reduction, as all the existing code is
-          still present, it is just easier to keep track of what is going on.
-
-          Also, when IPv6 is enabled, it might be on a platform that is
-          using IPv6 exclusively, ie, with no IPv4 enabled. At least one
-          third-party user of ACE requested a specific test for IPv4
-          enablement status, thus I have added a new method for that test.
-
-        * ace/config-linux.h:
-          Linux supplies the getipaddrs system call.
-
-        * tests/Enum_Interfaces_Test.cpp:
-          Extended the test so that if ACE is built with ACE_HAS_IPV6
-          defined, the test will expect at least one IPv6 endpoint or it
-          will fail.
-
-Tue Aug 22 11:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/UUID.{h,cpp}:
-          Implemented copy constructor
-
-        * tests/UUIDTest.cpp:
-          Test copy constructor
-
-Tue Aug 22 09:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/UUID.{h,inl}:
-          Made the accessors const and reimplemented operator == and
-          operator !=.
-
-        * tests/UUIDTest.cpp:
-          Test the operator != and ==.
-
-Mon Aug 21 20:46:43 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * configure.ac: Modified the check for the net/if.h header file
-          to do a #include <sys/socket.h> if it exists. Allows the compile
-          of net/if.h to succeed, fixing a configure warning for a file that
-          exists but won't compile. Thanks to Don Meek <Don dot Meek at
-          windstream dot com> for reporting this problem.
-
-        * THANKS: Added Don Meek to the Hall of Fame.
-
-Mon Aug 21 20:43:59 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.inl:
-
-          Added the missing implementation of the static process_file ()
-          method. Thanks to Lothar Werzinger <lothar@tradescape.biz> for
-          pointing that out.
-
-Mon Aug 21 20:06:38 Pacific Daylight Time 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        From Russell Mora <russell_mora at symantec dot com>:
-        * ace/Thread_Exit.cpp (instance):
-
-          Fixed race condition in generated code by stopping optimizer
-          from re-ordering static variable initializations by declaring
-          static "instance_" variable as "volatile".  This problem was
-          observed on a quad-CPU Solaris 8 box.
-
-Mon Aug 21 18:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/*.doxygen:
-          In all files except ace.doxygen added SHORT_NAMES=YES to let
-          doxygen generate shorter filenames, this should fix the problems
-          we had during the release with cpio not capable of handling
-          long filenames
-
-Mon Aug 21 17:46:55 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Numeric_Limits.h (ACE_Numeric_Limits):
-
-          The Microsoft Platform SDK does not provide
-          std::numeric_limits<> specializations for 64 bit integers so we
-          need to explicitly provide ACE_Numeric_Limits<> specializations
-          to compensate for this deficiency.  [Bug 2639]
-
-          Unfortunately there is no way to tell if the platform SDK is
-          being used so we specialize for the ACE_WIN64 + MSVC++ 7.1 case,
-          which is the configuration that exhibits this problem.  It also
-          happens to be a fairly isolated configuration since 64-bit
-          support in MSVC++ 7.1 was not very good to begin with.
-
-Mon Aug 21 15:35:26 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Timeprobe_T.cpp (print_times): More fixed for timestamp
-          inversion due to recording time from different threads.  This
-          prints a warning message the first time it detects a timestamp
-          inversion.  It also fixes various minor problems in the
-          timeprobe reports whenever the total number of timeprobes
-          exceeds 8192.  Thanks to Patrick Rabau for contributing this.
-
-        * ace/INET_Addr.h: Updated the documentation of the non-reentrant
-          versions of get_host_addr() and get_host_name() to clarify how
-          they can be used correctly (or better yet not used at all..).
-          Thanks to Ephy Levy <EphyLevy at gmail dot com> for motivating
-          this.
-
-        * ace/Logging_Strategy.cpp: Added a destructor to delete
-          this->filename_, which is allocated in the constructor.  Thanks
-          to Amnon AB <AmnonAB at gmail dot com> for reporting this.
-
-        * ace/Acceptor.h: Made the suspend()/resume() methods of
-          ACE_Strategy_Acceptor public rather than protected.  Thanks to
-          Amnon AB <AmnonAB at gmail dot com> for reporting this.
-
-        * docs/Symbol_Versioning.html (HREF): Added a link to the Riverace
-          webpage that describes symbol versioning in ACE.  Thanks to
-          Steve Huston for contributing this.
-
-        * ace/Timeprobe_T.cpp (print_times): Revised the code so that if
-          there is a timestamp inversion due to recording time from
-          different threads, the time difference will be displayed as a
-          negative value instead of a gigantic positive value.  Also
-          compute the time difference correctly when the timeprobe array
-          wraps around.  Thanks to Patrick Rabau <pr2345 at gmail dot com>
-          for this fix.
-
-        * ace/Containers_T.cpp,
-        * ace/Log_Msg.cpp,
-        * ace/CDR_Size.cpp,
-        * ace/CDR_Size.inl,
-        * ace/CDR_Stream.cpp: Fixed a bunch of problems with type punning.
-          Thanks to Thomas Girard <thomas.g.girard at free dot fr> for
-          reporting this.
-
-        * ace/TSS_T.cpp (tryacquire): There was a missing '&' in
-
-          ACE_Thread::getspecific (this->key_, temp);
-
-          Thanks to Thomas Girard <thomas.g.girard at free dot fr> for
-          reporting this.
-
-Mon Aug 21 10:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/UUID.{h,cpp,inl}:
-          Extended UUID to make it possible to assign a string to a UUID
-          to set it a new value.
-
-        * tests/UUIDTest.cpp:
-          Extended this test to test the new functionality above.
-
-Mon Aug 21 10:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/UUID.{h,cpp,inl}:
-          Changed node_release_ to a real bool and use ACE_ERROR instead
-          of ACE_DEBUG for a real error message
-
-        * ace/OS_NS_unistd.cpp:
-          Const improvement
-
-Sat Aug 19 22:03:03 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * bin/tao_orb_tests.lst
-
-          Excluded the DII collocation oneway test from running in the minimum
-          CORBA build.
-
-Fri Aug 18 20:38:35 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * examples/APG/Logging/Trace.h: Further changed use of __VA_ARGS__
-          to remove the comma and the fixed FMT arg from the macros. This
-          may still trigger the same ISO C99 warning, but it doesn't fail.
-
-Fri Aug 18 17:22:08 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_unistd.cpp (pwrite): Corrected the large-file-offset
-          logic to build correctly for Windows. Also moved the explicit
-          SetFilePointerEx() before WriteFile() to the non-ACE_HAS_WINNT4
-          section - for ACE_HAS_WINNT4 the supplied OVERLAPPED structure
-          carries the file offset to write at.
-
-Fri Aug 18 17:08:35 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * bin/tao_orb_tests.lst
-
-          Added DII collocation oneway test. This is the regression test
-          for bugzilla #2545.
-
-Fri Aug 18 15:49:01 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * examples/APG/Logging/Trace.h: Changed the varargs form used in the
-          macros from ##__VA_ARGS__ to ,__VA_ARGS__ in an effort to conform
-          to C99 and clear some compile warnings from gcc4. This effectively
-          prohibits leaving the varargs out completely from the macro
-          invocation but that use-case isn't exercised anyway.
-
-        * bin/ace_tests.lst: Add protocols/tests/RMCast/run_test.pl to run
-          RMCast tests, except ACE_FOR_TAO builds.
-
-Fri Aug 18 12:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Don't run Bug_2510_Regression in a ST build, it uses threading
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          Don't print a message with the dummy realclean
-
-Thu Aug 17 14:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * apps/drwho/Binary_Search.cpp:
-        * apps/drwho/CM_Client.cpp:
-        * apps/drwho/CM_Server.cpp:
-        * apps/drwho/Hash_Table.cpp:
-        * apps/drwho/Options.cpp:
-        * apps/drwho/Options.h:
-        * apps/drwho/PMC_All.cpp:
-        * apps/drwho/PMC_Flo.cpp:
-        * apps/drwho/PMC_Ruser.cpp:
-        * apps/drwho/PMC_Usr.cpp:
-        * apps/drwho/PMS_All.cpp:
-        * apps/drwho/PMS_Flo.cpp:
-        * apps/drwho/PMS_Ruser.cpp:
-        * apps/drwho/PMS_Usr.cpp:
-        * apps/drwho/Protocol_Manger.cpp:
-        * apps/drwho/Protocol_Record.cpp:
-        * apps/drwho/Rwho_DB_Manager.cpp:
-        * apps/drwho/Search_Struct.cpp:
-        * apps/drwho/Single_Lookup.cpp:
-        * apps/Gateway/Gateway/Gateway.cpp:
-        * apps/Gateway/Gateway/Options.cpp:
-        * apps/Gateway/Gateway/Options.h:
-
-          Renamed the enum ID "DEBUG" to "DEBUGGING", was causing problems
-          with MFC builds.
-
-Thu Aug 17 12:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/SString_Test.cpp:
-          Added a check whether npos is zero, if it is print an error,
-          with Intel C++ 9.0 with the Microsoft platform SDK this seems
-          to be zero
-
-Thu Aug 17 08:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_events_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb:
-          Removed -Sc form the taoidlflags, it is deprecated already sometime
-          ago
-
-Wed Aug 16 22:19:47 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Acceptor.h: Doxygen improvements.
-
-Wed Aug 16 17:42:02 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Numeric_Limits.h:
-
-          Explicitly #undef min and max before including <limits> in the
-          Mingw case to address global namespace pollution induced
-          conflicts.  The previous attempt to address this problem where
-          the Windows-specific NOMINMAX preprocessor symbol was defined in
-          this header didn't work since the min and max macros were
-          already defined beforehand.  In order for NOMINMAX to work as
-          expected, it would be have to be defined before any Windows
-          headers are included, or more preferrably on the
-          preprocessor/compiler command line.  Unfortunately, that would
-          probably break some applications.
-
-Wed Aug 16 14:51:58 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/svn/svn-prefs.reg
-        * docs/svn/config
-
-          Updated to correct keywords values, and add use-commit-times
-          as a default option.
-
-Wed Aug 16 10:19:41 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Obstack_T.{cpp,inl}:
-          Moved grow_fast and freeze methods from inl to cpp file,
-          should fix the link problems with the RHAS IPv6 build
-
-Wed Aug 16 09:50:41 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Misc/Misc.mpc:
-        * examples/Misc/test_timestamp.cpp:
-          Simple small test for ACE::timestamp()
-
-Wed Aug 16 08:37:41 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/build_lib.bor:
-        * include/makeinclude/clean.bor:
-        * include/makeinclude/compiler.bor:
-          Removed support for the CBuilderX preview compiler, it has never
-          become more then preview and we don't test with it anymore
-
-        * include/makeinclude/recurse.bor:
-          Removed from the repo, seems not to be used anymore
-
-Tue Aug 15 17:47:11 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Numeric_Limits.h:
-
-          Windows defines min/max macros that interfere with the
-          numeric_limits::min/max() traits.  Prevent those macros from
-          being defined by defining the Windows-specific NOMINMAX symbol
-          before any Windows headers are included.  This is currently
-          only done for Mingw builds since the problem is not exhibited by
-          other Windows builds (e.g. MSVC++, Borland, etc).
-
-Tue Aug 15 16:17:56 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * ace/Hash_MultiMap_Manager_T.h
-          Made some minor changes to the documentation to use @a to refer to
-          argument names.
-
-Tue Aug 15 15:00:00 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * ace/Event_Handler.cpp:
-
-          Updated Event_Handler_var to use an ACE_Errno_Guard to
-          prevent overwriting the errno.
-
-        * bin/tao_orb_tests.lst
-
-          Added new test: TAO/tests/Oneway_Timeouts/run_test.pl
-
-Tue Aug 15 14:22:53 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * ace/Hash_MultiMap_Manager_T.h
-          Address the "unsupported xml/html tag" warnings in doxygen build.
-
-Tue Aug 15 08:36:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * bin/MakeProjectCreator/config/acedefaults.mpb
-
-          Backout all of the recent MFC changes.
-
-        * bin/MakeProjectCreator/config/ace_opt_mfc.mpb:
-
-          DELETED.
-
-Mon Aug 14 23:34:11 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ace/TP_Reactor.cpp
-        * ace/TP_Reactor.h
-
-          Removed all register_handler member functions from these files.
-          This essentially enables the ability to register signal handlers in
-          the TP Reactor by implicitly delegating to the select reactor base
-          class.
-
-          Other register_handler methods (not relating to signal handling)
-          were explicit delegations to the select reactor base class, present
-          only to silence virtual function hiding warnings created by
-          disabling the signal related methods.
-
-Mon Aug 14 16:14:56 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * test/Hash_Multi_Map_Manager_Test.cpp
-          Address the "no matching function for call" errors.
-
-        * ace/Hash_MultiMap_Manager_T.h
-          Address the "unsupported xml/html tag" warnings in doxygen build.
-
-Mon Aug 14 16:00:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * bin/MakeProjectCreator/config/ace_mfc.mpb:
-        * bin/MakeProjectCreator/config/ace_opt_mfc.mpb:
-
-          Backout the "Specific" guards.
-
-Mon Aug 14 15:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * bin/MakeProjectCreator/config/ace_mfc.mpb:
-        * bin/MakeProjectCreator/config/ace_opt_mfc.mpb:
-
-          Specific the macro and don't inherit from mfc for opt.
-
-Mon Aug 14 15:43:12 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Makefile.am: Added Hash_Multi_Map_Manager_Test.
-
-Mon Aug 14 13:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/clean.bor:
-          Use .inl as file extension to clean instead of .i
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          Added empty realclean target
-
-Mon Aug 14 12:52:19 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ACE-INSTALL.html:
-
-          I added "-type gnuace" to the options where the default project
-          type was assumed.  Eventually, MPC will not have a default project
-          type.
-
-        * include/makeinclude/macros.GNU:
-        * include/makeinclude/rules.common.GNU:
-        * include/makeinclude/rules.local.GNU:
-
-          Added a new target to remove only the binaries (executables and
-          shared libraries).
-
-Mon Aug 14 11:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/*.h:
-          Added /**/ to the include of config-all.h and ACE_export.h, this
-          way doxygen doesn't add these files to the include graphs which
-          make them much easier to read
-
-Sun Aug 13 23:30:02 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-
-          Excluded TAO POAManagerFactory and EndpointPolicy tests from
-          running in a minimum CORBA configuration.
-
-Sun Aug 13 22:21:55 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * test/Hash_Multi_Map_Manager_Test.cpp
-          Address the "Implicit conversion of string literal to char * is
-          deprecated" warnings.
-
-Sun Aug 13 15:25:17 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * bin/MakeProjectCreator/config/ciaocidldefaults.mpb:
-
-          Removed '--' from the cidlc command line.
-
-Sun Aug 13 000:02:00 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * ace/Hash_MultiMap_Manager_T.inl
-        * ace/Hash_MultiMap_Manager_T.cpp
-        * ace/Hash_MultiMap_Manager_T.h
-          Change the name of these files into Hash_Multi_Map_Manager.*.
-          Add some comments to explain in brief the purpose of using
-          ACE_Hash_Multi_Map_Manager class and how to use it.
-          Remove the backward compatibility of ACE_Hash_Multi_Map_Manager class
-          and its associated iterator classes.
-          Remove "_Ex" on the names of ACE_Hash_Multi_Map_Manager class and its
-          associated iterator classes.
-
-        * ace/Hash_MultiMap_Manager.h
-          Remove this file since it simply includes the
-          Hash_MultiMap_Manager_T.h file.
-
-        * test/Hash_MultiMap_Manager_Test.cpp
-          Change the name of this file into Hash_Multi_Map_Manager_Test.cpp.
-          Address the "convert const char* to ACE_TCHAR*" errors.
-
-        * ace/ace.mpc
-          Change the name of Hash_MultiMap_Manager project into
-          Hash_Multi_Map_Manager.
-
-        * test/run_test.lst
-        * test/tests.mpc
-          Change the name of Hash_MultiMap_Manager_Test project into
-          Hash_Multi_Map_Manager_Test.
-
-Fri Aug 11 16:46:56 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * ace/Hash_MultiMap_Manager.h
-        * ace/Hash_MultiMap_Manager_T.cpp
-        * ace/Hash_MultiMap_Manager_T.h
-        * ace/Hash_MultiMap_Manager_T.inl
-          Add these files which implement Hash_MultiMap_Manager.
-
-        * test/Hash_MultiMap_Manager_Test.cpp
-          Add this test file for Hash_MultiMap_Manager.
-
-        * ace/ace.mpc
-          Modify this file to include Hash_MultiMap_Manager.
-
-        * test/run_test.lst
-        * test/tests.mpc
-          Modify these files to include Hash_MultiMap_Manager_Test.
-
-Fri Aug 11 16:37:34 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/CDR_File_Test.cpp: Corrected a signed/unsigned compare.
-
-Fri Aug 11 13:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Size.cpp:
-          Add include of OS_Memory.h to get ACE_align_binary
-
-        * ace/Sig_Handler.cpp:
-          Add include of Guard_T.h to get the guards
-
-        * ace/config-vxworks6.3.h:
-          Add some code for the diab compiler but this is not complete
-          support, just some testing results.
-
-Fri Aug 11 07:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/svn/config:
-        * docs/svn/svn-prefs.reg:
-          Added settings for .idl and .pidl
-
-Thu Aug 10 13:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_other_tests.lst:
-          Disabled the performance tests on OpenVMS for the moment, they
-          result in too much error logs
-
-Thu Aug 10 10:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          Updated for -GX
-
-Thu Aug 10 09:38:13 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * bin/tao_other_tests.lst:
-
-          Exclude Bug_2615_Regression from running on 'ACE for TAO' builds.
-
-Thu Aug 10 01:52:34 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Added ACE_HAS_TEMPLATE_TYPEDEFS for Visual
-          Age C++ 6 and higher.
-
-Wed Aug  9 14:15:18 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * bin/MakeProjectCreator/config/csd_threadpool.mpb:
-
-          Added a dependency upon threads.mpb as this project shouldn't be
-          built if thread support is not going to be built into TAO.
-
-Wed Aug  9 13:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * bin/MakeProjectCreator/config/acedefaults.mpb
-
-          Typo, Remove the + character that came with the patch file.
-
-Wed Aug  9 12:17:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * bin/MakeProjectCreator/config/ace_opt_mfc.mpb
-        * bin/MakeProjectCreator/config/acedefaults.mpb
-
-          Chad's new fix for MPC building MFC projects.
-
-Tue Aug  8 14:00:06 UTC 2006  Carlos O'Ryan  <coryan@atdesk.com>
-
-        * Merged in all the changes from the fix_bug_2540 branch, that is,
-          from revision 73857 to revision 73859.
-
-        Thu Aug  3 21:49:27 UTC 2006  Carlos O'Ryan  <coryan@atdesk.com>
-
-        * ace/TP_Reactor.cpp:
-        * ace/Select_Reactor_T.cpp:
-          Avoid the problems described in bug 2540 by detecting the
-          infinite loop and recomputing the number of active handlers.
-          Thanks to Jody Hagins for correcting my original "fix."
-
-Tue Aug  8 14:05:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * bin/MakeProjectCreator/config/ace_mfc.mpb
-        * bin/MakeProjectCreator/config/acedefaults.mpb
-
-          Reverted Chad's fix for MPC building MFC projects.
-          It seems that this causes non MFC builds to build as MFC
-          breaking the scoreboard.
-
-Tue Aug  8 09:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE.mwc:
-          Removed several directories which aren't existing anymore
-
-Tue Aug  8 09:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Removed some parts of the VxWorks building instructions because
-          it was really wrong what was said
-
-Tue Aug  8 09:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * ace/OS_Memory.h
-        * ace/config-win32-msvc.h
-        * bin/MakeProjectCreator/config/ace_mfc.mpb
-        * bin/MakeProjectCreator/config/acedefaults.mpb
-
-          Chad's fix for MPC building MFC projects. Correction for
-          Thu Apr 27 21:04:08 UTC 2006  Steve Huston  <shuston@riverace.com>
-          throw CMemoryException on out-of-memory condition. These
-          exceptions must be caught by pointer and thrown via calling
-          AfxThrowMemoryException ().
-
-Tue Aug  8 08:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Select_Reactor_Base.cpp:
-        * ace/Select_Reactor_T.cpp:
-          Const improvements, use bool when possible
-
-Tue Aug  8 07:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_rel_manpages:
-        * bin/make_release:
-          Did a little bit of cleanup removing old things
-
-Tue Aug  8 07:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Select_Reactor_T.cpp (dump):
-          Removed usage of not needed operator++ on the handle set
-
-Mon Aug  7 08:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Handle_Set.{h,cpp}:
-          Removed operator++, it is deprecated and nothing more then a noop
-
-Fri Aug  4 07:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Asynch_IO.h:
-        * ace/Event_Handler.h:
-        * ace/Framework_Component_T.h:
-        * ace/Hash_Map_Manager_T.h:
-        * ace/IO_SAP.h:
-        * ace/Local_Tokens.h:
-        * ace/LSOCK_Connector.h:
-        * ace/Map_Manager.h:
-        * ace/Map_T.h:
-        * ace/WFM_Reactor.h:
-          Doxygen improvements
-
-Thu Aug  3 10:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Connector.h:
-          Improved documentation
-
-Wed Aug  2 22:54:24 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * THANKS: Added Eric Danielou to the hall of fame.
-
-Wed Aug  2 21:27:59 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/PerlACE/Run_Test.pm:
-
-          Added two new packaged-scoped variables, $PerlACE::ACE_ROOT and
-          $PerlACE::TAO_ROOT.  $PerlACE::TAO_ROOT is set to the TAO_ROOT
-          environment variable, if one exists.  If not it is set to
-          $ACE_ROOT/TAO.  $PerlACE::ACE_ROOT is the same as the ACE_ROOT
-          envrionment variable so it's just there for convenience and for
-          symmetry.
-
-Wed Aug  2 20:19:04 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-          Added new test (TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression).
-
-Wed Aug  2 18:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Connector.cpp:
-          Const improvements
-
-        * ace/Caching_Utility_T.h:
-        * ace/config-lite.h:
-        * ace/Event_Handler.h:
-        * ace/Framework_Component.h:
-        * ace/Lock.h:
-        * ace/Lock_Adapter_T.h:
-        * ace/Null_Mutex.h:
-        * ace/Object_Manager.h:
-        * ace/Object_Manager_Base.h:
-        * ace/Proactor.cpp:
-        * ace/Process_Manager.h:
-        * ace/Semaphore.h:
-        * ace/Thread_Exit.h:
-          Doxygen improvements
-
-Wed Aug  2 15:50:48 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * bin/tao_other_tests.lst:
-
-          Schedule bugzilla #2615 regression test.
-
-Wed Aug  2 14:55:45 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ACE-INSTALL.html:
-
-          Updated the location of the MPC documentation.  It was moved from
-          the MPC root directory to a docs directory.
-
-        * bin/ChangeLogEditor/CVSFileLocator.pm:
-        * bin/ChangeLogEditor/ChangeLogEdit.pm:
-        * bin/ChangeLogEditor/ChangeLogEntry.pm:
-        * bin/ChangeLogEditor/FileLocator.pm:
-        * bin/ChangeLogEditor/SVNFileLocator.pm:
-        * bin/cle.pl:
-
-          Added better support for subversion and it now reports errors from
-          cvs/svn.
-
-        * bin/MakeProjectCreator/README:
-
-          Updated to provide information on anonymously checking out MPC
-          using Subversion.
-
-        * bin/make_release:
-
-          I added "-type gnuace" to the options where the default project
-          type was assumed.  Eventually, MPC will not have a default project
-          type.
-
-Wed Aug  2 13:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/ACE-development-process.html:
-          Document the fact that people should test on at least two
-          platforms and should be available for some days after they
-          commit a change.
-
-Wed Aug  2 11:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Also put the download page from deuce.doc under svn control
-          so that we can update it for the svn conversion
-
-Wed Aug  2 11:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/bczar/bczar.html:
-        * docs/bczar/privileges.html:
-          Added documents that where on deuce.doc, the documentation
-          for the bczar how to create a release should really be handled
-          with care, so put them under svn control
-
-Tue Aug  1 20:23:50 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * ace/config-macosx-tiger.h:
-          Added preliminary support for Mac OS X 10.4 on Intel CPU's.
-
-Tue Aug  1 20:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-vxworks6.3.h:
-          Enabled some features in ACE because vxworks 6.3 delivers more system
-          api's
-
-Mon Jul 31 19:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_stropts.inl (ioctl):
-          Check for ACE_HAS_IOCTL_INT_3_PARAM to make it easier to handle
-          the different VxWorks versions
-
-        * config-vxworks5.x.h:
-        * config-vxworks6.2.h:
-        * config-vxworks6.3.h:
-          Added ACE_HAS_IOCTL_INT_3_PARAM
-
-Mon Jul 31 18:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * Containers_T.{h,cpp}:
-        * Hash_Map_Manager_T.{h,cpp}:
-        * Map_Manager.{h,inl}:
-        * Node.{h,cpp}:
-          Removed check for !ACE_HAS_BROKEN_NOOP_DTORS, this define is
-          not in any config file
-
-        * config-unixware-7.1.0.udk.h:
-          Removed commented out define
-
-        * Token_Collection.{h,cpp}:
-        * Token_Manager.{h,inl}:
-          Changed debug flag to be a bool
-
-        * SOCK_Dgram_Bcast.h
-        * TP_Reactor.h
-        * Signal.h
-        * Thread.h
-        * Thread_Adapter.h
-          Documentation updates
-
-Mon Jul 31 14:57:08 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * apps/Makefile.am: Removed hard-coded inclusion of gperf in the
-          SUBDIRS list; it's an optional piece; see also
-          Tue Jun 20 20:19:37 UTC 2006  Steve Huston  <shuston@riverace.com>
-          Thanks to Robert Schwebel <robert at schwebel dot de> for this fix.
-
-Mon Jul 31 14:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/*.doxygen:
-          Cleanup of these files
-
-Sat Jul 29 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-icc-common.h:
-          Added fix for Intel C++ 9.1
-
-Fri Jul 28 15:32:27 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ace/SSL/Makefile.am
-        * ace/QoS/Makefile.am
-        * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
-        * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
-        * Kokyu/Makefile.am
-        * apps/JAWS/clients/Caching/Makefile.am
-        * ACEXML/apps/svcconf/Makefile.am
-        * ACEXML/common/Makefile.am
-        * ACEXML/parser/parser/Makefile.am
-        * ACEXML/examples/SAXPrint/Makefile.am
-        * websvcs/lib/Makefile.am
-        * examples/ASX/Event_Server/Event_Server/Makefile.am
-        * examples/ASX/UPIPE_Event_Server/Makefile.am
-        * examples/Service_Configurator/IPC-tests/server/Makefile.am
-
-        Updated to comply with the .i->.inl changes from:
-        Thu Jul 27 20:30:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-Fri Jul 28 12:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * Kokyu/DSRT_Dispatch_Item_T.inl:
-        * ACEXML/parser/parser/Parser.inl:
-          Fixed file tag
-
-Thu Jul 27 20:30:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ace/SSL/SSL_SOCK_Connector.h
-        * ace/SSL/SSL_SOCK_Acceptor.inl
-        * ace/SSL/SSL_SOCK_Acceptor.cpp
-        * ace/SSL/SSL_SOCK_Connector.i
-        * ace/SSL/SSL_SOCK_Stream.h
-        * ace/SSL/SSL_SOCK_Stream.i
-        * ace/SSL/SSL_SOCK_Acceptor.h
-        * ace/SSL/SSL_SOCK_Acceptor.i
-        * ace/SSL/SSL_SOCK.cpp
-        * ace/SSL/SSL_SOCK.inl
-        * ace/SSL/SSL_SOCK.h
-        * ace/SSL/SSL_SOCK.i
-        * ace/SSL/SSL_SOCK_Connector.cpp
-        * ace/SSL/SSL_SOCK_Connector.inl
-        * ace/SSL/SSL_SOCK_Stream.cpp
-        * ace/SSL/SSL_SOCK_Stream.inl
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.inl
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
-        * ace/QoS/QoS_Session_Impl.cpp
-        * ace/QoS/QoS_Session_Impl.inl
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.h
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.i
-        * ace/QoS/QoS_Session_Impl.h
-        * ace/QoS/QoS_Session_Impl.i
-        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
-        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.inl
-        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
-        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i
-        * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.inl
-        * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
-        * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.i
-        * Kokyu/Kokyu_dsrt.cpp
-        * Kokyu/Kokyu_dsrt.inl
-        * Kokyu/Kokyu.cpp
-        * Kokyu/Kokyu.inl
-        * Kokyu/Kokyu_defs.h
-        * Kokyu/Kokyu_defs.i
-        * Kokyu/Dispatcher_Impl.h
-        * Kokyu/Dispatcher_Impl.i
-        * Kokyu/Default_Dispatcher_Impl.h
-        * Kokyu/Default_Dispatcher_Impl.i
-        * Kokyu/Dispatch_Deferrer.h
-        * Kokyu/Dispatch_Deferrer.i
-        * Kokyu/DSRT_Dispatcher_Impl_T.h
-        * Kokyu/DSRT_Dispatcher_Impl_T.i
-        * Kokyu/DSRT_Dispatch_Item_T.h
-        * Kokyu/DSRT_Dispatch_Item_T.i
-        * Kokyu/Kokyu_dsrt.h
-        * Kokyu/Kokyu_defs.cpp
-        * Kokyu/Kokyu_defs.inl
-        * Kokyu/Kokyu_dsrt.i
-        * Kokyu/Kokyu.h
-        * Kokyu/Dispatcher_Impl.cpp
-        * Kokyu/Dispatcher_Impl.inl
-        * Kokyu/Kokyu.i
-        * Kokyu/Default_Dispatcher_Impl.cpp
-        * Kokyu/Default_Dispatcher_Impl.inl
-        * Kokyu/Dispatch_Deferrer.cpp
-        * Kokyu/Dispatch_Deferrer.inl
-        * Kokyu/DSRT_Dispatcher_Impl_T.cpp
-        * Kokyu/DSRT_Dispatcher_Impl_T.inl
-        * Kokyu/DSRT_Dispatch_Item_T.cpp
-        * Kokyu/DSRT_Dispatch_Item_T.inl
-        * apps/JAWS/clients/Caching/Local_Locator.inl
-        * apps/JAWS/clients/Caching/Local_Locator.cpp
-        * apps/JAWS/clients/Caching/URL_Properties.inl
-        * apps/JAWS/clients/Caching/URL_Properties.cpp
-        * apps/JAWS/clients/Caching/Local_Locator.h
-        * apps/JAWS/clients/Caching/Local_Locator.i
-        * apps/JAWS/clients/Caching/URL_Properties.h
-        * apps/JAWS/clients/Caching/URL_Properties.i
-        * apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
-        * apps/JAWS/clients/Caching/Locator_Request_Reply.inl
-        * apps/JAWS/clients/Caching/Locator_Request_Reply.h
-        * apps/JAWS/clients/Caching/Locator_Request_Reply.i
-        * apps/JAWS2/HTTPU/http_response.h
-        * apps/JAWS2/HTTPU/http_response.i
-        * apps/JAWS2/HTTPU/http_base.inl
-        * apps/JAWS2/HTTPU/http_base.cpp
-        * apps/JAWS2/HTTPU/http_headers.h
-        * apps/JAWS2/HTTPU/http_headers.i
-        * apps/JAWS2/HTTPU/http_status.inl
-        * apps/JAWS2/HTTPU/http_status.cpp
-        * apps/JAWS2/HTTPU/parse_http_request.h
-        * apps/JAWS2/HTTPU/http_request.inl
-        * apps/JAWS2/HTTPU/parse_http_request.i
-        * apps/JAWS2/HTTPU/http_request.cpp
-        * apps/JAWS2/HTTPU/parse_http_response.h
-        * apps/JAWS2/HTTPU/http_response.cpp
-        * apps/JAWS2/HTTPU/parse_http_response.i
-        * apps/JAWS2/HTTPU/http_response.inl
-        * apps/JAWS2/HTTPU/http_headers.inl
-        * apps/JAWS2/HTTPU/http_headers.cpp
-        * apps/JAWS2/HTTPU/http_base.h
-        * apps/JAWS2/HTTPU/http_base.i
-        * apps/JAWS2/HTTPU/parse_http_request.inl
-        * apps/JAWS2/HTTPU/parse_http_request.cpp
-        * apps/JAWS2/HTTPU/http_status.h
-        * apps/JAWS2/HTTPU/parse_http_response.cpp
-        * apps/JAWS2/HTTPU/parse_http_response.inl
-        * apps/JAWS2/HTTPU/http_status.i
-        * apps/JAWS2/HTTPU/http_request.h
-        * apps/JAWS2/HTTPU/http_request.i
-        * ACEXML/apps/svcconf/Svcconf_Handler.cpp
-        * ACEXML/apps/svcconf/Svcconf_Handler.inl
-        * ACEXML/apps/svcconf/Svcconf_Handler.h
-        * ACEXML/apps/svcconf/Svcconf_Handler.i
-        * ACEXML/common/AttributesImpl.cpp
-        * ACEXML/common/LocatorImpl.cpp
-        * ACEXML/common/Env.cpp
-        * ACEXML/common/Exception.cpp
-        * ACEXML/common/SAXExceptions.h
-        * ACEXML/common/SAXExceptions.i
-        * ACEXML/common/AttributesImpl.h
-        * ACEXML/common/AttributesImpl.i
-        * ACEXML/common/XMLFilterImpl.cpp
-        * ACEXML/common/Env.h
-        * ACEXML/common/SAXExceptions.cpp
-        * ACEXML/common/Env.i
-        * ACEXML/common/Exception.h
-        * ACEXML/common/Exception.i
-        * ACEXML/common/AttributesImpl.inl
-        * ACEXML/common/LocatorImpl.inl
-        * ACEXML/common/Env.inl
-        * ACEXML/common/XMLFilterImpl.h
-        * ACEXML/common/XMLFilterImpl.i
-        * ACEXML/common/Exception.inl
-        * ACEXML/common/XMLFilterImpl.inl
-        * ACEXML/common/LocatorImpl.h
-        * ACEXML/common/LocatorImpl.i
-        * ACEXML/common/SAXExceptions.inl
-        * ACEXML/parser/debug_validator/Element_Tree.i
-        * ACEXML/parser/debug_validator/Element_Tree.cpp
-        * ACEXML/parser/debug_validator/Element_Tree.inl
-        * ACEXML/parser/debug_validator/Element_Tree.h
-        * ACEXML/parser/parser/Parser.h
-        * ACEXML/parser/parser/Parser.i
-        * ACEXML/parser/parser/Entity_Manager.cpp
-        * ACEXML/parser/parser/Entity_Manager.inl
-        * ACEXML/parser/parser/Entity_Manager.h
-        * ACEXML/parser/parser/Entity_Manager.i
-        * ACEXML/parser/parser/Parser.cpp
-        * ACEXML/parser/parser/Parser.inl
-        * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp
-        * ACEXML/examples/SAXPrint/SAXPrint_Handler.inl
-        * ACEXML/examples/SAXPrint/SAXPrint_Handler.h
-        * ACEXML/examples/SAXPrint/SAXPrint_Handler.i
-        * websvcs/lib/URL_Addr.h
-        * websvcs/lib/URL_Addr.i
-        * websvcs/lib/URL_Addr.cpp
-        * websvcs/lib/URL_Addr.inl
-        * examples/ASX/Event_Server/Event_Server/Options.h
-        * examples/ASX/Event_Server/Event_Server/Options.i
-        * examples/ASX/Event_Server/Event_Server/Options.inl
-        * examples/ASX/UPIPE_Event_Server/Options.h
-        * examples/ASX/UPIPE_Event_Server/Options.i
-        * examples/ASX/UPIPE_Event_Server/Options.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
-        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.cpp
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.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_Broadcast.h
-        * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.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_R_Stream.h
-        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp
-        * 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_L_FIFO.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
-        * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
-        * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
-        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
-
-          Moved the .i file to .inl (with history), changed the includes in the
-          .cpp and .h files to match, removed the .i file.
-
-Thu Jul 27 18:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Some more updates to refer to the subversion archive
-
-Thu Jul 27 13:57:31 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/svn/config
-
-          Fixed syntax errors.  thanks to Adam Mitz for reporting them.
-
-Thu Jul 27 10:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Committing some small changes I had pending to see how svn behaves now
-        with updates and status info on the build systems.
-
-        * ace/Recursive_Thread_Mutex.{h,cpp}:
-          Changed removed_ to a bool
-
-        * ace/Thread_Mutex.{h,cpp,inl}:
-          Changed removed_ to a bool and removed ACE_USES_OBSOLETE_GUARD_CLASSES
-          support.
-
-Thu Jul 27 07:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/tao.doxygen:
-        * etc/tao_portableserver.doxygen:
-          Set ignore prefix
-
-        * Kokyu/Dispatcher_Task.i
-        * Kokyu/Dispatcher_Task.inl
-          Renamed .i to .inl so that we can have a look how subversion stores
-          this in the history
-
-        * Kokyu/Dispatcher_Task.cpp
-        * Kokyu/Dispatcher_Task.h
-        * Kokyu/Makefile.am
-          Updated for the change above.
-
-Wed Jul 26 07:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/sets-manager.py:
-          Fixed typo
-
-Wed Jul 26 07:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-        * html/Stats/index.shtml:
-        * docs/ACE-bug-process.html:
-          Updated documentation to point to the new svn repository
-
-Tue Jul 25 21:51:07 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/PythonACE/fuzz/max_project_len.py
-        * bin/PythonACE/fuzz/inline.py
-
-          Fixed errors in these checks.
-
-Tue Jul 25 20:52:51 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/PythonACE/fuzz/cpp_inline.py
-
-          Fixed this check, it was incorrectly matching ACE_INLINES inside
-          defines and comments.
-
-Tue Jul 25 20:16:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/svn/svn-prefs.reg
-        * docs/svn/config
-
-          Updated to add global-ignores to mimic .cvsignore functionality.
-
-Tue Jul 25 19:40:54 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/PythonACE/__init__.py
-
-          This enables PythonACE to be loaded as a module.
-
-        * bin/PythonACE/fuzz/check_includes.py
-        * bin/PythonACE/fuzz/no_conflict_markers.py
-
-          Fixed these checks, they were incorrectly flagging errors.
-
-        * bin/fuzz.py
-
-          Command line fuzz client that uses the PythonACE fuzz module.
-
-        * bin/sets-manager.py
-
-          Corrected this file to point at DOC/Middleware instead of ACE/Middleware.
-
-Mon Jul 24 23:58:33 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/svn/svn-prefs.reg
-        * docs/svn/config
-
-          Updated these files to add svn:keywords to most text types.
-
-Mon Jul 24 23:53:53 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/create_ace_build.pl
-
-          Fix provided by Steve Huston to prevent this script from building
-          links from .svn directories.
-
-Mon Jul 24 19:17:37 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/fuzz.pl
-
-          Disabled the ID string check until the script can be fixed to ignore
-          .svn directories.
-
-Mon Jul 24 15:45:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * Subversion conversion completed at revision 73730
-
-Sun Jul 23 15:44:43 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * Repository frozen for repository conversion
-
-Sun Jul 23 11:17:31 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/make_release:
-          Don't exclude the other mwc files for vc71/vc8, this will create then
-          some more workspace files which just contain a subset of the projects
-
-Sun Jul 23 09:25:12 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * NEWS:
-          Added a note about TTY_IO API change.
-
-Sat Jul 22 19:12:10 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/svn/config
-        * docs/svn/svn-prefs.reg
-
-          These are client side configuration files for Subversion. Currently,
-          the automate setting svn:eol-style and svn:executable properties on
-          newly added files.
-
-Sat Jul 22 18:28:33 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/sets-manager.py
-
-          First cut of a branching script for subverion.  Pass --help
-          to get documentation.
-
-Fri Jul 21 13:28:31 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          Updated because of -oS addition to tao_idl
-
-Fri Jul 21 13:17:31 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.cpp:
-          Const improvements and initialise pointer with 0
-
-Thu Jul 20 21:44:31 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/Service_Config_Test.cpp:
-
-          In testLimits (), surrounded string literals with ACE_TEXT to
-          fix a build error on wchar builds.
-
-Thu Jul 20 16:42:04 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Basic_Types.h:
-
-          Removed ACE_NTOHLL function.  It was experimental, untested and
-          not ready for the ACE sources just yet.
-
-          Removed "ace/os_include/netinet/os_in.h" include directive.  Now
-          that ACE_NTOHLL has been removed it is no longer necessary.
-
-        * ace/Numeric_Limits.h:
-
-          Commented out "{unsigned} long long" specializations in the
-          ACE_LACKS_NUMERIC_LIMITS case.  They're currently not used, and
-          we need
-
-Thu Jul 20 15:19:30 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Basic_Types.h: Added
-
-          # include "ace/os_include/netinet/os_in.h" // Get ntohl()
-
-          and added the inline keyword to ACE_NTOHLL() to fix the problems
-          introduced with
-
-          Wed Jul 19 22:46:51 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-Thu Jul 20 15:01:32 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Configuration.cpp: Made
-          ACE_Configuration_ExtId::operator==() and
-          ACE_Configuration_ExtId::operator!=() case insensitive.  Thanks
-          to Domingos Monteiro <d dot monteiro at netia dot net> for this
-          contribution.
-
-Thu Jul 20 09:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/tao_no_iiop.mpb:
-          New feature to disable iiop in TAO
-
-        * bin/MakeProjectCreator/config/global.features:
-          Set tao_no_iiop to 0 by default
-
-Thu Jul 20 09:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.h:
-          Doxygen improvements
-
-Thu Jul 20 08:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Mutex.{h,cpp,inl}:
-          Made the removed_ member a bool instead of an int
-
-Thu Jul 20 08:37:17 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          Fixed compile error on VxWorks. Thanks to Johnny for pointing
-          out the problem.
-
-Wed Jul 19 23:39:05 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/PythonACE/fuzz/__init__.py
-        * bin/PythonACE/fuzz/_generic_handler.py
-        * bin/PythonACE/fuzz/_mailer.py
-        * bin/PythonACE/fuzz/_singleton.py
-        * bin/PythonACE/fuzz/_warning_handler.py
-        * bin/PythonACE/fuzz/streams_include.py
-
-          Changes necessary to support mailing (non-fatal) Fuzz errors to
-          the user that attempts a commit.  streams_include is an example
-          of a fuzz check that sends warnings instead of stopping commits.
-
-Wed Jul 19 22:46:51 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Basic_Types.h (ACE_INT64, ACE_UINT64):
-
-          Silence g++ "-pedantic" warnings regarding use of "long long"
-          type by preceding the typedef with the g++ __extension__
-          keyword.
-
-Wed Jul 19 21:15:51 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * NEWS:
-
-          Updated the file with a note announcing the interface change
-          from "Wed Jul 19 20:11:52 UTC 2006".
-
-Wed Jul 19 20:11:52 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/ACE.h:
-        * ace/ACE.cpp:
-
-          Changing ACE::debug () to use boolean instead of char.
-
-        * ace/Acceptor.cpp:
-        * ace/DLL_Manager.cpp:
-        * ace/Dynamic_Service_Dependency.cpp:
-        * ace/SOCK_Dgram_Bcast.cpp:
-        * ace/Service_Gestalt.cpp:
-        * ace/Service_Object.cpp:
-        * ace/Service_Repository.cpp:
-        * ace/Service_Types.cpp:
-
-          Updating places where ACE::debug() return value is interpreted
-          as a integral type.
-
-        * tests/Service_Config_Test.cpp:
-
-          Fixing the test to correctly account for XML-based service
-          configurations.
-
-Wed Jul 19 15:53:09 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/PythonACE/fuzz/__init__.py
-        * bin/PythonACE/fuzz/_fuzz.py
-        * bin/PythonACE/fuzz/_generic_handler.py
-        * bin/PythonACE/fuzz/_path.py
-        * bin/PythonACE/fuzz/_types.py
-        * bin/PythonACE/fuzz/check_includes.py
-        * bin/PythonACE/fuzz/cpp_inline.py
-        * bin/PythonACE/fuzz/inline.py
-        * bin/PythonACE/fuzz/math_include.py
-        * bin/PythonACE/fuzz/max_filename.py
-        * bin/PythonACE/fuzz/max_project_len.py
-        * bin/PythonACE/fuzz/newline.py
-        * bin/PythonACE/fuzz/no_conflict_markers.py
-        * bin/PythonACE/fuzz/noncvs.py
-        * bin/PythonACE/fuzz/ptr_arith_t.py
-        * bin/PythonACE/fuzz/refcountservantbase.py
-        * bin/PythonACE/fuzz/verify_changelog.py
-
-          This is a python module designed to eventually replace the
-          bin/fuzz.pl script.  Each .py file in the fuzz directory that
-          does not have a _ at the beginning of its filename contains a
-          single check.  New fuzz checks can be added to the system simply
-          by creating a new file in the fuzz directory.  Care should be
-          taken to select a filename that does not conflict with an
-          existing python module.
-
-          ptr_arith_t.py and inline.py are good examples that use the
-          generic handler to implement their checks, max_project_len is a
-          good example of a check that does not use the generic handler.
-
-Wed Jul 19 15:07:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/DLL_Manager.cpp:
-
-          Fixing a build problem on HP and Windows, as a consequence of my
-          earlier change: "Tue Jul 18 19:17:54 UTC 2006". Moral: use
-          ACE_TEXT around literal expressions only.
-
-Wed Jul 19 13:55:39 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * examples/IPC_SAP/DEV_SAP/reader/reader.cpp:
-        * examples/IPC_SAP/DEV_SAP/writer/writer.cpp:
-          Updated to reflect changes below.
-
-Wed Jul 19 13:39:13 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.h:
-          Changed type of rtsenb from 'int' to 'unsigned char'.
-          Updated documentation to note that 'parityenb' member is
-          now deprecated.
-
-        * ace/TTY_IO.cpp:
-          Changed constructor of Serial_Params class to assign sensible
-          values to class members.
-
-Wed Jul 19 10:47:31 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Proactor_Timer_Test.cpp: Corrected compile warning re static.
-
-Wed Jul 19 08:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb:
-          Use exceptions as base project
-
-Wed Jul 19 7:14:10 UTC 2006  Ossama Othman  <ossama_othman@symantec.com>
-
-        * ace/String_Base.h (size_type):
-
-          Explicitly bring the ACE_String_Base_Const::size_type typedef
-          into the ACE_String_Base<> scope through a "using" declaration.
-          IBM Visual Age 6 and Sun Studio 10 have difficulty resolving the
-          name otherwise.
-
-        * ace/SString.cpp:
-
-          Replaced std::numeric_limits<>::max() call that was
-          inadvertently introduced with its ACE_Numeric_Limits<>
-          counterpart.  The former is not available on VxWorks.
-
-Tue Jul 18 22:52:38 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Message_Queue_Test_Ex.cpp: Rearranged the pieces left out of
-          single-threaded builds; should correct single-threaded builds.
-
-Tue Jul 18 20:50:49 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * Happy Birthday to me!!
-
-Tue Jul 18 19:17:54 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          This change is in response to bug#2602, which was reported by
-          Lothar Werzinger <lothar at tradescape dot biz>. It fixes a
-          problem with trying to use XML as the service configuration file
-          format.  The change also includes additional comments and
-          in-line documentation on the new ability to use local service
-          repositories.
-
-        * ace/DLL_Manager.cpp:
-
-          Updated the debugging output of DLL_Handle::open() to be able to
-          see _why_ a DLL open failed.  For example, the errno message is
-          'not found' in a case where one tries to open library A, which
-          in turn depends on library B, but B is missing.  This change
-          allows one to see the underlying cause for the error
-          (via DLL_Handle::error(), if ACE_DEBUG=2, or greater is
-          present).
-
-        * ace/Parse_Node.h:
-        * ace/Parse_Node.cpp:
-
-          Moving the ACE_Service_Type_Factory here, from
-          Service_Config.{h,cpp} This class is only needed when
-          ACE_USES_CLASSIC_SVC_CONF is 1, i.e. when ACE is using the
-          non-XML configuration file format.  Therefore, moving it to
-          Parse_Node.{h,cpp} causes it to compile only if needed.
-
-        * ace/Service_Config.h:
-
-          Removed the static get_xml_svc_conf() method, as it already has
-          the required implementation in the base class.
-
-        * ace/Service_Gestalt.h:
-        * ace/Service_Gestalt.cpp:
-
-          Moved the ACE_Service_Type_Factory class to Parse_Node.{h,cpp}.
-          Updated the documentation with a more clear description of the
-          class responsibilities. Corrected minor omissions.
-
-Tue Jul 18 18:12:17 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ACE-INSTALL.html: Updated the description of how to build
-          ACE+TAO using MPC.  Thanks to Steve Totten for helping with
-          this.
-
-Tue Jul 18 19:04:42 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Numeric_Limits.h:
-
-          Corrected short integer limit constants, i.e. "s/SHORT/SHRT/g".
-
-          Try other known "long long" integer constants if
-          "{U}LLONG_{MIN,MAX}" are not available.  Issue a preprocessor
-          error if all known cases have been exhausted.
-
-Tue Jul 18 16:55:31 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Makefile.am (libACE_la_SOURCES, nobase_include_HEADERS):
-
-          Added new Sig_{Adapter,Handler}.* source and header files.
-
-Mon Jul 17 23:18:52 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/README: Documented the ACE_TIMEPROBE_ASSERTS_FIXED_SIZE macro.
-
-Mon Jul 17 23:16:55 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Timeprobe_T.cpp (timeprobe): Added a check to guard against
-          segfaults by wrapping the index around when it reaches the end
-          of the buffer.  Thanks to Patrick Rabau <pr2345 at gmail dot
-          com> for this fix.
-
-Tue Jul 18 13:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added Bug_2595_Regression
-
-Tue Jul 18 12:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          Fixed the rules to decide whether a .inl file should be added
-          or not. Thanks to Chad Elliot for noticing this incorrect
-          rule.
-
-Tue Jul 18 09:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/ProcessVX_Win32.pm:
-          Increased delay factor from 2 to 3, downloading executables
-          seems to take longer now
-
-Tue Jul 18 09:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/Process_Unix.pm:
-          Removed chorus support
-
-Mon Jul 17 22:52:19 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Proactor.cpp (schedule_timer): Record the ACE_Proactor instance
-          that the timer is scheduled on in the ACE_Handler; makes this
-          behavior analogous to that in ACE_Reactor::schedule_timer().
-
-        * tests/Proactor_Timer_Test.cpp: Add a test for repeating timers and
-          canceling a repeating timer when it's likely that an expiration for
-          the timer is already queued when it's canceled.
-
-Mon Jul 17 16:06:57 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Unload_libACE.cpp: Alter the libACE suffix for HP-UX on
-          PA-RISC only. Also see:
-          Fri Jul 14 19:44:03 UTC 2006  john_c  <johnc@ociweb.com>
-
-Mon Jul 17 22:11:42 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * examples/Threads/process_semaphore.cpp:
-
-          Added #include of ace/OS_NS_stdlib.h to get ACE_OS::atoi().
-
-Mon Jul 19 11:21:56 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/String_Base.cpp:
-        * ace/String_Base.inl:
-
-          Explicitly qualify size_type parameters with "typename" to force
-          some compilers (Sun Studio 10) to recognize it as a type.
-
-Mon Jul 17 17:49:41 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * include/makeinclude/platform_hpux_aCC.GNU (SOFLAGS):
-
-          Corrected shared library path for Itanium builds.
-
-        * protocols/ace/HTBP/HTBP_ID_Requestor.cpp (get_HTID):
-
-          Use new ACE_CString::size_type type to hold string
-          position/index value, instead of "int".  Addresses "comparison
-          between signed and unsigned" warnings.
-
-Mon Jul 17 16:04:07 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * NEWS:
-
-          Added information about the use of atomic operations on SPARC
-          Solaris.
-
-Mon Jul 17 15:09:21 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Refcounted_Auto_Ptr.{h inl} (null): Changed the return type
-          of the null() method from int to bool in order to more accurately
-          reflect the true/false nature of the returned value.
-
-        * NEWS: Noted the above change.
-
-Mon Jul 17 15:05:05 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: Added
-          include "ace/Log_Msg.h" in the "non-supported platform" case.
-          Fixes compile error on Windows.
-
-Mon Jul 17 13:03:09 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ace/ace_for_tao.mpc:
-
-          Sig_Handler.cpp and Sig_Adapter.cpp are needed to link gperf.
-
-Mon Jul 17 12:49:34 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * netsvcs/servers/main.cpp:
-
-          Added a missing #include for ace/Sig_Adapter.h.
-
-Mon Jul 17 11:57:26 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ace/qt_reactor.mpb:
-
-          Removed this file.  It was no longer referenced by ace and it's
-          functionality was replaced by ace_qtreactor.mpc.
-
-Mon Jul 17 10:41:14 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Message_Queue_Test_Ex.cpp: Removed the VxWorks-specific
-          section from MQ_Ex_N_Tester::receiver() - it was apparantly
-          pulled in from another test example and didn't need to be here.
-          Should resolve compile errors on VxWorks.
-
-Mon Jul 18 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-vxworks6.3.h:
-        * include/makeinclude/platform_vxworks6.3.GNU:
-          New files for VxWorks 6.3
-
-        * ace/os_include/sys/os_types.h:
-        * ace/os_include/os_stdio.h:
-        * ace/OS_NS_unistd.inl:
-        * ace/OS_NS_arpa_inet.cpp:
-          Updated for VxWorks 6.3
-
-Sun Jul 17 06:49:21 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * apps/soreduce/Library.cpp (set_path):
-        * apps/soreduce/Obj_Module.cpp (add_source):
-        * examples/Misc/test_sstring.cpp:
-        * examples/Web_Crawler/Command_Processor.cpp:
-        * examples/Web_Crawler/URL_Visitor.cpp:
-
-          Use new ACE_CString::size_type type to hold string
-          position/index value, instead of "int".  Addresses "comparison
-          between signed and unsigned" warnings.
-
-        * examples/APG/Signals/SigAction.cpp:
-        * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp:
-        * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp:
-
-          Include "ace/OS_NS_stdlib.h" to pull in ACE_OS::exit()
-          prototype.
-
-        * examples/APG/Signals/SigGuard.cpp:
-        * examples/APG/Signals/SigHandler.cpp:
-        * examples/APG/Signals/SigHandlers.cpp:
-        * examples/APG/ThreadManagement/Signals.cpp:
-        * examples/APG/ThreadManagement/Signals2.cpp:
-        * examples/ASX/CCM_App/SC_Server.cpp:
-        * examples/ASX/Event_Server/Event_Server/event_server.cpp:
-        * examples/ASX/UPIPE_Event_Server/event_server.cpp:
-        * examples/Connection/blocking/SPIPE-connector.h:
-        * examples/Connection/misc/Connection_Handler.cpp:
-        * examples/Connection/non_blocking/CPP-acceptor.h:
-        * examples/Connection/non_blocking/CPP-connector.h:
-        * examples/Service_Configurator/IPC-tests/server/server_test.cpp:
-        * netsvcs/lib/TS_Clerk_Handler.cpp:
-
-          Include "ace/Sig_Handler.h" or "ace/Sig_Adapter.h" to pull in
-          ACE_Sig_Handler or ACE_Sig_Adapter class declaration,
-          respectively.  Necessitated by "ace/Signal.h" refactoring.
-
-Sun Jul 16 23:14:53 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * ace/String_Base_Const.cpp:
-
-          Took out an extra sem-colon. It seems to make the
-          FC4_Versioned_Namespace build grumpy.
-
-Sat Jul 15 16:14:05 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * NEWS:
-
-          Added entry on HPUX library extension changes.
-
-Fri Jul 14 22:10:02 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Sig_Handler.cpp:
-
-          Removed explicit template instantiations.  They snuck back in
-          when Signal.* was refactored.  Thanks to Johnny for pointing
-          this out.
-
-Fri Jul 14 21:32:02 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Numeric_Limits.h:
-
-          "ace/ACE_Export.h" -> "ace/ACE_export.h".  Darn Windows case
-          insensitivity.
-
-          Removed unnecessary "ACE_Export" from ACE_Numeric_Limits primary
-          template.
-
-        * ace/Registry.cpp (make_name):
-
-          Use ACE_TString::size_type, not ssize_t, to hold string position
-          values.  Addresses signed/unsigned comparison warnings.
-
-        * ace/Shared_Memory_Pool.h:
-
-          Include new "ace/Sig_Handler.h" header to pull in
-          ACE_Sig_Handler class declaration.
-
-        * ace/String_Base.h:
-
-          Added tips to documentation related to potentially user visible
-          changes.
-
-Fri Jul 14 21:10:11 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/Atomic_Op.h (ACE_Atomic_Op):
-        * ace/Atomic_Op.inl (ACE_Atomic_Op):
-
-          Reverted change that made the constructor parameters for the
-          "long" type specialization be passed in by reference to const
-          instead of by value.  Explicit template instantiation is no
-          longer performed by ACE so there is no need for the
-          specialization constructor parameters to match the primary
-          template constructor parameters.
-
-        * ace/CDR_Base.cpp:
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.inl:
-
-          Const-correctness improvements.
-
-        * ace/CDR_Base.h:
-
-          Minor const related cosmetic changes.
-
-        * ace/CDR_Base.inl (first_size, next_size):
-
-          Quickly multiply by two using a bit shift.  This is guaranteed
-          to work since the variable is an unsigned integer.
-
-        * ace/CORBA_macros.h:
-
-          Removed unnecessary instantiation of emulated exception
-          environment variable from native exception case.  Reduces
-          footprint in code that uses the ACE emulated exception macros in
-          a native C++ exception configuration, and provides a slight
-          performance increase due to resulting tighter binaries.
-
-        * ace/DLL_Manager.cpp (get_dll_names):
-
-          ACE_TString::rfind() now return an ACE_TString::size_type type.
-          Use ACE_TString::size_type, not ssize_t, to hold the return
-          value of ACE_TString::rfind().
-
-        * ace/Dev_Poll_Reactor.cpp:
-
-          Include new "ace/Sig_Handler.h" header to pull in
-          ACE_Sig_Handler class declaration.
-
-          Added support for HP-UX devpoll headers.
-
-        * ace/Event_Handler.cpp:
-
-          No need to include "ace/Message_Block.h".
-
-        * ace/MMAP_Memory_Pool.h:
-        * ace/Select_Reactor_T.cpp:
-        * ace/TP_Reactor.cpp:
-        * ace/WFMO_Reactor.inl:
-
-          Include new "ace/Sig_Handler.h" header to pull in
-          ACE_Sig_Handler class declaration.
-
-        * ace/Malloc_Base.h (ACE_Allocator):
-
-          Defined a new "size_type" typedef (currently a "size_t") to
-          simplify potential allocator size type changes in the future.
-          It's introduction was motivated by the ACE string class size
-          type fixes described below.  Analogous to the STL
-          std::allocator<>::size_type typedef.
-
-        * ace/Numeric_Limits.h:
-
-          Traits containing basic integer limits.  Useful for
-          template-based code on platforms that lack
-          std::numeric_limits<>.  These traits are not meant to be a
-          replacement for std::numeric_limits<>.  Rather they are a crutch
-          until all ACE-supported platforms support
-          std::numeric_limits<>.  [Bug 2451]
-
-        * ace/OS_NS_dirent.inl:
-
-          "__USE_POSIX" -> "_POSIX_SOURCE".  The former is a C library
-          implementation-specific feature test macro/symbol.
-
-        * ace/OS_NS_stdio.cpp:
-        * ace/OS_NS_stdio.h:
-        * ace/OS_NS_stdio.inl (get_win32_versioninfo):
-
-          Fixed/added missing wide character support.
-
-        * ace/OS_NS_stdlib.cpp (mkstemp_emulation):
-
-          Clean up preprocessor conditional blocks by taking advantage of
-          new ACE_Numeric_Limits<> trait templates.
-
-        * ace/OS_NS_stdlib.inl (atop):
-
-          Address VC++ 64-bit warnings by taking advantage of standard
-          intptr_t type, if available.
-
-        * ace/OS_NS_sys_socket.inl (closesocket):
-
-          Do not shutdown the write end here.  Doing so will break
-          applications that duplicate a handle on fork(), for example, and
-          expect to continue writing in the fork()ed process.
-
-        * ace/OS_NS_sys_utsname.cpp (uname):
-
-          Fixed garbage in wide string output.
-
-        * ace/Object_Manager.cpp:
-
-          No need to include "ace/Containers.h".
-
-          Include newly refactored "ace/Sig_Adapter.h" instead of old
-          "ace/Signal.h".  Removes dependency on the ACE_Reactor.  Allows
-          service configurator-disabled subset containing
-          ACE_Object_Manager support to be built, e,g, MPC ace_svcconf=0
-          configuration.
-
-        * ace/Object_Manager_Base.cpp (init):
-        * ace/Process.cpp (pass_handle):
-
-          Fixed Windows version info handling in wide string
-          configurations.
-
-        * ace/Process_Manager.h (wait):
-
-          Clarified that the timeout value is a relative time, not
-          absolute, in the documentation.
-
-        * ace/SOCK_Acceptor.cpp (shared_open):
-
-          Removed assertion that assumes all protocol families are
-          internet related.  This method is invoked by some non-internet
-          protocol subclasses, such as ACE_LSOCK_Acceptor.
-
-        * ace/SOCK_Stream.cpp (close):
-
-          Reinstituted explicit close_writer() method call for the
-          ACE_WIN32 case since ACE_OS::close() no longer causes the writer
-          to be shutdown on Windows (nor should it!).
-
-        * ace/Service_Config.cpp:
-
-          Replaced old "ace/Signal.h" include directive with
-          "ace/Sig_Adapter.h".  ACE_Sig_Handler support is unnecessary.
-
-          Removed redundant "ace/Service_Config.h" include directive.
-
-        * ace/Sig_Adapter.cpp:
-        * ace/Sig_Adapter.h:
-        * ace/Sig_Handler.cpp:
-        * ace/Sig_Handler.h:
-        * ace/Sig_Handler.inl:
-        * ace/Signal.cpp:
-        * ace/Signal.h:
-        * ace/Signal.inl:
-
-          Refactored ACE_Sig_Adapter and ACE_Sig_Handler classes from
-          "ace/Signal.*" into their own dedicated source files.  Allows
-          ACE_Sig_{Guard,Set} to be used without introducing a dependency
-          on the ACE_Reactor framework.
-
-        * ace/String_Base_Const.cpp (npos):
-        * ace/String_Base_Const.h (npos):
-
-          Introduced a new "size_type" typedef.  This is consistent with
-          the standard C++ string class typdef/trait.
-
-          The "no position" constant is now an unsigned integer of the
-          same "size" type used by the underlying ACE string allocator.
-          It is defined to be the maximum value the unsigned type can
-          handle (e.g. ACE_Numeric_Limits<size_type>::max()).  This works
-          since a string length will always be less than or equal to
-          "max() - 1" since the final character in the string is the null
-          terminator.  [Bug 2598]
-
-        * ace/String_Base.cpp:
-        * ace/String_Base.h:
-        * ace/String_Base.inl:
-        * ace/SString.cpp:
-        * ace/SString.h:
-        * ace/SString.inl:
-
-          All size parameter and return value types are now consistent
-          with the size type of the underlying allocator
-          (i.e. ACE_Allocator::size_type).  Addresses inability of ACE
-          string classes to provide valid search index for string lengths
-          greater than the maximum value of ssize_t, a signed type.  In
-          particular, the find(), rfind() and strstr() methods now return
-          an unsigned integer (size_t) instead of a signed one
-          (ssize_t). Affected classes include:
-
-              ACE_CString
-              ACE_WString
-              ACE_TString
-              ACE_NS_WString
-
-         Unless you have been explicitly using -1 instead of npos when
-         comparing the return value of find(), rfind() and strstr(),
-         and/or assigning the return value to ssize_t you should not see
-         any difference. A new size_type typedef has been added to the ACE
-         string class to aid developers.
-
-         The ACE_String_Base<>::strstr() documentation as well as a
-         default rfind() argument erroneously referred to -1 instead of
-         npos. Those instances have been corrected.
-
-         To summarize, a "no position" condition is denoted using the npos
-         constant, not -1. It can be referred directly by scoping it with
-         the appropriate string class (e.g. ACE_CString::npos,
-         ACE_WString::npos, etc).  [Bug 2598]
-
-        * ace/Task_T.h:
-
-          Include "ace/IO_Cntl_Msg.h" to pull in ACE_IO_Cntl_Msg class
-          declaration.
-
-        * ace/Time_Value.cpp (max_time):
-
-          Cleaned up preprocessor conditional blocks by taking advantage
-          of ACE_Numeric_Limits trait templates.
-
-        * ace/Timer_Queue_Adapters.cpp:
-
-          Include "ace/Signal.h" to pull in ACE_Sig_Guard class
-          declaration.
-
-        * ace/Timer_Queue_Adapters.h:
-
-          Forward declare ACE_Sig_Set class.  No need for the full blown
-          declaration.
-
-        * ace/Token.cpp:
-
-          Minor cosmetic change.
-
-        * ace/ace_wchar.h (ACE_GetVersionEx):
-
-          New wide string support for Windows "GetVersionEx{A,W}()"
-          functions.
-
-        * ace/ace_wchar.inl:
-
-          Improved const-correctness.
-
-        * ace/config-aix-4.x.h:
-        * ace/config-macosx-panther.h:
-        * ace/config-macosx-tiger.h:
-        * ace/config-macosx.h:
-
-          Fixed single-threaded configuration so that all multi-thread
-          support is disabled.
-
-        * ace/ace.mpc:
-
-          Added missing DLL_Manager.cpp source file, and newly refactored
-          Sig_{Adapter,Handler}.cpp source files.
-
-        * ace/ace_for_tao.mpc:
-
-          Explicitly require the ace_svcconf MPC feature.
-
-          Added missing ACE_LACKS_ACE_TOKEN macro.  The ace_for_tao subset
-          does not support ACE's token collections.
-
-        * ace/svcconf.mpb:
-
-          Do not define ACE_HAS_ACE_SVCCONF.  There is no such macro in
-          the ACE sources.
-
-          Explicitly remove ACE_LACKS_ACE_SVCCONF from the macro list.
-
-          Moved "DLL_Manager.cpp" to the core ACE library source file
-          list.  "DLL_Manager.cpp" is not an optional component, and must
-          always exist in ACE regardless of whether or not ACE's service
-          configurator support is enabled.
-
-        * ace/token.mpb:
-
-          Do not define ACE_HAS_ACE_TOKEN.  There is no such macro in
-          the ACE sources.
-
-          Explicitly remove ACE_LACKS_ACE_TOKEN from the macro list.
-
-        * bin/MakeProjectCreator/config/ace_for_tao.mpb:
-
-          Added missing ACE_LACKS_ACE_TOKEN macro.  The ace_for_tao subset
-          does not support ACE's token collections.
-
-        * tests/SString_Test.cpp:
-
-          Corrected checks for "no position" return values to compare
-          against "npos" constant, not "-1".
-
-Fri Jul 14 20:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/INET_Addr.cpp:
-          Initialise some pointers explicitly with 0
-
-Fri Jul 14 20:41:23 UTC 2006  john_c  <johnc@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Add new test TAO/tests/Optimized_Connection to nightly builds.
-
-Fri Jul 14 20:39:41 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-vxworks6.2.h: Reverted this change:
-          Fri Jul 14 10:34:43 UTC 2006  Steve Huston  <shuston@riverace.com>
-          It appears to not work, and I can't test anything else here.
-
-Fri Jul 14 18:53:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/global.features
-        * bin/MakeProjectCreator/config/stl.mpb
-
-          Added an stl feature/base project for projects that use portions
-          of the STL that may not be universally supported.
-
-Fri Jul 14 19:44:03 UTC 2006  john_c  <johnc@ociweb.com>
-
-        * ace/config-hpux-11.00.h:
-        * include/makeinclude/platform_hpux_aCC.GNU:
-
-          Changing the shared library extension for hpux ia64 to ".so". On
-          HP-UX 11i Version 1.5 the naming scheme is lib*.sl for PA and
-          lib*.so on IPF.
-
-Fri Jul 14 19:29:59 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_stdio.cpp (DllMain): Add extern "C" to the DllMain
-          signature - enables it to be located and called at startup.
-          Thanks to Hubert Talbot <Hubert dot Talbot at criq dot qc dot ca>
-          for this fix.
-
-Fri Jul 14 19:13:06 UTC 2006  john_c  <john@ociweb.com>
-
-        * ace/Timer_Queue_Adapters.cpp:
-
-          Include file was missing. Fixes compile error when
-          ACE_HAS_DEFERRED_TIMER_COMMANDS is defined.
-
-Fri Jul 14 19:05:15 UTC 2006  Ciju John  <john_c@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-
-          Adding the TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated
-          test to nightly builds.
-
-Fri Jul 14 16:25:00 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added exclusions for Bug_2593_Regression test.
-
-Fri Jul 14 15:50:34 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          Added an optional parameter to Process->Kill().  If the parameter is
-          true then the return value from the process is ignored.
-
-Fri Jul 14 15:45:04 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Message_Queue_Test_Ex.{h cpp}: Corrected for !ACE_HAS_THREADS.
-
-Fri Jul 14 15:39:53 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-          Added new test (TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl).
-
-Fri Jul 14 10:34:43 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-vxworks6.2.h: Added ACE_LACKS_USECONDS_T to fix a
-          compile error. It's in the non-__RTP__ section since that's where
-          ACE_LACKS_SUSECONDS_T was, but I'm not sure this is correct.
-
-Fri Jul 14 07:26:46 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/Thread_Mutex.h:
-        * ace/ace_wchar.h:
-        * tests/SOCK_Dgram_Bcast_Test.cpp:
-          Fixed typos in comments.
-
-        * m4/config_h.m4:
-          Removed references to ACE_HAS_TERM_IOCTLS. It's no longer
-          used in ACE/TAO/CIAO code.
-
-Fri Jul 14 02:11:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added new test for Bug 2593 to nightly suite.
-
-Thu Jul 13 20:40:10 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/config-integritySCA.h:
-          Removed references to ACE_HAS_ATTR_SETSCHED. It's no longer
-          used in ACE/TAO/CIAO code.
-
-        * ace/config-rtems.h:
-          Removed references to ACE_HAS_SIGNAL_SAFE_OS_CALLS. It's no longer
-          used in ACE/TAO/CIAO code.
-
-        * ace/config-sco-5.0.0-mit-pthread.h:
-          Removed references to ACE_HAS_T_OPMGMT. It's no longer
-          used in ACE/TAO/CIAO code.
-
-Thu Jul 13 10:35:39 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/Base_Thread_Adapter.cpp:
-        * ace/Cleanup.cpp:
-        * ace/OS.cpp:
-        * ace/OS_Errno.cpp:
-        * ace/OS_Log_Msg_Attributes.cpp:
-        * ace/OS_NS_Thread.cpp:
-        * ace/OS_NS_arpa_inet.cpp:
-        * ace/OS_NS_ctype.cpp:
-        * ace/OS_NS_dirent.cpp:
-        * ace/OS_NS_dlfcn.cpp:
-        * ace/OS_NS_errno.cpp:
-        * ace/OS_NS_fcntl.cpp:
-        * ace/OS_NS_math.cpp:
-        * ace/OS_NS_netdb.cpp:
-        * ace/OS_NS_poll.cpp:
-        * ace/OS_NS_pwd.cpp:
-        * ace/OS_NS_regex.cpp:
-        * ace/OS_NS_signal.cpp:
-        * ace/OS_NS_stdio.cpp:
-        * ace/OS_NS_stdlib.cpp:
-        * ace/OS_NS_string.cpp:
-        * ace/OS_NS_strings.cpp:
-        * ace/OS_NS_stropts.cpp:
-        * ace/OS_NS_sys_mman.cpp:
-        * ace/OS_NS_sys_msg.cpp:
-        * ace/OS_NS_sys_resource.cpp:
-        * ace/OS_NS_sys_select.cpp:
-        * ace/OS_NS_sys_sendfile.cpp:
-        * ace/OS_NS_sys_shm.cpp:
-        * ace/OS_NS_sys_socket.cpp:
-        * ace/OS_NS_sys_stat.cpp:
-        * ace/OS_NS_sys_time.cpp:
-        * ace/OS_NS_sys_uio.cpp:
-        * ace/OS_NS_sys_wait.cpp:
-        * ace/OS_NS_time.cpp:
-        * ace/OS_NS_unistd.cpp:
-        * ace/OS_NS_wchar.cpp:
-        * ace/OS_TLI.cpp:
-        * ace/Thread_Adapter.cpp:
-        * ace/Thread_Control.cpp:
-        * apps/JAWS2/HTTPU/parse_http_request.cpp:
-        * apps/JAWS2/HTTPU/parse_http_response.cpp:
-
-          Fixed typo in comment.
-
-Thu Jul 13 09:51:33 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * configure.ac:
-          Removed references to ACE_HAS_EXCEPTION_H. It's no longer
-          used in ACE/TAO/CIAO code.
-
-Thu Jul 13 09:48:10 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/os_include/os_string.h:
-        * ace/os_include/os_stropts.h:
-          Fixed typo in comment.
-
-Thu Jul 13 09:32:54 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/config-vxworks6.2.h:
-        * configure.ac:
-        * m4/config_h.m4:
-          Removed references to ACE_HAS_USING_KEYWORD. It's no longer
-          used in ACE/TAO/CIAO code.
-
-Thu Jul  6 20:45:15 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Refcounted_Auto_Ptr.{h inl}: Repaired the ACE_Refcounted_Auto_Ptr
-          reset() and release() methods per Bugzilla #1925. They will both now
-          detach from the underlying ACE_Refcounted_Auto_Ptr_Rep object;
-          reset() will create a new one for the new pointer specified as its
-          argument. Generally modified the class to not make changes to the
-          underlying ACE_Refcounted_Auto_Ptr_Rep (such as with reset()). This
-          safely allows the get() method to avoid using the lock for reading
-          the pointer value since there's no way to change the underlying
-          rep's pointer.
-          Also cleaned up the Doxygen stuff for these classes.
-
-          This work resulted in removal of the following methods in
-          ACE_Refcounted_Auto_Ptr_Rep (not ACE_Refcounted_Auto_Ptr):
-            - null ()
-            - assign ()
-            - release ()
-            - reset ()
-
-          This significantly improves ACE_Refcounted_Auto_Ptr. This is not
-          a recommendation to [not] use it over ACE_Strong_Bound_Ptr. Just
-          responding to user reports. It may still be possibly/adviseable to
-          work further on this class, though I have no specific ideas or
-          reports at this time.
-
-        * tests/Refcounted_Auto_Ptr_Test.{h cpp}: Added tests for release()
-          and reset() per code supplied in Bugzilla #1925. Removed code in
-          ACE_ASSERT since it doesn't run in Release builds; replaced with
-          explicit checks and ACE_ERROR.
-
-Wed Jul 12 20:32:49 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Message_Queue_Test_Ex.{h cpp}: Fixed compile errors on Linux.
-
-Wed Jul 12 19:15:58 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Message_Queue_T.{h cpp}: Added a new class,
-          ACE_Message_Queue_Ex_N<class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL>, that
-          is similar to ACE_Message_Queue_Ex in that the object queued is a
-          template parameter. However, ACE_Message_Queue_Ex_N allows the
-          enqueueing and dequeueing of multiple chained objects at once. This
-          wasn't added to ACE_Message_Queue_Ex because the chained object
-          functionality requires the ACE_MESSAGE_TYPE class to have a
-          ACE_MESSAGE_TYPE *next (void) const method, analogous to
-          ACE_Message_Block::next(), to follow the chain and this would
-          probably break existing applications using ACE_Message_Queue_Ex.
-
-        * tests/Message_Queue_Test_Ex.{h cpp}: Added test capability for
-          ACE_Message_Queue_Ex_N.
-
-        * NEWS: Added description of the new class.
-
-          Thanks to Guy Peleg <guy dot peleg at amdocs dot com> for
-          contributing this new class and its tests.
-
-Wed Jul 12 16:37:40 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * etc/ace.doxygen:
-        * etc/ace_qos.doxygen:
-        * etc/ace_ssl.doxygen: Use the IGNORE_PREFIX directive to have Doxygen
-          ignore the ACE_, ACE_QoS_, ACE_SSL_ prefixes when alphabetizing
-          the class index. Thanks to Stefan Naewe <naewe dot s at atlas dot de>
-          for this idea.
-
-        * THANKS: Added Stefan Naewe to the Hall of Fame.
-
-Wed Jul 12 14:30:16 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-lynxos.h:
-        * ace/config-netbsd.h: Changed ACE_SCANDIR_CMP_USES_VOIDPTR to
-          ACE_SCANDIR_CMP_USES_CONST_VOIDPTR - makes it match the decl in
-          ace/os_include/os_dirent.h and should resolve a compile error.
-
-Wed Jul 12 13:55:09 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Message_Queue.inl: Move the #include out of the namespace; see
-          Tue Jul 11 13:38:10 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-Wed Jul 12 10:15:12 UTC 2006  Martin Corino <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_openvms.GNU:
-          Added fixes for SSL support.
-
-        * ace/config-openvms.h:
-          Added ACE_HAS_PTHREAD_SCHEDPARAM.
-
-        * ace/Global_Macros.h:
-        * ace/Lib_Find.cpp:
-        * ace/Service_Config.cpp:
-        * ace/Service_Config.h:
-        * ace/Service_Object.cpp:
-        * ace/Service_Object.h:
-          Moved OpenVMS specific dynamic service support class to a
-          better place.
-
-Wed Jul 12 07:13:01 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/FILE_Connector.cpp:
-          It is safe to use ACE_OS::mkstemp() on all platforms.
-
-Wed Jul 12 02:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Build ObjRefTemplate before IORInterceptor
-
-Tue Jul 11 23:09:28 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * include/makeinclude/platform_hpux_aCC.GNU:
-
-          The C compiler doesn't support the -mt option.  So, add -mt to
-          CC_THR_DEFS and then later add CC_THR_DEFS to CCFLAGS.  CCFLAGS
-          isn't used when compiling C files.
-
-Tue Jul 11 22:30:21 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-win32-common.h:
-        * ace/config-WinCE.h: Break the tight tie between UNICODE and
-          ACE_USES_WCHAR I introduced in
-          Thu Oct  6 17:56:19 2005  Steve Huston  <shuston@riverace.com>
-          Now ACE_USES_WCHAR is always on for CE; non-CE Windows builds must
-          explicitly set ACE_USES_WCHAR independent of UNICODE. Thanks to
-          Russell Morra <russell_mora at symantec dot com> for explaining
-          the situation and submitting this fix.
-
-Tue Jul 11 22:20:14 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * bin/generate_doxygen.pl: Add the ability to put the generated
-          HTML output in a specified location using the new -html_output
-          command line option. It alters the path specified for the
-          HTML_OUTPUT and GENERATE_TAGFILE Doxygen options.
-
-Tue Jul 11 22:09:56 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_linux.GNU: Added support for the
-          "buildbits=64" and "buildbits=32" make settings to target
-          32- and 64-bit build targets, respectively. Thanks to Boris
-          Kaminer <boris dor kaminer at gmail dot com> for this addition.
-
-Tue Jul 11 22:22:04 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * configure.ac: Change the minimum automake version to 1.9.6; this is
-          required to generate Makefiles that work properly on AIX.
-
-        * m4/compiler.m4: For AIX, replace ACE_AIX_MAJOR_VERS and
-          ACE_AIX_MINOR_VERS compile macros with ACE_AIX_VERS as the
-          hand-edited platform_aix_ibm.GNU has and the code expects.
-          Also removed the AIX 3 and 4 code since AIX 3 and 4 are no longer
-          supported. Also, turned on -qtemplateregistry for xlC-type
-          compilers (Visual Age C++ 6 and XL C++ 7).
-
-Tue Jul 11 21:37:51 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_stdio.cpp (snprintf, sprintf): In the wchar versions,
-          adjust the preprocessor checks to pick up the way that Solaris
-          indicates the presence of XPG5 capability. Allows these functions
-          to work, which allows ACE_Log_Msg to work also.
-
-        * ace/OS_NS_unistd.{h inl} (ualarm): Changed u_long arguments and
-          return value to useconds_t to gain portability.
-
-        * ace/OS_NS_dirent.{h inl cpp}: Made the selector and comparator
-          function pointer arguments to ACE_OS::scandir() and
-          scandir_emulation() be extern "C" to enforce their use with a
-          C RTL function. This resolves warnings from Solaris and makes usage
-          correct across all platforms. The function types are now in
-          typedefs ACE_SCANDIR_SELECTOR and ACE_SCANDIR_COMPARATOR,
-          respectively. The typedef was used previously only for Windows/MSVC
-          where the calling convention change had bit someone - now it's
-          uniform for all.
-          Also, folded in the ACE_SCANDIR_CMP_USES_VOIDPTR def here to
-          set up the proper typing with extern "C" for when it's needed to
-          cast inside the ACE_OS::scandir() implementation. The interface
-          offered by ACE_OS::scandir() is always defined in terms of
-          ACE_SCANDIR_SELECTOR and ACE_SCANDIR_COMPARATOR.
-
-        * ace/Dirent_Selector.{h cpp}: Use the extern "C"-containing typedefs
-          for selector/comparator functions set up for ACE_OS::scandir() in
-          ACE_Dirent_Selector as well since they get passed through to ACE_OS.
-
-        * apps/soreduce/Library.cpp:
-        * tests/Dirent_Test.cpp: Mark selector/comparator functions that'll be
-          passed to ACE_OS::scandir() as extern "C" to match new param types.
-
-        * ace/config-aix-5.x.h: Added ACE_HAS_SCANDIR since AIX has scandir(),
-          as well as the needed ACE_SCANDIR_SEL_LACKS_CONST and
-          ACE_SCANDIR_CMP_USES_VOIDPTR to adjust to it's differences from
-          the common way scandir() is usually defined.
-
-        * ace/config-hpux-11.00.h: Added ACE_HAS_SCANDIR.
-
-        * ace/config-linux-common.h: Clarify that, despite the man page,
-          ACE_SCANDIR_CMP_USES_CONST_VOIDPTR is needed, at least on RHEL 3
-          and 4.
-
-        * ace/README: Added descriptions for ACE_HAS_SCANDIR and
-          ACE_SCANDIR_CMP_USES_VOIDPTR as well as the new settings
-          ACE_SCANDIR_SEL_LACKS_CONST and ACE_SCANDIR_CMP_USES_CONST_VOIDPTR.
-
-        * NEWS: Summarize the above user-visible selector/comparator changes.
-
-Tue Jul 11 17:39:00 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/Basic_Types.h:
-        * ace/OS.h:
-          Removed unnecessary includes.
-
-Tue Jul 11 17:25:06 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * include/makeinclude/platform_rtems.x_g++.GNU:
-        * include/makeinclude/wrapper_macros.GNU:
-
-          Removed references to obsolete ACE_HAS_GNUG_PRE_2_8 make
-          variable. Removed egcs checks.
-
-Tue Jul 11 16:55:57 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          Enable raw mode correctly on POSIX systems. Accept "none" as
-          valid parity value. Thanks to hongxing <hongxing777 at gmail dot com>
-          for the patch.
-
-        * ace/TTY_IO.h:
-          Updated documentation to reflect changes above.
-
-        * ace/os_include/sys/os_resource.h:
-          Fixed typo in comment.
-
-Tue Jul 11 16:38:29 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/config-linux-common.h:
-        * ace/os_include/os_signal.h:
-        * ace/os_include/os_stropts.h:
-
-          Changed ACE_HAS_ISASTREAM_PROTO to ACE_HAS_ISASTREAM_PROTOTYPE and
-          ACE_HAS_PTHREAD_SIGMASK_PROTO to ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
-          to better follow ACE naming conventions.
-
-Tue Jul 11 13:38:10 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Message_Queue.inl: Include "ace/Guard_T.h" in the ACE_WIN32
-          section to avoid compile errors with Release builds.
-
-        * ace/TSS_T.h: Improved documentation.
-
-        * tests/ACE_Init_TestDlg.cpp: Added comment block at the top to explain
-          the file's purpose.
-
-        * tests/Task_Test.cpp: Added a smoke test for the new
-          ACE_Task::last_thread() method.
-
-Thu Jul  6 12:48:58 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_sys_socket.inl (sendto): Initialize "bytes_sent" to 0
-          to avoid random values.  Thanks to Winston Zhang <winston_ace at
-          kubao-inc dot com> for reporting this.
-
-Wed Jul  5 20:32:20 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/WFMO_Reactor.cpp (open): Added some more code to prevent
-          memory leaks when the ACE_WFMO_Reactor is reopened.  Thanks to
-          Sonicfly Zhou <zhoucn at txsec dot com> for this fix.
-
-Tue Jul 11 12:19:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/tao.doxygen:
-          Added .idl to FILE_PATTERNS
-
-Tue Jul 11 12:01:12 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ace/Atomic_Op.cpp:
-        * ace/Atomic_Op_Sparc.h:
-        * ace/Atomic_Op_Sparc.c:
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-
-          Added a SPARC assembler implementation of functions needed for use
-          within the ACE_Atomic_Op specializations.  The implementation will
-          only be used if atomic_ops_sparc is set to 1 in
-          platform_macros.GNU.  It also requires that v8plus or higher be
-          used with SunCC.
-
-        * ace/Makefile.am:
-        * ace/ace.mpc:
-
-          Added the new Atomic_Op_Sparc.c.
-
-        * ace/CDR_Base.cpp:
-
-          In grow(), call the clone_nocopy() method on the ACE_Data_Block
-          with the new size.  Previously, the clone_nocopy() would be called
-          and then directly after that, size() would be called on the cloned
-          data block which would re-allocate to the new size and copy the
-          previous contents.
-
-          In the same method, we avoid constructing an ACE_Message_Block to
-          avoid reference count manipulating the data block's reference
-          count.
-
-          Also, in consolidate(), avoid attempting to copy data if the
-          destination and source are the same. [RT 8372]
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.cpp:
-
-          Added a constructor that takes an ACE_Data_Block* which can be
-          used to avoid an allocation while constructing the
-          ACE_Message_Block held by the ACE_OutputCDR. [RT 8372]
-
-        * ace/Message_Block.h:
-        * ace/Message_Block.cpp:
-        * ace/Message_Block_T.h:
-        * ace/Message_Block_T.cpp:
-
-          Added a new parameter to the ACE_Data_Block::clone_nocopy() method
-          that allows the user copy the data block, but increase the size
-          all in one step. [RT 8372]
-
-        * ace/OS_NS_string.inl:
-
-          Added an unrolled implementation of memset, only active if
-          ACE_HAS_SLOW_MEMSET is defined, that supports up to 16 bytes
-          without calling into the memset() C function.
-
-        * ace/config-sunos5.5.h:
-
-          SunCC 5.x supports new(nothrow_t).  So, I have enable the use of
-          it when exceptions are enabled. [RT 8372]
-
-        * ace/OS_NS_Thread.h:
-        * ace/os_include/os_pthread.h:
-
-          Added macro definitions required to build ACE and TAO on Solaris
-          without using the pthreads library.
-
-        * include/makeinclude/platform_aix_ibm.GNU:
-        * include/makeinclude/platform_hpux_aCC.GNU:
-        * include/makeinclude/platform_irix6.x_sgic++.GNU:
-
-          Added 64-bit options to the CFLAGS macros to deal with the newly
-          added C file in ACE. [RT 8372]
-
-Tue Jul 11 01:47:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Log_Msg_Test.cpp:
-          initialise pointer with 0
-
-Tue Jul 11 01:37:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.h:
-          Layout change
-
-Tue Jul 11 01:09:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          If -oA has been used as idlflags, don't add the A files
-
-Tue Jul 11 00:50:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_compile_stats.sh:
-          Updated to also handle redhat version information
-
-Sun Jul 09 05:53:23 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 5.5.2 released.
-
-Fri Jul  7 08:07:50 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html: Small improvements
-
-Thu Jul  6 19:57:50 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ACE-INSTALL.html: Improvements and corrections motivated by
-          Abdul Sowayan <abdullah dot sowayan at lmco dot com>.
-
-Wed Jul  5 19:15:37 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ACE-INSTALL.html: Cleaned up further; clarified role of DOC and
-          support companies and use of PROBLEM-REPORT-FORM.
-
-        * NEWS: Noted removal of Chorus and pSOS.
-
-Tue Jul  4 04:10:11 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Memcpy_Test.cpp: Added a short summary of this test.
-          Thanks to Arvind Krishna for contributing it.
-
-Tue Jul  4 01:05:47 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Memcpy_Test.cpp (testit): ACE-ified this test.
-
-Tue Jul  4 01:03:52 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/CE_fostream.cpp:
-        * tests/Service_Config_Test.cpp: Improved the description of these
-          tests.
-
-Mon Jul  3 14:42:45 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * NEWS: Updated the NEWS file with information about using multiple
-          service repositories.
-
-Mon Jul  3 03:25:43 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * examples/APG/Svc_Config/HA_Configurable_Server_Dynamic.cpp
-          (ACE_TMAIN): Changed the reactor event loop to explicitly pass
-          in ACE_Reactor::check_reconfiguration().  Thanks to Michael Reed
-          <mnr102 at yahoo dot com> for reporting this.
-
-Mon Jul  3 03:15:14 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * examples/Service_Configurator/IPC-tests/server/server_test.cpp
-          (ACE_TMAIN): Changed the reactor event loop to explicitly pass
-          in ACE_Reactor::check_reconfiguration().
-
-Fri Jun 30 13:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added CSD_Framework and CSD_ThreadPool
-
-Fri Jun 30 09:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_rel_manpages:
-          Updated doxygen version we are using for the release
-
-Fri Jun 30 07:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoexe.mpb:
-          Added corba/e and core_minimum_corba as base projects so that
-          the executables that can be build with CORBA/e and minimum
-          corba do have set the correct flags during compilation
-
-Thu Jun 29 17:30:52 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * NEWS: Added a note about the logging changes from
-          Tue May 16 22:23:55 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-Thu Jun 29 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Signal_Test.cpp:
-          Layout changes
-
-Thu Jun 29 09:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Containers_T.cpp:
-          Initialise pointer with 0
-
-Thu Jun 29 08:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_g++_common.GNU:
-        * include/makeinclude/platform_osf1_4.x_cxx.GNU:
-        * include/makeinclude/platform_sunos5_ghs.GNU:
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-        * include/makeinclude/wrapper_macros.GNU:
-          Removed support for explicit templates, we don't support that
-          anymore
-
-Thu Jun 29 08:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/ACE-guidelines.html:
-          Document that the STL generic algorithms are safe to be used and
-          made some other small updates
-
-Wed Jun 28 10:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ace_for_tao.mpc:
-          Added missing file because of the sendfile addition to TAO
-
-Wed Jun 28 09:20:08 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Link.cpp:
-        * protocols/ace/RMCast/Link.h:
-        * protocols/ace/RMCast/Socket.cpp:
-          Added explicit calls to close functions for sockets and pipes.
-          Thanks to finalpatch <fengli@gmail.com> for reporting this.
-
-Wed Jun 28 07:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/ACE-guidelines.html:
-          Document that template template arguments are not possible to
-          be used because HP aCC 3.70 doesn't support it.
-
-Tue Jun 27 13:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Unbounded_Queue.cpp:
-          Explicitly initialise pointers with 0
-
-Tue Jun 27 08:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ace_for_tao.mpc:
-          Added MMAP_Memory_Pool.* because TAO uses these for sendfile
-          support
-
-Tue Jun 27 06:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.inl:
-        * ace/config-WinCE.h:
-          WinCE doesn't seem to have SetFilePointerEx, so introduced
-          ACE_LACKS_SETFILEPOINTEREX which we check in OS_NS_unistd.inl,
-          if this is set we fallback to SetFilePointer
-
-Tue Jun 27 06:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/CDR_File_Test.cpp:
-          Fixed 64bit conversion warning
-
-Tue Jun 27 06:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taolib.mpb:
-          Added tao_versioning_idl_defaults as base
-
-Mon Jun 26 13:27:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-          Added PICurrent refactoring note. Moved from NEWS to TAO/NEWS
-
-Mon Jun 26 08:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/DLL_Manager.h:
-          Reexport ACE_DLL_Handle, the ACE_DLL_Manager returns a pointer
-          to this type in its interfaces. Thanks to Patrick Bennett
-          <Patrick dot Bennett at inin dot com> for reporting this
-
-Mon Jun 26 08:17:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_openvms.GNU:
-          Some compileswitch changes.
-
-        * ace/config-openvms.h:
-          Added multicast filtering setting.
-
-Sun Jun 25 11:54:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_openvms.GNU:
-          Some compileswitch changes.
-
-Sun Jun 25 08:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_mpc_auto_compile.pl:
-          Build gperf and TAO_IDL before tao
-
-Sat Jun 24 14:02:15 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Lib_Find.cpp (open_temp_file): In the ACE_WIN32 section,
-          'perm' is not used, so use ACE_UNUSED_ARG on it.
-
-        * tests/Hash_Map_Manager_Test.cpp: Use const ACE_TCHAR with literal
-          string, not non-const. Resolves compile warning on some compilers.
-
-Fri Jun 23 21:03:37 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/Lib_Find.cpp (open_temp_file):
-
-          Added FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE
-          for the 'perms' argument of the Windows version, which
-          eliminates a open_temp_file() failure in the IDL compiler
-          on a file that was previously opened/closed with fopen/fclose.
-          Thanks to Krishnakumar Balasubramanian <kitty@dre.vanderbilt.edu>
-          for figuring out the fix.
-
-Fri Jun 23 16:01:31 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * examples/Reactor/Proactor/test_proactor.cpp (open): When calling
-          ACE_OS::open(), don't supply a very UNIXy-looking 0644 value for
-          the 'perms' argument. Let it default to something reasonable for
-          the platform. Using 0644 on Windows passes something Windows doesn't
-          like, and the test fails. Thanks very much to William Cote
-          <William dot Cote at hp dot com> for fixing this.
-
-        * THANKS: Added William Cote to the Hall of Fame.
-
-Fri Jun 23 13:20:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Reverted the change below, it triggers pidl recompilation for all pidl files
-        Fri Jun 23 07:36:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          Added .pidl to the inputext. This should be the way how things should
-          run fine again in TAO but it seems somewhere ther is something missing.
-
-Fri Jun 23 07:36:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          Added .pidl to the inputext. This should be the way how things should
-          run fine again in TAO but it seems somewhere ther is something missing.
-
-Thu Jun 22 21:05:20 UTC 2006  Krishnakumar B  <kitty@dre.vanderbilt.edu>
-
-        * ace/OS_NS_fcntl.h (ACE_DEFAULT_OPEN_PERMS): Set the value of
-          ACE_DEFAULT_OPEN_PERMS from ACE_DEFAULT_FILE_PERMS instead of
-          0.  This ensures that users of ACE_OS::open() who don't override
-          the default argument get a sensible default.
-
-Thu Jun 22 15:08:01 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/SSL/SSL_Context.{h cpp} (load_trusted_ca): Added a third
-          argument, bool use_env_defaults, which defaults to true. If false,
-          the ca_file and ca_dir arguments do not get ACE defaults applied
-          to them if passed as 0. This allows a user to specify a 0 file or
-          directory to the underlying SSL_CTX_load_verify_locations() function.
-          If a ca_dir is supplied, attempt to add its CA list to the
-          X509 names in addition to that of ca_file.
-
-          (seed_file): If the file loads ok, check RAND_status() to see if
-          there's "enough" entropy.
-
-        * ace/SSL/SSL_Context.inl:
-        * ace/SSL/SSL_Asynch_Stream.cpp:
-        * ace/SSL/SSL_SOCK_Stream.cpp: When setting up SSL_CTX, set the verify
-          mode as well. When creating a new socket object, let it inherit the
-          verify mode from the SSL context rather than making a call back to
-          the context to retrieve the verify mode and setting it with a
-          separate SSL call.
-
-Thu Jun 22 14:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Build the portableserver earlier in the list of libs
-
-Thu Jun 22 05:29:48 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.cpp:
-
-          The initialize_i() method would not remove a service, which
-          failed to initialize, in case the ACE_NOLOGGING is defined. For
-          some reason the two blocks of code were switched around.  Thanks
-          to Martin Corino <mcorino at remedy dot nl> for pointing out the
-          problem.
-
-Wed Jun 21 21:29:04 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-lynxos.h: Added ACE_LACKS_STRPTIME. This should fix a
-          compile error on LynxOS.
-
-Wed Jun 21 15:45:32 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Hash_Map_Manager_Test.cpp: Fix incorrect concatenating of
-          text literals.
-
-Wed Jun 21 07:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Misc/test_trace.cpp:
-          Fixed fuzz error
-
-Tue Jun 20 23:20:17 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Framework_Component_DLL.cpp: Added a description of this test.
-
-Tue Jun 20 22:34:43 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Service_Config_DLL.cpp: Added a comment block at the top
-          to describe this file's purpose.
-
-Tue Jun 20 22:09:54 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_time.cpp (strptime): Added a const_cast<char*> wherever
-          a return of something based on the const char *buf was done; related
-          to:
-          Tue Jun 20 20:19:37 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * NEWS: Noted that the signature of ACE_OS::strptime() changed, also
-          related to the entry above.
-
-Tue Jun 20 20:19:37 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * configure.ac:
-        * ace/README:
-        * ace/OS_NS_time.h:
-        * ace/OS_NS_time.inl:
-        * ace/OS_NS_time.cpp:
-        * m4/config_h.m4: The ACE_OS::strptime() wrapper was previously not
-          compiled in unless ACE_HAS_STRPTIME was set. If this was set and
-          ACE_LACKS_NATIVE_STRPTIME was also set, an emulation was supplied.
-          This has been changed so that:
-             - ACE_OS::strptime() is always supplied.
-             - The emulation is used if ACE_LACKS_STRPTIME is set.
-             - The first arg to ACE_OS::strptime() is now "const char *"
-               instead of "char *" as the native strptime() is.
-             - ACE_OS::strptime() is inlineable.
-          ACE_HAS_STRPTIME is no longer used, and ACE_LACKS_NATIVE_STRPTIME
-          is changed to ACE_LACKS_STRPTIME. If ACE_LACKS_STRPTIME is set
-          and the user decides not to include the emulation, then
-          ACE_REFUSE_STRPTIME_EMULATION should be set, which will cause
-          ACE_NOTSUP_RETURN to be used instead of the emulation.
-
-        * ace/config-borland-common.h:
-        * ace/config-vxworks5.x.h:
-        * ace/config-vxworks6.2.h:
-        * ace/config-win32-dmc.h:
-        * ace/config-win32-ghs.h:
-        * ace/config-win32-mingw.h:
-        * ace/config-win32-msvc-7.h:
-        * ace/config-win32-msvc-8.h:
-        * ace/config-win32-visualage.h: Removed ACE_HAS_STRPTIME; changed
-          ACE_LACKS_NATIVE_STRPTIME to ACE_LACKS_STRPTIME.
-
-        * ace/config-cygwin32.h:
-        * ace/config-doxygen.h:
-        * ace/config-irix6.x-common.h:
-        * ace/config-linux-common.h:
-        * ace/config-netbsd.h:
-        * ace/config-openvms.h:
-        * ace/config-sunos5.5.h:
-        * ace/config-tandem-nsk-mips-v3.h: Removed ACE_HAS_STRPTIME.
-
-        * ace/config-rtems.h: Changed ACE_LACKS_NATIVE_STRPTIME to
-          ACE_LACKS_STRPTIME.
-          NOTE!! RTEMS users should add #define ACE_REFUSE_STRPTIME_EMULATION
-          to the local config.h file to avoid bringing in the emulation,
-          maintaining behavior in previous ACE versions.
-
-        For additional background on why this arrangement was put in place
-        originally, please see:
-        Tue Aug 10 14:46:12 1999  David L. Levine  <levine@cs.wustl.edu>
-        It makes sense, but adds a unique requirement for porting to new
-        platforms that one must know to explicitly enable an existing wrapper,
-        even if its natively available. This has tripped up a number of porting
-        efforts (including mine) and now it's consistent with other wrappers.
-
-        * m4/ace.m4: Add --enable-wince to set up the BUILD_WINCE setting
-          that's inserted into the Makefile.am files for the wince MPC setting.
-
-        * ace/ace.mpc: Replace config-win32-msvc-6.h with config-win32-msvc-8.h
-
-        * bin/bin/mpc: Removed the verbatim for automake that adds
-          TESTS=auto_run_tests.pl - it was an early attempt at getting the
-          test ability to work that never was right.
-
-        * */Makefile.am: Regenerated with MPC. This effectively changes the
-          version scheme based on the changes in:
-          Thu May 18 16:37:46 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * apps/Makefile.am: Hand-added code to avoid building gperf if
-          --disable-gperf was specified to configure. Thanks to Robert Schwebel
-          <robert at schwebel dot de> for this fix.
-
-        * apps/gperf/tests/Makefile.am: This one doesn't get close to being
-          regenerated with MPC. The "stamp" items require hand-tweaking as
-          given in previous entries for this file.
-
-        * ace/Makefile.am: Regenerated with MPC and hand-tweaked to add needed
-          "nobase_include_HEADERS =" line.
-
-        * configure.ac: Added the following new AC_CONFIG_FILES entries:
-
-        * ACEXML/tests/util/Makefile.am:
-        * apps/JAWS2/Makefile.am:
-        * apps/JAWS2/JAWS/Makefile.am:
-        * examples/ASX/Event_Server/Makefile.am:
-        * examples/ASX/Event_Server/Event_Server/Makefile.am:
-        * examples/ASX/Event_Server/Transceiver/Makefile.am:
-        * examples/ASX/UPIPE_Event_Server/Makefile.am:
-        * examples/Map_Manager/Makefile.am:
-        * examples/Reactor/TP_Reactor/Makefile.am:
-        * protocols/tests/Makefile.am:
-        * protocols/tests/RMCast/Makefile.am: New files, generated with MPC.
-
-        * THANKS: Added Robert Schwebel to the Hall of Fame.
-
-Tue Jun 20 19:25:20 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Task.{h inl cpp}: Moved the public data members (thr_count_,
-          thr_mgr_, flags_, grp_id_, lock_) from public to a new protected
-          section. There was a comment that said these should be private, but
-          no reason given why they weren't.
-          Removed the thr_count_dec() method since it is no longer used
-          anywhere in ACE. Moved its functionality into cleanup() where it
-          also sets the new last_thread_id_ member (see below).
-          Added a new member last_thread_id_ which holds the thread ID
-          (ACE_thread_t) of the last thread to exit svc() processing. Before
-          any threads exit, the value is 0; it's set to 0 in the constructor
-          and in activate().
-          The new accessor, ACE_thread_t last_thread (void) const, retrieves
-          the value of last_thread_id_. It's recommended that a thread in
-          close() check the last_thread_id_ value, rather than the thr_count(),
-          when deciding if it's safe to destroy the object. Since thr_count
-          can be seen as 0 in multiple threads concurrently, it's not safe
-          to rely on for destroying a thread. This fixes Bugzilla #2339.
-          Thanks to Howard Finer <hfiner@sonusnet.com> for this idea.
-
-        * NEWS: Added a note about the new ACE_Task::last_thread() method.
-
-Tue Jun 20 18:55:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Based_Pointer_Test.cpp:
-        * tests/Based_Pointer_Test_Lib.cpp:
-        * tests/CDR_File_Test.cpp:
-        * tests/DLL_Test.cpp:
-        * tests/Malloc_Test.cpp:
-        * tests/Process_Manager_Test.cpp:
-          Several fixes to make OpenVMS happy.
-
-Tue Jun 20 18:04:45 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * examples/Log_Msg/test_ostream.cpp (ACE_TMAIN): Couldn't used
-          std::getline() for some odd reason..  Fixed by using
-          ifstream::getline() instead.  Thanks to Johnny for reporting
-          this.
-
-Tue Jun 20 14:31:05 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * examples/Misc/test_trace.cpp (recursive): Simplified the
-          ACE_TRACE method name to make fuzz happy.
-
-Tue Jun 20 13:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Hash_Map_Manager_Test.cpp:
-          Fixed unicode compile problems
-
-Tue Jun 20 12:51:19 UTC 2006  James H. Hill  <hillj@isis.vanderbilt.edu>
-
-        * bin/ChangeLogEditor/FileLocatorFactory.pm:
-
-          Now supports the standard hack for subversion on Windows when
-          SVN_ASP_DOT_NET_HACK environment variable is set. Instead
-          of placing repo info in a .svn file, it is placed in _svn.
-
-Tue Jun 20 12:31:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/os_include/os_time.h:
-        * ace/os_include/sys/os_types.h:
-          Fixed type definitions for OpenVMS.
-
-        * ace/config-openvms.h:
-          Updated build configuration for OpenVMS.
-
-        * ace/Lib_Find{.h .cpp}:
-        * ace/DLL_Manager.cpp:
-        * ace/Service_Config{.h .cpp}:
-        * ace/Global_Macros.h:
-        * ace/Strategies_T.cpp:
-        * ace/Logging_Strategy.cpp:
-          Added support for dynamic loading scheme of service configurator
-          framework under OpenVMS.
-
-        * ace/OS_NS_stdio.h:
-          Additional include for OpenVMS.
-
-Tue Jun 20 08:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taolib.mpb:
-          Add corba subset projects as base
-
-        * bin/MakeProjectCreator/config/core_minimum_corba.mpb:
-          New file for usage within the core libs
-
-        * bin/MakeProjectCreator/config/core_minimum_corba.mpb:
-          Make minimum corba a feature
-
-Tue Jun 20 07:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Log_Msg/test_callback.cpp:
-          Fixed typo
-
-Tue Jun 20 07:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/global.features:
-          CORBA subset configurations are disabled by default
-
-Mon Jun 19 18:03:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_openvms.GNU:
-          Changed template instantiation model.
-
-        * include/makeinclude/rules.local.GNU:
-          Change to enable adding custom REALCLEAN_FILES in platform file.
-
-Mon Jun 19 15:11:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/auto_run_tests.pl:
-          Changed to enable spawning Perl testscripts on OpenVMS.
-
-Mon Jun 19 14:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Replaced dsp/dsw with sln/vcproj. Thanks to Abdullah Sowayan
-          <abdullah dot sowayan at lmco dot com> for reporting this
-
-Mon Jun 19 13:14:54 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Fixed a typo.
-          Thanks to Abdul for reporting this.
-
-        * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Added a
-          test for the two allocator version of ACE_Hash_Map_Manager.
-          Thanks to Jarek for contributing this.
-
-Mon Jun 19 02:55:48 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * examples/Log_Msg/test_ostream.cpp (ACE_TMAIN): Enhanced the test to
-          show the ofstream output better.
-
-Mon Jun 19 01:31:46 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * examples/Log_Msg/test_callback.cpp (ACE_TMAIN): Zapped the
-          extraneous '\n' from the messages.
-
-Mon Jun 19 01:06:49 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * examples/Misc/test_trace.cpp: Enhanced to the the ACE_TRACE macro.
-
-Sun Jun 18 16:58:20 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * netsvcs/clients/Logger/indirect_logging.cpp (ACE_TMAIN): Cleaned
-          up the test to work if none of the daemons are running.
-
-Sun Jun 18 16:44:14 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Signal.{inl,cpp}: Moved the destructors out of the *.inl
-          file into the *.cpp file since inline destructors aren't really
-          a good idea.
-
-Sun Jun 18 16:35:13 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * netsvcs/lib/Client_Logging_Handler.cpp (send): Printout the type
-          of log message as a diagnostic to make it easier to see the
-          filtering that's going on!
-
-Fri Jun 16 17:48:18 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/CDR_Size.cpp (adjust): Added a fix for the case where
-          ACE_LACKS_CDR_ALIGNMENT is undefined.  Thanks to Aleksandar
-          Vukajlovic <vukajlo at finsoft dot co dot yu> for contributing
-          this.
-
-Fri Jun 16 13:57:53 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Ping_Socket.cpp: Replaced the use of char, short, int,
-          etc. for struct ip and icmp with the equivalent
-          ACE_UNIT[8,12,32] types to ensure a fixed size.  Thanks to Paul
-          Daugherty <Paul at nextalk dot com> and Robert S. Iakobashvili
-          <coroberti at gmail dot com> for reporting this and contributing
-          a fix.
-
-Mon Jun 19 11:37:17 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.{h,cpp,inl}:
-          Changed the (f)truncate method to use ACE_LOFF_T and use
-          SetFilePointerEx on windows to fix 64bit warnings
-
-Mon Jun 19 10:08:17 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/diff-builds.pl:
-          Changed this script not to die when we can't find results for
-          a certain date, then just take the closest results.
-
-Mon Jun 19 10:00:17 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Service_Gestalt.cpp:
-        * ace/Acceptor.cpp:
-          Const improvement
-
-Mon Jun 19 09:56:17 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ace/OS_NS_sys_sendfile.cpp (sendfile_emulation):
-
-          Verify the ACE_OS::mmap() call succeeded prior to continuing.
-
-          Use ACE_OS::send() instead of ACE_OS::write() on Windows.  The
-          latter doesn't provide the same semantics on Windows as on
-          Unix.  Addresses an ACE_OS::sendfile() failure on Windows.
-
-Tue Jun 13 02:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_tests.lst:
-          Don't run netlink test in ACE_FOR_TAO configuration
-
-Mon Jun 12 17:00:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * include/makeinclude/wrapper_macros.GNU:
-
-          Set winnt to 0 if not explicitly set by a platform_*.GNU
-          makefile.
-
-Mon Jun 12 16:48:19 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/SV_Shared_Memory_Test.cpp (run_main): Moved a couple of
-          calls outside of ACE_ASSERT since they don't belong in there.
-
-Mon Jun 12 14:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_stat.h:
-          Fixed mingw definition of ACE_stat
-
-Mon Jun 12 10:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/vc6.features:
-          Removed this file, wer don't support vc6 anymore
-
-Mon Jun 12 01:30:03 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Thread_Manager.cpp (wait): Changed the flag parameters to be
-          bool rathet than int.  Thanks to Johnny for this suggestion.
-
-Sat Jun 10 22:32:03 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ACE-INSTALL.html: Corrected a bunch of platform build things and
-          hopefully clarified the sections a bit.
-
-        * bin/make_release: Removed the search for, and chmod for, dsp/dsw
-          files - they're for MSVC6 which is no longer generated.
-
-Sat Jun 10 10:07:32 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Thread_Manager.cpp:
-          Fix for compiler errors.
-
-Sat Jun 10 04:31:54 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/automake.features:
-
-          Define MPC feature variable "wxWindows" to 1.
-
-        * bin/MakeProjectCreator/config/wxwindows.mpb:
-
-          Add automake specific definitions for compile_flags,
-          linkflags, and pure_libs.
-
-Fri Jun  9 19:25:19 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Thread_Manager.h: Added a new parameter to wait() that
-          determines whether relative or absolute time is used.  Thanks to
-          Sonicfly Zhou <zhoucn at txsec dot com> for this idea.
-
-Fri Jun  9 14:06:52 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Hash_Map_With_Allocator_T.{h,inl,cpp}: Enhanced this class
-          so that it compiles with the new "two allocator"
-          ACE_Hash_Map_Manager_Ex class.  This class needs to be improved
-          so that it actually leverages the two allocator features, but
-          that's something for the future.
-
-Fri Jun  9 13:15:38 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Hash_Map_Manager_T.h: Clarified the meaning of the
-          constructor and open() parameters.
-
-Fri Jun  9 13:07:40 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Hash_Map_Manager_T.cpp (open): If the user doesn't supply an
-          entry_alloc pointer then use the table_alloc pointer.
-
-Fri Jun  9 13:00:22 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Hash_Map_Manager_T.cpp (open): Zapped the use of ACE_ASSERT
-          and replaced it with and if statement.  We shouldn't be using
-          ACE_ASSERT in ACE library code..
-
-Fri Jun  9 12:53:48 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Hash_Map_Manager_T.{h,inl,cpp}: Added support for a separate
-          allocator for creating the entries in the chain of
-          ACE_Hash_Map_Entry objects in the buckets.  There are now two
-          allocators, one for the bucket table and the other for the
-          entries in the buckets.  Thanks to Jaroslaw Nozderko <jaroslaw
-          dot nozderko at polkomtel dot com dot pl> for this fix.
-
-Fri Jun  9 14:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ace_for_tao.mpc:
-          Updated because ARGV and Arg_Shifter are template files now
-
-Fri Jun  9 13:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/FILE_IO.cpp:
-          Const improvements
-
-        * ace/MMAP_Memory_Pool.cpp:
-          Added static cast from ACE_LOFF_T to size_t and const improvements
-
-Fri Jun  9 13:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/FILE_IO.cpp:
-          Added static cast from ACE_LOFF_T to size_t
-
-Fri Jun  9 13:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_stat.inl:
-          Use special stat call for vc71
-
-Fri Jun  9 13:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Connection_Recycling_Strategy.h:
-          Doxygen improvement
-
-Fri Jun  9 13:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.{h,cpp}:
-          Use ACE_LOFF_T in the pwrite interface
-
-Fri Jun  9 12:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_stat.h:
-          With vc71 use _stati64 for ACE_stat, not __stat64. The first has
-          time as 32bit, the second time as 64 bit (__time64_t) which causes
-          problems because the time interfaces of ACE use time_t which is
-          32bit with vc71 but 64bit with vc8.
-
-Fri Jun  9 10:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Configuration_Import_Export.cpp:
-          Initialise pointer with 0
-
-Fri Jun  9 10:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Arg_Shifter.{h,cpp}:
-          Also refactored ACE_Arg_Shifter to ACE_Arg_Shifter<CHAR_TYPE> and
-          made ACE_Arg_Shifter a typedef. The refactoring fo ACE_ARGV resulted
-          in a drop of the TAO Hello client executable of about 2.5Kb which is
-          nice for such a small change.
-
-        * ace/ace.mpc:
-        * ace/Makefile.am:
-          Updated because Arg_Shifter.cpp is not a template file
-
-Fri Jun  9 09:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-linux-common.h:
-          Added ACE_HAS_NETLINK, all linux versions do support netlink sockets.
-          This closes bugzilla bug 2317. Thanks to Robert Iakobashvili
-          <coroberti at gmail dot com> and Razi Ben-Yehuda
-          <raziebe at gmail dot com> for creating the netlink wrappers
-
-Fri Jun  9 08:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/SOCK_Netlink_Test.cpp:
-          New test for netlink sockets. Thanks to Robert Iakobashvili
-          <coroberti at gmail dot com> for creating this test.
-
-        * tests/tests.mpc:
-        * tests/run_test.lst:
-          Added new netlink test
-
-Fri Jun  9 07:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ARGV.{h,cpp,inl}:
-
-          Refactored ACE_ARGV to ACE_ARGV_T which is a template, where
-          ACE_ARGV is now a typedef of ACE_ARGV_T<ACE_TCHAR>. Taken the
-          idea from the wchar work of David Giovannini <giovannd at ociweb
-          dot com>
-
-        * ace/ace.mpc:
-        * ace/Makefile.am:
-
-          ARGV.cpp added to the template files, added the new netlink files
-
-        * ace/OS_NS_sys_stat.{h,inl}:
-        * ace/MMAP_Memory_Pool{h,cpp}:
-        * ace/Mem_Map.{h,cpp,inl}:
-        * ace/Filecache.{h,cpp}:
-        * ace/FILE_IO.cpp:
-        * ace/FILE.h:
-
-          Use ACE_LOFF_T for the filesize so that we can support files
-          bigger then 2Gb on windows and other platforms. Also use for
-          Borland the 64bit stat structure and api's. This fixes bugzilla
-          bug 1286, thanks to Ruslan Zasukhin <sunshine at public dot
-          kherson dot ua> for reporting this. Also fixes part of bugzilla
-          bug 2359, thanks to Olivier Brunet <o dot brunet at free dot fr>
-          for reporting this.
-
-Thu Jun  8 17:13:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/String_Base.h,
-          ace/Array_Map.h: Removed the @deprecated
-          comments to make Ossama happy ;-)  This fixes bugid 2558.
-
-Thu Jun  8 12:44:46 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_Thread.inl (recursive_mutex_lock): Cleaned up the
-          structure of the code here so that we don't try to release the
-          nesting lock unless it was acquired successfully.  Thanks to
-          J.T. for reporting this.
-
-Thu Jun  8 12:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/corba_e_compact.mpb:
-        * bin/MakeProjectCreator/config/corba_e_micro.mpb:
-          New base projects for CORBA/e micro and compact
-
-Thu Jun  8 12:28:49 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/DependencyGenerator/DependencyEditor.pm:
-        * bin/DependencyGenerator/DependencyGenerator.pm:
-        * bin/DependencyGenerator/GNUDependencyWriter.pm:
-        * bin/DependencyGenerator/GNUObjectGenerator.pm:
-        * bin/DependencyGenerator/Preprocessor.pm:
-        * bin/depgen.pl:
-
-          Committing performance improvements which take off about 7% from
-          the dependency generation time for the whole ACE_wrappers tree.
-
-Thu Jun  8 11:57:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/OS_NS_dirent.cpp:
-        * ace/OS_NS_dirent.h:
-
-          Don't compile the {opendir,readir,closedir,scandir}_emulation()
-          functions if {opendir,readir,closedir,scandir} are provided by
-          the OS.
-
-Thu Jun  8 11:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Netlink_Addr.h:
-        * ace/SOCK_SEQPACK_Association.h:
-          Doxygen fixes
-
-        * ace/OS_NS_Thread.inl:
-          Const improvement
-
-Thu Jun  8 11:37:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-
-          Define ACE_HAS_SCANDIR and ACE_SCANDIR_CMP_VOIDPTR.
-
-Wed Jun  7 23:02:53 UTC 2006  Krishnakumar B  <kitty@nospam.invalid.domain>
-
-        * tests/Recursive_Mutex_Test.cpp: Use ACE_TEST_MUTEX instead of
-          ACE_Recursive_Thread_Mutex so that we use the right version of
-          mutex (ACE_Process_Mutex) on Windows.  Thanks to Doug for the
-          suggestion.  This should fix the Recursive_Mutex_Test failing on
-          Windows.
-
-Wed Jun  7 21:42:36 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb
-
-          Fixed static library ordering problem.
-
-Wed Jun  7 13:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-doxygen.h:
-          Added ACE_HAS_NETLINK so that we get documentation for the new
-          netlink classes
-
-Wed Jun  7 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          Removed chorus
-
-Wed Jun  7 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_socket.h:
-          When ACE_HAS_NETLINK is defined, include more files specific
-          for this protocol.
-
-Wed Jun  7 12:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Netlink_Addr.{h,cpp,inl}:
-        * ace/SOCK_Netlink.{h,cpp,inl}:
-          New files for netlink sockets. Thanks to Robert Iakobashvili
-          <coroberti at gmail dot com> and Razi Ben-Yehuda
-          <raziebe at gmail dot com> for creating these new files.
-          These files will be added to the ACE mpc later this week, with
-          the files in the repo it is much easier to test them on
-          multiple linux version. See bugzilla bug 2317 for more info.
-
-Wed Jun  7 12:28:18 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Changed the message displayed when a project isn't build when a
-          particular feature is disabled.  Many users thought that this
-          message was an error, I believe, because of the word 'missing'.
-
-Wed Jun  7 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-suncc-common.h:
-          New config file for the SunCC compiler, idea is to refactor
-          all things related to the Sun C++ compiler to this file. This is
-          to make it easier to support Sun C++ on Linux
-
-Wed Jun  7 10:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_suncc.GNU:
-          First version for using the Sun compiler on Linux. The compiler
-          itself is an alpha version, so no guarantees at this moment
-
-Wed Jun  7 10:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Strategies_T.cpp:
-          Initialise pointer with 0 and const improvement
-
-Wed Jun  7 09:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          When using -SS we do generate an empty S.h file, so add S
-          to the header_outputext so that we zap this file during a clean
-
-Wed Jun  7 09:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_aix_g++.GNU:
-          Set X11 and Xt defines, thanks to Peter Grotrian
-          <peter dot grotrian at pdv-fs dot de> for reporting this. This fixes
-          bugzilla 2556
-
-        * ace/config-sunos5.5.h:
-          Added fixes to build with threads=0, this fixes bugzilla bug 2555. Thanks
-          to Peter Grotrian <peter dot grotrian at pdv-fs dot de> for reporting
-          this.
-
-        * ace/config-aix-4.x.h:
-          Added fixes to build with threads=0, this fixes bugzilla bug 2553. Thanks
-          to Peter Grotrian <peter dot grotrian at pdv-fs dot de> for reporting
-          this.
-
-        * include/makeinclude/platform_chorus.GNU:
-        * include/makeinclude/platform_chorus4.x_g++.GNU:
-        * include/makeinclude/platform_chorus_ghs.GNU:
-        * include/makeinclude/platform_psos_diab.GNU:
-        * include/makeinclude/platform_psos_diab_ppc.GNU:
-        * include/makeinclude/platform_psos_tm.GNU:
-        * include/makeinclude/platform_psosim_g++.GNU:
-          Removed these files, psos and chorus are not supported anymore
-
-Wed Jun  7 08:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.cpp:
-          Added needed check for VxWorks with task api
-
-        * ace/os_include/sys/os_stat.h:
-          Removed workarounds for old Borland compiler versions
-
-Wed Jun  7 03:25:00 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb
-        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpc
-
-          Corrected the file extension.
-
-Tue Jun  6 21:11:37 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/WFMO_Reactor.cpp (open): make sure we delete the
-          notify_handler_ before reassigning it to prevent resource leaks.
-          Thanks to Sonicfly Zhou <zhoucn at txsec dot com> for suggesting
-          this.
-
-Tue Jun  6 21:41:02 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Service_Gestalt.{h cpp}:
-        * ace/Dynamic_Service_Base.cpp:
-        * ace/Dynamic_Service_Dependency.cpp:
-        * ace/Service_Config.cpp:
-        * ace/Service_Object.cpp:
-        * ace/Svc_Conf_Lexer.cpp: Add missing #include directives.
-
-Tue Jun  6 18:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.cpp:
-          Reverted a change for VxWorks, broke other platforms, will make
-          a new change tomorrow.
-
-Tue Jun  6 17:14:51 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
-
-          Cleaned up the fill_value() method and removed an unused method.
-
-        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
-
-          Use DirectoryManager::mpc_basename() instead of
-          File::Basename::basename().
-
-Tue Jun  6 15:43:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd
-
-          Modified to explicitly state the name of a project being skipped
-          due to missing features or libraries.
-
-Tue Jun  6 03:57:08 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Hash_Map_Manager_T.cpp:
-        * ace/Hash_Map_Manager_T.h:
-
-          Added key() and item() methods to ACE_Hash_Map_Entry<>, to be
-          like ACE_RB_Tree_Node<>.  This makes it easier to switch code
-          to and from Hash_Maps and RB_Trees.  Mark direct access to
-          the ext_id_ and int_id_ fields @deprecated.
-
-        * ace/Hash_Map_Manager_T.cpp:
-        * ace/Hash_Map_Manager_T.h:
-        * ace/Hash_Map_Manager_T.inl:
-        * ace/RB_Tree.h:
-        * ace/RB_Tree.inl:
-
-          Added operator->() for iterators to be more like STL API.
-
-Mon Jun  5 20:27:42 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb
-        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpc
-
-          Restructured to clean up config handlers MPC files.
-
-Sun Jun  4 13:38:21 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Array_Map_Test.cpp: Fixed all uses of empty() to be
-          is_empty().
-
-Sun Jun  4 13:35:25 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Array_Map.{h,inl},
-        * ace/Intrusive_List.{h,inl},
-        * ace/String_Base.{h,inl}: Changed empty() to is_empty(), which
-          makes more sense.  Kept empty() around for the time being as a
-          @deprecated method.  Thanks to Domingos Monteiro <d dot monteiro
-          at netia dot net> for this suggestion.
-
-Sun Jun  4 00:51:38 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/CString.{h,inl,cpp}: Added some performance improvements for ACE_CString:
-
-          . Introduced new operators == and != to compare ACE_CString
-            and const char *.  This results in at least a 10-fold performance
-            improvement, due to avoiding dynamic memory allocation.
-
-          . Streamlined the existing operator == between two ACE_CString's.
-            (15% improvement in some cases, due to avoiding some of the
-            overhead of compare())
-
-          Also cleaned up some of the doxygen comments, e.g., the
-          ACE_CString comparison operators must have been returning an
-          integer at some point (?), but it's not the case anymore.
-          Thanks to Patrick Rabau <pr2345 at gmail dot com> for these
-          patches.
-
-Fri Jun  2 19:52:19 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Removed DII_Collocation_Tests.
-
-Fri Jun  2 16:29:55 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Select_Reactor_T.cpp (open): Added an error message
-          explicitly noting that the notification pipe open failed, which
-          should make debugging easier when this occurs, e.g., due to a
-          disabled network interface.  Thanks to David Highley <dhighley
-          at highley-recommended dot com> for this suggestion.
-
-Fri Jun  2 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb:
-          Updated to make cross compilation possible
-
-Fri Jun  2 12:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-          Added TAO_IDL3_TO_IDL2 and TAO_IDL3_TO_IDL2_DEP as first step to
-          run idl3_to_idl2 in a cross build environment
-
-Fri Jun  2 11:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_vxworks6.2.GNU:
-          Updated for VxWorks 6.2
-
-Fri Jun  2 11:33:36 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Recursive_Mutex_Test.cpp (test_recursion_depth): The
-          get_nesting_level() only works on certain OS platforms, so don't
-          use it as part of the test.
-
-Fri Jun  2 10:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Configuration.cpp:
-          Fixed operator==
-
-        * tests/Config_Test.{h,cpp}:
-          Added an explicit test for operator==. Thanks to Popeye Cai
-          <popeye dot cai at utstar dot com> for reporting this. This
-          fixes bugzilla bug 2550
-
-Fri Jun  2 10:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.cpp:
-          Improved VxWorks 6.2 support
-
-        * ace/Svc_Handler.cpp:
-          64bit change and initialise pointer with 0
-
-        * ace/Process.cpp:
-          Added support for VxWorks 6.x in rtp mode
-
-Fri Jun  2 09:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.inl:
-          Added necessary code for VxWorks 6.2
-
-Thu Jun  1 23:13:58 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Added oneway and twoway DII_Collocation_Tests.
-
-Thu Jun  1 20:53:31 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/Recursive_Mutex_Test.cpp (run_main):
-
-          Added ACE_UNUSED_ARG macros to eliminate 'unused parameter'
-          warnings on single threaded builds.
-
-Thu Jun  1 16:54:56 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Added new DII_Collocation_Tests.
-
-Thu Jun  1 13:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/FILE.cpp:
-          Const improvement
-
-Thu Jun  1 12:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Dirent_Test.cpp:
-          Updated VxWorks specific checks, removed chorus checks
-
-Thu Jun  1 11:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Threads/thread_pool.cpp:
-          Fixed 64bit conversion warnings
-
-Thu Jun  1 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/diff-builds.pl:
-          Corrected usage of strftime
-
-Thu Jun  1 09:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Default_Constants.h:
-          Define the platform suffix for vxworks
-
-        * ace/Sock_Connect.cpp:
-          Added include for VxWorks and removed some unneeded checks
-          for vxworks >= 0x600
-
-        * ace/ACE.h:
-          Doxygen improvement
-
-        * ace/config-vxworks6.2.h:
-          Updated with more settings to better match vxworks 6.2
-
-        * ace/Process_Manager.cpp:
-          Added specific check for vxworks
-
-        * ace/OS_NS_stdlib.inl:
-          Emulate putenv with setenv when putenv is not available but
-          setenv is.
-
-Thu Jun  1 02:26:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Service_Gestalt.h:
-        * ace/Service_Gestalt.cpp:
-
-          Reworked the way static svc descriptors are kept so that if DLLs
-          include static initializers, they won't cause a problem if the
-          DLL is later unloaded and reloaded. There is currently no
-          dependency replationship between these "static" services and the
-          DLL that contains them, so there is still a slight risk that
-          pointers held after the DLL is unloaded might be referenced. But
-          the only thing that actually uses these pointers is the service
-          gestalt itself if it is processing an explicit static directive
-          and the desired service object had not yet been loaded in that
-          configuration context.
-
-Wed May 31 20:49:03 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/APG/Logging/Trace.h:
-
-          Added '##' to several macro definitions in this file, at the
-          suggestion of Steve Huston <shuston@riverace.com> to get
-          rid of warnings on GCC4 platforms.
-
-Wed May 31 18:18:37 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb:
-
-          Shortened some line lengths, to make the file more readable.
-
-Wed May 31 16:36:43 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/tests.mpc:
-        * tests/run_test.lst: Don't build or run Unload_libACE on WinCE. The
-          code is purposely leaving out ACE stuff and the ACE stuff is needed
-          for WinCE, unless there's lots of conditional code added to duplicate
-          the workings on ACE_TMAIN on CE.
-
-Wed May 31 14:33:16 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/OS_NS_Thread.inl (recursive_mutex_lock):
-
-          Added additional ACE_UNUSED_ARG for the timeout parameter, to
-          eliminate warnings in single-threaded builds.
-
-Wed May 31 13:05:05 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Argv_Type_Converter.cpp (align_char_with_wchar): ACE-ified this code.
-
-Wed May 31 14:00:16 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/Recursive_Mutex_Test.cpp (run_main):
-
-          Moved '#if defined (ACE_HAS_THREADS)' up a few lines to include
-          a variable defined inside the same guard at the top of the file,
-          to eliminate an 'undefined' error on single-threaded builds.
-
-Wed May 31 13:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added Bug_2542_Regression, this should run without problems
-
-Wed May 31 11:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_time.inl:
-          Fixed unreachable code warning
-
-Wed May 31 09:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          Changes for ACE_FOR_TAO configuration
-
-Wed May 31 08:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bound_Ptr_Test.cpp:
-          Initalise pointers with 0
-
-Wed May 31 08:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Recursive_Mutex_Test.cpp:
-          Added missing include to get ACE_OS::sleep
-
-Tue May 30 21:56:52 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ACE-INSTALL.html: Corrected the AIX section; removed descriptions of
-          old compilers that are no longer supported and suggested the config
-          and platform_macros files to use. Thanks to Michelle Zheng
-          <Michelle dot Zheng at dowjones dot com> for motivating this.
-
-        * THANKS: Added Michelle Zheng to the Hall of Fame.
-
-Tue May 30 19:17:40 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Dynamic_Service.h:
-        * ace/Dynamic_Service.inl:
-        * ace/Dynamic_Service.cpp:
-        * ace/Dynamic_Service_Base.h:
-        * ace/Dynamic_Service_Base.cpp:
-        * ace/Dynamic_Service_Dependency.cpp:
-
-          In order to ensure proper separation of contexts, this patch
-          gives the dynamic service instance lookup the ability to
-          optionally exclude the global configuration context.
-
-        * ace/Service_Gestalt.h:
-        * ace/Service_Gestalt.cpp:
-
-          To allow explicitly configured static service objects, those for
-          which a directive such as 'static XYZ "foo bar"', to be
-          independently configured in different configuration contexts,
-          these changes retain any static service descriptor for service
-          XYZ, then looks for a previous instance of XYZ in the local
-          context only, otherwise it uses the previously retained static
-          service descriptor to create a new instance.
-
-
-Tue May 30 18:24:54 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/DLL.h (ACE_DLL): Updated the documentation of open() to explain the
-         lookup scheme when a filename is given.  Thanks to Phlip
-          <phlip2005 at gmail dot com> for motivating this.
-
-Tue May 30 13:06:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/ACE.inl:
-        * ace/Base_Thread_Adapter.cpp:
-        * ace/Default_Constants.h:
-        * ace/Global_Macros.h:
-        * ace/OS.h:
-        * ace/OS_NS_Thread.cpp:
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_netdb.inl:
-        * ace/OS_NS_signal.inl:
-        * ace/OS_NS_sys_socket.inl:
-        * ace/OS_NS_time.inl:
-        * ace/OS_main.cpp:
-        * ace/OS_main.h:
-        * ace/Object_Manager_Base.h:
-        * ace/Process_Manager.cpp:
-        * ace/Process_Semaphore.cpp:
-        * ace/Process_Semaphore.h:
-        * ace/Process_Semaphore.inl:
-        * ace/Recursive_Thread_Mutex.cpp:
-        * ace/SV_Semaphore_Simple.h:
-        * ace/TLI_Acceptor.cpp:
-        * ace/Thread_Adapter.cpp:
-        * ace/Token.h:
-        * ace/config-macros.h: Removed all vestiges of PSOS.
-
-Tue May 30 12:22:53 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/mpc.pl:
-        * bin/mwc.pl:
-
-          Added a load-time check for the minimum perl version (5.6).
-
-Tue May 30 12:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.cpp:
-        * ace/OS_NS_dirent.inl:
-        * ace/OS_NS_netdb.inl:
-        * ace/OS_NS_pwd.inl:
-        * ace/OS_NS_stdlib.inl:
-        * ace/OS_NS_Thread.cpp:
-        * ace/OS_NS_Thread.inl:
-        * ace/OS_NS_time.cpp:
-        * ace/OS_NS_time.inl:
-        * ace/Thread_Manager.cpp:
-        * ace/os_include/os_pthread.h:
-        * ace/os_include/os_stdlib.h:
-          Removed support for HPUX 10.20
-
-        * ace/os_include/net/os_if.h:
-        * ace/os_include/netinet/os_tcp.h:
-          Removed psos support
-
-        * ace/os_include/sys/os_types.h:
-          Removed ACE_LACKS_FLOATING_POINT
-
-Tue May 30 11:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-hpux-10.x-g++.h
-        * ace/config-hpux-10.x-hpc++.h
-        * ace/config-hpux-10.x.h
-          Removed these files, not supported anymore
-
-        * ace/OS_NS_time.inl:
-          Removed check for ACE_CTIME_R_RETURNS_INT, it was for hpux 10.20
-
-Tue May 30 11:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-osf1-4.0.h:
-          Removed, contents merged to tru64 file
-
-        * ace/config-tru64.h:
-          Added osf1-4.0 file contents, be aware that tru64 support hasn't
-          been tested for a long time.
-
-Tue May 30 11:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Recursive_Mutex_Test.cpp:
-          Fixed compile error
-
-Tue May 30 11:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/os_stdio.h:
-          Removed psos support
-
-        * ace/IOStream.h:
-          Removed checks for ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS, that was only
-          set for chorus which is removed
-
-        * ace/Basic_Types.h:
-        * ace/Log_Msg.cpp:
-        * ace/Profile_Timer.{h,cpp}:
-          Removed checks for ACE_LACKS_FLOATING_POINT. Was only set for chorus
-          which is now removed.
-
-        * ace/OS_NS_Thread.cpp:
-          Removed chorus support
-
-        * ace/config-chorus.h:
-          Removed.
-
-        * ace/INET_Addr.cpp
-        * ace/Lib_Find.cpp
-        * ace/Local_Tokens.cpp
-        * ace/Log_Record.cpp
-        * ace/Parse_Node.cpp
-          Removed check for ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS, is only
-          set for psos which we don't support anymore
-
-        * ace/os_include/os_signal.h:
-          Removed check for ACE_SIGINFO_IS_SIGINFO_T, only set for psos
-
-        * 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
-          Removed from the repo, psos support has been removed
-
-Tue May 30 10:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Stream.cpp:
-          Use true/false, when demarshaling a string, check the result of the
-          demarshaling of the length of the string, if that failed, just return
-          directly instead of trying to demarshal a random lenght string
-
-        * ace/Task.h:
-        * ace/System_Time.h:
-          Doxygen improvement
-
-        * ace/ACE.cpp:
-        * ace/SOCK_Dgram_Bcast.cpp:
-        * ace/Sock_Connect.cpp:
-        * ace/Process.cpp:
-        * ace/OS_NS_unistd.cpp:
-        * ace/Mem_Map.cpp:
-          Removed chorus support
-
-        * ace/config-fsu-pthread.h:
-          Removed this file, this configuration isn't supported and used for
-          ages
-
-        * ace/Condition_Thread_Mutex.cpp:
-        * ace/Recursive_Thread_Mutex.cpp:
-          Removed fsu pthread support
-
-        * ace/Process_Manager.cpp:
-          Const improvement
-
-        * ace/OS.inl:
-        * ace/OS_NS_sys_socket.inl:
-        * ace/OS_NS_stdlib.cpp:
-        * ace/OS_NS_stdlib.inl:
-        * ace/OS_NS_Thread.cpp:
-          Removed psos support
-
-        * ace/OS_NS_unistd.inl:
-        * ace/OS_NS_stdio.{h,cpp,inl}:
-        * ace/Handle_Set.h:
-        * ace/OS_NS_Thread.{h,inl}:
-          Removed psos and chorus support
-
-        * ace/Thread_Manager.{h,cpp,inl}:
-          Made terminated_ a real bool, removed chorus support, check for
-          ACE_VXWORKS instead of VXWORKS
-
-        * ace/OS_NS_sys_time.inl:
-          Check for ACE_VXWORKS instead of VXWORKS
-
-        * ace/MMAP_Memory_Pool.{h,cpp}:
-          Removed chorus support, use bool internally and added an option to
-          get each time an unique mmap filename
-
-        * ace/config-linux-common.h:
-          Added ACE_HAS_VOIDPTR_MMAP and removed KCC support
-
-        * ace/ace_wchar.inl
-        * ace/Default_Constants.h
-        * ace/INET_Addr.h
-        * ace/IPC_SAP.cpp
-        * ace/Message_Queue.cpp
-        * ace/Message_Queue.h
-        * ace/Message_Queue.inl
-        * ace/Message_Queue_T.cpp
-        * ace/Message_Queue_T.h
-        * ace/OS.h
-        * ace/OS_NS_macros.h
-        * ace/OS_NS_stdio.h
-        * ace/OS_NS_stdio.inl
-        * ace/OS_NS_stdlib.inl
-        * ace/OS_NS_Thread.cpp
-        * ace/OS_NS_Thread.h
-        * ace/OS_NS_Thread.inl
-        * ace/OS_NS_time.inl
-        * ace/Recursive_Thread_Mutex.cpp
-        * ace/Sched_Params.cpp
-        * ace/Select_Reactor_T.cpp
-        * ace/SOCK_Dgram_Bcast.cpp
-        * ace/Thread_Manager.h
-        * ace/Token.h
-          Check for ACE_VXWORKS instead of VXWORKS
-
-Mon May 29 22:08:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_Thread.inl (recursive_mutex_lock): *Really* make the compiler
-          happy now.  Thanks Olli!
-
-Mon May 29 21:12:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_Thread.inl (recursive_mutex_lock): Added a const_cast
-          for ACE_Time_Value * to make the compiler happy when passing the
-          timeout parameter to ACE_OS::cond_timed_wait().  Thanks to Olli
-          Savia for helping here.
-
-Mon May 29 20:30:44 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * We recently added the 2100th contributor to ACE+TAO+CIAO!!!  The
-          2000th contributor was added in August of 2005, this means that
-          over 100 different people have contributed to the project in the
-          past 9 months!
-
-Mon May 29 19:50:54 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * examples/Service_Configurator/IPC-tests/server/server_test.cpp (ACE_TMAIN):
-          Changed
-
-          ACE_Reactor::instance ()->run_reactor_event_loop ()
-
-          to
-
-          ACE_Reactor::run_event_loop ()
-
-          so that reconfiguration happens properly after a SIGHUP or
-          SIGINT occurs.  Thanks to Kevin Hu <Xiaotao dot Hu at ge dot
-          com> for motivating this.
-
-Mon May 29 18:10:50 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/Signal_Test.cpp:
-        * tests/Thread_Manager_Test.cpp: Add missing ACE_TEXT to a string.
-
-Mon May 29 18:44:05 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Recursive_Mutex_Test.cpp: Enhanced this test to exercise
-          the new timed feature of ACE_Recursive_Thread_Mutex.
-
-Mon May 29 18:16:31 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Recursive_Thread_Mutex.h: Clarified that get_nesting_level()
-          may return -1 on some platforms when ACE_HAS_RECURSIVE_MUTEXES
-          is enabled.
-
-Mon May 29 17:45:02 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Recursive_Thread_Mutex.inl: Moved some of the short accessor
-          methods from the Recursive_Thread_Mutex.cpp file to here.
-
-        * ace/Recursive_Thread_Mutex.h,
-          ace/Recursive_Thread_Mutex.inl: Added support for time recursive
-          mutexes, thanks also to Abdullah.
-
-        * ace/OS_NS_Thread.h,
-        * ace/OS_NS_Thread.inl: Added support for timed recursive mutexes.
-          Thanks to Abdullah Sowayan <abdullah dot sowayan at lmco dot
-          com> for contributing this.
-
-Mon May 29 17:30:52 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_Thread.h: Updated the documentation to clarify why
-          recursive mutexes can't be used for ACE_OS::mutex_lock().
-
-Mon May 29 18:27:08 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/DLL/test_dll.cpp:
-
-          Changed instances of a C-style cast from void* to
-          pointer-to-function to a two-step reinterpret_cast
-          using ptrdiff_t as an intermediate. C++ forbids casting
-          directly between pointer-to-object and pointer-to-function,
-          and some of the newer compilers are catching it.
-
-Sat May 27 15:03:07 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * netsvcs/servers/main.cpp (ACE_TMAIN): Removed the following code:
-
-          if (ACE::debug () == 0)
-            ACE_LOG_MSG->priority_mask (~LM_DEBUG, ACE_Log_Msg::PROCESS);
-
-          since (1) it makes debugging hard and (2) it's simply wrong
-          since it's blowing away anything that's set by the
-          ACE_Logging_Strategy in the svc.conf file.
-
-Sat May 27 14:37:14 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Log_Record.cpp (print): Only print out the log records if the
-          corresponding type is enabled for logging.
-
-Sat May 27 14:35:21 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * netsvcs/servers/main.cpp: Enable the ignore_debug_flag in the
-          ACE_Service_Config::open() call so that we can override the
-          default ACE_Log_Priority settings in the svc.conf file.
-
-Sat May 27 11:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/SCTP/hist.cpp:
-          Fixed compile error
-
-Fri May 26 22:02:48 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp:
-        * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp:
-        * examples/IPC_SAP/SPIPE_SAP/server.cpp: Wide-char fixes; there's no
-          wide-char variant for ACE_OS::fdetach().
-
-        * examples/IPC_SAP/TLI_SAP/CPP-client.cpp:
-        * examples/IPC_SAP/TLI_SAP/db-client.cpp:
-        * examples/IPC_SAP/TLI_SAP/ftp-client.cpp:
-        * examples/Connection/non_blocking/test_tli_acceptor.cpp:
-        * examples/Connection/non_blocking/test_tli_connector.cpp:
-          Wide-char/narrow-char fixes.
-
-Fri May 26 21:47:56 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * netsvcs/lib/Client_Logging_Handler.cpp,
-        * netsvcs/lib/Server_Logging_Handler_T.cpp,
-        * ace/Log_Msg_IPC.cpp: Removed the special case code for Windows
-          since it seems like ACE (or Windows) now handles this properly.
-
-Fri May 26 21:20:35 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Log_Record.cpp (operator>>): Add one when allocating the buffer.
-
-Fri May 26 13:16:48 UTC 2006  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * ace/DLL_Manager.cpp:
-
-          Fixed incorrect usage of ACE::debug check.  Thanks to Johnny for
-          reporting this.
-
-Fri May 26 15:04:55 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ASNMP/tests/Counter_Test.cpp:
-        * ASNMP/tests/Gauge_Test.cpp:
-        * performance-tests/SCTP/hist.cpp:
-
-          Added static_cast<>s to eliminate implicit conversion warnings.
-
-Fri May 26 12:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Naming_Test.cpp:
-          Replaced assert with if statement, resolved argument not used
-          warning in BCB6 release builds
-
-Fri May 26 10:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1890_Regression_Test.cpp:
-        * tests/Bug_2540_Regression_Test.cpp:
-          New tests made by Carlos O'Ryan for the given bug numbers.
-
-        * tests/run_test.lst:
-        * tests/tests.mpc:
-          Added the new tests above
-
-Fri May 26 09:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/Run_Test.pm:
-          Increased wait_interval_for_process_creation from 5 to 10 seconds.
-          On the slower systems some tests failed because the startup time
-          is longer then 5 seconds, especially if several configuration files
-          are read and saved during startup
-
-Fri May 26 08:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/diff-builds.pl:
-          Fixed typo in comment
-
-Thu May 25 04:58:44 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Tokens_Test.cpp (run_main): Don't try to spawn the
-          netsvcs/server/main if it's not built.
-
-Thu May 25 03:53:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/config_h.m4:
-
-          Removed AH_TEMPLATE for ACE_LACKS_TCP_H.  This was replaced
-          with ACE_LACKS_NETINET_TCP_H long ago.
-
-Wed May 24 22:19:43 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Repository.{h, inl, cpp}:
-
-          Changed size arguments type to size_t in ctor, open,
-          current_size, total_size and the corresponding members.
-          ACE_Service_Repository_Iterator::next_ now starts from 0 instead
-          of -1 to avoid warnings about signed/unsigned comparisons.
-
-        * ace/Service_Gestalt.cpp:
-
-          Reverted the change "Wed May 24 14:00:43 UTC 2006 Iliyan
-          Jeliazkov <iliyan@ociweb.com>", since now the
-          Service_repository::instance() takes size_t argument.
-
-        * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc:
-        * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc:
-
-          Fixed and error whereby the DLL's generated by this two project
-          files did not match the name used in the svc configuration
-          files, causing the test to crash because of missing DLL.
-
-Wed May 24 13:08:08 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Message_Queue.h: Added #include "ace/Thread_Mutex.h" on platforms
-          that have ACE_Message_Queue_NT available; that class has a
-          ACE_Thread_Mutex member so the include is needed to see the class.
-          Thanks to Guy Peleg <guype at amdocs dot com> for this fix.
-
-Wed May 24 17:39:47 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Remote_Tokens.cpp (request_reply): Added a helpful error
-          message to make it easy to track down problems with TSS.
-
-Wed May 24 17:22:31 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Change feature test to define ACE_LACKS_NATIVE_STRPTIME if
-          system doesn't support strptime(), as it seems ACE doesn't
-          follow its feature test macro naming conventions when it comes
-          to strptime().
-
-          Changed ACE_LACKS_STRPTIME_PROTOTYPE feature test to use
-          AC_CHECK_DECL instead of AC_EGREP_HEADER.
-
-Wed May 24 16:33:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-        * m4/config_h.m4:
-
-          Changed ACE_LACKS_STRPTIME and ACE_LACKS_STRPTIME_PROTOTYPE
-          feature tests to use the same idiom as similar tests.  This
-          Avoids requiring an AH_TEMPLATE for each feature test macro
-          in config_h.m4.
-
-Wed May 24 09:07:53 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * ace/Activation_Queue.cpp,
-        * ace/Activation_Queue.inl: Fixed the queue() "setter" method
-          so that it doesn't leak memory.  Thanks to David Chu <beyonddc
-          dot storage at gmail dot com> for providing this fix.
-
-Wed May 24 14:00:43 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.cpp:
-
-          Added a cast from size_t to int in the ctor to match the
-          interface of ::instance() and to quiet the 64bit compilers,
-          complaining about loss of precision in the implicit conversion.
-
-Tue May 23 19:21:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Signal_Test.cpp:
-
-          Reset SIGHUP handler to SIG_DFL to support cases where SIGHUP
-          is ignored (running under nohup(1), etc.).
-
-Tue May 23 10:55:59 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * netsvcs/lib/Client_Logging_Handler.cpp (handle_input):
-        * netsvcs/lib/Server_Logging_Handler_T.cpp
-          (handle_logging_record): Cleaned up the code so that it should
-          have no memory leaks and will also build cleanly on all the OS
-          platforms.
-
-        * ace/Log_Msg_IPC.cpp: Fix support for ACE_HAS_STREAM_PIPES.
-
-Tue May 23 13:05:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Log_Msg.cpp:
-          Fixing a memory leak found by valgrind.
-
-        * ace/Timeprobe.cpp:
-          Added missing include - this wouldn't comple with both noinline
-          and ACE_COMPILE_TIMEPROPE set.
-
-Mon May 22 21:13:15 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/diff-builds.pl:
-
-          Updated to allow diff between the tests failures today and on a
-          specified date, for the clean builds (or, all the builds from
-          the build score).
-
-Mon May 22 19:06:41 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Log_Record.cpp (operator<<, operator>>): Have to use a different
-          CDR array method when ACE_USES_WCHAR.
-
-Mon May 22 09:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * netsvcs/lib/Client_Logging_Handler.cpp:
-          Fixed compile error on Solaris
-
-Mon May 22 04:53:29 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Signal_Test.cpp:
-
-          The change:
-          Sat May 20 15:10:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-          Was not enough to get this test working on all platforms.
-
-          Revert to using ACE_Sig_Guard in worker_child().  Handle the
-          SIGINT race condition by raising it if and only if the child
-          was not shut down by the parent.
-
-Sun May 21 13:46:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/Service_Config_Test.cpp:
-
-          Fixing Windows test failures, because errno gets overriden
-          between Service Repository::insert() and testLimits(). Most
-          likely, it happens in ace_yyparse (), however the existing
-          mechanism for reporting parser errors does not allow for
-          reliably propagating the cause of the error. Removing the test
-          for the cause of the error and simply reporting the error, if it
-          had occured.
-
-Sat May 20 15:10:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Signal_Test.cpp:
-
-          Changed synchronous tests to block signals at the top level.
-          This had been done with a ACE_Sig_Guard, but that lead to a race
-          condition between when the guard was release and the delivery of
-          the SIGINT the client sends to itself.  The SIGINT would then be
-          handled by the default handler, which terminated the process
-          before the "Ending" message was written to the log.
-
-          #if'd out the ACE_DEBUG, etc. invocations from handle_signal().
-          These result in signal-unsafe functions being called when the
-          handler is called asynchronously.  A braver person would have
-          just removed them entirely.
-
-Fri May 19 20:08:29 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-sunos5.6.h:
-        * ace/os_include/sys/os_mman.h: Moved the declaration of ::madvise()
-          from config-sunos5.6.h to os_mman.h, to be compiled only when
-          ACE_LACKS_MADVISE_PROTOTYPE is defined. Set
-          ACE_LACKS_MADVISE_PROTOTYPE in config-sunos5.6.h where it used to
-          declare madvise(). This allows autoconf-detected
-          ACE_LACKS_MADVISE_PROTOTYPE platforms (such as Solaris 9) to
-          compile correctly.
-
-Fri May 19 17:53:51 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.cpp:
-
-          Fixed a defect in process_directive () which was replacing the
-          ENOSPC errno with EINVAL. Added #ifndef ACE_NLOGGING / #endif
-          around logging statements.
-
-        * ace/Service_Repository.cpp:
-
-          Minor reformating.
-
-        * tests/Service_Config_DLL.cpp:
-
-          Added two independent service objects, to be used in the
-          testLimits test. See testLimits().
-
-        * tests/Service_Config_Test.cpp:
-
-          Reworked the testLimits() to avoid printing the word "error",
-          which confuses the test driver into thinking the test failed.
-
-Fri May 19 17:51:33 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Service_Gestalt.cpp:
-
-          Elminated memory leak found by valgrind.
-
-Fri May 19 17:09:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/Service_Config_Test.cpp:
-
-          Fixed a warning due to assignment of a string literal to a
-          non-const variable.
-
-Thu May 18 17:42:09 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/diff-builds.pl:
-
-          Contributing a little tool to find the difference in the failing
-          tests between two dates, on the same build. Or between two
-          builds, on a particular date. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for mining and hosting the data used by
-          this script.
-
-Thu May 18 17:33:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-        * m4/config_h.m4:
-
-          Changed feature test for socklen_t to #include <sys/types.h>
-          before <sys/socket.h>.  Use cannonical AC_CHECK_TYPE and
-          AC_DEFINE with a third argument instead of a AH_TEMPLATE for
-          ACE_HAS_SOCKLEN_T.  Fixes configuration on OpenBSD.  Thanks to
-          Vladimir Panov <gbr at voidland dot org> for reporting this bug.
-
-Thu May 18 16:37:46 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * configure.ac: Set a ACE_VERSION_NAME variable with the version
-          string (canonical major.minor.beta), which may include a fix kit id.
-
-        * bin/MakeProjectCreator/config/acedefaults.mpb: Change am_version from
-          libtool's -version-info format (current:revision:age) to the ACE
-          release number format (major.minor.beta) and rename it am_release.
-          This is intended for use with the libtool's -release option and will
-          result in library names that correspond to the ACE kit number.
-          The -version-info option uses interface numbers meant to indicate a
-          series of public API numbers. However, with ACE, things change
-          pretty often. Rather than try to come up with a way of managing
-          interface numbers, just use the release numbering that users know
-          and are used to.
-
-Thu May 18 15:15:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Removed Limits from the list of ORB tests because it is now part
-          of ACE.
-
-        * tests/Service_Config_Test.cpp:
-
-          Added functionality to test gestalt size limits.
-
-Thu May 18 15:21:33 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * NEWS:
-        * ace/Task.{h inl cpp}: Reverted the changes from:
-          Fri Apr 14 15:53:21 UTC 2006  Steve Huston  <shuston@riverace.com>
-          Tasks that delete themselves from within close() would invalidate
-          the lock that ACE_Task held across the close() call and perform
-          undefined and illegal actions on the deleted lock upon return.
-          Bugzilla #2339 remains unresolved.
-
-Wed May 17 20:31:11 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com>
-
-        * ace/DLL_Manager.cpp:
-        * ace/DLL_Manager.h:
-          The dll handle is added to the to the
-          handle_vector_ only after the library is opened
-          successfully. This way, the vector does not have redundant
-          handles.
-
-        * ace/Object_Manager.cpp:
-          ACE_DLL_Manager::close_singleton is called explicitly from the
-          ACE_Object_Manager to make sure ACE_DLL_Manager gets cleaned up,
-          even if there was an error while opening a lib file.
-
-          Thanks to Timo Kuosmanen <ttkuosma at cc dot jyu dot fi> for
-          reporting this.
-
-Wed May 17 14:07:33 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * netsvcs/lib/Server_Logging_Handler_T.cpp: Improved the code so
-          that it should compile and run properly on Windows.  Thanks to
-          Phil Mesnier for reporting this.
-
-Wed May 17 19:07:43 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Dynamic_Service_Dependency.h: Doxygen correction; use @c to
-          set a word in "typewriter" font, but for known class names, there's
-          no need to do this.
-
-Wed May 17 17:56:49 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * examples/C++NPv1/Logging_Client.cpp
-        * examples/C++NPv1/Logging_Handler.cpp
-        * examples/C++NPv2/Logging_Handler.cpp
-
-          Removed now-redundant CDR insertion/extration operators now
-          defined in ace/Log_Record.{h,cpp}
-
-Wed May 17 09:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_ipc.h:
-        * ace/os_include/sys/os_socket.h:
-        * ace/os_include/sys/os_stat.h:
-        * ace/os_include/sys/os_types.h:
-          Removed psos support
-
-        * ace/os_include/sys/os_mman.h:
-          Removed madvice prototype and ACE_LACKS_MADVISE_PROTOTYPE, it
-          is not set in any config file
-
-Wed May 17 02:23:31 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Log_Msg_IPC.cpp:
-
-          Fix typo exposed on systems with ACE_HAS_STREAM_PIPES defined.
-          I'll leave it to Will & Doug to do whatever the TO DO said to do.
-
-Tue May 16 22:23:55 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ace/Log_Msg_IPC.cpp
-        * ace/Log_Record.cpp
-        * ace/Log_Record.h
-        * ace/Log_Record.inl
-        * netsvcs/lib/Client_Logging_Handler.cpp
-        * netsvcs/lib/Server_Logging_Handler_T.cpp
-
-          Fixed some problems that stemmed from changing ACE_Log_Msg
-          msg_data_ from a fixed-size array to a dynamically-sized array.
-          Thanks to Keith Muzzioli <Keith_W_Muzzioli at raytheon dot com>,
-          John Black <John_K_Black at Raytheon dot com>, and Mitsuo
-          Fukasawa <fukasawa_mitsuo at nifty dot com> for reporting this
-          and to Doug Schmidt for helping to fix it!
-
-Tue May 16 13:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_time.inl:
-        * ace/OS_NS_time.{h,cpp,inl}:
-          Removed chorus and psos support
-
-        * ace/OS_Thread_Adapter.cpp:
-          Removed psos support
-
-Tue May 16 13:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_wait.{h,inl}:
-          Remove chorus support
-
-        * ace/OS_NS_stropts.inl:
-        * ace/OS_NS_sys_stat.inl:
-        * ace/OS_NS_string.inl:
-          Removed psos support
-
-Tue May 16 13:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.cpp:
-        * ace/OS_NS_arpa_inet.{h,cpp,inl}:
-        * ace/OS_NS_dirent.inl:
-          Removed psos support
-
-        * ace/INET_Addr.cpp:
-        * ace/config-macros.h:
-          Removed chorus support
-
-        * ace/Unbounded_Queue.h:
-          Removed remark about chorus
-
-        * ace/config-cray.h:
-          Removed explicit template instantiation define, we don't have that
-          anymore
-
-        * ace/config-hpux-11.00.h:
-        * ace/config-sunos5.7.h:
-        * ace/config-rtems.h:
-        * ace/config-osf1-4.0.h:
-          Removed kcc support
-
-Mon May 15 11:30:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-          Added more tests that can't run in ACE_FOR_TAO configations due
-          to dependency on something that avoids ACE_FOR_TAO.
-
-Mon May 15 01:15:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-        * bin/tao_other_tests.lst:
-          Added !ACE_FOR_TAO to those tests for which MPC skips generating
-          executables because it directly or indirectly avoids ACE_FOR_TAO.
-          Indirect avoidance occurs when a project derives from a base
-          project that avoids ACE_FOR_TAO.
-
-Thu May 11 12:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Message_Block.h:
-          Doxygen improvements
-
-Thu May 11 11:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Dev_Poll_Reactor.cpp:
-          Removed chorus support
-
-Thu May 11 07:19:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added Bug_1254_Regression
-
-Wed May 10 14:10:02 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-win32-msvc-7.h: MSVC 7.1 operator new throws an exception
-          on an out-of-memory condition, but only when the standard C++
-          library is used; the older CRT new() doesn't.
-
-Tue May  9 11:38:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/orbsvcslib.mpb:
-          Add -GT to the idlflags, all orbsvcs then do generate the TIE files,
-          if people then use them, they get them out of the box.
-
-Tue May  9 07:36:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          Removed -Sc, added -GT, see bugzilla bug 2525 for more info
-
-Tue May  9 07:25:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Condition_T.{h,cpp,inl}:
-        * ace/Local_Name_Space_T.cpp:
-        * ace/Configuration.cpp:
-        * ace/Sched_Params.cpp:
-        * ace/Mutex.{h,cpp,inl}:
-        * ace/Select_Reactor_T.cpp:
-        * ace/Signal.cpp:
-          Removed Chorus support
-
-        * ace/CDR_Stream.cpp:
-          Small layout change
-
-        * ace/Event_Handler.cpp:
-          Removed psos support
-
-        * ace/Message_Block.h:
-          Doxygen improvements
-
-        * ace/Message_Block.cpp:
-          Const improvement
-
-Sun May  7 21:03:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.{h,cpp}:
-
-          Weeding out the remaining issues with single threaded
-          builds. The implementation now relies on the ACE_TSS_* macros to
-          abstract from the differences among build styles and platform
-          support for TSS.
-
-        * ace/Service_Gestalt.{h,cpp}:
-
-          Eliminated commented out code. Minor reformatting in places.
-
-        * ace/TSS_T.{h,inl,cpp}:
-
-          Added some comments to help others avoid a few pitfalls. Made
-          ts_init() a non-const, which eliminates a few const_cast's.
-
-Sun May  7 07:02:51 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.h:
-        * ace/Service_Config.cpp:
-
-          Refactored the TSS usage (again) to fix a nasty
-          order-of-initialization problem. The gist of which is that, if
-          the ptr (to a template class instance) is a static member, in
-          static builds, it will be initialized by the process prologue
-          code *after* another static initializer has had the chance to
-          use and assign it a value. The solution was to use a method
-          scope static instance, which C++ guarantees to be initialized by
-          the (first) exit from that method.
-
-        * ace/Service_Gestalt.h:
-        * ace/Service_Gestalt.cpp:
-
-          Refactored the construction to avoid using straight new in
-          constructor initializer lists. Replaced new with ACE_NEW_* where
-          appropriate.
-
-Sat May  6 18:08:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add feature tests for ACE_LACKS_ASCTIME, ACE_LACKS_ACSTIME_R,
-          ACE_LACKS_GETCWD, ACE_LACKS_GMTIME, ACE_LACKS_GMTIME_R,
-          ACE_LACKS_LOCALTIME, and ACE_LACKS_STRFTIME.
-
-Sat May  6 09:52:06 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * examples/DLL/test_dll.cpp: Renamed the DLLs and removed the "./"
-          from the pathname.  Thanks to Sam and Roopa for reporting this
-          and tracking it down, respectively.
-
-Sat May  6 10:23:13 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: Add -lrt -laio to
-          the LIBS. The Proactor framework needs this; I'm not sure why it
-          never showed up until static builds were run.
-
-Tue Apr 25 10:22:16 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * ace/OS_NS_string.cpp (strerror): Do a sanity check to make sure
-          errnum >= 0 and < _sys_nerr and set errno to EINVAL if things
-          are not sane.  Thanks to Aleksandar Vukajlovic <vukajlo at
-          finsoft dot co dot yu> for this fix.
-
-Fri May  5 19:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Default_Constants.h:
-          Added a compile time check that ACE_DEFAULT_CDR_BUFSIZE must be
-          defined to a value bigger then 0, it is 0 we get in a never ending
-          loop in the CDR code
-
-Fri May  5 17:01:32 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp:
-        * examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp:
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.{cpp i h}:
-          Wide-char corrections.
-
-Fri May  5 13:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/FIFO.cpp:
-        * ace/os_include/os_stddef.h:
-          Removed psos support
-
-        * ace/config-WinCE.h:
-        * ace/os_include/os_stddef.h:
-          Moved setting of ACE_LACKS_STDDEF_H and ACE_LACKS_PTRDIFF_T to the
-          WinCE file
-
-Fri May  5 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_openvms.GNU:
-          Changed the way templates are handled
-
-Fri May  5 11:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Reactor_Token_T.h:
-          Removed workaround for vc6
-
-Fri May  5 08:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/MMAP_Memory_Pool.{h,cpp}:
-          Made guess_on_fault_ a real bool
-
-Fri May  5 08:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/os_dirent.h:
-        * ace/os_include/os_errno.h:
-        * ace/os_include/os_netdb.h:
-        * ace/os_include/os_stdint.h:
-        * ace/os_include/os_time.h:
-        * ace/os_include/os_string.h:
-        * ace/os_include/os_stdlib.h:
-          Removed psos support
-
-        * ace/os_include/os_dlfcn.h:
-        * ace/os_include/os_signal.h:
-          Removed psos and kcc support
-
-        * ace/os_include/os_pthread.h:
-          Removed chorus support
-
-        * ace/os_include/os_unistd.h:
-          Removed chorus and psos support
-
-Fri May  5 07:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_utsname.cpp:
-        * ace/OS.h
-          Removed psos and chorus support
-
-        * ace/OS_NS_fcntl.cpp:
-        * ace/Lib_Find.cpp:
-        * ace/OS_NS_netdb.inl:
-          Removed psos support
-
-        * ace/Mem_Map.cpp:
-          Removed chorus support
-
-        * ace/IOStream.h:
-          Removed checks for KCC compiler
-
-Fri May  5 07:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Base_Thread_Adapter.h:
-        * ace/SPIPE_Connector.cpp:
-        * ace/SOCK_Dgram.cpp:
-        * ace/Select_Reactor_T.cpp:
-        * ace/Handle_Set.cpp:
-          Removed code for psos, support for this platform will be removed
-
-        * ace/CDR_Base.h:
-          Removed check for KCC compiler
-
-        * ace/Malloc_Allocator.h:
-          Doxygen improvement
-
-Thu May  4 22:11:06 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Message_Block.h: Made ACE_Data_Block::release_i() virtual.
-          Thanks to Gary Fernandez <gary dot fernandez at ironmountain dot
-          com> for this change.
-
-Thu May  4 21:07:10 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/SPIPE_Acceptor.cpp (create_new_instance, close): Have to use
-          ACE_TEXT_ALWAYS_CHAR to pass pipe name on wide-char w/
-          ACE_HAS_STREAM_PIPES. Thanks to Gary Fernandez <gary dot
-          fernandez at ironmountain dot com> for this fix and to Yasser
-          Zabuair <yzabuair at hotmail dot com> for also reporting it.  This
-          fixes bugid 2541.
-
-        * THANKS: Added Gary and Yasser to the Hall of Fame.
-
-Thu May  4 08:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Reverted the change below, broke the sendfile test and Steve
-        Huston changed things in such a way that sendfile is only
-        used on Solaris 9 and newer
-
-        Tue May  2 09:34:54 Pacific Daylight Time 2006    <ossama_othman at symantec dot com>
-        * ace/OS_NS_sys_sendfile.inl (sendfile):
-          Removed "::" global scope qualifier from platform sendfile()
-          call.  It caused problem on Solaris 8.  Thanks to Simon Massey
-          and Johnny Willemsen for analyzing the problem and suggesting
-          this fix.
-
-Thu May  4 08:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ace_for_tao.mpc:
-          Added OS_NS_sys_sendfile
-
-Thu May  4 00:43:32 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Makefile.am:
-
-          Add Dynamic_Service_Dependency.{cpp,h} to appropriate lists.
-
-Wed May  3 16:02:10 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.h:
-        * ace/Service_Config.cpp:
-
-          Fixed a problem due to an attempt to access current_ before it
-          has been initialized (a static ACE_TSS instance). The current_
-          is now just a pointer to an ACE_TSS instance, which gets
-          dynamicaly allocated upon invoking the current() method. The
-          deallocation of that instance is left up to the Object Manager
-          with which the dynamic ACE_TSS instance is registered.
-
-        * ace/TSS_T.h:
-
-          Added a ACE_TSS_SET () to complete the set of TSS access
-          operations, which should work regardless of threading, TSS
-          emulation and TSS availability.
-
-Wed May  3 11:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Mem_Map.inl:
-          Small const improvements
-
-Wed May  3 10:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Mem_Map.{h,cpp,inl}:
-          Made close_handle_ a bool
-
-Wed May  3 08:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-macros.h:
-          Removed support for KCC
-
-Wed May  3 08:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_sendfile.h:
-          Export sendfile_emulation to resolve link problems in the
-          windows builds
-
-Wed May  3 03:36:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Svc_Conf_y.cpp:
-
-          Moved the ACE_BEGIN_VERSIONED_NAMESPACE_DECL macro to include
-          ace_yyparse.
-
-Tue May  2 09:34:54 Pacific Daylight Time 2006    <ossama_othman at symantec dot com>
-
-        * ace/OS_NS_sys_sendfile.inl (sendfile):
-
-          Removed "::" global scope qualifier from platform sendfile()
-          call.  It caused problem on Solaris 8.  Thanks to Simon Massey
-          and Johnny Willemsen for analyzing the problem and suggesting
-          this fix.
-
-Tue May  2 10:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-WinCE.h:
-          Added ACE_LACKS_GETCWD, ACE_LACKS_ASCTIME, ACE_LACKS_ASCTIME_R,
-          ACE_LACKS_GMTIME, ACE_LACKS_GMTIME_R, ACE_LACKS_LOCALTIME and
-          ACE_LACKS_STRFTIME. These macros are new and will be used soon
-          in the ACE_OS layer.
-
-Mon May  1 19:49:45 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/ARGV.{h i cpp}: Filled out more of the documentation in this
-          class, specifically mentioning that the class will enforce the
-          "whitespace separates tokens, except when quoted" rule of command
-          line parsing that's consistent with ACE_Get_Opt, etc. Also removed
-          documentation of non-existant restrictions such as after using
-          add(), can't use buf().
-          Removed the State enum since the only value ever used was ITERATIVE,
-          and changed "int state_" to "bool iterative_" (and removed the
-          state() accessor). Changed substitute_env_args_ from int to bool.
-
-        * ace/OS_NS_unistd.{h cpp} (argv_to_string, string_to_argv): Changed
-          the substitute_env_args parameter from "int" to "bool" to better
-          reflect what it is, a yes/no indicator.
-
-Mon May  1 06:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_sunos5_g++.GNU:
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-          Also for solaris 10 link the sendfile lib
-
-Sun Apr 30 04:21:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Svc_Conf_y.cpp:
-          What I meant to commit last time.
-
-Sun Apr 30 02:21:16 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Svc_Conf_y.cpp:
-          Eliminating more warnings from the scoreboard. I'm not sure the
-          best way to add this patch to ace/svcconf.mpb, since it affects
-          more than just gnuace targets. The easiest would be to store the
-          diff between this commit and the previous version and run patch,
-          but I'm not sure how to integrate that solution.
-
-Sat Apr 29 13:58:28 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.cpp:
-          More fuzz cleanup.
-
-Sat Apr 29 13:17:24 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/ACE.cpp:
-          Fuzz cleanup.
-
-        * THANKS:
-          Added credits.
-
-Fri Apr 28 22:31:52 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.cpp:
-
-          Removed an ';' after ACE_TRACE, which was confusing GCC4 with
-          "hidden visibility" enabled.
-
-Fri Apr 28 21:22:53 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.cpp:
-        * ace/Service_Gestalt.cpp:
-
-          More re-formatting to weed out those pesky tabs.
-
-Fri Apr 28 20:57:19 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-sunos5.8.h:
-        * ace/config-sunos5.9.h: Moved ACE_HAS_SENDFILE from Solaris 8 to
-          Solaris 9. Solaris 8 supports sendfilev[64] but not sendfile,
-          at least not without some patches I don't know about.
-
-Fri Apr 28 20:13:41 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_sunos5_g++.GNU:
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-          Solaris 9 puts sendfile() is a separate library, so LIBS needs
-          -lsendfile on Solaris 9.
-
-Fri Apr 28 18:03:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/ACE.cpp:
-        * ace/DLL.cpp:
-        * ace/DLL_Manager.cpp:
-        * ace/Dynamic_Service_Base.cpp:
-        * ace/Dynamic_Service_Dependency.cpp:
-        * ace/Parse_Node.cpp:
-        * ace/Service_Config.inl:
-        * ace/Service_Config.cpp:
-        * ace/Service_Gestalt.cpp:
-        * ace/Service_Object.cpp:
-        * ace/Service_Repository.cpp:
-        * ace/Service_Types.cpp:
-        * ace/Shared_Object.cpp:
-
-          Applied formatting style consistent with ACE convention.
-
-Fri Apr 28 15:48:25 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Service_Config.cpp (open_i): ACE_DEFAULT_SVC_CONF shouldn't
-          be enclosed in ACE_LIB_TEXT since it's defined in terms of
-          ACE_LIB_TEXT already.
-
-Fri Apr 28 15:49:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Makefile.am:
-          Added new Service_Gestalt files to the appropriate lists.
-
-Fri Apr 28 15:42:59 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Service_Config.cpp:
-          Fixed a problem killing some wchar builds.
-
-        * ace/Service_Gestalt.h:
-          Cleaned up the long-lines of the UNIMPLEMENTED functions.
-
-Fri Apr 28 15:26:53 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Timer_Queue_Adapters.h: Clarified the use and restrictions with
-          ACE_Async_Timer_Queue_Adapter.
-
-Fri Apr 28 15:22:35 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS2/JAWS/Concurrency.cpp: Removed unused variables.
-
-Fri Apr 28 14:54:04 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-macros.h: HP aC++ needs to see the statement in
-          ACE_NOTREACHED up to the version 6 series (Integrity). Also see
-          Tue Apr 11 13:12:36 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-Fri Apr 28 14:31:48 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Service_Gestalt.h: Removed extraneous ';' from
-          ACE_UNIMPLEMENTED_FUNC usage.
-
-        * m4/ace.m4: Fixed incorrect variable referenced in case during
-          --enable-uses-wchar.  Thanks to Paul Robinson <probinson at
-          gmail dot com> for reporting this.
-
-Fri Apr 28 14:03:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Dynamic_Service.h:
-        * ace/Parse_Node.h:
-
-          Fixed the usage of ACE_UNIMPLEMENTED_FUNC to remove the trailing
-          semicolon. It was causing build errors on compilers that define
-          the macro as empty.
-
-Fri Apr 28 13:55:01 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.h:
-
-          Fixed the usage of ACE_UNIMPLEMENTED_FUNC to remove the trailing
-          semicolon. It was causing build errors on compilers that define
-          the macro as empty.
-
-Fri Apr 28 13:29:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Updated the conditions for running the ORB-specific service
-          repository tests.
-
-Fri Apr 28 13:23:57 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.h:
-
-          Updated the declaration of current_ to match the definition in
-          its use of ACE_TSS_TYPE macro, as they are not equivalent for
-          a single-threaded builds.
-
-Fri Apr 28 13:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Process_Mutex_Test.cpp:
-          When spawn fails log an error and exit instead of using an assert
-          which causes an abort of the exe
-
-Fri Apr 28 13:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Pipe_Test.cpp:
-          When spawn fails log an error and exit instead of using an assert
-          which causes an abort of the exe
-
-Fri Apr 28 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-openvms.h:
-          Added __SIGNED_INT_TIME_T so that we get a signed time_t that
-          matches the POSIX spec that ACE expects.
-
-Fri Apr 28 12:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-openvms.h:
-          Removed comments, macros are documented in generally, added
-          ACE_LACKS_PERFECT_MULTICAST_FILTERING
-
-Fri Apr 28 11:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/Process_VMS.pm:
-          New file to be able to run the tests automatically on OpenVMS
-
-        * bin/PerlACE/Process.pm:
-          When running on OpenVMS use Process_VMS
-
-        * ace/config-openvms.h:
-          Added ACE_HAS_SIGISMEMBER_BUG
-
-        * tests/run_test.pl:
-          If ACE_ROOT is not set, add ../bin to lib
-
-Fri Apr 28 09:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Process_Manager_Test.cpp:
-          Also create a logfile for each child process started
-
-Fri Apr 28 08:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          Added Sendfile_Test
-
-Fri Apr 28 08:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Sendfile_Test.cpp:
-          Added missing include
-
-Thu Apr 27 21:04:08 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_Memory.h: Allow configs to set ACE_bad_alloc to avoid
-          extending the if-elif chain here further.
-
-        * ace/config-win32-msvc.h: Regardless of MSVC version, MFC changes
-          operator new to throw CMemoryException on out-of-memory condition.
-          Version-specific settings still control the setting of
-          ACE_HAS_NEW_NOTHROW. Thanks to Mohit Kapoor <Mohit dot Kapoor at
-          siemens dot com> for this fix.
-
-        * ace/Select_Reactor_T.cpp (handle_error): HACK ALERT! Some Linux
-          kernels will return from select() with an "invalid" errno value,
-          ERESTARTNOHAND, when compiled with profiling enabled. This works
-          around the problem. This is a known kernel bug; see Red Hat Bugzilla
-          https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=161468 and
-          https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=123648 as well
-          as Riverace support issue #167 and Riverace's complaint to Red Hat,
-          support issue #17841808.
-
-        * THANKS: Added Mohit Kapoor to the Hall of Fame.
-
-Thu Apr 27 20:14:52 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.cpp:
-
-          Fixed a complaint from a ACE_NDEBUG builds about unrefrenced
-          variable (only used in ACE_ASSERT).
-
-Thu Apr 27 18:33:18 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Aio_Platform_Test.cpp:
-          When AIO is not available, just print an info message and exit
-
-        * tests/run_test.lst:
-          Added Aio_Platform_Test, it was not in this file at all
-
-Thu Apr 27 18:21:17 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-5.x.h: Added ACE_HAS_SIGSUSPEND.
-
-Thu Apr 27 14:57:10 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Svc_Conf.y:
-        * ace/Svc_Conf_Tokens.h:
-        * ace/Svc_Conf_y.cpp:
-
-          Fixed fuzz complaint about #include inside a versioned namespace
-          in Svc_Conf_y.cpp. It was due to a code that Bison generates a
-          part of the parser, from Svc_Conf.y. Changed the versioned
-          namespace to encloses the non-generated code only, while the
-          rest of the parser seems to be designed so that multiple parses
-          can coexist without name clashes.
-
-Thu Apr 27 14:29:07 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Dynamic_Service_Dependency.h:
-        * ace/Dynamic_Service_Dependency.cpp:
-
-          Updated to remove an empty inl file.
-
-        * ace/Dynamic_Service_Dependency.inl:
-
-          Removed this file.
-
-Thu Apr 27 14:00:18 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          Implemented get_ip_interfaces for OpenVMS
-
-Thu Apr 27 11:19:18 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Array_Map.h:
-        * ace/ATM_Addr.h:
-        * ace/Atomic_Op_T.h:
-        * ace/Base_Thread_Adapter.h:
-        * ace/Cached_Connect_Strategy_T.h:
-        * ace/Capabilities.h:
-        * ace/Default_Constants.h:
-        * ace/Hash_Map_Manager_T.h:
-        * ace/Log_Msg_Callback.h:
-        * ace/Log_Msg_IPC.h:
-        * ace/Map_Manager.h:
-        * ace/POSIX_Asynch_IO.h:
-        * ace/POSIX_Proactor.h:
-        * ace/RB_Tree.h:
-        * ace/Strategies_T.h:
-        * ace/Timer_Heap_T.h:
-        * ace/Timer_List_T.h:
-        * ace/Timer_Queue_Adapters.h:
-        * ace/Timer_Queue_T.h:
-        * ace/Timer_Wheel_T.h:
-          Fixed doxygen warnings
-
-Thu Apr 27 01:49:18 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/OS_NS_sys_sendfile.h (sendfile, sendfile_emulation):
-        * ace/OS_NS_sys_sendfile.cpp (sendfile_emulation):
-
-          ACE_LOFF_T -> off_t.  Expected ACE_LOFF_T behavior is still
-          under scrutiny.
-
-        * ace/OS_NS_sys_sendfile.inl:
-
-          Added missing <sys/sendfile.h> include directive.  Addresses
-          infinite recursion at run-time when ACE_HAS_SENDFILE is defined.
-
-          (sendfile):
-
-          ACE_LOFF_T -> off_t, as above.
-
-Wed Apr 26 22:00:21 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Parse_Node.h:
-        * ace/Service_Gestalt.h:
-
-          Correcting a build problem, caused by the extraneous semicolons
-          after ACE_UNIMPLEMENTED_FUNC
-
-Wed Apr 26 20:21:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          The motivation for these changes was to enable support in ACE
-          for multiple instances of Service Configuration Repository, or
-          more appropriately - "Gestalt" (from the German word, meaning
-          something that's more than the sum of its parts).  This is
-          feature is necessary to enable support for ORB-specific, or more
-          generally - service-specific sets of services, i.e. to be able
-          to have dynamically loaded services to use their own private set
-          of service objects. In the context of the implementation I will
-          use "gestalt" as a synonym for service configuration context or
-          service configuration repository.
-
-          In order to accomplish this, the "instance"-related
-          functionality of the former ACE_Service_Config class has been
-          moved to another class - ACE_Service_Gestalt. The
-          ACE_Service_Config retains all static interfaces and those
-          members, pertaining to the concept of process-wide configuration
-          state. The service config, as known today has been retained as a
-          concept, but in its specialized semantics as holding a
-          process-wide configuration state. The primary concept expressing
-          an instance of configuration context is the gestalt. The
-          implementation actually uses a specialization of
-          ACE_Service_Gestalt in order to implement ACE_Service_Config as
-          a singleton, special case of configuration context.
-
-          The static methods in ACE_Service_Config provide access to
-          process-wide gestalt (ubergestalt, anyone?) instance.
-
-          For more details, here is the history of all included changes,
-          with their motivation and explanation. It is ordered
-          alphabetically, by the names of the changed files:
-
-        * ace/ACE.cpp:
-
-          Added to the condition evaluating ACE::debug() to include a
-          check if environmental variable ACE_DEBUG has been set.
-
-          Updated the debug() function to call getenv() only once by using
-          a method-local static variable to hold the value from the
-          environment.
-
-        * ace/DLL.h:
-        * ace/DLL.cpp:
-
-          Implemented an operator=, needed in order to implement the
-          ACE_Service_Configuration_Guard class.
-
-        * ace/DLL_Manager.cpp:
-
-          Improved the error diagnostics so that a "file not found" would
-          not mask a "symbol not defined" error when loading a DLL.
-
-        * ace/Dynamic_Service.h:
-
-          "Privatized" copy ctor and operator= for ACE_Dynamic_Service
-          objects since it is not designed for such operations.
-
-        * ace/Dynamic_Service.inl:
-
-          Added overloaded method instance() for ACE_ANTI_TCHAR.
-
-        * ace/Dynamic_Service.cpp:
-
-          Changes to enable instantiation of a service, based on the
-          registration in a particular service repository. Adding a method
-          that takes ACE_Service_Gestalt* additional parameter.
-
-        * ace/Dynamic_Service_Base.h:
-        * ace/Dynamic_Service_Base.cpp:
-
-          Factored out a find_i() method to be used by the friend
-          ACE_Dynamic_Service_Dependency class. It implements the specific
-          lookup policy that extends the search to the global repository
-          if the named service object can not be found locally.
-
-          Added instance method, allowing the caller to explicitly specify
-          the gestalt.
-
-        * ace/Dynamic_Service_Dependency.h:
-        * ace/Dynamic_Service_Dependency.inl:
-        * ace/Dynamic_Service_Dependency.cpp:
-
-          A newly introduced class, whose instances are designed to be
-          embedded inside instances of other classes, typically created by
-          DLL-based factories (service objects). This provides a way to
-          declare dependency on a specific service, thus avoiding order of
-          initialization issues with objects whose implementation code
-          resides in dynamically loaded services.
-
-          It is disastrous to have dynamically loadable services create
-          and give away ownership of objects and then be unloaded before
-          all those instances have been deleted. Normally the code for
-          such objects classes resides within the TEXT segment of the DLL,
-          which implements the service. If a service gets removed, its DLL
-          may be unmapped from memory and then any attempt to invoke a
-          method on the said objects will cause SEGV.
-
-          Such instances must contain a member of
-          ACE_Dynamic_Service_Dependency initialized with the service they
-          depend on. @code ACE_Dynamic_Service_Dependency's constructor
-          and destructor are "magical" - they work by maintaining the
-          underlying dynamic service's DLL reference count.
-
-          The problem was not present before because the one Service
-          Repository outlived any other user objects. Now that an
-          un-loadable service can own its configuration, the sequence of
-          service finalization has been reversed.
-
-          Updated the implementation of ACE_Dynamic_Service_Dependency
-          class to ease debugging. ACE_Dynamic_Service_Dependency gets
-          initialized whenever a dependent service gets loaded, to help us
-          keep our access to dependent instances after their DLL is gone
-          (by upping the ref count on the DLL).
-
-          Updated usage of gestalt's instance() to current(). Removed
-          unnecessary comments.
-
-        * ace/Global_Macros.h:
-
-          Changed the ACE_STATIC_SVC_DEFINE to use the new
-          ACE_Service_Config::insert () method, which allows to streamline
-          the Service Configuration interface and promote hiding the
-          storage used for the static service descriptors.
-
-        * ace/Parse_Node.h:
-        * ace/Parse_Node.cpp:
-
-          Changes to aid in keeping track of the gestalt, while deep in
-          the guts of the svc.conf parser.
-
-          Replaced the ACE_Service_Gestalt & in the method signatures with
-          ACE_Service_Gestalt * to unify the interfaces.
-
-          Updated the static function node's logic to use only
-          ACE_Service_Gestalt public members and to no longer rely on
-          knowledge about the internal storage representation of service
-          repository.
-
-          Removed a static_cast<> in ACE_Static_Function_Node::symbol()
-          that was causing problems on some platforms. It was not even
-          necessary as both sides were of the same type.
-
-        * ace/Service_Config.{h,inl,cpp}:
-
-          This separates the responsibilities between the service gestalt,
-          which represents an _instance_ of configuration information, and
-          the service config, which represents a special, process-wide,
-          global configuration repository. Since both these entities
-          represent the same concept - service configuration state, but
-          from different aspects, the ACE_Service_Config now inherits
-          (publicly) from ACE_Service_Gestalt.
-
-          Lots of instance-related code moved to ACE_Service_Gestalt
-          Replaced the use of char with ACE_ANTI_TCHAR and the appropriate
-          ACE_TEXT_* macros.
-
-          Moved the parsing of command-line options, pertaining to the
-          process as a whole, here - in the parse_args_i () (protected,
-          virtual).
-
-          In order to resolve a problem caused by the inability of a
-          dependent static service to determine which gestalt they need to
-          register with, the concept of "current" was separated from the
-          "global" gestalt. The current gestalt is pointed to by a
-          pointer, stored in thread-specific storage (TSS) and manipulated
-          by the ACE_Service_Config_Guard class that implements the
-          "resource acquisition is initialization" idiom.
-
-          Fixed an error in the separation of responsibilities between the
-          instance gestalt and the global (ubergestalt), during
-          initialization.  The bug can cause infinite recursion, when
-          initializing an ORB, housed in a dynamic service. The singleton
-          gestalt (i.e. ACE_Service_Config) must be initialized through
-          open_i(), before open_i() can proceed initializing the specific
-          gestalt instance. The difficulty is in that some use cases
-          reverse the order of initialization by calling
-          ACE_Service_Config::open () first and then, at some point call
-          the instance gestalt open_i(). The solution is to use the
-          is_initialized_ member together with an explicit call to
-          ACE_Service_Config::global()->open_i().  To ease debugging of
-          the process of registering static service, I have changes the
-          ACE_Service_Config::static_svcs() to return
-          ACE_Service_Gestalt::instance (), instead. Thus all the
-          ACE_STATIC_SVC* macros are still working (no need to change
-          existing code), but now there is a convenient place to debug -
-          see the newly added ACE_Service_Gestalt::insert () method.  The
-          header file no longer declares ACE_STATIC_SVCS,
-          ACE_STATIC_SVCS_ITERATOR, ACE_SVC_QUEUE and
-          ACE_SVC_QUEUE_ITERATOR. Those are now protected typedefs in
-          ACE_Service_Gestalt, where they are actually used.
-
-          Added new insert () method to use instead of the sequence
-          static_svc ()->insert () which unnecessary exposes the internal
-          storage structure of Service Configurator.  Made no_static_svcs_
-          an instance member, instead of a class (static) member, thus
-          providing for ability to set it per instance, not globally.
-
-          Added default values for open_i() and declared private copy ctor
-          and assignment operator for ACE_Service_Config_Guard, since it
-          is not intended to be copied.
-
-          Similarly, moved the parts of the open_i() functionality that
-          did not belong in every instance of the gestalt.
-          ACE_Service_Config is again a process-wide Singleton,registered
-          with ACE_Object_Manager.
-
-          Eliminated old #if 0-ed code in Service_Config.cpp.
-
-        * ace/Service_Gestalt.h:
-        * ace/Service_Gestalt.inl:
-        * ace/Service_Gestalt.cpp:
-
-          Encapsulates the idea of Service Configuration repository, or
-          configuration context.
-
-          Changed open_i to be able to detect if it is working on the
-          special, process-wide instance (ubergestalt) or a "plain"
-          gestalt instance, since there are things that must only be done
-          once per process - like signal handler, logging key and
-          daemon-ization of the whole process.
-
-          Added an ignore_static_svcs parameter to
-          ACE_Service_Gestalt::open_i in order to preserve the prior
-          behavior of the singleton ACE_Service_Gestalt instance. Even
-          though its no_static_svcs_ member was being initialized with 1,
-          some clients (TAO) needs to be able to override it. Since now a
-          call to open_i on an instance gestalt may precede in time the
-          call to open_i on the ubergestalt, we need a mechanism to allow
-          the no_static_svcs_ value to be overridden.
-
-          Added the insert()'s implementation (described above).  Added a
-          singleton() method to return the process-wide gestalt singleton
-          (or ubergestalt?:). Used in open_i() to account for the fact
-          that now a Service Gestalt may be called to open () prior to
-          open () on the singleton instance, which would typically contain
-          the bulk of the static service object descriptors.
-
-          There was a problem with "hybrid" service objects, i.e. dynamic
-          SO which contains static SO (dependent services).  The dependent
-          services are typically registered via static ctor or static
-          initializer at the point of loading of the dynamic SO's DLL.  As
-          such, they end up registering before the dynamic SO.  Upon
-          finalization of the service repository, the dynamic SO is
-          finalized first, thus unloading its DLL and unmapping the TEXT
-          segment, where the dependent static services code is.  When
-          next, the static SO is to be finalized its memory is no longer
-          at valid address.  The change ensures the dynamic service is
-          registered *before* its dependent static services and will
-          therefore be finalized last.  The solution is based upon the
-          concept of forward declaring a dynamic service, named after the
-          configuration file being processed.  Before processing a file,
-          we simply check for an existing service with the same name and
-          "pass" if we find one.
-
-          Fixed the ACE_Service_Config_Guard's detection of the case where
-          the forward service declaration was not replaced by a proper
-          declaration as expected. It now properly removes the forward
-          decl, not the "good" instance.
-
-          Cleared up the TSS management issue, causing executable to crash
-          on startup. The problem was due to an order-of-instantiation
-          issue, involving the TSS-based pointer to the current
-          gestalt. Used ACE_Object_Manager's shutting_down and starting_up
-          methods to determine if it is safe to use the static ACE_TSS
-          instance.
-
-          Added const-ness for find().  Removed prototypes for initialize,
-          resume, suspend and remove that used plain char type and
-          conditionally compiled in only for WinCE and
-          ACE_USES_WCHAR. Service_Config still declares and defines these
-          (using ACE_ANTI_TCHAR). Updated to resolve problems when built
-          with ACE_USES_WCHAR.
-
-          Declared private copy ctor and assignment operator for
-          ACE_Service_Gestalt and ACE_Service_Type_Factory, since their
-          instances are not intended to be copied.  Added an
-          ACE_UNIMPLEMENTED_FUNC macro for the copy-ctor and assignment
-          operator of ACE_Service_Type_Factory.
-
-          Reorganized to streamline the header file and remove unnecessary
-          declarations and to add a decl for find_static_svc_descriptor().
-
-          Changed the open() method's implementation to incorporate the
-          additional parameter for open_i().
-
-          Added the new find_static_svc_descriptor() member, which allows
-          ACE_Static_Function_Node to not need to know how the static
-          services are registered in the service repository.
-
-        * ace/Service_Object.h:
-        * ace/Service_Object.inl:
-        * ace/Service_Object.cpp:
-
-          Exposed the dll_ member through dll () const method because the
-          reference is needed by the new ACE_Dynamic_Service_Dependency
-          class. Fixed the dump () method.
-
-        * ace/Service_Repository.h:
-        * ace/Service_Repository.cpp:
-
-          Added const-ness for the find* () methods. Added debugging.  The
-          remove method changes the order of services registrations in the
-          repository, which may break the Service Repository's invariant,
-          imposed by the need to correctly finalize dynamic services with
-          their own static services.
-
-          For example, consider a case where a static service (S0) is
-          registered in the repository. Then a DLL-based service (D1)
-          registers its own static service (S1). So far the order is
-          "finalization-compatible": S0 < D1 < S1, i.e. services will be
-          finalized in reverse order and D1's DLL will still be available
-          when finalizing S1.  Now let's remove (S0). Currently, after
-          this operation the repository end up in this order: S1 < D1,
-          which is trivially not finalization-compatible.
-
-          Instead of replacing the pointer with the last ptr to a svc in
-          the array (repository) and then decrementing the current size of
-          the repo, the solution actually shifts left the rest of the
-          array.
-
-        * ace/Service_Types.cpp:
-        * ace/Shared_Object.cpp:
-
-          Removed some and updated existing debug statements. Eliminated
-          dead partial instantiation code.
-
-        * ace/Svc_Conf.y:
-        * ace/Svc_Conf.h:
-        * ace/Svc_Conf_Tokens.h:
-        * ace/Svc_Conf_y.cpp:
-
-          Changed to allow propagation of the knowledge about which
-          gestalt is currently being used for service registrations.
-
-          Factored the ACE_Svc_Conf_Param class out in its own translation
-          unit.
-
-        * ace/Svc_Conf_Param.h:
-
-          Replaced the ACE_Service_Gestalt & in the method signatures with
-          ACE_Service_Gestalt *
-
-        * ace/svcconf.mpb:
-
-          Updated the svcconf.mpb rule to allow building with Bison 2.0
-          and up. The change adds #ifdef/#endif around the generated
-          header file. A YYSTYPE_IS_DECLARED define is added in order to
-          make sure the token declarations from the Svc_Conf_Tokens.h are
-          used instead of those generated in the Svc_Conf_y.cpp file.
-
-          Added the new Dynamic_Service_Dependency.* files.
-
-        * bin/tao_orb_tests.lst:
-
-          Adding the new tests to the automated test suite to run during
-          the nightly builds.
-
-Wed Apr 26 17:13:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added test for Parallel_Connect_Strategy. This test will take
-          about 9 minutes to run to completion.
-
-Wed Apr 26 14:22:31 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added tests for new POA features.
-
-        * bin/MakeProjectCreator/config/endpointpolicy.mpb:
-          Applications wishing to use the TAO EndpointPolicy should add
-          this base project to their MPC files. This will include
-          libTAO_EndpointPolicy in their link lines.
-
-Wed Apr 26 14:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_hpux_kcc.GNU:
-        * include/makeinclude/platform_irix6.x_kcc.GNU:
-        * include/makeinclude/platform_linux_kcc.GNU:
-        * include/makeinclude/platform_osf1_4.x_kcc.GNU:
-        * include/makeinclude/platform_sunos5_kcc.GNU:
-        * include/makeinclude/platform_tru64_kcc.GNU:
-          Removed these files which are for the KAI C++ compiler. This
-          compiler doesn't exist anymore and full support for KAI C++
-          has been removed now from ACE/TAO. See bugzilla bug 2007
-
-Wed Apr 26 13:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/POA/Bug_2511_Regression
-
-Wed Apr 26 12:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Process_Manager.cpp:
-          Fixed fuzz errors and use const when possible
-
-Wed Apr 26 12:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/CDR_Test.cpp:
-          Boolean is now size 1 or bigger, the marshaling code will take
-          care that a Boolean is marshaled as octet of size 1
-
-Wed Apr 26 11:28:28 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/OBV/truncatable.
-
-Wed Apr 26 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/OBV
-
-Wed Apr 26 09:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/Portable_Interceptors/Bug_2510_Regression
-
-Wed Apr 26 07:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-          Increased template-depth to 50, hopefully this is large enough to
-          also build CIAO
-
-Tue Apr 25 16:44:04 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.cpp:
-          Added code to support rewinding the output CDR to some previous
-          location and updating a value there. This is required to support
-          marshaling offset values were the target of the offset is not
-          known until the final offset target is actually reached.
-
-Tue Apr 25 13:50:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Signal_Test.cpp:
-          Fixed this test for (modern) Linux and Solaris at least.
-          The crux is blocking signals before calling sigwait() when doing
-          synchronous signal handling.
-
-Tue Apr 25 09:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Base_Thread_Adapter.h:
-        * ace/Cleanup.h:
-          Fixed some errors I made
-
-Tue Apr 25 09:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Updated supported platforms and use vc8 for the MPC examples
-
-Tue Apr 25 08:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Base.h:
-          Always use bool for Boolean, see bugzilla 2514 for more info
-
-Tue Apr 25 06:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.h:
-          Put back ACE_TSS_CLEANUP_NAME that got lost by accident with the
-          vc6 cleanup. Thanks to Olli Savia for reporting this.
-
-Mon Apr 24 17:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          Added Signal_Test. Thanks to Martin Corino for notificing that
-          we don't run this test on any platform.
-
-Mon Apr 24 10:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/Bug_1676_Regression
-
-Mon Apr 24 09:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-          Increase template depth to resolve compile errors when building
-          TAO with the new sequence implementation
-
-Mon Apr 24 09:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_types.h:
-          Added ACE_LOFF_T for LynxOS. Thanks to Simon Massey for delivering
-          the patch
-
-Fri Apr 21 16:28:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-         Merge from ARMS Escher repository.
-
-        * ace/OS_NS_Thread.cpp
-
-          Updated sched_params() to not ignore the process id passed in.
-          Also enhanced the Windows implementation to get a handle to the
-          process specified before applying the priority class changes.
-
-        * ace/Process_Manager.cpp
-        * ace/Process_Manager.h
-
-           Added methods set_scheduler and set_scheduler_all
-           to set scheduling parameters for process(es) managed by this
-           class.
-
-        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb
-
-          Fixed build ordering problem in CIAO.
-
-Fri Apr 21 07:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Caching_Utility_T.cpp:
-          Removed invalid added const
-
-Thu Apr 20 19:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_types.h:
-          Added ACE_LOFF_T for the BSD variants, thanks to J.T. Conklin
-          for delivering the patch
-
-Thu Apr 20 18:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-macros.h:
-          Removed setting of ACE_ANY_OPS_USE_NAMESPACE again. This causes
-          problems when building CIAO. Thanks to Jeff Parsons for finding
-          this.
-
-Thu Apr 20 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/ACE_Init_Test.rc:
-          Removed another msvc specific part
-
-Thu Apr 20 11:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Added a check for deprecated macros, first one to check is
-          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-
-        * tests/*.cpp:
-        * protocols/*.cpp:
-        * ACEXML/*.cpp:
-        * performance-tests/*.cpp
-        * netsvcs/*.cpp
-          Removed all explicit template instantiations
-
-        * ace/os_include/sys/os_types.h:
-          Added ACE_LOFF_T typedef for VxWorks 6.2 and newer
-
-Thu Apr 20 07:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_types.h:
-          Always define ACE_LOFF_T so that we can use it in the sendfile
-          wrapper
-
-Thu Apr 20 07:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/svcconf.mpb:
-          Removed Service_Templates.cpp
-
-Wed Apr 19 19:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/*:
-          Removed explicit template support
-
-Wed Apr 19 15:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2368_Regression_Test.cpp:
-          Fixed compile error and compile warning
-
-Wed Apr 19 14:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_sendfile.h:
-          Updated include to get size_t and ACE_LOFF_T to fix compile
-          errors on Solaris
-
-Wed Apr 19 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/APG/Logging/Use_Multiple_Sinks.cpp:
-        * examples/APG/Logging/Use_Ostream.cpp:
-        * examples/APG/Logging/LogManager.h:
-          Removed vc6 workarounds
-
-Wed Apr 19 13:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2368_Regression_Test.cpp:
-        * tests/run_test.lst:
-        * tests/tests.mpc:
-          Added regression for bug 2368, this will fail because this bug
-          isn't addressed yet
-
-Wed Apr 19 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_sunos5_g++.GNU:
-          Use -shared instead of -G when building shared libraries. Thanks to
-          Alan L Batongbacal <alanlb at vt dot edu> for reporting this. This
-          fixes bugzilla bug 1848.
-
-Wed Apr 19 12:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/ACE_Init_Test.rc:
-          Removed msvc specific lines
-
-        * tests/tests.mpc:
-          The ACE_Init_Test should use its resource file. Fixes bugzilla
-          2495
-
-        * ace/Capabilities.{h,cpp}:
-          Prefix increment instead of postfix
-
-        * ace/Hash_Map_Manager_T.{h,cpp}:
-          Removed workaround for suncc 4.2
-
-        * ace/Object_Manager.h:
-        * ace/Parse_Node.h:
-        * ace/POSIX_Proactor.h:
-        * ace/Thread_Mutex.h:
-          Doxygen improvements
-
-        * ace/Parse_Node.cpp:
-          Use prefix increment, initialise pointers with 0 and don't print
-          an error message when we can't a dll, this gives false messages
-          when using TAO. This fixes bugzilla 2383. Thanks to Ming Xiong
-          for making a patch.
-
-        * ace/Proactor.h:
-          Removed all virtual keywords, not needed for this class. Fixes
-          bugzilla 2178.
-
-        * ace/Thread_Manager.h:
-          Removed virtual keywords, not needed and safes footprint. Fixes
-          bugzilla 2179.
-
-        * bin/fuzz.pl:
-          Added more msvc checks to detect code constructors for vc6 or
-          vc7.0
-
-Wed Apr 19 11:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Merged ACE changes from sendfile branch. Also made a lot of const
-        improvements throughout ACE.
-
-        Tue Apr  4 10:20:36 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Mem_Map.cpp (open):
-
-        Only copy the filename to the ACE_Mem_Map::filename_ member
-        if the call to open() succeeds.
-
-        * ace/PI_Malloc.h (ACE_Malloc_Header):
-
-        Added missing private and undefined copy constructor.  The
-        corresponding assignment operator was already there.
-
-        Wed Mar 29 14:51:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-sunos5.8.h:
-        Solaris 8 and newer also support sendfile. It seems HPUX also
-        supports it but with a different signature and semantics, so just
-        don't try it there yet.
-
-        Wed Mar 29 13:06:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/MMAP_Memory_Pool.{h,cpp,inl}:
-        Added new .inl file to implement the new mmap accessors, include
-        this new file in the header and implementation file
-
-        Wed Mar 29 08:00:12 2006  Ossama Othman <ossama@dre.vanderbilt.edu>
-
-        * ace/OS_NS_sys_sendfile.cpp
-        * ace/OS_NS_sys_sendfile.h
-        * ace/OS_NS_sys_sendfile.inl
-        New sendfile wrapper
-
-        * ace/MMAP_Memory_Pool.h:
-        Added accessors for mmap
-
-        * ace/ace.mpc
-        Added OS_NS_sys_sendfile
-
-        * ace/config-linux-common.h
-        Added ACE_HAS_SENDFILE
-
-Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Merged ACE changes from sequpdate3 branch
-
-        * ace/config-osf1-3.2.h:
-          Removed, very old
-
-        * ace/config-tru64.h:
-          Removed include of config-osf1-3.2.h
-
-        * ace/OS_Dirent.cpp:
-        * ace/OS_Memory.{cpp,inl}:
-        * ace/OS_String.{cpp,inl}:
-        * ace/Sync.cpp:
-          Removed these files, where not build for a long time already
-
-        * ace/ace.mpc:
-          Removed files above
-
-        * ace/OS_Memory.h:
-        * ace/OS_String.h:
-          Removed include of inline files
-
-        * ace/config-win32-msvc6.h:
-        * ace/config-kcc-common.h:
-          Removed these files, vc6 and kcc are deprecated
-
-        * ace/config-irix6.x-kcc.h:
-        * ace/config-osf1-4.0.h:
-        * ace/config-sunos5.5.h:
-          Removed support for KCC
-
-        * ace/Asynch_IO_Impl.h:
-          Removed workarounds for KCC
-
-        * ace/config-win32-msvc.h:
-          Removed support for vc6 and vc7.0
-
-        * ace/Array_Base.cpp:
-        * ace/Array_Map.{h,cpp}:
-        * ace/Base_Thread_Adapter.h:
-        * ace/Cleanup.h:
-        * ace/Log_Msg.h:
-        * ace/Versioned_Namespace.h:
-        * ace/Get_Opt.cpp:
-        * ace/WIN32_Proactor.cpp:
-        * ace/Message_Queue.cpp:
-        * ace/CDR_Base.h:
-          Removed work arounds for vc6
-
-        * ace/README
-        * ace/config-win32-msvc6.h:
-        * ace/Global_Macros.h:
-          Deprecated ACE_HAS_BROKEN_NAMESPACES, we drop msvc6 and I am
-          removing the workarounds for this compiler one by one as part of the
-          new sequence implementation. Because we deprecate this also
-          ACE_NESTED_CLASS is deprecated
-
-        * ace/config-win32-msvc6.h:
-        * ace/config-win32-msvc7.h:
-        * ace/config-win32-msvc8.h:
-          Removed ACE_HAS_BROKEN_IMPLICIT_CONST_CAST, not used in ACE
-
-        * ace/config-win32-msvc6.h:
-        * ace/config-win32-visualage.h:
-        * ace/Registry.h
-          Removed ACE_HAS_BROKEN_NESTED_TEMPLATES, only used for msvc6 and
-          visual age, both are being dropped
-
-Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added Bug_2503_Regression
-
-Tue Apr 18 20:49:16 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * ACE version 5.5.1 released.
-
-Local Variables:
-mode: change-log
-add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
-indent-tabs-mode: nil
-End:
diff --git a/ACE/Kokyu/Kokyu.mpc b/ACE/Kokyu/Kokyu.mpc
index 182c2115f9a..aeb6e69941e 100644
--- a/ACE/Kokyu/Kokyu.mpc
+++ b/ACE/Kokyu/Kokyu.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(Kokyu) : acelib, install {
+project(Kokyu) : acelib, core {
   sharedname  = Kokyu
   dynamicflags = KOKYU_BUILD_DLL
 
diff --git a/ACE/Kokyu/Makefile.am b/ACE/Kokyu/Makefile.am
index 86deb01005e..8a68d21c2eb 100644
--- a/ACE/Kokyu/Makefile.am
+++ b/ACE/Kokyu/Makefile.am
@@ -2,11 +2,6 @@
 ##
 ## $Id$
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 includedir = @includedir@/Kokyu
 pkgconfigdir = @libdir@/pkgconfig
@@ -35,7 +30,7 @@ libKokyu_la_SOURCES = \
   Kokyu_defs.cpp
 
 libKokyu_la_LDFLAGS = \
- -release @ACE_VERSION_NAME@
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
 libKokyu_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -65,11 +60,7 @@ nobase_include_HEADERS = \
   Kokyu_dsrt.h \
   Kokyu_dsrt.inl
 
-pkgconfig_DATA = \
-  Kokyu.pc
-
-CLEANFILES = \
-  Kokyu.pc
+pkgconfig_DATA = Kokyu.pc
 
 Kokyu.pc: ${top_builddir}/config.status ${srcdir}/Kokyu.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/Kokyu.pc.in
diff --git a/ACE/Kokyu/docs/Kokyu.html b/ACE/Kokyu/docs/Kokyu.html
index bb4505eb9e6..55c8016cd1c 100644
--- a/ACE/Kokyu/docs/Kokyu.html
+++ b/ACE/Kokyu/docs/Kokyu.html
@@ -357,7 +357,7 @@ interface is in <tt>Kokyu::DSRT_Dispatcher (Kokyu_dsrt.h)</tt>
 <h3>
 <a NAME="Status"></a>Current status</h3>
 Kokyu dispatching framework is available as a separate module under <tt><font size=+1>ACE_wrappers/Kokyu</font></tt>
-as part of the <a href="http://download.dre.vanderbilt.edu">ACE/TAO
+as part of the <a href="http://deuce.doc.wustl.edu/Download.html">ACE/TAO
 distribution</a>. Note that this module is not dependent on TAO, though
 it is built on top of ACE. The TAO Event Channel uses the Strategy and
 Service Configurator patterns to use configurable dispatching modules.
diff --git a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am b/ACE/Kokyu/tests/DSRT_MIF/Makefile.am
index 4ed16f988cd..9e51858b971 100644
--- a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am
+++ b/ACE/Kokyu/tests/DSRT_MIF/Makefile.am
@@ -6,16 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-
-## Makefile.DSRT_MIF.am
-
-if !BUILD_ACE_FOR_TAO
-
+## Makefile.DSRT_MIF.am 
 noinst_PROGRAMS = MIF
 
 MIF_CPPFLAGS = \
@@ -27,10 +23,8 @@ MIF_SOURCES = \
   MIF.cpp
 
 MIF_LDADD = \
-  $(top_builddir)/Kokyu/libKokyu.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
+ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/ACE/Kokyu/tests/EDF/Makefile.am b/ACE/Kokyu/tests/EDF/Makefile.am
index 9aa8fcdf71d..22b09e8251a 100644
--- a/ACE/Kokyu/tests/EDF/Makefile.am
+++ b/ACE/Kokyu/tests/EDF/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.EDF.am
-
+## Makefile.EDF.am 
 noinst_PROGRAMS = EDF
 
 EDF_CPPFLAGS = \
@@ -24,8 +23,8 @@ EDF_SOURCES = \
   test.cpp
 
 EDF_LDADD = \
-  $(top_builddir)/Kokyu/libKokyu.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/ACE/Kokyu/tests/FIFO/Makefile.am b/ACE/Kokyu/tests/FIFO/Makefile.am
index 05b7dbe9e38..9852af122e0 100644
--- a/ACE/Kokyu/tests/FIFO/Makefile.am
+++ b/ACE/Kokyu/tests/FIFO/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.FIFO.am
-
+## Makefile.FIFO.am 
 noinst_PROGRAMS = FIFO
 
 FIFO_CPPFLAGS = \
@@ -24,8 +23,8 @@ FIFO_SOURCES = \
   test.cpp
 
 FIFO_LDADD = \
-  $(top_builddir)/Kokyu/libKokyu.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/ACE/Kokyu/tests/Makefile.am b/ACE/Kokyu/tests/Makefile.am
index 9745459d4e3..39737061deb 100644
--- a/ACE/Kokyu/tests/Makefile.am
+++ b/ACE/Kokyu/tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc
 
 SUBDIRS = \
         DSRT_MIF \
diff --git a/ACE/Makefile.am b/ACE/Makefile.am
index 29fb2e2dbe8..340e2a53ff1 100644
--- a/ACE/Makefile.am
+++ b/ACE/Makefile.am
@@ -9,12 +9,18 @@
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
-	ace \
-	@ACEXML@ \
-	@ASNMP@ \
+        ace \
+        ASNMP
+
+if BUILD_ACEXML
+SUBDIRS += ACEXML 
+endif
+
+SUBDIRS += \
         apps \
         bin \
-        netsvcs
+        netsvcs \
+        protocols 
 
 if BUILD_EXAMPLES
 SUBDIRS += examples
@@ -26,7 +32,6 @@ SUBDIRS += tests
 endif
 
 SUBDIRS += \
-        @protocols@ \
         websvcs \
 	@KOKYU@ \
 	@TAO@
diff --git a/ACE/NEWS b/ACE/NEWS
index 79b7156c470..81e2c4b6c14 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -3,125 +3,10 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 
 . (Remedy) OpenVMS 8.3 on IA64 port
 
-PLANNED CHANGES FOR "ACE-5.5.6"
-===============================
-
-. (OO) Minor 64 bit file offset fixes for ACE AIO classes on HP-UX.
-
-. (OO) Various other fixes that have been piling up.
-
-PLANNED CHANGES FOR "ACE-5.5.5"
-===============================
-
-. (Riverace) Pharlap ETS 13 qualification.
-
-USER VISIBLE CHANGES BETWEEN ACE-5.5.4 and ACE-5.5.5
-====================================================
-
-. Reformat stringified IPv6 addresses to use [addr]:port when printing
-  addresses that contain ':' such as "::1".
-
-. Added method to ACE_INET_Addr to determine if address is IPv6 or
-  IPv4 multicast.
-
-. Fixed a bug in ACE_Async_Timer_Adapter_Timer_Queue_Adapter<TQ> where the
-  gettimeofday function of the timer queue was ignored when setting the alarm.
-
-. Fixed a problem where, on Solaris 9 onwards, calling
-  ACE_OS::thr_create(THR_NEW_LWP) more than 2^15 (65535) times in a
-  process will fail.  See changelog entry from "Wed Jan 3 22:31:05 UTC
-  2007 Chris Cleeland <cleeland_c@ociweb.com>" for more information.
-
-. Fixed a bug in ACE_QtReactor where the two select() calls in that function
-  might select on different handler sets.
-
-. ACE_SOCK_IO::recvv(iovec[], size_t, const ACE_Time_Value* = 0) and
-  ACE_SOCK_IO::sendv (const iovec[], size_t, const ACE_Time_Value* = 0) methods
-  were changed to specify the iovec count argument as int instead of size_t
-  since it gets reduced to int in the underlying OS calls (usually).
-
-. The following deprecated methods were removed:
-
-    ssize_t ACE_SOCK_IO::recv (iovec iov[],
-                               size_t n,
-                               const ACE_Time_Value *timeout = 0) const;
-
-    ssize_t ACE_SOCK_IO::recv (iovec *io_vec,
-                               const ACE_Time_Value *timeout = 0) const;
-
-    ssize_t ACE_SOCK_IO::send (const iovec iov[],
-                               size_t n,
-                               const ACE_Time_Value *timeout = 0) const;
-
-    These were previously replaced with more specific recvv() and sendv()
-    methods.
-
-. The ACE_Service_Repository::find(const ACE_TCHAR name[],
-                                   const ACE_Service_Type **srp = 0,
-                                   int ignore_suspended = true) const
-  method's 'ignore_suspended' parameter was changed from int to bool to
-  reflect it's purpose as a yes/no indicator.
-
-. Added --enable-ace-reactor-notification-queue configure script
-  option to the autoconf build for enabling the Reactor's userspace
-  notification queue (defines ACE_HAS_REACTOR_NOTIFICATION_QUEUE in
-  config.h).
-
-. The int ACE_OutputCDR::consolidate(void) method was contributed by
-  Howard Finer at Sonus Networks. This method consolidates any continuation
-  blocks used by an ACE_OutputCDR object into a single block. It's useful for
-  situations which require access to a single memory area containing the
-  encoded stream, regardless of its length, when the length cannot be known
-  in advance.
-
-. There are a number of new methods defined on ACE_String_Base<CHAR>:
-
-        size_t capacity (void) const:  This method returns the number
-            of allocated CHAR units in the string object.
-
-        void fast_resize (size_t): This method manage the sizing/reallocating
-            of the string, but doesn't do the memory setting of resize().
-
-        bool operator!= (const CHAR *) const
-        bool operator== (const CHAR *) const: These methods compare the
-            string with a nul-terminated CHAR* string.
-
-        nonmember functions operator== and operator!= where also added
-            that compare const ACE_String_Base and const CHAR*; these make
-            it possible to switch ACE_String and CHAR* on either side of
-            the operator.
-
-  Thank you to Kelly Hickel <kfh at mqsoftware dot com> for these additions.
-
-. There are 2 new build options on the traditional make command:
-  dmalloc and mtrace. When specified at build time (e.g. make mtrace=1)
-  the PLATFORM_DMALLOC_CPPFLAGS and/or PLATFORM_MTRACE_CPPFLAGS values
-  are added to CPPFLAGS. For dmalloc, the PLATFORM_DMALLOC_LDFLAGS and
-  PLATFORM_DMALLOC_LIBS are added to LDFLAGS and LIBS, respectively.
-  Thank you to Howard Finer for supplying these additions.
-
-. Added the ability to specify additional purify and quantify command-line
-  options by setting PLATFORM_PURIFY_OPTIONS and PLATFORM_QUANTIFY_OPTIONS,
-  respectively. Thank you to Howard Finer for supplying these additions.
-
-. Removed Irix 5, DGUX, and m88k support
-
-. Improved LynxOS 4.2 support
-
-. VxWorks 6.4 support
-
-. Added support for FC6. Because the GCC 4.1.1 version that gets shipped
-  has a fix for the visibility attribute we use for the singletons
-  you will need to define the following in your config.h file. This can't be
-  done automatically because SuSE 10.2 gets shipped with GCC 4.1.2 but
-  doesn't have the same fix
-  ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
-
-. RTEMS port
+. (Remedy) RTEMS port
 
 USER VISIBLE CHANGES BETWEEN ACE-5.5.3 and ACE-5.5.4
 ====================================================
-
 . Added appropriate intptr_t and uintptr_t typedefs on platforms that
   don't provide them (i.e. when ACE_LACKS_INTPTR_T is defined).
 
@@ -133,7 +18,7 @@ USER VISIBLE CHANGES BETWEEN ACE-5.5.3 and ACE-5.5.4
   Windows.  Use the new ACE_OFF_T typedef to refer to file offsets
   across UNIX and Windows portably.
 
-. 64-bit file offsets are now enabled by default in Win64
+. 64 bit file offsets are now enabled by default in Win64
   configurations.
 
 . Improved support for 64 bit platforms (64 bit addresses, etc).
@@ -148,7 +33,7 @@ USER VISIBLE CHANGES BETWEEN ACE-5.5.3 and ACE-5.5.4
 
 . Greatly improved event handler dispatch performance in
   select()-based reactors (e.g. ACE_Select_Reactor and ACE_TP_Reactor)
-  for large handle sets on Windows. Previous event handler search
+  for large handle sets on Windows.  Previous event handler search
   were linear, and are now constant on average.
 
 . Addressed a number of Coverity errors (CHECKED_RETURN, DEADCODE,
@@ -159,13 +44,6 @@ USER VISIBLE CHANGES BETWEEN ACE-5.5.3 and ACE-5.5.4
 
 . Removed support for LynxOS 3.x.
 
-. Resolved Bugzilla #2701 to ensure fini() is called for all
-  Service Objects upon calling ACE_Service_Config::close()
-
-. VxWorks 5.5.2 has been tested, for ACE the support is exactly
-  the same as for VxWorks 5.5.1. No specific defines or flags have
-  to be used.
-
 USER VISIBLE CHANGES BETWEEN ACE-5.5.2 and ACE-5.5.3
 ====================================================
 
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 9eccbd1eab0..7e3ce98b2ec 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -43,7 +43,7 @@
 To: ace-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 5.5.4
+    ACE VERSION: 5.5.3
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/Release b/ACE/Release
index 6072314a11f..bec32e4a29c 100644
--- a/ACE/Release
+++ b/ACE/Release
@@ -86,6 +86,7 @@ RELEASE_FILES = \
         $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
         ACE_wrappers/ACE-INSTALL \
         ACE_wrappers/GNUmake* \
+        ACE_wrappers/*.dsw \
         ACE_wrappers/*.sln \
         ACE_wrappers/*.bor \
         ACE_wrappers/*.vcw \
@@ -117,10 +118,10 @@ RELEASE_LIB_FILES = \
 RELEASE_TAG_FILES = \
         html
 
-.PHONY: tag ACE TAO CIAO acesources taosources ciaosources
+.PHONY: tag ACE TAO CIAO acesources taosources ciaosources 
 .PHONY: allsources manpages all
 
-# Some useful defines which are used to create the release bundle.
+# Some useful defines which are used to create the release bundle. 
 ACE_TAG_VALUE = $(shell head -1 VERSION | perl -ne \
                 's/.* ([\d\.]+),.*\n/$$1/; tr/./_/; print "ACE-$$_";')
 ACE_TAG       = -ta $(ACE_TAG_VALUE)
@@ -162,22 +163,22 @@ acesources: $(APPLY_NEW_TAG)
 	@$(ACE_ROOT)/bin/make_release -k ace $(ACE_TAG) \
          $(INSTALL_KIT) $(ZIP_FILES) $(CHECK)
 
-#### The following target is for use by the TAO Release target. It
-#### should not be called directly from the command line.  This is
+#### The following target is for use by the TAO Release target. It 
+#### should not be called directly from the command line.  This is 
 #### invoked by the TAO target this Release file.
 taosources:
 	@$(ACE_ROOT)/bin/make_release -k ace+tao $(ACE_TAG) $(TAO_TAG) \
          $(INSTALL_KIT) $(ZIP_FILES) $(CHECK)
 
-#### The following target is for use by the TAO Release target. It
-#### should not be called directly from the command line.  This is
+#### The following target is for use by the TAO Release target. It 
+#### should not be called directly from the command line.  This is 
 #### invoked by the TAO target this Release file.
 ciaosources:
 	@$(ACE_ROOT)/bin/make_release -k ace+tao+ciao $(ACE_TAG) $(TAO_TAG) $(CIAO_TAG) \
          $(INSTALL_KIT) $(ZIP_FILES) $(CHECK)
 
 #########################################################################
-## The following targets are a matter of convinience. We don't
+## The following targets are a matter of convinience. We don't 
 ## believe that we ever will release ACE+TAO+CIAO seperately. If that
 ## happens then we have these to help us out.
 #########################################################################
diff --git a/ACE/THANKS b/ACE/THANKS
index 2ac399557c6..4936d09d3ab 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -1702,7 +1702,7 @@ Craig Watcham <craigw at ananzi dot co dot za>
 Pit Linnartz <Pit dot Linnartz at t-mobile dot de>
 Peder Norgaard <pcn at pogt dot dk>
 David Ohlemacher <ohlemacher at bbn dot com>
-Ken Kane <kenneth dot kane at ironmountain dot com>
+Ken Kane <kkane at livevault dot com>
 Bill Church <wchurch at ara dot com>
 Udo Berninger <udo dot berninger at siemens dot com>
 Vincent Korkos <vincent dot korkos at fr dot thalesgroup dot com>
@@ -1733,7 +1733,7 @@ Roland Schimmack <Roland dot Schimmack at gmx dot de>
 Roy Pollock <rpollock at ghs dot com>
 Eric Held <Eric dot Held at harris dot com>
 Kees van Marle <kvmarle at remedy dot nl>
-Dieter Knueppel <Dieter dot Knueppel at batm dot de>
+Dieter Knueppel <dknueppel at datus dot com>
 Amol Tambe <Amol dot Tambe at ideas dot com>
 Emiliano Berenbaum <eberenb at yahoo dot com>
 Scott Clarke <sclarke at ideorlando dot org>
@@ -1765,6 +1765,7 @@ Onopin V. Mikhail <kool at garant dot ru>
 Edward R. Mulholland  <emulholl at atl dot lmco dot com>
 Brian Buesker <bbuesker at qualcomm dot com>
 Vladimir Naylov <vladimir at monosphere dot com>
+David Faure <faure at kde dot org>
 Ted Mules <ned at technisyst dot com dot au>
 Mike Hepburn <mike at anvil dot com>
 Dale Wilson  <wilson_d at ociweb dot com>
@@ -2036,7 +2037,7 @@ Hubert Talbot <Hubert dot Talbot at criq dot qc dot ca>
 Oh Yoon Sik <boom at estsoft dot com>
 Anton Bakanovskiy <Anton dot Bakanovskiy at bercut dot ru>
 Toha Bakanovsky <im-scooter at yandex dot ru>
-David Faure <dfaure at klaralvdalens-datakonsult dot se> <faure at kde dot org>
+David Faure <dfaure at klaralvdalens-datakonsult dot se>
 Robert Hancock <hancockr at shaw dot ca>
 Peter Oslej <peter dot oslej at vrm dot sk>
 Yongming Wang <wangym at gmail dot com>
@@ -2131,7 +2132,7 @@ Michael Reed <mnr102 at yahoo dot com>
 Heesuk Shin <heesuks at econz dot com>
 Hong Xing <hongxing777 at gmail dot com>
 Winston Zhang <winston_ace at kubao-inc dot com>
-Stefan Naewe <naewe dot s at atlas dot de> <stefan at naewe dot de>
+Stefan Naewe <naewe dot s at atlas dot de>
 Graeme Bell <graemeb at econz dot com>
 Eric Danielou <eric dot danielou at eads dot com>
 Wei Jiang <sdjiangwei at sina dot com>
@@ -2159,14 +2160,6 @@ N Johnson <nj at artesys dot info>
 Adam Nagel <nagelar at isis dot vanderbilt dot edu>
 Robert Neumann <robert dot neumann at gmail dot com>
 Venkat <swara101 at yahoo dot com>
-Juraj Ivancic <juraj dot ivancic at gmail dot com>
-Daniel Black <dragonheart at gentoo dot org>
-Richard Ridgway <Richard_Ridgway at ml dot com>
-Vadym Ridosh <vridosh at prismtech dot com>
-Viola Wang <vwang at eso dot org>
-Ray Lischner <rlischner at proteus-technologies dot com>
-Sergey Kosenko <sergey dot kosenko at gmail dot com>
-Pavel Zaichenko <zpf at ivl dot ua>
 
 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/VERSION b/ACE/VERSION
index 91fcb538a9c..ed4f76e9cbd 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.5.4, released Mon Nov 20 08:16:34 2006.
+This is ACE version 5.5.3, released Thu Oct 05 00:35:37 2006.
 
 If you have any problems with or questions about ACE, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp
index 6fec4b5d3a1..bfc8a867d6c 100644
--- a/ACE/ace/ACE.cpp
+++ b/ACE/ace/ACE.cpp
@@ -455,6 +455,12 @@ ACE::recv (ACE_HANDLE handle,
     return ACE_OS::recv (handle, (char *) buf, len, flags);
   else
     {
+#if defined (ACE_HAS_RECV_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday ();
+      timespec_t ts = copy;
+      return ::recv_timedwait (handle, buf, len, flags, &ts);
+#else
       int val = 0;
       if (ACE::enter_recv_timedwait (handle, timeout, val) ==-1)
         return -1;
@@ -465,6 +471,7 @@ ACE::recv (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_RECV_TIMEDWAIT */
     }
 }
 
@@ -506,6 +513,12 @@ ACE::recv (ACE_HANDLE handle,
     return ACE::recv_i (handle, buf, n);
   else
     {
+#if defined (ACE_HAS_READ_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday ();
+      timespec_t ts = copy;
+      return ::read_timedwait (handle, buf, n, &ts);
+#else
       int val = 0;
       if (ACE::enter_recv_timedwait (handle, timeout, val) == -1)
         return -1;
@@ -515,6 +528,7 @@ ACE::recv (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_READ_TIMEDWAIT */
     }
 }
 
@@ -528,6 +542,12 @@ ACE::recvmsg (ACE_HANDLE handle,
     return ACE_OS::recvmsg (handle, msg, flags);
   else
     {
+#if defined (ACE_HAS_RECVMSG_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday ();
+      timespec_t ts = copy;
+      return ::recvmsg_timedwait (handle, msg, flags, &ts);
+#else
       int val = 0;
       if (ACE::enter_recv_timedwait (handle, timeout, val) == -1)
         return -1;
@@ -537,6 +557,7 @@ ACE::recvmsg (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_RECVMSG_TIMEDWAIT */
     }
 }
 
@@ -553,6 +574,12 @@ ACE::recvfrom (ACE_HANDLE handle,
     return ACE_OS::recvfrom (handle, buf, len, flags, addr, addrlen);
   else
     {
+#if defined (ACE_HAS_RECVFROM_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday ();
+      timespec_t ts = copy;
+      return ::recvfrom_timedwait (handle, buf, len, flags, addr, addrlen, &ts);
+#else
       int val = 0;
       if (ACE::enter_recv_timedwait (handle, timeout, val) == -1)
         return -1;
@@ -563,6 +590,7 @@ ACE::recvfrom (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_RECVFROM_TIMEDWAIT */
     }
 }
 
@@ -967,6 +995,12 @@ ACE::recvv (ACE_HANDLE handle,
     return ACE_OS::recvv (handle, iov, iovcnt);
   else
     {
+#if defined (ACE_HAS_READV_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday ();
+      timespec_t ts = copy;
+      return ::readv_timedwait (handle, iov, iovcnt, &ts);
+#else
       int val = 0;
       if (ACE::enter_recv_timedwait (handle, timeout, val) == -1)
         return -1;
@@ -976,6 +1010,7 @@ ACE::recvv (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_READV_TIMEDWAIT */
     }
 }
 
@@ -1230,6 +1265,12 @@ ACE::send (ACE_HANDLE handle,
     return ACE_OS::send (handle, (const char *) buf, n, flags);
   else
     {
+#if defined (ACE_HAS_SEND_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday();
+      timespec_t ts = copy;
+      return ::send_timedwait (handle, buf, n, flags, &ts);
+#else
       int val = 0;
       if (ACE::enter_send_timedwait (handle, timeout, val) == -1)
         return -1;
@@ -1239,6 +1280,7 @@ ACE::send (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_SEND_TIMEDWAIT */
     }
 }
 
@@ -1279,6 +1321,12 @@ ACE::send (ACE_HANDLE handle,
     return ACE::send_i (handle, buf, n);
   else
     {
+#if defined (ACE_HAS_WRITE_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday ();
+      timespec_t ts = copy;
+      return ::write_timedwait (handle, buf, n, &ts);
+#else
       int val = 0;
       if (ACE::enter_send_timedwait (handle, timeout, val) == -1)
         return -1;
@@ -1288,6 +1336,7 @@ ACE::send (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_WRITE_TIMEDWAIT */
     }
 }
 
@@ -1301,6 +1350,12 @@ ACE::sendmsg (ACE_HANDLE handle,
     return ACE_OS::sendmsg (handle, msg, flags);
   else
     {
+#if defined (ACE_HAS_SENDMSG_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday ();
+      timespec_t ts = copy;
+      return ::sendmsg_timedwait (handle, msg, flags, &ts);
+#else
       int val = 0;
       if (ACE::enter_send_timedwait (handle, timeout, val) == -1)
         return -1;
@@ -1310,6 +1365,7 @@ ACE::sendmsg (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_SENDMSG_TIMEDWAIT */
     }
 }
 
@@ -1326,6 +1382,12 @@ ACE::sendto (ACE_HANDLE handle,
     return ACE_OS::sendto (handle, buf, len, flags, addr, addrlen);
   else
     {
+#if defined (ACE_HAS_SENDTO_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday ();
+      timespec_t ts = copy;
+      return ::sendto_timedwait (handle, buf, len, flags, addr, addrlen, ts);
+#else
       int val = 0;
       if (ACE::enter_send_timedwait (handle, timeout, val) == -1)
         return -1;
@@ -1336,6 +1398,7 @@ ACE::sendto (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_SENDTO_TIMEDWAIT */
     }
 }
 
@@ -1742,6 +1805,12 @@ ACE::sendv (ACE_HANDLE handle,
     return ACE_OS::sendv (handle, iov, iovcnt);
   else
     {
+#if defined (ACE_HAS_WRITEV_TIMEDWAIT)
+      ACE_Time_Value copy = *timeout;
+      copy += ACE_OS::gettimeofday ();
+      timespec_t ts = copy;
+      return ::sendv_timedwait (handle, iov, iovcnt, &ts);
+#else
       int val = 0;
       if (ACE::enter_send_timedwait (handle, timeout, val) == -1)
         return -1;
@@ -1751,6 +1820,7 @@ ACE::sendv (ACE_HANDLE handle,
           ACE::restore_non_blocking_mode (handle, val);
           return bytes_transferred;
         }
+#endif /* ACE_HAS_WRITEV_TIMEDWAIT */
     }
 }
 
@@ -2818,8 +2888,13 @@ ACE::fork (const ACE_TCHAR *program_name,
         }
 
       // Parent process waits for child to terminate.
-      ACE_exitcode status;
+#if defined (ACE_HAS_UNION_WAIT)
+      union wait status;
+      if (pid < 0 || ACE_OS::waitpid (pid, &(status.w_status), 0) < 0)
+#else
+        ACE_exitcode status;
       if (pid < 0 || ACE_OS::waitpid (pid, &status, 0) < 0)
+#endif /* ACE_HAS_UNION_WAIT */
         return -1;
 
       // child terminated by calling exit()?
diff --git a/ACE/ace/FlReactor/ACE_FlReactor.pc.in b/ACE/ace/ACE_FlReactor.pc.in
index c284481585d..c284481585d 100644
--- a/ACE/ace/FlReactor/ACE_FlReactor.pc.in
+++ b/ACE/ace/ACE_FlReactor.pc.in
diff --git a/ACE/ace/FlReactor/ACE_FlReactor_export.h b/ACE/ace/ACE_FlReactor_export.h
index f46b66cb3f7..f46b66cb3f7 100644
--- a/ACE/ace/FlReactor/ACE_FlReactor_export.h
+++ b/ACE/ace/ACE_FlReactor_export.h
diff --git a/ACE/ace/QtReactor/ACE_QtReactor.pc.in b/ACE/ace/ACE_QtReactor.pc.in
index 4e7aa83e6be..4e7aa83e6be 100644
--- a/ACE/ace/QtReactor/ACE_QtReactor.pc.in
+++ b/ACE/ace/ACE_QtReactor.pc.in
diff --git a/ACE/ace/QtReactor/ACE_QtReactor_export.h b/ACE/ace/ACE_QtReactor_export.h
index f7192051a29..f7192051a29 100644
--- a/ACE/ace/QtReactor/ACE_QtReactor_export.h
+++ b/ACE/ace/ACE_QtReactor_export.h
diff --git a/ACE/ace/TkReactor/ACE_TkReactor.pc.in b/ACE/ace/ACE_TkReactor.pc.in
index e53797e600c..e53797e600c 100644
--- a/ACE/ace/TkReactor/ACE_TkReactor.pc.in
+++ b/ACE/ace/ACE_TkReactor.pc.in
diff --git a/ACE/ace/TkReactor/ACE_TkReactor_export.h b/ACE/ace/ACE_TkReactor_export.h
index bd74f861e60..bd74f861e60 100644
--- a/ACE/ace/TkReactor/ACE_TkReactor_export.h
+++ b/ACE/ace/ACE_TkReactor_export.h
diff --git a/ACE/ace/XtReactor/ACE_XtReactor.pc.in b/ACE/ace/ACE_XtReactor.pc.in
index 118c61c5632..118c61c5632 100644
--- a/ACE/ace/XtReactor/ACE_XtReactor.pc.in
+++ b/ACE/ace/ACE_XtReactor.pc.in
diff --git a/ACE/ace/XtReactor/ACE_XtReactor_export.h b/ACE/ace/ACE_XtReactor_export.h
index 3d9049cb7af..3d9049cb7af 100644
--- a/ACE/ace/XtReactor/ACE_XtReactor_export.h
+++ b/ACE/ace/ACE_XtReactor_export.h
diff --git a/ACE/ace/ARGV.cpp b/ACE/ace/ARGV.cpp
index 6117ded088a..8ef7d441afb 100644
--- a/ACE/ace/ARGV.cpp
+++ b/ACE/ace/ARGV.cpp
@@ -17,25 +17,10 @@ ACE_RCSID(ace, ARGV, "$Id$")
 // Open versioned namespace, if enabled by the user.
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_ALLOC_HOOK_DEFINE (ACE_ARGV_Queue_Entry)
 ACE_ALLOC_HOOK_DEFINE (ACE_ARGV)
 
 template <typename CHAR_TYPE>
 void
-ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_ARGV_Queue_Entry_T::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("arg_ = %s"), this->arg_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("quote_arg_ = %d"), (int)this->quote_arg_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-template <typename CHAR_TYPE>
-void
 ACE_ARGV_T<CHAR_TYPE>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
@@ -76,6 +61,13 @@ ACE_ARGV_T<CHAR_TYPE>::string_to_argv (void)
 }
 
 template <typename CHAR_TYPE>
+int
+ACE_ARGV_T<CHAR_TYPE>::argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf)
+{
+  return ACE_OS::argv_to_string (argv, buf);
+}
+
+template <typename CHAR_TYPE>
 ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (const CHAR_TYPE buf[],
                                    bool substitute_env_args)
   : substitute_env_args_ (substitute_env_args),
@@ -105,8 +97,7 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (const CHAR_TYPE buf[],
 
 template <typename CHAR_TYPE>
 ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *argv[],
-                                   bool substitute_env_args,
-                                   bool quote_arg)
+                                   bool substitute_env_args)
   : substitute_env_args_ (substitute_env_args),
     iterative_ (false),
     argc_ (0),
@@ -120,17 +111,13 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *argv[],
   if (argv == 0 || argv[0] == 0)
     return;
 
-  this->argc_ = ACE_OS::argv_to_string (argv,
-                                        this->buf_,
-                                        substitute_env_args,
-                                        quote_arg);
+  this->argc_ = ACE_OS::argv_to_string (argv, this->buf_, substitute_env_args);
 }
 
 template <typename CHAR_TYPE>
 ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *first_argv[],
                                    CHAR_TYPE *second_argv[],
-                                   bool substitute_env_args,
-                                   bool quote_args)
+                                   bool substitute_env_args)
   : substitute_env_args_ (substitute_env_args),
     iterative_ (false),
     argc_ (0),
@@ -141,29 +128,17 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *first_argv[],
 {
   ACE_TRACE ("ACE_ARGV_T::ACE_ARGV_T CHAR_TYPE*[] + CHAR_TYPE *[] to CHAR_TYPE[]");
 
-  int first_argc = 0;
-  int second_argc = 0;
+  int first_argc;
+  int second_argc;
 
-  CHAR_TYPE *first_buf = 0;
-  CHAR_TYPE *second_buf = 0;
+  CHAR_TYPE *first_buf;
+  CHAR_TYPE *second_buf;
 
   // convert the first argv to a string
-  if (first_argv != 0 && first_argv[0] != 0)
-    {
-      first_argc = ACE_OS::argv_to_string (first_argv,
-                                           first_buf,
-                                           substitute_env_args,
-                                           quote_args);
-    }
+  first_argc = this->argv_to_string (first_argv, first_buf);
 
   // convert the second argv to a string
-  if (second_argv != 0 && second_argv[0] != 0)
-    {
-      second_argc = ACE_OS::argv_to_string (second_argv,
-                                            second_buf,
-                                            substitute_env_args,
-                                            quote_args);
-    }
+  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;
@@ -182,7 +157,9 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *first_argv[],
   ACE_OS::strcat (this->buf_, second_buf);
 
   //   Delete the first and second buffers
+
   delete [] first_buf;
+
   delete [] second_buf;
 }
 
@@ -203,7 +180,7 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (bool substitute_env_args)
 
 template <typename CHAR_TYPE>
 int
-ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg, bool quote_arg)
+ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg)
 {
   // Only allow this to work in the "iterative" verion -- the
   // ACE_ARGVs created with the one argument constructor.
@@ -213,25 +190,14 @@ ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg, bool quote_arg)
       return -1;
     }
 
-  this->length_ += ACE_OS::strlen (next_arg);
-  if (quote_arg && ACE_OS::strchr (next_arg, ' ') != 0)
-    {
-      this->length_ += 2;
-      if (ACE_OS::strchr (next_arg, '"') != 0)
-        for (const CHAR_TYPE * p = next_arg; *p != '\0'; ++p)
-          if (*p == '"') ++this->length_;
-    }
-  else
-    {
-      quote_arg = false;
-    }
-
   // Put the new argument at the end of the queue.
-  if (this->queue_.enqueue_tail (ACE_ARGV_Queue_Entry_T<CHAR_TYPE> (next_arg, quote_arg)) == -1)
+  if (this->queue_.enqueue_tail (const_cast <CHAR_TYPE *> (next_arg)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_LIB_TEXT ("Can't add more to ARGV queue")),
                       -1);
 
+  this->length_ += ACE_OS::strlen (next_arg);
+
   this->argc_++;
 
   // Wipe argv_ and buf_ away so that they will be recreated if the
@@ -253,10 +219,10 @@ ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg, bool quote_arg)
 
 template <typename CHAR_TYPE>
 int
-ACE_ARGV_T<CHAR_TYPE>::add (CHAR_TYPE *argv[], bool quote_args)
+ACE_ARGV_T<CHAR_TYPE>::add (CHAR_TYPE *argv[])
 {
   for (int i = 0; argv[i] != 0; i++)
-    if (this->add (argv[i], quote_args) == -1)
+    if (this->add (argv[i]) == -1)
       return -1;
 
   return 0;
@@ -297,58 +263,36 @@ ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue (void)
                   -1);
 
   // Get an iterator over the queue
-  ACE_Unbounded_Queue_Iterator<ACE_ARGV_Queue_Entry_T<CHAR_TYPE> > iter (this->queue_);
+  ACE_Unbounded_Queue_Iterator<CHAR_TYPE *> iter (this->queue_);
 
-  ACE_ARGV_Queue_Entry_T<CHAR_TYPE> *arg = 0;
+  CHAR_TYPE **arg = 0;
   CHAR_TYPE *ptr = this->buf_;
   size_t len;
+  int more = 0;
 
   while (!iter.done ())
     {
       // Get next argument from the queue.
       iter.next (arg);
-      iter.advance ();
-
-      if (arg->quote_arg_)
-        {
-          *ptr++ = '"';
-          if (ACE_OS::strchr (arg->arg_, '"') != 0)
-            {
-              for (const CHAR_TYPE * p = arg->arg_; *p != '\0'; ++p)
-                {
-                  if (*p == '"') *ptr++ = '\\';
-                  *ptr++ = *p;
-                }
-            }
-          else
-            {
-              len = ACE_OS::strlen (arg->arg_);
-              // Copy the argument into buf_
-              ACE_OS::memcpy ((void *) ptr,
-                              (const void *) (arg->arg_),
-                              len * sizeof (CHAR_TYPE));
-              // Move the pointer down.
-              ptr += len;
-            }
-          *ptr++ = '"';
-        }
-      else
-        {
-          len = ACE_OS::strlen (arg->arg_);
-          // Copy the argument into buf_
-          ACE_OS::memcpy ((void *) ptr,
-                          (const void *) (arg->arg_),
-                          len * sizeof (CHAR_TYPE));
-          // Move the pointer down.
-          ptr += len;
-        }
+
+      more = iter.advance ();
+
+      len = ACE_OS::strlen (*arg);
+
+      // Copy the argument into buf_
+      ACE_OS::memcpy ((void *) ptr,
+                      (const void *) (*arg),
+                      len * sizeof (CHAR_TYPE));
+      // Move the pointer down.
+      ptr += len;
 
       // Put in an argument separating space.
-      *ptr++ = ' ';
+      if (more != 0)
+        *ptr++ = ' ';
     }
 
   // Put in the NUL terminator
-  ptr[-1] = '\0';
+  *ptr = '\0';
 
   return 0;
 }
diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h
index 15b583dbbf4..f9540fc4824 100644
--- a/ACE/ace/ARGV.h
+++ b/ACE/ace/ARGV.h
@@ -27,54 +27,6 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
- * @class ACE_ARGV_Queue_Entry_T
- *
- * @brief An entry in the queue which keeps user supplied arguments.
- */
-template <typename CHAR_TYPE>
-class ACE_ARGV_Queue_Entry_T
-{
-public:
-  // = Initialization and termination.
-  /// Initialize a ACE_ARGV_Queue_Entry_T.
-  ACE_ARGV_Queue_Entry_T (void);
-
-  /**
-   * Initialize a ACE_ARGV_Queue_Entry_T.
-   *
-   * @param arg   Pointer to an argument
-   *
-   * @param quote_arg The argument @a arg need to be quoted
-   *              while adding to the vector.
-   */
-  ACE_ARGV_Queue_Entry_T (const CHAR_TYPE *arg,
-                          bool quote_arg);
-
-  /**
-   * Initialize a ACE_ARGV_Queue_Entry_T.
-   *
-   * @param entry Pointer to a queue entry
-   */
-  ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_Entry_T<CHAR_TYPE> &entry);
-
-  /// We need this destructor to keep some compilers from complaining.
-  /// It's just a no-op, however.
-  ~ACE_ARGV_Queue_Entry_T (void);
-
-  /// Dump the state of this object.
-  void dump (void) const;
-
-  // Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-  /// Pointer to the argument.
-  const CHAR_TYPE * arg_;
-
-  /// The argument need to be quoted while adding to the vector.
-  bool quote_arg_;
-};
-
-/**
  * @class ACE_ARGV_T
  *
  * @brief Builds a counted argument vector (ala argc/argv) from either
@@ -127,13 +79,9 @@ public:
    *              an environment variable reference (e.g., @c $VAR) will have
    *              its environment variable value in the resultant vector
    *              in place of the environment variable name.
-   *
-   * @param quote_args  If non-zero each argument @a argv[i] needs to
-   *                    be enclosed in double quotes ('"').
    */
   ACE_ARGV_T (CHAR_TYPE *argv[],
-              bool substitute_env_args = true,
-              bool quote_args = false);
+              bool substitute_env_args = true);
 
   /**
    * Initializes the argument vector from two combined argument vectors.
@@ -148,15 +96,10 @@ public:
    *              reference (e.g., @c $VAR) will have its environment
    *              variable value in the resultant vector in place
    *              of the environment variable name.
-   *
-   * @param quote_args  If non-zero each arguments @a first_argv[i] and
-   *                    @a second_argv[i] needs to be enclosed
-   *                    in double quotes ('"').
    */
   ACE_ARGV_T (CHAR_TYPE *first_argv[],
               CHAR_TYPE *second_argv[],
-              bool substitute_env_args = true,
-              bool quote_args = false);
+              bool substitute_env_args = true);
 
   /**
    * Initialize this object so arguments can be added later using one
@@ -218,14 +161,11 @@ public:
    *
    * @param next_arg    Pointer to the next argument to add to the vector.
    *
-   * @param quote_arg   The argument @a next_arg need to be quoted while
-   *                    adding to the vector.
-   *
    * @retval 0 on success; -1 on failure. Most likely @c errno values are:
    *       - EINVAL: This object is not in iterative mode.
    *       - ENOMEM: Not enough memory available to save @a next_arg.
    */
-  int add (const CHAR_TYPE *next_arg, bool quote_arg = false);
+  int add (const CHAR_TYPE *next_arg);
 
   /**
    * Add an array of arguments. This only works in the iterative mode.
@@ -238,14 +178,11 @@ public:
    * @param argv    Pointers to the arguments to add to the vector.
    *                @a argv must be terminated by a 0 pointer.
    *
-   * @param quote_args  If non-zero each argument @a argv[i] needs to
-   *                    be enclosed in double quotes ('"').
-   *
    * @retval 0 on success; -1 on failure. Most likely @c errno values are:
    *       - EINVAL: This object is not in iterative mode.
    *       - ENOMEM: Not enough memory available to save @a next_arg.
    */
-  int add (CHAR_TYPE *argv[], bool quote_args = false);
+  int add (CHAR_TYPE *argv[]);
 
 private:
   /// Copy constructor not implemented.
@@ -260,6 +197,10 @@ private:
   /// Converts buf_ into the CHAR_TYPE *argv[] format.
   int string_to_argv (void);
 
+  /// Returns the string created from argv in buf and
+  /// returns the number of arguments.
+  int argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf);
+
   /// Replace args with environment variable values?
   bool substitute_env_args_;
 
@@ -280,10 +221,9 @@ private:
 
   /// Queue which keeps user supplied arguments.  This is only
   /// active in the "iterative" mode.
-  ACE_Unbounded_Queue<ACE_ARGV_Queue_Entry_T<CHAR_TYPE> > queue_;
+  ACE_Unbounded_Queue<CHAR_TYPE *> queue_;
 };
 
-typedef ACE_ARGV_Queue_Entry_T<ACE_TCHAR> ACE_ARGV_Queue_Entry;
 typedef ACE_ARGV_T<ACE_TCHAR> ACE_ARGV;
 
 // Close versioned namespace, if enabled by the user.
diff --git a/ACE/ace/ARGV.inl b/ACE/ace/ARGV.inl
index e84166f49ba..6924a95cca4 100644
--- a/ACE/ace/ARGV.inl
+++ b/ACE/ace/ARGV.inl
@@ -6,47 +6,12 @@
 // Open versioned namespace, if enabled by the user.
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <typename CHAR_TYPE> ACE_INLINE
-ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (void)
-  : arg_(0),
-    quote_arg_(false)
-{
-  // No-op
-}
-
-template <typename CHAR_TYPE> ACE_INLINE
-ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (const CHAR_TYPE *arg,
-                                                           bool quote_arg)
-  : arg_(arg),
-    quote_arg_(quote_arg)
-{
-  // No-op
-}
-
-template <typename CHAR_TYPE> ACE_INLINE
-ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_Entry_T<CHAR_TYPE> &entry)
-  : arg_(entry.arg_),
-    quote_arg_(entry.quote_arg_)
-{
-  // No-op
-}
-
-template <typename CHAR_TYPE> ACE_INLINE
-ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T (void)
-{
-  // No-op just to keep some compilers happy...
-}
-
 // Return the number of args
 template <typename CHAR_TYPE>
 ACE_INLINE int
 ACE_ARGV_T<CHAR_TYPE>::argc (void) const
 {
   ACE_TRACE ("ACE_ARGV_T::argc");
- // Try to create the argv_ if it isn't there
-  ACE_ARGV_T<CHAR_TYPE> *nonconst_this =
-    const_cast <ACE_ARGV_T<CHAR_TYPE> *> (this);
- (void) nonconst_this->argv ();
   return this->argc_;
 }
 
diff --git a/ACE/ace/Asynch_Acceptor.cpp b/ACE/ace/Asynch_Acceptor.cpp
index fd7525a30c8..374658afefe 100644
--- a/ACE/ace/Asynch_Acceptor.cpp
+++ b/ACE/ace/Asynch_Acceptor.cpp
@@ -12,7 +12,7 @@
 
 ACE_RCSID(ace, Asynch_Acceptor, "$Id$")
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE)
 // This only works on platforms that support async i/o.
 
 #include "ace/OS_Errno.h"
@@ -239,6 +239,8 @@ ACE_Asynch_Acceptor<HANDLER>::accept (size_t bytes_to_read, const void *act)
 template <class HANDLER> void
 ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &result)
 {
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || defined (ACE_HAS_AIO_CALLS)
+
   ACE_TRACE ("ACE_Asynch_Acceptor<>::handle_accept");
 
   // Variable for error tracking
@@ -250,7 +252,7 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re
       error = 1;
     }
 
-#if defined (ACE_WIN32)
+#if !defined (ACE_HAS_AIO_CALLS)
   // In order to use accept handle with other Window Sockets 1.1
   // functions, we call the setsockopt function with the
   // SO_UPDATE_ACCEPT_CONTEXT option. This option initializes the
@@ -265,7 +267,7 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re
     {
       error = 1;
     }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_AIO_CALLS */
 
   // Parse address.
   ACE_INET_Addr local_address;
@@ -340,6 +342,7 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re
 #endif
       )
     this->accept (this->bytes_to_read_);
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || defined (ACE_HAS_AIO_CALLS */
 }
 
 template <class HANDLER> int
@@ -367,14 +370,14 @@ ACE_Asynch_Acceptor<HANDLER>::cancel (void)
   // All I/O operations that are canceled will complete with the error
   // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
   // operations will occur normally.
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) && \
-    (defined (_MSC_VER) || defined (__BORLANDC__))
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \
+    && (    defined (_MSC_VER) || (defined (__BORLANDC__)))
   return (int) ::CancelIo (this->listen_handle_);
 #else
   // Supported now
   return this->asynch_accept_.cancel();
 
-#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) && (defined (_MSC_VER)) || defined (__BORLANDC__)) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && ((defined (_MSC_VER)) || (defined (__BORLANDC__))) */
 }
 
 template <class HANDLER> void
@@ -393,7 +396,7 @@ ACE_Asynch_Acceptor<HANDLER>::parse_address (const
   str.get_local_addr (local_address);
   str.get_remote_addr (remote_address);
 
-#elif defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#elif (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
 
   ACE_Message_Block &message_block = result.message_block ();
 
@@ -424,7 +427,7 @@ ACE_Asynch_Acceptor<HANDLER>::parse_address (const
 #else
   // just in case
   errno = ENOTSUP;
-#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
   return;
 }
 
diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h
index f615557feb8..80ae20a3667 100644
--- a/ACE/ace/Asynch_Acceptor.h
+++ b/ACE/ace/Asynch_Acceptor.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE)
 // This only works on platforms that support async i/o.
 
 #include "ace/Default_Constants.h"
@@ -291,6 +291,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #pragma implementation ("Asynch_Acceptor.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
 #include /**/ "ace/post.h"
 #endif /* ACE_ASYNCH_ACCEPTOR_H */
diff --git a/ACE/ace/Asynch_IO.cpp b/ACE/ace/Asynch_IO.cpp
index 07027962100..cfcaf28aa2c 100644
--- a/ACE/ace/Asynch_IO.cpp
+++ b/ACE/ace/Asynch_IO.cpp
@@ -4,7 +4,7 @@
 
 ACE_RCSID(ace, Asynch_IO, "$Id$")
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 // This only works on platforms with Asynchronous IO
 
 #include "ace/Proactor.h"
@@ -187,7 +187,7 @@ ACE_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
                                       signal_number);
 }
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
 int
 ACE_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
                                size_t bytes_to_read,
@@ -201,7 +201,7 @@ ACE_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
                                        priority,
                                        signal_number);
 }
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
 ACE_Asynch_Operation_Impl *
 ACE_Asynch_Read_Stream::implementation (void) const
@@ -295,7 +295,7 @@ ACE_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
                                        signal_number);
 }
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
 int
 ACE_Asynch_Write_Stream::writev (ACE_Message_Block &message_block,
                                  size_t bytes_to_write,
@@ -309,7 +309,7 @@ ACE_Asynch_Write_Stream::writev (ACE_Message_Block &message_block,
                                         priority,
                                         signal_number);
 }
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
 ACE_Asynch_Operation_Impl *
 ACE_Asynch_Write_Stream::implementation (void) const
@@ -1330,6 +1330,6 @@ ACE_Asynch_Write_Dgram::Result::~Result (void)
 {
 }
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h
index 873ef6f40e9..c4ae5c8ca3b 100644
--- a/ACE/ace/Asynch_IO.h
+++ b/ACE/ace/Asynch_IO.h
@@ -33,7 +33,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 
 #include "ace/Synch_Traits.h"
 #if defined (ACE_HAS_THREADS)
@@ -49,7 +49,8 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-# if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+# if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \
+                         && ! defined (ACE_HAS_PHARLAP)
 typedef TRANSMIT_FILE_BUFFERS ACE_TRANSMIT_FILE_BUFFERS;
 typedef LPTRANSMIT_FILE_BUFFERS ACE_LPTRANSMIT_FILE_BUFFERS;
 typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS;
@@ -58,7 +59,7 @@ typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS;
 #   define ACE_STATUS_TIMEOUT STATUS_TIMEOUT
 #   define ACE_WAIT_FAILED WAIT_FAILED
 #   define ACE_WAIT_TIMEOUT WAIT_TIMEOUT
-# else /* ACE_HAS_WIN32_OVERLAPPED_IO */
+# else /* ACE_WIN32 */
 struct ACE_TRANSMIT_FILE_BUFFERS
 {
   void *Head;
@@ -75,7 +76,7 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS;
 #   define ACE_STATUS_TIMEOUT LONG_MAX
 #   define ACE_WAIT_FAILED LONG_MAX
 #   define ACE_WAIT_TIMEOUT LONG_MAX
-# endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+# endif /* ACE_WIN32 */
 
 // Forward declarations
 class ACE_Proactor;
@@ -337,7 +338,7 @@ public:
             int priority = 0,
             int signal_number = ACE_SIGRTMIN);
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   /**
   * Same as above but with scatter support, through chaining of composite
   * message blocks using the continuation field.
@@ -347,7 +348,7 @@ public:
              const void *act = 0,
              int priority = 0,
              int signal_number = ACE_SIGRTMIN);
-#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
   /// Return the underlying implementation class.
   //  (this should be protected...)
@@ -461,7 +462,7 @@ public:
              int priority = 0,
              int signal_number = ACE_SIGRTMIN);
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
@@ -471,7 +472,7 @@ public:
               const void *act = 0,
               int priority = 0,
               int signal_number = ACE_SIGRTMIN);
-#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
   /// Return the underlying implementation class.
   /// @todo (this should be protected...)
diff --git a/ACE/ace/Asynch_IO_Impl.cpp b/ACE/ace/Asynch_IO_Impl.cpp
index 5349f5e7ca1..8dba289d6ec 100644
--- a/ACE/ace/Asynch_IO_Impl.cpp
+++ b/ACE/ace/Asynch_IO_Impl.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Asynch_IO_Impl.h"
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 // This only works on Win32 platforms and on Unix platforms supporting
 // aio calls.
 
@@ -114,4 +114,4 @@ ACE_Asynch_Write_Dgram_Result_Impl::ACE_Asynch_Write_Dgram_Result_Impl (void)
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif /* ACE_WIN32 || ACE_HAS_WINCE */
diff --git a/ACE/ace/Asynch_IO_Impl.h b/ACE/ace/Asynch_IO_Impl.h
index b1af7a57d25..3e0af19f2e7 100644
--- a/ACE/ace/Asynch_IO_Impl.h
+++ b/ACE/ace/Asynch_IO_Impl.h
@@ -30,7 +30,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 // This only works on Win32 platforms and on Unix platforms supporting
 // aio calls.
 
@@ -811,6 +811,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Asynch_IO_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif /* ACE_HAS_AIO_CALLS  || !ACE_HAS_WINCE && ACE_WIN32 */
 #include /**/ "ace/post.h"
 #endif /* ACE_ASYNCH_IO_IMPL_H */
diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h
index ea5c5d201c4..35d1ceec8a5 100644
--- a/ACE/ace/Atomic_Op_T.h
+++ b/ACE/ace/Atomic_Op_T.h
@@ -46,57 +46,57 @@ class ACE_Atomic_Op_Ex
 public:
   // = Initialization methods.
 
-  /// Initialize @c value_ to 0.
+  /// Initialize <value_> to 0.
   ACE_Atomic_Op_Ex (ACE_LOCK &mtx);
 
-  /// Initialize @c value_ to c.
+  /// Initialize <value_> to c.
   ACE_Atomic_Op_Ex (ACE_LOCK &mtx, const TYPE &c);
 
   // = Accessors.
 
-  /// Atomically pre-increment @c value_.
+  /// Atomically pre-increment <value_>.
   TYPE operator++ (void);
 
-  /// Atomically post-increment @c value_.
+  /// Atomically post-increment <value_>.
   TYPE operator++ (int);
 
-  /// Atomically increment @c value_ by rhs.
+  /// Atomically increment <value_> by rhs.
   TYPE operator+= (const TYPE &rhs);
 
-  /// Atomically pre-decrement @c value_.
+  /// Atomically pre-decrement <value_>.
   TYPE operator-- (void);
 
-  /// Atomically post-decrement @c value_.
+  /// Atomically post-decrement <value_>.
   TYPE operator-- (int);
 
-  /// Atomically decrement @c value_ by rhs.
+  /// Atomically decrement <value_> by rhs.
   TYPE operator-= (const TYPE &rhs);
 
-  /// Atomically compare @c value_ with rhs.
+  /// Atomically compare <value_> with rhs.
   bool operator== (const TYPE &rhs) const;
 
-  /// Atomically compare @c value_ with rhs.
+  /// Atomically compare <value_> with rhs.
   bool operator!= (const TYPE &rhs) const;
 
-  /// Atomically check if @c value_ greater than or equal to rhs.
+  /// Atomically check if <value_> greater than or equal to rhs.
   bool operator>= (const TYPE &rhs) const;
 
-  /// Atomically check if @c value_ greater than rhs.
+  /// Atomically check if <value_> greater than rhs.
   bool operator> (const TYPE &rhs) const;
 
-  /// Atomically check if @c value_ less than or equal to rhs.
+  /// Atomically check if <value_> less than or equal to rhs.
   bool operator<= (const TYPE &rhs) const;
 
-  /// Atomically check if @c value_ less than rhs.
+  /// Atomically check if <value_> less than rhs.
   bool operator< (const TYPE &rhs) const;
 
-  /// Atomically assign rhs to @c value_.
+  /// Atomically assign rhs to <value_>.
   ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &operator= (const TYPE &rhs);
 
-  /// Atomically assign <rhs> to @c value_.
+  /// Atomically assign <rhs> to <value_>.
   ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &operator= (const ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &rhs);
 
-  /// Explicitly return @c value_.
+  /// Explicitly return <value_>.
   TYPE value (void) const;
 
   /// Dump the state of an object.
@@ -118,7 +118,7 @@ public:
   ACE_LOCK &mutex (void);
 
   /**
-   * Explicitly return @c value_ (by reference).  This gives the user
+   * Explicitly return <value_> (by reference).  This gives the user
    * full, unrestricted access to the underlying value.  This method
    * will usually be used in conjunction with explicit access to the
    * lock.  Use with care ;-)
@@ -151,58 +151,58 @@ template <class ACE_LOCK, class TYPE>
 class ACE_Atomic_Op
 {
 public:
-  /// Initialize @c value_ to 0.
+  /// Initialize <value_> to 0.
   ACE_Atomic_Op (void);
 
-  /// Initialize @c value_ to c.
+  /// Initialize <value_> to c.
   ACE_Atomic_Op (const TYPE &c);
 
   /// Manage copying...
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_LOCK, TYPE> &c);
 
-  /// Atomically assign rhs to @c value_.
+  /// Atomically assign rhs to <value_>.
   ACE_Atomic_Op<ACE_LOCK, TYPE> &operator= (const TYPE &rhs);
 
-  /// Atomically assign <rhs> to @c value_.
+  /// Atomically assign <rhs> to <value_>.
   ACE_Atomic_Op<ACE_LOCK, TYPE> &operator= (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs);
 
-  /// Atomically pre-increment @c value_.
+  /// Atomically pre-increment <value_>.
   TYPE operator++ (void);
 
-  /// Atomically post-increment @c value_.
+  /// Atomically post-increment <value_>.
   TYPE operator++ (int);
 
-  /// Atomically increment @c value_ by rhs.
+  /// Atomically increment <value_> by rhs.
   TYPE operator+= (const TYPE &rhs);
 
-  /// Atomically pre-decrement @c value_.
+  /// Atomically pre-decrement <value_>.
   TYPE operator-- (void);
 
-  /// Atomically post-decrement @c value_.
+  /// Atomically post-decrement <value_>.
   TYPE operator-- (int);
 
-  /// Atomically decrement @c value_ by rhs.
+  /// Atomically decrement <value_> by rhs.
   TYPE operator-= (const TYPE &rhs);
 
-  /// Atomically compare @c value_ with rhs.
+  /// Atomically compare <value_> with rhs.
   bool operator== (const TYPE &rhs) const;
 
-  /// Atomically compare @c value_ with rhs.
+  /// Atomically compare <value_> with rhs.
   bool operator!= (const TYPE &rhs) const;
 
-  /// Atomically check if @c value_ greater than or equal to rhs.
+  /// Atomically check if <value_> greater than or equal to rhs.
   bool operator>= (const TYPE &rhs) const;
 
-  /// Atomically check if @c value_ greater than rhs.
+  /// Atomically check if <value_> greater than rhs.
   bool operator> (const TYPE &rhs) const;
 
-  /// Atomically check if @c value_ less than or equal to rhs.
+  /// Atomically check if <value_> less than or equal to rhs.
   bool operator<= (const TYPE &rhs) const;
 
-  /// Atomically check if @c value_ less than rhs.
+  /// Atomically check if <value_> less than rhs.
   bool operator< (const TYPE &rhs) const;
 
-  /// Explicitly return @c value_.
+  /// Explicitly return <value_>.
   TYPE value (void) const;
 
   /// Dump the state of an object.
@@ -221,7 +221,7 @@ public:
   ACE_LOCK &mutex (void);
 
   /**
-   * Explicitly return @c value_ (by reference).  This gives the user
+   * Explicitly return <value_> (by reference).  This gives the user
    * full, unrestricted access to the underlying value.  This method
    * will usually be used in conjunction with explicit access to the
    * lock.  Use with care ;-)
diff --git a/ACE/ace/Basic_Stats.cpp b/ACE/ace/Basic_Stats.cpp
index 0f00f5b7332..f81b29bfcaa 100644
--- a/ACE/ace/Basic_Stats.cpp
+++ b/ACE/ace/Basic_Stats.cpp
@@ -70,9 +70,6 @@ ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg,
               l_avg,
               l_max, this->max_at_));
 
-#else
-  ACE_UNUSED_ARG (msg);
-  ACE_UNUSED_ARG (sf);
 #endif /* ACE_NLOGGING */
 }
 
diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h
index 48a0becdb12..367f3ace86d 100644
--- a/ACE/ace/Basic_Types.h
+++ b/ACE/ace/Basic_Types.h
@@ -392,8 +392,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 # else /* ! BYTE_ORDER && ! __BYTE_ORDER */
   // We weren't explicitly told, so we have to figure it out . . .
 #   if defined (i386) || defined (__i386__) || defined (_M_IX86) || \
-     defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__) || \
-     defined (ARM) || defined (_M_IA64) || defined (__ia64__) || \
+     defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__) ||\
+     defined (ARM) || defined (_M_IA64) || \
      defined (_M_AMD64) || defined (__amd64)
     // We know these are little endian.
 #     define ACE_LITTLE_ENDIAN 0x0123
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp
index b033d8a1587..516e4fd2c63 100644
--- a/ACE/ace/CDR_Stream.cpp
+++ b/ACE/ace/CDR_Stream.cpp
@@ -677,51 +677,6 @@ ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x,
   return this->good_bit ();
 }
 
- 
-int
-ACE_OutputCDR::consolidate (void)
-{
-  // Optimize by only doing something if we need to
-  if (this->current_ != &this->start_)
-    {
-      // Set the number of bytes in the top-level block, reallocating
-      // if necessary.  The rd_ptr and wr_ptr remain at the original offsets
-      // into the buffer, even if it is reallocated.
-      // Return an error if the allocation failed.
-      size_t newsize =
-        ACE_CDR::first_size (this->total_length ()
-                             + ACE_CDR::MAX_ALIGNMENT);
-      if (this->start_.size (newsize) < 0)
-        {
-          return -1;
-        }
-
-      // Consolidate the chain into the first block.  NOTE that
-      // ACE_CDR::consolidate can not be used since we don't want to
-      // overwrite what is already in the first block. We just append it since
-      // the read and write pointers weren't affected by the resizing above.
-      // We also don't have to worry about alignment since the start block is
-      // already aligned.
-      // NOTE also we know there is a continuation since we checked for it
-      // above.  There is therefore no reason to check for a 0 continuation
-      // field here.
-      ACE_Message_Block *cont = this->start_.cont ();
-      for (const ACE_Message_Block* i = cont; i != 0; i = i->cont ())
-        {
-          this->start_.copy (i->rd_ptr (), i->length ());
-        }
-      
-      // Release the old blocks that were consolidated and reset the
-      // current_ and current_is_writable_ to reflect the single used block.
-      ACE_Message_Block::release (cont);
-      this->start_.cont (0);
-      this->current_ = &this->start_;
-      this->current_is_writable_ = true;
-    }
-  
-  return 0;
-}
-
 
 ACE_Message_Block*
 ACE_OutputCDR::find (char* loc)
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index 40504e1a2cf..3e4d23a92dc 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -138,8 +138,8 @@ public:
   /**
    * Create an output stream from an arbitrary data block, care must be
    * exercised with alignment, because this contructor will align if
-   * needed.  In this case @a data_block will not point to the
-   * start of the output stream. begin()->rd_ptr() points to the start
+   * needed.  In this case the <data_block> buffer will not point to the
+   * start off the output stream. begin()->rd_prt() points to the start
    * off the output stream.  See ACE_ptr_align_binary() to properly align a
    * pointer and use ACE_CDR::MAX_ALIGNMENT for the correct alignment.
    */
@@ -338,15 +338,6 @@ public:
   /// Return the <current_> message block in chain.
   const ACE_Message_Block *current (void) const;
 
-  /// Replace the message block chain with a single message block.
-  /**
-   * Upon successful completion, there will be a single message block
-   * containing the data from the complete message block chain.
-   *
-   * @note The only expected error is to run out of memory.
-   */
-  int consolidate (void);
-
   /**
    * Access the underlying buffer (read only).  @note This
    * method only returns a pointer to the first block in the
@@ -355,7 +346,7 @@ public:
   const char *buffer (void) const;
 
   /**
-   * Return the size of first message block in the block chain. @note This
+   * Return the start and size of the internal buffer.@note This
    * method only returns information about the first block in the
    * chain.
    */
@@ -481,7 +472,7 @@ private:
   /// The start of the chain of message blocks.
   ACE_Message_Block start_;
 
-  /// The current block in the chain where we are writing.
+  /// The current block in the chain were we are writing.
   ACE_Message_Block *current_;
 
 #if !defined (ACE_LACKS_CDR_IALIGNMENT)
diff --git a/ACE/ace/CORBA_macros.h b/ACE/ace/CORBA_macros.h
index 4a7a3c44bf0..8b36ec2f0a0 100644
--- a/ACE/ace/CORBA_macros.h
+++ b/ACE/ace/CORBA_macros.h
@@ -34,19 +34,6 @@
 
 #include "ace/Exception_Macros.h"
 
-// The Windows MFC exception mechanism requires that a caught CException
-// (including the CMemoryException in use here) be freed using its Delete()
-// method. Thus, when MFC is in use and we're catching exceptions as a result
-// of new(), the exception's Delete() method has to be called. No other
-// platform imposes this sort of restriction/requirement. The Windows
-// config stuff (at least for MSVC/MFC) defines a ACE_del_bad_alloc macro
-// that works with its ACE_bad_alloc macro to implement this cleanup
-// requirement. Since no other platform requires this, define it as
-// empty here.
-#if !defined (ACE_del_bad_alloc)
-#  define ACE_del_bad_alloc
-#endif
-
 // If you wish to you use these macros for emulating exceptions on
 // platforms which lack native exception support, you need to do the
 // following:
@@ -420,7 +407,7 @@
 
 #   define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \
      do { try { POINTER = new CONSTRUCTOR; } \
-       catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \
+       catch (ACE_bad_alloc) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \
      } while (0)
 
 #else /* ! ACE_NEW_THROWS_EXCEPTIONS */
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp
index 039c2a1c192..3201b66bd4a 100644
--- a/ACE/ace/Configuration.cpp
+++ b/ACE/ace/Configuration.cpp
@@ -576,12 +576,47 @@ ACE_Configuration_Win32Registry::remove_section (const ACE_Configuration_Section
     }
 
   int errnum;
+#if (ACE_HAS_WINNT4 != 0)
   errnum = ACE_TEXT_RegDeleteKey (base_key, sub_section);
   if (errnum != ERROR_SUCCESS)
     {
       errno = errnum;
       return -1;
     }
+#else
+  if (!recursive)
+    {
+      ACE_Configuration_Section_Key section;
+      if (open_section (key, sub_section, 0, section))
+        return -1;
+
+      HKEY sub_key;
+      if (load_key (section, sub_key))
+        return -1;
+
+      ACE_TCHAR name_buffer[ACE_DEFAULT_BUFSIZE];
+      DWORD buffer_size = ACE_DEFAULT_BUFSIZE;
+      // Check for a an entry under the sub_key
+      if (ACE_TEXT_RegEnumKeyEx (sub_key,
+                                 0,
+                                 name_buffer,
+                                 &buffer_size,
+                                 0,
+                                 0,
+                                 0,
+                                 0) == ERROR_SUCCESS)
+        {
+          errno = ERROR_DIR_NOT_EMPTY;
+          return -1;
+        }
+    }
+  errnum = ACE_TEXT_RegDeleteKey (base_key, sub_section);
+  if (errnum != ERROR_SUCCESS)
+    {
+      errno = errnum;
+      return -1;
+    }
+#endif
 
   return 0;
 }
diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp
index 4290700b55e..378ccd7e9bb 100644
--- a/ACE/ace/DLL_Manager.cpp
+++ b/ACE/ace/DLL_Manager.cpp
@@ -281,7 +281,7 @@ ACE_DLL_Handle::close (int unload)
       this->handle_ = ACE_SHLIB_INVALID_HANDLE;
     }
 
-  if (retval != 0 && ACE::debug ())
+  if (retval != 0)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::close - ")
                 ACE_LIB_TEXT ("Failed with: \"%s\".\n"),
@@ -339,6 +339,8 @@ ACE_DLL_Handle::get_handle (int become_owner)
   ACE_TRACE ("ACE_DLL_Handle::get_handle");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
 
+  ACE_SHLIB_HANDLE handle = ACE_SHLIB_INVALID_HANDLE;
+
   if (this->refcount_ == 0 && become_owner != 0)
     {
       if (ACE::debug ())
@@ -349,7 +351,7 @@ ACE_DLL_Handle::get_handle (int become_owner)
       return ACE_SHLIB_INVALID_HANDLE;
     }
 
-  ACE_SHLIB_HANDLE handle = this->handle_;
+  handle = this->handle_;
 
   if (become_owner != 0)
     {
diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h
index 754904ea84f..15aeb799399 100644
--- a/ACE/ace/Default_Constants.h
+++ b/ACE/ace/Default_Constants.h
@@ -278,11 +278,18 @@
 
 // Default file permissions.
 # if !defined (ACE_DEFAULT_FILE_PERMS)
-#   if defined (ACE_VXWORKS)
+#   if defined (ACE_WIN32)
+#     if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1)
+#       define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE | \
+                                       FILE_SHARE_DELETE)
+#     else
+#       define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE)
+#     endif /* ACE_HAS_WINNT4 */
+#   elif defined (ACE_VXWORKS)
 #     define ACE_DEFAULT_FILE_PERMS (S_IRUSR | S_IWUSR| S_IRGRP| S_IROTH)
 #   else
 #     define ACE_DEFAULT_FILE_PERMS 0644
-#   endif /* ACE_VXWORKS */
+#   endif /* ACE_WIN32 */
 # endif /* ACE_DEFAULT_FILE_PERMS */
 
 // Default directory permissions.
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index 8bf63534735..3f181426598 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -104,7 +104,7 @@ ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r,
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
       // Set the read handle into non-blocking mode since we need to
-      // perform a "speculative" read when determining if there are
+      // perform a "speculative" read when determining if their are
       // notifications to dispatch.
       if (ACE::set_flags (this->notification_pipe_.read_handle (),
                           ACE_NONBLOCK) == -1)
@@ -2228,12 +2228,12 @@ ACE_Dev_Poll_Reactor::handler (int signum,
   return 0;
 }
 
-bool
+int
 ACE_Dev_Poll_Reactor::initialized (void)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::initialized");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, false));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
 
   return this->initialized_;
 }
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 41132201f01..a3b0d83635f 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -873,7 +873,7 @@ public:
 
   /// Returns true if Reactor has been successfully initialized, else
   /// false.
-  virtual bool initialized (void);
+  virtual int initialized (void);
 
   /// Returns the current size of the Reactor's internal descriptor
   /// table.
diff --git a/ACE/ace/Dynamic_Service_Base.cpp b/ACE/ace/Dynamic_Service_Base.cpp
index 301361a0b2d..7c2bd20fcec 100644
--- a/ACE/ace/Dynamic_Service_Base.cpp
+++ b/ACE/ace/Dynamic_Service_Base.cpp
@@ -60,7 +60,7 @@ ACE_Dynamic_Service_Base::find_i (const ACE_Service_Gestalt* &repo,
     {
       // Check the static repo, too if different
       if (repo == global)
-        break;
+  break;
     }
 
   return svc_rec;
@@ -80,6 +80,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
   const ACE_Service_Type_Impl *type = 0;
 
   const ACE_Service_Gestalt* repo_found = repo;
+
   const ACE_Service_Type *svc_rec = find_i (repo_found, name, no_global);
   if (svc_rec != 0)
     {
diff --git a/ACE/ace/FlReactor.cpp b/ACE/ace/FlReactor.cpp
new file mode 100644
index 00000000000..f45ce67a994
--- /dev/null
+++ b/ACE/ace/FlReactor.cpp
@@ -0,0 +1,330 @@
+// $Id$
+
+#include "ace/FlReactor.h"
+
+ACE_RCSID(ace, FlReactor, "$Id$")
+
+#include /**/ <FL/Fl.h>
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor)
+
+// Must be called with lock held
+ACE_FlReactor::ACE_FlReactor (size_t size,
+                              int restart,
+                              ACE_Sig_Handler *h)
+  : ACE_Select_Reactor (size, restart, h)
+{
+  // When the ACE_Select_Reactor is constructed it creates the notify
+  // pipe and registers it with the register_handler_i() method. The
+  // FlReactor overloads this method BUT because the
+  // register_handler_i occurs when constructing the base class
+  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
+  // is called not the FlReactor register_handler_i().  This means
+  // that the notify pipe is registered with the ACE_Select_Reactor
+  // event handling code not the FlReactor and so notfications don't
+  // work.  To get around this we simply close and re-opened the
+  // notification handler in the constructor of the FlReactor.
+
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+  this->notify_handler_->close ();
+  this->notify_handler_->open (this, 0);
+#endif /* ACE_MT_SAFE */
+}
+
+ACE_FlReactor::~ACE_FlReactor (void)
+{
+}
+
+// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
+// but we use the Fl functions to wait for an event, not <select>
+
+int
+ACE_FlReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
+                                         ACE_Time_Value *max_wait_time)
+{
+  ACE_TRACE ("ACE_FlReactor::wait_for_multiple_events");
+  int nfound;
+
+  do
+    {
+      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
+
+      size_t width = this->handler_rep_.max_handlep1 ();
+      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
+      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
+      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
+
+      // Check to make sure our handle's are all usable.
+      ACE_Select_Reactor_Handle_Set temp_set = handle_set;
+
+      ACE_Time_Value zero = ACE_Time_Value::zero;
+      if (ACE_OS::select (width,
+                          temp_set.rd_mask_,
+                          temp_set.wr_mask_,
+                          temp_set.ex_mask_,
+                          &zero) == -1)
+        return -1; // Bad file arguments...
+
+      // Instead of waiting using <select>, just use the Fl mechanism
+      // to wait for one or more events...
+
+      // Wait for something to happen.
+      double t = 0;
+      if (max_wait_time != 0)
+        t = max_wait_time->sec () + max_wait_time->usec () / 1000000.0F;
+
+      while (t > 0) {
+        t = Fl::wait (t);
+      }
+
+      // Reset the width, in case it changed during the upcalls.
+      width = this->handler_rep_.max_handlep1 ();
+
+      // Now actually read the result needed by the <Select_Reactor>
+      // using <select>.
+      zero = ACE_Time_Value::zero;
+      nfound = ACE_OS::select (width,
+                               handle_set.rd_mask_,
+                               handle_set.wr_mask_,
+                               handle_set.ex_mask_,
+                               &zero);
+
+    } while (nfound == -1 && this->handle_error () > 0);
+
+  if (nfound > 0)
+    {
+#if !defined (ACE_WIN32)
+      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
+      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
+      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
+#endif /* ACE_WIN32 */
+    }
+  return nfound; // Timed out or input available
+}
+
+void
+ACE_FlReactor::fl_io_proc (int fd, void* reactor)
+{
+  ACE_FlReactor *self = static_cast<ACE_FlReactor *> (reactor);
+  ACE_HANDLE handle = (ACE_HANDLE)fd; //reinterpret_cast<ACE_HANDLE> (fd);
+
+  // my copy isn't const.
+  ACE_Time_Value zero = ACE_Time_Value::zero;
+
+  ACE_Select_Reactor_Handle_Set wait_set;
+
+  // Deal with one file event.
+
+  // - read which kind of event
+  if (self->wait_set_.rd_mask_.is_set (handle))
+    wait_set.rd_mask_.set_bit (handle);
+  if (self->wait_set_.wr_mask_.is_set (handle))
+    wait_set.wr_mask_.set_bit (handle);
+  if (self->wait_set_.ex_mask_.is_set (handle))
+    wait_set.ex_mask_.set_bit (handle);
+
+  int result = ACE_OS::select (fd + 1,
+                               wait_set.rd_mask_,
+                               wait_set.wr_mask_,
+                               wait_set.ex_mask_, &zero);
+
+  ACE_Select_Reactor_Handle_Set dispatch_set;
+
+  // - Use only that one file event (removes events for other files).
+  if (result > 0)
+    {
+      if (wait_set.rd_mask_.is_set (handle))
+        dispatch_set.rd_mask_.set_bit (handle);
+      if (wait_set.wr_mask_.is_set (handle))
+        dispatch_set.wr_mask_.set_bit (handle);
+      if (wait_set.ex_mask_.is_set (handle))
+        dispatch_set.ex_mask_.set_bit (handle);
+
+      self->dispatch (1, dispatch_set);
+    }
+}
+
+void
+ACE_FlReactor::fl_timeout_proc (void* reactor)
+{
+  ACE_FlReactor *self = static_cast<ACE_FlReactor *> (reactor);
+
+  // Deal with any timer events
+  ACE_Select_Reactor_Handle_Set handle_set;
+  self->dispatch (0, handle_set);
+  self->reset_timeout ();
+}
+
+
+int
+ACE_FlReactor::register_handler_i (ACE_HANDLE handle,
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
+{
+  ACE_TRACE ("ACE_FlReactor::register_handler_i");
+
+  int result = ACE_Select_Reactor::register_handler_i (handle,
+                                                       handler, mask);
+  if (result == -1)
+    return -1;
+
+  int condition = 0;
+
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
+    ACE_SET_BITS (condition, FL_READ);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
+    ACE_SET_BITS (condition, FL_WRITE);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
+    ACE_SET_BITS (condition, FL_EXCEPT);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
+    ACE_SET_BITS (condition, FL_READ);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
+    {
+      ACE_SET_BITS (condition, FL_WRITE); // connected, you may write
+      ACE_SET_BITS (condition, FL_READ);  // connected, you have data/err
+    }
+
+  if (condition != 0)
+    {
+      Fl::add_fd ((int)handle, // reinterpret_cast<int> (handle),
+                  ACE_FlReactor::fl_io_proc,
+                  this);
+    }
+  return 0;
+}
+
+int
+ACE_FlReactor::register_handler_i (const ACE_Handle_Set &handles,
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
+{
+  return ACE_Select_Reactor::register_handler_i (handles,
+                                                 handler,
+                                                 mask);
+}
+
+int
+ACE_FlReactor::remove_handler_i (ACE_HANDLE handle,
+                                 ACE_Reactor_Mask mask)
+{
+  ACE_TRACE ("ACE_FlReactor::remove_handler_i");
+
+  // In the registration phase we registered first with
+  // ACE_Select_Reactor and then with X.  Now we are now doing things
+  // in reverse order.
+
+  // First clean up the corresponding X11Input.
+  Fl::remove_fd ((int)handle); // reinterpret_cast<int> (handle);
+
+  // Now let the reactor do its work.
+  return ACE_Select_Reactor::remove_handler_i (handle,
+                                               mask);
+}
+
+int
+ACE_FlReactor::remove_handler_i (const ACE_Handle_Set &handles,
+                                 ACE_Reactor_Mask mask)
+{
+  return ACE_Select_Reactor::remove_handler_i (handles,
+                                               mask);
+}
+
+// The following function ensures there's an Fl timeout for the first
+// timeout in the Reactor's Timer_Queue.
+
+void
+ACE_FlReactor::reset_timeout (void)
+{
+  ACE_Time_Value *max_wait_time =
+    this->timer_queue_->calculate_timeout (0);
+
+  if (max_wait_time != 0)
+    {
+      float t = max_wait_time->sec ()
+        + max_wait_time->usec () / 1000000.0F;
+      Fl::add_timeout (t,
+                       ACE_FlReactor::fl_timeout_proc,
+                       this);
+    }
+}
+
+int
+ACE_FlReactor::reset_timer_interval
+  (long timer_id,
+   const ACE_Time_Value &interval)
+{
+  ACE_TRACE ("ACE_FlReactor::reset_timer_interval");
+  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
+
+  int result =
+    ACE_Select_Reactor::reset_timer_interval (timer_id,
+                                              interval);
+
+  if (result == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return result;
+    }
+}
+
+long
+ACE_FlReactor::schedule_timer (ACE_Event_Handler *event_handler,
+                               const void *arg,
+                const ACE_Time_Value &delay,
+                               const ACE_Time_Value &interval)
+{
+  ACE_TRACE ("ACE_FlReactor::schedule_timer");
+  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
+
+  long result = ACE_Select_Reactor::schedule_timer (event_handler,
+                                                    arg,
+                                                    delay,
+                                                    interval);
+  if (result == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return result;
+    }
+}
+
+int
+ACE_FlReactor::cancel_timer (ACE_Event_Handler *handler,
+                             int dont_call_handle_close)
+{
+  ACE_TRACE ("ACE_FlReactor::cancel_timer");
+
+  if (ACE_Select_Reactor::cancel_timer (handler,
+                                        dont_call_handle_close) == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return 0;
+    }
+}
+
+int
+ACE_FlReactor::cancel_timer (long timer_id,
+                             const void **arg,
+                             int dont_call_handle_close)
+{
+  ACE_TRACE ("ACE_FlReactor::cancel_timer");
+
+  if (ACE_Select_Reactor::cancel_timer (timer_id,
+                                        arg,
+                                        dont_call_handle_close) == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return 0;
+    }
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/FlReactor.h b/ACE/ace/FlReactor.h
new file mode 100644
index 00000000000..5126c52e0aa
--- /dev/null
+++ b/ACE/ace/FlReactor.h
@@ -0,0 +1,110 @@
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file   FlReactor.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@cs.wustl.edu>
+ *  @author Based in part in the ACE_XtReactor implementation by
+ *  @author Eric C. Newton's <ecn@clark.net>
+ *  @author Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ */
+//=============================================================================
+
+
+#ifndef ACE_FLREACTOR_H
+#define ACE_FLREACTOR_H
+#include /**/ "ace/pre.h"
+
+#include /**/ "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/ACE_FlReactor_export.h"
+#include "ace/Select_Reactor.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class ACE_FlReactor
+ *
+ * @brief A Reactor implementation that uses the Fast-Light (FL) toolkit
+ * for event demultiplexing.  This will let us integrate the FL
+ * toolkit with ACE and/or TAO.
+ *
+ * As many other GUI toolkits FL supports a minimal set of
+ * callbacks to handle event demultiplexing, namely simple methods
+ * to add file descriptors to the event demuxing set or timeout
+ * events.  This class adapts this simple mechanisms so they are
+ * compatible with ACE's Reactor.
+ */
+class ACE_FlReactor_Export ACE_FlReactor : public ACE_Select_Reactor
+{
+
+public:
+  // = Initialization and termination methods.
+  ACE_FlReactor (size_t size = DEFAULT_SIZE,
+                 int restart = 0,
+                 ACE_Sig_Handler * = 0);
+  virtual ~ACE_FlReactor (void);
+
+  // = Timer operations.
+  virtual long schedule_timer (ACE_Event_Handler *event_handler,
+                               const void *arg,
+                               const ACE_Time_Value &delay,
+                               const ACE_Time_Value &interval);
+  virtual int reset_timer_interval (long timer_id,
+                                    const ACE_Time_Value &interval);
+  virtual int cancel_timer (ACE_Event_Handler *handler,
+                            int dont_call_handle_close = 1);
+  virtual int cancel_timer (long timer_id,
+                            const void **arg = 0,
+                            int dont_call_handle_close = 1);
+
+protected:
+  // = Register timers/handles with Fl.
+  /// Register a single <handler>.
+  virtual int register_handler_i (ACE_HANDLE handle,
+                                  ACE_Event_Handler *handler,
+                                  ACE_Reactor_Mask mask);
+
+  /// Register a set of <handlers>.
+  virtual int register_handler_i (const ACE_Handle_Set &handles,
+                                  ACE_Event_Handler *handler,
+                                  ACE_Reactor_Mask mask);
+
+  /// Remove the <handler> associated with this <handle>.
+  virtual int remove_handler_i (ACE_HANDLE handle,
+                                ACE_Reactor_Mask mask);
+
+  /// Remove a set of <handles>.
+  virtual int remove_handler_i (const ACE_Handle_Set &handles,
+                                ACE_Reactor_Mask);
+
+  /// Wait for events to occur.
+  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
+                                        ACE_Time_Value *);
+
+private:
+  /// This method ensures there's an Fl timeout for the first timeout
+  /// in the Reactor's Timer_Queue.
+  void reset_timeout (void);
+
+  // = Integrate with the FL callback function mechanism.
+  static void fl_io_proc (int fd, void*);
+  static void fl_timeout_proc (void*);
+
+  /// Deny access since member-wise won't work...
+  ACE_FlReactor (const ACE_FlReactor &);
+  ACE_FlReactor &operator = (const ACE_FlReactor &);
+};
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+#endif /* ACE_FLREACTOR_H */
diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor/FlReactor.cpp
deleted file mode 100644
index 611b9a14a19..00000000000
--- a/ACE/ace/FlReactor/FlReactor.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-// $Id$
-
-#include "ace/FlReactor/FlReactor.h"
-
-ACE_RCSID(ace, FlReactor, "$Id$")
-
-#include /**/ <FL/Fl.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor)
-
-// Must be called with lock held
-ACE_FlReactor::ACE_FlReactor (size_t size,
-                              int restart,
-                              ACE_Sig_Handler *h)
-  : ACE_Select_Reactor (size, restart, h)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // FlReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the FlReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the FlReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the FlReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  this->notify_handler_->close ();
-  this->notify_handler_->open (this, 0);
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_FlReactor::~ACE_FlReactor (void)
-{
-}
-
-// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
-// but we use the Fl functions to wait for an event, not <select>
-
-int
-ACE_FlReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-                                         ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_FlReactor::wait_for_multiple_events");
-  int nfound;
-
-  do
-    {
-      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-
-      size_t width = this->handler_rep_.max_handlep1 ();
-      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-
-      // Check to make sure our handle's are all usable.
-      ACE_Select_Reactor_Handle_Set temp_set = handle_set;
-
-      ACE_Time_Value zero = ACE_Time_Value::zero;
-      if (ACE_OS::select (width,
-                          temp_set.rd_mask_,
-                          temp_set.wr_mask_,
-                          temp_set.ex_mask_,
-                          &zero) == -1)
-        return -1; // Bad file arguments...
-
-      // Instead of waiting using <select>, just use the Fl mechanism
-      // to wait for one or more events...
-
-      // Wait for something to happen.
-      double t = 0;
-      if (max_wait_time != 0)
-        t = max_wait_time->sec () + max_wait_time->usec () / 1000000.0F;
-
-      while (t > 0) {
-        t = Fl::wait (t);
-      }
-
-      // Reset the width, in case it changed during the upcalls.
-      width = this->handler_rep_.max_handlep1 ();
-
-      // Now actually read the result needed by the <Select_Reactor>
-      // using <select>.
-      zero = ACE_Time_Value::zero;
-      nfound = ACE_OS::select (width,
-                               handle_set.rd_mask_,
-                               handle_set.wr_mask_,
-                               handle_set.ex_mask_,
-                               &zero);
-
-    } while (nfound == -1 && this->handle_error () > 0);
-
-  if (nfound > 0)
-    {
-#if !defined (ACE_WIN32)
-      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-    }
-  return nfound; // Timed out or input available
-}
-
-void
-ACE_FlReactor::fl_io_proc (int fd, void* reactor)
-{
-  ACE_FlReactor *self = static_cast<ACE_FlReactor *> (reactor);
-  ACE_HANDLE handle = (ACE_HANDLE)fd; //reinterpret_cast<ACE_HANDLE> (fd);
-
-  // my copy isn't const.
-  ACE_Time_Value zero = ACE_Time_Value::zero;
-
-  ACE_Select_Reactor_Handle_Set wait_set;
-
-  // Deal with one file event.
-
-  // - read which kind of event
-  if (self->wait_set_.rd_mask_.is_set (handle))
-    wait_set.rd_mask_.set_bit (handle);
-  if (self->wait_set_.wr_mask_.is_set (handle))
-    wait_set.wr_mask_.set_bit (handle);
-  if (self->wait_set_.ex_mask_.is_set (handle))
-    wait_set.ex_mask_.set_bit (handle);
-
-  int result = ACE_OS::select (fd + 1,
-                               wait_set.rd_mask_,
-                               wait_set.wr_mask_,
-                               wait_set.ex_mask_, &zero);
-
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  // - Use only that one file event (removes events for other files).
-  if (result > 0)
-    {
-      if (wait_set.rd_mask_.is_set (handle))
-        dispatch_set.rd_mask_.set_bit (handle);
-      if (wait_set.wr_mask_.is_set (handle))
-        dispatch_set.wr_mask_.set_bit (handle);
-      if (wait_set.ex_mask_.is_set (handle))
-        dispatch_set.ex_mask_.set_bit (handle);
-
-      self->dispatch (1, dispatch_set);
-    }
-}
-
-void
-ACE_FlReactor::fl_timeout_proc (void* reactor)
-{
-  ACE_FlReactor *self = static_cast<ACE_FlReactor *> (reactor);
-
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  self->dispatch (0, handle_set);
-  self->reset_timeout ();
-}
-
-
-int
-ACE_FlReactor::register_handler_i (ACE_HANDLE handle,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_FlReactor::register_handler_i");
-
-  int result = ACE_Select_Reactor::register_handler_i (handle,
-                                                       handler, mask);
-  if (result == -1)
-    return -1;
-
-  int condition = 0;
-
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, FL_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, FL_WRITE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, FL_EXCEPT);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, FL_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
-    {
-      ACE_SET_BITS (condition, FL_WRITE); // connected, you may write
-      ACE_SET_BITS (condition, FL_READ);  // connected, you have data/err
-    }
-
-  if (condition != 0)
-    {
-      Fl::add_fd ((int)handle, // reinterpret_cast<int> (handle),
-                  ACE_FlReactor::fl_io_proc,
-                  this);
-    }
-  return 0;
-}
-
-int
-ACE_FlReactor::register_handler_i (const ACE_Handle_Set &handles,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i (handles,
-                                                 handler,
-                                                 mask);
-}
-
-int
-ACE_FlReactor::remove_handler_i (ACE_HANDLE handle,
-                                 ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_FlReactor::remove_handler_i");
-
-  // In the registration phase we registered first with
-  // ACE_Select_Reactor and then with X.  Now we are now doing things
-  // in reverse order.
-
-  // First clean up the corresponding X11Input.
-  Fl::remove_fd ((int)handle); // reinterpret_cast<int> (handle);
-
-  // Now let the reactor do its work.
-  return ACE_Select_Reactor::remove_handler_i (handle,
-                                               mask);
-}
-
-int
-ACE_FlReactor::remove_handler_i (const ACE_Handle_Set &handles,
-                                 ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-                                               mask);
-}
-
-// The following function ensures there's an Fl timeout for the first
-// timeout in the Reactor's Timer_Queue.
-
-void
-ACE_FlReactor::reset_timeout (void)
-{
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0);
-
-  if (max_wait_time != 0)
-    {
-      float t = max_wait_time->sec ()
-        + max_wait_time->usec () / 1000000.0F;
-      Fl::add_timeout (t,
-                       ACE_FlReactor::fl_timeout_proc,
-                       this);
-    }
-}
-
-int
-ACE_FlReactor::reset_timer_interval
-  (long timer_id,
-   const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_FlReactor::reset_timer_interval");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  int result =
-    ACE_Select_Reactor::reset_timer_interval (timer_id,
-                                              interval);
-
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-long
-ACE_FlReactor::schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_FlReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  long result = ACE_Select_Reactor::schedule_timer (event_handler,
-                                                    arg,
-                                                    delay,
-                                                    interval);
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-int
-ACE_FlReactor::cancel_timer (ACE_Event_Handler *handler,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_FlReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-int
-ACE_FlReactor::cancel_timer (long timer_id,
-                             const void **arg,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_FlReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-                                        arg,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/FlReactor/FlReactor.h b/ACE/ace/FlReactor/FlReactor.h
deleted file mode 100644
index e35572b99e1..00000000000
--- a/ACE/ace/FlReactor/FlReactor.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file   FlReactor.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@cs.wustl.edu>
- *  @author Based in part in the ACE_XtReactor implementation by
- *  @author Eric C. Newton's <ecn@clark.net>
- *  @author Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_FLREACTOR_H
-#define ACE_FLREACTOR_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/FlReactor/ACE_FlReactor_export.h"
-#include "ace/Select_Reactor.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_FlReactor
- *
- * @brief A Reactor implementation that uses the Fast-Light (FL) toolkit
- * for event demultiplexing.  This will let us integrate the FL
- * toolkit with ACE and/or TAO.
- *
- * As many other GUI toolkits FL supports a minimal set of
- * callbacks to handle event demultiplexing, namely simple methods
- * to add file descriptors to the event demuxing set or timeout
- * events.  This class adapts this simple mechanisms so they are
- * compatible with ACE's Reactor.
- */
-class ACE_FlReactor_Export ACE_FlReactor : public ACE_Select_Reactor
-{
-
-public:
-  // = Initialization and termination methods.
-  ACE_FlReactor (size_t size = DEFAULT_SIZE,
-                 int restart = 0,
-                 ACE_Sig_Handler * = 0);
-  virtual ~ACE_FlReactor (void);
-
-  // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                               const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval);
-  virtual int reset_timer_interval (long timer_id,
-                                    const ACE_Time_Value &interval);
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-                            int dont_call_handle_close = 1);
-  virtual int cancel_timer (long timer_id,
-                            const void **arg = 0,
-                            int dont_call_handle_close = 1);
-
-protected:
-  // = Register timers/handles with Fl.
-  /// Register a single <handler>.
-  virtual int register_handler_i (ACE_HANDLE handle,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Register a set of <handlers>.
-  virtual int register_handler_i (const ACE_Handle_Set &handles,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Remove the <handler> associated with this <handle>.
-  virtual int remove_handler_i (ACE_HANDLE handle,
-                                ACE_Reactor_Mask mask);
-
-  /// Remove a set of <handles>.
-  virtual int remove_handler_i (const ACE_Handle_Set &handles,
-                                ACE_Reactor_Mask);
-
-  /// Wait for events to occur.
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-
-private:
-  /// This method ensures there's an Fl timeout for the first timeout
-  /// in the Reactor's Timer_Queue.
-  void reset_timeout (void);
-
-  // = Integrate with the FL callback function mechanism.
-  static void fl_io_proc (int fd, void*);
-  static void fl_timeout_proc (void*);
-
-  /// Deny access since member-wise won't work...
-  ACE_FlReactor (const ACE_FlReactor &);
-  ACE_FlReactor &operator = (const ACE_FlReactor &);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_FLREACTOR_H */
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index b32fe9ddfb5..3c978d006bc 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -36,37 +36,27 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
   ACE_TRACE ("ACE_INET_Addr::addr_to_string");
 
   // XXX Can we (should we) include the scope id for IPv6 addresses?
-  char  hoststr[MAXHOSTNAMELEN+1];
 
-  bool result = false;
-  if (ipaddr_format == 0)
-    result = (this->get_host_name (hoststr,MAXHOSTNAMELEN+1) == 0);
-  else
-    result = (this->get_host_addr (hoststr,MAXHOSTNAMELEN+1) != 0);
-
-  if (!result)
-    return -1;
-
-  size_t total_len =
-    ACE_OS::strlen (hoststr)
-    + 5 // ACE_OS::strlen ("65535"), Assuming the max port number.
-    + 1 // sizeof (':'), addr/port sep
-    + 1; // sizeof ('\0'), terminating NUL
-  ACE_TCHAR const *format = ACE_LIB_TEXT("%s:%d");
-#if defined (ACE_HAS_IPV6)
-  if (ACE_OS::strchr(hoststr,':') != 0)
-    {
-      total_len += 2; // ACE_OS::strlen ("[]") IPv6 addr frames
-      format = ACE_LIB_TEXT("[%s]:%d");
-    }
-#endif // ACE_HAS_IPV6
+  size_t const total_len =
+    (ipaddr_format == 0
+     ? ACE_OS::strlen (this->get_host_name ())
+     : ACE_OS::strlen (this->get_host_addr ()))
+    + ACE_OS::strlen ("65536") // Assume the max port number.
+    + sizeof (':')
+    + sizeof ('\0'); // For trailing '\0'.
 
   if (size < total_len)
     return -1;
   else
-      ACE_OS::sprintf (s, format,
-                       ACE_TEXT_CHAR_TO_TCHAR (hoststr), this->get_port_number ());
-  return 0;
+    {
+      ACE_OS::sprintf (s,
+                       ACE_LIB_TEXT ("%s:%d"),
+                       ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
+                                               ? this->get_host_name ()
+                                               : this->get_host_addr ()),
+                       this->get_port_number ());
+      return 0;
+    }
 }
 
 void
@@ -327,9 +317,13 @@ ACE_INET_Addr::set (u_short port_number,
   struct in_addr addrv4;
   if (ACE_OS::inet_aton (host_name,
                          &addrv4) == 1)
+# if !defined (ACE_LACKS_NTOHL)
     return this->set (port_number,
-                      encode ? ACE_NTOHL (addrv4.s_addr) : addrv4.s_addr,
+                      encode ? ntohl (addrv4.s_addr) : addrv4.s_addr,
                       encode);
+# else
+    return -1;
+# endif /* ACE_LACKS_NTOHL */
   else
     {
 #  if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)
@@ -352,9 +346,13 @@ ACE_INET_Addr::set (u_short port_number,
           (void) ACE_OS::memcpy ((void *) &addrv4.s_addr,
                                  hp->h_addr,
                                  hp->h_length);
+#  if !defined (ACE_LACKS_NTOHL)
           return this->set (port_number,
-                            encode ? ACE_NTOHL (addrv4.s_addr) : addrv4.s_addr,
+                            encode ? ntohl (addrv4.s_addr) : addrv4.s_addr,
                             encode);
+#  else
+          return -1;
+#  endif /* ACE_LACKS_NTOHL */
         }
     }
 #endif /* ACE_HAS_IPV6 */
@@ -367,6 +365,7 @@ static int get_port_number_from_name (const char port_name[],
 {
   int port_number = 0;
 
+#if !defined (ACE_LACKS_HTONS)
   // Maybe port_name is directly a port number?
   char *endp = 0;
   port_number = static_cast<int> (ACE_OS::strtol (port_name, &endp, 10));
@@ -377,9 +376,10 @@ static int get_port_number_from_name (const char port_name[],
       // store that value as the port number.  NOTE: this number must
       // be returned in network byte order!
       u_short n = static_cast<u_short> (port_number);
-      n = ACE_HTONS (n);
+      n = htons (n);
       return n;
     }
+#endif
 
   // We try to resolve port number from its name.
 
@@ -656,18 +656,12 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
   : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
-#if !defined (ACE_LACKS_HTONL)
   this->reset ();
   if (this->set (port_name,
                  htonl (inet_address),
                  protocol) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
-#else
-  ACE_UNUSED_ARG (port_name);
-  ACE_UNUSED_ARG (inet_address);
-  ACE_UNUSED_ARG (protocol);
-#endif
 }
 #endif /* ACE_HAS_WCHAR */
 
@@ -752,8 +746,12 @@ ACE_INET_Addr::set_port_number (u_short port_number,
 {
   ACE_TRACE ("ACE_INET_Addr::set_port_number");
 
+#if !defined (ACE_LACKS_HTONS)
   if (encode)
-    port_number = ACE_HTONS (port_number);
+    port_number = htons (port_number);
+#else
+  ACE_UNUSED_ARG (encode);
+#endif /* ACE_LACKS_HTONS */
 
 #if defined (ACE_HAS_IPV6)
   if (this->get_type () == AF_INET6)
@@ -1105,8 +1103,11 @@ ACE_INET_Addr::get_ip_address (void) const
       return 0;
     }
 #endif /* ACE_HAS_IPV6 */
-  return ACE_NTOHL (ACE_UINT32 (this->inet_addr_.in4_.sin_addr.s_addr));
+#if !defined (ACE_LACKS_NTOHL)
+  return ntohl (ACE_UINT32 (this->inet_addr_.in4_.sin_addr.s_addr));
+#else
   return 0;
+#endif /* ACE_LACKS_NTOHL */
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h
index 9d66e4b5418..f05b90667b0 100644
--- a/ACE/ace/INET_Addr.h
+++ b/ACE/ace/INET_Addr.h
@@ -315,9 +315,6 @@ public:
   /// Return @c true if the IP address is IPv4/IPv6 loopback address.
   bool is_loopback (void) const;
 
-  /// Return @c true if the IP address is IPv4/IPv6 multicast address.
-  bool is_multicast (void) const;
-
 #if defined (ACE_HAS_IPV6)
   /// Return @c true if the IP address is IPv6 linklocal address.
   bool is_linklocal (void) const;
diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl
index 50b5e5dcdb1..15af6fe0a42 100644
--- a/ACE/ace/INET_Addr.inl
+++ b/ACE/ace/INET_Addr.inl
@@ -208,19 +208,6 @@ ACE_INET_Addr::is_loopback (void) const
   return (this->get_ip_address () == INADDR_LOOPBACK);
 }
 
-// Return @c true if the IP address is IPv4/IPv6 multicast address.
-ACE_INLINE bool
-ACE_INET_Addr::is_multicast (void) const
-{
-#if defined (ACE_HAS_IPV6)
-  if (this->get_type() == AF_INET6)
-    return this->inet_addr_.in6_.sin6_addr.s6_addr[0] == 0xFF;
-#endif /* ACE_HAS_IPV6 */
-  return
-    this->inet_addr_.in4_.sin_addr.s_addr >= 0xE0000000 &&  // 224.0.0.0
-    this->inet_addr_.in4_.sin_addr.s_addr <= 0xEFFFFFFF; // 239.255.255.255
-}
-
 #if defined (ACE_HAS_IPV6)
 // Return @c true if the IP address is IPv6 linklocal address.
 ACE_INLINE bool
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 41b6e0bb4fb..52866c75050 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1599,6 +1599,23 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                       ACE_OS::sprintf (bp,
                                        format,
                                        static_cast <unsigned> (ACE_Thread::self ()));
+#elif defined (ACE_AIX_VERS) && (ACE_AIX_VERS <= 402)
+                  // AIX's pthread_t (ACE_hthread_t) is a pointer, and it's
+                  // a little ugly to send that through a %u format.  So,
+                  // get the kernel thread ID (tid_t) via thread_self() and
+                  // display that instead.
+                  // This isn't conditionalized on ACE_HAS_THREAD_SELF because
+                  // 1. AIX 4.2 doesn't have that def anymore (it messes up
+                  //    other things)
+                  // 2. OSF/1 V3.2 has that def, and I'm not sure what affect
+                  //   this would have on that.
+                  // -Steve Huston, 19-Aug-97
+                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u"));
+                  if (can_check)
+                    this_len = ACE_OS::snprintf
+                      (bp, bspace, format, thread_self());
+                  else
+                    this_len = ACE_OS::sprintf (bp, format, thread_self());
 #elif defined (DIGITAL_UNIX)
                   ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u"));
                   {
@@ -1684,26 +1701,33 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 
                 case 'W':
                   {
-#if defined (ACE_HAS_WCHAR)
+#if defined (ACE_WIN32)
+                    ACE_TCHAR *wstr = va_arg (argp, ACE_TCHAR *);
+# if defined (ACE_USES_WCHAR)
+                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
+# else /* ACE_USES_WCHAR */
+                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
+# endif /* ACE_USES_WCHAR */
+                    if (can_check)
+                      this_len = ACE_OS::snprintf
+                        (bp, bspace, format, wstr ? wstr : ACE_LIB_TEXT ("(null)"));
+                    else
+                      this_len = ACE_OS::sprintf
+                        (bp, format, wstr ? wstr : ACE_LIB_TEXT ("(null)"));
+#elif defined (ACE_HAS_WCHAR)
                     wchar_t *wchar_str = va_arg (argp, wchar_t *);
 # if defined (HPUX)
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
-# elif defined (ACE_WIN32)
-#   if defined (ACE_USES_WCHAR)
-                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
-#   else /* ACE_USES_WCHAR */
-                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
-#   endif /* ACE_USES_WCHAR */
 # else
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
 # endif /* HPUX */
                     if (can_check)
                       this_len = ACE_OS::snprintf
-                        (bp, bspace, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)"));
+                        (bp, bspace, format, wchar_str);
                     else
                       this_len = ACE_OS::sprintf
-                        (bp, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)"));
-#endif /* ACE_HAS_WCHAR */
+                        (bp, format, wchar_str);
+#endif /* ACE_WIN32 / ACE_HAS_WCHAR */
                     ACE_UPDATE_COUNT (bspace, this_len);
                   }
                   break;
diff --git a/ACE/ace/Log_Msg_NT_Event_Log.cpp b/ACE/ace/Log_Msg_NT_Event_Log.cpp
index fc1844a81ce..8053624283c 100644
--- a/ACE/ace/Log_Msg_NT_Event_Log.cpp
+++ b/ACE/ace/Log_Msg_NT_Event_Log.cpp
@@ -103,15 +103,13 @@ int
 ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record)
 {
   // Make a copy of the log text and replace any newlines with
-  // CR-LF. Newline characters on their own do not appear correctly in
-  // the event viewer. We allow for a doubling in the size of the msg
-  // data for the worst case of all newlines.
+  // CR-LF. Newline characters on their own do not appear correctly
+  // in the event viewer. We allow for a doubling in the size of
+  // the msg data for the worst case of all newlines.
   const ACE_TCHAR* src_msg_data = log_record.msg_data ();
   ACE_TCHAR msg_data [ACE_Log_Record::MAXLOGMSGLEN * 2];
 
-  for (size_t i = 0, j = 0;
-       i < log_record.msg_data_len ();
-       ++i)
+  for (long i = 0, j = 0; i < log_record.length (); ++i)
     {
       if (src_msg_data[i] == '\n')
         {
diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h
index 978f2ade5ae..36bda6f89ac 100644
--- a/ACE/ace/Log_Record.h
+++ b/ACE/ace/Log_Record.h
@@ -130,12 +130,10 @@ public:
   /// power of 2, as defined by the enums in <ACE_Log_Priority>).
   void priority (u_long num);
 
-  /// Get the total length of the <Log_Record>, which includes the 
-  /// size of the various data member fields.
+  /// Get the length of the <Log_Record>.
   long length (void) const;
 
-  /// Set the total length of the <Log_Record>, which needs to account for
-  /// the size of the various data member fields.
+  /// Set the length of the <Log_Record>.
   void length (long);
 
   /// Get the time stamp of the <Log_Record>.
diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am
index 955b88be851..3f61d779a43 100644
--- a/ACE/ace/Makefile.am
+++ b/ACE/ace/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 includedir = @includedir@/ace
 pkgconfigdir = @libdir@/pkgconfig
@@ -16,7 +16,7 @@ ACE_ROOT = $(top_srcdir)
 
 SUBDIRS = \
         . \
-	QoS \
+        QoS \
         SSL
 
 CLEANFILES =
@@ -33,6 +33,8 @@ lib_LTLIBRARIES += libACE.la
 libACE_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
+  -DACE_HAS_ACE_TOKEN \
+  -DACE_HAS_ACE_SVCCONF \
   -DACE_BUILD_DLL
 
 libACE_la_SOURCES = \
@@ -239,7 +241,6 @@ libACE_la_SOURCES = \
   Registry_Name_Space.cpp \
   Remote_Name_Space.cpp \
   Remote_Tokens.cpp \
-  Rtems_init.c \
   SOCK.cpp \
   SOCK_Acceptor.cpp \
   SOCK_CODgram.cpp \
@@ -391,7 +392,6 @@ nobase_include_HEADERS += \
   Asynch_Pseudo_Task.h \
   Atomic_Op.h \
   Atomic_Op.inl \
-  Atomic_Op_Sparc.h \
   Atomic_Op_T.cpp \
   Atomic_Op_T.h \
   Atomic_Op_T.inl \
@@ -568,9 +568,6 @@ nobase_include_HEADERS += \
   Hash_Map_With_Allocator_T.cpp \
   Hash_Map_With_Allocator_T.h \
   Hash_Map_With_Allocator_T.inl \
-  Hash_Multi_Map_Manager_T.cpp \
-  Hash_Multi_Map_Manager_T.h \
-  Hash_Multi_Map_Manager_T.inl \
   Hashable.h \
   Hashable.inl \
   High_Res_Timer.h \
@@ -704,9 +701,7 @@ nobase_include_HEADERS += \
   Null_Condition.h \
   Null_Mutex.h \
   Null_Semaphore.h \
-  Numeric_Limits.h \
   OS.h \
-  OS.inl \
   OS_Dirent.h \
   OS_Errno.h \
   OS_Errno.inl \
@@ -1211,7 +1206,7 @@ CLEANFILES += \
   ACE.pc
 
 ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE.pc.in
 
 endif !BUILD_ACE_FOR_TAO
 
@@ -1235,7 +1230,7 @@ libACE_FlReactor_la_CPPFLAGS = \
   -DACE_FLREACTOR_BUILD_DLL
 
 libACE_FlReactor_la_SOURCES = \
-  FlReactor/FlReactor.cpp
+  FlReactor.cpp
 
 libACE_FlReactor_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@ $(ACE_FLTK_LDFLAGS)
@@ -1245,8 +1240,8 @@ libACE_FlReactor_la_LIBADD = \
   $(ACE_FLTK_LIBS)
 
 nobase_include_HEADERS += \
-  FlReactor/ACE_FlReactor_export.h \
-  FlReactor/FlReactor.h
+  ACE_FlReactor_export.h \
+  FlReactor.h
 
 pkgconfig_DATA += \
   ACE_FlReactor.pc
@@ -1254,15 +1249,15 @@ pkgconfig_DATA += \
 CLEANFILES += \
   ACE_FlReactor.pc
 
-ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/FlReactor/ACE_FlReactor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/FlReactor/ACE_FlReactor.pc.in
+ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_FlReactor.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE_FlReactor.pc.in
 
 endif BUILD_X11
 endif BUILD_GL
 endif BUILD_FL
 
 EXTRA_DIST += \
-  FlReactor/ACE_FlReactor.pc.in
+  ACE_FlReactor.pc.in
 
 
 ## Makefile.ACE_QtReactor.am
@@ -1270,13 +1265,13 @@ EXTRA_DIST += \
 if BUILD_QT
 
 BUILT_SOURCES = \
-  QtReactor/QtReactor_moc.cpp
+  QtReactor_moc.cpp
 
 CLEANFILES += \
-  QtReactor/QtReactor_moc.cpp
+  QtReactor_moc.cpp
 
-QtReactor/QtReactor_moc.cpp: $(srcdir)/QtReactor/QtReactor.h
-	$(QTDIR)/bin/moc  $(srcdir)/QtReactor/QtReactor.h -o QtReactor/QtReactor_moc.cpp
+QtReactor_moc.cpp: $(srcdir)/QtReactor.h
+	$(QTDIR)/bin/moc  -o QtReactor_moc.cpp $(srcdir)/QtReactor.h
 
 lib_LTLIBRARIES += libACE_QtReactor.la
 
@@ -1287,8 +1282,8 @@ libACE_QtReactor_la_CPPFLAGS = \
   -DACE_QTREACTOR_BUILD_DLL
 
 libACE_QtReactor_la_SOURCES = \
-  QtReactor/QtReactor.cpp \
-  QtReactor/QtReactor_moc.cpp
+  QtReactor.cpp \
+  QtReactor_moc.cpp
 
 libACE_QtReactor_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@ $(ACE_QT_LDFLAGS)
@@ -1298,8 +1293,8 @@ libACE_QtReactor_la_LIBADD = \
   $(ACE_QT_LIBS)
 
 nobase_include_HEADERS += \
-  QtReactor/ACE_QtReactor_export.h \
-  QtReactor/QtReactor.h
+  ACE_QtReactor_export.h \
+  QtReactor.h
 
 pkgconfig_DATA += \
   ACE_QtReactor.pc
@@ -1307,13 +1302,13 @@ pkgconfig_DATA += \
 CLEANFILES += \
   ACE_QtReactor.pc
 
-ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/QtReactor/ACE_QtReactor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/QtReactor/ACE_QtReactor.pc.in
+ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_QtReactor.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE_QtReactor.pc.in
 
 endif BUILD_QT
 
 EXTRA_DIST += \
-  QtReactor/ACE_QtReactor.pc.in
+  ACE_QtReactor.pc.in
 
 
 ## Makefile.ACE_TkReactor.am
@@ -1330,7 +1325,7 @@ libACE_TkReactor_la_CPPFLAGS = \
   -DACE_TKREACTOR_BUILD_DLL
 
 libACE_TkReactor_la_SOURCES = \
-  TkReactor/TkReactor.cpp
+  TkReactor.cpp
 
 libACE_TkReactor_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS)
@@ -1341,8 +1336,8 @@ libACE_TkReactor_la_LIBADD = \
   $(ACE_TCL_LIBS)
 
 nobase_include_HEADERS += \
-  TkReactor/ACE_TkReactor_export.h \
-  TkReactor/TkReactor.h
+  ACE_TkReactor_export.h \
+  TkReactor.h
 
 pkgconfig_DATA += \
   ACE_TkReactor.pc
@@ -1350,13 +1345,13 @@ pkgconfig_DATA += \
 CLEANFILES += \
   ACE_TkReactor.pc
 
-ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/TkReactor/ACE_TkReactor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TkReactor/ACE_TkReactor.pc.in
+ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_TkReactor.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE_TkReactor.pc.in
 
 endif BUILD_TK
 
 EXTRA_DIST += \
-  TkReactor/ACE_TkReactor.pc.in
+  ACE_TkReactor.pc.in
 
 
 ## Makefile.ACE_XtReactor.am
@@ -1374,7 +1369,7 @@ libACE_XtReactor_la_CPPFLAGS = \
   -DACE_XTREACTOR_BUILD_DLL
 
 libACE_XtReactor_la_SOURCES = \
-  XtReactor/XtReactor.cpp
+  XtReactor.cpp
 
 libACE_XtReactor_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
@@ -1385,8 +1380,8 @@ libACE_XtReactor_la_LIBADD = \
   $(ACE_X11_LIBS)
 
 nobase_include_HEADERS += \
-  XtReactor/ACE_XtReactor_export.h \
-  XtReactor/XtReactor.h
+  ACE_XtReactor_export.h \
+  XtReactor.h
 
 pkgconfig_DATA += \
   ACE_XtReactor.pc
@@ -1394,14 +1389,14 @@ pkgconfig_DATA += \
 CLEANFILES += \
   ACE_XtReactor.pc
 
-ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/XtReactor/ACE_XtReactor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/XtReactor/ACE_XtReactor.pc.in
+ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_XtReactor.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE_XtReactor.pc.in
 
 endif BUILD_XT
 endif BUILD_X11
 
 EXTRA_DIST += \
-  XtReactor/ACE_XtReactor.pc.in
+  ACE_XtReactor.pc.in
 
 
 ## Clean up template repositories, etc.
diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp
index 674b1916f33..d59436ac2b6 100644
--- a/ACE/ace/Malloc_T.cpp
+++ b/ACE/ace/Malloc_T.cpp
@@ -483,7 +483,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
   if (this->lock_ == 0)
     return;
 
-  this->delete_lock_ = true;
+  this->delete_lock_ = 1;
 
   this->bad_flag_ = this->open ();
 
@@ -508,7 +508,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
   if (this->lock_ == 0)
     return;
 
-  this->delete_lock_ = true;
+  this->delete_lock_ = 1;
 
   this->bad_flag_ = this->open ();
   if (this->bad_flag_ == -1)
@@ -525,7 +525,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
   : cb_ptr_ (0),
     memory_pool_ (pool_name, options),
     lock_ (lock),
-    delete_lock_ (false),
+    delete_lock_ (0),
     bad_flag_ (0)
 {
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T");
@@ -560,7 +560,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
   if (this->lock_ == 0)
     return;
 
-  this->delete_lock_ = true;
+  this->delete_lock_ = 1;
   this->bad_flag_ = this->open ();
   if (this->bad_flag_ == -1)
     ACE_ERROR ((LM_ERROR,
diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h
index a8c11e4d0fa..021a13c2e58 100644
--- a/ACE/ace/Malloc_T.h
+++ b/ACE/ace/Malloc_T.h
@@ -661,9 +661,7 @@ private:
 
   /// Lock that ensures mutual exclusion for the memory pool.
   ACE_LOCK *lock_;
-
-  /// True if destructor should delete the lock
-  bool delete_lock_;
+  int delete_lock_;       // True if destructor should delete the lock
 
   /// Keep track of failure in constructor.
   int bad_flag_;
diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp
index 7ee226e8821..f39124ce9d9 100644
--- a/ACE/ace/Map_Manager.cpp
+++ b/ACE/ace/Map_Manager.cpp
@@ -170,7 +170,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::move_all_free_slots_from_occupied_lis
       if (current_slot.free_)
         {
           // Reset free flag to zero before moving to free list.
-          current_slot.free_ = false;
+          current_slot.free_ = 0;
 
           // Move from occupied list to free list.
           this->move_from_occupied_list_to_free_list (position_of_current_slot);
@@ -461,7 +461,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_slot (ACE_UINT32 slot)
   // run out of free slots in the free list.
   //
 
-  this->search_structure_[slot].free_ = true;
+  this->search_structure_[slot].free_ = 1;
 
 #else
 
@@ -530,7 +530,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::resize_i (ACE_UINT32 new_size)
       // flag to be zero so that we don't have to set it when the slot
       // is moved to the occupied list.  In addition, this flag has no
       // meaning while this slot is in the free list.
-      temp[i].free_ = false;
+      temp[i].free_ = 0;
 
 #endif /* ACE_HAS_LAZY_MAP_MANAGER */
 
diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h
index 2c3f800c6bc..d57da083b03 100644
--- a/ACE/ace/Map_Manager.h
+++ b/ACE/ace/Map_Manager.h
@@ -39,9 +39,6 @@ template <class EXT_ID, class INT_ID>
 class ACE_Map_Entry
 {
 public:
-  /// Initialize member variables.
-  ACE_Map_Entry (void);
-
   /// We need this destructor to keep some compilers from complaining.
   /// It's just a no-op, however.
   ~ACE_Map_Entry (void);
@@ -82,7 +79,7 @@ public:
 #if defined (ACE_HAS_LAZY_MAP_MANAGER)
 
   /// Is this entry free?
-  bool free_;
+  int free_;
 
 #endif /* ACE_HAS_LAZY_MAP_MANAGER */
 
diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl
index a3718734763..493d6c6a5c1 100644
--- a/ACE/ace/Map_Manager.inl
+++ b/ACE/ace/Map_Manager.inl
@@ -8,16 +8,6 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class EXT_ID, class INT_ID> ACE_INLINE
-ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry (void) 
-  : next_ (0),
-    prev_ (0)
-#if defined (ACE_HAS_LAZY_MAP_MANAGER)
-    , free_ (1)
-#endif /* ACE_HAS_LAZY_MAP_MANAGER */
-{
-}
-
-template <class EXT_ID, class INT_ID> ACE_INLINE
 ACE_Map_Entry<EXT_ID, INT_ID>::~ACE_Map_Entry (void)
 {
   // No-op just to keep some compilers happy...
diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp
index 0f8775018c4..d2bc4102ce6 100644
--- a/ACE/ace/Mem_Map.cpp
+++ b/ACE/ace/Mem_Map.cpp
@@ -13,12 +13,49 @@
 #include "ace/Log_Msg.h"
 #include "ace/Truncate.h"
 
+#if defined (ACE_WIN32) \
+    && (!defined(ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0))
+# define ACE_USE_MAPPING_NAME 1
+#endif /* ACE_WIN32 */
+
+#if defined (ACE_USE_MAPPING_NAME)
+#include "ace/SString.h"
+#endif /* ACE_USE_MAPPING_NAME */
+
 ACE_RCSID(ace, Mem_Map, "Mem_Map.cpp,v 4.39 2003/11/01 11:15:13 dhinton Exp")
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Mem_Map)
 
+#if defined (ACE_USE_MAPPING_NAME)
+// Gets a mapping object name from a file name.  TODO: The file name
+// is used as the key to the mapping. We should try to avoid mapping
+// the same object name to different files (there is a mapping object
+// name length limitation).
+
+static void
+to_mapping_name (ACE_TCHAR *mapobjname,
+    const ACE_TCHAR *filename,
+    size_t len)
+{
+  --len;
+  size_t i = 0;
+
+  while (*filename && i < len)
+    {
+      if (*filename == ACE_LIB_TEXT ('\\'))
+        // Can't use backslash in mapping object name.
+        mapobjname[i] = ACE_LIB_TEXT ('.');
+      else
+        mapobjname[i] = *filename;
+      ++filename;
+      ++i;
+    }
+
+  mapobjname[i] = 0;
+}
+#endif /* ACE_USE_MAPPING_NAME */
 
 void
 ACE_Mem_Map::dump (void) const
@@ -141,6 +178,31 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle,
         return -1;
     }
 
+#if defined (ACE_USE_MAPPING_NAME)
+  if (ACE_BIT_ENABLED (share, MAP_SHARED))
+    {
+# if defined(__MINGW32__)
+      const int max_mapping_name_length = 32;
+# else
+      const int max_mapping_name_length = 31;
+# endif /* __MINGW32__ */
+      ACE_TCHAR file_mapping_name[max_mapping_name_length + 1];
+      to_mapping_name (file_mapping_name,
+                       filename_,
+                       max_mapping_name_length + 1);
+
+      this->base_addr_ = ACE_OS::mmap (this->base_addr_,
+                                       this->length_,
+                                       prot,
+                                       share,
+                                       this->handle_,
+                                       offset,
+                                       &this->file_mapping_,
+                                       sa,
+                                       file_mapping_name);
+    }
+  else
+#endif /* ACE_USE_MAPPING_NAME */
     this->base_addr_ = ACE_OS::mmap (this->base_addr_,
                                      this->length_,
                                      prot,
diff --git a/ACE/ace/Message_Queue.cpp b/ACE/ace/Message_Queue.cpp
index 7295c2b9c8f..504af19b0fb 100644
--- a/ACE/ace/Message_Queue.cpp
+++ b/ACE/ace/Message_Queue.cpp
@@ -379,7 +379,7 @@ ACE_Message_Queue_Vx::peek_dequeue_head (ACE_Message_Block *&,
 
 #endif /* ACE_VXWORKS */
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
 
 ACE_Message_Queue_NT::ACE_Message_Queue_NT (DWORD max_threads)
   : max_cthrs_ (max_threads),
@@ -597,6 +597,6 @@ ACE_Message_Queue_NT::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Message_Queue.h b/ACE/ace/Message_Queue.h
index 5a4b26fbfd6..4f9fc0f107f 100644
--- a/ACE/ace/Message_Queue.h
+++ b/ACE/ace/Message_Queue.h
@@ -21,7 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/IO_Cntl_Msg.h"
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
 # include "ace/Thread_Mutex.h"   /* Needed in ACE_Message_Queue_NT */
 #endif
 
@@ -425,7 +425,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
 /**
  * @class ACE_Message_Queue_NT
  *
@@ -617,7 +617,7 @@ private:
   ACE_HANDLE completion_port_;
 
 };
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/Message_Queue.inl b/ACE/ace/Message_Queue.inl
index 452b33f8e6f..388198a0bf5 100644
--- a/ACE/ace/Message_Queue.inl
+++ b/ACE/ace/Message_Queue.inl
@@ -25,7 +25,7 @@ ACE_Message_Queue_Vx::msgq (void)
 
 #endif /* ACE_VXWORKS */
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
 
 ACE_INLINE int
 ACE_Message_Queue_NT::enqueue_tail (ACE_Message_Block *new_item,
@@ -143,6 +143,6 @@ ACE_Message_Queue_NT::notification_strategy (ACE_Notification_Strategy *)
 {
 }
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp
index 4eabd618369..9052769d52f 100644
--- a/ACE/ace/Message_Queue_T.cpp
+++ b/ACE/ace/Message_Queue_T.cpp
@@ -2791,7 +2791,7 @@ ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_Vx_message_queue (size_t max_me
 }
   // factory method for a wrapped VxWorks message queue
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
 
 template <ACE_SYNCH_DECL>
 ACE_Message_Queue_NT *
@@ -2805,7 +2805,7 @@ ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_NT_message_queue (size_t max_th
   return tmp;
 }
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
 #endif /* defined (ACE_VXWORKS) */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h
index b1695c84248..329258fabd0 100644
--- a/ACE/ace/Message_Queue_T.h
+++ b/ACE/ace/Message_Queue_T.h
@@ -28,9 +28,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Message_Queue_Vx;
 #endif /* defined (ACE_VXWORKS) */
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
 class ACE_Message_Queue_NT;
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO*/
+#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
 
 /**
  * @class ACE_Message_Queue
@@ -933,13 +933,13 @@ public:
 
 #endif /* defined (ACE_VXWORKS) */
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
 
   /// Factory method for a NT message queue.
   static ACE_Message_Queue_NT *
   create_NT_message_queue (size_t max_threads);
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
 };
 
 /**
diff --git a/ACE/ace/Msg_WFMO_Reactor.cpp b/ACE/ace/Msg_WFMO_Reactor.cpp
index bbc95b948fa..aaedb391b51 100644
--- a/ACE/ace/Msg_WFMO_Reactor.cpp
+++ b/ACE/ace/Msg_WFMO_Reactor.cpp
@@ -39,11 +39,20 @@ ACE_Msg_WFMO_Reactor::wait_for_multiple_events (int timeout,
   // ReadFile and WriteFile operations. QS_ALLINPUT allows
   // <MsgWaitForMultipleObjectsEx> to wait for any message is in the
   // queue.
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   return ::MsgWaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (),
                                         this->handler_rep_.handles (),
                                         timeout,
                                         QS_ALLINPUT,
                                         alertable);
+#else
+  ACE_UNUSED_ARG (alertable);
+  return ::MsgWaitForMultipleObjects (this->handler_rep_.max_handlep1 (),
+                                      this->handler_rep_.handles (),
+                                      FALSE,
+                                      timeout,
+                                      QS_ALLINPUT);
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 }
 
 int
@@ -59,7 +68,7 @@ ACE_Msg_WFMO_Reactor::dispatch_window_messages (void)
       if (msg.message == WM_QUIT)
         {
           // Should inform the main thread
-          ::PostQuitMessage (LOWORD (msg.wParam));
+          ::PostQuitMessage (msg.wParam);
           return -1;
         }
 
diff --git a/ACE/ace/Name_Proxy.cpp b/ACE/ace/Name_Proxy.cpp
index e33237069fd..82d0bd27eca 100644
--- a/ACE/ace/Name_Proxy.cpp
+++ b/ACE/ace/Name_Proxy.cpp
@@ -166,7 +166,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
     case sizeof (ACE_UINT32):
       {
         // Transform the length into host byte order.
-        ssize_t length = ACE_NTOHL (reply.length ());
+        ssize_t length = ntohl (reply.length ());
 
         // Receive the rest of the request message.
         // @@ beware of blocking read!!!.
diff --git a/ACE/ace/Name_Request_Reply.cpp b/ACE/ace/Name_Request_Reply.cpp
index e066b2ef4ac..f92bbf3c15d 100644
--- a/ACE/ace/Name_Request_Reply.cpp
+++ b/ACE/ace/Name_Request_Reply.cpp
@@ -269,17 +269,17 @@ ACE_Name_Request::encode (void *&buf)
 
   for (size_t i = 0; i < nv_data_len; i++)
     this->transfer_.data_[i] =
-      ACE_HTONS (this->transfer_.data_[i]);
+      htons (this->transfer_.data_[i]);
 
   buf = (void *) &this->transfer_;
-  this->transfer_.block_forever_ = ACE_HTONL (this->transfer_.block_forever_);
-  this->transfer_.usec_timeout_  = ACE_HTONL (this->transfer_.usec_timeout_);
-  this->transfer_.sec_timeout_ = ACE_HTONL (this->transfer_.sec_timeout_);
-  this->transfer_.length_ = ACE_HTONL (this->transfer_.length_);
-  this->transfer_.msg_type_ = ACE_HTONL (this->transfer_.msg_type_);
-  this->transfer_.name_len_ = ACE_HTONL (this->transfer_.name_len_);
-  this->transfer_.value_len_ = ACE_HTONL (this->transfer_.value_len_);
-  this->transfer_.type_len_ = ACE_HTONL (this->transfer_.type_len_);
+  this->transfer_.block_forever_ = htonl (this->transfer_.block_forever_);
+  this->transfer_.usec_timeout_  = htonl (this->transfer_.usec_timeout_);
+  this->transfer_.sec_timeout_ = htonl (this->transfer_.sec_timeout_);
+  this->transfer_.length_ = htonl (this->transfer_.length_);
+  this->transfer_.msg_type_ = htonl (this->transfer_.msg_type_);
+  this->transfer_.name_len_ = htonl (this->transfer_.name_len_);
+  this->transfer_.value_len_ = htonl (this->transfer_.value_len_);
+  this->transfer_.type_len_ = htonl (this->transfer_.type_len_);
 
   return len;
 }
@@ -292,14 +292,14 @@ ACE_Name_Request::decode (void)
 {
   ACE_TRACE ("ACE_Name_Request::decode");
   // Decode the fixed-sized portion first.
-  this->transfer_.block_forever_ = ACE_NTOHL (this->transfer_.block_forever_);
-  this->transfer_.usec_timeout_  = ACE_NTOHL (this->transfer_.usec_timeout_);
-  this->transfer_.sec_timeout_ = ACE_NTOHL (this->transfer_.sec_timeout_);
-  this->transfer_.length_ = ACE_NTOHL (this->transfer_.length_);
-  this->transfer_.msg_type_ = ACE_NTOHL (this->transfer_.msg_type_);
-  this->transfer_.name_len_ = ACE_NTOHL (this->transfer_.name_len_);
-  this->transfer_.value_len_ = ACE_NTOHL (this->transfer_.value_len_);
-  this->transfer_.type_len_ = ACE_NTOHL (this->transfer_.type_len_);
+  this->transfer_.block_forever_ = ntohl (this->transfer_.block_forever_);
+  this->transfer_.usec_timeout_  = ntohl (this->transfer_.usec_timeout_);
+  this->transfer_.sec_timeout_ = ntohl (this->transfer_.sec_timeout_);
+  this->transfer_.length_ = ntohl (this->transfer_.length_);
+  this->transfer_.msg_type_ = ntohl (this->transfer_.msg_type_);
+  this->transfer_.name_len_ = ntohl (this->transfer_.name_len_);
+  this->transfer_.value_len_ = ntohl (this->transfer_.value_len_);
+  this->transfer_.type_len_ = ntohl (this->transfer_.type_len_);
 
   size_t nv_data_len =
     (this->transfer_.name_len_ + this->transfer_.value_len_)
@@ -307,7 +307,7 @@ ACE_Name_Request::decode (void)
 
   for (size_t i = 0; i < nv_data_len; i++)
     this->transfer_.data_[i] =
-      ACE_NTOHS (this->transfer_.data_[i]);
+      ntohs (this->transfer_.data_[i]);
 
   this->name_ = this->transfer_.data_;
   this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (ACE_WCHAR_T)];
@@ -513,9 +513,9 @@ ACE_Name_Reply::encode (void *&buf)
   ACE_TRACE ("ACE_Name_Reply::encode");
   int len = this->length (); // Get length *before* marshaling.
 
-  this->transfer_.length_ = ACE_HTONL (this->transfer_.length_);
-  this->transfer_.type_ = ACE_HTONL (this->transfer_.type_);
-  this->transfer_.errno_ = ACE_HTONL (this->transfer_.errno_);
+  this->transfer_.length_ = htonl (this->transfer_.length_);
+  this->transfer_.type_ = htonl (this->transfer_.type_);
+  this->transfer_.errno_ = htonl (this->transfer_.errno_);
   buf = (void *) &this->transfer_;
   return len;
 }
@@ -527,9 +527,9 @@ int
 ACE_Name_Reply::decode (void)
 {
   ACE_TRACE ("ACE_Name_Reply::decode");
-  this->transfer_.length_ = ACE_NTOHL (this->transfer_.length_);
-  this->transfer_.type_ = ACE_NTOHL (this->transfer_.type_);
-  this->transfer_.errno_ = ACE_NTOHL (this->transfer_.errno_);
+  this->transfer_.length_ = ntohl (this->transfer_.length_);
+  this->transfer_.type_ = ntohl (this->transfer_.type_);
+  this->transfer_.errno_ = ntohl (this->transfer_.errno_);
   return 0;
 }
 
diff --git a/ACE/ace/Null_Mutex.h b/ACE/ace/Null_Mutex.h
index 2072bf2db52..4d83ae67802 100644
--- a/ACE/ace/Null_Mutex.h
+++ b/ACE/ace/Null_Mutex.h
@@ -18,10 +18,6 @@
 
 // All methods in this class are inline, so there is no
 // need to import or export on Windows. -- CAE 12/18/2003
-// Update... leaving off the ACE_Export causes compile warnings in some
-// cases with Microsoft Visual Studio .NET 2005, so I added the ACE_Export
-// to these class declarations.  Steve Huston, 12/8/2006.
-
 #include "ace/os_include/os_errno.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -42,7 +38,7 @@ class ACE_Time_Value;
  * @brief Implement a do nothing ACE_Mutex, i.e., all the methods are
  * no ops.
  */
-class ACE_Export ACE_Null_Mutex
+class ACE_Null_Mutex
 {
 public:
   ACE_Null_Mutex (const ACE_TCHAR * = 0)
@@ -101,7 +97,7 @@ public:
  * This class is obsolete and should be replaced by
  * ACE_Guard<ACE_Null_Mutex>.
  */
-class ACE_Export ACE_Null_Mutex_Guard
+class ACE_Null_Mutex_Guard
 {
 public:
   ACE_Null_Mutex_Guard (ACE_Null_Mutex &) {}
@@ -133,7 +129,7 @@ class ACE_Guard;
  * performance of the "Null_Mutex" considerably.
  */
 template<>
-class ACE_Export ACE_Guard<ACE_Null_Mutex>
+class ACE_Guard<ACE_Null_Mutex>
 {
 public:
   // = Initialization and termination methods.
@@ -168,8 +164,7 @@ class ACE_Write_Guard;
  *
  */
 template<>
-class ACE_Export ACE_Write_Guard<ACE_Null_Mutex>
-  : public ACE_Guard<ACE_Null_Mutex>
+class ACE_Write_Guard<ACE_Null_Mutex> : public ACE_Guard<ACE_Null_Mutex>
 {
 public:
   ACE_Write_Guard (ACE_Null_Mutex &m)
@@ -192,8 +187,7 @@ class ACE_Read_Guard;
  *
  */
 template<>
-class ACE_Export ACE_Read_Guard<ACE_Null_Mutex>
-  : public ACE_Guard<ACE_Null_Mutex>
+class ACE_Read_Guard<ACE_Null_Mutex> : public ACE_Guard<ACE_Null_Mutex>
 {
 public:
   ACE_Read_Guard (ACE_Null_Mutex &m)
@@ -215,7 +209,7 @@ template <class T> class ACE_Malloc_Lock_Adapter_T;
  *
  */
 template<>
-class ACE_Export ACE_Malloc_Lock_Adapter_T<ACE_Null_Mutex>
+class ACE_Malloc_Lock_Adapter_T<ACE_Null_Mutex>
 {
 public:
   ACE_Null_Mutex * operator () (const ACE_TCHAR *name)
diff --git a/ACE/ace/OS_Errno.cpp b/ACE/ace/OS_Errno.cpp
index 6f9905cad1f..25266ae5c55 100644
--- a/ACE/ace/OS_Errno.cpp
+++ b/ACE/ace/OS_Errno.cpp
@@ -6,10 +6,9 @@
 ACE_RCSID(ace, OS_Errno, "$Id$")
 
 // Inlining this class on debug builds with gcc on Solaris can cause
-// deadlocks during static initialization. On non debug builds it
-// causes compilation errors.
+// deadlocks during static initialization.
 #if !defined (ACE_HAS_INLINED_OSCALLS) || \
-    (defined (__GNUG__) && defined (__sun__))
+    (defined (__GNUG__) && defined (__sun__) && !defined (ACE_NDEBUG))
 # if defined (ACE_INLINE)
 #  undef ACE_INLINE
 # endif /* ACE_INLINE */
diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h
index 077aff14ff8..d67868631c1 100644
--- a/ACE/ace/OS_Errno.h
+++ b/ACE/ace/OS_Errno.h
@@ -86,10 +86,9 @@ private:
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 // Inlining this class on debug builds with gcc on Solaris can cause
-// deadlocks during static initialization. On non debug builds it
-// causes compilation errors.
+// deadlocks during static initialization.
 #if defined (ACE_HAS_INLINED_OSCALLS) && \
-    (!defined (__GNUG__) || !defined (__sun__))
+    (!defined (__GNUG__) || !defined (__sun__) || defined (ACE_NDEBUG))
 # if defined (ACE_INLINE)
 #  undef ACE_INLINE
 # endif /* ACE_INLINE */
diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h
index 70716bedfc2..2ca472e762e 100644
--- a/ACE/ace/OS_Memory.h
+++ b/ACE/ace/OS_Memory.h
@@ -81,19 +81,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #  endif
 #endif
 
-// The Windows MFC exception mechanism requires that a caught CException
-// (including the CMemoryException in use here) be freed using its Delete()
-// method. Thus, when MFC is in use and we're catching exceptions as a result
-// of new(), the exception's Delete() method has to be called. No other
-// platform imposes this sort of restriction/requirement. The Windows
-// config stuff (at least for MSVC/MFC) defines a ACE_del_bad_alloc macro
-// that works with its ACE_bad_alloc macro to implement this cleanup
-// requirement. Since no other platform requires this, define it as
-// empty here.
-#if !defined (ACE_del_bad_alloc)
-#  define ACE_del_bad_alloc
-#endif
-
 #if defined (ACE_NEW_THROWS_EXCEPTIONS)
 
 // Since new() throws exceptions, we need a way to avoid passing
@@ -158,7 +145,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #  elif defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
 #    include /**/ <new>
 #    if !defined (ACE_bad_alloc)
-#      define ACE_bad_alloc std::bad_alloc
+       // MFC changes the behavior of operator new at all MSVC versions from 6 up.
+#      if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1)
+#        define ACE_bad_alloc CMemoryException*
+#      else
+#        define ACE_bad_alloc std::bad_alloc
+#      endif
 #    endif
 #    define ACE_nothrow   std::nothrow
 #    define ACE_nothrow_t std::nothrow_t
@@ -171,7 +163,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #  else
 #    include /**/ <new>
 #    if !defined (ACE_bad_alloc)
-#      define ACE_bad_alloc bad_alloc
+       // MFC changes the behavior of operator new at all MSVC versions from 6 up.
+#      if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1)
+#        define ACE_bad_alloc CMemoryException*
+#      else
+#        define ACE_bad_alloc bad_alloc
+#      endif
 #    endif
 #    define ACE_nothrow   nothrow
 #    define ACE_nothrow_t nothrow_t
@@ -201,17 +198,17 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 #    define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \
    do { try { POINTER = new CONSTRUCTOR; } \
-     catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; POINTER = 0; return RET_VAL; } \
+        catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; return RET_VAL; } \
    } while (0)
 
 #    define ACE_NEW(POINTER,CONSTRUCTOR) \
    do { try { POINTER = new CONSTRUCTOR; } \
-     catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; POINTER = 0; return; } \
+        catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; return; } \
    } while (0)
 
 #    define ACE_NEW_NORETURN(POINTER,CONSTRUCTOR) \
    do { try { POINTER = new CONSTRUCTOR; } \
-     catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; POINTER = 0; } \
+        catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; } \
    } while (0)
 #  endif /* ACE_HAS_NEW_NOTHROW */
 
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index 014226cbbe2..fa59249af77 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -102,6 +102,19 @@ ACE_Thread_ID::to_string (char *thr_string) const
   ACE_OS::sprintf (thr_string,
                    format,
                    static_cast <unsigned> (thread_id_));
+#elif defined (ACE_AIX_VERS) && (ACE_AIX_VERS <= 402)
+                  // AIX's pthread_t (ACE_hthread_t) is a pointer, and it's
+                  // a little ugly to send that through a %u format.  So,
+                  // get the kernel thread ID (tid_t) via thread_self() and
+                  // display that instead.
+                  // This isn't conditionalized on ACE_HAS_THREAD_SELF because
+                  // 1. AIX 4.2 doesn't have that def anymore (it messes up
+                  //    other things)
+                  // 2. OSF/1 V3.2 has that def, and I'm not sure what affect
+                  //   this would have on that.
+                  // -Steve Huston, 19-Aug-97
+                  ACE_OS::strcpy (fp, "u");
+                  ACE_OS::sprintf (thr_string, format, thread_id_);
 #elif defined (DIGITAL_UNIX)
                   ACE_OS::strcpy (fp, "u");
                   ACE_OS::sprintf (thr_string, format,
@@ -2599,31 +2612,15 @@ ACE_OS::event_init (ACE_event_t *event,
 
   if (type == USYNC_PROCESS)
     {
-      const char *name_p = 0;
-#  if defined (ACE_SHM_OPEN_REQUIRES_ONE_SLASH)
-      char adj_name[MAXPATHLEN];
-      if (name[0] != '/')
-        {
-          adj_name[0] = '/';
-          ACE_OS::strsncpy (&adj_name[1], name, MAXPATHLEN-1);
-          name_p = adj_name;
-        }
-      else
-        {
-          name_p = name;
-        }
-#  else
-      name_p = name;
-#  endif /* ACE_SHM_OPEN_REQUIRES_ONE_SLASH */
       int owner = 0;
       // Let's see if the shared memory entity already exists.
-      ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name_p),
+      ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name),
                                         O_RDWR | O_CREAT | O_EXCL,
                                         ACE_DEFAULT_FILE_PERMS);
       if (fd == ACE_INVALID_HANDLE)
         {
           if (errno == EEXIST)
-            fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name_p),
+            fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name),
                                    O_RDWR | O_CREAT,
                                    ACE_DEFAULT_FILE_PERMS);
           if (fd == ACE_INVALID_HANDLE)   // Still can't get it.
@@ -2651,16 +2648,16 @@ ACE_OS::event_init (ACE_event_t *event,
       if (evtdata == MAP_FAILED)
         {
           if (owner)
-            ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name_p));
+            ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name));
           return -1;
         }
 
       if (owner)
         {
-          event->name_ = ACE_OS::strdup (name_p);
+          event->name_ = ACE_OS::strdup (name);
           if (event->name_ == 0)
             {
-              ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name_p));
+              ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name));
               return -1;
             }
           event->eventdata_ = evtdata;
@@ -3629,8 +3626,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
       return -1;
     }
 
-# endif /* ACE_HAS_PHARLAP_RT */
-
   if (sched_params.scope () == ACE_SCOPE_THREAD)
     {
 
@@ -3651,16 +3646,13 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
         }
 #endif /* ACE_DISABLE_WIN32_INCREASE_PRIORITY */
 
+# endif /* ACE_HAS_PHARLAP_RT */
       // Now that we have set the priority class of the process, set the
       // priority of the current thread to the desired value.
       return ACE_OS::thr_setprio (sched_params.priority ());
     }
   else if (sched_params.scope () == ACE_SCOPE_PROCESS)
     {
-
-# if defined (ACE_HAS_PHARLAP_RT)
-      ACE_NOTSUP_RETURN (-1);
-# else
       HANDLE hProcess = ::OpenProcess (PROCESS_SET_INFORMATION,
                                        FALSE,
                                        id);
@@ -3687,8 +3679,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
         }
       ::CloseHandle (hProcess);
       return 0;
-#endif /* ACE_HAS_PHARLAP_RT */
-
     }
   else
     {
@@ -4080,6 +4070,25 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
           else
             spolicy = SCHED_RR;
 
+#       if defined (ACE_HAS_FSU_PTHREADS)
+          int ret;
+          switch (spolicy)
+            {
+            case SCHED_FIFO:
+            case SCHED_RR:
+              ret = 0;
+              break;
+            default:
+              ret = 22;
+              break;
+            }
+          if (ret != 0)
+            {
+              ::pthread_attr_destroy (&attr);
+              return -1;
+            }
+#       endif    /*  ACE_HAS_FSU_PTHREADS */
+
 #     endif /* ACE_HAS_ONLY_SCHED_OTHER */
 
 #     if defined (ACE_HAS_PTHREADS_DRAFT4)
@@ -4152,6 +4161,17 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
           sparam.sched_priority = priority;
 #     endif /* ACE_HAS_IRIX62_THREADS */
 
+#     if defined (ACE_HAS_FSU_PTHREADS)
+          if (sparam.sched_priority >= PTHREAD_MIN_PRIORITY
+              && sparam.sched_priority <= PTHREAD_MAX_PRIORITY)
+            attr.prio = sparam.sched_priority;
+          else
+            {
+              pthread_attr_destroy (&attr);
+              errno = EINVAL;
+              return -1;
+            }
+#     else
           {
 #       if defined (sun)  &&  defined (ACE_HAS_ONLY_SCHED_OTHER)
             // SunOS, through 5.6, POSIX only allows priorities > 0 to
@@ -4178,6 +4198,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                   }
               }
           }
+#     endif    /* ACE_HAS_FSU_PTHREADS */
         }
 
       // *** Set scheduling explicit or inherited
@@ -4248,7 +4269,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
         }
 #   endif /* !ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP */
 
-#   if ! defined(ACE_LACKS_THR_CONCURRENCY_FUNCS)
       if (ACE_BIT_ENABLED (flags, THR_NEW_LWP))
         {
           // Increment the number of LWPs by one to emulate the
@@ -4275,7 +4295,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                 return -1;
             }
         }
-#   endif /* ! ACE_LACKS_THR_CONCURRENCY_FUNCS */
     }
 
 #   if defined (ACE_HAS_PTHREADS_DRAFT4)
@@ -5109,6 +5128,16 @@ ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data)
   // ACE_OS_TRACE ("ACE_OS::thr_setspecific_native");
 #   if defined (ACE_HAS_THREADS)
 #     if defined (ACE_HAS_PTHREADS)
+#       if defined (ACE_HAS_FSU_PTHREADS)
+      // Call pthread_init() here to initialize threads package.  FSU
+      // threads need an initialization before the first thread constructor.
+      // This seems to be the one; however, a segmentation fault may
+      // indicate that another pthread_init() is necessary, perhaps in
+      // Synch.cpp or Synch_T.cpp.  FSU threads will not reinit if called
+      // more than once, so another call to pthread_init will not adversely
+      // affect existing threads.
+      pthread_init ();
+#       endif /*  ACE_HAS_FSU_PTHREADS */
 #      if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
     ACE_OSCALL_RETURN (::pthread_setspecific (key, data), int, -1);
 #       else
@@ -5532,3 +5561,18 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...)
 }
 #endif /* ACE_VXWORKS && !__RTP__ */
 
+#if defined (__DGUX) && defined (ACE_HAS_THREADS) && defined (_POSIX4A_DRAFT10_SOURCE)
+extern "C" int __d6_sigwait (sigset_t *set);
+
+extern "C" int __d10_sigwait (const sigset_t *set, int *sig)
+{
+  sigset_t unconst_set = *set;
+  int caught_sig = __d6_sigwait (&unconst_set);
+
+  if (caught == -1)
+    return -1;
+
+  *sig = caught_sig;
+  return 0;
+}
+#endif /* __DGUX && PTHREADS && _POSIX4A_DRAFT10_SOURCE */
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h
index c9f6c261a87..e6628d14f9b 100644
--- a/ACE/ace/OS_NS_Thread.h
+++ b/ACE/ace/OS_NS_Thread.h
@@ -313,7 +313,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #     define THR_SCHED_RR            0
 #     define THR_SCHED_DEFAULT       0
 #     define THR_INHERIT_SCHED       0
-#     define THR_EXPLICIT_SCHED      0
 #     define THR_SCOPE_PROCESS       0
 #     define THR_SCOPE_SYSTEM        0
 #   endif /* ACE_HAS_PTHREADS / STHREADS / VXWORKS / WTHREADS **********/
diff --git a/ACE/ace/OS_NS_arpa_inet.cpp b/ACE/ace/OS_NS_arpa_inet.cpp
index d1d3b2d23d5..8c026593b2c 100644
--- a/ACE/ace/OS_NS_arpa_inet.cpp
+++ b/ACE/ace/OS_NS_arpa_inet.cpp
@@ -36,7 +36,7 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr)
       addr->s_addr = ip_addr;  // Network byte ordered
       return 1;
     }
-#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x630)
   // inet_aton() returns OK (0) on success and ERROR (-1) on failure.
   // Must reset errno first. Refer to WindRiver SPR# 34949, SPR# 36026
   ::errnoSet(0);
diff --git a/ACE/ace/OS_NS_arpa_inet.inl b/ACE/ace/OS_NS_arpa_inet.inl
index 3f0b768adff..547d30cdaf1 100644
--- a/ACE/ace/OS_NS_arpa_inet.inl
+++ b/ACE/ace/OS_NS_arpa_inet.inl
@@ -69,7 +69,6 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)
   ACE_NOTSUP_RETURN(0);
 #endif /* ACE_HAS_IPV6 */
 }
-
 ACE_INLINE int
 ACE_OS::inet_pton (int family, const char *strptr, void *addrptr)
 {
diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp
index b18ddc6928a..0fa32cc497e 100644
--- a/ACE/ace/OS_NS_dirent.cpp
+++ b/ACE/ace/OS_NS_dirent.cpp
@@ -13,6 +13,21 @@ ACE_RCSID(ace, OS_NS_dirent, "$Id$")
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdlib.h"
 
+
+/*
+   These definitions are missing on the original VC6 distribution.  The new
+   headers that define these are available in the Platform SDK and are defined
+   for those that don't have it.
+ */
+#if defined (ACE_WIN32)
+#  if !defined (INVALID_FILE_ATTRIBUTES)
+#    define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+#  endif /* INVALID_FILE_ATTRIBUTES */
+#  if !defined (INVALID_SET_FILE_POINTER)
+#    define INVALID_SET_FILE_POINTER ((DWORD)-1)
+#  endif /* INVALID_SET_FILE_POINTER */
+#endif /* ACE_WIN32 */
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_LACKS_CLOSEDIR)
diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl
index a768a914887..862dd7d07c3 100644
--- a/ACE/ace/OS_NS_dirent.inl
+++ b/ACE/ace/OS_NS_dirent.inl
@@ -47,17 +47,18 @@ opendir (const ACE_TCHAR *filename)
 #endif /* ACE_HAS_DIRENT */
 }
 
-ACE_INLINE struct ACE_DIRENT *
+ACE_INLINE
+struct ACE_DIRENT *
 readdir (ACE_DIR *d)
 {
 #if defined (ACE_HAS_DIRENT)
-#  if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR)
-     return ACE_OS::readdir_emulation (d);
+#    if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR)
+  return ACE_OS::readdir_emulation (d);
 #  elif defined (ACE_HAS_WREADDIR) && defined (ACE_USES_WCHAR)
-     return ::wreaddir (d);
-#  else /* ACE_WIN32 && ACE_LACKS_READDIR */
-     return ::readdir (d);
-#  endif /* ACE_WIN32 && ACE_LACKS_READDIR */
+  return ::wreaddir (d);
+#    else /* ACE_WIN32 && ACE_LACKS_READDIR */
+  return ::readdir (d);
+#    endif /* ACE_WIN32 && ACE_LACKS_READDIR */
 #else
   ACE_UNUSED_ARG (d);
   ACE_NOTSUP_RETURN (0);
@@ -66,8 +67,8 @@ readdir (ACE_DIR *d)
 
 ACE_INLINE int
 readdir_r (ACE_DIR *dirp,
-           struct ACE_DIRENT *entry,
-           struct ACE_DIRENT **result)
+                   struct ACE_DIRENT *entry,
+                   struct ACE_DIRENT **result)
 {
 #if !defined (ACE_HAS_REENTRANT_FUNCTIONS)
   ACE_UNUSED_ARG (entry);
@@ -77,14 +78,29 @@ readdir_r (ACE_DIR *dirp,
     return 0; // Keep iterating
   else
     return 1; // Oops, some type of error!
-#elif defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_READDIR_R)
-#  if defined (ACE_HAS_3_PARAM_READDIR_R)
-       return ::readdir_r (dirp, entry, result);
-#  else
-       // <result> had better not be 0!
-       *result = ::readdir_r (dirp, entry);
-       return 0;
-#  endif /* sun */
+#elif defined (ACE_HAS_DIRENT)  &&  !defined (ACE_LACKS_READDIR_R)
+#  if (defined (sun) && (defined (_POSIX_PTHREAD_SEMANTICS) || \
+                        (_FILE_OFFSET_BITS == 64) || \
+                        (_POSIX_C_SOURCE - 0 >= 199506L))) || \
+      (!defined (sun) && (defined (ACE_HAS_PTHREADS_STD) || \
+                         defined (ACE_HAS_PTHREADS_DRAFT7) || \
+                         defined (_POSIX_SOURCE) || \
+                         defined (__FreeBSD__) || \
+                         defined (HPUX_11)))
+#    if defined (__GNUG__) && defined (DIGITAL_UNIX)
+  return readdir_r (dirp, entry, result);
+#    else
+  return ::readdir_r (dirp, entry, result);
+#    endif /* defined (__GNUG__) && defined (DIGITAL_UNIX) */
+#  else  /* ! POSIX.1c - this is draft 4 or draft 6 */
+#    if defined(__GNUC__) && defined (_AIX)
+        return ::readdir_r (dirp, entry, result);
+#    else
+    // <result> had better not be 0!
+    *result = ::readdir_r (dirp, entry);
+    return 0;
+#    endif /* AIX */
+#  endif /* ! POSIX.1c */
 #else  /* ! ACE_HAS_DIRENT  ||  ACE_LACKS_READDIR_R */
   ACE_UNUSED_ARG (dirp);
   ACE_UNUSED_ARG (entry);
@@ -145,7 +161,7 @@ scandir (const ACE_TCHAR *dirname,
 ACE_INLINE void
 seekdir (ACE_DIR *d, long loc)
 {
-#if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_SEEKDIR)
+#if defined (ACE_HAS_DIRENT)  &&  !defined (ACE_LACKS_SEEKDIR)
   ::seekdir (d, loc);
 #else  /* ! ACE_HAS_DIRENT  ||  ACE_LACKS_SEEKDIR */
   ACE_UNUSED_ARG (d);
@@ -156,7 +172,7 @@ seekdir (ACE_DIR *d, long loc)
 ACE_INLINE long
 telldir (ACE_DIR *d)
 {
-#if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_TELLDIR)
+#if defined (ACE_HAS_DIRENT)  &&  !defined (ACE_LACKS_TELLDIR)
   return ::telldir (d);
 #else  /* ! ACE_HAS_DIRENT  ||  ACE_LACKS_TELLDIR */
   ACE_UNUSED_ARG (d);
diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp
index a788714eefd..92a853b2895 100644
--- a/ACE/ace/OS_NS_netdb.cpp
+++ b/ACE/ace/OS_NS_netdb.cpp
@@ -356,7 +356,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
 
   return 0;
 
-#elif defined (linux) && !defined (ACE_LACKS_NETWORKING)
+#elif defined (linux)
 
   struct ifreq ifr;
 
diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h
index bb5b03b1c0d..ec59a0e91a1 100644
--- a/ACE/ace/OS_NS_signal.h
+++ b/ACE/ace/OS_NS_signal.h
@@ -81,7 +81,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Also see ChangeLog entries:
 // Mon Jan 23 16:35:40 UTC 2006  Steve Huston  <shuston@riverace.com>
 // Mon Jan 23 22:08:56 UTC 2006  Steve Huston  <shuston@riverace.com>
-#if defined (__HP_aCC) && (__HP_aCC <= 37300)
+#if defined (__HP_aCC) && (__HP_aCC <= 36500)
 typedef extern "C" struct sigaction  ACE_SIGACTION;
 #else
 typedef struct sigaction ACE_SIGACTION;
diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl
index df71ce0eb23..172bf82c7eb 100644
--- a/ACE/ace/OS_NS_signal.inl
+++ b/ACE/ace/OS_NS_signal.inl
@@ -127,7 +127,7 @@ sigemptyset (sigset_t *s)
       return -1;
     }
   *s = 0 ;
-  return 0;
+  return 0 ;
 #else
   ACE_OSCALL_RETURN (::sigemptyset (s), int, -1);
 #endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index c4b23cb1904..c428ab2f762 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -299,7 +299,7 @@ ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...)
 int
 ACE_OS::printf (const char *format, ...)
 {
-  // ACE_OS_TRACE ("ACE_OS::printf");
+  ACE_OS_TRACE ("ACE_OS::printf");
   int result;
   va_list ap;
   va_start (ap, format);
@@ -312,12 +312,41 @@ int
 ACE_OS::snprintf (char *buf, size_t maxlen, const char *format, ...)
 {
   // ACE_OS_TRACE ("ACE_OS::snprintf");
+#if defined (ACE_HAS_SNPRINTF)
   int result;
   va_list ap;
   va_start (ap, format);
-  result = ACE_OS::vsnprintf (buf, maxlen, format, ap);
+#  if !defined (ACE_WIN32) || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x600))
+  ACE_OSCALL (ACE_SPRINTF_ADAPTER (::vsnprintf (buf, maxlen, format, ap)),
+              int, -1, result);
+#  else
+  ACE_OSCALL (ACE_SPRINTF_ADAPTER (::_vsnprintf (buf, maxlen, format, ap)),
+              int, -1, result);
+  // Win32 doesn't regard a full buffer with no 0-terminate as an
+  // overrun.
+  if (result == static_cast <int> (maxlen))
+    result = -1;
+
+  // Win32 doesn't 0-terminate the string if it overruns maxlen.
+  if (result == -1)
+    buf[maxlen-1] = '\0';
+#  endif /* !ACE_WIN32 || __BORLANDC__ >= 0x600 */
   va_end (ap);
+  // In out-of-range conditions, C99 defines vsnprintf to return the number
+  // of characters that would have been written if enough space was available.
+  // Earlier variants of the vsnprintf() (e.g. UNIX98) defined it to return
+  // -1. This method follows the C99 standard, but needs to guess at the
+  // value; uses maxlen + 1.
+  if (result == -1)
+    result = static_cast <int> (maxlen + 1);
   return result;
+
+#else
+  ACE_UNUSED_ARG (buf);
+  ACE_UNUSED_ARG (maxlen);
+  ACE_UNUSED_ARG (format);
+  ACE_NOTSUP_RETURN (-1);
+#endif /* ACE_HAS_SNPRINTF */
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -336,8 +365,10 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...)
   // Microsoft's vswprintf() doesn't have the maxlen argument that
   // XPG4/UNIX98 define. They do, however, recommend use of _vsnwprintf()
   // as a substitute, which does have the same signature as the UNIX98 one.
-  ACE_OSCALL (::_vsnwprintf (buf, maxlen, format, ap), int, -1, result);
-  // Win32 doesn't regard a full buffer with no 0-terminate as an overrun.
+  ACE_OSCALL (ACE_SPRINTF_ADAPTER (::_vsnwprintf (buf, maxlen, format, ap)),
+              int, -1, result);
+  // Win32 doesn't regard a full buffer with no 0-terminate as an
+  // overrun.
   if (result == static_cast <int> (maxlen))
     result = -1;
 
@@ -345,7 +376,8 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...)
   if (result == -1)
     buf[maxlen-1] = '\0';
 #  else
-  ACE_OSCALL (::vswprintf (buf, maxlen, format, ap), int, -1, result);
+  ACE_OSCALL (ACE_SPRINTF_ADAPTER (::vswprintf (buf, maxlen, format, ap)),
+              int, -1, result);
 #  endif /* ACE_WIN32 */
   va_end (ap);
   // In out-of-range conditions, C99 defines vsnprintf to return the number
@@ -357,12 +389,12 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...)
     result = static_cast <int> (maxlen + 1);
   return result;
 
-# else
+#else
   ACE_UNUSED_ARG (buf);
   ACE_UNUSED_ARG (maxlen);
   ACE_UNUSED_ARG (format);
   ACE_NOTSUP_RETURN (-1);
-# endif /* _XOPEN_SOURCE ...  */
+#endif /* ACE_HAS_SNPRINTF */
 }
 #endif /* ACE_HAS_WCHAR */
 
@@ -374,7 +406,7 @@ ACE_OS::sprintf (char *buf, const char *format, ...)
   int result;
   va_list ap;
   va_start (ap, format);
-  ACE_OSCALL (::vsprintf (buf, format, ap), int, -1, result);
+  ACE_OSCALL (ACE_SPRINTF_ADAPTER (::vsprintf (buf, format, ap)), int, -1, result);
   va_end (ap);
   return result;
 }
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index 18ca767ddab..bc3e5569fcf 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -367,7 +367,7 @@ namespace ACE_OS {
 
 # if defined (ACE_HAS_WCHAR)
   extern ACE_Export
-  int snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...);
+  int snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format,...);
 # endif /* ACE_HAS_WCHAR */
 
   extern ACE_Export
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index 72a13d34b1f..ce74c3a21cb 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -12,9 +12,11 @@
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_Memory.h"
 
-#if defined (ACE_HAS_TRIO)
-#  include <trio.h>
-#endif /* ACE_HAS_TRIO */
+#if defined (ACE_HAS_CHARPTR_SPRINTF)
+#  define ACE_SPRINTF_ADAPTER(X) ACE_OS::strlen (X)
+#else
+#  define ACE_SPRINTF_ADAPTER(X) X
+#endif /* ACE_HAS_CHARPTR_SPRINTF */
 
 /*****************************************************************************/
 
@@ -794,7 +796,7 @@ ACE_OS::rename (const char *old_name,
                      ACE_TEXT_CHAR_TO_TCHAR (new_name)))
     ACE_FAIL_RETURN (-1);
   return 0;
-# elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX)
+# elif defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1)
   // NT4 (and up) provides a way to rename/move a file with similar semantics
   // to what's usually done on UNIX - if there's an existing file with
   // <new_name> it is removed before the file is renamed/moved. The
@@ -826,7 +828,7 @@ ACE_OS::rename (const wchar_t *old_name,
   if (MoveFileW (old_name, new_name) != 0)
     ACE_FAIL_RETURN (-1);
   return 0;
-# elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX)
+# elif defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1)
   // NT4 (and up) provides a way to rename/move a file with similar semantics
   // to what's usually done on UNIX - if there's an existing file with
   // <new_name> it is removed before the file is renamed/moved. The
@@ -915,47 +917,41 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
 ACE_INLINE int
 ACE_OS::vsprintf (char *buffer, const char *format, va_list argptr)
 {
-  return ::vsprintf (buffer, format, argptr);
+  return ACE_SPRINTF_ADAPTER (::vsprintf (buffer, format, argptr));
 }
 
 ACE_INLINE int
 ACE_OS::vsnprintf (char *buffer, size_t maxlen, const char *format, va_list ap)
 {
-#if !defined (ACE_LACKS_VSNPRINTF)
-  int result;
-#  if !defined (ACE_WIN32)
-  result = ::vsnprintf (buffer, maxlen, format, ap);
+#if defined (ACE_HAS_SNPRINTF)
+
+#  if !defined (ACE_WIN32) \
+   || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x600))
+  return ACE_SPRINTF_ADAPTER (::vsnprintf (buffer, maxlen, format, ap));
 #  else
-  result = ::_vsnprintf (buffer, maxlen, format, ap);
 
-  // Win32 doesn't regard a full buffer with no 0-terminate as an overrun.
+  int result =
+    ACE_SPRINTF_ADAPTER (::_vsnprintf (buffer, maxlen, format, ap));
+
+  // Win32 doesn't regard a full buffer with no 0-terminate as an
+  // overrun.
   if (result == static_cast<int> (maxlen))
-    buffer[maxlen-1] = '\0';
+    result = -1;
 
   // Win32 doesn't 0-terminate the string if it overruns maxlen.
   if (result == -1)
     buffer[maxlen-1] = '\0';
-# endif
-  // In out-of-range conditions, C99 defines vsnprintf() to return the number
-  // of characters that would have been written if enough space was available.
-  // Earlier variants of the vsnprintf() (e.g. UNIX98) defined it to return
-  // -1. This method follows the C99 standard, but needs to guess at the
-  // value; uses maxlen + 1.
-  if (result == -1)
-    {
-      result = static_cast <int> (maxlen + 1);
-    }
 
   return result;
-#elif defined (ACE_HAS_TRIO)
-  return trio_vsnprintf (buffer, maxlen, format, ap);
+
+# endif
 #else
   ACE_UNUSED_ARG (buffer);
   ACE_UNUSED_ARG (maxlen);
   ACE_UNUSED_ARG (format);
   ACE_UNUSED_ARG (ap);
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_LACKS_VSNPRINTF */
+#endif /* ACE_HAS_SNPRINTF */
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -1001,7 +997,8 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis
 
 # elif defined (ACE_WIN32)
 
-  int result = ::_vsnwprintf (buffer, maxlen, format, ap);
+  int result =
+    ACE_SPRINTF_ADAPTER (::_vsnwprintf (buffer, maxlen, format, ap));
 
   // Win32 doesn't regard a full buffer with no 0-terminate as an
   // overrun.
diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp
index cd2005eb041..0850b2a63df 100644
--- a/ACE/ace/OS_NS_stdlib.cpp
+++ b/ACE/ace/OS_NS_stdlib.cpp
@@ -6,8 +6,6 @@ ACE_RCSID (ace,
            OS_NS_stdlib,
            "$Id$")
 
-#include "ace/Default_Constants.h"
-
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_stdlib.inl"
 #endif /* ACE_HAS_INLINED_OSCALLS */
@@ -103,76 +101,6 @@ ACE_OS::getenvstrings (void)
 #endif /* ACE_WIN32 */
 }
 
-// Return a dynamically allocated duplicate of <str>, substituting the
-// environment variables of form $VAR_NAME.  Note that the pointer is
-// allocated with <ACE_OS::malloc> and must be freed by
-// <ACE_OS::free>.
-
-ACE_TCHAR *
-ACE_OS::strenvdup (const ACE_TCHAR *str)
-{
-#if defined (ACE_HAS_WINCE)
-  // WinCE doesn't have environment variables so we just skip it.
-  return ACE_OS::strdup (str);
-#elif defined (ACE_LACKS_ENV)
-  ACE_UNUSED_ARG (str);
-  ACE_NOTSUP_RETURN (0);
-#else
-  const ACE_TCHAR * start = 0;
-  if ((start = ACE_OS::strchr (str, ACE_LIB_TEXT ('$'))) != 0)
-    {
-      ACE_TCHAR buf[ACE_DEFAULT_ARGV_BUFSIZ];
-      size_t var_len = ACE_OS::strcspn (&start[1],
-        ACE_LIB_TEXT ("$~!#%^&*()-+=\\|/?,.;:'\"`[]{} \t\n\r"));
-      ACE_OS::strncpy (buf, &start[1], var_len);
-      buf[var_len++] = ACE_LIB_TEXT ('\0');
-#  if defined (ACE_WIN32)
-      // Always use the ACE_TCHAR for Windows.
-      ACE_TCHAR *temp = ACE_OS::getenv (buf);
-#  else
-      // Use char * for environment on non-Windows.
-      char *temp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (buf));
-#  endif /* ACE_WIN32 */
-      size_t buf_len = ACE_OS::strlen (str) + 1;
-      if (temp != 0)
-        buf_len += ACE_OS::strlen (temp) - var_len;
-      ACE_TCHAR * buf_p = buf;
-      if (buf_len > ACE_DEFAULT_ARGV_BUFSIZ)
-        {
-          buf_p =
-            (ACE_TCHAR *) ACE_OS::malloc (buf_len * sizeof (ACE_TCHAR));
-          if (buf_p == 0)
-            {
-              errno = ENOMEM;
-              return 0;
-            }
-        }
-      ACE_TCHAR * p = buf_p;
-      size_t len = start - str;
-      ACE_OS::strncpy (p, str, len);
-      p += len;
-      if (temp != 0)
-        {
-#  if defined (ACE_WIN32)
-          p = ACE_OS::strecpy (p, temp) - 1;
-#  else
-          p = ACE_OS::strecpy (p, ACE_TEXT_CHAR_TO_TCHAR (temp)) - 1;
-#  endif /* ACE_WIN32 */
-        }
-      else
-        {
-          ACE_OS::strncpy (p, start, var_len);
-          p += var_len;
-          *p = ACE_LIB_TEXT ('\0');
-        }
-      ACE_OS::strcpy (p, &start[var_len]);
-      return (buf_p == buf) ? ACE_OS::strdup (buf) : buf_p;
-    }
-  else
-    return ACE_OS::strdup (str);
-#endif /* ACE_HAS_WINCE */
-}
-
 #if !defined (ACE_HAS_ITOA)
 char *
 ACE_OS::itoa_emulation (int value, char *string, int radix)
diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h
index b90205fb328..26c555db656 100644
--- a/ACE/ace/OS_NS_stdlib.h
+++ b/ACE/ace/OS_NS_stdlib.h
@@ -225,7 +225,7 @@ namespace ACE_OS {
   void srand (u_int seed);
 
   // not in spec
-  extern ACE_Export
+  ACE_NAMESPACE_INLINE_FUNCTION
   ACE_TCHAR *strenvdup (const ACE_TCHAR *str);
 
 #if !defined (ACE_LACKS_STRTOD)
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index 8a33ed3ae7f..3099a5e2c70 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -10,7 +10,7 @@
 #include "ace/os_include/os_errno.h"
 #include "ace/os_include/os_search.h"
 
-#if defined (ACE_WCHAR_IN_STD_NAMESPACE)
+#if defined(ACE_WCHAR_IN_STD_NAMESPACE)
 # define ACE_WCHAR_STD_NAMESPACE std
 #else
 # define ACE_WCHAR_STD_NAMESPACE ACE_STD_NAMESPACE
@@ -64,7 +64,7 @@ ACE_OS::atoi (const wchar_t *s)
 #if defined (ACE_WIN32)
   ACE_OSCALL_RETURN (::_wtoi (s), int, -1);
 #else /* ACE_WIN32 */
-  return ACE_OS::atoi (ACE_Wide_To_Ascii (s).char_rep ());
+  return ACE_OS::atoi (ACE_Wide_To_Ascii(s).char_rep());
 #endif /* ACE_WIN32 */
 }
 #endif /* ACE_HAS_WCHAR */
@@ -221,7 +221,7 @@ ACE_OS::mktemp (wchar_t *s)
   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
+  // 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)
@@ -235,9 +235,9 @@ ACE_OS::mktemp (wchar_t *s)
 
 #endif /* !ACE_LACKS_MKTEMP */
 
-#if defined (INTEGRITY)
+#if defined(INTEGRITY)
 extern "C" {
-  int putenv (char *string);
+  int putenv(char *string);
 }
 #endif
 
@@ -251,14 +251,14 @@ ACE_OS::putenv (const char *string)
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_LACKS_PUTENV) && defined (ACE_HAS_SETENV)
   int result = 0;
-  char *sp = ACE_OS::strchr (const_cast <char *> (string), '=');
+  char* sp = ACE_OS::strchr (const_cast <char *> (string), '=');
   if (sp)
     {
-      char *stmp = ACE_OS::strdup (string);
+      char* stmp = ACE_OS::strdup (string);
       if (stmp)
         {
           stmp[sp - string] = '\0';
-          ACE_OSCALL (::setenv (stmp, sp+sizeof (char), 1), int, -1, result);
+          ACE_OSCALL (::setenv(stmp, sp+sizeof(char), 1), int, -1, result);
           ACE_OS::free (stmp);
         }
       else
@@ -268,8 +268,9 @@ ACE_OS::putenv (const char *string)
         }
     }
   else
-    ACE_OSCALL (::setenv (string, "", 1), int, -1, result);
-
+    {
+      ACE_OSCALL (::setenv(string, "", 1), int, -1, result);
+    }
   return result;
 #elif defined (ACE_LACKS_ENV) || defined (ACE_LACKS_PUTENV)
   ACE_UNUSED_ARG (string);
@@ -345,15 +346,15 @@ ACE_OS::rand_r (ACE_RANDR_TYPE& seed)
 {
   ACE_OS_TRACE ("ACE_OS::rand_r");
 
-  long new_seed = (long) (seed);
+  long new_seed = (long)(seed);
   if (new_seed == 0)
     new_seed = 0x12345987;
   long temp = new_seed / 127773;
   new_seed = 16807 * (new_seed - temp * 127773) - 2836 * temp;
   if (new_seed < 0)
     new_seed += 2147483647;
- (seed) = (unsigned int)new_seed;
-  return (int) (new_seed & RAND_MAX);
+  (seed) = (unsigned int)new_seed;
+  return (int)(new_seed & RAND_MAX);
 }
 
 #endif /* !ACE_WIN32 */
@@ -409,6 +410,41 @@ ACE_OS::srand (u_int seed)
   ::srand (seed);
 }
 
+// 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>.
+
+ACE_INLINE ACE_TCHAR *
+ACE_OS::strenvdup (const ACE_TCHAR *str)
+{
+#if defined (ACE_HAS_WINCE)
+  // WinCE doesn't have environment variables so we just skip it.
+  return ACE_OS::strdup (str);
+#elif defined (ACE_LACKS_ENV)
+  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);
+    }
+  else
+    return ACE_OS::strdup (str);
+#endif /* ACE_HAS_WINCE */
+}
+
 #if !defined (ACE_LACKS_STRTOD)
 ACE_INLINE double
 ACE_OS::strtod (const char *s, char **endptr)
@@ -470,7 +506,7 @@ ACE_OS::system (const ACE_TCHAR *s)
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   ACE_OSCALL_RETURN (::_wsystem (s), int, -1);
-#elif defined (ACE_TANDEM_T1248_PTHREADS)
+#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);
diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl
index 204ea5db435..c1b8aef93e5 100644
--- a/ACE/ace/OS_NS_string.inl
+++ b/ACE/ace/OS_NS_string.inl
@@ -525,7 +525,7 @@ ACE_INLINE wchar_t *
 ACE_OS::strtok (wchar_t *s, const wchar_t *tokens)
 {
 #if defined (ACE_HAS_3_PARAM_WCSTOK)
-  static wchar_t *lasts = 0;
+  static wchar_t *lasts;
   return ::wcstok (s, tokens, &lasts);
 #else
   return ::wcstok (s, tokens);
diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl
index cd9a65d5a84..422d07e9c35 100644
--- a/ACE/ace/OS_NS_sys_mman.inl
+++ b/ACE/ace/OS_NS_sys_mman.inl
@@ -91,19 +91,41 @@ ACE_OS::mmap (void *addr,
   // Only create a new handle if we didn't have a valid one passed in.
   if (*file_mapping == ACE_INVALID_HANDLE)
     {
-      SECURITY_ATTRIBUTES sa_buffer;
-      SECURITY_DESCRIPTOR sd_buffer;
-      const LPSECURITY_ATTRIBUTES attr =
-        ACE_OS::default_win32_security_attributes_r (sa,
-                                                     &sa_buffer,
-                                                     &sd_buffer);
+#  if !defined(ACE_HAS_WINCE) && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0))
+      int try_create = 1;
+      if ((file_mapping_name != 0) && (*file_mapping_name != 0))
+        {
+          // On Win9x, we first try to OpenFileMapping to
+          // file_mapping_name. Only if there is no mapping object
+          // with that name, and the desired name is valid, do we try
+          // CreateFileMapping.
 
-      *file_mapping = ACE_TEXT_CreateFileMapping (file_handle,
-                                                  attr,
-                                                  prot,
-                                                  0,
-                                                  0,
-                                                  file_mapping_name);
+          *file_mapping = ACE_TEXT_OpenFileMapping (nt_flags,
+                                                    0,
+                                                    file_mapping_name);
+          if (*file_mapping != 0
+              || (::GetLastError () == ERROR_INVALID_NAME
+                  && ::GetLastError () == ERROR_FILE_NOT_FOUND))
+            try_create = 0;
+        }
+
+      if (try_create)
+#  endif /* !ACE_HAS_WINCE && (ACE_HAS_WINNT4 || ACE_HAS_WINNT4 == 0) */
+        {
+          SECURITY_ATTRIBUTES sa_buffer;
+          SECURITY_DESCRIPTOR sd_buffer;
+          const LPSECURITY_ATTRIBUTES attr =
+            ACE_OS::default_win32_security_attributes_r (sa,
+                                                         &sa_buffer,
+                                                         &sd_buffer);
+
+          *file_mapping = ACE_TEXT_CreateFileMapping (file_handle,
+                                                      attr,
+                                                      prot,
+                                                      0,
+                                                      0,
+                                                      file_mapping_name);
+        }
     }
 
   if (*file_mapping == 0)
diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl
index 9300e4ac011..8849e37d96b 100644
--- a/ACE/ace/OS_NS_sys_time.inl
+++ b/ACE/ace/OS_NS_sys_time.inl
@@ -66,7 +66,7 @@ ACE_OS::gettimeofday (void)
 #else
 # if defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY) || \
   defined(ACE_HAS_VOIDPTR_GETTIMEOFDAY) || \
-  (defined (ACE_HAS_SVR4_GETTIMEOFDAY) && !defined (SCO))
+  (defined (ACE_HAS_SVR4_GETTIMEOFDAY) && !defined (m88k) && !defined (SCO))
   ACE_OSCALL (::gettimeofday (&tv, 0), int, -1, result);
 # elif defined (ACE_VXWORKS)
   // Assumes that struct timespec is same size as struct timeval,
diff --git a/ACE/ace/OS_NS_sys_wait.inl b/ACE/ace/OS_NS_sys_wait.inl
index 2503d509828..e273b5602d4 100644
--- a/ACE/ace/OS_NS_sys_wait.inl
+++ b/ACE/ace/OS_NS_sys_wait.inl
@@ -15,7 +15,11 @@ ACE_OS::wait (int *status)
   ACE_UNUSED_ARG (status);
   ACE_NOTSUP_RETURN (0);
 #else
+# if defined (ACE_HAS_UNION_WAIT)
+  ACE_OSCALL_RETURN (::wait ((union wait *) status), pid_t, -1);
+# else
   ACE_OSCALL_RETURN (::wait (status), pid_t, -1);
+# endif /* ACE_HAS_UNION_WAIT */
 #endif /* ACE_LACKS_WAIT */
 }
 
diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp
index 81b2c9e3aa9..4fd4401c3d9 100644
--- a/ACE/ace/OS_NS_unistd.cpp
+++ b/ACE/ace/OS_NS_unistd.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (ace, OS_NS_unistd, "$Id$")
+ACE_RCSID(ace, OS_NS_unistd, "$Id$")
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_unistd.inl"
@@ -39,8 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 int
 ACE_OS::argv_to_string (ACE_TCHAR **argv,
                         ACE_TCHAR *&buf,
-                        bool substitute_env_args,
-                        bool quote_args)
+                        bool substitute_env_args)
 {
   if (argv == 0 || argv[0] == 0)
     return 0;
@@ -49,90 +48,35 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv,
 
   // Determine the length of the buffer.
 
-  int argc;
-  for (argc = 0; argv[argc] != 0; ++argc)
-    continue;
-  ACE_TCHAR **argv_p = argv;
-
-  for (int i = 0; i < argc; ++i)
+  for (int i = 0; argv[i] != 0; i++)
     {
 #if !defined (ACE_LACKS_ENV)
       // Account for environment variables.
-      if (substitute_env_args
-          && ACE_OS::strchr (argv[i], ACE_LIB_TEXT ('$')) != 0)
-        {
-          if (argv_p == argv)
-            {
-              argv_p = (ACE_TCHAR **) ACE_OS::malloc (argc * sizeof (ACE_TCHAR *));
-              if (argv_p == 0)
-                {
-                  errno = ENOMEM;
-                  return 0;
-                }
-              ACE_OS::memcpy (argv_p, argv, argc * sizeof (ACE_TCHAR *));
-            }
-          argv_p[i] = ACE_OS::strenvdup (argv[i]);
-          if (argv_p[i] == 0)
-            {
-              ACE_OS::free (argv_p);
-              errno = ENOMEM;
-              return 0;
-            }
-        }
-#endif /* ACE_LACKS_ENV */
-      if (quote_args
-          && ACE_OS::strchr (argv_p[i], ACE_LIB_TEXT (' ')) != 0)
+      if (substitute_env_args && argv[i][0] == ACE_LIB_TEXT ('$'))
         {
-          if (argv_p == argv)
-            {
-              argv_p = (ACE_TCHAR **) ACE_OS::malloc (argc * sizeof (ACE_TCHAR *));
-              if (argv_p == 0)
-                {
-                  errno = ENOMEM;
-                  return 0;
-                }
-              ACE_OS::memcpy (argv_p, argv, argc * sizeof (ACE_TCHAR *));
-            }
-          int quotes = 0;
-          ACE_TCHAR *temp = argv_p[i];
-          if (ACE_OS::strchr (temp, ACE_LIB_TEXT ('"')) != 0)
-            {
-              for (int j = 0; temp[j] != 0; ++j)
-                if (temp[j] == ACE_LIB_TEXT ('"'))
-                  ++quotes;
-            }
-          argv_p[i] =
-            (ACE_TCHAR *) ACE_OS::malloc (ACE_OS::strlen (temp) * sizeof (ACE_TCHAR) + quotes + 3);
-          if (argv_p[i] == 0)
-            {
-              ACE_OS::free (argv_p);
-              errno = ENOMEM;
-              return 0;
-            }
-          ACE_TCHAR *end = argv_p[i];
-
-          *end++ = ACE_LIB_TEXT ('"');
-
-          if (quotes > 0)
-            {
-              for (ACE_TCHAR *p = temp;
-                   *p != 0;
-                   *end++ = *p++)
-                if (*p == ACE_LIB_TEXT ('"'))
-                  *end++ = ACE_LIB_TEXT ('\\');
-
-              *end++ = ACE_LIB_TEXT ('\0');
-            }
+#  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
-            end = ACE_OS::strecpy (end, temp);
-
-          end[-1] = ACE_LIB_TEXT ('"');
-
-          *end = ACE_LIB_TEXT ('\0');
-          if (temp != argv[i])
-            ACE_OS::free (temp);
+            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 */
         }
-      buf_len += ACE_OS::strlen (argv_p[i]);
+      else
+#endif /* ACE_LACKS_ENV */
+        buf_len += ACE_OS::strlen (argv[i]);
 
       // Add one for the extra space between each string.
       buf_len++;
@@ -146,27 +90,48 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv,
                   0);
 
   // Initial null charater to make it a null string.
-  buf[0] = ACE_LIB_TEXT ('\0');
+  buf[0] = '\0';
   ACE_TCHAR *end = buf;
+  int j;
 
-  for (int i = 0; i < argc; ++i)
+  for (j = 0; argv[j] != 0; j++)
     {
-      end = ACE_OS::strecpy (end, argv_p[i]);
-      if (argv_p[i] != argv[i])
-        ACE_OS::free (argv_p[i]);
+
+#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 */
+        }
+      else
+#endif /* ACE_LACKS_ENV */
+        end = ACE_OS::strecpy (end, argv[j]);
 
       // Replace the null char that strecpy put there with white
       // space.
-      end[-1] = ACE_LIB_TEXT (' ');
+      end[-1] = ' ';
     }
-  // Null terminate the string.
-  *end = ACE_LIB_TEXT ('\0');
-
-  if (argv_p != argv)
-    ACE_OS::free (argv_p);
 
+  // Null terminate the string.
+  *end = '\0';
   // The number of arguments.
-  return argc;
+  return j;
 }
 
 int
@@ -278,7 +243,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
 
 #   if defined (ACE_USES_WCHAR)
       // Wide-char builds need to convert the command-line args to
-      // narrow char strings for execv ().
+      // narrow char strings for execv().
       char **cargv = 0;
       int arg_count;
 #   endif /* ACE_HAS_WCHAR */
@@ -341,10 +306,9 @@ ACE_OS::num_processors (void)
   int num_processors;
   int mib[2] = { CTL_HW, HW_NCPU };
   size_t len = sizeof (num_processors);
-  if (::sysctl (mib, 2, &num_processors, &len, NULL, 0) != -1)
-    return num_processors;
-  else
-    return -1;
+
+  sysctl(mib, 2, &num_processors, &len, NULL, 0);
+  return num_processors;
 #else
   ACE_NOTSUP_RETURN (-1);
 #endif
@@ -367,10 +331,9 @@ ACE_OS::num_processors_online (void)
   int num_processors;
   int mib[2] = { CTL_HW, HW_NCPU };
   size_t len = sizeof (num_processors);
-  if (::sysctl (mib, 2, &num_processors, &len, NULL, 0) != -1)
-    return num_processors;
-  else
-    return -1;
+
+  sysctl(mib, 2, &num_processors, &len, NULL, 0);
+  return num_processors;
 #elif defined (__hpux)
   struct pst_dynamic psd;
   if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1)
@@ -397,7 +360,7 @@ ACE_OS::read_n (ACE_HANDLE handle,
        bytes_transferred += n)
     {
       n = ACE_OS::read (handle,
- (char *) buf + bytes_transferred,
+                        (char *) buf + bytes_transferred,
                         len - bytes_transferred);
 
       if (n == -1 || n == 0)
@@ -426,7 +389,7 @@ ACE_OS::pread (ACE_HANDLE handle,
                                                   FILE_CURRENT);
 
   if (original_low_position == INVALID_SET_FILE_POINTER
-      && GetLastError () != NO_ERROR)
+      && GetLastError() != NO_ERROR)
     return -1;
 
   // Go to the correct position
@@ -437,12 +400,12 @@ ACE_OS::pread (ACE_HANDLE handle,
                                              &high_offset,
                                              FILE_BEGIN);
   if (altered_position == INVALID_SET_FILE_POINTER
-      && GetLastError () != NO_ERROR)
+      && GetLastError() != NO_ERROR)
     return -1;
 
   DWORD bytes_read;
 
-#     if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#     if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
 
   OVERLAPPED overlapped;
   overlapped.Internal = 0;
@@ -473,7 +436,7 @@ ACE_OS::pread (ACE_HANDLE handle,
         }
     }
 
-#     else /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#     else /* ACE_HAS_WINNT4 && (ACE_HAS_WINNT4 != 0) */
 
   BOOL result = ::ReadFile (handle,
                             buf,
@@ -483,14 +446,14 @@ ACE_OS::pread (ACE_HANDLE handle,
   if (result == FALSE)
     return -1;
 
-#     endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#     endif /* ACE_HAS_WINNT4 && (ACE_HAS_WINNT4 != 0) */
 
   // Reset the original file pointer position
   if (::SetFilePointer (handle,
                         original_low_position,
                         &original_high_position,
                         FILE_BEGIN) == INVALID_SET_FILE_POINTER
-      && GetLastError () != NO_ERROR)
+      && GetLastError() != NO_ERROR)
     return -1;
 
   return (ssize_t) bytes_read;
@@ -521,9 +484,9 @@ ACE_OS::pread (ACE_HANDLE handle,
   if (altered_position == -1)
     return -1;
 
-  ssize_t const bytes_read = ACE_OS::read (handle,
-                                           buf,
-                                           nbytes);
+  ssize_t bytes_read = ACE_OS::read (handle,
+                                     buf,
+                                     nbytes);
 
   if (bytes_read == -1)
     return -1;
@@ -564,7 +527,7 @@ ACE_OS::pwrite (ACE_HANDLE handle,
   LARGE_INTEGER loffset;
   loffset.QuadPart = offset;
 
-#     if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#     if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
 
   OVERLAPPED overlapped;
   overlapped.Internal = 0;
@@ -592,7 +555,7 @@ ACE_OS::pwrite (ACE_HANDLE handle,
         return -1;
     }
 
-#     else /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#     else /* ACE_HAS_WINNT4 && (ACE_HAS_WINNT4 != 0) */
 
   // Go to the correct position
   if (! ::SetFilePointerEx (handle, loffset, 0, FILE_BEGIN))
@@ -609,7 +572,7 @@ ACE_OS::pwrite (ACE_HANDLE handle,
   if (result == FALSE)
     return -1;
 
-#     endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#     endif /* ACE_HAS_WINNT4 && (ACE_HAS_WINNT4 != 0) */
 
   // Reset the original file pointer position
   if (::SetFilePointer (handle,
@@ -679,11 +642,11 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
     {
       // Skip whitespace..
       while (ACE_OS::ace_isspace (*cp))
-        ++cp;
+        cp++;
 
       // Increment count and move to next whitespace..
       if (*cp != ACE_LIB_TEXT ('\0'))
-        ++argc;
+        argc++;
 
       while (*cp != ACE_LIB_TEXT ('\0') && !ACE_OS::ace_isspace (*cp))
         {
@@ -693,21 +656,20 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
               ACE_TCHAR quote = *cp;
 
               // Scan past the string..
-              for (++cp; *cp != ACE_LIB_TEXT ('\0')
-                   && (*cp != quote || cp[-1] == ACE_LIB_TEXT ('\\')); ++cp)
+              for (cp++; *cp != ACE_LIB_TEXT ('\0') && *cp != quote; cp++)
                 continue;
 
               // '\0' implies unmatched quote..
               if (*cp == ACE_LIB_TEXT ('\0'))
                 {
-                  --argc;
+                  argc--;
                   break;
                 }
               else
-                ++cp;
+                cp++;
             }
           else
-            ++cp;
+            cp++;
         }
     }
 
@@ -729,11 +691,11 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
 
   ACE_TCHAR *ptr = buf;
 
-  for (int i = 0; i < argc; ++i)
+  for (int i = 0; i < argc; i++)
     {
       // Skip whitespace..
       while (ACE_OS::ace_isspace (*ptr))
-        ++ptr;
+        ptr++;
 
       // Copy next argument and move to next whitespace..
       cp = argp;
@@ -742,15 +704,11 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
           {
             ACE_TCHAR quote = *ptr++;
 
-            while (*ptr != ACE_LIB_TEXT ('\0')
-                   && (*ptr != quote || ptr[-1] == ACE_LIB_TEXT ('\\')))
-              {
-                if (*ptr == quote && ptr[-1] == ACE_LIB_TEXT ('\\')) --cp;
-                *cp++ = *ptr++;
-              }
+            while (*ptr != ACE_LIB_TEXT ('\0') && *ptr != quote)
+              *cp++ = *ptr++;
 
             if (*ptr == quote)
-              ++ptr;
+              ptr++;
           }
         else
           *cp++ = *ptr++;
@@ -760,7 +718,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
 #if !defined (ACE_LACKS_ENV)
       // Check for environment variable substitution here.
       if (substitute_env_args) {
-          argv[i] = ACE_OS::strenvdup (argp);
+          argv[i] = ACE_OS::strenvdup(argp);
 
           if (argv[i] == 0)
             {
@@ -773,7 +731,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
       else
 #endif /* ACE_LACKS_ENV */
         {
-          argv[i] = ACE_OS::strdup (argp);
+          argv[i] = ACE_OS::strdup(argp);
 
           if (argv[i] == 0)
             {
@@ -810,7 +768,7 @@ ACE_OS::write_n (ACE_HANDLE handle,
        bytes_transferred += n)
     {
       n = ACE_OS::write (handle,
- (char *) buf + bytes_transferred,
+                         (char *) buf + bytes_transferred,
                          len - bytes_transferred);
 
       if (n == -1 || n == 0)
diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h
index f076594de80..3f51db36c3f 100644
--- a/ACE/ace/OS_NS_unistd.h
+++ b/ACE/ace/OS_NS_unistd.h
@@ -64,8 +64,7 @@ namespace ACE_OS
   extern ACE_Export
   int argv_to_string (ACE_TCHAR **argv,
                       ACE_TCHAR *&buf,
-                      bool substitute_env_args = true,
-                      bool quote_args = false);
+                      bool substitute_env_args = true);
 
 #if !defined (ACE_LACKS_CHDIR)
   ACE_NAMESPACE_INLINE_FUNCTION
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index 5883dc4cf6f..35aedac07ec 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -21,7 +21,7 @@
 
 #if defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
 #  include "ace/os_include/os_unistd.h"
-#  if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640))
+#  if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630))
 #    if defined (__RTP__)
 #      include "ace/os_include/os_strings.h"
 #    else
diff --git a/ACE/ace/OS_TLI.h b/ACE/ace/OS_TLI.h
index cc686df968b..4744c2b8536 100644
--- a/ACE/ace/OS_TLI.h
+++ b/ACE/ace/OS_TLI.h
@@ -160,7 +160,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Also see ChangeLog entries:
 // Mon Jan 23 16:35:40 UTC 2006  Steve Huston  <shuston@riverace.com>
 // Mon Jan 23 22:08:56 UTC 2006  Steve Huston  <shuston@riverace.com>
-#if defined (__HP_aCC) && (__HP_aCC <= 37300)
+#if defined (__HP_aCC) && (__HP_aCC <= 36500)
 typedef extern "C" struct t_optmgmt  ACE_TOPTMGMT;
 typedef extern "C" struct t_bind  ACE_TBIND;
 #else
diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp
index d79791311f2..0f5b350bcef 100644
--- a/ACE/ace/Object_Manager_Base.cpp
+++ b/ACE/ace/Object_Manager_Base.cpp
@@ -407,7 +407,7 @@ ACE_OS_Object_Manager::print_error_message (unsigned int line_number,
 {
   // To avoid duplication of these const strings in OS.o.
 #if !defined (ACE_HAS_WINCE)
-  fprintf (stderr, "ace/Object_Manager_Base.cpp, line %u: %s ",
+  fprintf (stderr, "ace/OS.cpp, line %u: %s ",
            line_number,
            ACE_TEXT_ALWAYS_CHAR (message));
   perror ("failed");
diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h
index 243fddc990f..97f5120d0ae 100644
--- a/ACE/ace/POSIX_Asynch_IO.h
+++ b/ACE/ace/POSIX_Asynch_IO.h
@@ -71,11 +71,12 @@ public:
    * This is the ACT associated with the handle on which the
    * Asynch_Operation takes place.
    *
-   * @note This is not implemented for POSIX4 platforms.
+   * @@ This is not implemented for POSIX4 platforms.
+   *
    */
   const void *completion_key (void) const;
 
-  /// Error value if the operation fails.
+  /// Error value if the operation fail.
   u_long error (void) const;
 
   /// This returns ACE_INVALID_HANDLE on POSIX4 platforms.
diff --git a/ACE/ace/POSIX_CB_Proactor.h b/ACE/ace/POSIX_CB_Proactor.h
index 2b844c180a8..0daea7aea41 100644
--- a/ACE/ace/POSIX_CB_Proactor.h
+++ b/ACE/ace/POSIX_CB_Proactor.h
@@ -27,7 +27,7 @@
 
 #include "ace/POSIX_Proactor.h"
 
-#if defined (ACE_LACKS_SIGVAL_T)
+#if defined(AIX) || defined(sun) || defined(__APPLE__) || defined (ACE_VXWORKS)
 typedef union sigval sigval_t;
 #endif
 
@@ -83,13 +83,13 @@ protected:
   virtual int notify_completion (int sig_num);
 
   /**
-   * Dispatch a single set of events.  If @a milli_seconds elapses
+   * Dispatch a single set of events.  If <milli_seconds> elapses
    * before any events occur, return 0. Return 1 if a completion is
    * dispatched. Return -1 on errors.
    */
   int handle_events_i (u_long milli_seconds);
 
-  /// Semaphore variable to notify
+  /// semaphore variable to notify
   /// used to wait the first AIO start
   ACE_SYNCH_SEMAPHORE sema_;
 };
diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp
index 395f5a08a32..1664200ecf6 100644
--- a/ACE/ace/POSIX_Proactor.cpp
+++ b/ACE/ace/POSIX_Proactor.cpp
@@ -1720,7 +1720,7 @@ int
 ACE_POSIX_SIG_Proactor::notify_completion (int sig_num)
 {
   // Get this process id.
-  pid_t const pid = ACE_OS::getpid ();
+  pid_t pid = ACE_OS::getpid ();
   if (pid == (pid_t) -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Error:%N:%l(%P | %t):%p",
@@ -1729,11 +1729,11 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num)
 
   // Set the signal information.
   sigval value;
-#if defined (ACE_HAS_SIGVAL_SIGVAL_INT)
+#if defined (__FreeBSD__)
   value.sigval_int = -1;
 #else
   value.sival_int = -1;
-#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */
+#endif /* __FreeBSD__ */
 
   // Queue the signal.
   if (sigqueue (pid, sig_num, value) == 0)
@@ -1870,11 +1870,11 @@ ACE_POSIX_SIG_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result)
   // store index!!, not pointer in signal info
   result->aio_sigevent.sigev_notify = SIGEV_SIGNAL;
   result->aio_sigevent.sigev_signo = result->signal_number ();
-#if defined (ACE_HAS_SIGVAL_SIGVAL_INT)
+#if defined (__FreeBSD__)
   result->aio_sigevent.sigev_value.sigval_int = static_cast<int> (i);
 #else
   result->aio_sigevent.sigev_value.sival_int = static_cast<int> (i);
-#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */
+#endif /* __FreeBSD__ */
 
   return static_cast<ssize_t> (i);
 }
@@ -1922,11 +1922,11 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout)
       flg_aio = 1;  // AIO signal received
       // define index to start
       // nothing will happen if it contains garbage
-#if defined (ACE_HAS_SIGVAL_SIGVAL_INT)
+#if defined (__FreeBSD__)
       index = static_cast<size_t> (sig_info.si_value.sigval_int);
 #else
       index = static_cast<size_t> (sig_info.si_value.sival_int);
-#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */
+#endif
       // Assume we have a correctly-functioning implementation, and that
       // there is one I/O to process, and it's correctly specified in the
       // siginfo received. There are, however, some special situations
diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h
index 82489dd66ff..2accb9fe4b1 100644
--- a/ACE/ace/POSIX_Proactor.h
+++ b/ACE/ace/POSIX_Proactor.h
@@ -523,7 +523,7 @@ public:
    */
   ACE_POSIX_SIG_Proactor (size_t nmaxop = ACE_AIO_DEFAULT_SIZE);
 
-  virtual Proactor_Type get_impl_type (void);
+  virtual Proactor_Type  get_impl_type (void);
 
   /**
    * This constructor should be used to tell the Proactor to mask and
diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp
index fcad91bfe93..125dd041f9e 100644
--- a/ACE/ace/Pagefile_Memory_Pool.cpp
+++ b/ACE/ace/Pagefile_Memory_Pool.cpp
@@ -229,7 +229,7 @@ ACE_Pagefile_Memory_Pool::map (int &first_time,
   // Create file mapping, if not yet done
   if (object_handle_ == 0)
     {
-#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
       // Allow access by all users.
       SECURITY_ATTRIBUTES sa;
       SECURITY_DESCRIPTOR sd;
@@ -242,7 +242,7 @@ ACE_Pagefile_Memory_Pool::map (int &first_time,
       sa.nLength = sizeof (SECURITY_ATTRIBUTES);
       sa.lpSecurityDescriptor = &sd;
       sa.bInheritHandle = FALSE;
-#endif /* ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
       // Get an object handle to the named reserved memory object.
       DWORD size_high;
@@ -257,11 +257,11 @@ ACE_Pagefile_Memory_Pool::map (int &first_time,
 
       object_handle_ =
         ACE_TEXT_CreateFileMapping (INVALID_HANDLE_VALUE,
-#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
                                     &sa,
 #else
                                     0,
-#endif /* !ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
                                     PAGE_READWRITE | SEC_RESERVE,
                                     size_high,
                                     size_low,
diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp
index 110e52f4673..42a7123dc76 100644
--- a/ACE/ace/Parse_Node.cpp
+++ b/ACE/ace/Parse_Node.cpp
@@ -669,8 +669,6 @@ ACE_Dummy_Node::apply (ACE_Service_Gestalt *, int &yyerrno)
                 ACE_LIB_TEXT ("did operations on stream %s, error = %d\n"),
                 this->name (),
                 yyerrno));
-#else
-  ACE_UNUSED_ARG (yyerrno);
 #endif /* ACE_NLOGGING */
 }
 
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index 481c7eef5b5..1a7106ad0af 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/config-lite.h"
 #include "ace/Proactor.h"
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
 
 // This only works on Win32 platforms and on Unix platforms with aio
 // calls.
@@ -1174,4 +1174,4 @@ ACE_Proactor::event_loop_done (void)
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h
index bcea10ec0fa..cff212a4f39 100644
--- a/ACE/ace/Proactor.h
+++ b/ACE/ace/Proactor.h
@@ -25,7 +25,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
@@ -684,7 +684,7 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Proactor_Impl.cpp b/ACE/ace/Proactor_Impl.cpp
index fe08453778e..0ab848c5920 100644
--- a/ACE/ace/Proactor_Impl.cpp
+++ b/ACE/ace/Proactor_Impl.cpp
@@ -6,8 +6,8 @@ ACE_RCSID (ace,
            Proactor_Impl,
            "$Id$")
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
-// This only works on standard Win32 platforms and on Unix platforms supporting
+#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+// This only works on Win32 platforms and on Unix platforms supporting
 // aio calls.
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Proactor_Impl.h b/ACE/ace/Proactor_Impl.h
index 607fbd0af09..0081010d8e6 100644
--- a/ACE/ace/Proactor_Impl.h
+++ b/ACE/ace/Proactor_Impl.h
@@ -18,8 +18,8 @@
 
 #include /**/ "ace/config-all.h"
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
-// This only works on standard Win32 platforms and on Unix platforms supporting
+#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+// This only works on Win32 platforms and on Unix platforms supporting
 // aio calls.
 
 #include "ace/Asynch_IO.h"
@@ -260,6 +260,6 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif /* (ACE_WIN32 && ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */
 #include /**/ "ace/post.h"
 #endif /* ACE_PROACTOR_IMPL_H */
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index b79fbcbd0f9..70b95d500e3 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -18,7 +18,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_Memory.h"
 #include "ace/Countdown_Time.h"
-#include "ace/Truncate.h"
 
 #if defined (ACE_VXWORKS) && (ACE_VXWORKS > 0x600) && defined (__RTP__)
 # include <rtpLib.h>
@@ -842,72 +841,29 @@ int
 ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
                              const ACE_TCHAR *format, ...)
 {
-  // To address the potential buffer overflow,
-  // we now allocate the buffer on heap with a variable size.
-  size_t const buflen = ACE_OS::strlen (variable_name) + ACE_OS::strlen (format) + 2;
-  ACE_TCHAR *newformat = 0;
-  ACE_NEW_RETURN (newformat, ACE_TCHAR[buflen], -1);
-  ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_newformat (newformat);
+  ACE_TCHAR newformat[DEFAULT_COMMAND_LINE_BUF_LEN];
 
   // Add in the variable name.
-  ACE_OS::sprintf (safe_newformat.get (),
+  ACE_OS::sprintf (newformat,
                    ACE_LIB_TEXT ("%s=%s"),
                    variable_name,
                    format);
 
+  ACE_TCHAR stack_buf[DEFAULT_COMMAND_LINE_BUF_LEN];
+
   // Start varargs.
   va_list argp;
   va_start (argp, format);
 
   // Add the rest of the varargs.
-  size_t tmp_buflen = DEFAULT_COMMAND_LINE_BUF_LEN > buflen 
-                      ? static_cast<size_t> (DEFAULT_COMMAND_LINE_BUF_LEN) : buflen;
-  int retval = 0;
-
-  ACE_TCHAR *stack_buf = 0;
-  ACE_NEW_RETURN (stack_buf, ACE_TCHAR[tmp_buflen], -1);
-  ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_stack_buf (stack_buf);
-
-  do 
-    {
-      retval = ACE_OS::vsnprintf (safe_stack_buf.get (), tmp_buflen, safe_newformat.get (), argp);
-      if (retval > ACE_Utils::Truncate<int> (tmp_buflen))
-        {
-          tmp_buflen *= 2;
-          ACE_NEW_RETURN (stack_buf, ACE_TCHAR[tmp_buflen], -1);
-          safe_stack_buf.reset (stack_buf);
-        }
-      else
-        break;
-    }
-  while (1);
-
-  if (retval == -1)
-    {
-      // In case that vsnprintf is not supported,
-      // e.g., LynxOS and VxWorks 5, we have to
-      // fall back to vsprintf.
-      if (errno == ENOTSUP)
-        { 
-          // ALERT: Since we have to use vsprintf here, there is still a chance that
-          // the stack_buf overflows, i.e., the length of the resulting string
-          // can still possibly go beyond the allocated stack_buf.
-          retval = ACE_OS::vsprintf (safe_stack_buf.get (), safe_newformat.get (), argp);
-          if (retval == -1)
-            // vsprintf is failed.
-            return -1;
-        }
-      else
-        // vsnprintf is failed.
-        return -1;
-    }
+  ACE_OS::vsprintf (stack_buf, newformat, argp);
 
   // End varargs.
   va_end (argp);
 
   // Append the string to our environment buffer.
-  if (this->setenv_i (safe_stack_buf.get (),
-                      ACE_OS::strlen (safe_stack_buf.get ())) == -1)
+  if (this->setenv_i (stack_buf,
+                      ACE_OS::strlen (stack_buf)) == -1)
     return -1;
 
 #if defined (ACE_WIN32)
@@ -923,7 +879,7 @@ ACE_Process_Options::setenv_i (ACE_TCHAR *assignment,
                                size_t len)
 {
   // Add one for the null char.
-  ++len;
+  len++;
 
   // If environment larger than allocated buffer return. Also check to
   // make sure we have enough room.
@@ -1066,7 +1022,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...)
   if (command_line_buf_len_ < 1)
     return -1;
 
-#if !defined (ACE_LACKS_VSNPRINTF)
+#if defined (ACE_HAS_SNPRINTF)
   // sprintf the format and args into command_line_buf__.
   ACE_OS::vsnprintf (command_line_buf_,
                      command_line_buf_len_ - 1,
diff --git a/ACE/ace/QoS/Makefile.am b/ACE/ace/QoS/Makefile.am
index c48750d77a7..22ff2031cba 100644
--- a/ACE/ace/QoS/Makefile.am
+++ b/ACE/ace/QoS/Makefile.am
@@ -57,7 +57,7 @@ CLEANFILES = \
   ACE_QoS.pc
 
 ACE_QoS.pc: ${top_builddir}/config.status ${srcdir}/ACE_QoS.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ACE_QoS.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE_QoS.pc.in
 
 endif BUILD_QOS
 
diff --git a/ACE/ace/QoS/qos.mpc b/ACE/ace/QoS/qos.mpc
index bb916932991..cf50f96b557 100644
--- a/ACE/ace/QoS/qos.mpc
+++ b/ACE/ace/QoS/qos.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project(QoS) : acelib, install {
+project(QoS) : acelib, core {
   requires    += qos
   sharedname   = ACE_QoS
   dynamicflags = ACE_QoS_BUILD_DLL
diff --git a/ACE/ace/QtReactor.cpp b/ACE/ace/QtReactor.cpp
new file mode 100644
index 00000000000..a6983ab9463
--- /dev/null
+++ b/ACE/ace/QtReactor.cpp
@@ -0,0 +1,629 @@
+//$Id$
+
+#include "ace/QtReactor.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
+
+// Must be called with lock held
+
+ACE_QtReactor::ACE_QtReactor (QApplication *qapp ,
+    ACE_Sig_Handler *sh,
+    ACE_Timer_Queue *tq,
+    int disable_notify_pipe,
+    ACE_Reactor_Notify *notify,
+    int mask_signals,
+    int s_queue ):
+    ACE_Select_Reactor( sh, tq, disable_notify_pipe,
+        notify, mask_signals, s_queue),
+    qapp_(qapp),
+    qtime_ (0)
+{
+    reopen_notification_pipe();
+}
+
+// Must be called with lock held
+ACE_QtReactor::ACE_QtReactor (size_t size,
+    QApplication *qapp,
+    int restart,
+    ACE_Sig_Handler *sh,
+    ACE_Timer_Queue *tq,
+    int disable_notify_pipe,
+    ACE_Reactor_Notify *notify,
+    int mask_signals,
+    int s_queue):
+    ACE_Select_Reactor( size, restart, sh, tq,
+        disable_notify_pipe, notify, mask_signals,
+        s_queue ),
+    qapp_(qapp),
+    qtime_ (0)
+
+{
+    reopen_notification_pipe();
+}
+
+void ACE_QtReactor::reopen_notification_pipe( void)
+{
+  // When the ACE_Select_Reactor is constructed it creates the notify
+  // pipe and registers it with the register_handler_i() method. The
+  // QtReactor overloads this method BUT because the
+  // register_handler_i occurs when constructing the base class
+  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
+  // is called not the QtReactor register_handler_i().  This means
+  // that the notify pipe is registered with the ACE_Select_Reactor
+  // event handling code not the QtReactor and so notfications don't
+  // work.  To get around this we simply close and re-opened the
+  // notification handler in the constructor of the QtReactor.
+
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+    if ( initialized_ )
+    {
+        this->notify_handler_->close ();
+
+        // Patch for MS Windows: close and open doesn't clear the read
+        // fd_set, so reset it manually
+        this->wait_set_.rd_mask_.reset ();
+
+        this->notify_handler_->open (this, 0);
+    }
+#endif /* ACE_MT_SAFE */
+}
+
+ACE_QtReactor::~ACE_QtReactor (void)
+{
+    // iterate over QSocketNotifiers for read and release them
+    MAP::ITERATOR iter = this->read_notifier_.begin ();
+    MAP::ITERATOR iterEnd = this->read_notifier_.end ();
+    while( iter != iterEnd )
+    {
+        MAP::ENTRY &entry = *iter;
+        // QOBject destructor notifies qapplication (hopefully) on delete
+        delete entry.int_id_;
+        ++iter;
+    }
+
+    // iterate over QSocketNotifiers for write and release them
+    this->write_notifier_.begin ();
+    this->write_notifier_.end ();
+    while( iter != iterEnd )
+    {
+        MAP::ENTRY &entry = *iter;
+        // QOBject destructor notifies qapplication (hopefully) on delete
+        delete entry.int_id_;
+        ++iter;
+    }
+
+    // iterate over QSocketNotifiers for exceptions and release them
+    this->exception_notifier_.begin ();
+    this->exception_notifier_.end ();
+    while( iter != iterEnd )
+    {
+        MAP::ENTRY &entry = *iter;
+        // QOBject destructor notifies qapplication (hopefully) on delete
+        delete entry.int_id_;
+        ++iter;
+    }
+
+    // QOBject destructor notifies qapplication (hopefully) on delete
+    delete qtime_;
+}
+
+void
+ACE_QtReactor::qapplication (QApplication *qapp)
+{
+  // reparent QSocketNotifiers and QTimer
+  qapp_ = qapp ;
+}
+
+void
+ACE_QtReactor::timeout_event (void)
+{
+  // Deal with any timer events
+  ACE_Select_Reactor_Handle_Set handle_set;
+  this->dispatch (0, handle_set );
+
+  // Set next timeout signal
+  this->reset_timeout ();
+}
+
+void
+ACE_QtReactor::read_event (int p_handle)
+{
+  ACE_TRACE ("ACE_QtReactor::read_event");
+
+  ACE_HANDLE handle = ACE_HANDLE( p_handle );
+
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
+  // disable socket notifier to clear pending events
+  QSocketNotifier *qsock_notifier = 0;
+  if ( ( this->read_notifier_.find( handle,
+             qsock_notifier) != -1) )
+    qsock_notifier->setEnabled( false );
+#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
+
+  // The core of read event handling
+  ACE_Select_Reactor_Handle_Set dispatch_set;
+
+  dispatch_set.rd_mask_.set_bit ( handle );
+  this->dispatch (1, dispatch_set);
+
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
+  // enable socket notifier according to current mask
+  ACE_Reactor_Mask mask = 0;
+  mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
+  if ( -1 != mask )
+        set_enable_flag_by_mask ( 1, handle, mask);
+#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
+}
+
+void
+ACE_QtReactor::write_event (int p_handle)
+{
+  ACE_TRACE ("ACE_QtReactor::write_event");
+
+  ACE_HANDLE handle = ACE_HANDLE( p_handle );
+
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
+  // disable socket notifier to clear pending events
+  QSocketNotifier *qsock_notifier = 0;
+  if ( ( this->write_notifier_.find( handle, qsock_notifier) != -1) )
+    qsock_notifier->setEnabled( false );
+#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
+
+  // The core of write event handling
+  ACE_Select_Reactor_Handle_Set dispatch_set;
+
+  dispatch_set.wr_mask_.set_bit( handle );
+  this->dispatch (1, dispatch_set);
+
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
+  // enable socket notifier according to current mask
+  ACE_Reactor_Mask mask = 0;
+  mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
+  if ( -1 != mask )
+        set_enable_flag_by_mask ( 1, handle, mask);
+#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
+}
+
+void
+ACE_QtReactor::exception_event (int p_handle)
+{
+  ACE_TRACE ("ACE_QtReactor::exception_event");
+
+  ACE_HANDLE handle = ACE_HANDLE( p_handle );
+
+
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
+  // disable socket notifier to clear pending events
+  QSocketNotifier *qsock_notifier = 0;
+  if ( ( this->exception_notifier_.find( handle, qsock_notifier) != -1) )
+    qsock_notifier->setEnabled( false );
+#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
+
+  // The core of exception event handling
+  ACE_Select_Reactor_Handle_Set dispatch_set;
+
+  dispatch_set.ex_mask_.set_bit( handle );
+  dispatch (1, dispatch_set);
+
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
+  // enable socket notifier according to current mask
+  ACE_Reactor_Mask mask = 0;
+  mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
+  if ( -1 != mask )
+        set_enable_flag_by_mask ( 1, handle, mask);
+#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
+}
+
+int
+ACE_QtReactor::set_enable_flag_by_mask (int flag_value,
+                                        ACE_HANDLE handle,
+                                        ACE_Reactor_Mask mask)
+{
+  QSocketNotifier *qs_not;
+
+  if (ACE_BIT_ENABLED(mask, ACE_Event_Handler::READ_MASK) ||
+      ACE_BIT_ENABLED( mask, ACE_Event_Handler::ACCEPT_MASK))
+    {
+      // Find the current notifier
+      qs_not = 0;
+      if ((this->read_notifier_.find (handle, qs_not) == -1))
+        return -1;
+
+      qs_not->setEnabled (flag_value);
+    }
+
+  if (ACE_BIT_ENABLED( mask, ACE_Event_Handler::WRITE_MASK) ||
+      ACE_BIT_ENABLED( mask, ACE_Event_Handler::ACCEPT_MASK) ||
+      ACE_BIT_ENABLED( mask, ACE_Event_Handler::CONNECT_MASK))
+    {
+      qs_not = 0;
+      if ((this->write_notifier_.find (handle, qs_not) == -1))
+        return -1;
+
+      qs_not->setEnabled (flag_value);
+    }
+
+  if (ACE_BIT_ENABLED( mask,
+                       ACE_Event_Handler::EXCEPT_MASK))
+    {
+      qs_not = 0;
+      if ((this->exception_notifier_.find (handle, qs_not) == -1))
+        return -1;
+
+      qs_not->setEnabled (flag_value);
+    }
+
+  return 0;
+}
+
+int
+ACE_QtReactor::bit_ops (ACE_HANDLE handle,
+                        ACE_Reactor_Mask mask,
+                        ACE_Select_Reactor_Handle_Set &handle_set,
+                        int ops)
+{
+  int result;
+  ACE_Select_Reactor_Handle_Set preserved_handle_set = handle_set;
+
+  // Call regular bit_ops
+  if ((result = ACE_Select_Reactor::bit_ops (handle, mask, handle_set, ops)) == -1)
+    return -1;
+
+  // disable or enable the notifiers based on handle_set and mask
+  int enableFlag = -1;
+  if (&handle_set == &this->suspend_set_)
+    enableFlag = 0;
+  else if (&handle_set == &this->wait_set_)
+    enableFlag = 1;
+  else
+    // We have no work to do here, so just return
+    return result;
+
+  switch (ops)
+    {
+    case ACE_Reactor::SET_MASK:
+    case ACE_Reactor::ADD_MASK:
+      // Enable or disable notifiers based on the specified masks
+      if (this->set_enable_flag_by_mask (enableFlag, handle, mask) == -1)
+        {
+          // We can't just return -1 here because we'll have half-changed things.
+          // So, we need to restore the old handle_set, then return -1.
+          handle_set = preserved_handle_set;
+          return -1;
+        }
+      break;
+
+    case ACE_Reactor::CLR_MASK:
+      if (this->set_enable_flag_by_mask (!enableFlag, handle, mask) == -1)
+        {
+          handle_set = preserved_handle_set;
+          return -1;
+        }
+      break;
+
+    default:
+      // we take no action for any other operations
+      break;
+    }
+
+  return result;
+}
+
+void
+ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle)
+{
+    QSocketNotifier *qsock_notifier = 0;
+
+    // if there is already a read socket notifier for this handle, do nothing
+    // otherwise create read notifier
+    if ( ( this->read_notifier_.find (handle,
+               qsock_notifier) == -1) )
+    {
+        ACE_NEW (qsock_notifier,
+            QSocketNotifier (int(handle), QSocketNotifier::Read, this));
+        this->read_notifier_.bind (handle,
+            qsock_notifier);
+        QObject::connect (qsock_notifier,
+            SIGNAL (activated (int)),
+            this,
+            SLOT (read_event (int))) ;
+        // disable; it will be enabled by the regular register_handler_i if
+        // necessary
+        qsock_notifier->setEnabled (0);
+    }
+
+    qsock_notifier = 0;
+
+
+    // if there is already a write socket notifier for this handle, do nothing
+    // otherwise create read notifier
+    if ((this->write_notifier_.find (handle,
+             qsock_notifier) == -1))
+    {
+        ACE_NEW (qsock_notifier,
+            QSocketNotifier (int(handle), QSocketNotifier::Write, this));
+
+        this->write_notifier_.bind (handle,
+            qsock_notifier);
+
+        QObject::connect (qsock_notifier,
+            SIGNAL (activated (int)),
+            this,
+            SLOT (write_event (int)));
+        // disable; it will be enabled by the regular register_handler_i if
+        // necessary
+        qsock_notifier->setEnabled (0);
+    }
+
+
+    qsock_notifier = 0;
+
+    // if there is already a write socket notifier for this handle, do nothing
+    // otherwise create read notifier
+    if ((this->exception_notifier_.find (handle,
+             qsock_notifier) == -1))
+    {
+
+        ACE_NEW (qsock_notifier,
+            QSocketNotifier (int(handle), QSocketNotifier::Exception, this));
+
+        this->exception_notifier_.bind (handle,
+            qsock_notifier);
+
+        QObject::connect (qsock_notifier,
+            SIGNAL (activated (int)),
+            this,
+            SLOT (exception_event (int))) ;
+        // disable; it will be enabled by the regular register_handler_i if
+        // necessary
+        qsock_notifier->setEnabled (0);
+    }
+}
+
+void
+ACE_QtReactor::destroy_notifiers_for_handle (ACE_HANDLE handle)
+{
+  QSocketNotifier *qsock_notifier = 0;
+
+  // Looks for the handle in the maps and removes them.
+
+  if ((this->read_notifier_.find (handle,
+                                  qsock_notifier) != -1))
+    {
+      this->read_notifier_.unbind (handle,
+                                   qsock_notifier);
+      delete qsock_notifier;
+    }
+
+  if ((this->write_notifier_.find (handle,
+                                   qsock_notifier) != -1))
+    {
+      this->write_notifier_.unbind (handle,
+                                    qsock_notifier);
+      delete qsock_notifier;
+    }
+
+
+  if ((this->exception_notifier_.find (handle,
+                                       qsock_notifier) != -1))
+    {
+      this->exception_notifier_.unbind (handle,
+                                        qsock_notifier);
+      delete qsock_notifier;
+    }
+}
+
+int
+ACE_QtReactor::register_handler_i (ACE_HANDLE handle ,
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
+{
+  ACE_TRACE ("ACE_QtReactor::register_handler_i");
+
+  this->create_notifiers_for_handle (handle);
+
+  int result;
+  if ((result = ACE_Select_Reactor::register_handler_i(handle,
+                                                       handler,
+                                                       mask ))
+      == -1)
+    {
+        // destroy notifiers only when there is no handler for handle
+        if ( !ACE_Select_Reactor::find_handler( handle ) )
+            this->destroy_notifiers_for_handle (handle);
+      return -1;
+    }
+
+  return 0;
+}
+
+int
+ACE_QtReactor::register_handler_i (const ACE_Handle_Set &handles,
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
+{
+  return ACE_Select_Reactor::register_handler_i(handles,
+                                                handler,
+                                                mask);
+}
+
+int ACE_QtReactor::remove_handler_i (ACE_HANDLE handle ,
+                                     ACE_Reactor_Mask mask   )
+{
+  ACE_TRACE ("ACE_QtReactor::remove_handler_i");
+
+  int result = ACE_Select_Reactor::remove_handler_i (handle, mask);
+  // destroy notifiers only when there is no handler for handle
+  if ( !ACE_Select_Reactor::find_handler( handle ) )
+      this->destroy_notifiers_for_handle (handle);
+  return result;
+}
+
+
+int
+ACE_QtReactor::remove_handler_i (const ACE_Handle_Set &handles,
+                                 ACE_Reactor_Mask  mask)
+{
+  return ACE_Select_Reactor::remove_handler_i (handles,
+                                               mask);
+}
+
+// The following functions ensure that there is an Qt timeout for the
+// first timeout in the Reactor's Timer_Queue.
+
+void
+ACE_QtReactor::reset_timeout (void)
+{
+  if (this->qtime_ != 0)
+    {
+      delete this->qtime_;
+      this->qtime_ = 0;
+    }
+
+  ACE_Time_Value *max_wait_time =
+    this->timer_queue_->calculate_timeout (0) ;
+
+  if (max_wait_time)
+  {
+    ACE_NEW (this->qtime_,
+             QTimer);
+
+    QObject::connect (qtime_,
+                      SIGNAL (timeout ()),
+                      this,
+                      SLOT (timeout_event ()));
+
+    qtime_->start(max_wait_time->msec(), 1);
+  }
+
+}
+
+
+long
+ACE_QtReactor::schedule_timer (ACE_Event_Handler *handler,
+                               const void *arg,
+                               const ACE_Time_Value &delay_time,
+                               const ACE_Time_Value &interval)
+{
+  ACE_TRACE ("ACE_QtReactor::schedule_timer");
+  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token,
+                            ace_mon,
+                            this->token_,
+                            -1));
+
+  long result;
+  if ((result = ACE_Select_Reactor::schedule_timer(handler,
+                                                   arg,
+                                                   delay_time,
+                                                   interval)) == -1 )
+    return -1;
+  else
+  {
+    this->reset_timeout ();
+    return result;
+  }
+}
+
+int
+ACE_QtReactor::cancel_timer (ACE_Event_Handler *handler,
+                             int dont_call_handle_close)
+{
+  ACE_TRACE ("ACE_QtReactor::cancel_timer");
+
+  if (ACE_Select_Reactor::cancel_timer (handler,
+                                        dont_call_handle_close ) == -1 )
+    return -1 ;
+  else
+  {
+    this->reset_timeout( ) ;
+    return 0 ;
+  }
+}
+
+int ACE_QtReactor::cancel_timer (long  timer_id,
+                                 const void **arg,
+                                 int dont_call_handle_close )
+{
+  ACE_TRACE ("ACE_QtReactor::cancel_timer") ;
+
+  if (ACE_Select_Reactor::cancel_timer (timer_id,
+                                        arg,
+                                        dont_call_handle_close ) == -1 )
+    return -1 ;
+  else
+  {
+    this->reset_timeout( ) ;
+    return 0 ;
+  }
+}
+
+// mbrudka: who needs QtWaitForMultipleEvents? It seems it's cargo load now!
+int
+ACE_QtReactor::QtWaitForMultipleEvents (int width,
+                                        ACE_Select_Reactor_Handle_Set &wait_set,
+                                        ACE_Time_Value * /*max_wait_time*/)
+{
+  // Check to make sure our handle's are all usable.
+  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
+
+  if (ACE_OS::select (width,
+                      temp_set.rd_mask_,
+                      temp_set.wr_mask_,
+                      temp_set.ex_mask_,
+                      (ACE_Time_Value *) &ACE_Time_Value::zero ) == -1)
+    return -1; // Bad file arguments...
+
+  // Qt processing.
+  this->qapp_->processOneEvent ();
+
+  // Reset the width, in case it changed during the upcalls.
+  width = handler_rep_.max_handlep1 ();
+
+  // Now actually read the result needed by the <Select_Reactor> using
+  // <select>.
+  return ACE_OS::select(width,
+                        wait_set.rd_mask_,
+                        wait_set.wr_mask_,
+                        wait_set.ex_mask_,
+                        (ACE_Time_Value *) &ACE_Time_Value::zero);
+}
+
+// mbrudka: who needs wait_for_multiple_events? It seems it's cargo load now!
+int
+ACE_QtReactor::wait_for_multiple_events (
+  ACE_Select_Reactor_Handle_Set &handle_set,
+  ACE_Time_Value *max_wait_time)
+{
+  ACE_TRACE ("ACE_QtReactor::wait_for_multiple_events");
+
+  int nfound = 0;
+  do
+  {
+    max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
+    size_t width = this->handler_rep_.max_handlep1 ();
+    handle_set.rd_mask_ = this->wait_set_.rd_mask_;
+    handle_set.wr_mask_ = this->wait_set_.wr_mask_;
+    handle_set.ex_mask_ = this->wait_set_.ex_mask_;
+
+    nfound = QtWaitForMultipleEvents (width,
+                                      handle_set,
+                                      max_wait_time);
+
+  } while( nfound == -1 && this->handle_error () > 0 );
+
+  if (nfound > 0)
+  {
+#if !defined (ACE_WIN32)
+    handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
+    handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
+    handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
+#endif /* ACE_WIN32 */
+  }
+
+  return nfound;
+  // Timed out or input available
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/QtReactor.h b/ACE/ace/QtReactor.h
new file mode 100644
index 00000000000..c3ccb82f7f3
--- /dev/null
+++ b/ACE/ace/QtReactor.h
@@ -0,0 +1,222 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    QtReactor.h
+ *
+ *  $Id$
+ *
+ *  @author Hamish Friedlander <ullexco@wave.co.nz>
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef ACE_QTREACTOR_H
+#define ACE_QTREACTOR_H
+
+#include /**/ "ace/pre.h"
+
+#include "ace/ACE_QtReactor_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Select_Reactor.h"
+#include "ace/Map_Manager.h"
+
+// QT toolkit specific includes.
+#include /**/ <qapplication.h>
+#include /**/ <qobject.h>
+#include /**/ <qsocketnotifier.h>
+#include /**/ <qtimer.h>
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class ACE_QtReactor
+ *
+ * @brief An object-oriented event demultiplexor and event handler
+ * dispatcher that uses the Qt Library. This class declaration
+ * also uses the extension facilities  provided by the Qt. So,
+ * readers  of the class declaration should not be upset with
+ * the appearence of the Keywords like Q_OBJECT, private slots
+ * etc. They are specific to Qt which uses these as a call back
+ * methods implementation mechanism.
+ *
+ * \note Marek Brudka <mbrudka@elka.pw.edu.pl>: ACE_QtReactor was
+ * quickly bugfixed to meet ACE 5.4.2 (6.0.0?) deadline.
+ * While it passes QtReactor_Test now, there is a great
+ * room for improvements as the implementation is rather inefficient
+ * and obfuscated
+ * To be more specific:
+ * - reset_timeout always creates and removes qtimer after each
+ * timeout event! Obviously, for fast triggering timers this may
+ * lead to excessive memory management.
+ * - create/destroy_notifiers_for_handle may also be reworked to
+ * establish more clean relations between handles and QSocketNotifiers.
+ * - read/write_exception_event disable now SocketNotifier for a while
+ * to clear pending events. The cost of this operation is high: two hash
+ * acces in ACE and at least two next ones in Qt. This makes QtReator slow,
+ * but how clear pending events another way ?
+ * - there is qapplication() mutator, which sets new qapplication for
+ * QtReactor. This mutator violates implicit assumption about the
+ * relations between QTimer and QSocketNotifiers and QApplication for
+ * this reactor, namely one may expect that after qapplication(), none
+ * of QtReactor artifacts is bound to old qapplication. That's not true
+ * now, as QTimer and QSocketNotifiers are not reparent to new
+ * QApplication. As a result, the sequence:
+ * QApplication *old_qapp = new QApplication(..);
+ * QtReactor qreactor( old_qapp);
+ * // .. register handlers, schedule_timers etc
+ * QApplication *new_qapp = new QApplication(..);
+ * qreactor.qpplication( new_qapp );
+ * delete old_qapp;
+ * almost always leads to problems and memory violation, because
+ * QSocketNotifiers are released by old_qapp. Therefore QtReactor
+ * should not be reparent now by setting new qapplication.
+ * - the lifecycle of Qt objects in ACE contects is rather mysterious
+ * and should be made more explicit.
+ * - valgrind reports a small memory leak in QtReactor_Test, though as for now
+ * it is not clear if the leak is introduced by  QtReactor, or rather incorrect
+ * memory management in QtReactor_Test.
+ */
+class ACE_QtReactor_Export ACE_QtReactor
+  : public QObject,
+    public ACE_Select_Reactor
+{
+
+    Q_OBJECT
+
+public:
+    /** \brief Constructor follows  @ACE_Select_Reactor
+        \param QApplication *qapp, qapplication which runs events loop
+    */
+    ACE_QtReactor (QApplication *qapp = 0,
+        ACE_Sig_Handler * = 0,
+        ACE_Timer_Queue * = 0,
+        int disable_notify_pipe = 0,
+        ACE_Reactor_Notify *notify = 0,
+        int mask_signals = 1,
+        int s_queue = ACE_SELECT_TOKEN::FIFO);
+
+    /** \brief Constructor follows @ACE_Select_Reactor
+        \param QApplication *qapp, qapplication which runs events loop
+    */
+    ACE_QtReactor (size_t size,
+        QApplication *qapp = 0,
+        int restart = 0,
+        ACE_Sig_Handler * = 0,
+        ACE_Timer_Queue * = 0,
+        int disable_notify_pipe = 0,
+        ACE_Reactor_Notify *notify = 0,
+        int mask_signals = 1,
+        int s_queue = ACE_SELECT_TOKEN::FIFO);
+
+    virtual ~ACE_QtReactor (void);
+
+    void qapplication (QApplication *qapp);
+
+    // = Timer operations.
+    virtual long schedule_timer (ACE_Event_Handler *handler,
+        const void *arg,
+        const ACE_Time_Value &delay_time,
+        const ACE_Time_Value &interval);
+
+    virtual int  cancel_timer (ACE_Event_Handler *handler,
+        int dont_call_handle_close = 1);
+
+    virtual int  cancel_timer (long timer_id,
+        const void **arg = 0,
+        int dont_call_handle_close = 1);
+
+protected:
+
+    // = Register timers/handles with Qt
+
+    /// Register a single <handler>.
+    virtual int register_handler_i (ACE_HANDLE handle,
+        ACE_Event_Handler *handler,
+        ACE_Reactor_Mask mask);
+
+    /// Register a set of <handlers> with Qt.
+    virtual int register_handler_i (const ACE_Handle_Set &handles,
+        ACE_Event_Handler *handler,
+        ACE_Reactor_Mask mask);
+
+
+    /// Remove the <handler> associated with this <handle>.
+    virtual int remove_handler_i (ACE_HANDLE handle,
+        ACE_Reactor_Mask mask);
+
+    /// Remove a set of <handles>.
+    virtual int remove_handler_i (const ACE_Handle_Set &handles,
+        ACE_Reactor_Mask mask);
+
+    /// Wait for events to occur.
+    virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
+        ACE_Time_Value *max_wait_time);
+
+    virtual int QtWaitForMultipleEvents (int width,
+        ACE_Select_Reactor_Handle_Set &wait_set,
+        ACE_Time_Value *max_wait_time);
+
+    virtual int bit_ops (ACE_HANDLE handle,
+        ACE_Reactor_Mask mask,
+        ACE_Select_Reactor_Handle_Set &handle_set,
+        int ops);
+
+    int set_enable_flag_by_mask (int flag_value, ACE_HANDLE handle, ACE_Reactor_Mask mask);
+    void create_notifiers_for_handle (ACE_HANDLE handle);
+    void destroy_notifiers_for_handle (ACE_HANDLE handle);
+
+    // Wait for Qt events to occur
+
+    /// Some Qt stuff that we need to have
+    QApplication *qapp_ ;
+
+    /// Typedef of a map.
+    typedef ACE_Map_Manager<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex> MAP;
+
+    /// A notifier for a read
+    MAP read_notifier_;
+
+    /// A write notifier
+    MAP write_notifier_;
+
+    /// An exception notifier
+    MAP exception_notifier_;
+
+    /// The timer class that would provide timer-sgnals & single-shot timers
+    QTimer *qtime_ ;
+
+private:
+    /// This method ensures there's an Qt timeout for the first timeout
+    /// in the Reactor's Timer_Queue.
+    void reset_timeout (void);
+    /// reopens notification pipe to create SocketNotifier for it
+    void reopen_notification_pipe(void);
+    /// Deny access since member-wise won't work...
+    ACE_QtReactor (const ACE_QtReactor &);
+    ACE_QtReactor &operator= (const ACE_QtReactor &);
+
+private slots:
+
+    // These are all part of the communication mechanism adopted in Qt.
+    /// Dispatch a Read Event
+    void read_event (int FD);
+
+    /// Dispatch a Write Event
+    void write_event (int FD);
+
+    /// Dispatch an exception event
+    void exception_event (int FD);
+
+    /// Dispach a timeout event
+    void timeout_event (void);
+};
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+#endif /* ACE_QTREACTOR_H */
diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp
deleted file mode 100644
index 28682e17109..00000000000
--- a/ACE/ace/QtReactor/QtReactor.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-//$Id$
-
-#include "ace/QtReactor/QtReactor.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
-
-// Must be called with lock held
-
-ACE_QtReactor::ACE_QtReactor (QApplication *qapp ,
-    ACE_Sig_Handler *sh,
-    ACE_Timer_Queue *tq,
-    int disable_notify_pipe,
-    ACE_Reactor_Notify *notify,
-    int mask_signals,
-    int s_queue ):
-    ACE_Select_Reactor( sh, tq, disable_notify_pipe,
-        notify, mask_signals, s_queue),
-    qapp_(qapp),
-    qtime_ (0)
-{
-    reopen_notification_pipe();
-}
-
-// Must be called with lock held
-ACE_QtReactor::ACE_QtReactor (size_t size,
-    QApplication *qapp,
-    int restart,
-    ACE_Sig_Handler *sh,
-    ACE_Timer_Queue *tq,
-    int disable_notify_pipe,
-    ACE_Reactor_Notify *notify,
-    int mask_signals,
-    int s_queue):
-    ACE_Select_Reactor( size, restart, sh, tq,
-        disable_notify_pipe, notify, mask_signals,
-        s_queue ),
-    qapp_(qapp),
-    qtime_ (0)
-
-{
-    reopen_notification_pipe();
-}
-
-void ACE_QtReactor::reopen_notification_pipe( void)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // QtReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the QtReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the QtReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the QtReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    if ( initialized_ )
-    {
-        this->notify_handler_->close ();
-
-        // Patch for MS Windows: close and open doesn't clear the read
-        // fd_set, so reset it manually
-        this->wait_set_.rd_mask_.reset ();
-
-        this->notify_handler_->open (this, 0);
-    }
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_QtReactor::~ACE_QtReactor (void)
-{
-    // iterate over QSocketNotifiers for read and release them
-    MAP::ITERATOR iter = this->read_notifier_.begin ();
-    MAP::ITERATOR iterEnd = this->read_notifier_.end ();
-    while( iter != iterEnd )
-    {
-        MAP::ENTRY &entry = *iter;
-        // QOBject destructor notifies qapplication (hopefully) on delete
-        delete entry.int_id_;
-        ++iter;
-    }
-
-    // iterate over QSocketNotifiers for write and release them
-    this->write_notifier_.begin ();
-    this->write_notifier_.end ();
-    while( iter != iterEnd )
-    {
-        MAP::ENTRY &entry = *iter;
-        // QOBject destructor notifies qapplication (hopefully) on delete
-        delete entry.int_id_;
-        ++iter;
-    }
-
-    // iterate over QSocketNotifiers for exceptions and release them
-    this->exception_notifier_.begin ();
-    this->exception_notifier_.end ();
-    while( iter != iterEnd )
-    {
-        MAP::ENTRY &entry = *iter;
-        // QOBject destructor notifies qapplication (hopefully) on delete
-        delete entry.int_id_;
-        ++iter;
-    }
-
-    // QOBject destructor notifies qapplication (hopefully) on delete
-    delete qtime_;
-}
-
-void
-ACE_QtReactor::qapplication (QApplication *qapp)
-{
-  // reparent QSocketNotifiers and QTimer
-  qapp_ = qapp ;
-}
-
-void
-ACE_QtReactor::timeout_event (void)
-{
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  this->dispatch (0, handle_set );
-
-  // Set next timeout signal
-  this->reset_timeout ();
-}
-
-void
-ACE_QtReactor::read_event (int p_handle)
-{
-  ACE_TRACE ("ACE_QtReactor::read_event");
-
-  ACE_HANDLE handle = ACE_HANDLE( p_handle );
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // disable socket notifier to clear pending events
-  QSocketNotifier *qsock_notifier = 0;
-  if ( ( this->read_notifier_.find( handle,
-             qsock_notifier) != -1) )
-    qsock_notifier->setEnabled( false );
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-
-  // The core of read event handling
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  dispatch_set.rd_mask_.set_bit ( handle );
-  this->dispatch (1, dispatch_set);
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // enable socket notifier according to current mask
-  ACE_Reactor_Mask mask = 0;
-  mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
-  if ( -1 != mask )
-        set_enable_flag_by_mask ( 1, handle, mask);
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-}
-
-void
-ACE_QtReactor::write_event (int p_handle)
-{
-  ACE_TRACE ("ACE_QtReactor::write_event");
-
-  ACE_HANDLE handle = ACE_HANDLE( p_handle );
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // disable socket notifier to clear pending events
-  QSocketNotifier *qsock_notifier = 0;
-  if ( ( this->write_notifier_.find( handle, qsock_notifier) != -1) )
-    qsock_notifier->setEnabled( false );
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-
-  // The core of write event handling
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  dispatch_set.wr_mask_.set_bit( handle );
-  this->dispatch (1, dispatch_set);
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // enable socket notifier according to current mask
-  ACE_Reactor_Mask mask = 0;
-  mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
-  if ( -1 != mask )
-        set_enable_flag_by_mask ( 1, handle, mask);
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-}
-
-void
-ACE_QtReactor::exception_event (int p_handle)
-{
-  ACE_TRACE ("ACE_QtReactor::exception_event");
-
-  ACE_HANDLE handle = ACE_HANDLE( p_handle );
-
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // disable socket notifier to clear pending events
-  QSocketNotifier *qsock_notifier = 0;
-  if ( ( this->exception_notifier_.find( handle, qsock_notifier) != -1) )
-    qsock_notifier->setEnabled( false );
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-
-  // The core of exception event handling
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  dispatch_set.ex_mask_.set_bit( handle );
-  dispatch (1, dispatch_set);
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // enable socket notifier according to current mask
-  ACE_Reactor_Mask mask = 0;
-  mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
-  if ( -1 != mask )
-        set_enable_flag_by_mask ( 1, handle, mask);
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-}
-
-int
-ACE_QtReactor::set_enable_flag_by_mask (int flag_value,
-                                        ACE_HANDLE handle,
-                                        ACE_Reactor_Mask mask)
-{
-  QSocketNotifier *qs_not;
-
-  if (ACE_BIT_ENABLED(mask, ACE_Event_Handler::READ_MASK) ||
-      ACE_BIT_ENABLED( mask, ACE_Event_Handler::ACCEPT_MASK))
-    {
-      // Find the current notifier
-      qs_not = 0;
-      if ((this->read_notifier_.find (handle, qs_not) == -1))
-        return -1;
-
-      qs_not->setEnabled (flag_value);
-    }
-
-  if (ACE_BIT_ENABLED( mask, ACE_Event_Handler::WRITE_MASK) ||
-      ACE_BIT_ENABLED( mask, ACE_Event_Handler::ACCEPT_MASK) ||
-      ACE_BIT_ENABLED( mask, ACE_Event_Handler::CONNECT_MASK))
-    {
-      qs_not = 0;
-      if ((this->write_notifier_.find (handle, qs_not) == -1))
-        return -1;
-
-      qs_not->setEnabled (flag_value);
-    }
-
-  if (ACE_BIT_ENABLED( mask,
-                       ACE_Event_Handler::EXCEPT_MASK))
-    {
-      qs_not = 0;
-      if ((this->exception_notifier_.find (handle, qs_not) == -1))
-        return -1;
-
-      qs_not->setEnabled (flag_value);
-    }
-
-  return 0;
-}
-
-int
-ACE_QtReactor::bit_ops (ACE_HANDLE handle,
-                        ACE_Reactor_Mask mask,
-                        ACE_Select_Reactor_Handle_Set &handle_set,
-                        int ops)
-{
-  int result;
-  ACE_Select_Reactor_Handle_Set preserved_handle_set = handle_set;
-
-  // Call regular bit_ops
-  if ((result = ACE_Select_Reactor::bit_ops (handle, mask, handle_set, ops)) == -1)
-    return -1;
-
-  // disable or enable the notifiers based on handle_set and mask
-  int enableFlag = -1;
-  if (&handle_set == &this->suspend_set_)
-    enableFlag = 0;
-  else if (&handle_set == &this->wait_set_)
-    enableFlag = 1;
-  else
-    // We have no work to do here, so just return
-    return result;
-
-  switch (ops)
-    {
-    case ACE_Reactor::SET_MASK:
-    case ACE_Reactor::ADD_MASK:
-      // Enable or disable notifiers based on the specified masks
-      if (this->set_enable_flag_by_mask (enableFlag, handle, mask) == -1)
-        {
-          // We can't just return -1 here because we'll have half-changed things.
-          // So, we need to restore the old handle_set, then return -1.
-          handle_set = preserved_handle_set;
-          return -1;
-        }
-      break;
-
-    case ACE_Reactor::CLR_MASK:
-      if (this->set_enable_flag_by_mask (!enableFlag, handle, mask) == -1)
-        {
-          handle_set = preserved_handle_set;
-          return -1;
-        }
-      break;
-
-    default:
-      // we take no action for any other operations
-      break;
-    }
-
-  return result;
-}
-
-void
-ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle)
-{
-    QSocketNotifier *qsock_notifier = 0;
-
-    // if there is already a read socket notifier for this handle, do nothing
-    // otherwise create read notifier
-    if ( ( this->read_notifier_.find (handle,
-               qsock_notifier) == -1) )
-    {
-        ACE_NEW (qsock_notifier,
-            QSocketNotifier (int(handle), QSocketNotifier::Read, this));
-        this->read_notifier_.bind (handle,
-            qsock_notifier);
-        QObject::connect (qsock_notifier,
-            SIGNAL (activated (int)),
-            this,
-            SLOT (read_event (int))) ;
-        // disable; it will be enabled by the regular register_handler_i if
-        // necessary
-        qsock_notifier->setEnabled (0);
-    }
-
-    qsock_notifier = 0;
-
-
-    // if there is already a write socket notifier for this handle, do nothing
-    // otherwise create read notifier
-    if ((this->write_notifier_.find (handle,
-             qsock_notifier) == -1))
-    {
-        ACE_NEW (qsock_notifier,
-            QSocketNotifier (int(handle), QSocketNotifier::Write, this));
-
-        this->write_notifier_.bind (handle,
-            qsock_notifier);
-
-        QObject::connect (qsock_notifier,
-            SIGNAL (activated (int)),
-            this,
-            SLOT (write_event (int)));
-        // disable; it will be enabled by the regular register_handler_i if
-        // necessary
-        qsock_notifier->setEnabled (0);
-    }
-
-
-    qsock_notifier = 0;
-
-    // if there is already a write socket notifier for this handle, do nothing
-    // otherwise create read notifier
-    if ((this->exception_notifier_.find (handle,
-             qsock_notifier) == -1))
-    {
-
-        ACE_NEW (qsock_notifier,
-            QSocketNotifier (int(handle), QSocketNotifier::Exception, this));
-
-        this->exception_notifier_.bind (handle,
-            qsock_notifier);
-
-        QObject::connect (qsock_notifier,
-            SIGNAL (activated (int)),
-            this,
-            SLOT (exception_event (int))) ;
-        // disable; it will be enabled by the regular register_handler_i if
-        // necessary
-        qsock_notifier->setEnabled (0);
-    }
-}
-
-void
-ACE_QtReactor::destroy_notifiers_for_handle (ACE_HANDLE handle)
-{
-  QSocketNotifier *qsock_notifier = 0;
-
-  // Looks for the handle in the maps and removes them.
-
-  if ((this->read_notifier_.find (handle,
-                                  qsock_notifier) != -1))
-    {
-      this->read_notifier_.unbind (handle,
-                                   qsock_notifier);
-      delete qsock_notifier;
-    }
-
-  if ((this->write_notifier_.find (handle,
-                                   qsock_notifier) != -1))
-    {
-      this->write_notifier_.unbind (handle,
-                                    qsock_notifier);
-      delete qsock_notifier;
-    }
-
-
-  if ((this->exception_notifier_.find (handle,
-                                       qsock_notifier) != -1))
-    {
-      this->exception_notifier_.unbind (handle,
-                                        qsock_notifier);
-      delete qsock_notifier;
-    }
-}
-
-int
-ACE_QtReactor::register_handler_i (ACE_HANDLE handle ,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_QtReactor::register_handler_i");
-
-  this->create_notifiers_for_handle (handle);
-
-  int result;
-  if ((result = ACE_Select_Reactor::register_handler_i(handle,
-                                                       handler,
-                                                       mask ))
-      == -1)
-    {
-        // destroy notifiers only when there is no handler for handle
-        if ( !ACE_Select_Reactor::find_handler( handle ) )
-            this->destroy_notifiers_for_handle (handle);
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-ACE_QtReactor::register_handler_i (const ACE_Handle_Set &handles,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i(handles,
-                                                handler,
-                                                mask);
-}
-
-int ACE_QtReactor::remove_handler_i (ACE_HANDLE handle ,
-                                     ACE_Reactor_Mask mask   )
-{
-  ACE_TRACE ("ACE_QtReactor::remove_handler_i");
-
-  int result = ACE_Select_Reactor::remove_handler_i (handle, mask);
-  // destroy notifiers only when there is no handler for handle
-  if ( !ACE_Select_Reactor::find_handler( handle ) )
-      this->destroy_notifiers_for_handle (handle);
-  return result;
-}
-
-
-int
-ACE_QtReactor::remove_handler_i (const ACE_Handle_Set &handles,
-                                 ACE_Reactor_Mask  mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-                                               mask);
-}
-
-// The following functions ensure that there is an Qt timeout for the
-// first timeout in the Reactor's Timer_Queue.
-
-void
-ACE_QtReactor::reset_timeout (void)
-{
-  if (this->qtime_ != 0)
-    {
-      delete this->qtime_;
-      this->qtime_ = 0;
-    }
-
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0) ;
-
-  if (max_wait_time)
-  {
-    ACE_NEW (this->qtime_,
-             QTimer);
-
-    QObject::connect (qtime_,
-                      SIGNAL (timeout ()),
-                      this,
-                      SLOT (timeout_event ()));
-
-    qtime_->start(max_wait_time->msec(), 1);
-  }
-
-}
-
-
-long
-ACE_QtReactor::schedule_timer (ACE_Event_Handler *handler,
-                               const void *arg,
-                               const ACE_Time_Value &delay_time,
-                               const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_QtReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token,
-                            ace_mon,
-                            this->token_,
-                            -1));
-
-  long result;
-  if ((result = ACE_Select_Reactor::schedule_timer(handler,
-                                                   arg,
-                                                   delay_time,
-                                                   interval)) == -1 )
-    return -1;
-  else
-  {
-    this->reset_timeout ();
-    return result;
-  }
-}
-
-int
-ACE_QtReactor::cancel_timer (ACE_Event_Handler *handler,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_QtReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-                                        dont_call_handle_close ) == -1 )
-    return -1 ;
-  else
-  {
-    this->reset_timeout( ) ;
-    return 0 ;
-  }
-}
-
-int ACE_QtReactor::cancel_timer (long  timer_id,
-                                 const void **arg,
-                                 int dont_call_handle_close )
-{
-  ACE_TRACE ("ACE_QtReactor::cancel_timer") ;
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-                                        arg,
-                                        dont_call_handle_close ) == -1 )
-    return -1 ;
-  else
-  {
-    this->reset_timeout( ) ;
-    return 0 ;
-  }
-}
-
-// mbrudka: who needs QtWaitForMultipleEvents? It seems it's cargo load now!
-int
-ACE_QtReactor::QtWaitForMultipleEvents (int width,
-                                        ACE_Select_Reactor_Handle_Set &wait_set,
-                                        ACE_Time_Value * /*max_wait_time*/)
-{
-  // Keep a copy of the wait set in case the wait_set be changed 
-  // between the two select calls in this function. It could happen
-  // while waiting for an event, another event is handled and dispatched
-  // which changes the dispatch_set_/wait_set.
-  ACE_Select_Reactor_Handle_Set orig_wait_set = wait_set;
-
-  // Check to make sure our handle's are all usable.
-  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
-
-  if (ACE_OS::select (width,
-                      temp_set.rd_mask_,
-                      temp_set.wr_mask_,
-                      temp_set.ex_mask_,
-                      (ACE_Time_Value *) &ACE_Time_Value::zero ) == -1)
-    return -1; // Bad file arguments...
-
-  // Qt processing.
-  this->qapp_->processOneEvent ();
-
-  // Reset the width, in case it changed during the upcalls.
-  width = handler_rep_.max_handlep1 ();
-
-  // Now actually read the result needed by the <Select_Reactor> using
-  // <select>.
-  return ACE_OS::select(width,
-                        orig_wait_set.rd_mask_,
-                        orig_wait_set.wr_mask_,
-                        orig_wait_set.ex_mask_,
-                        (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// mbrudka: who needs wait_for_multiple_events? It seems it's cargo load now!
-int
-ACE_QtReactor::wait_for_multiple_events (
-  ACE_Select_Reactor_Handle_Set &handle_set,
-  ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_QtReactor::wait_for_multiple_events");
-
-  int nfound = 0;
-  do
-  {
-    max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-    size_t width = this->handler_rep_.max_handlep1 ();
-    handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-    handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-    handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-
-    nfound = QtWaitForMultipleEvents (width,
-                                      handle_set,
-                                      max_wait_time);
-
-  } while( nfound == -1 && this->handle_error () > 0 );
-
-  if (nfound > 0)
-  {
-#if !defined (ACE_WIN32)
-    handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-    handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-    handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-  }
-
-  return nfound;
-  // Timed out or input available
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor/QtReactor.h
deleted file mode 100644
index 33e50058c15..00000000000
--- a/ACE/ace/QtReactor/QtReactor.h
+++ /dev/null
@@ -1,222 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    QtReactor.h
- *
- *  $Id$
- *
- *  @author Hamish Friedlander <ullexco@wave.co.nz>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACE_QTREACTOR_H
-#define ACE_QTREACTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/QtReactor/ACE_QtReactor_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Select_Reactor.h"
-#include "ace/Map_Manager.h"
-
-// QT toolkit specific includes.
-#include /**/ <qapplication.h>
-#include /**/ <qobject.h>
-#include /**/ <qsocketnotifier.h>
-#include /**/ <qtimer.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_QtReactor
- *
- * @brief An object-oriented event demultiplexor and event handler
- * dispatcher that uses the Qt Library. This class declaration
- * also uses the extension facilities  provided by the Qt. So,
- * readers  of the class declaration should not be upset with
- * the appearence of the Keywords like Q_OBJECT, private slots
- * etc. They are specific to Qt which uses these as a call back
- * methods implementation mechanism.
- *
- * \note Marek Brudka <mbrudka@elka.pw.edu.pl>: ACE_QtReactor was
- * quickly bugfixed to meet ACE 5.4.2 (6.0.0?) deadline.
- * While it passes QtReactor_Test now, there is a great
- * room for improvements as the implementation is rather inefficient
- * and obfuscated
- * To be more specific:
- * - reset_timeout always creates and removes qtimer after each
- * timeout event! Obviously, for fast triggering timers this may
- * lead to excessive memory management.
- * - create/destroy_notifiers_for_handle may also be reworked to
- * establish more clean relations between handles and QSocketNotifiers.
- * - read/write_exception_event disable now SocketNotifier for a while
- * to clear pending events. The cost of this operation is high: two hash
- * acces in ACE and at least two next ones in Qt. This makes QtReator slow,
- * but how clear pending events another way ?
- * - there is qapplication() mutator, which sets new qapplication for
- * QtReactor. This mutator violates implicit assumption about the
- * relations between QTimer and QSocketNotifiers and QApplication for
- * this reactor, namely one may expect that after qapplication(), none
- * of QtReactor artifacts is bound to old qapplication. That's not true
- * now, as QTimer and QSocketNotifiers are not reparent to new
- * QApplication. As a result, the sequence:
- * QApplication *old_qapp = new QApplication(..);
- * QtReactor qreactor( old_qapp);
- * // .. register handlers, schedule_timers etc
- * QApplication *new_qapp = new QApplication(..);
- * qreactor.qpplication( new_qapp );
- * delete old_qapp;
- * almost always leads to problems and memory violation, because
- * QSocketNotifiers are released by old_qapp. Therefore QtReactor
- * should not be reparent now by setting new qapplication.
- * - the lifecycle of Qt objects in ACE contects is rather mysterious
- * and should be made more explicit.
- * - valgrind reports a small memory leak in QtReactor_Test, though as for now
- * it is not clear if the leak is introduced by  QtReactor, or rather incorrect
- * memory management in QtReactor_Test.
- */
-class ACE_QtReactor_Export ACE_QtReactor
-  : public QObject,
-    public ACE_Select_Reactor
-{
-
-    Q_OBJECT
-
-public:
-    /** \brief Constructor follows  @ACE_Select_Reactor
-        \param QApplication *qapp, qapplication which runs events loop
-    */
-    ACE_QtReactor (QApplication *qapp = 0,
-        ACE_Sig_Handler * = 0,
-        ACE_Timer_Queue * = 0,
-        int disable_notify_pipe = 0,
-        ACE_Reactor_Notify *notify = 0,
-        int mask_signals = 1,
-        int s_queue = ACE_SELECT_TOKEN::FIFO);
-
-    /** \brief Constructor follows @ACE_Select_Reactor
-        \param QApplication *qapp, qapplication which runs events loop
-    */
-    ACE_QtReactor (size_t size,
-        QApplication *qapp = 0,
-        int restart = 0,
-        ACE_Sig_Handler * = 0,
-        ACE_Timer_Queue * = 0,
-        int disable_notify_pipe = 0,
-        ACE_Reactor_Notify *notify = 0,
-        int mask_signals = 1,
-        int s_queue = ACE_SELECT_TOKEN::FIFO);
-
-    virtual ~ACE_QtReactor (void);
-
-    void qapplication (QApplication *qapp);
-
-    // = Timer operations.
-    virtual long schedule_timer (ACE_Event_Handler *handler,
-        const void *arg,
-        const ACE_Time_Value &delay_time,
-        const ACE_Time_Value &interval);
-
-    virtual int  cancel_timer (ACE_Event_Handler *handler,
-        int dont_call_handle_close = 1);
-
-    virtual int  cancel_timer (long timer_id,
-        const void **arg = 0,
-        int dont_call_handle_close = 1);
-
-protected:
-
-    // = Register timers/handles with Qt
-
-    /// Register a single <handler>.
-    virtual int register_handler_i (ACE_HANDLE handle,
-        ACE_Event_Handler *handler,
-        ACE_Reactor_Mask mask);
-
-    /// Register a set of <handlers> with Qt.
-    virtual int register_handler_i (const ACE_Handle_Set &handles,
-        ACE_Event_Handler *handler,
-        ACE_Reactor_Mask mask);
-
-
-    /// Remove the <handler> associated with this <handle>.
-    virtual int remove_handler_i (ACE_HANDLE handle,
-        ACE_Reactor_Mask mask);
-
-    /// Remove a set of <handles>.
-    virtual int remove_handler_i (const ACE_Handle_Set &handles,
-        ACE_Reactor_Mask mask);
-
-    /// Wait for events to occur.
-    virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-        ACE_Time_Value *max_wait_time);
-
-    virtual int QtWaitForMultipleEvents (int width,
-        ACE_Select_Reactor_Handle_Set &wait_set,
-        ACE_Time_Value *max_wait_time);
-
-    virtual int bit_ops (ACE_HANDLE handle,
-        ACE_Reactor_Mask mask,
-        ACE_Select_Reactor_Handle_Set &handle_set,
-        int ops);
-
-    int set_enable_flag_by_mask (int flag_value, ACE_HANDLE handle, ACE_Reactor_Mask mask);
-    void create_notifiers_for_handle (ACE_HANDLE handle);
-    void destroy_notifiers_for_handle (ACE_HANDLE handle);
-
-    // Wait for Qt events to occur
-
-    /// Some Qt stuff that we need to have
-    QApplication *qapp_ ;
-
-    /// Typedef of a map.
-    typedef ACE_Map_Manager<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex> MAP;
-
-    /// A notifier for a read
-    MAP read_notifier_;
-
-    /// A write notifier
-    MAP write_notifier_;
-
-    /// An exception notifier
-    MAP exception_notifier_;
-
-    /// The timer class that would provide timer-sgnals & single-shot timers
-    QTimer *qtime_ ;
-
-private:
-    /// This method ensures there's an Qt timeout for the first timeout
-    /// in the Reactor's Timer_Queue.
-    void reset_timeout (void);
-    /// reopens notification pipe to create SocketNotifier for it
-    void reopen_notification_pipe(void);
-    /// Deny access since member-wise won't work...
-    ACE_QtReactor (const ACE_QtReactor &);
-    ACE_QtReactor &operator= (const ACE_QtReactor &);
-
-private slots:
-
-    // These are all part of the communication mechanism adopted in Qt.
-    /// Dispatch a Read Event
-    void read_event (int FD);
-
-    /// Dispatch a Write Event
-    void write_event (int FD);
-
-    /// Dispatch an exception event
-    void exception_event (int FD);
-
-    /// Dispach a timeout event
-    void timeout_event (void);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_QTREACTOR_H */
diff --git a/ACE/ace/README b/ACE/ace/README
index 13743b8c708..e9c6d84f739 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -201,6 +201,7 @@ ACE_HAS_STDARG_THR_DEST                 Platform has void (*)(...)
                                         prototype for
                                         pthread_key_create()
                                         destructor (e.g., LynxOS).
+ACE_HAS_SNPRINTF                        Platform offers snprintf().
 ACE_HAS_STL_MAP_CONFLICT                Used when users want to
                                         compile ACE with STL and STL
                                         map class conflicts with
@@ -286,6 +287,9 @@ ACE_HAS_CHARPTR_DL                      OS/platform uses char * for
 ACE_HAS_CHARPTR_SOCKOPT                 OS/platform uses char * for
                                         sockopt, rather than const
                                         char *
+ACE_HAS_CHARPTR_SPRINTF                 sprintf() returns char *
+                                        rather than int (e.g., SunOS
+                                        4.x)
 ACE_HAS_CLOCK_GETTIME                   Platform supports POSIX.1b
                                         clock_gettime () at least for clock-id CLOCK_REALTIME
 ACE_HAS_CLOCK_GETTIME_MONOTONIC         Platform supports POSIX.1b
@@ -829,8 +833,6 @@ ACE_HAS_VOIDPTR_SOCKOPT                 OS/compiler uses void * arg 4
                                         setsockopt() rather than const
                                         char *
 ACE_HAS_WCSNLEN                         Platform supports wcsnlen(3).
-ACE_HAS_WIN32_OVERLAPPED_IO             Platform has Windows overlapped I/O;
-                                        requires I/O completion ports.
 ACE_HAS_WIN32_TRYLOCK                   The Win32 platform support
                                         TryEnterCriticalSection()
                                         (WinNT 4.0 and beyond)
@@ -949,11 +951,10 @@ ACE_LACKS_MEMORY_H                      Platform lacks memory.h (e.g.,
                                         VxWorks and Chorus)
 ACE_LACKS_MKFIFO                        Platform lacks mkfifo() e.g.,
                                         VxWorks, Chorus, pSoS, and WinNT.
-ACE_LACKS_MKTEMP                        Platform lacks the mktemp() function.
+ACE_LACKS_MKTEMP                        ACE has no mktemp()
 ACE_LACKS_MKTEMP_PROTOTYPE              Platform/compiler lacks the
                                         mktemp() prototype (e.g.,
                                         LynxOS)
-ACE_LACKS_MKSTEMP			Platform lacks the mkstemp() function.
 ACE_LACKS_MKSTEMP_PROTOTYPE             Platform/compiler lacks the
                                         mkstemp() prototype (e.g.,
                                         LynxOS)
@@ -1113,17 +1114,6 @@ ACE_LACKS_TELLDIR                       Platform uses ACE_HAS_DIRENT
 ACE_LACKS_THREAD_STACK_SIZE             Platform lacks
                                         pthread_attr_setstacksize()
                                         (e.g., Linux pthreads)
-ACE_LACKS_THR_CONCURRENCY_FUNCS		(ONLY APPLIES TO SOLARIS)
-					Platform does not support
-					thr_getconcurrency/thr_setconcurrency
-					functions, or their implementation
-					is effectively a "no-op".  This
-					notably applies for Solaris >= 5.9.
-					Note that if you build on Solaris 8
-					and run on Solaris 9+, you can
-					encounter thread creation errors
-					unless you rebuild on the target
-					platform.
 ACE_LACKS_TIMEDWAIT_PROTOTYPES          MIT pthreads platform lacks
                                         the timedwait prototypes
 ACE_LACKS_TIMESPEC_T                    Platform does not define
@@ -1164,10 +1154,7 @@ ACE_LACKS_UNAME                         Platform lacks uname calls
 ACE_LACKS_WAIT                          The platform lacks wait
 ACE_LACKS_WILDCARD_BIND                 The bind() call will not
                                         select the port if it's 0.
-ACE_LACKS_WIN32_MOVEFILEEX              The Windows platforms doesn't have
-                                        MoveFileEx().
-ACE_LACKS_WIN32_SECURITY_DESCRIPTORS    The Windows platform doesn't have
-                                        security descriptor support.
+
 ACE_LACKS_WRITEV                        Platform doesn't define
                                         writev, so use our own
 
@@ -1212,10 +1199,6 @@ ACE_ONLY_LATEST_AND_GREATEST            A macro that indicates that
                                         which has the opposite meaning
                                         but serves the same purpose.
 
-ACE_SHM_OPEN_REQUIRES_ONE_SLASH         The path specified on shm_open() must
-                                        have a leading, single slash and not
-                                        have any other slashes.
-
 ACE_WSTRING_HAS_USHORT_SUPPORT          If a platform has wchar_t as a
                                         separate type, then
                                         ACE_WString doesn't have a
diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp
index c71089fb62f..4921135bd3a 100644
--- a/ACE/ace/Reactor.cpp
+++ b/ACE/ace/Reactor.cpp
@@ -399,7 +399,8 @@ ACE_Reactor::timer_queue (ACE_Timer_Queue *tq)
 ACE_Timer_Queue *
 ACE_Reactor::timer_queue (void) const
 {
-  return this->implementation ()->timer_queue ();
+  ACE_Reactor_Impl *impl = this->implementation_;
+  return impl->timer_queue ();
 }
 
 int
diff --git a/ACE/ace/Reactor_Impl.h b/ACE/ace/Reactor_Impl.h
index 47800975214..51cca18517e 100644
--- a/ACE/ace/Reactor_Impl.h
+++ b/ACE/ace/Reactor_Impl.h
@@ -500,7 +500,7 @@ public:
 
   /// Returns true if Reactor has been successfully initialized, else
   /// false.
-  virtual bool initialized (void) = 0;
+  virtual int initialized (void) = 0;
 
   /// Returns the current size of the Reactor's internal descriptor
   /// table.
diff --git a/ACE/ace/Read_Buffer.cpp b/ACE/ace/Read_Buffer.cpp
index f57feff1e4a..9401048f148 100644
--- a/ACE/ace/Read_Buffer.cpp
+++ b/ACE/ace/Read_Buffer.cpp
@@ -33,7 +33,7 @@ ACE_Read_Buffer::dump (void) const
 }
 
 ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp,
-                                  bool close_on_delete,
+                                  int close_on_delete,
                                   ACE_Allocator *alloc)
   : stream_ (fp),
     close_on_delete_ (close_on_delete),
@@ -46,7 +46,7 @@ ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp,
 
 #if !defined (ACE_HAS_WINCE)
 ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle,
-                                  bool close_on_delete,
+                                  int close_on_delete,
                                   ACE_Allocator *alloc)
   : stream_ (ACE_OS::fdopen (handle, ACE_LIB_TEXT ("r"))),
     close_on_delete_ (close_on_delete),
@@ -121,7 +121,7 @@ ACE_Read_Buffer::rec_read (int term, int search, int replace)
       // Check for possible substitutions.
       if (c == search)
         {
-          ++this->occurrences_;
+          this->occurrences_++;
 
           if (replace >= 0)
             c = replace;
@@ -141,7 +141,7 @@ ACE_Read_Buffer::rec_read (int term, int search, int replace)
   if (this->size_ == 0)
     return 0;
 
-  char *result = 0;
+  char *result;
 
   // Recurse, when the recursion bottoms out, allocate the result
   // buffer.
diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h
index cfa0dd0f791..937152a7498 100644
--- a/ACE/ace/Read_Buffer.h
+++ b/ACE/ace/Read_Buffer.h
@@ -39,7 +39,7 @@ class ACE_Allocator;
  * Processing.
  *
  * This implementation is optimized to do a single dynamic
- * allocation and make only one copy of the data. It uses
+ * allocation and make only one copy of the data.  It uses
  * recursion and the run-time stack to accomplish this
  * efficiently.
  */
@@ -49,7 +49,7 @@ public:
   // = Initialization and termination methods.
   /// Read from a FILE *.
   ACE_Read_Buffer (FILE *fp,
-                   bool close_on_delete = false,
+                   int close_on_delete = 0,
                    ACE_Allocator * = 0);
 
 #if !defined (ACE_HAS_WINCE)
@@ -57,7 +57,7 @@ public:
 
   /// Read from an open HANDLE.
   ACE_Read_Buffer (ACE_HANDLE handle,
-                   bool close_on_delete = false,
+                   int close_on_delete = 0,
                    ACE_Allocator * = 0);
 #endif  // ACE_HAS_WINCE
 
@@ -66,19 +66,19 @@ public:
 
   /**
    * Returns a pointer dynamically allocated with
-   * ACE_Allocator::malloc to data from the input stream up to (and
-   * including) the @a terminator.  If @a search is >= 0 then all
-   * occurrences of the @a search value are substituted with the
-   * @a replace value.  The last of the byte of data is a 0, so that
-   * @c strlen can be used on it.  The caller is responsible for
+   * <ACE_Allocator::malloc> to data from the input stream up to (and
+   * including) the <terminator>.  If <search> is >= 0 then all
+   * occurrences of the <search> value are substituted with the
+   * <replace> value.  The last of the byte of data is a 0, so that
+   * <strlen> can be used on it.  The caller is responsible for
    * freeing the pointer returned from this method using the
-   * ACE_Allocator::free.
+   * <ACE_Allocator::free>.
    */
   char *read (int terminator = EOF,
               int search = '\n',
               int replace = '\0');
 
-  /// Returns the number of characters replaced during a @c read.
+  /// Returns the number of characters replaced during a <read>.
   size_t replaced (void) const;
 
   /// Returns the size of the allocated buffer obtained during a
@@ -112,10 +112,11 @@ private:
 
   /// Keeps track of whether we should close the FILE in the
   /// destructor.
-  bool const close_on_delete_;
+  int close_on_delete_;
 
   /// Pointer to the allocator.
   ACE_Allocator *allocator_;
+
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c
index b0c548c4fd3..4ed83fd7696 100644
--- a/ACE/ace/Rtems_init.c
+++ b/ACE/ace/Rtems_init.c
@@ -1,46 +1,49 @@
 /*
+ * RTEMS Network configuration/initialization
+ *
+ *  This file is a merger of the netdemo/init.c and networkconfig.h
+ *  with some modifications to support loopback only.  This file
+ *  is OK for a starting point for a real networked application.
+ *     --joel sherrill 16 Mar 2001
+ *
+ * This program may be distributed and used for any purpose.
+ * I ask only that you:
+ *	1. Leave this author information intact.
+ *	2. Document any changes you make.
+ *
+ * W. Eric Norum
+ * Saskatchewan Accelerator Laboratory
+ * University of Saskatchewan
+ * Saskatoon, Saskatchewan, CANADA
+ * eric@skatter.usask.ca
+ *
  *  $Id$
  */
 
 #if defined (ACE_HAS_RTEMS)
 
-#define RTEMS_BSP_NETWORK_DRIVER_NAME "ne1"
-#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_ne_driver_attach
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 256
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS 100
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 300
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 300
-#define CONFIGURE_MAXIMUM_POSIX_KEYS 100
-#define CONFIGURE_MAXIMUM_POSIX_TIMERS 100
-#define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 10
-#define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES 300
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-#define CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT Init
-#define CONFIGURE_MEMORY_FOR_POSIX (10*1024)
-#define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE (10*1024)
+#include <bsp.h>
+
+char *rtems_progname;
 
 #define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXECUTIVE_RAM_SIZE	(512*1024)
+#define CONFIGURE_MAXIMUM_SEMAPHORES	20
+#define CONFIGURE_MAXIMUM_TASKS		20
 
 #define CONFIGURE_MICROSECONDS_PER_TICK	10000
 
-#define CONFIGURE_MAXIMUM_SEMAPHORES    100
-#define CONFIGURE_MAXIMUM_TASKS         100
-#define CONFIGURE_INIT_TASK_PRIORITY 120
+#define CONFIGURE_INIT_TASK_STACK_SIZE	(10*1024)
+#define CONFIGURE_INIT_TASK_PRIORITY	120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
                                            RTEMS_NO_TIMESLICE | \
                                            RTEMS_NO_ASR | \
                                            RTEMS_INTERRUPT_LEVEL(0))
 
-#include <bsp.h>
-
-char *rtems_progname;
-
 #define CONFIGURE_INIT
-
 rtems_task Init (rtems_task_argument argument);
 
 #include <confdefs.h>
@@ -50,6 +53,7 @@ rtems_task Init (rtems_task_argument argument);
 #if !defined (ACE_LACKS_NETWORKING)
 
 #include <rtems/rtems_bsdnet.h>
+/* start of #include "../networkconfig.h" */
 
 /*
  * Network configuration
@@ -58,6 +62,8 @@ rtems_task Init (rtems_task_argument argument);
  * EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION     *
  * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! *
  ************************************************************
+ *
+ *  $Id$
  */
 
 #ifndef _RTEMS_NETWORKCONFIG_H_
@@ -84,12 +90,13 @@ rtems_task Init (rtems_task_argument argument);
  */
 #define RTEMS_SET_ETHERNET_ADDRESS
 #if (defined (RTEMS_SET_ETHERNET_ADDRESS))
+/* static char ethernet_address[6] = { 0x08, 0x00, 0x3e, 0x12, 0x28, 0xb1 }; */
 static char ethernet_address[6] = { 0x00, 0x80, 0x7F, 0x22, 0x61, 0x77 };
 
 #endif
 
 #define RTEMS_USE_LOOPBACK
-
+#define RTEMS_USE_LOOPBACK_ONLY
 #ifdef RTEMS_USE_LOOPBACK
 /*
  * Loopback interface
@@ -129,7 +136,7 @@ static struct rtems_bsdnet_ifconfig netdriver_config = {
 	NULL,				/* BOOTP supplies IP address */
 	NULL,				/* BOOTP supplies IP net mask */
 #else
-  "XXX.YYY.ZZZ.XYZ",   /* IP address */
+	"XXX.YYY.ZZZ.XYZ",		/* IP address */
 	"255.255.255.0",		/* IP net mask */
 #endif /* !RTEMS_USE_BOOTP */
 
@@ -161,9 +168,9 @@ struct rtems_bsdnet_config rtems_bsdnet_config = {
 #if (!defined (RTEMS_USE_BOOTP))
 	"rtems_host",		/* Host name */
 	"nodomain.com",		/* Domain name */
-  "XXX.YYY.ZZZ.1", /* Gateway */
+	"XXX.YYY.ZZZ.1",	/* Gateway */
 	"XXX.YYY.ZZZ.1",	/* Log host */
-  {"XXX.YYY.ZZZ.1" },  /* Name server(s) */
+	{"XXX.YYY.ZZZ.1" },	/* Name server(s) */
 	{"XXX.YYY.ZZZ.1" },	/* NTP server(s) */
 
 	/*
@@ -194,25 +201,23 @@ struct rtems_bsdnet_config rtems_bsdnet_config = {
 #endif
 
 #endif /* _RTEMS_NETWORKCONFIG_H_ */
+/* end of #include "../networkconfig.h" */
 
 #endif /* ACE_LACKS_NETWORKING */
 
-extern int main (int, char *[]);
-
 /*
  * RTEMS Startup Task
  */
 rtems_task
 Init (rtems_task_argument not_used)
 {
-  int retval = 0;
+  int doSocket(void);
+
 #if !defined (ACE_LACKS_NETWORKING)
-  retval = rtems_bsdnet_initialize_network ();
+  rtems_bsdnet_initialize_network ();
+  rtems_bsdnet_show_inet_routes ();
 #endif /* ACE_LACKS_NETWORKING */
-  if (retval == 0)
-    {
-      retval = main (0, 0);
-    }
+  exit (0);
 }
 
 #elif !defined (__GNUC__)
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
index d2a5e4cf8f3..51b200fdc83 100644
--- a/ACE/ace/SOCK_Dgram.cpp
+++ b/ACE/ace/SOCK_Dgram.cpp
@@ -9,7 +9,6 @@
 #include "ace/OS_NS_sys_select.h"
 #include "ace/OS_NS_ctype.h"
 #include "ace/os_include/net/os_if.h"
-#include "ace/Truncate.h"
 
 #if !defined (__ACE_INLINE__)
 #  include "ace/SOCK_Dgram.inl"
@@ -98,23 +97,14 @@ ACE_SOCK_Dgram::recv (iovec *io_vec,
       ACE_NEW_RETURN (io_vec->iov_base,
                       char[inlen],
                       -1);
-      ssize_t rcv_len = ACE_OS::recvfrom (this->get_handle (),
+      io_vec->iov_len = ACE_OS::recvfrom (this->get_handle (),
                                           (char *) io_vec->iov_base,
                                           inlen,
                                           flags,
                                           (sockaddr *) saddr,
                                           &addr_len);
-      if (rcv_len < 0)
-        {
-          delete [] (char *)io_vec->iov_base;
-          io_vec->iov_base = 0;
-        }
-      else
-        {
-          io_vec->iov_len = ACE_Utils::Truncate<size_t> (rcv_len);
-          addr.set_size (addr_len);
-        }
-      return rcv_len;
+      addr.set_size (addr_len);
+      return io_vec->iov_len;
     }
   else
     return 0;
@@ -625,6 +615,8 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
         return -1;
       lmreq.imr_interface.s_addr =
         ACE_HTONL (interface_addr.get_ip_address ());
+#elif defined (ACE_LACKS_IFREQ)
+      // Do nothing
 #else
       ifreq if_address;
 
diff --git a/ACE/ace/SOCK_Dgram.inl b/ACE/ace/SOCK_Dgram.inl
index c365a6bb7b7..55343b13668 100644
--- a/ACE/ace/SOCK_Dgram.inl
+++ b/ACE/ace/SOCK_Dgram.inl
@@ -53,12 +53,12 @@ ACE_SOCK_Dgram::recv (void *buf,
   sockaddr *saddr = (sockaddr *) addr.get_addr ();
   int addr_len = addr.get_size ();
 
-  ssize_t const status = ACE_OS::recvfrom (this->get_handle (),
-                                           (char *) buf,
-                                           n,
-                                           flags,
-                                           (sockaddr *) saddr,
-                                           &addr_len);
+  ssize_t status = ACE_OS::recvfrom (this->get_handle (),
+                                     (char *) buf,
+                                     n,
+                                     flags,
+                                     (sockaddr *) saddr,
+                                     &addr_len);
   addr.set_size (addr_len);
   addr.set_type (reinterpret_cast<sockaddr_in *> (saddr)->sin_family);
   return status;
diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp
index 639a86d1612..2bca65d6538 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.cpp
+++ b/ACE/ace/SOCK_Dgram_Bcast.cpp
@@ -236,8 +236,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                            IFF_UP) == 0)
         {
           ACE_ERROR ((LM_ERROR, "%p [%s]\n",
-                     "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up",
-                     flags.ifr_name));
+                                                 "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up",
+                                                 flags.ifr_name));
           continue;
         }
 
@@ -252,8 +252,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                              SIOCGIFBRDADDR,
                              (char *) &if_req) == -1)
             ACE_ERROR ((LM_ERROR, "%p [%s]\n",
-                       "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)",
-                       flags.ifr_name));
+                                                   "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)",
+                                                   flags.ifr_name));
           else
             {
               ACE_INET_Addr addr (reinterpret_cast <sockaddr_in *>
diff --git a/ACE/ace/SOCK_IO.h b/ACE/ace/SOCK_IO.h
index 252ec68d0cd..b59421602ac 100644
--- a/ACE/ace/SOCK_IO.h
+++ b/ACE/ace/SOCK_IO.h
@@ -70,10 +70,21 @@ public:
                 const ACE_Time_Value *timeout = 0) const;
 
   /// Recv an <iovec> of size <n> from the connected socket.
+  /**
+   * @note The value of @a n will be silently reduced to the maximum
+   * value an @c int can hold if needed. This is due to the underlying
+   * system calls on many OSes limiting the number of @c iovec structures
+   * that can be passed in one call.
+   */
   ssize_t recvv (iovec iov[],
-                 int n,
+                 size_t n,
                  const ACE_Time_Value *timeout = 0) const;
 
+  /// @deprecated Same as above.  Deprecated.
+  ssize_t recv (iovec iov[],
+                size_t n,
+                const ACE_Time_Value *timeout = 0) const;
+
   /**
    * Allows a client to read from a socket without having to provide a
    * buffer to read.  This method determines how much data is in the
@@ -85,6 +96,10 @@ public:
   ssize_t recvv (iovec *io_vec,
                  const ACE_Time_Value *timeout = 0) const;
 
+  /// Same as above.  Deprecated.
+  ssize_t recv (iovec *io_vec,
+                const ACE_Time_Value *timeout = 0) const;
+
   /// Recv <n> varargs messages to the connected socket.
   ssize_t recv (size_t n,
                 ...) const;
@@ -106,10 +121,21 @@ public:
                 const ACE_Time_Value *timeout = 0) const;
 
   /// Send an <iovec> of size <n> to the connected socket.
+  /**
+   * @note The value of @a n will be silently reduced to the maximum
+   * value an @c int can hold if needed. This is due to the underlying
+   * system calls on many OSes limiting the number of @c iovec structures
+   * that can be passed in one call.
+   */
   ssize_t sendv (const iovec iov[],
-                 int n,
+                 size_t n,
                  const ACE_Time_Value *timeout = 0) const;
 
+  /// Same as above.  Deprecated.
+  ssize_t send (const iovec iov[],
+                size_t n,
+                const ACE_Time_Value *timeout = 0) const;
+
   /// Send <n> varargs messages to the connected socket.
   ssize_t send (size_t n,
                 ...) const;
diff --git a/ACE/ace/SOCK_IO.inl b/ACE/ace/SOCK_IO.inl
index 0721c33fd0d..f1aec4af3b8 100644
--- a/ACE/ace/SOCK_IO.inl
+++ b/ACE/ace/SOCK_IO.inl
@@ -3,6 +3,7 @@
 // $Id$
 
 #include "ace/OS_NS_unistd.h"
+#include "ace/Truncate.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -48,17 +49,37 @@ ACE_SOCK_IO::recv (void *buf,
 
 ACE_INLINE ssize_t
 ACE_SOCK_IO::recvv (iovec iov[],
-                    int n,
+                    size_t n,
                     const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recvv");
   return ACE::recvv (this->get_handle (),
                      iov,
-                     n,
+                     ACE_Utils::Truncate<size_t> (n),
                      timeout);
 }
 
 ACE_INLINE ssize_t
+ACE_SOCK_IO::recv (iovec iov[],
+                   size_t n,
+                   const ACE_Time_Value *timeout) const
+{
+  ACE_TRACE ("ACE_SOCK_IO::recv");
+  return this->recvv (iov,
+                      n,
+                      timeout);
+}
+
+ACE_INLINE ssize_t
+ACE_SOCK_IO::recv (iovec *io_vec,
+                   const ACE_Time_Value *timeout) const
+{
+  ACE_TRACE ("ACE_SOCK_IO::recv");
+  return this->recvv (io_vec,
+                      timeout);
+}
+
+ACE_INLINE ssize_t
 ACE_SOCK_IO::recv (void *buf,
                    size_t n,
                    ACE_OVERLAPPED *overlapped) const
@@ -98,17 +119,28 @@ ACE_SOCK_IO::send (const void *buf,
 
 ACE_INLINE ssize_t
 ACE_SOCK_IO::sendv (const iovec iov[],
-                    int n,
+                    size_t n,
                     const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_IO::sendv");
   return ACE::sendv (this->get_handle (),
                      iov,
-                     n,
+                     ACE_Utils::Truncate<size_t> (n),
                      timeout);
 }
 
 ACE_INLINE ssize_t
+ACE_SOCK_IO::send (const iovec iov[],
+                   size_t n,
+                   const ACE_Time_Value *timeout) const
+{
+  ACE_TRACE ("ACE_SOCK_IO::send");
+  return this->sendv (iov,
+                      n,
+                      timeout);
+}
+
+ACE_INLINE ssize_t
 ACE_SOCK_IO::send (const void *buf,
                    size_t n,
                    ACE_OVERLAPPED *overlapped) const
diff --git a/ACE/ace/SPIPE_Acceptor.cpp b/ACE/ace/SPIPE_Acceptor.cpp
index ba5806bae29..960adfc786c 100644
--- a/ACE/ace/SPIPE_Acceptor.cpp
+++ b/ACE/ace/SPIPE_Acceptor.cpp
@@ -14,9 +14,9 @@ ACE_RCSID(ace, SPIPE_Acceptor, "$Id$")
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (void)
-#if defined (ACE_HAS_WIN32_NAMED_PIPES)
+#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   : sa_ (0), pipe_handle_ (ACE_INVALID_HANDLE)
-#endif /* ACE_HAS_WIN32_NAMED_PIPES */
+#endif /* ACE_WIN32 */
 {
   ACE_TRACE ("ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor");
 }
@@ -61,13 +61,13 @@ ACE_SPIPE_Acceptor::open (const ACE_SPIPE_Addr &local_sap,
 
   this->local_addr_ = local_sap;
   this->set_handle (ACE_INVALID_HANDLE);
-#if defined (ACE_HAS_WIN32_NAMED_PIPES)
+#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   this->sa_ = sa;
   this->pipe_mode_ = pipe_mode;
 #else
   ACE_UNUSED_ARG (sa);
   ACE_UNUSED_ARG (pipe_mode);
-#endif /* ACE_HAS_WIN32_NAMED_PIPES */
+#endif /* ACE_WIN32 */
 
   return this->create_new_instance (perms);
 }
@@ -100,7 +100,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
   this->set_handle (spipe[1]);
   return 0;
 
-#elif defined (ACE_HAS_WIN32_NAMED_PIPES)
+#elif (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   // Create a new instance of the Named Pipe (WIN32).  A new instance
   // of the named pipe must be created for every client process.  If
   // an instance of the named pipe that is already connected to a
@@ -183,7 +183,7 @@ ACE_SPIPE_Acceptor::close (void)
 {
   ACE_TRACE ("ACE_SPIPE_Acceptor::close");
 
-#if defined (ACE_HAS_WIN32_NAMED_PIPES)
+#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
 
   // Check to see if we have a valid pipe; if not, nothing to do.
   if (this->pipe_handle_ == ACE_INVALID_HANDLE)
@@ -194,7 +194,7 @@ ACE_SPIPE_Acceptor::close (void)
   // hanging overlapped operation afterwards.
   this->set_handle (this->pipe_handle_);
 
-#endif /* ACE_HAS_WIN32_NAMED_PIPES */
+#endif /* ACE_WIN32 */
 
   // This behavior is shared by UNIX and Win32...
   int result = this->ACE_SPIPE::close ();
@@ -202,7 +202,7 @@ ACE_SPIPE_Acceptor::close (void)
 
 #if defined (ACE_HAS_STREAM_PIPES)
   ACE_OS::fdetach (ACE_TEXT_ALWAYS_CHAR (this->local_addr_.get_path_name ()));
-#elif defined (ACE_HAS_WIN32_NAMED_PIPES)
+#elif (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
 
   // open () started the Connect in asynchronous mode, and accept() restarts
   // the ConnectNamedPipe in overlapped mode.  To avoid leaving a hanging
@@ -283,7 +283,7 @@ ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io,
     *remote_addr = new_io.remote_addr_;
 
   return 0;
-#elif defined (ACE_HAS_WIN32_NAMED_PIPES)
+#elif (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   ACE_UNUSED_ARG (restart);
   ACE_UNUSED_ARG (remote_addr);
 
diff --git a/ACE/ace/SPIPE_Acceptor.h b/ACE/ace/SPIPE_Acceptor.h
index 2c7d9958756..6e0bb7ed8aa 100644
--- a/ACE/ace/SPIPE_Acceptor.h
+++ b/ACE/ace/SPIPE_Acceptor.h
@@ -22,9 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_WIN32_NAMED_PIPES)
+#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
 #include "ace/Manual_Event.h"
-#endif /* ACE_HAS_WIN32_NAMED_PIPES */
+#endif /* ACE_WIN32 */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -138,7 +138,7 @@ private:
   /// Create a new instance of an SPIPE.
   int create_new_instance (int perms = 0);
 
-#if defined (ACE_HAS_WIN32_NAMED_PIPES)
+#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   // On Windows, the SECURITY_ATTRIBUTES specified for the initial accept
   // operation is reused on all subsequent pipe instances as well.
   LPSECURITY_ATTRIBUTES sa_;
@@ -158,7 +158,7 @@ private:
   ACE_Manual_Event event_;
   ACE_HANDLE       pipe_handle_;
   int              already_connected_;
-#endif /* ACE_HAS_WIN32_NAMED_PIPES */
+#endif /* ACE_WIN32 */
 
 };
 
diff --git a/ACE/ace/SSL/Makefile.am b/ACE/ace/SSL/Makefile.am
index 135fa9b937b..b5ca23f600e 100644
--- a/ACE/ace/SSL/Makefile.am
+++ b/ACE/ace/SSL/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 includedir = @includedir@/ace/SSL
 pkgconfigdir = @libdir@/pkgconfig
@@ -18,7 +18,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.SSL.am
 
 if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES = libACE_SSL.la
 
@@ -67,9 +66,8 @@ CLEANFILES = \
   ACE_SSL.pc
 
 ACE_SSL.pc: ${top_builddir}/config.status ${srcdir}/ACE_SSL.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ACE_SSL.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE_SSL.pc.in
 
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 EXTRA_DIST = \
diff --git a/ACE/ace/SSL/ssl.mpc b/ACE/ace/SSL/ssl.mpc
index 723f22c311d..1095488afe8 100644
--- a/ACE/ace/SSL/ssl.mpc
+++ b/ACE/ace/SSL/ssl.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project(SSL) : acelib, install, ace_openssl {
+project(SSL) : acelib, core, ace_openssl {
   avoids      += ace_for_tao
   requires    += ssl
   sharedname   = ACE_SSL
diff --git a/ACE/ace/SSL/ssl_for_tao.mpc b/ACE/ace/SSL/ssl_for_tao.mpc
index 50117aed740..11a06071d9d 100644
--- a/ACE/ace/SSL/ssl_for_tao.mpc
+++ b/ACE/ace/SSL/ssl_for_tao.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(SSL_FOR_TAO) : acelib, install, ace_openssl {
+project(SSL_FOR_TAO) : acelib, core, ace_openssl {
   requires    += ssl ace_for_tao
   sharedname   = ACE_SSL_FOR_TAO
   dynamicflags = ACE_SSL_BUILD_DLL
diff --git a/ACE/ace/SStringfwd.h b/ACE/ace/SStringfwd.h
index 26f4810674c..315553751ce 100644
--- a/ACE/ace/SStringfwd.h
+++ b/ACE/ace/SStringfwd.h
@@ -25,12 +25,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if ((36300 <= __HP_aCC) && (__HP_aCC <= 37300))
-// Due to a bug in the aCC 3.xx compiler need to define the ACE_String_Base
-// template before we can typedef ACE_CString
-# include "ace/String_Base.h"
-#endif /* __HP_aCC */
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class CHAR> class ACE_String_Base;  // Forward declaration.
diff --git a/ACE/ace/Sample_History.cpp b/ACE/ace/Sample_History.cpp
index 832029e4dde..ffa138571d0 100644
--- a/ACE/ace/Sample_History.cpp
+++ b/ACE/ace/Sample_History.cpp
@@ -50,9 +50,6 @@ ACE_Sample_History::dump_samples (const ACE_TCHAR *msg,
       const ACE_UINT32 val = ACE_CU64_TO_CU32 (x);
       ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s: %d %u\n"), msg, i, val));
     }
-#else
-  ACE_UNUSED_ARG (msg);
-  ACE_UNUSED_ARG (scale_factor);
 #endif /* ACE_NLOGGING */
 }
 
diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h
index 9ec4e642210..118a03de8ae 100644
--- a/ACE/ace/Select_Reactor_Base.h
+++ b/ACE/ace/Select_Reactor_Base.h
@@ -39,10 +39,6 @@
 # include "ace/Array_Base.h"
 #endif  /* ACE_WIN32 */
 
-#if !defined (ACE_DISABLE_NOTIFY_PIPE_DEFAULT)
-# define ACE_DISABLE_NOTIFY_PIPE_DEFAULT 0
-#endif /* ACE_DISABLE_NOTIFY_PIPE_DEFAULT */
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Add useful typedefs to simplify the following code.
@@ -144,7 +140,7 @@ public:
   /// Initialize.
   virtual int open (ACE_Reactor_Impl *,
                     ACE_Timer_Queue * = 0,
-                    int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT);
+                    int disable_notify_pipe = 0);
 
   /// Destroy.
   virtual int close (void);
@@ -260,7 +256,7 @@ protected:
   //   more notifications to be stored than would otherwise be the case.
 
   /// Keeps track of allocated arrays of type
-  /// ACE_Notification_Buffer.
+  /// <ACE_Notification_Buffer>.
   ACE_Unbounded_Queue <ACE_Notification_Buffer *> alloc_queue_;
 
   /// Keeps track of all pending notifications.
@@ -325,7 +321,7 @@ public:
   /// Default "do-nothing" constructor.
   ACE_Select_Reactor_Handler_Repository (ACE_Select_Reactor_Impl &);
 
-  /// Initialize a repository of the appropriate @a size.
+  /// Initialize a repository of the appropriate <size>.
   /**
    * On Unix platforms, the size parameter should be as large as the
    * maximum number of file descriptors allowed for a given process.
@@ -390,7 +386,7 @@ private:
   int unbind (ACE_HANDLE handle,
               map_type::iterator pos,
               ACE_Reactor_Mask mask);
-
+  
   /**
    * @return @c iterator corresponding @c ACE_Event_Handler*
    *         associated with @c ACE_HANDLE.
@@ -398,7 +394,7 @@ private:
   map_type::iterator find_eh (ACE_HANDLE handle);
 
 private:
-  /// Reference to our @c Select_Reactor.
+  /// Reference to our <Select_Reactor>.
   ACE_Select_Reactor_Impl &select_reactor_;
 
 #ifndef ACE_WIN32
@@ -429,7 +425,7 @@ public:
 
   // = Iteration methods.
 
-  /// Pass back the @a next_item that hasn't been seen in the Set.
+  /// Pass back the <next_item> that hasn't been seen in the Set.
   /// Returns @c false when all items have been seen, else @c true.
   bool next (ACE_Event_Handler* & next_item);
 
@@ -460,7 +456,7 @@ private:
  *
  * @brief This class simply defines how Select_Reactor's basic interface
  * functions should look like and provides a common base class for
- * @c Select_Reactor using various locking mechanism.
+ * <Select_Reactor> using various locking mechanism.
  */
 class ACE_Export ACE_Select_Reactor_Impl : public ACE_Reactor_Impl
 {
diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp
index c7cde626b0a..f6fc77b5cb5 100644
--- a/ACE/ace/Select_Reactor_T.cpp
+++ b/ACE/ace/Select_Reactor_T.cpp
@@ -40,7 +40,15 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_T)
 
-template <class ACE_SELECT_REACTOR_TOKEN> int
+#if defined (ACE_WIN32)
+#define ACE_SELECT_REACTOR_HANDLE(H) (this->event_handlers_[(H)].handle_)
+#define ACE_SELECT_REACTOR_EVENT_HANDLER(THIS,H) ((THIS)->event_handlers_[(H)].event_handler_)
+#else
+#define ACE_SELECT_REACTOR_HANDLE(H) (H)
+#define ACE_SELECT_REACTOR_EVENT_HANDLER(THIS,H) ((THIS)->event_handlers_[(H)])
+#endif /* ACE_WIN32 */
+
+  template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready
   (ACE_Select_Reactor_Handle_Set &wait_set)
 {
@@ -58,7 +66,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready
   return this->any_ready_i (wait_set);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> int
+  template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready_i
   (ACE_Select_Reactor_Handle_Set &wait_set)
 {
@@ -100,15 +108,14 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i (int signum,
   return 0;
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> bool
+template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::initialized (void)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::initialized");
-  ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, 0));
   return this->initialized_;
 }
 
-
 template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::owner (ACE_thread_t tid,
                                                        ACE_thread_t *o_id)
@@ -210,7 +217,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::notify (ACE_Event_Handler *eh,
   // caller to dictate which Event_Handler method the receiver
   // invokes.  Note that this call can timeout.
 
-  ssize_t const n = this->notify_handler_->notify (eh, mask, timeout);
+  ssize_t n = this->notify_handler_->notify (eh, mask, timeout);
   return n == -1 ? -1 : 0;
 }
 
@@ -407,7 +414,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open
       if (this->timer_queue_ == 0)
         result = -1;
       else
-        this->delete_timer_queue_ = true;
+        this->delete_timer_queue_ = 1;
     }
 
   // Allows the Notify_Handler to be overridden.
@@ -420,7 +427,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open
       if (this->notify_handler_ == 0)
         result = -1;
       else
-        this->delete_notify_handler_ = true;
+        this->delete_notify_handler_ = 1;
     }
 
   if (result != -1 && this->handler_rep_.open (size) == -1)
@@ -437,7 +444,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open
 
   if (result != -1)
     // We're all set to go.
-    this->initialized_ = true;
+    this->initialized_ = 1;
   else
     // This will close down all the allocated resources properly.
     this->close ();
@@ -466,10 +473,10 @@ template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::timer_queue
   (ACE_Timer_Queue *tq)
 {
-  if (this->timer_queue_ != 0 && this->delete_timer_queue_)
+  if (this->timer_queue_ != 0 && this->delete_timer_queue_ != 0)
     delete this->timer_queue_;
   this->timer_queue_ = tq;
-  this->delete_timer_queue_ = false;
+  this->delete_timer_queue_ = 0;
   return 0;
 }
 
@@ -575,7 +582,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close (void)
     {
       delete this->timer_queue_;
       this->timer_queue_ = 0;
-      this->delete_timer_queue_ = false;
+      this->delete_timer_queue_ = 0;
     }
 
   if (this->notify_handler_ != 0)
@@ -585,10 +592,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close (void)
     {
       delete this->notify_handler_;
       this->notify_handler_ = 0;
-      this->delete_notify_handler_ = false;
+      this->delete_notify_handler_ = 0;
     }
 
-  this->initialized_ = false;
+  this->initialized_ = 0;
 
   return 0;
 }
diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h
index 638e71185c5..bb9cdceed61 100644
--- a/ACE/ace/Select_Reactor_T.h
+++ b/ACE/ace/Select_Reactor_T.h
@@ -67,7 +67,7 @@ public:
   /// fine if your application doesn't use the reactor to handle signals).
   ACE_Select_Reactor_T (ACE_Sig_Handler * = 0,
                         ACE_Timer_Queue * = 0,
-                        int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT,
+                        int disable_notify_pipe = 0,
                         ACE_Reactor_Notify *notify = 0,
                         int mask_signals = 1,
                         int s_queue = ACE_SELECT_TOKEN::FIFO);
@@ -92,7 +92,7 @@ public:
                         int restart = 0,
                         ACE_Sig_Handler * = 0,
                         ACE_Timer_Queue * = 0,
-                        int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT,
+                        int disable_notify_pipe = 0,
                         ACE_Reactor_Notify *notify = 0,
                         int mask_signals = 1,
                         int s_queue = ACE_SELECT_TOKEN::FIFO);
@@ -118,11 +118,11 @@ public:
                     int restart = 0,
                     ACE_Sig_Handler * = 0,
                     ACE_Timer_Queue * = 0,
-                    int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT,
+                    int disable_notify_pipe = 0,
                     ACE_Reactor_Notify * = 0);
 
   /// Returns -1 (not used in this implementation);
-  virtual int current_info (ACE_HANDLE, size_t &size);
+  virtual int current_info (ACE_HANDLE, size_t & /* size */);
 
   /// Use a user specified signal handler instead.
   virtual int set_sig_handler (ACE_Sig_Handler *signal_handler);
@@ -146,7 +146,7 @@ public:
    * but does not actually dispatch the event handlers.  By default,
    * don't block while checking this, i.e., "poll".
    */
-  virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero);
+  virtual int work_pending (const ACE_Time_Value &max_wait_time =  ACE_Time_Value::zero);
 
   /**
    * This event loop driver that blocks for @a max_wait_time before
@@ -200,7 +200,7 @@ public:
 
   // = Register and remove ACE_Event_Handlers.
   /**
-   * Register a @a eh with a particular @a mask.  Note that the
+   * Register a <eh> with a particular <mask>.  Note that the
    * <Select_Reactor> will call <ACE_Event_Handler::get_handle> to
    * extract the underlying I/O handle.
    */
@@ -244,9 +244,9 @@ public:
                                 ACE_Reactor_Mask mask);
 
   /**
-   * Register @a new_sh to handle the signal @a signum using the
-   * @a new_disp. Returns the @a old_sh that was previously registered
-   * (if any), along with the @a old_disp of the signal handler.
+   * Register <new_sh> to handle the signal <signum> using the
+   * <new_disp>.  Returns the <old_sh> that was previously registered
+   * (if any), along with the <old_disp> of the signal handler.
    */
   virtual int register_handler (int signum,
                                 ACE_Event_Handler *new_sh,
@@ -254,8 +254,8 @@ public:
                                 ACE_Event_Handler **old_sh = 0,
                                 ACE_Sig_Action *old_disp = 0);
 
-  /// Registers @a new_sh to handle a set of signals @a sigset using the
-  /// @a new_disp.
+  /// Registers <new_sh> to handle a set of signals <sigset> using the
+  /// <new_disp>.
   virtual int register_handler (const ACE_Sig_Set &sigset,
                                 ACE_Event_Handler *new_sh,
                                 ACE_Sig_Action *new_disp = 0);
@@ -523,7 +523,7 @@ public:
                        ACE_Event_Handler ** = 0);
 
   /// Returns true if we've been successfully initialized, else false.
-  virtual bool initialized (void);
+  virtual int initialized (void);
 
   /// Returns the current size of the Reactor's internal descriptor
   /// table.
diff --git a/ACE/ace/Select_Reactor_T.inl b/ACE/ace/Select_Reactor_T.inl
index ebbdfba1e5f..0ad9033f9a0 100644
--- a/ACE/ace/Select_Reactor_T.inl
+++ b/ACE/ace/Select_Reactor_T.inl
@@ -4,7 +4,6 @@
 
 #include "ace/Reactor.h"
 #include "ace/Signal.h"
-#include "ace/Sig_Handler.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index a44998d066c..81a8536cf02 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -21,6 +21,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Get_Opt.h"
 #include "ace/ARGV.h"
+#include "ace/Static_Object_Lock.h"
 
 ACE_RCSID (ace,
            Service_Config,
@@ -130,9 +131,9 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[])
                               -1);
 #endif /* ACE_LACKS_UNIX_SIGNALS */
           break;
-        }
       default:
-        superargv.add ( argv[getopt.opt_ind () - 1]);
+          superargv.add ( argv[getopt.opt_ind () - 1]);
+        }
       }
 
   // Collect any argumets that were left
@@ -325,19 +326,12 @@ ACE_Service_Config::impl_ (void)
 
   static TSS_Service_Gestalt_Ptr * instance_ = 0;
 
-  // We can't possibly rely on ACE_STATIC_OBJECT_LOCK or any other
-  // object that may be managed by the Object Manager. It is very
-  // likely we are called in a static initializer context, before the
-  // ACE_Object_Manager has been instantiated. This of course only
-  // matters for threaded environments.
-  ACE_MT (static ACE_SYNCH_RECURSIVE_MUTEX guardian_);
-
   if (instance_ == 0)
     {
       // TSS not initialized yet - first thread to hit this, so doing
       // the double-checked locking thing
       ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
-                                guardian_, 0));
+                                *ACE_Static_Object_Lock::instance (), 0));
 
       if (instance_ == 0)
         ACE_NEW_RETURN (instance_,
@@ -452,6 +446,8 @@ ACE_Service_Config::ACE_Service_Config (int ignore_static_svcs,
 {
   ACE_TRACE ("ACE_Service_Config::ACE_Service_Config");
 
+  //  this->no_static_svcs_ = (ignore_static_svcs);
+
   ACE_Service_Config::signum_ = signum;
 }
 
@@ -591,7 +587,7 @@ ACE_Service_Config::close_svcs (void)
   ACE_TRACE ("ACE_Service_Config::close_svcs");
 
   ACE_Service_Repository::close_singleton ();
-  ACE_Service_Config::current (0);
+
   return 0;
 }
 
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index 8a9621b90b0..fbe63edc87e 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -274,9 +274,9 @@ public:
    */
   static int open (const ACE_TCHAR program_name[],
                    const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY,
-                   bool ignore_static_svcs = true,
-                   bool ignore_default_svc_conf_file = false,
-                   bool ignore_debug_flag = false);
+                   int ignore_static_svcs = 1,
+                   int ignore_default_svc_conf_file = 0,
+                   int ignore_debug_flag = 0);
 
   /**
    * This is the primary entry point into the ACE_Service_Config (the
@@ -331,9 +331,9 @@ public:
   static int open (int argc,
                    ACE_TCHAR *argv[],
                    const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY,
-                   bool ignore_static_svcs = true,
-                   bool ignore_default_svc_conf_file = false,
-                   bool ignore_debug_flag = false);
+                   int ignore_static_svcs = 1,
+                   int ignore_default_svc_conf_file = 0,
+                   int ignore_debug_flag = 0);
 
   /// Tidy up and perform last rites when ACE_Service_Config is shut
   /// down.  This method calls <close_svcs>.  Returns 0.
diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl
index 895c2340232..6719682dfef 100644
--- a/ACE/ace/Service_Config.inl
+++ b/ACE/ace/Service_Config.inl
@@ -12,9 +12,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE int
 ACE_Service_Config::open (const ACE_TCHAR program_name[],
                           const ACE_TCHAR *logger_key,
-                          bool ignore_static_svcs,
-                          bool ignore_default_svc_conf,
-                          bool ignore_debug_flag)
+                          int ignore_static_svcs,
+                          int ignore_default_svc_conf,
+                          int ignore_debug_flag)
 {
   ACE_TRACE ("ACE_Service_Config::open");
   return ACE_Service_Config::current()->open (program_name,
@@ -29,9 +29,9 @@ ACE_INLINE int
 ACE_Service_Config::open (int argc,
                           ACE_TCHAR *argv[],
                           const ACE_TCHAR *logger_key,
-                          bool ignore_static_svcs,
-                          bool ignore_default_svc_conf,
-                          bool ignore_debug_flag)
+                          int ignore_static_svcs,
+                          int ignore_default_svc_conf,
+                          int ignore_debug_flag)
 {
   ACE_TRACE ("ACE_Service_Config::open");
   return ACE_Service_Config::current()->open (argc,
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index 4d2492daac2..eeae45e785d 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -138,13 +138,12 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void)
   // Lookup without ignoring suspended services. Making sure
   // not to ignore any inactive services, since those may be forward
   // declarations
-  size_t slot = 0;
-  int const ret = this->repo_.find_i (this->name_, slot, &tmp, false);
+  int ret = this->repo_.find_i (this->name_, &tmp, 0);
 
   // We inserted it (as inactive), so we expect to find it, right?
   if (ret < 0 && ret != -2)
     {
-      if (ACE::debug ())
+      if(ACE::debug ())
         ACE_ERROR ((LM_WARNING,
                     ACE_LIB_TEXT ("ACE (%P|%t) STDG::<dtor> - Failed (%d) to find %s\n"),
                     ret, this->name_));
@@ -242,21 +241,16 @@ ACE_Service_Gestalt::Processed_Static_Svc::
 
 ACE_Service_Gestalt::~ACE_Service_Gestalt (void)
 {
+  ACE_ASSERT (this->repo_ != 0);
+
   if (this->svc_repo_is_owned_)
     delete this->repo_;
-
-  this->repo_ =0;
-
   delete this->static_svcs_;
-  this->static_svcs_ = 0;
-
   // Delete the dynamically allocated static_svcs instance.
-#ifndef ACE_NLOGGING
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
                 ACE_LIB_TEXT ("ACE (%P|%t) SG::dtor - this=%@, pss = %@\n"),
                 this, this->processed_static_svcs_));
-#endif
 
   if (this->processed_static_svcs_ &&
       !this->processed_static_svcs_->is_empty())
@@ -270,53 +264,36 @@ ACE_Service_Gestalt::~ACE_Service_Gestalt (void)
         }
     }
   delete this->processed_static_svcs_;
-  this->processed_static_svcs_ = 0;
 }
 
 ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size,
                                           bool svc_repo_is_owned,
                                           bool no_static_svcs)
   : svc_repo_is_owned_ (svc_repo_is_owned)
-  , svc_repo_size_ (size)
   , is_opened_ (0)
   , logger_key_ (ACE_DEFAULT_LOGGER_KEY)
   , no_static_svcs_ (no_static_svcs)
   , svc_queue_ (0)
   , svc_conf_file_queue_ (0)
-  , static_svcs_ (0)
-  , processed_static_svcs_ (0)
 {
-  (void)this->init_i ();
+  if (svc_repo_is_owned)
+    ACE_NEW_NORETURN (this->repo_,
+                      ACE_Service_Repository (size));
+  else
+      this->repo_ =
+        ACE_Service_Repository::instance (size);
+
+  ACE_NEW_NORETURN (this->static_svcs_,
+                    ACE_STATIC_SVCS);
+
+  this->processed_static_svcs_ = 0;
 
-#ifndef ACE_NLOGGING
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
                 ACE_LIB_TEXT ("ACE (%P|%t) SG::ctor - this = %@, pss = %@\n"),
                 this, this->processed_static_svcs_));
-#endif
 }
 
-/// Performs the common initialization tasks for a new or previously
-/// closed instance. Must not be virtual, as it is called from the
-/// constructor.
-int
-ACE_Service_Gestalt::init_i (void)
-{
-  if (this->svc_repo_is_owned_)
-    {
-      ACE_NEW_NORETURN (this->repo_,
-                        ACE_Service_Repository (this->svc_repo_size_));
-    }
-  else
-    {
-      this->repo_ =
-        ACE_Service_Repository::instance (this->svc_repo_size_);
-    }
-
-  return 0;
-}
-
-
 // Add the default statically-linked services to the Service
 // Repository.
 
@@ -377,9 +354,6 @@ ACE_Service_Gestalt::find_static_svc_descriptor (const ACE_TCHAR* name,
 const ACE_Static_Svc_Descriptor*
 ACE_Service_Gestalt::find_processed_static_svc (const ACE_TCHAR* name)
 {
-  if (this->processed_static_svcs_ == 0 || name == 0)
-    return 0;
-
   Processed_Static_Svc **pss = 0;
   for (ACE_PROCESSED_STATIC_SVCS_ITERATOR iter (*this->processed_static_svcs_);
        iter.next (pss) != 0;
@@ -414,7 +388,7 @@ ACE_Service_Gestalt::add_processed_static_svc
   ///
   /// In contrast a "dynamic" directive, when processed through the
   /// overloaded process_directives(string) both creates the SO
-  /// locally and initializes it, where the statics directive must
+  /// locally and initializes it, where the statis directive must
   /// first locate the SO and then calls the init() method. This means
   /// that durig the "static" initialization there's no specific
   /// information about the hosting repository and the gestalt must
@@ -475,11 +449,6 @@ ACE_Service_Gestalt::insert (ACE_Static_Svc_Descriptor *stsd)
            stsd->active_);
     }
 
-  if (this->static_svcs_ == 0)
-    ACE_NEW_RETURN (this->static_svcs_,
-                    ACE_STATIC_SVCS,
-                    -1);
-
   // Inserting a service after the Gestalt has been opened makes it
   // impossible to activate it later. Perhaps open came too soon?
   //ACE_ASSERT (this->is_opened_ == 0);
@@ -523,7 +492,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name,
 #endif
 
   const ACE_Service_Type *srp = 0;
-  for (int i = 0; this->find (svc_name, &srp) == -1 && i < 2; i++)
+  for (int i = 0; this->repo_->find (svc_name, &srp) == -1 && i < 2; i++)
     //  if (this->repo_->find (svc_name, &srp) == -1)
     {
       const ACE_Static_Svc_Descriptor *assd =
@@ -676,8 +645,8 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr,
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
                 ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - looking up dynamic ")
-                ACE_LIB_TEXT (" service %s to initialize, repo=%@\n"),
-                sr->name (), this->repo_));
+                ACE_LIB_TEXT (" service \'%s\' to initialize\n"),
+                sr->name ()));
 
   ACE_Service_Type *srp = 0;
   if (this->repo_->find (sr->name (),
@@ -744,9 +713,6 @@ int
 ACE_Service_Gestalt::remove (const ACE_TCHAR svc_name[])
 {
   ACE_TRACE ("ACE_Service_Gestalt::remove");
-  if (this->repo_ == 0)
-    return -1;
-
   return this->repo_->remove (svc_name);
 }
 
@@ -760,9 +726,6 @@ int
 ACE_Service_Gestalt::suspend (const ACE_TCHAR svc_name[])
 {
   ACE_TRACE ("ACE_Service_Gestalt::suspend");
-  if (this->repo_ == 0)
-    return -1;
-
   return this->repo_->suspend (svc_name);
 }
 
@@ -773,9 +736,6 @@ int
 ACE_Service_Gestalt::resume (const ACE_TCHAR svc_name[])
 {
   ACE_TRACE ("ACE_Service_Gestalt::resume");
-  if (this->repo_ == 0)
-    return -1;
-
   return this->repo_->resume (svc_name);
 }
 
@@ -796,9 +756,6 @@ int
 ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd,
                                         int force_replace)
 {
-  if (this->repo_ == 0)
-    return -1;
-
   if (!force_replace)
     {
       if (this->repo_->find (ssd.name_, 0, 0) >= 0)
@@ -1018,7 +975,9 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[])
 
   ACE_Svc_Conf_Param d (this, directive);
 
-  return this->process_directives_i (&d);
+  int result = this->process_directives_i (&d);
+
+  return result;
 #else
   ACE_DLL dll;
 
@@ -1100,10 +1059,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[],
   if (this->is_opened_++ != 0)
     return 0;
 
-  if (this->init_i () != 0)
-    return -1;
-
-  if (!ignore_debug_flag)
+  if (ignore_debug_flag == 0)
     {
       // If -d was included as a startup parameter, the user wants debug
       // information printed during service initialization.
@@ -1133,7 +1089,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[],
     // Make sure to save/restore errno properly.
     ACE_Errno_Guard error (errno);
 
-    if (!ignore_debug_flag)
+    if (ignore_debug_flag == 0)
       {
         log_msg->priority_mask (old_process_mask, ACE_Log_Msg::PROCESS);
         log_msg->priority_mask (old_thread_mask, ACE_Log_Msg::THREAD);
@@ -1307,6 +1263,9 @@ ACE_Service_Gestalt::close (void)
                 this, this->repo_, this->processed_static_svcs_));
 #endif
 
+  delete this->static_svcs_;
+  this->static_svcs_ = 0;
+
   if (this->processed_static_svcs_ &&
       !this->processed_static_svcs_->is_empty())
     {
@@ -1321,9 +1280,6 @@ ACE_Service_Gestalt::close (void)
   delete this->processed_static_svcs_;
   this->processed_static_svcs_ = 0;
 
-  if (this->svc_repo_is_owned_)
-      delete this->repo_;
-
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
@@ -1331,8 +1287,6 @@ ACE_Service_Gestalt::close (void)
                 this, this->repo_));
 #endif
 
-  this->repo_ = 0;
-
   return 0;
 
 } /* close () */
diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h
index a5d656a53a5..1476020fe38 100644
--- a/ACE/ace/Service_Gestalt.h
+++ b/ACE/ace/Service_Gestalt.h
@@ -110,9 +110,9 @@ public:
    */
   int open (const ACE_TCHAR program_name[],
             const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY,
-            bool ignore_static_svcs = true,
-            bool ignore_default_svc_conf_file = false,
-            bool ignore_debug_flag = false);
+            int ignore_static_svcs = 1,
+            int ignore_default_svc_conf_file = 0,
+            int ignore_debug_flag = 0);
 
   /**
    * This is the primary entry point into the ACE_Service_Config (the
@@ -150,11 +150,11 @@ public:
    * @param logger_key   Indicates where to write the logging output,
    *                     which is typically either a STREAM pipe or a
    *                     socket address.
-   * @param ignore_static_svcs   If true then static services are not loaded,
+   * @param ignore_static_svcs   If 1 then static services are not loaded,
    *                             otherwise, they are loaded.
-   * @param ignore_default_svc_conf_file  If false then the @c svc.conf
+   * @param ignore_default_svc_conf_file  If non-0 then the @c svc.conf
    *                                      configuration file will be ignored.
-   * @param ignore_debug_flag If false then the application is responsible
+   * @param ignore_debug_flag If non-0 then the application is responsible
    *                          for setting the @c ACE_Log_Msg::priority_mask
    *                          appropriately.
    *
@@ -167,9 +167,9 @@ public:
   int open (int argc,
             ACE_TCHAR *argv[],
             const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY,
-            bool ignore_static_svcs = true,
-            bool ignore_default_svc_conf_file = false,
-            bool ignore_debug_flag = false);
+            int ignore_static_svcs = 1,
+            int ignore_default_svc_conf_file = 0,
+            int ignore_debug_flag = 0);
 
   /// Has it been opened?  Returns the difference between the times
   /// open and close have been called on this instance
@@ -367,14 +367,10 @@ protected:
   // the designated shared object in this file.
   int initialize_i (const ACE_Service_Type *sr, const ACE_TCHAR *parameters);
 
-  const ACE_Static_Svc_Descriptor* find_processed_static_svc (const ACE_TCHAR*);
-  void add_processed_static_svc (const ACE_Static_Svc_Descriptor *);
-
-  /// Performs the common initialization tasks for a new or previously
-  /// closed instance. Must not be virtual, as it is called from the
-  /// constructor.
-  int init_i (void);
+const ACE_Static_Svc_Descriptor*
+   find_processed_static_svc (const ACE_TCHAR* );
 
+void add_processed_static_svc (const ACE_Static_Svc_Descriptor *);
 
 protected:
 
@@ -402,14 +398,10 @@ protected:
 
 protected:
 
-  /// Do we own the service repository instance, or have only been
-  /// given a ptr to the singleton?
+  /// Do we own the service repository instance or have only been given a ptr
+  /// to the singleton one?
   bool svc_repo_is_owned_;
 
-  /// Repository size is necessary, so that we can close (which may
-  /// destroy the repository instance), and then re-open again.
-  size_t svc_repo_size_;
-
   /// Keep track of the number of times the instance has been
   /// initialized (opened). "If so, we can't allow <yyparse> to be called since
   /// it's not reentrant" is the original motivation, but that does not seem
@@ -423,7 +415,7 @@ protected:
   const ACE_TCHAR *logger_key_;
 
   /// Should we avoid loading the static services?
-  bool no_static_svcs_;
+  int no_static_svcs_;
 
   /// Queue of services specified on the command-line.
   ACE_SVC_QUEUE* svc_queue_;
diff --git a/ACE/ace/Service_Gestalt.inl b/ACE/ace/Service_Gestalt.inl
index db9e9ad6d80..9897b83c681 100644
--- a/ACE/ace/Service_Gestalt.inl
+++ b/ACE/ace/Service_Gestalt.inl
@@ -12,9 +12,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE int
 ACE_Service_Gestalt::open (const ACE_TCHAR program_name[],
                           const ACE_TCHAR *logger_key,
-                          bool ignore_static_svcs,
-                          bool ignore_default_svc_conf,
-                          bool ignore_debug_flag)
+                          int ignore_static_svcs,
+                          int ignore_default_svc_conf,
+                          int ignore_debug_flag)
 {
   ACE_TRACE ("ACE_Service_Gestalt::open");
   this->no_static_svcs_ = ignore_static_svcs;
@@ -30,9 +30,9 @@ ACE_INLINE int
 ACE_Service_Gestalt::open (int argc,
                           ACE_TCHAR *argv[],
                           const ACE_TCHAR *logger_key,
-                          bool ignore_static_svcs,
-                          bool ignore_default_svc_conf,
-                          bool ignore_debug_flag)
+                          int ignore_static_svcs,
+                          int ignore_default_svc_conf,
+                          int ignore_debug_flag)
 {
   ACE_TRACE ("ACE_Service_Gestalt::open");
   this->no_static_svcs_ = ignore_static_svcs;
@@ -55,14 +55,8 @@ ACE_Service_Gestalt::find (const ACE_TCHAR name[],
                            const ACE_Service_Type **srp,
                            int ignore_suspended) const
 {
-  // Closing the gestalt will have disassociated it from the
-  // repository. If the repository used to be owned by the gestalt, it
-  // will also have been destroyed - so just check for repo_ before
-  // doing anything with it.
-  if (this->repo_ != 0)
-    return this->repo_->find (name, srp, ignore_suspended);
-
-  return 0;
+  ACE_ASSERT (this->repo_ != 0);
+  return this->repo_->find (name, srp, ignore_suspended);
 }
 
 
diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h
index c0d0c7e0fa7..02d955a7a30 100644
--- a/ACE/ace/Service_Manager.h
+++ b/ACE/ace/Service_Manager.h
@@ -34,11 +34,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * This implementation is simple and just handles each client
  * request one at a time.  There are currently 3 types of requests:
- * - List services: If the string "help" is sent, return a list of all
+ * + List services: If the string "help" is sent, return a list of all
  *   the services supported by the Service Configurator.
- * - Reconfigure: If the string "reconfigure" is sent trigger a
+ * + Reconfigure: If the string "reconfigure" is sent trigger a
  *   reconfiguration, which will re-read the local <svc.conf> file.
- * - Process directive: If neither "help" nor "reconfigure" is sent,
+ * + Process directive: If neither "help" nor "reconfigure" is sent,
  *   simply treat the incoming string as a process directive and pass
  *   it along to <ACE_Service_Config::process_directive>.  This allows
  *   remote configuration via command-line instructions like
diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp
index 2c9d6920d78..c3b63ac5a97 100644
--- a/ACE/ace/Service_Repository.cpp
+++ b/ACE/ace/Service_Repository.cpp
@@ -247,9 +247,8 @@ ACE_Service_Repository::~ACE_Service_Repository (void)
 
 int
 ACE_Service_Repository::find_i (const ACE_TCHAR name[],
-                                size_t &slot,
                                 const ACE_Service_Type **srp,
-                                bool ignore_suspended) const
+                                int ignore_suspended) const
 {
   ACE_TRACE ("ACE_Service_Repository::find_i");
   size_t i;
@@ -261,7 +260,6 @@ ACE_Service_Repository::find_i (const ACE_TCHAR name[],
 
   if (i < this->current_size_)
     {
-      slot = i;
       if (this->service_vector_[i]->fini_called ())
         {
           if (srp != 0)
@@ -274,7 +272,7 @@ ACE_Service_Repository::find_i (const ACE_TCHAR name[],
       if (ignore_suspended
           && this->service_vector_[i]->active () == 0)
         return -2;
-      return 0;
+      return i;
     }
   else
     return -1;
@@ -312,8 +310,6 @@ ACE_Service_Repository::relocate_i (size_t begin,
                     this, i, this->total_size_, type->name (),
                     old_handle,
                     new_handle));
-#else
-  ACE_UNUSED_ARG (new_handle);
 #endif
       type->dll (adll);
     }
@@ -324,12 +320,12 @@ ACE_Service_Repository::relocate_i (size_t begin,
 int
 ACE_Service_Repository::find (const ACE_TCHAR name[],
                               const ACE_Service_Type **srp,
-                              bool ignore_suspended) const
+                              int ignore_suspended) const
 {
   ACE_TRACE ("ACE_Service_Repository::find");
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
-  size_t ignore_location = 0;
-  return this->find_i (name, ignore_location, srp, ignore_suspended);
+
+  return this->find_i (name, srp, ignore_suspended);
 }
 
 
@@ -418,8 +414,9 @@ ACE_Service_Repository::resume (const ACE_TCHAR name[],
   ACE_TRACE ("ACE_Service_Repository::resume");
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
 
-  size_t i = 0;
-  if (-1 == this->find_i (name, i, srp, 0))
+  int i = this->find_i (name, srp, 0);
+
+  if (i == -1)
     return -1;
 
   return this->service_vector_[i]->resume ();
@@ -434,8 +431,9 @@ ACE_Service_Repository::suspend (const ACE_TCHAR name[],
 {
   ACE_TRACE ("ACE_Service_Repository::suspend");
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
-  size_t i = 0;
-  if (-1 == this->find_i (name, i, srp, 0))
+  int i = this->find_i (name, srp, 0);
+
+  if (i == -1)
     return -1;
 
   return this->service_vector_[i]->suspend ();
@@ -493,19 +491,21 @@ ACE_Service_Repository::remove (const ACE_TCHAR name[], ACE_Service_Type **ps)
 int
 ACE_Service_Repository::remove_i (const ACE_TCHAR name[], ACE_Service_Type **ps)
 {
-  size_t i = 0;
-  if (-1 == this->find_i (name, i, 0, false))
-    return -1;    // Not found
+    int i = this->find_i (name, 0, 0);
 
-  // We may need the old ptr - to be delete outside the lock!
-  *ps = const_cast<ACE_Service_Type *> (this->service_vector_[i]);
+    // Not found
+    if (i == -1)
+      return -1;
 
-  // Pack the array
-  --this->current_size_;
-  for (size_t j = i; j < this->current_size_; j++)
-    this->service_vector_[j] = this->service_vector_[j+1];
+    // We may need the old ptr - to be delete outside the lock!
+    *ps = const_cast<ACE_Service_Type *> (this->service_vector_[i]);
 
-  return 0;
+    // Pack the array
+    --this->current_size_;
+    for (size_t j = i; j < this->current_size_; j++)
+      this->service_vector_[j] = this->service_vector_[j+1];
+
+    return 0;
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Repository_Iterator)
diff --git a/ACE/ace/Service_Repository.h b/ACE/ace/Service_Repository.h
index 4041688ee9a..8cd55344d29 100644
--- a/ACE/ace/Service_Repository.h
+++ b/ACE/ace/Service_Repository.h
@@ -95,24 +95,16 @@ public:
   int insert (const ACE_Service_Type *);
 
   /**
-   * Locate a named entry in the service table, optionally ignoring
-   * suspended entries.
-   *
-   * @param service_name The name of the service to search for.
-   * @param srp          Optional; if not 0, it is a pointer to a location
-   *                     to receive the ACE_Service_Type pointer for the
-   *                     located service. Meaningless if this method
-   *                     returns -1.
-   * @param ignore_suspended If true, the search ignores suspended services.
-   *
-   * @retval  0 Named service was located.
-   * @retval -1 Named service was not found.
-   * @retval -2 Named service was found, but is suspended and
-   *            @a ignore_suspended is true.
+   * Locate an entry with <name> in the table.  If <ignore_suspended>
+   * is set then only consider services marked as resumed.  If the
+   * caller wants the located entry, pass back a pointer to the
+   * located entry via <srp>.  If <name> is not found, -1 is returned.
+   * If <name> is found, but it is suspended and the caller wants to
+   * ignore suspended services a -2 is returned.
    */
   int find (const ACE_TCHAR name[],
             const ACE_Service_Type **srp = 0,
-            bool ignore_suspended = true) const;
+            int ignore_suspended = 1) const;
 
   /// Remove an existing service record. If @a sr == 0, the service record
   /// is deleted before control is returned to the caller. If @a sr != 0,
@@ -149,30 +141,12 @@ private:
   /// responsible for properly disposing of it.
   int remove_i (const ACE_TCHAR[], ACE_Service_Type **sr);
 
-  /**
-   * Locate a named entry in the service table, optionally ignoring
-   * suspended entries.
-   *
-   * @param service_name The name of the service to search for.
-   * @param slot         Receives the position index of the service if it
-   *                     is found. Contents are meaningless if this method
-   *                     returns -1.
-   * @param srp          Optional; if not 0, it is a pointer to a location
-   *                     to receive the ACE_Service_Type pointer for the
-   *                     located service. Meaningless if this method
-   *                     returns -1.
-   * @param ignore_suspended If true, the search ignores suspended services.
-   *
-   * @retval  0 Named service was located; index in the table is set in
-   *            @a slot.
-   * @retval -1 Named service was not found.
-   * @retval -2 Named service was found, but is suspended and
-   *            @a ignore_suspended is true.
-   */
+  /// Locates <service_name>.  Must be called without locks being
+  /// held...
+
   int find_i (const ACE_TCHAR service_name[],
-              size_t &slot,
-              const ACE_Service_Type **srp = 0,
-              bool ignore_suspended = true) const;
+              const ACE_Service_Type ** = 0,
+              int ignore_suspended = 1) const;
 
   /// @brief Relocate (static) services to another DLL.
   ///
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 6dd4e67f624..5737aff7f2e 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -49,7 +49,7 @@ extern "C" {
 #include "ace/OS_NS_stdio.h"
 #endif /* ACE_VXWORKS < 0x600 */
 
-#if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640)) && defined (__RTP__) && defined (ACE_HAS_IPV6)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x630) && defined (__RTP__) && defined (ACE_HAS_IPV6)
 const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
 const struct in6_addr in6addr_nodelocal_allnodes = IN6ADDR_NODELOCAL_ALLNODES_INIT;
 const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
@@ -162,6 +162,201 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+#if defined (ACE_WIN32) && \
+    (!defined (ACE_HAS_WINSOCK2) \
+     || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0)))
+
+static int
+get_reg_subkeys (const ACE_TCHAR *key,
+                 ACE_TCHAR *buffer,
+                 DWORD &buf_len)
+{
+  HKEY hk;
+  LONG rc = ACE_TEXT_RegOpenKeyEx (HKEY_LOCAL_MACHINE,
+                                   key,
+                                   0,
+                                   KEY_READ,
+                                   &hk);
+
+  if (rc != ERROR_SUCCESS)
+    return -1;
+
+  ACE_TCHAR subkeyname[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1];
+  DWORD subkeyname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN;
+  FILETIME update_dummy;
+
+  DWORD total = 0;
+
+  for (int i = 0;
+       (rc = ACE_TEXT_RegEnumKeyEx (hk, i,
+                                    subkeyname,
+                                    &subkeyname_len,
+                                    0, 0, 0,
+                                    &update_dummy)) != ERROR_NO_MORE_ITEMS;
+        ++i)
+    {
+      if (subkeyname_len < buf_len - total)
+        {
+          ACE_OS::strcpy(buffer + total, subkeyname);
+          total += subkeyname_len + 1;
+          // Reset: was changed by RegEnumKeyEx call.
+          subkeyname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1;
+        }
+      else
+        return -1;
+    }
+
+  buf_len = total;
+
+  ::RegCloseKey (hk);
+  return 0;
+}
+
+// Return value in buffer for a key/name pair from the Windows
+// Registry up to buf_len size.
+// If all_subkeys == 1, look for name under all subkeys of key.
+
+static int
+get_reg_value (const ACE_TCHAR *key,
+               const ACE_TCHAR *name,
+               ACE_TCHAR *buffer,
+               DWORD &buf_len,
+               int all_subkeys = 0)
+{
+  HKEY hk;
+  DWORD buf_type;
+  LONG rc = ACE_TEXT_RegOpenKeyEx (HKEY_LOCAL_MACHINE,
+                                   key,
+                                   0,
+                                   KEY_READ,
+                                   &hk);
+
+  if (rc != ERROR_SUCCESS)
+    // print_error_string(ACE_LIB_TEXT ("RegOpenKeyEx"), rc);
+    return -1;
+
+  if (all_subkeys)
+    {
+      ACE_TCHAR ifname[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1];
+      DWORD ifname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1;
+      FILETIME update_dummy;
+
+      DWORD total = 0;
+      DWORD size = buf_len;
+
+      for (int i = 0;
+           (rc = ACE_TEXT_RegEnumKeyEx (hk, i, ifname, &ifname_len,
+                                        0, 0, 0,
+                                        &update_dummy)) != ERROR_NO_MORE_ITEMS;
+           ++i)
+        {
+          HKEY ifkey;
+          if (rc != ERROR_SUCCESS
+              || ACE_TEXT_RegOpenKeyEx (hk, ifname, 0,
+                                        KEY_READ, &ifkey) != ERROR_SUCCESS)
+            continue;
+
+          if (ACE_TEXT_RegQueryValueEx (ifkey, name, 0, 0,
+                                        (u_char*) (buffer + total),
+                                        &size) != ERROR_SUCCESS)
+            {
+              RegCloseKey(ifkey);
+              continue;
+            }
+          else
+            {
+              total += size;
+              size = buf_len - total;
+            }
+          // Needs to be reset.
+          ifname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1;
+        }
+
+      if (total == 0)
+        {
+          ::RegCloseKey (hk);
+          return -2;
+        }
+      else
+        {
+          buf_len = total;
+        }
+    }
+  else
+    {
+
+      rc = ACE_TEXT_RegQueryValueEx (hk,
+                                     name,
+                                     0,
+                                     &buf_type,
+                                     (u_char *) buffer,
+                                     &buf_len);
+      if (rc != ERROR_SUCCESS)
+        {
+          // print_error_string(ACE_LIB_TEXT ("RegEnumKeyEx"), rc);
+          RegCloseKey (hk);
+          return -2;
+        }
+    }
+
+  ::RegCloseKey (hk);
+  return 0;
+}
+
+enum ACE_WINDOWS_VERSION {
+  ACE_WINDOWS_IS_UNKNOWN,
+  ACE_WINDOWS_IS_WIN95,
+  ACE_WINDOWS_IS_WIN98,
+  ACE_WINDOWS_IS_WINME,
+  ACE_WINDOWS_IS_WINNT,
+  ACE_WINDOWS_IS_WIN2K,
+  ACE_WINDOWS_IS_WINCE
+};
+
+static ACE_WINDOWS_VERSION
+get_windows_version()
+{
+  OSVERSIONINFO vinfo;
+  vinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+  if (::GetVersionEx(&vinfo) == 0)
+    {
+      return ACE_WINDOWS_IS_UNKNOWN;
+    }
+
+  switch (vinfo.dwPlatformId)
+    {
+    case VER_PLATFORM_WIN32_NT:
+      if (vinfo.dwMajorVersion <= 4)
+        return ACE_WINDOWS_IS_WINNT;
+      else
+        return ACE_WINDOWS_IS_WIN2K;
+    case VER_PLATFORM_WIN32_WINDOWS:
+      if (vinfo.dwMajorVersion == 4)
+        {
+          if (vinfo.dwMinorVersion == 0)
+            return ACE_WINDOWS_IS_WIN95;
+          else if (vinfo.dwMinorVersion == 10)
+            return ACE_WINDOWS_IS_WIN98;
+          else if (vinfo.dwMinorVersion == 90)
+            return ACE_WINDOWS_IS_WINME;
+        }
+#if defined (VER_PLATFORM_WIN32_CE)
+    case VER_PLATFORM_WIN32_CE:
+        if (vinfo.dwMajorVersion >= 3) {
+            return ACE_WINDOWS_IS_WINCE;
+        }
+        else {
+            return ACE_WINDOWS_IS_UNKNOWN;
+        }
+#endif /* VER_PLATFORM_WIN32_CE */
+      // If no match we fall throu.
+    default:
+      return ACE_WINDOWS_IS_UNKNOWN;
+    }
+}
+
+#endif //(ACE_WIN32) && !(ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0)
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Bind socket to an unused port.
@@ -628,89 +823,9 @@ get_ip_interfaces_win32 (size_t &count,
   delete [] octet_buffer;
   return 0;
 
-# elif defined (ACE_HAS_PHARLAP)
-  // PharLap ETS has its own kernel routines to rummage through the device
-  // configs and extract the interface info, but only for Pharlap RT.
-#   if !defined (ACE_HAS_PHARLAP_RT)
-  ACE_NOTSUP_RETURN (-1);
-#   endif /* ACE_HAS_PHARLAP_RT */
-
-  // Locate all of the IP devices in the system, saving a DEVHANDLE
-  // for each. Then allocate the ACE_INET_Addrs needed and fetch all
-  // the IP addresses.  To locate the devices, try the available
-  // device name roots and increment the device number until the
-  // kernel says there are no more of that type.
-  const size_t ACE_MAX_ETS_DEVICES = 64;  // Arbitrary, but should be enough.
-  DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES];
-  EK_TCPIPCFG *devp;
-  size_t i, j;
-  ACE_TCHAR dev_name[16];
-
-  count = 0;
-  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
-    {
-      // Ethernet.
-      ACE_OS::sprintf (dev_name,
-                       "ether%d",
-                       i);
-      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
-      if (ip_dev[count] == 0)
-        break;
-    }
-  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
-    {
-      // SLIP.
-      ACE_OS::sprintf (dev_name,
-                       "sl%d",
-                       i);
-      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
-      if (ip_dev[count] == 0)
-        break;
-    }
-  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
-    {
-      // PPP.
-      ACE_OS::sprintf (dev_name,
-                       "ppp%d",
-                       i);
-      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
-      if (ip_dev[count] == 0)
-        break;
-    }
-
-  if (count > 0)
-    ACE_NEW_RETURN (addrs,
-                    ACE_INET_Addr[count],
-                    -1);
-  else
-    addrs = 0;
-
-  for (i = 0, j = 0; i < count; i++)
-    {
-      devp = EtsTCPGetDeviceCfg (ip_dev[i]);
-      if (devp != 0)
-        {
-          addrs[j].set (0,
-                        devp->nwIPAddress,
-                        0); // Already in net order.
-          ++j;
-        }
-      // There's no call to close the DEVHANDLE.
-    }
-
-  count = j;
-  if (count == 0 && addrs != 0)
-    {
-      delete [] addrs;
-      addrs = 0;
-    }
-
-  return 0;
-
-
-# else
-  // All non-CE, non-Pharlap Windows. Must support Winsock2.
-
+# elif defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+  // Win32 can do this by a simple API call if MSVC 5 or later is the compiler.
+  // Not sure if Borland supplies the needed header/lib, but it might.
   int i, n_interfaces, status;
 
   INTERFACE_INFO info[64];
@@ -828,7 +943,263 @@ get_ip_interfaces_win32 (size_t &count,
 
   return 0;
 
-# endif /* ACE_HAS_WINCE */
+#else /* Winsock 2 && MSVC 5 or later */
+
+  // PharLap ETS has kernel routines to rummage through the device
+  // configs and extract the interface info. Sort of a pain in the
+  // butt, but better than trying to figure out where it moved to in
+  // the registry... :-|
+#  if defined (ACE_HAS_PHARLAP)
+#    if !defined (ACE_HAS_PHARLAP_RT)
+  ACE_NOTSUP_RETURN (-1);
+#    endif /* ACE_HAS_PHARLAP_RT */
+
+  // Locate all of the IP devices in the system, saving a DEVHANDLE
+  // for each. Then allocate the ACE_INET_Addrs needed and fetch all
+  // the IP addresses.  To locate the devices, try the available
+  // device name roots and increment the device number until the
+  // kernel says there are no more of that type.
+  const size_t ACE_MAX_ETS_DEVICES = 64;  // Arbitrary, but should be enough.
+  DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES];
+  EK_TCPIPCFG *devp;
+  size_t i, j;
+  ACE_TCHAR dev_name[16];
+
+  count = 0;
+  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
+    {
+      // Ethernet.
+      ACE_OS::sprintf (dev_name,
+                       "ether%d",
+                       i);
+      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
+      if (ip_dev[count] == 0)
+        break;
+    }
+  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
+    {
+      // SLIP.
+      ACE_OS::sprintf (dev_name,
+                       "sl%d",
+                       i);
+      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
+      if (ip_dev[count] == 0)
+        break;
+    }
+  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
+    {
+      // PPP.
+      ACE_OS::sprintf (dev_name,
+                       "ppp%d",
+                       i);
+      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
+      if (ip_dev[count] == 0)
+        break;
+    }
+
+  if (count > 0)
+    ACE_NEW_RETURN (addrs,
+                    ACE_INET_Addr[count],
+                    -1);
+  else
+    addrs = 0;
+
+  for (i = 0, j = 0; i < count; i++)
+    {
+      devp = EtsTCPGetDeviceCfg (ip_dev[i]);
+      if (devp != 0)
+        {
+          addrs[j].set (0,
+                        devp->nwIPAddress,
+                        0); // Already in net order.
+          j++;
+        }
+      // There's no call to close the DEVHANDLE.
+    }
+
+  count = j;
+  if (count == 0 && addrs != 0)
+    {
+      delete [] addrs;
+      addrs = 0;
+    }
+
+  return 0;
+
+#  else /* ACE_HAS_PHARLAP */
+  //
+  // No Winsock2.
+  // Get interface information from the registry.
+  // As this information is in different locations of the registry
+  // on different windows versions, we need to ask at runtime.
+  //
+
+  // Normally we have to look under one key for interfaces name,
+  // and under a second key for ip address of those interfaces.
+  // Exact values and the way to search depend on windows version.
+
+  // This is the first key we have to look for.
+  const ACE_TCHAR *BASE_KEY1;
+
+  // This is the name we have to look for under the first key.
+  // If this is == 0, we need to look for subkeys, not the values from
+  // a name.
+  const ACE_TCHAR *KEY1_NAME_ID;
+
+  // The second key is normally constructed concatenating a prefix,
+  // the value found on KEY1_NAME_ID stripped from the first s_offset
+  // characters, and a suffix.
+  unsigned int s_offset;
+  const ACE_TCHAR *PREFFIX_KEY2;
+  const ACE_TCHAR *SUFFIX_KEY2;
+
+  // If != 0, look for the value of KEY1_NAME_ID not directly under
+  // BASE_KEY1, but on every subkey of BASE_KEY1.
+  int use_subkeys;
+
+  // When we search for IP Addresses below, we look for a key with a
+  // name in this array (null terminated).
+  // For some windows versions, there is an
+  // aditional key for ppp interfaces that will be stored on [1].
+  const ACE_TCHAR *IPADDR_NAME_ID[3] = {
+    ACE_LIB_TEXT ("IPAddress"), 0, 0
+  };
+
+  // Skip addresses that match this.
+  const ACE_TCHAR *INVALID_TCPIP_DEVICE_ADDR = ACE_LIB_TEXT ("0.0.0.0");
+
+  ACE_WINDOWS_VERSION winver = get_windows_version();
+
+  switch (winver)
+    {
+      case ACE_WINDOWS_IS_WINNT:
+        PREFFIX_KEY2 = ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\");
+        BASE_KEY1 =
+          ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services")
+          ACE_LIB_TEXT ("\\Tcpip\\Linkage");
+        SUFFIX_KEY2 = ACE_LIB_TEXT ("\\Parameters\\Tcpip");
+        KEY1_NAME_ID = ACE_LIB_TEXT ("Bind");
+        s_offset = 8;
+        use_subkeys = 0;
+        break;
+
+      case ACE_WINDOWS_IS_WIN2K:
+        BASE_KEY1 =
+          ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services")
+          ACE_LIB_TEXT ("\\Tcpip\\Parameters\\Interfaces\\");
+        PREFFIX_KEY2 = BASE_KEY1;
+        SUFFIX_KEY2 = ACE_LIB_TEXT ("");
+        KEY1_NAME_ID = 0;
+        s_offset = 0;
+        use_subkeys = 1;
+        // PPP.
+        IPADDR_NAME_ID[1] = ACE_LIB_TEXT ("DhcpIPAddress");
+        break;
+
+      // If ACE_HAS_WINNT4 we can safely assume the ones below will
+      // not be needed.
+#   if !defined(ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)
+      case ACE_WINDOWS_IS_WIN95:
+      case ACE_WINDOWS_IS_WIN98:
+      case ACE_WINDOWS_IS_WINME:
+        PREFFIX_KEY2 =
+          ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\Class\\");
+        BASE_KEY1 = ACE_LIB_TEXT ("Enum\\Network\\MSTCP");
+        SUFFIX_KEY2 = ACE_LIB_TEXT ("");
+        KEY1_NAME_ID =  ACE_LIB_TEXT ("Driver");
+        use_subkeys = 1;
+        s_offset = 0;
+        break;
+#   endif /* !ACE_HAS_WINNT4 */
+
+      default:
+        return -1;
+    }
+
+  ACE_TCHAR raw_buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1];
+  DWORD raw_buflen = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1;
+
+  if (KEY1_NAME_ID == 0)
+    {
+      if (::get_reg_subkeys (BASE_KEY1,
+                             raw_buffer,
+                             raw_buflen))
+        return -1;
+    }
+  else
+    {
+      if (::get_reg_value (BASE_KEY1,
+                           KEY1_NAME_ID,
+                           raw_buffer,
+                           raw_buflen,
+                           use_subkeys))
+        return -1;
+    }
+  // return buffer contains 0 delimited strings
+
+  ACE_Tokenizer dev_names (raw_buffer);
+  dev_names.delimiter (ACE_LIB_TEXT ('\0'));
+  int n_interfaces = 0;
+
+  // Count the number of interfaces
+  while (dev_names.next () != 0)
+    ++n_interfaces;
+
+  // case 1. no interfaces present, empty string? OS version change?
+  if (n_interfaces == 0)
+    return 0;
+
+  ACE_NEW_RETURN (addrs,
+                  ACE_INET_Addr[n_interfaces],
+                  -2);
+
+  ACE_TCHAR buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1];
+  DWORD buf_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1;
+
+  count = 0;
+  for (int i = 0; i < n_interfaces; i++)
+    {
+      for (const ACE_TCHAR **ipaddr_name_id = IPADDR_NAME_ID;
+           *ipaddr_name_id != 0;
+           ++ipaddr_name_id)
+        {
+          // a. construct name to access IP Address for this interface
+          ACE_TString ifdevkey (PREFFIX_KEY2);
+          ACE_TString the_dev = dev_names.next ();
+
+          if (the_dev.length() < s_offset)
+            {
+              return -3;              // Something's wrong
+            }
+
+          // rest of string from offset.
+          the_dev = the_dev.substring (s_offset);
+
+          ifdevkey += the_dev;
+          ifdevkey += SUFFIX_KEY2;
+
+          // b. extract value
+          // Gets overwritten on each call
+          buf_len = sizeof (buffer);
+          if (get_reg_value (ifdevkey.fast_rep (),
+                             *ipaddr_name_id,
+                             buffer,
+                             buf_len))
+            continue; // Skip unknown devices.
+
+          if (ACE_OS::strcmp (buffer,
+                              INVALID_TCPIP_DEVICE_ADDR) == 0)
+            continue; // Don't count this device
+
+          // c. store in hostinfo object array and up the counter
+          addrs[count++] =
+            ACE_INET_Addr ((u_short) 0, buffer);
+        }
+    }
+
+  return 0;
+#  endif /* ACE_HAS_PHARLAP */
+# endif /* Winsock 2 && MSVC 5 or later */
 }
 #elif defined (ACE_HAS_GETIFADDRS)
 static int
@@ -1120,7 +1491,7 @@ get_ip_interfaces_aix (size_t &count,
         || req->ifr_addr.sa_family == AF_INET6
 # endif
         )
-       ++num_ifs;
+       num_ifs++;
     }
   ACE_NEW_RETURN (addrs,ACE_INET_Addr[num_ifs], -1);
 
@@ -1228,7 +1599,7 @@ ACE::get_ip_interfaces (size_t &count,
 #elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)
   return get_ip_interfaces_vxworks_lt600 (count, addrs);
 
-#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS)
   // COMMON (SVR4 and BSD) UNIX CODE
 
   size_t num_ifs, num_ifs_found;
@@ -1331,13 +1702,13 @@ ACE::get_ip_interfaces (size_t &count,
 #  endif
               )
             {
-              int addrlen = static_cast<int> (sizeof (struct sockaddr_in));
+	      int addrlen = static_cast<int> (sizeof (struct sockaddr_in));
 #  if defined (ACE_HAS_IPV6)
               if (addr->sin_family == AF_INET6)
                 addrlen = static_cast<int> (sizeof (struct sockaddr_in6));
 #  endif
               addrs[count].set (addr, addrlen);
-              ++count;
+              count++;
             }
 # else /* ! _UNICOS */
           // need to explicitly copy on the Cray, since the bitfields kinda
@@ -1358,7 +1729,7 @@ ACE::get_ip_interfaces (size_t &count,
 # endif /* ! _UNICOS */
         }
 
-#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS)
+#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
       ++pcur;
 #else
       if (pcur->ifr_addr.sa_len <= sizeof (struct sockaddr))
@@ -1464,7 +1835,7 @@ ACE::count_interfaces (ACE_HANDLE handle,
 # endif /* SIOCGLIFNUM */
 return 0;
 
-#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS)
   // Note: DEC CXX doesn't define "unix".  BSD compatible OS: HP UX,
   // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of
   // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan
@@ -1518,13 +1889,13 @@ return 0;
       if (ifcfg.ifc_len < 0)
         break;
 
-      ++if_count;
-#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS)
-      ++p_ifs;
+      if_count++;
+#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
+      p_ifs++;
 #else
      if (p_ifs->ifr_addr.sa_len <= sizeof (struct sockaddr))
        {
-          ++p_ifs;
+          p_ifs++;
        }
        else
        {
@@ -1537,14 +1908,14 @@ return 0;
   ACE_OS::free (ifcfg.ifc_req);
 
 # if defined (ACE_HAS_IPV6)
-  FILE* fp = 0;
+  FILE* fp;
 
   if ((fp = ACE_OS::fopen (ACE_LIB_TEXT ("/proc/net/if_inet6"), ACE_LIB_TEXT ("r"))) != NULL)
     {
       // Scan the lines according to the expected format but don't really read any input
       while (fscanf (fp, "%*32s %*02x %*02x %*02x %*02x %*8s\n") != EOF)
         {
-          ++if_count;
+          if_count++;
         }
       ACE_OS::fclose (fp);
     }
@@ -1568,7 +1939,7 @@ ACE::get_handle (void)
   ACE_HANDLE handle = ACE_INVALID_HANDLE;
 #if defined (sparc)
   handle = ACE_OS::open ("/dev/udp", O_RDONLY);
-#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS)
   // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX,
   // AIX, SunOS 4.x
 
diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp
index 525dcbc2553..01de0963b72 100644
--- a/ACE/ace/String_Base.cpp
+++ b/ACE/ace/String_Base.cpp
@@ -267,29 +267,19 @@ ACE_String_Base<CHAR>::resize (typename ACE_String_Base<CHAR>::size_type len,
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::resize");
 
-  fast_resize(len);
-  ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (CHAR));
-}
-
-template <class CHAR> void
-ACE_String_Base<CHAR>::fast_resize (size_t len)
-{
-  ACE_TRACE ("ACE_String_Base<CHAR>::fast_resize");
-
   // Only reallocate if we don't have enough space...
   if (this->buf_len_ <= len)
     {
-      if (this->buf_len_ != 0 && this->release_ != 0)
+    if (this->buf_len_ != 0 && this->release_ != 0)
         this->allocator_->free (this->rep_);
 
-      this->rep_ = static_cast<CHAR*>
-                     (this->allocator_->malloc ((len + 1) * sizeof (CHAR)));
+    this->rep_ = static_cast<CHAR*>(
+      this->allocator_->malloc ((len + 1) * sizeof (CHAR)));
       this->buf_len_ = len + 1;
       this->release_ = 1;
     }
   this->len_ = 0;
-  if (len > 0)
-    this->rep_[0] = 0;
+  ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (CHAR));
 }
 
 template <class CHAR> void
diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h
index 239019b0fae..a2d565a8420 100644
--- a/ACE/ace/String_Base.h
+++ b/ACE/ace/String_Base.h
@@ -337,15 +337,6 @@ public:
   size_type length (void) const;
 
   /**
-   *  Return the number of allocated CHARs in the string object.
-   *  This may be greater than the current length of the string.
-   *
-   *  @return Maximum number of CHAR units that can be stored, including
-   *          any terminating nul that may be needed.
-   */
-  size_t capacity (void) const;
-
-  /**
    * Return @c true if the length of the string is zero, else @c false.
    */
   bool is_empty (void) const;
@@ -474,7 +465,7 @@ public:
   /**
    *  Inequality comparison operator.
    *
-   *  @param s String to compare against stored string.
+   *  @param s Input ACE_String_Base string to compare against stored string.
    *  @return @c true if not equal, @c false otherwise.
    */
   bool operator != (const ACE_String_Base<CHAR> &s) const;
@@ -514,14 +505,10 @@ public:
    * Rather than fix the method to work as documented, the code is
    * left as is, but the second parameter should probably not be used.
    *
-   * fast_resize just adjusts the buffer if needed and sets the length,
-   * it doesn't fill the buffer, so is much faster.
-   * 
    * @param len The number of CHARs to reserve
    * @param c The CHAR to use when filling the string.
    */
   void resize (size_type len, CHAR c = 0);
-  void fast_resize (size_t len);
 
   /// Swap the contents of this @c ACE_String_Base with @a str.
   /**
diff --git a/ACE/ace/String_Base.inl b/ACE/ace/String_Base.inl
index e244cf4ed6d..45abd5eb83b 100644
--- a/ACE/ace/String_Base.inl
+++ b/ACE/ace/String_Base.inl
@@ -33,13 +33,6 @@ ACE_String_Base<CHAR>::length (void) const
   return this->len_;
 }
 
-template <class CHAR> ACE_INLINE size_t
-ACE_String_Base<CHAR>::capacity (void) const
-{
-  ACE_TRACE ("ACE_String_Base<CHAR>::capacity");
-  return this->buf_len_;
-}
-
 template <class CHAR> ACE_INLINE bool
 ACE_String_Base<CHAR>::is_empty (void) const
 {
diff --git a/ACE/ace/System_Time.h b/ACE/ace/System_Time.h
index e40b21299f5..bf58d4d5640 100644
--- a/ACE/ace/System_Time.h
+++ b/ACE/ace/System_Time.h
@@ -25,7 +25,6 @@
 #include "ace/Global_Macros.h"
 #include "ace/os_include/os_time.h"  /* For time_t. */
 #include "ace/os_include/os_limits.h"  /* For MAXPATHLEN. */
-#include "ace/MMAP_Memory_Pool.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp
index 73557515dcb..1dcc78f04b3 100644
--- a/ACE/ace/TP_Reactor.cpp
+++ b/ACE/ace/TP_Reactor.cpp
@@ -102,7 +102,7 @@ ACE_TP_Reactor::ACE_TP_Reactor (ACE_Sig_Handler *sh,
                                 ACE_Timer_Queue *tq,
                                 int mask_signals,
                                 int s_queue)
-  : ACE_Select_Reactor (sh, tq, ACE_DISABLE_NOTIFY_PIPE_DEFAULT, 0, mask_signals, s_queue)
+  : ACE_Select_Reactor (sh, tq, 0, 0, mask_signals, s_queue)
 {
   ACE_TRACE ("ACE_TP_Reactor::ACE_TP_Reactor");
   this->supress_notify_renew (1);
@@ -114,7 +114,7 @@ ACE_TP_Reactor::ACE_TP_Reactor (size_t max_number_of_handles,
                                 ACE_Timer_Queue *tq,
                                 int mask_signals,
                                 int s_queue)
-  : ACE_Select_Reactor (max_number_of_handles, restart, sh, tq, ACE_DISABLE_NOTIFY_PIPE_DEFAULT, 0, mask_signals, s_queue)
+  : ACE_Select_Reactor (max_number_of_handles, restart, sh, tq, 0, 0, mask_signals, s_queue)
 {
   ACE_TRACE ("ACE_TP_Reactor::ACE_TP_Reactor");
   this->supress_notify_renew (1);
diff --git a/ACE/ace/Time_Request_Reply.cpp b/ACE/ace/Time_Request_Reply.cpp
index 7692b73bf45..e7524ce6ce7 100644
--- a/ACE/ace/Time_Request_Reply.cpp
+++ b/ACE/ace/Time_Request_Reply.cpp
@@ -130,11 +130,11 @@ ACE_Time_Request::encode (void *&buf)
   // Compute the length *before* doing the marshaling.
 
   buf = (void *) &this->transfer_;
-  this->transfer_.block_forever_ = ACE_HTONL (this->transfer_.block_forever_);
-  this->transfer_.usec_timeout_  = ACE_HTONL (this->transfer_.usec_timeout_);
-  this->transfer_.sec_timeout_   = ACE_HTONL (this->transfer_.sec_timeout_);
-  this->transfer_.msg_type_      = ACE_HTONL (this->transfer_.msg_type_);
-  this->transfer_.time_          = ACE_HTONL (this->transfer_.time_);
+  this->transfer_.block_forever_ = htonl (this->transfer_.block_forever_);
+  this->transfer_.usec_timeout_  = htonl (this->transfer_.usec_timeout_);
+  this->transfer_.sec_timeout_   = htonl (this->transfer_.sec_timeout_);
+  this->transfer_.msg_type_      = htonl (this->transfer_.msg_type_);
+  this->transfer_.time_          = htonl (this->transfer_.time_);
 
   return this->size ();  // Always fixed
 }
@@ -146,11 +146,11 @@ ACE_Time_Request::decode (void)
 {
   ACE_TRACE ("ACE_Time_Request::decode");
   // Decode
-  this->transfer_.block_forever_ = ACE_NTOHL (this->transfer_.block_forever_);
-  this->transfer_.usec_timeout_  = ACE_NTOHL (this->transfer_.usec_timeout_);
-  this->transfer_.sec_timeout_   = ACE_NTOHL (this->transfer_.sec_timeout_);
-  this->transfer_.msg_type_      = ACE_NTOHL (this->transfer_.msg_type_);
-  this->transfer_.time_          = ACE_NTOHL (this->transfer_.time_);
+  this->transfer_.block_forever_ = ntohl (this->transfer_.block_forever_);
+  this->transfer_.usec_timeout_  = ntohl (this->transfer_.usec_timeout_);
+  this->transfer_.sec_timeout_   = ntohl (this->transfer_.sec_timeout_);
+  this->transfer_.msg_type_      = ntohl (this->transfer_.msg_type_);
+  this->transfer_.time_          = ntohl (this->transfer_.time_);
 
   this->time_ = this->transfer_.time_;
   return 0;
diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp
index 738e8f1d225..4a3c45dc399 100644
--- a/ACE/ace/Timer_Queue_Adapters.cpp
+++ b/ACE/ace/Timer_Queue_Adapters.cpp
@@ -54,7 +54,7 @@ template <class TQ> int
 ACE_Async_Timer_Queue_Adapter<TQ>::schedule_ualarm (void)
 {
   ACE_Time_Value tv = this->timer_queue_.earliest_time ()
-    - this->timer_queue_.gettimeofday ();
+    - ACE_OS::gettimeofday ();
 
   // Beware of negative times and zero times (which cause problems for
   // <ualarm>).
diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp
index 246700f6aa2..82030315aab 100644
--- a/ACE/ace/Timer_Queue_T.cpp
+++ b/ACE/ace/Timer_Queue_T.cpp
@@ -9,11 +9,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-/*
- * Hook to specialize to add includes
- */
-//@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 #include "ace/Timer_Queue_T.h"
 #include "ace/Guard_T.h"
 #include "ace/Log_Msg.h"
@@ -83,7 +78,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::calculate_timeout (ACE_Time_Value *m
     return max_wait_time;
   else
     {
-      ACE_Time_Value const cur_time = this->gettimeofday ();
+      ACE_Time_Value cur_time = this->gettimeofday ();
 
       if (this->earliest_time () > cur_time)
         {
@@ -412,7 +407,7 @@ ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK>::timeout (TIMER_QUEUE &timer_q
   // Upcall to the <handler>s handle_timeout method.
   if (event_handler->handle_timeout (cur_time, act) == -1)
     {
-      if (event_handler->reactor_timer_interface ())
+      if (event_handler->reactor ())
         event_handler->reactor_timer_interface ()->cancel_timer (event_handler, 0);
       else
         timer_queue.cancel (event_handler, 0); // 0 means "call handle_close()".
diff --git a/ACE/ace/TkReactor.cpp b/ACE/ace/TkReactor.cpp
new file mode 100644
index 00000000000..7f6ae69e320
--- /dev/null
+++ b/ACE/ace/TkReactor.cpp
@@ -0,0 +1,439 @@
+#include "ace/TkReactor.h"
+
+#include "ace/SOCK_Acceptor.h"
+#include "ace/SOCK_Connector.h"
+
+ACE_RCSID(ace, TkReactor, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_ALLOC_HOOK_DEFINE (ACE_TkReactor)
+
+// Must be called with lock held
+ACE_TkReactor::ACE_TkReactor (size_t size,
+                              int restart,
+                              ACE_Sig_Handler *h)
+  : ACE_Select_Reactor (size, restart, h),
+    ids_ (0),
+    timeout_ (0)
+{
+  // When the ACE_Select_Reactor is constructed it creates the notify
+  // pipe and registers it with the register_handler_i() method. The
+  // TkReactor overloads this method BUT because the
+  // register_handler_i occurs when constructing the base class
+  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
+  // is called not the TkReactor register_handler_i().  This means
+  // that the notify pipe is registered with the ACE_Select_Reactor
+  // event handling code not the TkReactor and so notfications don't
+  // work.  To get around this we simply close and re-opened the
+  // notification handler in the constructor of the TkReactor.
+
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+  this->notify_handler_->close ();
+  this->notify_handler_->open (this, 0);
+#endif /* ACE_MT_SAFE */
+}
+
+ACE_TkReactor::~ACE_TkReactor (void)
+{
+  // Delete the remaining items in the linked list.
+
+  while (this->ids_)
+    {
+      ACE_TkReactorID *TkID = this->ids_->next_;
+      delete this->ids_;
+      this->ids_ = TkID;
+    }
+}
+
+// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
+// but we use the Tk functions to wait for an event, not <select>
+
+int
+ACE_TkReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
+                                         ACE_Time_Value *max_wait_time)
+{
+  ACE_TRACE ("ACE_TkReactor::wait_for_multiple_events");
+  int nfound;
+
+  do
+    {
+      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
+
+      size_t width = this->handler_rep_.max_handlep1 ();
+      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
+      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
+      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
+      nfound = TkWaitForMultipleEvents (width,
+                                        handle_set,
+                                        max_wait_time);
+
+    } while (nfound == -1 && this->handle_error () > 0);
+
+  if (nfound > 0)
+    {
+#if !defined (ACE_WIN32)
+      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
+      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
+      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
+#endif /* ACE_WIN32 */
+    }
+  return nfound; // Timed out or input available
+}
+
+void
+ACE_TkReactor::TimerCallbackProc (ClientData cd)
+{
+  ACE_TkReactor *self = (ACE_TkReactor *) cd;
+  self->timeout_ = 0;
+
+  // Deal with any timer events
+  ACE_Select_Reactor_Handle_Set handle_set;
+  self->dispatch (0, handle_set);
+  self->reset_timeout ();
+}
+
+/**
+ * @todo the unused mask argument is probably quite useful, but we
+ *       ignore it, why?  In fact the following comment probably
+ *       relates to that:
+ *       This could be made shorter if we know which *kind* of event
+ *       we were about to get.  Here we use <select> to find out which
+ *       one might be available.
+ */
+void
+ACE_TkReactor::InputCallbackProc (ClientData cd,
+                                  int /* mask */)
+{
+  ACE_TkReactor_Input_Callback *callback = (ACE_TkReactor_Input_Callback *) cd;
+  ACE_TkReactor *self = callback->reactor_;
+  ACE_HANDLE handle = callback->handle_;
+
+  // my copy isn't const.
+  ACE_Time_Value zero = ACE_Time_Value::zero;
+
+  ACE_Select_Reactor_Handle_Set wait_set;
+
+  // Deal with one file event.
+
+  // - read which kind of event
+  if (self->wait_set_.rd_mask_.is_set (handle))
+    wait_set.rd_mask_.set_bit (handle);
+  if (self->wait_set_.wr_mask_.is_set (handle))
+    wait_set.wr_mask_.set_bit (handle);
+  if (self->wait_set_.ex_mask_.is_set (handle))
+    wait_set.ex_mask_.set_bit (handle);
+
+  int result = ACE_OS::select (handle + 1,
+                               wait_set.rd_mask_,
+                               wait_set.wr_mask_,
+                               wait_set.ex_mask_, &zero);
+
+  ACE_Select_Reactor_Handle_Set dispatch_set;
+
+  // - Use only that one file event (removes events for other files).
+  if (result > 0)
+    {
+      if (wait_set.rd_mask_.is_set (handle))
+        dispatch_set.rd_mask_.set_bit (handle);
+      if (wait_set.wr_mask_.is_set (handle))
+        dispatch_set.wr_mask_.set_bit (handle);
+      if (wait_set.ex_mask_.is_set (handle))
+        dispatch_set.ex_mask_.set_bit (handle);
+
+      self->dispatch (1, dispatch_set);
+    }
+}
+
+int
+ACE_TkReactor::TkWaitForMultipleEvents (int width,
+                                        ACE_Select_Reactor_Handle_Set &wait_set,
+                                        ACE_Time_Value *)
+{
+  // Check to make sure our handle's are all usable.
+  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
+
+  if (ACE_OS::select (width,
+                      temp_set.rd_mask_,
+                      temp_set.wr_mask_,
+                      temp_set.ex_mask_,
+                      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+    return -1; // Bad file arguments...
+
+  // Instead of waiting using <select>, just use the Tk mechanism to
+  // wait for a single event.
+
+  // Wait for something to happen.
+  ::Tcl_DoOneEvent (0);
+
+  // Reset the width, in case it changed during the upcalls.
+  width = this->handler_rep_.max_handlep1 ();
+
+  // Now actually read the result needed by the <Select_Reactor> using
+  // <select>.
+  return ACE_OS::select (width,
+                         wait_set.rd_mask_,
+                         wait_set.wr_mask_,
+                         wait_set.ex_mask_,
+                         (ACE_Time_Value *) &ACE_Time_Value::zero);
+}
+
+int
+ACE_TkReactor::register_handler_i (ACE_HANDLE handle,
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
+{
+  ACE_TRACE ("ACE_TkReactor::register_handler_i");
+
+  int result = ACE_Select_Reactor::register_handler_i (handle,
+                                                       handler, mask);
+  if (result == -1)
+    return -1;
+
+  int condition = 0;
+
+#if !defined ACE_WIN32
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
+    ACE_SET_BITS (condition, TK_READABLE);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
+    ACE_SET_BITS (condition, TK_WRITABLE);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
+    ACE_SET_BITS (condition, TK_EXCEPTION);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
+    ACE_SET_BITS (condition, TK_READABLE);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
+      ACE_SET_BITS (condition, TK_READABLE); // connected, you may write
+      ACE_SET_BITS (condition, TK_WRITABLE);  // connected, you have data/err
+  }
+#else
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
+    ACE_SET_BITS (condition, TK_READABLE);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
+    ACE_SET_BITS (condition, TK_WRITABLE);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
+    ACE_NOTSUP_RETURN(-1);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
+    ACE_SET_BITS (condition, TK_READABLE);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
+      ACE_SET_BITS (condition, TK_READABLE); // connected, you may write
+      ACE_SET_BITS (condition, TK_WRITABLE);  // connected, you have data/err
+  }
+#endif /* !ACE_WIN32 */
+
+  if (condition != 0)
+    {
+      ACE_TkReactorID *TkID = this->ids_;
+
+      while(TkID)
+        {
+          if (TkID->handle_ == handle)
+            {
+              ::Tk_DeleteFileHandler (TkID->handle_);
+
+              ACE_TkReactor_Input_Callback *callback;
+              ACE_NEW_RETURN (callback,
+                              ACE_TkReactor_Input_Callback,
+                              -1);
+              callback->reactor_ = this;
+              callback->handle_ = handle;
+              ::Tk_CreateFileHandler ((int) handle,
+                                      condition,
+                                      InputCallbackProc,
+                                      (ClientData) callback);
+              return 0;
+            }
+          else
+            TkID = TkID->next_;
+        }
+
+      ACE_NEW_RETURN (TkID,
+                      ACE_TkReactorID,
+                      -1);
+      TkID->next_ = this->ids_;
+      TkID->handle_ = handle;
+      ACE_TkReactor_Input_Callback *callback;
+      ACE_NEW_RETURN (callback,
+                      ACE_TkReactor_Input_Callback,
+                      -1);
+      callback->reactor_ = this;
+      callback->handle_ = handle;
+
+      ::Tk_CreateFileHandler ((int) handle,
+                              condition,
+                              InputCallbackProc,
+                              (ClientData) callback);
+      this->ids_ = TkID;
+    }
+  return 0;
+}
+
+int
+ACE_TkReactor::register_handler_i (const ACE_Handle_Set &handles,
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
+{
+  return ACE_Select_Reactor::register_handler_i (handles,
+                                                 handler,
+                                                 mask);
+}
+
+int
+ACE_TkReactor::remove_handler_i (ACE_HANDLE handle,
+                                 ACE_Reactor_Mask mask)
+{
+  ACE_TRACE ("ACE_TkReactor::remove_handler_i");
+
+  // In the registration phase we registered first with
+  // ACE_Select_Reactor and then with X.  Now we are now doing things
+  // in reverse order.
+
+  // First clean up the corresponding X11Input.
+  this->remove_TkFileHandler (handle);
+
+  // Now let the reactor do its work.
+  return ACE_Select_Reactor::remove_handler_i (handle,
+                                               mask);
+}
+
+void
+ACE_TkReactor::remove_TkFileHandler (ACE_HANDLE handle)
+{
+  ACE_TRACE ("ACE_TkReactor::remove_TkFileHandler");
+
+  ACE_TkReactorID *TkID = this->ids_;
+
+  if (TkID)
+    {
+      if (TkID->handle_ == handle)
+        {
+          ::Tk_DeleteFileHandler (TkID->handle_);
+          this->ids_ = TkID->next_;
+          delete TkID;
+          return;
+        }
+
+      ACE_TkReactorID *NextID = TkID->next_;
+
+      while (NextID)
+        {
+          if (NextID->handle_ == handle)
+            {
+              ::Tk_DeleteFileHandler (NextID->handle_);
+              TkID->next_ = NextID->next_;
+              delete NextID;
+              return;
+            }
+          else
+            {
+              TkID = NextID;
+              NextID = NextID->next_;
+            }
+        }
+    }
+}
+
+int
+ACE_TkReactor::remove_handler_i (const ACE_Handle_Set &handles,
+                                 ACE_Reactor_Mask mask)
+{
+  return ACE_Select_Reactor::remove_handler_i (handles,
+                                               mask);
+}
+
+// The following functions ensure that there is an Tk timeout for the
+// first timeout in the Reactor's Timer_Queue.
+
+void
+ACE_TkReactor::reset_timeout (void)
+{
+  if (this->timeout_)
+    ::Tk_DeleteTimerHandler (this->timeout_);
+  timeout_ = 0;
+
+  ACE_Time_Value *max_wait_time =
+    this->timer_queue_->calculate_timeout (0);
+
+  if (max_wait_time)
+    timeout_ = ::Tk_CreateTimerHandler (max_wait_time->msec (),
+                                        TimerCallbackProc,
+                                        (ClientData) this);
+}
+
+int
+ACE_TkReactor::reset_timer_interval
+  (long timer_id,
+   const ACE_Time_Value &interval)
+{
+  ACE_TRACE ("ACE_TkReactor::reset_timer_interval");
+  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
+
+  int result = ACE_Select_Reactor::timer_queue_->reset_interval
+    (timer_id,
+     interval);
+
+  if (result == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return result;
+    }
+}
+
+long
+ACE_TkReactor::schedule_timer (ACE_Event_Handler *event_handler,
+                               const void *arg,
+                const ACE_Time_Value &delay,
+                               const ACE_Time_Value &interval)
+{
+  ACE_TRACE ("ACE_TkReactor::schedule_timer");
+  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
+
+  long result = ACE_Select_Reactor::schedule_timer (event_handler,
+                                                    arg,
+                                                    delay,
+                                                    interval);
+  if (result == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return result;
+    }
+}
+
+int
+ACE_TkReactor::cancel_timer (ACE_Event_Handler *handler,
+                             int dont_call_handle_close)
+{
+  ACE_TRACE ("ACE_TkReactor::cancel_timer");
+
+  if (ACE_Select_Reactor::cancel_timer (handler,
+                                        dont_call_handle_close) == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return 0;
+    }
+}
+
+int
+ACE_TkReactor::cancel_timer (long timer_id,
+                             const void **arg,
+                             int dont_call_handle_close)
+{
+  ACE_TRACE ("ACE_TkReactor::cancel_timer");
+
+  if (ACE_Select_Reactor::cancel_timer (timer_id,
+                                        arg,
+                                        dont_call_handle_close) == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return 0;
+    }
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/TkReactor.h b/ACE/ace/TkReactor.h
new file mode 100644
index 00000000000..ca3f39474f6
--- /dev/null
+++ b/ACE/ace/TkReactor.h
@@ -0,0 +1,136 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    TkReactor.h
+ *
+ *  $Id$
+ *
+ *  @author Nagarajan Surendran <naga@cs.wustl.edu>
+ */
+//=============================================================================
+
+
+#ifndef ACE_TKREACTOR_H
+#define ACE_TKREACTOR_H
+#include /**/ "ace/pre.h"
+
+#include /**/ "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/ACE_TkReactor_export.h"
+#include "ace/Select_Reactor.h"
+#include /**/ <tk.h>
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class ACE_TkReactorID
+ *
+ * @brief This little class is necessary due to the way that Microsoft
+ * implements sockets to be pointers rather than indices.
+ */
+class ACE_TkReactor_Export ACE_TkReactorID
+{
+public:
+  /// Underlying handle.
+  ACE_HANDLE handle_;
+
+  /// Pointer to next node in the linked list.
+  ACE_TkReactorID *next_;
+};
+
+class ACE_TkReactor;
+
+class ACE_TkReactor_Export ACE_TkReactor_Input_Callback
+{
+public:
+  ACE_TkReactor *reactor_;
+  ACE_HANDLE handle_;
+};
+
+/**
+ * @class ACE_TkReactor
+ *
+ * @brief An object-oriented event demultiplexor and event handler
+ * dispatcher that uses the Tk functions.
+ */
+class ACE_TkReactor_Export ACE_TkReactor : public ACE_Select_Reactor
+{
+public:
+  // = Initialization and termination methods.
+  ACE_TkReactor (size_t size = DEFAULT_SIZE,
+                 int restart = 0,
+                 ACE_Sig_Handler * = 0);
+
+  virtual ~ACE_TkReactor (void);
+
+  // = Timer operations.
+  virtual long schedule_timer (ACE_Event_Handler *event_handler,
+                               const void *arg,
+                               const ACE_Time_Value &delay,
+                               const ACE_Time_Value &interval);
+  virtual int reset_timer_interval (long timer_id,
+                                    const ACE_Time_Value &interval);
+  virtual int cancel_timer (ACE_Event_Handler *handler,
+                            int dont_call_handle_close = 1);
+  virtual int cancel_timer (long timer_id,
+                            const void **arg = 0,
+                            int dont_call_handle_close = 1);
+
+protected:
+  // = Register timers/handles with Tk.
+  /// Register a single <handler>.
+  virtual int register_handler_i (ACE_HANDLE handle,
+                                  ACE_Event_Handler *handler,
+                                  ACE_Reactor_Mask mask);
+
+  /// Register a set of <handlers>.
+  virtual int register_handler_i (const ACE_Handle_Set &handles,
+                                  ACE_Event_Handler *handler,
+                                  ACE_Reactor_Mask mask);
+
+  /// Remove the <handler> associated with this <handle>.
+  virtual int remove_handler_i (ACE_HANDLE handle,
+                                ACE_Reactor_Mask mask);
+
+  /// Remove a set of <handles>.
+  virtual int remove_handler_i (const ACE_Handle_Set &handles,
+                                ACE_Reactor_Mask);
+
+  /// Removes an Tk FileHandler.
+  virtual void remove_TkFileHandler (ACE_HANDLE handle);
+
+  /// Wait for events to occur.
+  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
+                                        ACE_Time_Value *);
+
+  ///Wait for Tk events to occur.
+  virtual int TkWaitForMultipleEvents (int,
+                                       ACE_Select_Reactor_Handle_Set &,
+                                       ACE_Time_Value *);
+
+  ACE_TkReactorID *ids_;
+  Tk_TimerToken timeout_;
+
+private:
+  /// This method ensures there's a Tk timeout for the first timeout in
+  /// the Reactor's Timer_Queue.
+  void reset_timeout (void);
+
+  // = Integrate with the X callback function mechanism.
+  static void TimerCallbackProc (ClientData cd);
+  static void InputCallbackProc (ClientData cd,int mask);
+
+  /// Deny access since member-wise won't work...
+  ACE_TkReactor (const ACE_TkReactor &);
+  ACE_TkReactor &operator = (const ACE_TkReactor &);
+};
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+#endif /* ACE_TK_REACTOR_H */
diff --git a/ACE/ace/TkReactor/TkReactor.cpp b/ACE/ace/TkReactor/TkReactor.cpp
deleted file mode 100644
index 942f66d7d1d..00000000000
--- a/ACE/ace/TkReactor/TkReactor.cpp
+++ /dev/null
@@ -1,439 +0,0 @@
-#include "ace/TkReactor/TkReactor.h"
-
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-
-ACE_RCSID(ace, TkReactor, "$Id$")
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE (ACE_TkReactor)
-
-// Must be called with lock held
-ACE_TkReactor::ACE_TkReactor (size_t size,
-                              int restart,
-                              ACE_Sig_Handler *h)
-  : ACE_Select_Reactor (size, restart, h),
-    ids_ (0),
-    timeout_ (0)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // TkReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the TkReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the TkReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the TkReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  this->notify_handler_->close ();
-  this->notify_handler_->open (this, 0);
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_TkReactor::~ACE_TkReactor (void)
-{
-  // Delete the remaining items in the linked list.
-
-  while (this->ids_)
-    {
-      ACE_TkReactorID *TkID = this->ids_->next_;
-      delete this->ids_;
-      this->ids_ = TkID;
-    }
-}
-
-// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
-// but we use the Tk functions to wait for an event, not <select>
-
-int
-ACE_TkReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-                                         ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_TkReactor::wait_for_multiple_events");
-  int nfound;
-
-  do
-    {
-      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-
-      size_t width = this->handler_rep_.max_handlep1 ();
-      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-      nfound = TkWaitForMultipleEvents (width,
-                                        handle_set,
-                                        max_wait_time);
-
-    } while (nfound == -1 && this->handle_error () > 0);
-
-  if (nfound > 0)
-    {
-#if !defined (ACE_WIN32)
-      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-    }
-  return nfound; // Timed out or input available
-}
-
-void
-ACE_TkReactor::TimerCallbackProc (ClientData cd)
-{
-  ACE_TkReactor *self = (ACE_TkReactor *) cd;
-  self->timeout_ = 0;
-
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  self->dispatch (0, handle_set);
-  self->reset_timeout ();
-}
-
-/**
- * @todo the unused mask argument is probably quite useful, but we
- *       ignore it, why?  In fact the following comment probably
- *       relates to that:
- *       This could be made shorter if we know which *kind* of event
- *       we were about to get.  Here we use <select> to find out which
- *       one might be available.
- */
-void
-ACE_TkReactor::InputCallbackProc (ClientData cd,
-                                  int /* mask */)
-{
-  ACE_TkReactor_Input_Callback *callback = (ACE_TkReactor_Input_Callback *) cd;
-  ACE_TkReactor *self = callback->reactor_;
-  ACE_HANDLE handle = callback->handle_;
-
-  // my copy isn't const.
-  ACE_Time_Value zero = ACE_Time_Value::zero;
-
-  ACE_Select_Reactor_Handle_Set wait_set;
-
-  // Deal with one file event.
-
-  // - read which kind of event
-  if (self->wait_set_.rd_mask_.is_set (handle))
-    wait_set.rd_mask_.set_bit (handle);
-  if (self->wait_set_.wr_mask_.is_set (handle))
-    wait_set.wr_mask_.set_bit (handle);
-  if (self->wait_set_.ex_mask_.is_set (handle))
-    wait_set.ex_mask_.set_bit (handle);
-
-  int result = ACE_OS::select (handle + 1,
-                               wait_set.rd_mask_,
-                               wait_set.wr_mask_,
-                               wait_set.ex_mask_, &zero);
-
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  // - Use only that one file event (removes events for other files).
-  if (result > 0)
-    {
-      if (wait_set.rd_mask_.is_set (handle))
-        dispatch_set.rd_mask_.set_bit (handle);
-      if (wait_set.wr_mask_.is_set (handle))
-        dispatch_set.wr_mask_.set_bit (handle);
-      if (wait_set.ex_mask_.is_set (handle))
-        dispatch_set.ex_mask_.set_bit (handle);
-
-      self->dispatch (1, dispatch_set);
-    }
-}
-
-int
-ACE_TkReactor::TkWaitForMultipleEvents (int width,
-                                        ACE_Select_Reactor_Handle_Set &wait_set,
-                                        ACE_Time_Value *)
-{
-  // Check to make sure our handle's are all usable.
-  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
-
-  if (ACE_OS::select (width,
-                      temp_set.rd_mask_,
-                      temp_set.wr_mask_,
-                      temp_set.ex_mask_,
-                      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-    return -1; // Bad file arguments...
-
-  // Instead of waiting using <select>, just use the Tk mechanism to
-  // wait for a single event.
-
-  // Wait for something to happen.
-  ::Tcl_DoOneEvent (0);
-
-  // Reset the width, in case it changed during the upcalls.
-  width = this->handler_rep_.max_handlep1 ();
-
-  // Now actually read the result needed by the <Select_Reactor> using
-  // <select>.
-  return ACE_OS::select (width,
-                         wait_set.rd_mask_,
-                         wait_set.wr_mask_,
-                         wait_set.ex_mask_,
-                         (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-int
-ACE_TkReactor::register_handler_i (ACE_HANDLE handle,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_TkReactor::register_handler_i");
-
-  int result = ACE_Select_Reactor::register_handler_i (handle,
-                                                       handler, mask);
-  if (result == -1)
-    return -1;
-
-  int condition = 0;
-
-#if !defined ACE_WIN32
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, TK_WRITABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, TK_EXCEPTION);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
-      ACE_SET_BITS (condition, TK_READABLE); // connected, you may write
-      ACE_SET_BITS (condition, TK_WRITABLE);  // connected, you have data/err
-  }
-#else
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, TK_WRITABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_NOTSUP_RETURN(-1);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
-      ACE_SET_BITS (condition, TK_READABLE); // connected, you may write
-      ACE_SET_BITS (condition, TK_WRITABLE);  // connected, you have data/err
-  }
-#endif /* !ACE_WIN32 */
-
-  if (condition != 0)
-    {
-      ACE_TkReactorID *TkID = this->ids_;
-
-      while(TkID)
-        {
-          if (TkID->handle_ == handle)
-            {
-              ::Tk_DeleteFileHandler (TkID->handle_);
-
-              ACE_TkReactor_Input_Callback *callback;
-              ACE_NEW_RETURN (callback,
-                              ACE_TkReactor_Input_Callback,
-                              -1);
-              callback->reactor_ = this;
-              callback->handle_ = handle;
-              ::Tk_CreateFileHandler ((int) handle,
-                                      condition,
-                                      InputCallbackProc,
-                                      (ClientData) callback);
-              return 0;
-            }
-          else
-            TkID = TkID->next_;
-        }
-
-      ACE_NEW_RETURN (TkID,
-                      ACE_TkReactorID,
-                      -1);
-      TkID->next_ = this->ids_;
-      TkID->handle_ = handle;
-      ACE_TkReactor_Input_Callback *callback;
-      ACE_NEW_RETURN (callback,
-                      ACE_TkReactor_Input_Callback,
-                      -1);
-      callback->reactor_ = this;
-      callback->handle_ = handle;
-
-      ::Tk_CreateFileHandler ((int) handle,
-                              condition,
-                              InputCallbackProc,
-                              (ClientData) callback);
-      this->ids_ = TkID;
-    }
-  return 0;
-}
-
-int
-ACE_TkReactor::register_handler_i (const ACE_Handle_Set &handles,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i (handles,
-                                                 handler,
-                                                 mask);
-}
-
-int
-ACE_TkReactor::remove_handler_i (ACE_HANDLE handle,
-                                 ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_TkReactor::remove_handler_i");
-
-  // In the registration phase we registered first with
-  // ACE_Select_Reactor and then with X.  Now we are now doing things
-  // in reverse order.
-
-  // First clean up the corresponding X11Input.
-  this->remove_TkFileHandler (handle);
-
-  // Now let the reactor do its work.
-  return ACE_Select_Reactor::remove_handler_i (handle,
-                                               mask);
-}
-
-void
-ACE_TkReactor::remove_TkFileHandler (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_TkReactor::remove_TkFileHandler");
-
-  ACE_TkReactorID *TkID = this->ids_;
-
-  if (TkID)
-    {
-      if (TkID->handle_ == handle)
-        {
-          ::Tk_DeleteFileHandler (TkID->handle_);
-          this->ids_ = TkID->next_;
-          delete TkID;
-          return;
-        }
-
-      ACE_TkReactorID *NextID = TkID->next_;
-
-      while (NextID)
-        {
-          if (NextID->handle_ == handle)
-            {
-              ::Tk_DeleteFileHandler (NextID->handle_);
-              TkID->next_ = NextID->next_;
-              delete NextID;
-              return;
-            }
-          else
-            {
-              TkID = NextID;
-              NextID = NextID->next_;
-            }
-        }
-    }
-}
-
-int
-ACE_TkReactor::remove_handler_i (const ACE_Handle_Set &handles,
-                                 ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-                                               mask);
-}
-
-// The following functions ensure that there is an Tk timeout for the
-// first timeout in the Reactor's Timer_Queue.
-
-void
-ACE_TkReactor::reset_timeout (void)
-{
-  if (this->timeout_)
-    ::Tk_DeleteTimerHandler (this->timeout_);
-  timeout_ = 0;
-
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0);
-
-  if (max_wait_time)
-    timeout_ = ::Tk_CreateTimerHandler (max_wait_time->msec (),
-                                        TimerCallbackProc,
-                                        (ClientData) this);
-}
-
-int
-ACE_TkReactor::reset_timer_interval
-  (long timer_id,
-   const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_TkReactor::reset_timer_interval");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  int result = ACE_Select_Reactor::timer_queue_->reset_interval
-    (timer_id,
-     interval);
-
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-long
-ACE_TkReactor::schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_TkReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  long result = ACE_Select_Reactor::schedule_timer (event_handler,
-                                                    arg,
-                                                    delay,
-                                                    interval);
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-int
-ACE_TkReactor::cancel_timer (ACE_Event_Handler *handler,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_TkReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-int
-ACE_TkReactor::cancel_timer (long timer_id,
-                             const void **arg,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_TkReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-                                        arg,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/TkReactor/TkReactor.h b/ACE/ace/TkReactor/TkReactor.h
deleted file mode 100644
index 80583bb8999..00000000000
--- a/ACE/ace/TkReactor/TkReactor.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TkReactor.h
- *
- *  $Id$
- *
- *  @author Nagarajan Surendran <naga@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_TKREACTOR_H
-#define ACE_TKREACTOR_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/TkReactor/ACE_TkReactor_export.h"
-#include "ace/Select_Reactor.h"
-#include /**/ <tk.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_TkReactorID
- *
- * @brief This little class is necessary due to the way that Microsoft
- * implements sockets to be pointers rather than indices.
- */
-class ACE_TkReactor_Export ACE_TkReactorID
-{
-public:
-  /// Underlying handle.
-  ACE_HANDLE handle_;
-
-  /// Pointer to next node in the linked list.
-  ACE_TkReactorID *next_;
-};
-
-class ACE_TkReactor;
-
-class ACE_TkReactor_Export ACE_TkReactor_Input_Callback
-{
-public:
-  ACE_TkReactor *reactor_;
-  ACE_HANDLE handle_;
-};
-
-/**
- * @class ACE_TkReactor
- *
- * @brief An object-oriented event demultiplexor and event handler
- * dispatcher that uses the Tk functions.
- */
-class ACE_TkReactor_Export ACE_TkReactor : public ACE_Select_Reactor
-{
-public:
-  // = Initialization and termination methods.
-  ACE_TkReactor (size_t size = DEFAULT_SIZE,
-                 int restart = 0,
-                 ACE_Sig_Handler * = 0);
-
-  virtual ~ACE_TkReactor (void);
-
-  // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                               const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval);
-  virtual int reset_timer_interval (long timer_id,
-                                    const ACE_Time_Value &interval);
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-                            int dont_call_handle_close = 1);
-  virtual int cancel_timer (long timer_id,
-                            const void **arg = 0,
-                            int dont_call_handle_close = 1);
-
-protected:
-  // = Register timers/handles with Tk.
-  /// Register a single <handler>.
-  virtual int register_handler_i (ACE_HANDLE handle,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Register a set of <handlers>.
-  virtual int register_handler_i (const ACE_Handle_Set &handles,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Remove the <handler> associated with this <handle>.
-  virtual int remove_handler_i (ACE_HANDLE handle,
-                                ACE_Reactor_Mask mask);
-
-  /// Remove a set of <handles>.
-  virtual int remove_handler_i (const ACE_Handle_Set &handles,
-                                ACE_Reactor_Mask);
-
-  /// Removes an Tk FileHandler.
-  virtual void remove_TkFileHandler (ACE_HANDLE handle);
-
-  /// Wait for events to occur.
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-
-  ///Wait for Tk events to occur.
-  virtual int TkWaitForMultipleEvents (int,
-                                       ACE_Select_Reactor_Handle_Set &,
-                                       ACE_Time_Value *);
-
-  ACE_TkReactorID *ids_;
-  Tk_TimerToken timeout_;
-
-private:
-  /// This method ensures there's a Tk timeout for the first timeout in
-  /// the Reactor's Timer_Queue.
-  void reset_timeout (void);
-
-  // = Integrate with the X callback function mechanism.
-  static void TimerCallbackProc (ClientData cd);
-  static void InputCallbackProc (ClientData cd,int mask);
-
-  /// Deny access since member-wise won't work...
-  ACE_TkReactor (const ACE_TkReactor &);
-  ACE_TkReactor &operator = (const ACE_TkReactor &);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_TK_REACTOR_H */
diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h
index efae24177d6..6ec6f9557bf 100644
--- a/ACE/ace/Truncate.h
+++ b/ACE/ace/Truncate.h
@@ -27,16 +27,16 @@
 #include "ace/If_Then_Else.h"
 #include "ace/Numeric_Limits.h"
 
-#if defined (__BORLANDC__) && __BORLANDC__ <= 0x590
+#if defined (__BORLANDC__) && __BORLANDC__ <= 0x582
 # include "ace/Basic_Types.h"
-#endif  /* __BORLANDC__ <= 0x590 */
+#endif  /* __BORLANDC__ <= 0x582 */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE_Utils
 {
 
-#if !defined (__BORLANDC__) || __BORLANDC__ > 0x590
+#if !defined (__BORLANDC__) || __BORLANDC__ > 0x582
 
   template<typename T> struct Sign_Check;
 
@@ -895,7 +895,7 @@ namespace ACE_Utils
     return truncator() (val);
   }
 
-#endif  /* !__BORLANDC__ || __BORLANDC__ > 0x590 */
+#endif  /* !__BORLANDC__ || __BORLANDC__ > 0x582 */
 
 } // namespace ACE_Utils
 
diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
index 9b35fe76a52..65eac030b59 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -113,7 +113,7 @@ namespace ACE_Utils
         // Get a buffer exactly the correct size. Use the nil UUID as a
         // gauge.  Don't forget the trailing nul.
         size_t UUID_STRING_LENGTH = 36 + thr_id_.length () + pid_.length ();
-        char *buf = 0;
+        char *buf;
 
         if ((thr_id_.length () != 0) && (pid_.length () != 0))
           {
@@ -161,20 +161,10 @@ namespace ACE_Utils
                              );
           }
 
-        // We allocated 'buf' above dynamically, so we shouldn't use
-        // ACE_NEW_RETURN here to avoid a possible memory leak.
-        ACE_NEW_NORETURN (this->as_string_,
-                          ACE_CString (buf, UUID_STRING_LENGTH));
-
-        // we first free the dynamically allocated 'buf'.
+        ACE_NEW_RETURN (this->as_string_,
+                        ACE_CString (buf, UUID_STRING_LENGTH),
+                        0);
         delete [] buf;
-
-        // then we test that ACE_NEW succeded for 'as_string_'
-        // if not, we return 0 (NULL) to indicate failure.
-        if( this->as_string_ == 0 )
-        {
-           return 0;
-        }
       }
 
     return as_string_;
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 3cede3b8bba..c940def3699 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -5,5 +5,5 @@
 
 #define ACE_MAJOR_VERSION 5
 #define ACE_MINOR_VERSION 5 
-#define ACE_BETA_VERSION 4 
-#define ACE_VERSION "5.5.4"
+#define ACE_BETA_VERSION 3 
+#define ACE_VERSION "5.5.3"
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp
index 29fec88714b..70447271dca 100644
--- a/ACE/ace/WFMO_Reactor.cpp
+++ b/ACE/ace/WFMO_Reactor.cpp
@@ -1192,7 +1192,7 @@ ACE_WFMO_Reactor::open (size_t size,
   this->atomic_wait_array_[0] = this->lock_.lock ().proc_mutex_;
   this->atomic_wait_array_[1] = this->ok_to_wait_.handle ();
 
-  // Prevent memory leaks when the ACE_WFMO_Reactor is reopened.
+  // Prevent memory leaks when the ACE_WFMO_Reactor is reopened. 
   if (this->delete_handler_rep_)
     {
       if (this->handler_rep_.changes_required ())
@@ -2423,7 +2423,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
               ACE_Event_Handler *event_handler =
                 buffer->eh_;
 
-              bool const requires_reference_counting =
+              int requires_reference_counting =
                 event_handler->reference_counting_policy ().value () ==
                 ACE_Event_Handler::Reference_Counting_Policy::ENABLED;
 
diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h
index e6d7c67e55e..a1ca110520e 100644
--- a/ACE/ace/WFMO_Reactor.h
+++ b/ACE/ace/WFMO_Reactor.h
@@ -1096,7 +1096,7 @@ public:
 
   /// Returns true if WFMO_Reactor has been successfully initialized, else
   /// false.
-  virtual bool initialized (void);
+  virtual int initialized (void);
 
   /// Returns the current size of the WFMO_Reactor's internal
   /// descriptor table.
diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl
index 7f72fdbe8f6..b2d24fb05d7 100644
--- a/ACE/ace/WFMO_Reactor.inl
+++ b/ACE/ace/WFMO_Reactor.inl
@@ -1132,7 +1132,7 @@ ACE_WFMO_Reactor::handler (ACE_HANDLE handle,
                                      event_handler);
 }
 
-ACE_INLINE bool
+ACE_INLINE int
 ACE_WFMO_Reactor::initialized (void)
 {
   return this->open_for_business_;
diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp
index 2ed1311936e..afe50d51c05 100644
--- a/ACE/ace/WIN32_Asynch_IO.cpp
+++ b/ACE/ace/WIN32_Asynch_IO.cpp
@@ -6,8 +6,7 @@ ACE_RCSID (ace,
            Win32_Asynch_IO,
            "$Id$")
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) && \
-    (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 1))
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 
 #include "ace/WIN32_Proactor.h"
 #include "ace/Message_Block.h"
@@ -167,7 +166,7 @@ ACE_WIN32_Asynch_Operation::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 int
 ACE_WIN32_Asynch_Operation::cancel (void)
 {
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) \
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \
     && (   (defined (_MSC_VER)) \
         || (defined (__BORLANDC__)) \
         || (defined (__MINGW32)))
@@ -187,7 +186,7 @@ ACE_WIN32_Asynch_Operation::cancel (void)
   // result is non-zero. All the operations are cancelled then.
   return 0;
 
-#else /* Not ACE_HAS_WIN32_OVERLAPPED_IO && _MSC... */
+#else /* Not ACE_HAS_WINNT4 && ACE_HAS_WINNT4!=0 && _MSC... */
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_AIO_CALLS */
 }
@@ -1300,7 +1299,7 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block,
                                    int priority,
                                    int signal_number)
 {
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if ((ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   static const size_t page_size = ACE_OS::getpagesize();
 
   FILE_SEGMENT_ELEMENT buffer_pointers[ACE_IOV_MAX + 1];
@@ -1400,9 +1399,9 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block,
   }
 
   return initiate_result;
-#else
+#else /*#if ( (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))*/
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_WIN32_OVERLAPPED_IO */
+#endif /*#if ( (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))*/
 }
 
 
@@ -1700,7 +1699,7 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block,
                                      int priority,
                                      int signal_number)
 {
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if ((ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   static const size_t page_size = ACE_OS::getpagesize();
 
   FILE_SEGMENT_ELEMENT buffer_pointers[ACE_IOV_MAX + 1];
@@ -1805,11 +1804,11 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block,
   }
 
   return initiate_result;
-#else
+#else /*#if ((ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))*/
 
   ACE_NOTSUP_RETURN (-1);
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif /* */
 }
 
 
@@ -2042,7 +2041,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
                                  int signal_number,
                                  int addr_family)
 {
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   // Sanity check: make sure that enough space has been allocated by
   // the caller.
   size_t address_size =
@@ -2146,7 +2145,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
         }
       return -1;
     }
-#else
+#else /* ACE_HAS_WINNT4 .......|| ACE_HAS_AIO_CALLS */
   ACE_UNUSED_ARG (message_block);
   ACE_UNUSED_ARG (bytes_to_read);
   ACE_UNUSED_ARG (accept_handle);
@@ -2155,7 +2154,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
   ACE_UNUSED_ARG (signal_number);
   ACE_UNUSED_ARG (addr_family);
   ACE_NOTSUP_RETURN (-1);
-#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (defined (ACE_HAS_AIO_CALLS) */
 }
 
 ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept (void)
@@ -2461,12 +2460,8 @@ ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle,
 int ACE_WIN32_Asynch_Connect::post_result (ACE_WIN32_Asynch_Connect_Result * result,
                                            bool post_enable)
 {
-  ACE_HANDLE handle = result->connect_handle ();
   if (this->flg_open_ && post_enable)
     {
-      // NOTE: result is invalid after post_completion(). It's either deleted
-      // or will be shortly via the proactor dispatch, regardless of success
-      // or fail of the call.
       if (this->win32_proactor_ ->post_completion (result) == 0)
         return 0;
 
@@ -2475,15 +2470,14 @@ int ACE_WIN32_Asynch_Connect::post_result (ACE_WIN32_Asynch_Connect_Result * res
                   ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::post_result: ")
                   ACE_LIB_TEXT (" <post_completion> failed")));
     }
-  else
-    {
-      // There was no call to post_completion() so manually delete result.
-      delete result;
-    }
+
+   ACE_HANDLE handle = result->connect_handle ();
 
    if (handle != ACE_INVALID_HANDLE)
      ACE_OS::closesocket (handle);
 
+   delete result;
+
    return -1;
 }
 
@@ -2957,7 +2951,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
                                                int priority,
                                                int signal_number)
 {
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
 
   // TransmitFile API limits us to DWORD range.
   if (bytes_to_write > MAXDWORD || bytes_per_send > MAXDWORD)
@@ -3025,7 +3019,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
         }
       return -1;
     }
-#else
+#else /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
   ACE_UNUSED_ARG (file);
   ACE_UNUSED_ARG (header_and_trailer);
   ACE_UNUSED_ARG (bytes_to_write);
@@ -3037,7 +3031,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
   ACE_UNUSED_ARG (priority);
   ACE_UNUSED_ARG (signal_number);
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_WINSOCK2 */
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
 ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File (void)
@@ -3758,4 +3752,4 @@ ACE_WIN32_Asynch_Write_Dgram::ACE_WIN32_Asynch_Write_Dgram (ACE_WIN32_Proactor *
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO && ACE_HAS_WINSOCK2 */
+#endif /* ACE_WIN32 || ACE_HAS_WINCE */
diff --git a/ACE/ace/WIN32_Asynch_IO.h b/ACE/ace/WIN32_Asynch_IO.h
index d49072e9fe8..66e30b20584 100644
--- a/ACE/ace/WIN32_Asynch_IO.h
+++ b/ACE/ace/WIN32_Asynch_IO.h
@@ -32,8 +32,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) && \
-    (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 1))
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 
 #include "ace/Asynch_IO_Impl.h"
 #include "ace/Addr.h"
@@ -1932,6 +1931,6 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO && ACE_HAS_WINSOCK2 */
+#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
 #include /**/ "ace/post.h"
 #endif /* ACE_WIN32_ASYNCH_IO_H */
diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp
index e35c3b01d64..7ace0d987b0 100644
--- a/ACE/ace/WIN32_Proactor.cpp
+++ b/ACE/ace/WIN32_Proactor.cpp
@@ -4,7 +4,7 @@
 
 #include "ace/WIN32_Proactor.h"
 
-#if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 // WIN implemenatation of the Proactor.
 
 #include "ace/Log_Msg.h"
diff --git a/ACE/ace/WIN32_Proactor.h b/ACE/ace/WIN32_Proactor.h
index e6db85ba930..addc5bfd94e 100644
--- a/ACE/ace/WIN32_Proactor.h
+++ b/ACE/ace/WIN32_Proactor.h
@@ -24,7 +24,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 // WIN32 implementation of the Proactor.
 
 #include "ace/WIN32_Asynch_IO.h"
diff --git a/ACE/ace/XtReactor.cpp b/ACE/ace/XtReactor.cpp
new file mode 100644
index 00000000000..ab4612c9472
--- /dev/null
+++ b/ACE/ace/XtReactor.cpp
@@ -0,0 +1,450 @@
+// $Id$
+
+#include "ace/XtReactor.h"
+
+#include "ace/SOCK_Acceptor.h"
+#include "ace/SOCK_Connector.h"
+
+ACE_RCSID(ace, XtReactor, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_ALLOC_HOOK_DEFINE (ACE_XtReactor)
+
+// Must be called with lock held
+ACE_XtReactor::ACE_XtReactor (XtAppContext context,
+                              size_t size,
+                              int restart,
+                              ACE_Sig_Handler *h)
+  : ACE_Select_Reactor (size, restart, h),
+    context_ (context),
+    ids_ (0),
+    timeout_ (0)
+{
+  // When the ACE_Select_Reactor is constructed it creates the notify
+  // pipe and registers it with the register_handler_i() method. The
+  // XtReactor overloads this method BUT because the
+  // register_handler_i occurs when constructing the base class
+  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
+  // is called not the XtReactor register_handler_i().  This means
+  // that the notify pipe is registered with the ACE_Select_Reactor
+  // event handling code not the XtReactor and so notfications don't
+  // work.  To get around this we simply close and re-opened the
+  // notification handler in the constructor of the XtReactor.
+
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+  this->notify_handler_->close ();
+  this->notify_handler_->open (this, 0);
+#endif /* ACE_MT_SAFE */
+}
+
+ACE_XtReactor::~ACE_XtReactor (void)
+{
+  // Delete the remaining items in the linked list.
+
+  while (this->ids_)
+    {
+      ACE_XtReactorID *XtID = this->ids_->next_;
+      delete this->ids_;
+      this->ids_ = XtID;
+    }
+}
+
+// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
+// but we use the Xt functions to wait for an event, not <select>
+
+int
+ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
+                                         ACE_Time_Value *max_wait_time)
+{
+  ACE_TRACE ("ACE_XtReactor::wait_for_multiple_events");
+  int nfound;
+
+  do
+    {
+      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
+
+      size_t width = this->handler_rep_.max_handlep1 ();
+      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
+      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
+      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
+      nfound = XtWaitForMultipleEvents (width,
+                                        handle_set,
+                                        max_wait_time);
+
+    } while (nfound == -1 && this->handle_error () > 0);
+
+  if (nfound > 0)
+    {
+#if !defined (ACE_WIN32)
+      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
+      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
+      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
+#endif /* ACE_WIN32 */
+    }
+  return nfound; // Timed out or input available
+}
+
+void
+ACE_XtReactor::TimerCallbackProc (XtPointer closure, XtIntervalId * /* id */)
+{
+  ACE_XtReactor *self = (ACE_XtReactor *) closure;
+  self->timeout_ = 0;
+
+  // Deal with any timer events
+  ACE_Select_Reactor_Handle_Set handle_set;
+  self->dispatch (0, handle_set);
+  self->reset_timeout ();
+}
+
+// This could be made shorter if we know which *kind* of event we were
+// about to get.  Here we use <select> to find out which one might be
+// available.
+
+void
+ACE_XtReactor::InputCallbackProc (XtPointer closure,
+                                  int *source,
+                                  XtInputId *)
+{
+  ACE_XtReactor *self = (ACE_XtReactor *) closure;
+  ACE_HANDLE handle = (ACE_HANDLE) *source;
+
+  // my copy isn't const.
+  ACE_Time_Value zero = ACE_Time_Value::zero;
+
+  ACE_Select_Reactor_Handle_Set wait_set;
+
+  // Deal with one file event.
+
+  // - read which kind of event
+  if (self->wait_set_.rd_mask_.is_set (handle))
+    wait_set.rd_mask_.set_bit (handle);
+  if (self->wait_set_.wr_mask_.is_set (handle))
+    wait_set.wr_mask_.set_bit (handle);
+  if (self->wait_set_.ex_mask_.is_set (handle))
+    wait_set.ex_mask_.set_bit (handle);
+
+  int result = ACE_OS::select (*source + 1,
+                               wait_set.rd_mask_,
+                               wait_set.wr_mask_,
+                               wait_set.ex_mask_, &zero);
+
+  ACE_Select_Reactor_Handle_Set dispatch_set;
+
+  // - Use only that one file event (removes events for other files).
+  if (result > 0)
+    {
+      if (wait_set.rd_mask_.is_set (handle))
+        dispatch_set.rd_mask_.set_bit (handle);
+      if (wait_set.wr_mask_.is_set (handle))
+        dispatch_set.wr_mask_.set_bit (handle);
+      if (wait_set.ex_mask_.is_set (handle))
+        dispatch_set.ex_mask_.set_bit (handle);
+
+      self->dispatch (1, dispatch_set);
+    }
+}
+
+int
+ACE_XtReactor::XtWaitForMultipleEvents (int width,
+                                        ACE_Select_Reactor_Handle_Set &wait_set,
+                                        ACE_Time_Value *)
+{
+  // Make sure we have a valid context
+  ACE_ASSERT (this->context_ != 0);
+
+  // Check to make sure our handle's are all usable.
+  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
+
+  if (ACE_OS::select (width,
+                      temp_set.rd_mask_,
+                      temp_set.wr_mask_,
+                      temp_set.ex_mask_,
+                      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+    return -1; // Bad file arguments...
+
+  // Instead of waiting using <select>, just use the Xt mechanism to
+  // wait for a single event.
+
+  // Wait for something to happen.
+  ::XtAppProcessEvent (this->context_, XtIMAll);
+
+  // Reset the width, in case it changed during the upcalls.
+  width = this->handler_rep_.max_handlep1 ();
+
+  // Now actually read the result needed by the <Select_Reactor> using
+  // <select>.
+  return ACE_OS::select (width,
+                         wait_set.rd_mask_,
+                         wait_set.wr_mask_,
+                         wait_set.ex_mask_,
+                         (ACE_Time_Value *) &ACE_Time_Value::zero);
+}
+
+XtAppContext
+ACE_XtReactor::context (void) const
+{
+  return this->context_;
+}
+
+void
+ACE_XtReactor::context (XtAppContext context)
+{
+  this->context_ = context;
+}
+
+int
+ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
+{
+  ACE_TRACE ("ACE_XtReactor::register_handler_i");
+
+  // Make sure we have a valid context
+  ACE_ASSERT (this->context_ != 0);
+
+  int result = ACE_Select_Reactor::register_handler_i (handle,
+                                                       handler, mask);
+  if (result == -1)
+    return -1;
+
+  int condition = 0;
+
+#if !defined ACE_WIN32
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
+    ACE_SET_BITS (condition, XtInputReadMask);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
+    ACE_SET_BITS (condition, XtInputWriteMask);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
+    ACE_SET_BITS (condition, XtInputExceptMask);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
+    ACE_SET_BITS (condition, XtInputReadMask);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
+      ACE_SET_BITS (condition, XtInputWriteMask); // connected, you may write
+      ACE_SET_BITS (condition, XtInputReadMask);  // connected, you have data/err
+  }
+#else
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
+    ACE_SET_BITS (condition, XtInputReadWinsock);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
+    ACE_SET_BITS (condition, XtInputWriteWinsock);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
+    ACE_NOTSUP_RETURN(-1);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
+    ACE_SET_BITS (condition, XtInputReadWinsock);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
+      ACE_SET_BITS (condition, XtInputWriteWinsock); // connected, you may write
+      ACE_SET_BITS (condition, XtInputReadWinsock);  // connected, you have data/err
+  }
+#endif /* !ACE_WIN32 */
+
+  if (condition != 0)
+    {
+      ACE_XtReactorID *XtID = this->ids_;
+
+      while(XtID)
+        {
+          if (XtID->handle_ == handle)
+            {
+              ::XtRemoveInput (XtID->id_);
+
+              XtID->id_ = ::XtAppAddInput (this->context_,
+                                           (int) handle,
+                                           (XtPointer) condition,
+                                           InputCallbackProc,
+                                           (XtPointer) this);
+              return 0;
+            }
+          else
+            XtID = XtID->next_;
+        }
+
+      ACE_NEW_RETURN (XtID,
+                      ACE_XtReactorID,
+                      -1);
+      XtID->next_ = this->ids_;
+      XtID->handle_ = handle;
+      XtID->id_ = ::XtAppAddInput (this->context_,
+                                  (int) handle,
+                                  (XtPointer) condition,
+                                  InputCallbackProc,
+                                  (XtPointer) this);
+      this->ids_ = XtID;
+    }
+  return 0;
+}
+
+int
+ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles,
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
+{
+  return ACE_Select_Reactor::register_handler_i (handles,
+                                                 handler,
+                                                 mask);
+}
+
+int
+ACE_XtReactor::remove_handler_i (ACE_HANDLE handle,
+                                 ACE_Reactor_Mask mask)
+{
+  ACE_TRACE ("ACE_XtReactor::remove_handler_i");
+
+  // In the registration phase we registered first with
+  // ACE_Select_Reactor and then with X.  Now we are now doing things
+  // in reverse order.
+
+  // First clean up the corresponding X11Input.
+  this->remove_XtInput (handle);
+
+  // Now let the reactor do its work.
+  return ACE_Select_Reactor::remove_handler_i (handle,
+                                               mask);
+}
+
+void
+ACE_XtReactor::remove_XtInput (ACE_HANDLE handle)
+{
+  ACE_TRACE ("ACE_XtReactor::remove_XtInput");
+
+  ACE_XtReactorID *XtID = this->ids_;
+
+  if (XtID)
+    {
+      if (XtID->handle_ == handle)
+        {
+          ::XtRemoveInput (XtID->id_);
+          this->ids_ = XtID->next_;
+          delete XtID;
+          return;
+        }
+
+      ACE_XtReactorID *NextID = XtID->next_;
+
+      while (NextID)
+        {
+          if (NextID->handle_ == handle)
+            {
+              ::XtRemoveInput(NextID->id_);
+              XtID->next_ = NextID->next_;
+              delete NextID;
+              return;
+            }
+          else
+            {
+              XtID = NextID;
+              NextID = NextID->next_;
+            }
+        }
+    }
+}
+
+int
+ACE_XtReactor::remove_handler_i (const ACE_Handle_Set &handles,
+                                 ACE_Reactor_Mask mask)
+{
+  return ACE_Select_Reactor::remove_handler_i (handles,
+                                               mask);
+}
+
+// The following functions ensure that there is an Xt timeout for the
+// first timeout in the Reactor's Timer_Queue.
+
+void
+ACE_XtReactor::reset_timeout (void)
+{
+  // Make sure we have a valid context
+  ACE_ASSERT (this->context_ != 0);
+
+  if (timeout_)
+    ::XtRemoveTimeOut (timeout_);
+  timeout_ = 0;
+
+  ACE_Time_Value *max_wait_time =
+    this->timer_queue_->calculate_timeout (0);
+
+  if (max_wait_time)
+    timeout_ = ::XtAppAddTimeOut (this->context_,
+                                  max_wait_time->msec (),
+                                  TimerCallbackProc,
+                                  (XtPointer) this);
+}
+
+int
+ACE_XtReactor::reset_timer_interval
+  (long timer_id,
+   const ACE_Time_Value &interval)
+{
+  ACE_TRACE ("ACE_XtReactor::reset_timer_interval");
+  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
+
+  int const result = ACE_Select_Reactor::timer_queue_->reset_interval
+    (timer_id,
+     interval);
+
+  if (result == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return result;
+    }
+}
+
+long
+ACE_XtReactor::schedule_timer (ACE_Event_Handler *event_handler,
+                const void *arg,
+                const ACE_Time_Value &delay,
+                               const ACE_Time_Value &interval)
+{
+  ACE_TRACE ("ACE_XtReactor::schedule_timer");
+  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
+
+  long const result = ACE_Select_Reactor::schedule_timer (event_handler,
+                                                          arg,
+                                                          delay,
+                                                          interval);
+  if (result == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return result;
+    }
+}
+
+int
+ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler,
+                             int dont_call_handle_close)
+{
+  ACE_TRACE ("ACE_XtReactor::cancel_timer");
+
+  if (ACE_Select_Reactor::cancel_timer (handler,
+                                        dont_call_handle_close) == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return 0;
+    }
+}
+
+int
+ACE_XtReactor::cancel_timer (long timer_id,
+                             const void **arg,
+                             int dont_call_handle_close)
+{
+  ACE_TRACE ("ACE_XtReactor::cancel_timer");
+
+  if (ACE_Select_Reactor::cancel_timer (timer_id,
+                                        arg,
+                                        dont_call_handle_close) == -1)
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return 0;
+    }
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/XtReactor.h b/ACE/ace/XtReactor.h
new file mode 100644
index 00000000000..c0d0a25ab80
--- /dev/null
+++ b/ACE/ace/XtReactor.h
@@ -0,0 +1,140 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    XtReactor.h
+ *
+ *  $Id$
+ *
+ *  @author Eric C. Newton <ecn@clark.net>
+ *  @author Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ */
+//=============================================================================
+
+
+#ifndef ACE_XTREACTOR_H
+#define ACE_XTREACTOR_H
+#include /**/ "ace/pre.h"
+
+#include /**/ "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ace/ACE_XtReactor_export.h"
+#include "ace/Select_Reactor.h"
+
+//#define String XtString
+#include /**/ <X11/Intrinsic.h>
+//#undef String
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class ACE_XtReactorID
+ *
+ * @brief This little class is necessary due to the way that Microsoft
+ * implements sockets to be pointers rather than indices.
+ */
+class ACE_XtReactor_Export ACE_XtReactorID
+{
+public:
+  /// Magic cookie.
+  XtInputId id_;
+
+  /// Underlying handle.
+  ACE_HANDLE handle_;
+
+  /// Pointer to next node in the linked list.
+  ACE_XtReactorID *next_;
+};
+
+/**
+ * @class ACE_XtReactor
+ *
+ * @brief An object-oriented event demultiplexor and event handler
+ * dispatcher that uses the X Toolkit functions.
+ */
+class ACE_XtReactor_Export ACE_XtReactor : public ACE_Select_Reactor
+{
+public:
+  // = Initialization and termination methods.
+  ACE_XtReactor (XtAppContext context = 0,
+                 size_t size = DEFAULT_SIZE,
+                 int restart = 0,
+                 ACE_Sig_Handler * = 0);
+  virtual ~ACE_XtReactor (void);
+
+  XtAppContext context (void) const;
+  void context (XtAppContext);
+
+  // = Timer operations.
+  virtual long schedule_timer (ACE_Event_Handler *event_handler,
+                               const void *arg,
+                               const ACE_Time_Value &delay,
+                               const ACE_Time_Value &interval);
+  virtual int reset_timer_interval (long timer_id,
+                                    const ACE_Time_Value &interval);
+  virtual int cancel_timer (ACE_Event_Handler *handler,
+                            int dont_call_handle_close = 1);
+
+  virtual int cancel_timer (long timer_id,
+                            const void **arg = 0,
+                            int dont_call_handle_close = 1);
+
+protected:
+  // = Register timers/handles with Xt.
+  /// Register a single <handler>.
+  virtual int register_handler_i (ACE_HANDLE handle,
+                                  ACE_Event_Handler *handler,
+                                  ACE_Reactor_Mask mask);
+
+  /// Register a set of <handlers>.
+  virtual int register_handler_i (const ACE_Handle_Set &handles,
+                                  ACE_Event_Handler *handler,
+                                  ACE_Reactor_Mask mask);
+
+  /// Remove the <handler> associated with this <handle>.
+  virtual int remove_handler_i (ACE_HANDLE handle,
+                                ACE_Reactor_Mask mask);
+
+  /// Remove a set of <handles>.
+  virtual int remove_handler_i (const ACE_Handle_Set &handles,
+                                ACE_Reactor_Mask);
+
+  /// Removes an Xt handle.
+  virtual void remove_XtInput (ACE_HANDLE handle);
+
+  /// Wait for events to occur.
+  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
+                                        ACE_Time_Value *);
+
+  ///Wait for Xt events to occur.
+  virtual int XtWaitForMultipleEvents (int,
+                                       ACE_Select_Reactor_Handle_Set &,
+                                       ACE_Time_Value *);
+
+  XtAppContext context_;
+  ACE_XtReactorID *ids_;
+  XtIntervalId timeout_;
+
+private:
+  /// This method ensures there's an Xt timeout for the first timeout
+  /// in the Reactor's Timer_Queue.
+  void reset_timeout (void);
+
+  // = Integrate with the X callback function mechanism.
+  static void TimerCallbackProc (XtPointer closure, XtIntervalId *id);
+  static void InputCallbackProc (XtPointer closure, int* source, XtInputId *id);
+
+  /// Deny access since member-wise won't work...
+  ACE_XtReactor (const ACE_XtReactor &);
+  ACE_XtReactor &operator = (const ACE_XtReactor &);
+};
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+
+#endif /* ACE_XTREACTOR_H */
diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor/XtReactor.cpp
deleted file mode 100644
index 7bdef11b936..00000000000
--- a/ACE/ace/XtReactor/XtReactor.cpp
+++ /dev/null
@@ -1,450 +0,0 @@
-// $Id$
-
-#include "ace/XtReactor/XtReactor.h"
-
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-
-ACE_RCSID(ace, XtReactor, "$Id$")
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE (ACE_XtReactor)
-
-// Must be called with lock held
-ACE_XtReactor::ACE_XtReactor (XtAppContext context,
-                              size_t size,
-                              int restart,
-                              ACE_Sig_Handler *h)
-  : ACE_Select_Reactor (size, restart, h),
-    context_ (context),
-    ids_ (0),
-    timeout_ (0)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // XtReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the XtReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the XtReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the XtReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  this->notify_handler_->close ();
-  this->notify_handler_->open (this, 0);
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_XtReactor::~ACE_XtReactor (void)
-{
-  // Delete the remaining items in the linked list.
-
-  while (this->ids_)
-    {
-      ACE_XtReactorID *XtID = this->ids_->next_;
-      delete this->ids_;
-      this->ids_ = XtID;
-    }
-}
-
-// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
-// but we use the Xt functions to wait for an event, not <select>
-
-int
-ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-                                         ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_XtReactor::wait_for_multiple_events");
-  int nfound;
-
-  do
-    {
-      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-
-      size_t width = this->handler_rep_.max_handlep1 ();
-      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-      nfound = XtWaitForMultipleEvents (width,
-                                        handle_set,
-                                        max_wait_time);
-
-    } while (nfound == -1 && this->handle_error () > 0);
-
-  if (nfound > 0)
-    {
-#if !defined (ACE_WIN32)
-      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-    }
-  return nfound; // Timed out or input available
-}
-
-void
-ACE_XtReactor::TimerCallbackProc (XtPointer closure, XtIntervalId * /* id */)
-{
-  ACE_XtReactor *self = (ACE_XtReactor *) closure;
-  self->timeout_ = 0;
-
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  self->dispatch (0, handle_set);
-  self->reset_timeout ();
-}
-
-// This could be made shorter if we know which *kind* of event we were
-// about to get.  Here we use <select> to find out which one might be
-// available.
-
-void
-ACE_XtReactor::InputCallbackProc (XtPointer closure,
-                                  int *source,
-                                  XtInputId *)
-{
-  ACE_XtReactor *self = (ACE_XtReactor *) closure;
-  ACE_HANDLE handle = (ACE_HANDLE) *source;
-
-  // my copy isn't const.
-  ACE_Time_Value zero = ACE_Time_Value::zero;
-
-  ACE_Select_Reactor_Handle_Set wait_set;
-
-  // Deal with one file event.
-
-  // - read which kind of event
-  if (self->wait_set_.rd_mask_.is_set (handle))
-    wait_set.rd_mask_.set_bit (handle);
-  if (self->wait_set_.wr_mask_.is_set (handle))
-    wait_set.wr_mask_.set_bit (handle);
-  if (self->wait_set_.ex_mask_.is_set (handle))
-    wait_set.ex_mask_.set_bit (handle);
-
-  int result = ACE_OS::select (*source + 1,
-                               wait_set.rd_mask_,
-                               wait_set.wr_mask_,
-                               wait_set.ex_mask_, &zero);
-
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  // - Use only that one file event (removes events for other files).
-  if (result > 0)
-    {
-      if (wait_set.rd_mask_.is_set (handle))
-        dispatch_set.rd_mask_.set_bit (handle);
-      if (wait_set.wr_mask_.is_set (handle))
-        dispatch_set.wr_mask_.set_bit (handle);
-      if (wait_set.ex_mask_.is_set (handle))
-        dispatch_set.ex_mask_.set_bit (handle);
-
-      self->dispatch (1, dispatch_set);
-    }
-}
-
-int
-ACE_XtReactor::XtWaitForMultipleEvents (int width,
-                                        ACE_Select_Reactor_Handle_Set &wait_set,
-                                        ACE_Time_Value *)
-{
-  // Make sure we have a valid context
-  ACE_ASSERT (this->context_ != 0);
-
-  // Check to make sure our handle's are all usable.
-  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
-
-  if (ACE_OS::select (width,
-                      temp_set.rd_mask_,
-                      temp_set.wr_mask_,
-                      temp_set.ex_mask_,
-                      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-    return -1; // Bad file arguments...
-
-  // Instead of waiting using <select>, just use the Xt mechanism to
-  // wait for a single event.
-
-  // Wait for something to happen.
-  ::XtAppProcessEvent (this->context_, XtIMAll);
-
-  // Reset the width, in case it changed during the upcalls.
-  width = this->handler_rep_.max_handlep1 ();
-
-  // Now actually read the result needed by the <Select_Reactor> using
-  // <select>.
-  return ACE_OS::select (width,
-                         wait_set.rd_mask_,
-                         wait_set.wr_mask_,
-                         wait_set.ex_mask_,
-                         (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-XtAppContext
-ACE_XtReactor::context (void) const
-{
-  return this->context_;
-}
-
-void
-ACE_XtReactor::context (XtAppContext context)
-{
-  this->context_ = context;
-}
-
-int
-ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_XtReactor::register_handler_i");
-
-  // Make sure we have a valid context
-  ACE_ASSERT (this->context_ != 0);
-
-  int result = ACE_Select_Reactor::register_handler_i (handle,
-                                                       handler, mask);
-  if (result == -1)
-    return -1;
-
-  int condition = 0;
-
-#if !defined ACE_WIN32
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, XtInputReadMask);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, XtInputWriteMask);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, XtInputExceptMask);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, XtInputReadMask);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
-      ACE_SET_BITS (condition, XtInputWriteMask); // connected, you may write
-      ACE_SET_BITS (condition, XtInputReadMask);  // connected, you have data/err
-  }
-#else
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, XtInputReadWinsock);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, XtInputWriteWinsock);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_NOTSUP_RETURN(-1);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, XtInputReadWinsock);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
-      ACE_SET_BITS (condition, XtInputWriteWinsock); // connected, you may write
-      ACE_SET_BITS (condition, XtInputReadWinsock);  // connected, you have data/err
-  }
-#endif /* !ACE_WIN32 */
-
-  if (condition != 0)
-    {
-      ACE_XtReactorID *XtID = this->ids_;
-
-      while(XtID)
-        {
-          if (XtID->handle_ == handle)
-            {
-              ::XtRemoveInput (XtID->id_);
-
-              XtID->id_ = ::XtAppAddInput (this->context_,
-                                           (int) handle,
-                                           (XtPointer) condition,
-                                           InputCallbackProc,
-                                           (XtPointer) this);
-              return 0;
-            }
-          else
-            XtID = XtID->next_;
-        }
-
-      ACE_NEW_RETURN (XtID,
-                      ACE_XtReactorID,
-                      -1);
-      XtID->next_ = this->ids_;
-      XtID->handle_ = handle;
-      XtID->id_ = ::XtAppAddInput (this->context_,
-                                  (int) handle,
-                                  (XtPointer) condition,
-                                  InputCallbackProc,
-                                  (XtPointer) this);
-      this->ids_ = XtID;
-    }
-  return 0;
-}
-
-int
-ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i (handles,
-                                                 handler,
-                                                 mask);
-}
-
-int
-ACE_XtReactor::remove_handler_i (ACE_HANDLE handle,
-                                 ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_XtReactor::remove_handler_i");
-
-  // In the registration phase we registered first with
-  // ACE_Select_Reactor and then with X.  Now we are now doing things
-  // in reverse order.
-
-  // First clean up the corresponding X11Input.
-  this->remove_XtInput (handle);
-
-  // Now let the reactor do its work.
-  return ACE_Select_Reactor::remove_handler_i (handle,
-                                               mask);
-}
-
-void
-ACE_XtReactor::remove_XtInput (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_XtReactor::remove_XtInput");
-
-  ACE_XtReactorID *XtID = this->ids_;
-
-  if (XtID)
-    {
-      if (XtID->handle_ == handle)
-        {
-          ::XtRemoveInput (XtID->id_);
-          this->ids_ = XtID->next_;
-          delete XtID;
-          return;
-        }
-
-      ACE_XtReactorID *NextID = XtID->next_;
-
-      while (NextID)
-        {
-          if (NextID->handle_ == handle)
-            {
-              ::XtRemoveInput(NextID->id_);
-              XtID->next_ = NextID->next_;
-              delete NextID;
-              return;
-            }
-          else
-            {
-              XtID = NextID;
-              NextID = NextID->next_;
-            }
-        }
-    }
-}
-
-int
-ACE_XtReactor::remove_handler_i (const ACE_Handle_Set &handles,
-                                 ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-                                               mask);
-}
-
-// The following functions ensure that there is an Xt timeout for the
-// first timeout in the Reactor's Timer_Queue.
-
-void
-ACE_XtReactor::reset_timeout (void)
-{
-  // Make sure we have a valid context
-  ACE_ASSERT (this->context_ != 0);
-
-  if (timeout_)
-    ::XtRemoveTimeOut (timeout_);
-  timeout_ = 0;
-
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0);
-
-  if (max_wait_time)
-    timeout_ = ::XtAppAddTimeOut (this->context_,
-                                  max_wait_time->msec (),
-                                  TimerCallbackProc,
-                                  (XtPointer) this);
-}
-
-int
-ACE_XtReactor::reset_timer_interval
-  (long timer_id,
-   const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_XtReactor::reset_timer_interval");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  int const result = ACE_Select_Reactor::timer_queue_->reset_interval
-    (timer_id,
-     interval);
-
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-long
-ACE_XtReactor::schedule_timer (ACE_Event_Handler *event_handler,
-                const void *arg,
-                const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_XtReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  long const result = ACE_Select_Reactor::schedule_timer (event_handler,
-                                                          arg,
-                                                          delay,
-                                                          interval);
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-int
-ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_XtReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-int
-ACE_XtReactor::cancel_timer (long timer_id,
-                             const void **arg,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_XtReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-                                        arg,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/XtReactor/XtReactor.h b/ACE/ace/XtReactor/XtReactor.h
deleted file mode 100644
index 22fb39ceeed..00000000000
--- a/ACE/ace/XtReactor/XtReactor.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    XtReactor.h
- *
- *  $Id$
- *
- *  @author Eric C. Newton <ecn@clark.net>
- *  @author Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_XTREACTOR_H
-#define ACE_XTREACTOR_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/XtReactor/ACE_XtReactor_export.h"
-#include "ace/Select_Reactor.h"
-
-#include /**/ <X11/Intrinsic.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_XtReactorID
- *
- * @brief This little class is necessary due to the way that Microsoft
- * implements sockets to be pointers rather than indices.
- */
-class ACE_XtReactor_Export ACE_XtReactorID
-{
-public:
-  /// Magic cookie.
-  XtInputId id_;
-
-  /// Underlying handle.
-  ACE_HANDLE handle_;
-
-  /// Pointer to next node in the linked list.
-  ACE_XtReactorID *next_;
-};
-
-/**
- * @class ACE_XtReactor
- *
- * @brief An object-oriented event demultiplexor and event handler
- * dispatcher that uses the X Toolkit functions.
- */
-class ACE_XtReactor_Export ACE_XtReactor : public ACE_Select_Reactor
-{
-public:
-  // = Initialization and termination methods.
-  ACE_XtReactor (XtAppContext context = 0,
-                 size_t size = DEFAULT_SIZE,
-                 int restart = 0,
-                 ACE_Sig_Handler * = 0);
-  virtual ~ACE_XtReactor (void);
-
-  XtAppContext context (void) const;
-  void context (XtAppContext);
-
-  // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                               const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval);
-  virtual int reset_timer_interval (long timer_id,
-                                    const ACE_Time_Value &interval);
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-                            int dont_call_handle_close = 1);
-
-  virtual int cancel_timer (long timer_id,
-                            const void **arg = 0,
-                            int dont_call_handle_close = 1);
-
-protected:
-  // = Register timers/handles with Xt.
-  /// Register a single <handler>.
-  virtual int register_handler_i (ACE_HANDLE handle,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Register a set of <handlers>.
-  virtual int register_handler_i (const ACE_Handle_Set &handles,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Remove the <handler> associated with this <handle>.
-  virtual int remove_handler_i (ACE_HANDLE handle,
-                                ACE_Reactor_Mask mask);
-
-  /// Remove a set of <handles>.
-  virtual int remove_handler_i (const ACE_Handle_Set &handles,
-                                ACE_Reactor_Mask);
-
-  /// Removes an Xt handle.
-  virtual void remove_XtInput (ACE_HANDLE handle);
-
-  /// Wait for events to occur.
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-
-  ///Wait for Xt events to occur.
-  virtual int XtWaitForMultipleEvents (int,
-                                       ACE_Select_Reactor_Handle_Set &,
-                                       ACE_Time_Value *);
-
-  XtAppContext context_;
-  ACE_XtReactorID *ids_;
-  XtIntervalId timeout_;
-
-private:
-  /// This method ensures there's an Xt timeout for the first timeout
-  /// in the Reactor's Timer_Queue.
-  void reset_timeout (void);
-
-  // = Integrate with the X callback function mechanism.
-  static void TimerCallbackProc (XtPointer closure, XtIntervalId *id);
-  static void InputCallbackProc (XtPointer closure, int* source, XtInputId *id);
-
-  /// Deny access since member-wise won't work...
-  ACE_XtReactor (const ACE_XtReactor &);
-  ACE_XtReactor &operator = (const ACE_XtReactor &);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_XTREACTOR_H */
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index 4b6aca6fd21..dc92a721395 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, filecache, versioned_namespace, pkgconfig {
+project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache, versioned_namespace, pkgconfig {
   avoids       = ace_for_tao
   libout       = $(ACE_ROOT)/lib
   sharedname   = ACE
@@ -367,7 +367,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca
     Swap.inl
     TSS_T.inl
     ace_wchar.inl
-    OS.inl
   }
 
   Header_Files {
diff --git a/ACE/ace/ace_flreactor.mpc b/ACE/ace/ace_flreactor.mpc
index b5c2c277bfb..af3f7afaf9c 100644
--- a/ACE/ace/ace_flreactor.mpc
+++ b/ACE/ace/ace_flreactor.mpc
@@ -1,32 +1,30 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE_FlReactor) : acedefaults, install, acelib, ace_fl{
+project(ACE_FlReactor) : acedefaults, core, acelib, ace_fl{
 
   sharedname   = ACE_FlReactor
   dynamicflags = ACE_FLREACTOR_BUILD_DLL
 
   Source_Files {
-    FlReactor
+    FlReactor.cpp
   }
 
   Header_Files {
-    FlReactor
+    ACE_FlReactor_export.h
+    FlReactor.h
   }
 
   Inline_Files {
-    FlReactor
   }
 
   Template_Files {
-    FlReactor
   }
 
   Resource_Files {
-    FlReactor
   }
 
   Pkgconfig_Files {
-    FlReactor/ACE_FlReactor.pc.in
+    ACE_FlReactor.pc.in
   }
 }
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index 58b7a928fe5..cd28be5635b 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -11,7 +11,7 @@
 // link.  This ACE_FOR_TAO subset library must remain as small as
 // possible.
 
-project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, pkgconfig {
+project(ACE_FOR_TAO) : acedefaults, core, svcconf, versioned_namespace, pkgconfig {
   macros      += ACE_LACKS_ACE_TOKEN
   requires     = ace_for_tao ace_svcconf
   libout       = $(ACE_ROOT)/lib
diff --git a/ACE/ace/ace_qtreactor.mpc b/ACE/ace/ace_qtreactor.mpc
index 324a29d02c6..549181b1348 100644
--- a/ACE/ace/ace_qtreactor.mpc
+++ b/ACE/ace/ace_qtreactor.mpc
@@ -1,38 +1,34 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE_QtReactor) : acedefaults, install, acelib, ace_qt {
+project(ACE_QtReactor) : acedefaults, core, acelib, ace_qt {
 
   sharedname   = ACE_QtReactor
   dynamicflags = ACE_QTREACTOR_BUILD_DLL
 
   MOC_Files {
-    QtReactor
+    QtReactor.h
   }
 
   Source_Files {
-
-    QtReactor/QtReactor_moc.cpp
-    QtReactor
+    QtReactor_moc.cpp
+    QtReactor.cpp
   }
 
   Header_Files {
-    QtReactor
+    ACE_QtReactor_export.h
   }
 
   Inline_Files {
-    QtReactor
   }
 
   Template_Files {
-    QtReactor
   }
 
   Resource_Files {
-    QtReactor
   }
 
   Pkgconfig_Files {
-    QtReactor/ACE_QtReactor.pc.in
+    ACE_QtReactor.pc.in
   }
 }
diff --git a/ACE/ace/ace_tkreactor.mpc b/ACE/ace/ace_tkreactor.mpc
index 544c9185c23..fbbda18160c 100644
--- a/ACE/ace/ace_tkreactor.mpc
+++ b/ACE/ace/ace_tkreactor.mpc
@@ -1,32 +1,30 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE_TkReactor) : acedefaults, install, acelib, ace_tk {
+project(ACE_TkReactor) : acedefaults, core, acelib, ace_tk {
 
   sharedname   = ACE_TkReactor
   dynamicflags = ACE_TKREACTOR_BUILD_DLL
 
   Source_Files {
-    TkReactor
+    TkReactor.cpp
   }
 
   Header_Files {
-    TkReactor
+    ACE_TkReactor_export.h
+    TkReactor.h
   }
 
   Inline_Files {
-    TkReactor
   }
 
   Template_Files {
-    TkReactor
   }
 
   Resource_Files {
-    TkReactor
   }
 
   Pkgconfig_Files {
-    TkReactor/ACE_TkReactor.pc.in
+    ACE_TkReactor.pc.in
   }
 }
diff --git a/ACE/ace/ace_xtreactor.mpc b/ACE/ace/ace_xtreactor.mpc
index 5efdaaed5ca..9d8c44e666f 100644
--- a/ACE/ace/ace_xtreactor.mpc
+++ b/ACE/ace/ace_xtreactor.mpc
@@ -1,32 +1,30 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE_XtReactor) : acedefaults, install, acelib, ace_xt {
+project(ACE_XtReactor) : acedefaults, core, acelib, ace_xt {
 
   sharedname   = ACE_XtReactor
   dynamicflags = ACE_XTREACTOR_BUILD_DLL
 
   Source_Files {
-    XtReactor
+    XtReactor.cpp
   }
 
   Header_Files {
-    XtReactor
+    XtReactor.h
+    ACE_XtReactor_export.h
   }
 
   Inline_Files {
-    XtReactor
   }
 
   Template_Files {
-    XtReactor
   }
 
   Resource_Files {
-    XtReactor
   }
 
   Pkgconfig_Files {
-    XtReactor/ACE_XtReactor.pc.in
+    ACE_XtReactor.pc.in
   }
 }
diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h
index 70a9694c857..8a31e29f9fd 100644
--- a/ACE/ace/config-WinCE.h
+++ b/ACE/ace/config-WinCE.h
@@ -68,6 +68,12 @@
 
 #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
 
+// CE is not NT.
+#if defined (ACE_HAS_WINNT4)
+# undef ACE_HAS_WINNT4
+#endif  // ACE_HAS_WINNT4
+#define ACE_HAS_WINNT4 0
+
 #define ACE_LACKS_MSG_WFMO
 #define ACE_LACKS_UMASK
 
diff --git a/ACE/ace/config-aix-4.1.x.h b/ACE/ace/config-aix-4.1.x.h
new file mode 100644
index 00000000000..a739c1ae49a
--- /dev/null
+++ b/ACE/ace/config-aix-4.1.x.h
@@ -0,0 +1,8 @@
+/* -*- C++ -*- */
+// $Id$
+
+#ifndef ACE_AIX_VERS
+# define ACE_AIX_VERS 401
+#endif
+
+#include "ace/config-aix-4.x.h"
diff --git a/ACE/ace/config-aix-4.2.x.h b/ACE/ace/config-aix-4.2.x.h
new file mode 100644
index 00000000000..b44c851a437
--- /dev/null
+++ b/ACE/ace/config-aix-4.2.x.h
@@ -0,0 +1,8 @@
+/* -*- C++ -*- */
+// $Id$
+
+#ifndef ACE_AIX_VERS
+# define ACE_AIX_VERS 402
+#endif
+
+#include "ace/config-aix-4.x.h"
diff --git a/ACE/ace/config-aix-4.3.x.h b/ACE/ace/config-aix-4.3.x.h
new file mode 100644
index 00000000000..d6b2824ec35
--- /dev/null
+++ b/ACE/ace/config-aix-4.3.x.h
@@ -0,0 +1,8 @@
+/* -*- C++ -*- */
+// $Id$
+
+#ifndef ACE_AIX_VERS
+# define ACE_AIX_VERS 403
+#endif
+
+#include "ace/config-aix-4.x.h"
diff --git a/ACE/ace/config-aix-4.x.h b/ACE/ace/config-aix-4.x.h
new file mode 100644
index 00000000000..d434ad61003
--- /dev/null
+++ b/ACE/ace/config-aix-4.x.h
@@ -0,0 +1,347 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for OS
+// platforms running AIX 4.x using the IBM C++ compiler (xlC),
+// Visual Age C++ or g++.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+// Both IBM and g++ compilers set _THREAD_SAFE if compiler is asked to compile
+// threaded code (xlC_r, as opposed to xlC; and g++ -pthread)
+#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0)
+#  if defined (ACE_HAS_THREADS)
+#    undef ACE_HAS_THREADS
+#  endif
+#  if defined (_THREAD_SAFE)
+#    define ACE_HAS_THREADS 1
+// #  else
+// #    define ACE_HAS_THREADS 0
+#  endif /* _THREAD_SAFE */
+#endif /* !ACE_MT_SAFE || (ACE_MT_SAFE != 0) */
+
+#if defined (__xlC__) || defined (__IBMCPP__)
+   // AIX xlC, IBM C/C++, and Visual Age C++ compilers
+   //********************************************************************
+   //
+
+// Compiler does this with a builtin - it's not in libc.
+// 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 supports the ssize_t typedef.
+#  define ACE_HAS_SSIZE_T
+
+// When using the preprocessor, Ignore info msg; invalid #pragma
+#  if defined (__IBMCPP__) && (__IBMCPP__ < 400)  // IBM C++ 3.6
+#    define ACE_CC_PREPROCESSOR_ARGS "-E -qflag=w:w"
+#  endif /* (__IBMCPP__) && (__IBMCPP__ < 400) */
+
+   // Keep an eye on this as the compiler and standards converge...
+#  define ACE_LACKS_LINEBUFFERED_STREAMBUF
+#  define ACE_LACKS_PRAGMA_ONCE
+
+   // C Set++ 3.1, IBM C/C++ 3.6, and Visual Age C++ 5 batch (__xlC__)
+#  if defined (__xlC__)
+#    if (__xlC__ < 0x0500)
+#      define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
+#    endif /* __xlC__ < 0x0500 */
+#  endif
+
+   // These are for Visual Age C++ only
+#  if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
+#    define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
+#    define ACE_HAS_TYPENAME_KEYWORD
+     // When using -qtempinc, we don't need to see template implementation
+     // source (though we do need a pragma to find the correct source file).
+     // However, without -qtempinc (either -qnotempinc or -qtemplateregistry)
+     // we do need to see the source.
+#    if defined (__TEMPINC__)
+#      if !defined ACE_TEMPLATES_REQUIRE_PRAGMA
+#        define ACE_TEMPLATES_REQUIRE_PRAGMA
+#      endif
+#    else
+#      if !defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#        define ACE_TEMPLATES_REQUIRE_SOURCE
+#      endif
+#    endif /* __TEMPINC__ */
+
+#    undef WIFEXITED
+#    undef WEXITSTATUS
+
+#    if (__IBMCPP__ >= 500)  /* Visual Age C++ 5 */
+#      define ACE_HAS_STANDARD_CPP_LIBRARY 1
+#      define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#    endif /* __IBMCPP__ >= 500 */
+
+#    if (__IBMCPP__ >= 600) /* Visual Age 6 and XL C/C++ 7 and up */
+#      define ACE_HAS_TEMPLATE_TYPEDEFS
+#    endif /* __IBMCPP__ >= 600 */
+#  endif /* __IBMCPP__ */
+
+#elif defined (__GNUG__)
+  // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+  // this must appear before its #include.
+# define ACE_HAS_STRING_CLASS
+
+# include "ace/config-g++-common.h"
+  // Denotes that GNU has cstring.h as standard, to redefine memchr().
+# define ACE_HAS_GNU_CSTRING_H
+# define ACE_HAS_SSIZE_T
+
+# if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 0))
+// We have to explicitly instantiate static template members prior to g++ 4.1
+#   define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
+#endif /* g++ prior to 4.1 */
+
+# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
+    // ACE_MT_SAFE is #defined below, for all compilers.
+#   if !defined (_REENTRANT)
+#     define _REENTRANT
+#   endif /* _REENTRANT */
+# endif /* !ACE_MT_SAFE */
+
+#else  /* ! __xlC__ && ! __GNUG__ */
+#  ifdef __cplusplus  /* Let it slide for C compilers. */
+#    error unsupported compiler in ace/config-aix-4.x.h
+#  endif  /* __cplusplus */
+#endif /* ! __xlC__ && ! __GNUG__ */
+
+
+// Compiling for AIX.
+#ifndef AIX
+#  define AIX
+#endif /* AIX */
+
+// Pick up all the detectable settings.
+#include "ace/config-posix.h"
+
+#if defined (ACE_HAS_POSIX_SEM_TIMEOUT)
+# undef ACE_HAS_POSIX_SEM_TIMEOUT
+#endif /* ACE_HAS_POSIX_SEM_TIMEOUT */
+
+// AIX shared libs look strangely like archive libs until you look inside
+// them.
+#if defined (ACE_DLL_SUFFIX)
+#  undef ACE_DLL_SUFFIX
+#endif
+#define ACE_DLL_SUFFIX ".a"
+
+// Use BSD 4.4 socket definitions for pre-AIX 4.2.  The _BSD setting also
+// controls the data type used for waitpid(), wait(), and wait3().
+#if (ACE_AIX_VERS < 402)
+#  define _BSD 44
+#  define ACE_HAS_UNION_WAIT
+#endif /* ACE_AIX_VERS < 402 */
+
+// This environment requires this thing, pre-AIX 4.3
+#if (ACE_AIX_VERS < 403)
+#  define _BSD_INCLUDES
+#endif /* ACE_AIX_VERS < 403 */
+
+#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
+
+#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+
+// ACE_HAS_AIX_BROKEN_SOCKET_HEADER may be required if your OS patches are
+// not up to date.  On up-to-date 4.2+ systems, it should not be required.
+// 4.2+ has 4.4 BSD sendmsg/recvmsg
+#if (ACE_AIX_VERS < 402)
+#  define ACE_HAS_AIX_BROKEN_SOCKET_HEADER
+#else
+#  if (ACE_AIX_VERS == 402)
+#    define ACE_HAS_SIZET_SOCKET_LEN
+#  else
+#    define ACE_HAS_SOCKLEN_T
+#  endif
+#  define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
+#endif /* ACE_AIX_VERS < 402 */
+
+#if (ACE_AIX_VERS >= 403)
+// AIX has AIO, but the functions don't match those of other AIO-enabled
+// platforms. If this is to work, it'll require some significant work,
+// maybe moving the OS-abstraction stuff to an OS_AIO or some such thing.
+//#  define ACE_HAS_AIO_CALLS
+#endif /* ACE_AIX_VERS >= 403 */
+
+#define ACE_HAS_AIX_HI_RES_TIMER
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+#if (ACE_AIX_VERS < 403)
+#  define ACE_HAS_CHARPTR_DL
+#endif /* ACE_AIX_VERS < 403 */
+
+// Prototypes for both signal() and struct sigaction are consistent.
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+
+// OS has readdir and friends.
+#define ACE_HAS_DIRENT
+
+// OS supports the getrusage() system call
+#define ACE_HAS_GETRUSAGE
+
+#define ACE_HAS_GPERF
+
+#define ACE_HAS_H_ERRNO
+
+#define ACE_LACKS_STDINT_H
+#define ACE_LACKS_SYS_SYSCTL_H
+
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+#define ACE_HAS_NONCONST_SELECT_TIMEVAL
+#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 */
+
+#define ACE_HAS_MSG
+#if (ACE_AIX_VERS < 402)
+#  define ACE_LACKS_MSG_ACCRIGHTS
+#  define ACE_LACKS_RLIMIT
+#endif
+
+// Compiler/platform supports poll().
+#define ACE_HAS_POLL
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+#define ACE_HAS_POSIX_TIME
+// ... but needs to include another header for it on 4.2+
+#if (ACE_AIX_VERS >= 402)
+#  define ACE_HAS_BROKEN_POSIX_TIME
+#endif /* ACE_AIX_VERS > 402 */
+// ... and needs another typedef
+#define ACE_LACKS_TIMESPEC_T
+#define ACE_HAS_SELECT_H
+
+#define ACE_HAS_REENTRANT_FUNCTIONS
+
+// Compiler/platform defines the sig_atomic_t typedef
+#define ACE_HAS_SIG_ATOMIC_T
+#if (ACE_AIX_VERS >= 402)
+#  define ACE_HAS_SIGINFO_T
+#  define ACE_LACKS_SIGINFO_H
+#endif /* ACE_AIX_VERS >= 402 */
+#if (ACE_AIX_VERS >= 403)
+// it may exist in earlier revs, but I'm not sure and I don't have a
+// system to validate
+#  define ACE_HAS_P_READ_WRITE
+#endif /* ACE_AIX_VERS >= 403 */
+
+#define ACE_HAS_SIGWAIT
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_STRBUF_T
+
+// Compiler supports stropts.h
+#define ACE_HAS_STREAMS
+// #define ACE_HAS_STREAM_PIPES
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// AIX bzero()
+#define ACE_HAS_STRINGS
+
+#define ACE_HAS_STRUCT_NETDB_DATA
+
+// Dynamic linking is in good shape on newer OS/patch levels.  If you have
+// trouble with the dynamic linking parts of ACE, and can't patch your OS
+// up to latest levels, comment this out.
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+// This is tightly related to dynamic linking...
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+
+#define ACE_HAS_SVR4_GETTIMEOFDAY
+
+#define ACE_HAS_SYSV_IPC
+#define ACE_HAS_TIMOD_H
+#define ACE_HAS_XTI
+#define ACE_HAS_BROKEN_T_ERROR
+#define ACE_TLI_TCP_DEVICE  "/dev/xti/tcp"
+
+#define ACE_HAS_UALARM
+
+#if (ACE_AIX_VERS >= 402)
+#  define ACE_HAS_UCONTEXT_T
+#endif /* ACE_AIX_VERS >= 402 */
+
+#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).
+#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
+
+// AIX uses LIBPATH to search for libraries
+#define ACE_LD_SEARCH_PATH "LIBPATH"
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+//**************************************************************
+//
+// Threads related definitions.
+//
+// The threads on AIX are generally POSIX P1003.1c (ACE_HAS_PTHREADS).
+// However, there is also a kernel thread ID (tid_t) that is used in
+// ACE_Log_Msg (printing the thread ID).  The tid_t is not the same as
+// pthread_t, and can't derive one from the other - thread_self() gets
+// the tid_t (kernel thread ID) if called from a thread.
+// Thanks very much to Chris Lahey for straightening this out.
+
+#if defined (ACE_HAS_THREADS)
+#  if !defined (ACE_MT_SAFE)
+#    define ACE_MT_SAFE 1
+#  endif
+
+#  define ACE_HAS_PTHREADS
+// 4.3 and up has 1003.1c standard; 4.2 has draft 7
+#  if (ACE_AIX_VERS >= 403)
+#    define ACE_HAS_PTHREADS_STD
+#    define ACE_HAS_PTHREADS_UNIX98_EXT
+#    define ACE_HAS_PTHREAD_CONTINUE_NP
+#    define ACE_HAS_PTHREAD_SUSPEND_NP
+#    define ACE_HAS_RECURSIVE_MUTEXES
+#  else
+#    define ACE_HAS_PTHREADS_DRAFT7
+#    define ACE_LACKS_RWLOCK_T
+#    define ACE_LACKS_THREAD_STACK_ADDR
+// If ACE doesn't compile due to the lack of these methods, please
+// send email to ace-users@cs.wustl.edu reporting this.
+// #define ACE_LACKS_CONDATTR_PSHARED
+// #define ACE_LACKS_MUTEXATTR_PSHARED
+#    define ACE_LACKS_SETSCHED
+#  endif /* ACE_AIX_VERS >= 403 */
+
+#  define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+#  define ACE_HAS_SIGTHREADMASK
+#  define ACE_HAS_THREAD_SPECIFIC_STORAGE
+
+#  define ACE_LACKS_THREAD_PROCESS_SCOPING
+#else
+#  undef ACE_HAS_THREADS
+#endif /* ACE_HAS_THREADS != 0 */
+
+#define ACE_MALLOC_ALIGN 8
+
+#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) && !defined(_UNIX95)
+# define ACE_HAS_3_PARAM_WCSTOK
+#endif /* (_XOPEN_SOURCE -0) >= 500 && !_UNIX95 */
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h
index 36d31fb2900..42cb40b96db 100644
--- a/ACE/ace/config-aix-5.x.h
+++ b/ACE/ace/config-aix-5.x.h
@@ -26,285 +26,7 @@
 #if !defined (ACE_HAS_AIO_CALLS)
 #  define _ACE_DISABLE_AIO_CALLS_
 #endif
-
-// Both IBM and g++ compilers set _THREAD_SAFE if compiler is asked to compile
-// threaded code (xlC_r, as opposed to xlC; and g++ -pthread)
-#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0)
-#  if defined (ACE_HAS_THREADS)
-#    undef ACE_HAS_THREADS
-#  endif
-#  if defined (_THREAD_SAFE)
-#    define ACE_HAS_THREADS 1
-// #  else
-// #    define ACE_HAS_THREADS 0
-#  endif /* _THREAD_SAFE */
-#endif /* !ACE_MT_SAFE || (ACE_MT_SAFE != 0) */
-
-#if defined (__xlC__) || defined (__IBMCPP__)
-   // AIX xlC, IBM C/C++, and Visual Age C++ compilers
-   //********************************************************************
-   //
-
-// Compiler does this with a builtin - it's not in libc.
-// 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 supports the ssize_t typedef.
-#  define ACE_HAS_SSIZE_T
-
-// When using the preprocessor, Ignore info msg; invalid #pragma
-#  if defined (__IBMCPP__) && (__IBMCPP__ < 400)  // IBM C++ 3.6
-#    define ACE_CC_PREPROCESSOR_ARGS "-E -qflag=w:w"
-#  endif /* (__IBMCPP__) && (__IBMCPP__ < 400) */
-
-   // Keep an eye on this as the compiler and standards converge...
-#  define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#  define ACE_LACKS_PRAGMA_ONCE
-
-   // C Set++ 3.1, IBM C/C++ 3.6, and Visual Age C++ 5 batch (__xlC__)
-#  if defined (__xlC__)
-#    if (__xlC__ < 0x0500)
-#      define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
-#    endif /* __xlC__ < 0x0500 */
-#  endif
-
-   // These are for Visual Age C++ only
-#  if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-#    define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
-#    define ACE_HAS_TYPENAME_KEYWORD
-     // When using -qtempinc, we don't need to see template implementation
-     // source (though we do need a pragma to find the correct source file).
-     // However, without -qtempinc (either -qnotempinc or -qtemplateregistry)
-     // we do need to see the source.
-#    if defined (__TEMPINC__)
-#      if !defined ACE_TEMPLATES_REQUIRE_PRAGMA
-#        define ACE_TEMPLATES_REQUIRE_PRAGMA
-#      endif
-#    else
-#      if !defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#        define ACE_TEMPLATES_REQUIRE_SOURCE
-#      endif
-#    endif /* __TEMPINC__ */
-
-#    undef WIFEXITED
-#    undef WEXITSTATUS
-
-#    if (__IBMCPP__ >= 500)  /* Visual Age C++ 5 */
-#      define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#      define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-#    endif /* __IBMCPP__ >= 500 */
-
-#    if (__IBMCPP__ >= 600) /* Visual Age 6 and XL C/C++ 7 and up */
-#      define ACE_HAS_TEMPLATE_TYPEDEFS
-#    endif /* __IBMCPP__ >= 600 */
-#  endif /* __IBMCPP__ */
-
-#elif defined (__GNUG__)
-  // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
-  // this must appear before its #include.
-# define ACE_HAS_STRING_CLASS
-
-# include "ace/config-g++-common.h"
-  // Denotes that GNU has cstring.h as standard, to redefine memchr().
-# define ACE_HAS_GNU_CSTRING_H
-# define ACE_HAS_SSIZE_T
-
-# if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 0))
-// We have to explicitly instantiate static template members prior to g++ 4.1
-#   define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-#endif /* g++ prior to 4.1 */
-
-# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
-    // ACE_MT_SAFE is #defined below, for all compilers.
-#   if !defined (_REENTRANT)
-#     define _REENTRANT
-#   endif /* _REENTRANT */
-# endif /* !ACE_MT_SAFE */
-
-#else  /* ! __xlC__ && ! __GNUG__ */
-#  ifdef __cplusplus  /* Let it slide for C compilers. */
-#    error unsupported compiler in ace/config-aix-5.x.h
-#  endif  /* __cplusplus */
-#endif /* ! __xlC__ && ! __GNUG__ */
-
-// Compiling for AIX.
-#ifndef AIX
-#  define AIX
-#endif /* AIX */
-
-// Pick up all the detectable settings.
-#include "ace/config-posix.h"
-
-#if defined (ACE_HAS_POSIX_SEM_TIMEOUT)
-# undef ACE_HAS_POSIX_SEM_TIMEOUT
-#endif /* ACE_HAS_POSIX_SEM_TIMEOUT */
-
-// AIX shared libs look strangely like archive libs until you look inside
-// them.
-#if defined (ACE_DLL_SUFFIX)
-#  undef ACE_DLL_SUFFIX
-#endif
-#define ACE_DLL_SUFFIX ".a"
-
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-#define ACE_HAS_SOCKLEN_T
-#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-
-// AIX has AIO, but the functions don't match those of other AIO-enabled
-// platforms. If this is to work, it'll require some significant work,
-// maybe moving the OS-abstraction stuff to an OS_AIO or some such thing.
-//#  define ACE_HAS_AIO_CALLS
-
-#define ACE_HAS_AIX_HI_RES_TIMER
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// OS has readdir and friends.
-#define ACE_HAS_DIRENT
-
-// OS supports the getrusage() system call
-#define ACE_HAS_GETRUSAGE
-
-#define ACE_HAS_GPERF
-
-#define ACE_HAS_H_ERRNO
-
-#define ACE_LACKS_STDINT_H
-#define ACE_LACKS_SYS_SYSCTL_H
-
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-#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 */
-
-#define ACE_HAS_MSG
-
-// Compiler/platform supports poll().
-#define ACE_HAS_POLL
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
-
-#define ACE_HAS_POSIX_TIME
-// ... but needs to include another header for it on 4.2+
-#  define ACE_HAS_BROKEN_POSIX_TIME
-// ... and needs another typedef
-#define ACE_LACKS_TIMESPEC_T
-#define ACE_HAS_SELECT_H
-
-#define ACE_HAS_REENTRANT_FUNCTIONS
-
-// Compiler/platform defines the sig_atomic_t typedef
-#define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_SIGINFO_T
-#define ACE_LACKS_SIGINFO_H
-#define ACE_HAS_P_READ_WRITE
-
-#define ACE_HAS_SIGWAIT
-#define ACE_HAS_SOCKADDR_IN_SIN_LEN
-#define ACE_HAS_STRBUF_T
-
-// Compiler supports stropts.h
-#define ACE_HAS_STREAMS
-// #define ACE_HAS_STREAM_PIPES
-
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
-// AIX bzero()
-#define ACE_HAS_STRINGS
-
-#define ACE_HAS_STRUCT_NETDB_DATA
-
-// Dynamic linking is in good shape on newer OS/patch levels.  If you have
-// trouble with the dynamic linking parts of ACE, and can't patch your OS
-// up to latest levels, comment this out.
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-// This is tightly related to dynamic linking...
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-
-#define ACE_HAS_SVR4_GETTIMEOFDAY
-
-#define ACE_HAS_SYSV_IPC
-#define ACE_HAS_TIMOD_H
-#define ACE_HAS_XTI
-#define ACE_HAS_BROKEN_T_ERROR
-#define ACE_TLI_TCP_DEVICE  "/dev/xti/tcp"
-
-#define ACE_HAS_UALARM
-
-#define ACE_HAS_UCONTEXT_T
-
-#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).
-#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
-
-// AIX uses LIBPATH to search for libraries
-#define ACE_LD_SEARCH_PATH "LIBPATH"
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
-//**************************************************************
-//
-// Threads related definitions.
-//
-// The threads on AIX are generally POSIX P1003.1c (ACE_HAS_PTHREADS).
-// However, there is also a kernel thread ID (tid_t) that is used in
-// ACE_Log_Msg (printing the thread ID).  The tid_t is not the same as
-// pthread_t, and can't derive one from the other - thread_self() gets
-// the tid_t (kernel thread ID) if called from a thread.
-// Thanks very much to Chris Lahey for straightening this out.
-
-#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_PTHREAD_CONTINUE_NP
-#  define ACE_HAS_PTHREAD_SUSPEND_NP
-#  define ACE_HAS_RECURSIVE_MUTEXES
-#  define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-#  define ACE_HAS_SIGTHREADMASK
-#  define ACE_HAS_THREAD_SPECIFIC_STORAGE
-
-#  define ACE_LACKS_THREAD_PROCESS_SCOPING
-#else
-#  undef ACE_HAS_THREADS
-#endif /* ACE_HAS_THREADS != 0 */
-
-#define ACE_MALLOC_ALIGN 8
-
-#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) && !defined(_UNIX95)
-# define ACE_HAS_3_PARAM_WCSTOK
-#endif /* (_XOPEN_SOURCE -0) >= 500 && !_UNIX95 */
-
+#include "ace/config-aix-4.x.h"
 #if defined (_ACE_DISABLE_AIO_CALLS_)
 #  if defined (ACE_HAS_AIO_CALLS)
 #    undef ACE_HAS_AIO_CALLS
@@ -327,13 +49,11 @@
 // AIX 5.1 has netinet/tcp.h
 #undef ACE_LACKS_NETINET_TCP_H
 
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_POSIX_GETPWNAM_R
 #define ACE_HAS_SCANDIR
-#define ACE_SCANDIR_CMP_USES_VOIDPTR
-#define ACE_SCANDIR_SEL_LACKS_CONST
+# define ACE_SCANDIR_CMP_USES_VOIDPTR
+# define ACE_SCANDIR_SEL_LACKS_CONST
 #define ACE_HAS_SIGSUSPEND
 #define ACE_HAS_TIMEZONE  /* Call tzset() to set timezone */
-#define ACE_LACKS_SIGVAL_T
 
 #endif /* ACE_CONFIG_AIX_5_X_H */
diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h
index 215ffb8e37f..60fcf4576f3 100644
--- a/ACE/ace/config-cygwin32.h
+++ b/ACE/ace/config-cygwin32.h
@@ -80,7 +80,6 @@
 #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
 #define ACE_HAS_SOCKADDR_MSG_NAME 1
 #define ACE_LACKS_PRI_T 1
-#define ACE_HAS_3_PARAM_READDIR_R
 
 // Compiler/platform supports alloca().
 // Although ACE does have alloca() on this compiler/platform combination, it is
@@ -146,6 +145,7 @@
 #define ACE_LACKS_FPUTWS 1
 
 #define ACE_HAS_AUTOMATIC_INIT_FINI
+#define ACE_HAS_SNPRINTF
 
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIGINFO_T
diff --git a/ACE/ace/config-dgux-4.11-epc.h b/ACE/ace/config-dgux-4.11-epc.h
new file mode 100644
index 00000000000..4ac2079a768
--- /dev/null
+++ b/ACE/ace/config-dgux-4.11-epc.h
@@ -0,0 +1,189 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for DG/UX
+// 4.11 platforms using the EPC compiler.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#define ACE_DGUX
+
+// Platform requires (struct sockaddr *) for msg_name field of struct
+// msghdr.
+#define ACE_HAS_SOCKADDR_MSG_NAME
+
+// Platform lacks strcasecmp().
+#define ACE_LACKS_STRCASECMP
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+
+// Platform supports system configuration information.
+#define ACE_HAS_SYSINFO
+
+// Platform supports the POSIX regular expression library.
+#define ACE_HAS_REGEX
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
+// Compiler/platform contains the <sys/syscall.h> file.
+// #define ACE_HAS_SYS_SYSCALL_H
+
+// Platform supports reentrant functions (i.e., all the POSIX *_r functions).
+#define ACE_HAS_REENTRANT_FUNCTIONS
+
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS
+
+// Compiler/platform correctly calls init()/fini() for shared libraries.
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+// Compiler/platform supports SunOS high resolution timers.
+// #define ACE_HAS_HI_RES_TIMER
+
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
+// Compiler/platform supports alloca()
+// #define ACE_HAS_ALLOCA
+
+// Compiler/platform has <alloca.h>
+// #define ACE_HAS_ALLOCA_H
+
+// Platform contains <poll.h>.
+#define ACE_HAS_POLL
+
+// Platform supports POSIX timers via timestruc_t.
+#define ACE_HAS_POSIX_TIME
+
+// Platform supports the /proc file system.
+#define ACE_HAS_PROC_FS
+
+// Platform supports the prusage_t struct.
+// #define ACE_HAS_PRUSAGE_T
+#define ACE_HAS_GETRUSAGE
+
+// Compiler/platform defines the sig_atomic_t typedef.
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Platform supports SVR4 extended signals.
+#define ACE_HAS_SIGINFO_T
+
+// Compiler/platform provides the sockio.h file.
+#define ACE_HAS_SYS_SOCKIO_H
+
+// Compiler supports the ssize_t typedef.
+#define ACE_HAS_SSIZE_T
+
+// Platform supports STREAMS.
+#define ACE_HAS_STREAMS
+
+// Platform supports STREAM pipes.
+#define ACE_HAS_STREAM_PIPES
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// Compiler/platform supports struct strbuf.
+#define ACE_HAS_STRBUF_T
+
+// Compiler/platform supports SVR4 dynamic linking semantics.
+// #define ACE_HAS_SVR4_DYNAMIC_LINKING
+
+// Compiler/platform supports SVR4 gettimeofday() prototype.
+// #define ACE_HAS_SVR4_GETTIMEOFDAY
+
+// DG/UX uses the same gettimeofday() prototype as OSF/1.
+#define ACE_HAS_OSF1_GETTIMEOFDAY
+
+// Compiler/platform supports SVR4 signal typedef.
+#define ACE_HAS_SVR4_SIGNAL_T
+
+// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)...
+#define ACE_HAS_SVR4_TLI
+
+// Platform provides <sys/filio.h> header.
+// #define ACE_HAS_SYS_FILIO_H
+
+// Compiler/platform supports sys_siglist array.
+#define ACE_HAS_SYS_SIGLIST
+
+/* Turn off the following four defines if you want to disable threading. */
+// Compile using multi-thread libraries.
+#if !defined (ACE_MT_SAFE)
+# define ACE_MT_SAFE 0
+#endif
+
+// Platform supports threads.
+// #define ACE_HAS_THREADS
+
+// Platform supports POSIX pthreads *and* Solaris threads!
+// #define ACE_HAS_STHREADS
+// #define ACE_HAS_PTHREADS
+#define ACE_HAS_SIGWAIT
+// If ACE doesn't compile due to the lack of these methods, please
+// send email to schmidt@cs.wustl.edu reporting this.
+// #define ACE_LACKS_CONDATTR_PSHARED
+// #define ACE_LACKS_MUTEXATTR_PSHARED
+
+// Compiler/platform has thread-specific storage
+//
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+
+// Reactor detects deadlock
+// #define ACE_REACTOR_HAS_DEADLOCK_DETECTION
+
+// Platform supports ACE_TLI timod STREAMS module.
+#define ACE_HAS_TIMOD_H
+
+// Platform supports ACE_TLI tiuser header.
+#define ACE_HAS_TIUSER_H
+
+// Platform provides ACE_TLI function prototypes.
+#define ACE_HAS_TLI_PROTOTYPES
+
+// Platform supports ACE_TLI.
+#define ACE_HAS_TLI
+
+// Use the poll() event demultiplexor rather than select().
+//#define ACE_USE_POLL
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+// #define _USING_POSIX4A_DRAFT6
+#define _POSIX_SOURCE
+#define _DGUX_SOURCE
+// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+#define ACE_HAS_UCONTEXT_T
+#define ACE_HAS_NONCONST_GETBY
+#define ACE_LACKS_MADVISE
+
+#if !defined (IP_ADD_MEMBERSHIP)
+# define IP_ADD_MEMBERSHIP 0x13
+#endif
+
+#if !defined (IP_DROP_MEMBERSHIP)
+# define IP_DROP_MEMBERSHIP 0x14
+#endif
+
+// Header files lack t_errno for ACE_TLI.
+#define ACE_LACKS_T_ERRNO
+
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+#define ACE_HAS_IDTYPE_T
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-dgux-4.x-ghs.h b/ACE/ace/config-dgux-4.x-ghs.h
new file mode 100644
index 00000000000..67b028c3bf4
--- /dev/null
+++ b/ACE/ace/config-dgux-4.x-ghs.h
@@ -0,0 +1,208 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for DG/UX
+// 4.x platforms using the Green Hills Multi C++ compiler.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#define ACE_DGUX
+
+# define ACE_CONFIG_INCLUDE_GHS_COMMON
+# include "ace/config-ghs-common.h"
+
+// Static objects do not get initialized correctly, so this is needed.
+#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
+
+// Platform requires (struct sockaddr *) for msg_name field of struct
+// msghdr.
+#define ACE_HAS_SOCKADDR_MSG_NAME
+
+// Platform lacks strcasecmp().
+#define ACE_LACKS_STRCASECMP
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+
+// Platform supports system configuration information.
+#define ACE_HAS_SYSINFO
+
+// Platform supports the POSIX regular expression library.
+#define ACE_HAS_REGEX
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
+// Platform supports reentrant functions (i.e., all the POSIX *_r functions).
+//#define ACE_HAS_REENTRANT_FUNCTIONS
+
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS
+
+// Compiler/platform correctly calls init()/fini() for shared libraries.
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+// Compiler/platform supports SunOS high resolution timers.
+// #define ACE_HAS_HI_RES_TIMER
+
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
+// Green Hills doesn't give a preprocessor symbol for long double
+#define ACE_SIZEOF_LONG_DOUBLE 8
+
+// Platform contains <poll.h>.
+#define ACE_HAS_POLL
+
+// Platform supports POSIX timers via timestruc_t.
+#define ACE_HAS_POSIX_TIME
+
+// Platform supports the /proc file system.
+#define ACE_HAS_PROC_FS
+
+// Platform supports the prusage_t struct.
+// #define ACE_HAS_PRUSAGE_T
+#define ACE_HAS_GETRUSAGE
+
+// Compiler/platform defines the sig_atomic_t typedef.
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Platform supports SVR4 extended signals.
+#define ACE_HAS_SIGINFO_T
+
+// Compiler/platform provides the sockio.h file.
+#define ACE_HAS_SYS_SOCKIO_H
+
+// Compiler supports the ssize_t typedef.
+#define ACE_HAS_SSIZE_T
+
+// Platform supports STREAMS.
+#define ACE_HAS_STREAMS
+
+// Platform supports STREAM pipes.
+#define ACE_HAS_STREAM_PIPES
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// Compiler/platform supports struct strbuf.
+#define ACE_HAS_STRBUF_T
+
+// Compiler/platform supports SVR4 dynamic linking semantics.
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+// ... but redefines the entrypoint names with a leading underscore
+#define dlopen  _dlopen
+#define dlclose _dlclose
+#define dlerror _dlerror
+#define dlsym   _dlsym
+// ... and uses 'char *' rather than 'const char *'
+#define ACE_HAS_CHARPTR_DL
+
+// DG/UX uses the same gettimeofday() prototype as OSF/1.
+#define ACE_HAS_OSF1_GETTIMEOFDAY
+
+// Compiler/platform supports SVR4 signal typedef.
+#define ACE_HAS_SVR4_SIGNAL_T
+
+// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)...
+#define ACE_HAS_SVR4_TLI
+
+// Compiler/platform supports sys_siglist array.
+// On DG/UX this is only done if the /usr/include/sys/_int_dg_features.h
+// file determines it should be turned on.  It will take some work to
+// figure out the magic options to turn it on reliably, so it'll have to
+// be delayed for now.
+//#define _TARGETTING_DGUXELF 1
+//#define _IX86_DG 1
+//#define _DGUX_TARGET 1
+//#define ACE_HAS_SYS_SIGLIST
+
+/* Turn off the following four defines if you want to disable threading. */
+// Compile using multi-thread libraries.
+#if !defined (ACE_MT_SAFE)
+# define ACE_MT_SAFE 1
+#endif
+
+// Platform supports threads.
+#define ACE_HAS_THREADS
+#define ACE_HAS_PTHREADS
+// DG/UX claims to implement draft 10 of the pthreads standard (which became
+// (with editorial change only) the final standard.  To get the behavior, some
+// further macros need to be defined which are specific to DG/UX.
+// _POSIX4A_DRAFT10_SOURCE turns on the draft 10 variant of threads.
+// _POSIX4A_DRAFT_SOURCE turns on sched_yield().
+#define _POSIX4A_DRAFT10_SOURCE
+#define ACE_HAS_PTHREADS_STD
+#define _POSIX4_DRAFT_SOURCE
+// Well, here are some from the standard they don't have...
+#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
+#define ACE_HAS_SIGWAIT
+#define ACE_LACKS_CONDATTR_PSHARED
+#define ACE_LACKS_THREAD_PROCESS_SCOPING
+// The default thread stacksize on DG/UX 4.x is 4096.  This needs to be bumped
+// up to do anything real in ACE.
+#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536
+
+// Need to #include <sched.h>
+#define ACE_NEEDS_SCHED_H
+
+// Compiler/platform has thread-specific storage
+//
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+
+// Platform supports ACE_TLI timod STREAMS module.
+#define ACE_HAS_TIMOD_H
+
+// Platform supports ACE_TLI tiuser header.
+#define ACE_HAS_TIUSER_H
+
+// Platform provides ACE_TLI function prototypes.
+#define ACE_HAS_TLI_PROTOTYPES
+
+// Platform supports ACE_TLI.
+#define ACE_HAS_TLI
+
+// Platform doesn't have read-write locks natively.
+#define ACE_LACKS_RWLOCK_T
+
+// Platform doesn't have timespec_t data type.
+#define ACE_LACKS_TIMESPEC_T
+
+// Use the poll() event demultiplexor rather than select().
+//#define ACE_USE_POLL
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+#define ACE_TEMPLATES_REQUIRE_SOURCE
+
+#define ACE_HAS_UCONTEXT_T
+#define ACE_HAS_NONCONST_GETBY
+#define ACE_LACKS_MADVISE
+
+#if !defined (IP_ADD_MEMBERSHIP)
+#define IP_ADD_MEMBERSHIP 0x13
+#endif
+
+#if !defined (IP_DROP_MEMBERSHIP)
+# define IP_DROP_MEMBERSHIP 0x14
+#endif
+
+// Header files lack t_errno for ACE_TLI.
+#define ACE_LACKS_T_ERRNO
+
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h
index 28c7744900e..6ed6e250bcc 100644
--- a/ACE/ace/config-freebsd.h
+++ b/ACE/ace/config-freebsd.h
@@ -225,7 +225,7 @@ extern "C" { char * cuserid (char *s); }
 #define ACE_HAS_SIGWAIT
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS
+#define ACE_HAS_TERMIOS 
 
 #if (__FreeBSD_version > 400000)
 #define ACE_HAS_UCONTEXT_T
@@ -234,6 +234,10 @@ extern "C" { char * cuserid (char *s); }
 #define ACE_HAS_PTHREADS_UNIX98_EXT
 #endif
 
+#ifndef ACE_HAS_SNPRINTF
+#define ACE_HAS_SNPRINTF
+#endif
+
 // Note, on FreeBSD 5, POSIX aio is now an optional kernel module which
 // must be loaded.
 // Read the aio(4) man page for what to do, otherwise any aio_* call
@@ -258,21 +262,11 @@ typedef union sigval sigval_t;
 #define ACE_LACKS_WCSDUP
 #define ACE_LACKS_ITOW
 #define ACE_HAS_3_PARAM_WCSTOK
-#define ACE_HAS_3_PARAM_READDIR_R
 
 #if (__FreeBSD_version >= 501000)
 #  define ACE_HAS_PTHREAD_SETSTACK
 #endif
 
-#if (__FreeBSD_version < 700007)
-# define ACE_HAS_SIGVAL_SIGVAL_INT
-#endif
-
-#if (__FreeBSD_version >= 700028)
-# define ACE_HAS_SCTP
-# define ACE_HAS_LKSCTP
-#endif
-
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index 83b9350b8e1..0886e0442a0 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -67,7 +67,7 @@
 
 // Take advantage of G++ (>= 4.x) visibility attributes to generate
 // improved shared library binaries.
-#if (__GNUC__ >= 4)
+#if (__GNUC__ > 3)
 
 # if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0
 #  undef ACE_HAS_CUSTOM_EXPORT_MACROS
@@ -78,24 +78,15 @@
 #  define ACE_Proper_Export_Flag __attribute__ ((visibility("default")))
 #  define ACE_Proper_Import_Flag
 
-# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
 // Sadly, G++ 4.x silently ignores visibility attributes on
 // template instantiations, which breaks singletons.
 // As a workaround, we use the GCC visibility pragmas.
 // And to make them fit in a macro, we use C99's _Pragma()
 // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17470
-// This has been fixed in GCC 4.1.1 with FC6 but not with SuSE 10.2
-// that gets shipped with GCC 4.1.2 so we assume that with GCC 4.2
-// this will be fixed on the head. With FC6 just set this define yourself
-#  ifndef ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS
-#    define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
-#  endif
-# endif
-
-#  if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS) && GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS == 1
+#  if 0 /* ... replace if/when gcc bug 17470 is fixed */
 #   define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T
 #   define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE <CLASS, LOCK>;
-#  else  /* ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */
+#  else  /* ! GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */
 #   define ACE_EXPORT_SINGLETON_DECLARATION(T)     \
         _Pragma ("GCC visibility push(default)")  \
         template class T                          \
@@ -104,15 +95,16 @@
         _Pragma ("GCC visibility push(default)")                    \
         template class SINGLETON_TYPE<CLASS, LOCK>;                 \
         _Pragma ("GCC visibility pop")
-#  endif /* ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */
+#  endif /* ! GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */
 
 // Note that the "__extension__" is needed to prevent g++ from issuing
 // an error when using its "-pedantic" command line flag.
 #  define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T
 #  define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>;
 
+
 # endif  /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */
-#endif  /* __GNU__ >= 4 */
+#endif  /* __GNU__ > 3 */
 
 #if defined (ACE_HAS_GNU_REPO)
   // -frepo causes unresolved symbols of basic_string left- and
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index 4e60f220cf0..a06e7bb84d0 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -135,8 +135,17 @@
 // Compiler supports template specialization.
 #    define ACE_HAS_TEMPLATE_SPECIALIZATION
 
+// Preprocessor needs some help with data types
+#    if defined (__LP64__)
+#      define ACE_SIZEOF_LONG 8
+#    else
+#      define ACE_SIZEOF_LONG 4
+#    endif
+
 // Platform has XPG4 wide character support
 #    define ACE_HAS_XPG4_MULTIBYTE_CHAR
+#    define ACE_HAS_WCHAR
+#    define ACE_SIZEOF_WCHAR _WCHAR_T
 
 #  endif /* __cplusplus < 199707L */
 
@@ -166,6 +175,10 @@
 
 #include /**/ <sys/stdsyms.h>
 
+#if defined (_INCLUDE_HPUX_SOURCE)
+#  define ACE_HAS_SNPRINTF
+#endif
+
 // HP-UX is a POSIX-compliant system - see what's available.
 #include "ace/config-posix.h"
 
@@ -200,13 +213,6 @@
 #  define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
 #endif  /* __LP64__ */
 
-// Preprocessor needs some help with data types
-#if defined (__LP64__)
-#  define ACE_SIZEOF_LONG 8
-#else
-#  define ACE_SIZEOF_LONG 4
-#endif
-
 // Platform can do async I/O (aio_*) (set up in config-posix.h)
 // ... but seems to require this in order to keep from hanging.  Needs some
 // investigation, maybe with HP.  John Mulhern determined this value
@@ -411,9 +417,6 @@
 #  define ACE_HAS_3_PARAM_WCSTOK
 #endif
 
-#define ACE_HAS_3_PARAM_READDIR_R
-
-
 //////////////////////////////////////////////////////////////////////////
 //
 // STREAMS information
diff --git a/ACE/ace/config-irix5.2.h b/ACE/ace/config-irix5.2.h
new file mode 100644
index 00000000000..cdb1fb49bdd
--- /dev/null
+++ b/ACE/ace/config-irix5.2.h
@@ -0,0 +1,67 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for the SGI
+// Indigo2EX running Irix 5.2 platform using the gcc v2.6.x compiler
+// and libg++ v2.6.x.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+// Platform supports STREAM pipes (note that this is disabled by
+// default, see the manual page on pipe(2) to find out how to enable
+// it).
+//#define ACE_HAS_STREAM_PIPES
+
+// Platform supports getpagesize() call.
+#define ACE_HAS_GETPAGESIZE
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+#define ACE_HAS_SIGWAIT
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+// Platform requires void * for mmap().
+#define ACE_HAS_VOIDPTR_MMAP
+
+// Compiler/platform contains the <sys/syscall.h> file.
+#define ACE_HAS_SYS_SYSCALL_H
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
+#define ACE_SIZEOF_LONG_DOUBLE 8
+
+#define IRIX5
+// Although ACE does have alloca() on this compiler/platform combination, it is
+// disabled by default since it can be dangerous.  Uncomment the following line
+// if you ACE to use it.
+//#define ACE_HAS_ALLOCA
+// Compiler/platform has <alloca.h>
+#define ACE_HAS_ALLOCA_H
+#define ACE_HAS_BSTRING
+#define ACE_HAS_GETRUSAGE
+#define ACE_HAS_POSIX_NONBLOCK
+#define ACE_HAS_POSIX_TIME
+#define ACE_HAS_CPLUSPLUS_HEADERS
+#define ACE_HAS_POLL
+#define ACE_HAS_PROC_FS
+#define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SIGINFO_T
+#define ACE_HAS_UCONTEXT_T
+#define ACE_HAS_STREAMS
+#define ACE_HAS_SSIZE_T
+#define ACE_HAS_STRERROR
+#define ACE_HAS_STRBUF_T
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+#define ACE_HAS_SVR4_SIGNAL_T
+#define ACE_HAS_SYS_SIGLIST
+#define ACE_HAS_SYS_FILIO_H
+#define ACE_HAS_SEMUN
+#define ACE_NEEDS_DEV_IO_CONVERSION
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-irix5.3-g++.h b/ACE/ace/config-irix5.3-g++.h
new file mode 100644
index 00000000000..c9f3cc99773
--- /dev/null
+++ b/ACE/ace/config-irix5.3-g++.h
@@ -0,0 +1,117 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for the SGI
+// Indigo2EX running Irix 5.3 platform using the GNU C++ Compiler
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
+
+#include "ace/config-g++-common.h"
+
+#define ACE_SIZEOF_LONG_DOUBLE 8
+
+// Platform supports getpagesize() call.
+#define ACE_HAS_GETPAGESIZE
+#define IRIX5
+#define ACE_HAS_SIGWAIT
+#define ACE_HAS_DIRENT
+
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+// Platform requires void * for mmap().
+#define ACE_HAS_VOIDPTR_MMAP
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
+// Compiler/platform contains the <sys/syscall.h> file.
+#define ACE_HAS_SYS_SYSCALL_H
+
+// Compiler/platform supports alloca()
+// Although ACE does have alloca() on this compiler/platform combination, it is
+// disabled by default since it can be dangerous.  Uncomment the following line
+// if you ACE to use it.
+//#define ACE_HAS_ALLOCA
+
+// Compiler/platform has <alloca.h>
+#define ACE_HAS_ALLOCA_H
+
+// IRIX5 needs to define bzero() in this odd file <bstring.h>
+#define ACE_HAS_BSTRING
+
+// Compiler/platform has the getrusage() system call.
+#define ACE_HAS_GETRUSAGE
+
+// Denotes that GNU has cstring.h as standard
+// which redefines memchr()
+#define ACE_HAS_GNU_CSTRING_H
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Platform supports POSIX timers via timestruc_t.
+#define ACE_HAS_POSIX_TIME
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+// Platform contains <poll.h>.
+#define ACE_HAS_POLL
+
+// Platform supports the /proc file system.
+#define ACE_HAS_PROC_FS
+
+// Compiler/platform defines the sig_atomic_t typedef.
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Platform supports SVR4 extended signals.
+#define ACE_HAS_SIGINFO_T
+#define ACE_HAS_UCONTEXT_T
+
+// Compiler supports the ssize_t typedef.
+#define ACE_HAS_SSIZE_T
+
+// Platform supports STREAMS.
+#define ACE_HAS_STREAMS
+
+// Platform supports STREAM pipes (note that this is disabled by
+// default, see the manual page on pipe(2) to find out how to enable
+// it).
+// #define ACE_HAS_STREAM_PIPES
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// Compiler/platform supports struct strbuf.
+#define ACE_HAS_STRBUF_T
+
+// Compiler/platform supports SVR4 dynamic linking semantics.
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+
+// Compiler/platform supports SVR4 signal typedef.
+#define ACE_HAS_IRIX_53_SIGNALS
+
+// Compiler/platform supports sys_siglist array.
+// #define ACE_HAS_SYS_SIGLIST
+
+// Platform provides <sys/filio.h> header.
+#define ACE_HAS_SYS_FILIO_H
+
+// Compiler/platform defines a union semun for SysV shared memory.
+#define ACE_HAS_SEMUN
+
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-irix5.3-sgic++.h b/ACE/ace/config-irix5.3-sgic++.h
new file mode 100644
index 00000000000..b1a4e4cb13c
--- /dev/null
+++ b/ACE/ace/config-irix5.3-sgic++.h
@@ -0,0 +1,120 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work
+// for the SGI Indigo2EX running Irix 5.3 platform using
+// the SGI C++ Compiler.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#define IRIX5
+
+#include <sys/bsd_types.h>
+#define _BSD_TYPES
+
+#define ACE_SIZEOF_LONG_DOUBLE 8
+
+#define ACE_LACKS_STDINT_H
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+// Platform supports getpagesize() call.
+#define ACE_HAS_GETPAGESIZE
+
+#define ACE_HAS_SIGWAIT
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+// Platform requires void * for mmap().
+#define ACE_HAS_VOIDPTR_MMAP
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
+// Compiler/platform contains the <sys/syscall.h> file.
+#define ACE_HAS_SYS_SYSCALL_H
+
+// Compiler/platform supports alloca()
+// Although ACE does have alloca() on this compiler/platform combination, it is
+// disabled by default since it can be dangerous.  Uncomment the following line
+// if you ACE to use it.
+//#define ACE_HAS_ALLOCA
+
+// Compiler/platform has <alloca.h>
+#define ACE_HAS_ALLOCA_H
+
+// IRIX5 needs to define bzero() in this odd file <bstring.h>
+#define ACE_HAS_BSTRING
+
+// Compiler/platform has the getrusage() system call.
+#define ACE_HAS_GETRUSAGE
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Platform supports POSIX timers via timestruc_t.
+#define ACE_HAS_POSIX_TIME
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+// Platform contains <poll.h>.
+#define ACE_HAS_POLL
+
+// No multi-threading so use poll() call
+// - for easier debugging, if nothing else
+// #define ACE_USE_POLL
+
+// Platform supports the /proc file system.
+// #define ACE_HAS_PROC_FS
+
+// Compiler/platform defines the sig_atomic_t typedef.
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Platform supports SVR4 extended signals.
+#define ACE_HAS_SIGINFO_T
+// #define ACE_HAS_UCONTEXT_T
+#define ACE_LACKS_UCONTEXT_H
+
+// Compiler supports the ssize_t typedef.
+#define ACE_HAS_SSIZE_T
+
+// Platform supports STREAMS.
+#define ACE_HAS_STREAMS
+
+// Platform supports STREAM pipes (note that this is disabled by
+// default, see the manual page on pipe(2) to find out how to enable
+// it).
+// #define ACE_HAS_STREAM_PIPES
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// Compiler/platform supports struct strbuf.
+#define ACE_HAS_STRBUF_T
+
+// Compiler/platform supports SVR4 dynamic linking semantics.
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+
+// Compiler/platform supports SVR4 signal typedef.
+#define ACE_HAS_IRIX_53_SIGNALS
+
+// Compiler/platform supports sys_siglist array.
+// #define ACE_HAS_SYS_SIGLIST
+
+// Platform provides <sys/filio.h> header.
+#define ACE_HAS_SYS_FILIO_H
+
+// Compiler/platform defines a union semun for SysV shared memory.
+#define ACE_HAS_SEMUN
+
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
+#define ACE_NEEDS_DEV_IO_CONVERSION
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-irix6.x-common.h b/ACE/ace/config-irix6.x-common.h
index 82a419edd59..dc6350b6717 100644
--- a/ACE/ace/config-irix6.x-common.h
+++ b/ACE/ace/config-irix6.x-common.h
@@ -77,6 +77,9 @@
 // Compiler/platform contains the <sys/syscall.h> file.
 #define ACE_HAS_SYS_SYSCALL_H
 
+// Compiler/platform supports snprintf
+#define ACE_HAS_SNPRINTF
+
 // 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
@@ -101,6 +104,10 @@
 // Platform contains <poll.h>.
 #define ACE_HAS_POLL
 
+// No multi-threading so use poll() call
+// - for easier debugging, if nothing else
+// #define ACE_USE_POLL
+
 // Platform supports the /proc file system.
 #define ACE_HAS_PROC_FS
 
@@ -117,6 +124,11 @@
 // Platform supports STREAMS.
 #define ACE_HAS_STREAMS
 
+// Platform supports STREAM pipes (note that this is disabled by
+// default, see the manual page on pipe(2) to find out how to enable
+// it).
+// #define ACE_HAS_STREAM_PIPES
+
 // Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
 
diff --git a/ACE/ace/config-irix6.x-sgic++-nothreads.h b/ACE/ace/config-irix6.x-sgic++-nothreads.h
new file mode 100644
index 00000000000..a2a0efb02ea
--- /dev/null
+++ b/ACE/ace/config-irix6.x-sgic++-nothreads.h
@@ -0,0 +1,5 @@
+/* -*- C++ -*- */
+// $Id$
+
+#error "Please use config-irix6.x-sgic++.h."
+#error "Set threads=0 in your platform_macros.GNU to disable multi-threading."
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 1a7c31a2246..95a7a07d8c0 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -43,11 +43,9 @@
   // with shm_open/shm_unlink pairing in ACE which  needs to be fixed when I have time.
 # if defined (ACE_HAS_SHM_OPEN)
 #   undef ACE_HAS_SHM_OPEN
-# endif /* ACE_HAS_SHM_OPEN */
+# endif
 
-# if !defined (ACE_LACKS_LINUX_VERSION_H)
-#  include <linux/version.h>
-# endif /* !ACE_LACKS_LINUX_VERSION_H */
+# include <linux/version.h>
 
 # if defined (ACE_USES_FIFO_SEM)
     // Don't use this for Linux NPTL since this has complete
@@ -124,6 +122,16 @@
 # define ACE_LACKS_STRTOK_R_PROTOTYPE
 // @note  end of glibc 2.0 (0.961212-5)-specific configuration.
 
+// These macros determined by reading <stdio.h> on RH 7.1 and glibc's
+// <features.h>.
+# if defined (_BSD_SOURCE) \
+  || defined (_ISOC99_SOURCE) \
+  || defined (_ISOC9X_SOURCE) \
+  || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) \
+  || (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500)
+#   define ACE_HAS_SNPRINTF
+# endif
+
 # if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1
     // These were suggested by Robert Hanzlik <robi@codalan.cz> to get
     // ACE to compile on Linux using glibc 2.1 and libg++/gcc 2.8.
@@ -237,7 +245,6 @@
 #if __GLIBC__ >= 2
 // glibc 2 and higher has wchar support
 # define ACE_HAS_XPG4_MULTIBYTE_CHAR
-# define ACE_HAS_VFWPRINTF
 #endif
 
 #if __GLIBC__ < 2
@@ -254,8 +261,6 @@
 # define ACE_HAS_3_PARAM_WCSTOK
 #endif
 
-#define ACE_HAS_3_PARAM_READDIR_R
-
 #if !defined (ACE_DEFAULT_BASE_ADDR)
 #  define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
 #endif /* ! ACE_DEFAULT_BASE_ADDR */
@@ -390,20 +395,13 @@
 
 #define ACE_HAS_VOIDPTR_MMAP
 
-#if defined (ACE_LACKS_NETWORKING)
-# include "ace/config-posix-nonetworking.h"
-#else
-# define ACE_HAS_NETLINK
-# define ACE_HAS_GETIFADDRS
-#endif
+#define ACE_HAS_NETLINK
 
 #if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO)
 // Detect if getsockname() and getpeername() returns random values in
 // the sockaddr_in::sin_zero field by evaluation of the kernel
 // version. Since version 2.5.47 this problem is fixed.
-#  if !defined (ACE_LACKS_LINUX_VERSION_H)
-#    include <linux/version.h>
-#  endif /* !ACE_LACKS_LINUX_VERSION_H */
+#include <linux/version.h>
 #  if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,47))
 #    define ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO 0
 #  else
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index ee3ca24eeeb..402ef191e16 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -58,6 +58,10 @@
 
 #endif  /* ACE_MT_SAFE */
 
+// This is certainly true for newer distributions. I'm not sure how
+// far back this goes.
+#define ACE_HAS_GETIFADDRS
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_LINUX_H */
diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h
index f8edd3b9192..e36f2c525a5 100644
--- a/ACE/ace/config-lite.h
+++ b/ACE/ace/config-lite.h
@@ -122,14 +122,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 // Once all C++ compilers support the standard reverse_iterator
 // adapters, we can drop this generator macro or at least drop the
 // MSVC++ or Sun Studio preprocessor conditional blocks.
-#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x580 \
-      && !defined (_STLPORT_VERSION)
-  // If we're not using the stlport4 C++ library (which has standard
-  // iterators), we need to ensure this is included in order to test
-  // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below.
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x580
+  // We need to ensure that this is included in order to test
+  // _RWSTD_NO_CLASS_PARTIAL_SPEC below
 # include <Cstd/stdcomp.h>
 #endif /* __SUNPRO_CC <= 0x580 */
-#if defined (_MSC_VER) && (_MSC_VER < 1310) && !defined (_CPPLIB_VER)
+#if defined (_MSC_VER) && !defined (_CPPLIB_VER)
   // MSVC++ 6 and the latest platform SDKs don't define a standard
   // compliant reverse_iterator adapter.
   //
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index 3d2ec76c8d5..739ecee49c8 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -54,6 +54,7 @@
 #define ACE_HAS_MEMCHR
 #define ACE_HAS_MSG
 #define ACE_HAS_NONCONST_CLOCK_SETTIME
+#define ACE_HAS_NONCONST_GETBY
 #define ACE_HAS_NONCONST_MSGSND
 #define ACE_HAS_NONCONST_READV
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
@@ -78,24 +79,29 @@
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 #define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_LACKS_CONST_TIMESPEC_PTR
+#define ACE_LACKS_GETOPT_PROTOTYPE
 #define ACE_LACKS_GETPGID
+#define ACE_LACKS_INET_ATON_PROTOTYPE
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MKSTEMP_PROTOTYPE
 #define ACE_LACKS_MKTEMP_PROTOTYPE
 #define ACE_LACKS_PUTENV_PROTOTYPE
 #define ACE_LACKS_REALPATH
+#define ACE_LACKS_REGEX_H
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SCANDIR_PROTOTYPE
 #define ACE_LACKS_SETEGID
 #define ACE_LACKS_SETEUID
 #define ACE_LACKS_SIGINFO_H
+#define ACE_LACKS_STRCASECMP_PROTOTYPE
+#define ACE_LACKS_STRNCASECMP_PROTOTYPE
 #define ACE_LACKS_STRPTIME
 #define ACE_LACKS_SUSECONDS_T
 #define ACE_LACKS_SWAB_PROTOTYPE
+#define ACE_LACKS_SYS_SELECT_H
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_USECONDS_T
-#define ACE_LACKS_VSNPRINTF
 #define ACE_LACKS_WCHAR_H
 #define ACE_MALLOC_ALIGN 8
 #define ACE_NEEDS_IPC_1C_H
@@ -107,11 +113,9 @@
 # define ACE_HAS_PTHREADS
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
 # define ACE_LACKS_NULL_PTHREAD_STATUS
-# if ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR == 0
-#   define ACE_LACKS_SETDETACH
-#   define ACE_LACKS_THREAD_PROCESS_SCOPING
-#   define ACE_LACKS_THREAD_STACK_ADDR
-# endif
+# define ACE_LACKS_SETDETACH
+# define ACE_LACKS_THREAD_PROCESS_SCOPING
+# define ACE_LACKS_THREAD_STACK_ADDR
 #endif /* ACE_MT_SAFE */
 
 #define ACE_POSIX_AIOCB_PROACTOR
@@ -142,25 +146,5 @@
 #define ALIGNBYTES (sizeof(int) - 1)
 #define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES)
 
-#if ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR == 0
-# define ACE_LACKS_GETOPT_PROTOTYPE
-# define ACE_LACKS_INET_ATON_PROTOTYPE
-# define ACE_LACKS_REGEX_H
-# define ACE_LACKS_STRCASECMP_PROTOTYPE
-# define ACE_LACKS_STRNCASECMP_PROTOTYPE
-# define ACE_LACKS_SYS_SELECT_H
-# define ACE_HAS_NONCONST_GETBY
-#endif
-
-#if (ACE_LYNXOS_MAJOR > 4) || (ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR >= 2)
-// LynxOS 4.2 additons
-# define ACE_HAS_POSIX_SEM_TIMEOUT
-# define ACE_HAS_MUTEX_TIMEOUTS
-#endif
-
-#if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
-# define ACE_HAS_BROKEN_THREAD_KEYFREE
-#endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-m88k.h b/ACE/ace/config-m88k.h
new file mode 100644
index 00000000000..8409f53cd3b
--- /dev/null
+++ b/ACE/ace/config-m88k.h
@@ -0,0 +1,225 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for Motorola
+// 88k SVR4 platforms using pthreads from Florida State (ACE_HAS_FSU_PTHREADS).
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#if ! defined (__ACE_INLINE__)
+# define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+  // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION.
+  // Maybe it will work?
+# undef ACE_HAS_TEMPLATE_SPECIALIZATION
+#endif /* __GNUG__ */
+
+#if !defined (m88k)
+#define m88k
+#endif
+
+extern "C" void pthread_init();
+
+#define PTHREAD_STACK_MIN 1024
+
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+#if !defined (IP_ADD_MEMBERSHIP)
+#define IP_ADD_MEMBERSHIP 0x13
+#endif  /*  m88k */
+
+#if !defined (IP_DROP_MEMBERSHIP)
+#define IP_DROP_MEMBERSHIP 0x14
+#endif  /*  m88k */
+
+struct sched_param
+{
+  int sched_priority;
+  int prio;
+};
+
+// This seems to be necessary for m88k.
+struct ip_mreq
+{
+  struct in_addr imr_multiaddr; // IP multicast address of the group
+  struct in_addr imr_interface; // local IP address of the interface
+};
+
+#if !defined (ACE_HAS_FSU_PTHREADS)
+# define ACE_HAS_FSU_PTHREADS
+#endif
+#if !defined (ACE_HAS_PTHREADS_DRAFT6)
+# define ACE_HAS_PTHREADS_DRAFT6
+#endif
+
+// Added for compilation on the m88k
+#if defined (m88k)
+# define ACE_LACKS_T_ERRNO
+# define ACE_LACKS_MADVISE
+# define ACE_HAS_GNU_CSTRING_H
+#endif  /* m88k */
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+// Sun has the wrong prototype for sendmsg.
+#define ACE_HAS_NONCONST_SENDMSG
+
+// The SunOS 5.x version of rand_r is inconsistent with the header files...
+#define ACE_HAS_BROKEN_RANDR
+
+// Platform supports system configuration information.
+#define ACE_HAS_SYSINFO
+
+// Platform supports the POSIX regular expression library.
+#define ACE_HAS_REGEX
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
+// Compiler/platform contains the <sys/syscall.h> file.
+#define ACE_HAS_SYS_SYSCALL_H
+
+#if !defined (ACE_HAS_FSU_PTHREADS)
+// Platform supports reentrant functions (i.e., all the POSIX *_r functions).
+#define ACE_HAS_REENTRANT_FUNCTIONS
+#endif  /* ACE_HAS_FSU_PTHREADS */
+
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
+
+// Compiler/platform correctly calls init()/fini() for shared libraries.
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+#if !defined (m88k)
+// Compiler/platform supports SunOS high resolution timers.
+# define ACE_HAS_HI_RES_TIMER
+#endif  /* m88k */
+
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
+// Compiler/platform supports alloca()
+// Although ACE does have alloca() on this compiler/platform combination, it is
+// disabled by default since it can be dangerous.  Uncomment the following line
+// if you ACE to use it.
+//#define ACE_HAS_ALLOCA
+
+#if !defined (m88k)
+// Compiler/platform has <alloca.h>
+#define ACE_HAS_ALLOCA_H
+#endif  /* m88k */
+
+// Platform contains <poll.h>.
+#define ACE_HAS_POLL
+
+// Platform supports POSIX timers via timestruc_t.
+#define ACE_HAS_POSIX_TIME
+
+// Platform supports the /proc file system.
+#define ACE_HAS_PROC_FS
+
+#if !defined (m88k)
+// Platform supports the prusage_t struct.
+#define ACE_HAS_PRUSAGE_T
+#endif  /* m88k */
+
+// Compiler/platform defines the sig_atomic_t typedef.
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Platform supports SVR4 extended signals.
+#define ACE_HAS_SIGINFO_T
+#define ACE_HAS_UCONTEXT_T
+
+// Compiler/platform provides the sockio.h file.
+#define ACE_HAS_SYS_SOCKIO_H
+
+// Compiler supports the ssize_t typedef.
+#define ACE_HAS_SSIZE_T
+
+// Platform supports STREAMS.
+#define ACE_HAS_STREAMS
+
+// Platform supports STREAM pipes.
+#define ACE_HAS_STREAM_PIPES
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// Compiler/platform supports struct strbuf.
+#define ACE_HAS_STRBUF_T
+
+// Compiler/platform supports SVR4 dynamic linking semantics.
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+
+// Compiler/platform supports SVR4 gettimeofday() prototype.
+#define ACE_HAS_SVR4_GETTIMEOFDAY
+
+// Compiler/platform supports SVR4 signal typedef.
+#define ACE_HAS_SVR4_SIGNAL_T
+
+// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)...
+#define ACE_HAS_SVR4_TLI
+
+// Platform provides <sys/filio.h> header.
+#define ACE_HAS_SYS_FILIO_H
+
+#if !defined (m88k)
+// Compiler/platform supports sys_siglist array.
+#define ACE_HAS_SYS_SIGLIST
+#endif  /* m88k */
+
+/* Turn off the following five defines if you want to disable threading. */
+// Compile using multi-thread libraries.
+#if !defined (ACE_MT_SAFE)
+# define ACE_MT_SAFE 1
+#endif
+
+#define ACE_HAS_PTHREADS
+#define ACE_LACKS_RWLOCK_T
+
+// Platform supports threads.
+#define ACE_HAS_THREADS
+
+#if defined (ACE_HAS_FSU_PTHREADS)
+#define ACE_LACKS_THREAD_STACK_ADDR
+#endif  /*  ACE_HAS_FSU_PTHREADS */
+
+// Compiler/platform has thread-specific storage
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+
+// Reactor detects deadlock
+// #define ACE_REACTOR_HAS_DEADLOCK_DETECTION
+
+// Platform supports ACE_TLI timod STREAMS module.
+#define ACE_HAS_TIMOD_H
+
+// Platform supports ACE_TLI tiuser header.
+#define ACE_HAS_TIUSER_H
+
+// Platform provides ACE_TLI function prototypes.
+#define ACE_HAS_TLI_PROTOTYPES
+
+// Platform supports ACE_TLI.
+#define ACE_HAS_TLI
+
+// Use the poll() event demultiplexor rather than select().
+//#define ACE_USE_POLL
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h
index 840d6a8f28a..52d8778d2b1 100644
--- a/ACE/ace/config-macosx-panther.h
+++ b/ACE/ace/config-macosx-panther.h
@@ -111,6 +111,9 @@
 #define ACE_HAS_IP_MULTICAST
 #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
 
+//platform supports snprintf ()
+#define ACE_HAS_SNPRINTF
+
 // Compiler/platform has the getrusage() system call.
 #define ACE_HAS_GETRUSAGE
 
@@ -171,7 +174,6 @@
 #define ACE_HAS_GETIFADDRS
 #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 #define ACE_LACKS_UNNAMED_SEMAPHORE
-#define ACE_LACKS_SIGVAL_T
 
 // dlcompat package (not part of base Darwin) is needed for dlopen().
 // You may download directly from sourceforge and install or use fink
diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h
index 4201ac8ddb6..4da967cd1a2 100644
--- a/ACE/ace/config-macosx-tiger.h
+++ b/ACE/ace/config-macosx-tiger.h
@@ -143,6 +143,9 @@
 #define ACE_HAS_IP_MULTICAST
 #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
 
+//platform supports snprintf ()
+#define ACE_HAS_SNPRINTF
+
 // Compiler/platform has the getrusage() system call.
 #define ACE_HAS_GETRUSAGE
 
@@ -206,7 +209,6 @@
 #define ACE_HAS_GETIFADDRS
 #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 #define ACE_LACKS_UNNAMED_SEMAPHORE
-#define ACE_LACKS_SIGVAL_T
 
 // dlcompat package (not part of base Darwin) is needed for dlopen().
 // You may download directly from sourceforge and install or use fink
diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h
index 215894604c6..6cfaa1eec67 100644
--- a/ACE/ace/config-macosx.h
+++ b/ACE/ace/config-macosx.h
@@ -113,6 +113,9 @@
 #define ACE_HAS_IP_MULTICAST
 #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
 
+//platform supports snprintf ()
+#define ACE_HAS_SNPRINTF
+
 // Compiler/platform has the getrusage() system call.
 #define ACE_HAS_GETRUSAGE
 
@@ -171,7 +174,6 @@
 #define ACE_HAS_GETIFADDRS
 #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 #define ACE_LACKS_UNNAMED_SEMAPHORE
-#define ACE_LACKS_SIGVAL_T
 
 // dlcompat package (not part of base Darwin) is needed for dlopen().
 // You may download directly from sourceforge and install or use fink
diff --git a/ACE/ace/config-mit-pthread.h b/ACE/ace/config-mit-pthread.h
new file mode 100644
index 00000000000..afaf665c383
--- /dev/null
+++ b/ACE/ace/config-mit-pthread.h
@@ -0,0 +1,49 @@
+// $Id$
+
+#ifndef ACE_CONFIG_MIT_PTHREAD_H
+#define ACE_CONFIG_MIT_PTHREAD_H
+#include /**/ "ace/pre.h"
+
+// Platform uses int for select() rather than fd_set.
+#if !defined(ACE_HAS_SELECT_H)
+#define ACE_HAS_SELECT_H
+#endif
+
+// Threads
+#define ACE_HAS_THREADS
+#if !defined (ACE_MT_SAFE)
+        #define ACE_MT_SAFE 1
+#endif
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+#define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_STD
+#define ACE_LACKS_PTHREAD_CANCEL
+#define ACE_HAS_SIGWAIT
+#define ACE_LACKS_THREAD_PROCESS_SCOPING
+//#define ACE_LACKS_THREAD_STACK_ADDR
+// If ACE doesn't compile due to the lack of these methods, please
+// send email to schmidt@cs.wustl.edu reporting this.
+// #define ACE_LACKS_CONDATTR_PSHARED
+// #define ACE_LACKS_MUTEXATTR_PSHARED
+#define ACE_LACKS_RWLOCK_T
+#define ACE_LACKS_SETSCHED
+
+#include <pthread.h>
+#if defined(_M_UNIX)
+#include <sys/regset.h>
+#endif
+
+#define ACE_LACKS_TIMEDWAIT_PROTOTYPES
+#define ACE_HAS_RECV_TIMEDWAIT
+#define ACE_HAS_RECVFROM_TIMEDWAIT
+#define ACE_HAS_RECVMSG_TIMEDWAIT
+#define ACE_HAS_SEND_TIMEDWAIT
+#define ACE_HAS_SENDTO_TIMEDWAIT
+#define ACE_HAS_SENDMSG_TIMEDWAIT
+#define ACE_HAS_READ_TIMEDWAIT
+#define ACE_HAS_READV_TIMEDWAIT
+#define ACE_HAS_WRITE_TIMEDWAIT
+#define ACE_HAS_WRITEV_TIMEDWAIT
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_MIT_PTHREAD_H */
diff --git a/ACE/ace/config-mklinux.h b/ACE/ace/config-mklinux.h
new file mode 100644
index 00000000000..7487484f103
--- /dev/null
+++ b/ACE/ace/config-mklinux.h
@@ -0,0 +1,20 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for MkLinux
+// platforms using GNU C++.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#include "ace/config-linux-common.h"
+
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+
+#undef ACE_HAS_SOCKLEN_T
+#define ACE_HAS_SIZET_SOCKET_LEN
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h
index 931b473102e..c7508bba3bb 100644
--- a/ACE/ace/config-netbsd.h
+++ b/ACE/ace/config-netbsd.h
@@ -4,28 +4,12 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
-#ifndef ACE_MT_SAFE
-#define ACE_MT_SAFE 1
-#endif
-
-#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-#  define ACE_HAS_THREADS 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_LACKS_PTHREAD_THR_SIGSETMASK 1
-#  define ACE_LACKS_PTHREAD_YIELD 1
-#endif /* ACE_MT_SAFE */
-
 #define ACE_HAS_CLOCK_SETTIME 1
 #define ACE_HAS_CLOCK_GETTIME 1
 #define ACE_HAS_SETTIMEOFDAY 1
 #define ACE_HAS_GETTIMEOFDAY 1
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1
 #define ACE_HAS_3_PARAM_WCSTOK 1
-#define ACE_HAS_3_PARAM_READDIR_R 1
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG 1
 #define ACE_HAS_ALT_CUSERID 1
 #define ACE_HAS_AUTOMATIC_INIT_FINI 1
@@ -52,6 +36,11 @@
 #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
@@ -65,6 +54,7 @@
 #define ACE_HAS_SIG_C_FUNC 1
 #define ACE_HAS_SOCKADDR_IN_SIN_LEN 1
 #define ACE_HAS_SOCKADDR_IN6_SIN6_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
@@ -85,6 +75,7 @@
 #define ACE_HAS_TEMPLATE_SPECIALIZATION 1
 #define ACE_HAS_TEMPLATE_TYPEDEFS 1
 #define ACE_HAS_TERMIOS 1
+#define ACE_HAS_THREADS 1
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE 1
 #define ACE_HAS_TIMEZONE 1
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY 1
@@ -125,6 +116,7 @@
 #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_SCANDIR_CMP_USES_CONST_VOIDPTR 1
 #define ACE_TEMPLATES_REQUIRE_SOURCE 1
diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h
index ff7ca61e423..ff5de9d77dd 100644
--- a/ACE/ace/config-openbsd.h
+++ b/ACE/ace/config-openbsd.h
@@ -229,6 +229,8 @@
 // bogus compiler syntax error.
 #define ACE_LACKS_CLEARERR
 
+#define ACE_HAS_SNPRINTF
+
 // OpenBSD 3.2 lacks sched_setscheduler (see /usr/src/lib/libc_r/TODO)
 #define ACE_LACKS_SETSCHED
 
diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h
index 24eaceceb3c..39b488e49bf 100644
--- a/ACE/ace/config-openvms.h
+++ b/ACE/ace/config-openvms.h
@@ -84,6 +84,7 @@
 #define ACE_LACKS_PWD_REENTRANT_FUNCTIONS 1
 #define ACE_LACKS_RAND_REENTRANT_FUNCTIONS 1
 
+#define ACE_HAS_SNPRINTF 1
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_CHARPTR_DL 1
 #define ACE_HAS_CLOCK_GETTIME 1
diff --git a/ACE/ace/config-pharlap.h b/ACE/ace/config-pharlap.h
index 739a424ce19..fa274e22383 100644
--- a/ACE/ace/config-pharlap.h
+++ b/ACE/ace/config-pharlap.h
@@ -21,7 +21,8 @@
 #endif
 
 // Fortunately, PharLap ETS offers much of the Win32 API. But it's still on
-// Winsock 1.1
+// WinNT 3.5, Winsock 1.1
+#define ACE_HAS_WINNT4 0
 #define ACE_HAS_WINSOCK2 0
 
 // The TSS implementation doesn't pass muster on the TSS_Test, but it works
@@ -33,8 +34,6 @@
 #define ACE_LACKS_MSYNC
 #define ACE_LACKS_TCP_NODELAY
 #define ACE_LACKS_MSG_WFMO
-#define ACE_LACKS_WIN32_MOVEFILEEX
-#define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS
 
 // There's no host table, by default. So using "localhost" won't work.
 // If your system does have the ability to use "localhost" and you want to,
@@ -48,9 +47,8 @@
 #define ACE_PAGE_SIZE 4096
 
 #if defined (ACE_HAS_PHARLAP_RT)
-# define ACE_HAS_IP_MULTICAST
   // ETS winsock doesn't define IP level socket options
-//# define IP_TOS 8
+# define IP_TOS 8
 #endif /* ACE_HAS_PHARLAP_RT */
 
 // Let the config-win32.h file do its thing
diff --git a/ACE/ace/config-posix-nonetworking.h b/ACE/ace/config-posix-nonetworking.h
deleted file mode 100644
index d87b20c340b..00000000000
--- a/ACE/ace/config-posix-nonetworking.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- C -*- */
-// $Id$
-
-/* The following configuration file is designed to work for RTEMS
-   platforms using GNU C.
-*/
-
-#ifndef ACE_CONFIG_POSIX_NONETWORKING_H
-#define ACE_CONFIG_POSIX_NONETWORKING_H
-
-// Missing header files
-# define ACE_LACKS_SYS_UIO_H
-# define ACE_LACKS_SYS_SOCKET_H
-# define ACE_LACKS_NETINET_IN_H
-# define ACE_LACKS_NETDB_H
-# define ACE_LACKS_ARPA_INET_H
-# define ACE_LACKS_SYS_SELECT_H
-# define ACE_LACKS_NET_IF_H
-# define ACE_LACKS_SYSLOG_H
-# define ACE_LACKS_SYS_UN_H
-# define ACE_LACKS_MEMORY_H
-# define ACE_LACKS_SYS_SYSCTL_H
-# define ACE_LACKS_NETINET_TCP_H
-
-// Missing types
-# define ACE_LACKS_IOVEC
-# define ACE_LACKS_IN_ADDR
-# define ACE_LACKS_SOCKADDR_IN
-# define ACE_LACKS_SOCKADDR_UN
-# define ACE_LACKS_HOSTENT
-# define ACE_LACKS_SOCKADDR
-# define ACE_LACKS_IP_MREQ
-# define ACE_LACKS_PROTOENT
-# define ACE_LACKS_SERVENT
-# define ACE_LACKS_IFREQ
-# define ACE_LACKS_IFCONF
-# define ACE_LACKS_LINGER
-
-// Missing methods
-# define ACE_LACKS_GETHOSTBYADDR
-# define ACE_LACKS_GETHOSTBYNAME
-# define ACE_LACKS_GETIPNODEBYADDR
-# define ACE_LACKS_LISTEN
-# define ACE_LACKS_BIND
-# define ACE_LACKS_NTOHL
-# define ACE_LACKS_HTONL
-# define ACE_LACKS_HTONS
-# define ACE_LACKS_NTOHS
-# define ACE_LACKS_SELECT
-# define ACE_LACKS_SOCKET
-# define ACE_LACKS_SHUTDOWN
-# define ACE_LACKS_SETSOCKOPT
-# define ACE_LACKS_INET_ATON
-# define ACE_LACKS_INET_ADDR
-# define ACE_LACKS_INET_NTOA
-# define ACE_LACKS_GET_BCAST_ADDR
-# define ACE_LACKS_GETHOSTENT
-# define ACE_LACKS_GETSERVBYNAME
-# define ACE_LACKS_ACCEPT
-# define ACE_LACKS_CONNECT
-# define ACE_LACKS_GETPEERNAME
-# define ACE_LACKS_GETSOCKNAME
-# define ACE_LACKS_GETSOCKOPT
-# define ACE_LACKS_RECV
-# define ACE_LACKS_SEND
-# define ACE_LACKS_SENDTO
-# define ACE_LACKS_RECVFROM
-# define ACE_LACKS_RECVMSG
-# define ACE_LACKS_SENDMSG
-# define ACE_LACKS_GETHOSTBYADDR_R
-# define ACE_LACKS_GETPROTOBYNAME
-# define ACE_LACKS_GETPROTOBYNUMBER
-# define ACE_LACKS_GETSERVBYNAME
-# define ACE_LACKS_READV
-# define ACE_LACKS_WRITEV
-# define ACE_LACKS_SOCKETPAIR
-# undef ACE_HAS_MSG
-
-// Missing OS features
-# define ACE_LACKS_UNIX_SYSLOG
-# define ACE_LACKS_TCP_NODELAY
-
-// Missing ACE features
-# define ACE_DISABLE_NOTIFY_PIPE_DEFAULT 1
-
-#endif /* ACE_CONFIG_POSIX_NONETWORKING_H */
diff --git a/ACE/ace/config-posix.h b/ACE/ace/config-posix.h
index dc1f0091ab5..42656c9989e 100644
--- a/ACE/ace/config-posix.h
+++ b/ACE/ace/config-posix.h
@@ -49,18 +49,17 @@
 #   undef ACE_HAS_THREADS
 # else
 #   if defined(_POSIX_THREADS) && (_POSIX_THREADS-0 != -1 )
-#     if !defined(ACE_HAS_THREADS)
-#       define ACE_HAS_THREADS
-#     endif /* ACE_HAS_THREADS */
+#   if !defined(ACE_HAS_THREADS)
+#     define ACE_HAS_THREADS
+#   endif /* ACE_HAS_THREADS */
 
-#     if !defined(ACE_HAS_PTHREADS)
-#       define ACE_HAS_PTHREADS
-#     endif /* ACE_HAS_PTHREADS */
-
-#     if !defined(ACE_HAS_PTHREADS_STD)
-#       define ACE_HAS_PTHREADS_STD
-#     endif /* ACE_HAS_PTHREADS_STD */
+#   if !defined(ACE_HAS_PTHREADS)
+#     define ACE_HAS_PTHREADS
+#   endif /* ACE_HAS_PTHREADS */
 
+#   if !defined(ACE_HAS_PTHREADS_STD)
+#     define ACE_HAS_PTHREADS_STD
+#   endif /* ACE_HAS_PTHREADS_STD */
 #   endif /* _POSIX_THREADS */
 # endif /* ACE_HAS_THREADS */
 #endif /* !ACE_MT_SAFE */
@@ -71,4 +70,8 @@
 # endif /* ACE_HAS_POSIX_MESSAGE_PASSING */
 #endif /* _POSIX_MESSAGE_PASSING */
 
+#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500)
+#  define ACE_HAS_SNPRINTF
+#endif /* _XOPEN_SOURCE */
+
 #endif /* ACE_CONFIG_POSIX_H */
diff --git a/ACE/ace/config-qnx-neutrino.h b/ACE/ace/config-qnx-neutrino.h
index d8fedf532fe..32549c1aa87 100644
--- a/ACE/ace/config-qnx-neutrino.h
+++ b/ACE/ace/config-qnx-neutrino.h
@@ -15,6 +15,13 @@
 #define _POSIX_NAME_MAX     14      /*  Max bytes in a filename             */
 #define _POSIX_PATH_MAX     256     /*  Num. bytes in pathname (excl. NULL) */
 
+// gcc can do inline
+#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+# if !defined (__ACE_INLINE__)
+#   define __ACE_INLINE__
+# endif /* ! __ACE_INLINE__ */
+#endif
+
 #if defined(__OPTIMIZE__)
 # if defined(__X86__)
     // string.h can't be used by ACE with __OPTIMIZE__.
@@ -64,7 +71,6 @@
 #define ACE_HAS_MT_SAFE_MKTIME
 #define ACE_HAS_MUTEX_TIMEOUTS
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
-#define ACE_HAS_NONCONST_SWAB
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_PTHREADS
@@ -78,6 +84,7 @@
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SIG_MACROS
 #define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_SIZET_SOCKET_LEN
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
@@ -92,9 +99,9 @@
 #define ACE_HAS_UCONTEXT_T
 #define ACE_HAS_VOIDPTR_MMAP
 #define ACE_HAS_VOIDPTR_SOCKOPT
+#define ACE_LACKS_CMSG_DATA_MEMBER
 #define ACE_LACKS_CONDATTR_PSHARED
 #define ACE_LACKS_CONST_TIMESPEC_PTR
-#define ACE_LACKS_CUSERID
 #define ACE_LACKS_FORK
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #define ACE_LACKS_MADVISE
@@ -102,19 +109,17 @@
 #define ACE_LACKS_NAMED_POSIX_SEM
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_POLL_H
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
+#define ACE_LACKS_RTTI
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SBRK
 #define ACE_LACKS_SEEKDIR
 #define ACE_LACKS_SOCKET_BUFSIZ
 #define ACE_LACKS_SOCKETPAIR
-#define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_STREAM_MODULES
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSCALL
 #define ACE_LACKS_SYS_MSG_H
-#define ACE_LACKS_SYS_SHM_H
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_TCP_NODELAY
 #define ACE_LACKS_TELLDIR
diff --git a/ACE/ace/config-qnx-rtp-62x.h b/ACE/ace/config-qnx-rtp-62x.h
index a8f5b35ec92..a54bc100225 100644
--- a/ACE/ace/config-qnx-rtp-62x.h
+++ b/ACE/ace/config-qnx-rtp-62x.h
@@ -52,6 +52,7 @@
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SIG_MACROS
 #define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_SNPRINTF
 #define ACE_HAS_SOCKLEN_T
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STRERROR
@@ -74,6 +75,7 @@
 //
 //                ACE_LACKS Section
 /////////////////////////////////////////////////////////////////
+#define ACE_LACKS_CMSG_DATA_MEMBER
 #define ACE_LACKS_CONST_TIMESPEC_PTR
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #define ACE_LACKS_MADVISE
diff --git a/ACE/ace/config-qnx-rtp-pre62x.h b/ACE/ace/config-qnx-rtp-pre62x.h
index c1ba745d664..46734ef8670 100644
--- a/ACE/ace/config-qnx-rtp-pre62x.h
+++ b/ACE/ace/config-qnx-rtp-pre62x.h
@@ -73,6 +73,7 @@
 //
 //                ACE_LACKS Section
 /////////////////////////////////////////////////////////////////
+#define ACE_LACKS_CMSG_DATA_MEMBER
 #define ACE_LACKS_CONDATTR_PSHARED
 #define ACE_LACKS_CONST_TIMESPEC_PTR
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index e2bf828b966..9379c2ffc19 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -33,12 +33,14 @@
 #  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! __KCC */
 
-#include "ace/config-posix.h"
-
 // Completely common part :-)
 
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 
+#if !defined (ACE_MAIN)
+# define ACE_MAIN ace_main
+#endif /* ! ACE_MAIN */
+
 #define ACE_LACKS_REGEX_H
 #define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_DLFCN_H
@@ -54,11 +56,13 @@
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_LACKS_STRCASECMP
 #define ACE_LACKS_MKSTEMP
+#define ACE_LACKS_PUTENV
 #define ACE_LACKS_STRDUP
 #define ACE_LACKS_STRTOK_R
 #define ACE_LACKS_RAND_REENTRANT_FUNCTIONS
 #define ACE_LACKS_REALPATH
 #define ACE_LACKS_TEMPNAM
+#define ACE_LACKS_INTPTR_T
 
 // Temporarily, enabling this results in compile errors with
 // rtems 4.6.6.
@@ -71,15 +75,12 @@
 // ... and the final standard even!
 #define ACE_HAS_PTHREADS_STD
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
-#define ACE_HAS_PTHREAD_SCHEDPARAM
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
 
 // XXX thread defines go here
 #define ACE_MT_SAFE 1
 #define ACE_PAGE_SIZE 4096
 #define ACE_HAS_ALT_CUSERID
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_CLOCK_SETTIME
 #define ACE_HAS_DIRENT
@@ -87,7 +88,6 @@
 #define ACE_HAS_MEMCHR
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_MKTIME
-#define ACE_HAS_NONCONST_READV
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_REENTRANT_FUNCTIONS
@@ -106,6 +106,7 @@
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_MADVISE
+#define ACE_LACKS_MKFIFO
 #define ACE_LACKS_MMAP
 #define ACE_LACKS_MPROTECT
 #define ACE_LACKS_MSYNC
@@ -113,6 +114,7 @@
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 #define ACE_LACKS_READDIR_R
 #define ACE_LACKS_READLINK
+#define ACE_HAS_NONCONST_READV
 #define ACE_LACKS_READV
 #define ACE_LACKS_RLIMIT
 #define ACE_LACKS_RLIMIT_PROTOTYPE
@@ -123,7 +125,6 @@
 #define ACE_LACKS_SETREUID_PROTOTYPE
 #define ACE_LACKS_SETREGID
 #define ACE_LACKS_SETREGID_PROTOTYPE
-#define ACE_LACKS_SIGVAL_T
 #define ACE_LACKS_STRPTIME
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SI_ADDR
@@ -137,26 +138,76 @@
 #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536
 #define ACE_NEEDS_SCHED_H
 #define ACE_HAS_POSIX_NONBLOCK
+#define ACE_LACKS_FDOPEN
 #define ACE_HAS_TERMIOS
 
-// rtems 4.7 or higher
-#if (__RTEMS_MAJOR__ > 4) || (__RTEMS_MAJOR__ == 4 && __RTEMS_MINOR__ > 6)
-# define ACE_HAS_UALARM
-#else
-# define ACE_LACKS_INTPTR_T
-# undef ACE_HAS_SHM_OPEN
-# undef ACE_HAS_AIO_CALLS
-#endif
-
-// __RTEMS_REVISION__ could also be used but this is broken according
-// to the rtems people
+#if defined (ACE_LACKS_NETWORKING)
 
-#if !defined (_POSIX_REALTIME_SIGNALS)
-# define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-#endif
+// Missing header files
+# define ACE_LACKS_SYS_UIO_H
+# define ACE_LACKS_SYS_SOCKET_H
+# define ACE_LACKS_NETINET_IN_H
+# define ACE_LACKS_NETDB_H
+# define ACE_LACKS_ARPA_INET_H
+# define ACE_LACKS_SYS_SELECT_H
+# define ACE_LACKS_NET_IF_H
+# define ACE_LACKS_SYSLOG_H
+# define ACE_LACKS_SYS_UN_H
+# define ACE_LACKS_MEMORY_H
+# define ACE_LACKS_SYS_SYSCTL_H
+# define ACE_LACKS_NETINET_TCP_H
+
+// Missing types
+# define ACE_LACKS_IOVEC
+# define ACE_LACKS_IN_ADDR
+# define ACE_LACKS_SOCKADDR_IN
+# define ACE_LACKS_HOSTENT
+# define ACE_LACKS_SOCKADDR
+# define ACE_LACKS_IP_MREQ
+# define ACE_LACKS_PROTOENT
+# define ACE_LACKS_SERVENT
+# define ACE_LACKS_IFREQ
+
+// Missing methods
+# define ACE_LACKS_GETHOSTBYADDR
+# define ACE_LACKS_GETHOSTBYNAME
+# define ACE_LACKS_GETIPNODEBYADDR
+# define ACE_LACKS_LISTEN
+# define ACE_LACKS_BIND
+# define ACE_LACKS_NTOHL
+# define ACE_LACKS_HTONL
+# define ACE_LACKS_HTONS
+# define ACE_LACKS_NTOHS
+# define ACE_LACKS_SELECT
+# define ACE_LACKS_SOCKET
+# define ACE_LACKS_SHUTDOWN
+# define ACE_LACKS_SETSOCKOPT
+# define ACE_LACKS_INET_ATON
+# define ACE_LACKS_INET_ADDR
+# define ACE_LACKS_INET_NTOA
+# define ACE_LACKS_GET_BCAST_ADDR
+# define ACE_LACKS_GETSERVBYNAME
+# define ACE_LACKS_ACCEPT
+# define ACE_LACKS_CONNECT
+# define ACE_LACKS_GETPEERNAME
+# define ACE_LACKS_GETSOCKNAME
+# define ACE_LACKS_GETSOCKOPT
+# define ACE_LACKS_RECV
+# define ACE_LACKS_SEND
+# define ACE_LACKS_SENDTO
+# define ACE_LACKS_RECVFROM
+# define ACE_LACKS_RECVMSG
+# define ACE_LACKS_SENDMSG
+# define ACE_LACKS_GETHOSTBYADDR_R
+# define ACE_LACKS_GETPROTOBYNAME
+# define ACE_LACKS_GETPROTOBYNUMBER
+# define ACE_LACKS_GETSERVBYNAME
+# undef ACE_HAS_MSG
+
+// Missing OS features
+# define ACE_LACKS_UNIX_SYSLOG
+# define ACE_LACKS_TCP_NODELAY
 
-#if defined (ACE_LACKS_NETWORKING)
-# include "ace/config-posix-nonetworking.h"
 #endif
 
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-sco-4.2-nothread.h b/ACE/ace/config-sco-4.2-nothread.h
new file mode 100644
index 00000000000..67ff29a6333
--- /dev/null
+++ b/ACE/ace/config-sco-4.2-nothread.h
@@ -0,0 +1,110 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for SCO UNIX
+// version 4.2 without threads.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+  // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION.
+  // Maybe it will work?
+# undef ACE_HAS_TEMPLATE_SPECIALIZATION
+#endif /* __GNUG__ */
+
+// Compiling for SCO.
+#if !defined (SCO)
+#define SCO
+#endif /* SCO */
+
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0
+
+#if defined (SCO) && !defined (MAXPATHLEN)
+#define MAXPATHLEN 1023
+#endif /* SCO */
+
+#define ACE_HAS_SIG_MACROS
+#define ACE_LACKS_UNIX_DOMAIN_SOCKETS
+#define ACE_LACKS_SYSCALL
+#define ACE_LACKS_STRRECVFD
+#define ACE_LACKS_MMAP
+#define ACE_LACKS_SOCKETPAIR
+#define ACE_HAS_SEMUN
+#define ACE_LACKS_MSYNC
+#define ACE_LACKS_MADVISE
+#define ACE_LACKS_WRITEV
+#define ACE_LACKS_READV
+#define ACE_NEEDS_FTRUNCATE
+#define ACE_LACKS_RLIMIT
+#define ACE_LACKS_RECVMSG
+#define ACE_LACKS_SENDMSG
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+// Platform supports recvmsg and sendmsg.
+//#define ACE_HAS_MSG
+
+// Compiler/platform contains the <sys/syscall.h> file.
+//#define ACE_HAS_SYS_SYSCALL_H
+
+// Fixes a problem with HP/UX not wrapping the mmap(2) header files
+// with extern "C".
+//#define ACE_HAS_BROKEN_MMAP_H
+
+// 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
+
+// Header files lack t_errno for ACE_TLI.
+//#define ACE_LACKS_T_ERRNO
+
+// Compiler/platform supports poll().
+#define ACE_HAS_POLL
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Compiler/platform defines the sig_atomic_t typedef
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Compiler supports the ssize_t typedef.
+//#define ACE_HAS_SSIZE_T
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// Platform/compiler supports void * as second parameter to gettimeofday().
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
+
+// Note, this only works if the flag is set above!
+//#define ACE_HAS_GETRUSAGE
+
+// Platform uses int for select() rather than fd_set.
+#define ACE_SELECT_USES_INT
+
+// Platform has prototypes for ACE_TLI.
+//#define ACE_HAS_TLI_PROTOTYPES
+// Platform has the XLI version of ACE_TLI.
+// #define ACE_HAS_XLI
+
+#define ACE_HAS_GNU_CSTRING_H
+
+#define ACE_HAS_DIRENT
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-sco-5.0.0-fsu-pthread.h b/ACE/ace/config-sco-5.0.0-fsu-pthread.h
new file mode 100644
index 00000000000..6d94c55d3a8
--- /dev/null
+++ b/ACE/ace/config-sco-5.0.0-fsu-pthread.h
@@ -0,0 +1,15 @@
+/* -*- C++ -*- */
+// $Id$
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#include "ace/config-g++-common.h"
+#include "ace/config-sco-5.0.0.h"
+#include "ace/config-fsu-pthread.h"
+
+#define ACE_HAS_GNU_CSTRING_H
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-sco-5.0.0-mit-pthread.h b/ACE/ace/config-sco-5.0.0-mit-pthread.h
new file mode 100644
index 00000000000..bfc938a9213
--- /dev/null
+++ b/ACE/ace/config-sco-5.0.0-mit-pthread.h
@@ -0,0 +1,164 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for SCO UNIX
+// version 5.0 with MIT pthreads.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#if !defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+  // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION.
+  // Maybe it will work?
+# undef ACE_HAS_TEMPLATE_SPECIALIZATION
+#endif /* __GNUG__ */
+
+// Compiling for SCO.
+#if !defined (SCO)
+#define SCO
+#define _SVID3
+#endif /* SCO */
+
+#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0
+#define ACE_HAS_SIG_MACROS
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+#if defined (SCO) && !defined (MAXPATHLEN)
+#define MAXPATHLEN 1023
+#endif /* SCO */
+
+#define ACE_LACKS_PWD_FUNCTIONS
+#define ACE_HAS_BIG_FD_SET
+
+//#define ACE_LACKS_SYSCALL
+//#define ACE_LACKS_STRRECVFD
+//#define ACE_NEEDS_FTRUNCATE
+#define ACE_LACKS_RLIMIT
+#define ACE_LACKS_MADVISE
+
+#define ACE_HAS_REENTRANT_FUNCTIONS
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+#define ACE_HAS_NONCONST_MSGSND
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
+// Compiler/platform contains the <sys/syscall.h> file.
+//#define ACE_HAS_SYS_SYSCALL_H
+
+// Fixes a problem with HP/UX not wrapping the mmap(2) header files
+// with extern "C".
+//#define ACE_HAS_BROKEN_MMAP_H
+
+// 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
+
+// Header files lack t_errno for ACE_TLI.
+//#define ACE_LACKS_T_ERRNO
+
+// Compiler/platform supports poll().
+// #define ACE_HAS_POLL
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Compiler/platform defines the sig_atomic_t typedef
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Compiler supports the ssize_t typedef.
+//#define ACE_HAS_SSIZE_T
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// ???
+// #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
+#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
+
+// Note, this only works if the flag is set above!
+//#define ACE_HAS_GETRUSAGE
+
+// Platform uses int for select() rather than fd_set.
+#define ACE_HAS_SELECT_H
+
+// Platform has prototypes for ACE_TLI.
+#define ACE_HAS_TLI
+//#define       ACE_HAS_SVR4_TLI
+#define ACE_HAS_TLI_PROTOTYPES
+#define ACE_HAS_TIMOD_H
+#define ACE_HAS_TIUSER_H
+#define ACE_LACKS_T_ERRNO
+
+// Platform has the XLI version of ACE_TLI.
+// #define ACE_HAS_XLI
+
+#define ACE_HAS_GNU_CSTRING_H
+
+#define ACE_HAS_SIGINFO_T
+#define ACE_HAS_UCONTEXT_T
+
+#define ACE_HAS_INLINED_OSCALLS
+
+#define ACE_HAS_STRBUF_T
+#define ACE_HAS_STREAMS
+//#define       ACE_HAS_STREAM_PIPES
+#define ACE_HAS_IP_MULTICAST
+
+// Threads
+#define ACE_HAS_THREADS
+#if !defined (ACE_MT_SAFE)
+# define ACE_MT_SAFE 1
+#endif
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+#define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_STD
+#define ACE_LACKS_PTHREAD_CANCEL
+#define ACE_HAS_SIGWAIT
+#define ACE_LACKS_THREAD_PROCESS_SCOPING
+//#define ACE_LACKS_THREAD_STACK_ADDR
+// If ACE doesn't compile due to the lack of these methods, please
+// send email to schmidt@cs.wustl.edu reporting this.
+// #define ACE_LACKS_CONDATTR_PSHARED
+// #define ACE_LACKS_MUTEXATTR_PSHARED
+#define ACE_LACKS_RWLOCK_T
+#define ACE_LACKS_SETSCHED
+#define ACE_HAS_POSIX_TIME
+
+#include <pthread.h>
+#include <sys/regset.h>
+
+#define ACE_LACKS_TIMEDWAIT_PROTOTYPES
+#define ACE_HAS_RECV_TIMEDWAIT
+#define ACE_HAS_RECVFROM_TIMEDWAIT
+#define ACE_HAS_RECVMSG_TIMEDWAIT
+#define ACE_HAS_SEND_TIMEDWAIT
+#define ACE_HAS_SENDTO_TIMEDWAIT
+#define ACE_HAS_SENDMSG_TIMEDWAIT
+#define ACE_HAS_READ_TIMEDWAIT
+#define ACE_HAS_READV_TIMEDWAIT
+#define ACE_HAS_WRITE_TIMEDWAIT
+#define ACE_HAS_WRITEV_TIMEDWAIT
+#define ACE_HAS_DIRENT
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-sunos5.4-centerline-2.x.h b/ACE/ace/config-sunos5.4-centerline-2.x.h
new file mode 100644
index 00000000000..2aa9e407c43
--- /dev/null
+++ b/ACE/ace/config-sunos5.4-centerline-2.x.h
@@ -0,0 +1,157 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for SunOS 5.4
+// platforms using the Centerline 2.x C++ compiler.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#define ACE_HAS_TEMPLATE_SPECIALIZATION
+
+// Platform supports pread() and pwrite()
+#define ACE_HAS_P_READ_WRITE
+
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+#define ACE_HAS_XPG4_MULTIBYTE_CHAR
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+// Sun has the wrong prototype for sendmsg.
+#define ACE_HAS_NONCONST_SENDMSG
+
+// The SunOS 5.x version of rand_r is inconsistent with the header files...
+#define ACE_HAS_BROKEN_RANDR
+
+// Platform supports system configuration information.
+#define ACE_HAS_SYSINFO
+
+// Platform supports the POSIX regular expression library
+#define ACE_HAS_REGEX
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
+// Compiler/platform contains the <sys/syscall.h> file.
+#define ACE_HAS_SYS_SYSCALL_H
+
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
+
+// Compiler/platform correctly calls init()/fini() for shared libraries.
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+// Compiler/platform supports SunOS high resolution timers.
+#define ACE_HAS_HI_RES_TIMER
+
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
+// Platform contains <poll.h>.
+#define ACE_HAS_POLL
+
+// Platform supports POSIX timers via timestruc_t.
+#define ACE_HAS_POSIX_TIME
+
+// Platform supports the /proc file system.
+#define ACE_HAS_PROC_FS
+
+// Platform supports the prusage_t struct.
+#define ACE_HAS_PRUSAGE_T
+
+// Compiler/platform defines the sig_atomic_t typedef.
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Platform supports SVR4 extended signals.
+#define ACE_HAS_SIGINFO_T
+#define ACE_HAS_UCONTEXT_T
+
+// Compiler/platform provides the sockio.h file.
+#define ACE_HAS_SYS_SOCKIO_H
+
+// Compiler supports the ssize_t typedef.
+#define ACE_HAS_SSIZE_T
+
+// Platform supports STREAMS.
+#define ACE_HAS_STREAMS
+
+// Platform supports STREAM pipes.
+#define ACE_HAS_STREAM_PIPES
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// Compiler/platform supports struct strbuf.
+#define ACE_HAS_STRBUF_T
+
+// Compiler/platform supports SVR4 dynamic linking semantics.
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+
+// Compiler/platform supports SVR4 signal typedef.
+#define ACE_HAS_SVR4_SIGNAL_T
+
+// Platform lacks pthread_sigaction
+#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
+
+// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)...
+#define ACE_HAS_SVR4_TLI
+
+// Platform provides <sys/filio.h> header.
+#define ACE_HAS_SYS_FILIO_H
+
+// Compiler/platform supports sys_siglist array.
+#define ACE_HAS_SYS_SIGLIST
+
+/* Turn off the following defines if you want to disable threading. */
+// Compile using multi-thread libraries.
+#if !defined (ACE_MT_SAFE)
+# define ACE_MT_SAFE 1
+#endif
+
+// Platform supports threads.
+#define ACE_HAS_THREADS
+
+// Platform supports Solaris threads.
+#define ACE_HAS_STHREADS
+
+// Compiler/platform has thread-specific storage
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+
+// Platform supports reentrant functions (i.e., all the POSIX *_r functions).
+#define ACE_HAS_REENTRANT_FUNCTIONS
+
+/* end threading defines */
+
+#define ACE_HAS_PRIOCNTL
+#define ACE_NEEDS_LWP_PRIO_SET
+
+// Platform supports ACE_TLI timod STREAMS module.
+#define ACE_HAS_TIMOD_H
+
+// Platform supports ACE_TLI tiuser header.
+#define ACE_HAS_TIUSER_H
+
+// Platform provides ACE_TLI function prototypes.
+#define ACE_HAS_TLI_PROTOTYPES
+
+// Platform supports ACE_TLI.
+#define ACE_HAS_TLI
+
+#define ACE_NEEDS_DEV_IO_CONVERSION
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+#define ACE_HAS_IDTYPE_T
+#define ACE_HAS_DIRENT
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h
index cb431bf7520..8530ebdecde 100644
--- a/ACE/ace/config-sunos5.4-g++.h
+++ b/ACE/ace/config-sunos5.4-g++.h
@@ -15,7 +15,6 @@
 // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
 // this must appear before its #include.
 #define ACE_HAS_STRING_CLASS
-#define ACE_LACKS_SIGVAL_T
 
 #include "ace/config-g++-common.h"
 #define ACE_HAS_GNU_CSTRING_H
@@ -28,7 +27,7 @@
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS
+#define ACE_HAS_TERMIOS 
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
diff --git a/ACE/ace/config-sunos5.4-sunc++-4.x.h b/ACE/ace/config-sunos5.4-sunc++-4.x.h
index bb8e4a17a76..882307aab64 100644
--- a/ACE/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ACE/ace/config-sunos5.4-sunc++-4.x.h
@@ -12,7 +12,6 @@
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
-#define ACE_LACKS_SIGVAL_T
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
 // Optimize ACE_Handle_Set for select().
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index 5fe33487e16..3323074f951 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -384,9 +384,9 @@
 # endif /* __GNUC_MINOR__ */
 #endif /* __GNUG__ */
 
-#if defined (i386) && (_FILE_OFFSET_BITS==32)
+#if defined (i386)
 # define ACE_HAS_X86_STAT_MACROS
-#endif /* i386 && _FILE_OFFSET_BITS==32 */
+#endif /* i386 */
 
 #define ACE_MALLOC_ALIGN 8
 #define ACE_LACKS_SETREUID_PROTOTYPE
@@ -402,12 +402,5 @@
 #undef ACE_HAS_PROC_FS
 #undef ACE_HAS_PRUSAGE_T
 #endif /* (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) */
-
-#if defined (_POSIX_PTHREAD_SEMANTICS) || (_FILE_OFFSET_BITS == 64) || (_POSIX_C_SOURCE - 0 >= 199506L)
-#  define ACE_HAS_3_PARAM_READDIR_R
-#endif
-
-#define ACE_LACKS_SIGVAL_T
-
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-sunos5.7.h b/ACE/ace/config-sunos5.7.h
index 239fba2d8c9..5e8b21a6469 100644
--- a/ACE/ace/config-sunos5.7.h
+++ b/ACE/ace/config-sunos5.7.h
@@ -69,6 +69,11 @@
 // SunOS 5.7 has socklen_t
 #define ACE_HAS_SOCKLEN_T
 
+// snprintf() is available at least from Solaris 7 on. If it can be determined
+// that it's also available in Solaris 2.6, this can be moved into
+// config-sunos5.6.h.
+#define ACE_HAS_SNPRINTF
+
 #if defined (__sparcv9)
 #define _LP64
 #define ACE_SIZEOF_LONG 8 /* Needed to circumvent compiler bug #4294969 */
diff --git a/ACE/ace/config-sunos5.8.h b/ACE/ace/config-sunos5.8.h
index 1d9df968710..fdaa9c3bbe2 100644
--- a/ACE/ace/config-sunos5.8.h
+++ b/ACE/ace/config-sunos5.8.h
@@ -16,7 +16,6 @@
 // This may be true for earlier Solaris versions, but I can only verify it
 // for Solaris 8 and later.
 #define ACE_HAS_VFWPRINTF
-#define ACE_SHM_OPEN_REQUIRES_ONE_SLASH
 
 // This may be true for versions prior to Solaris 8 as well, but I don't
 // have any to try it on.
diff --git a/ACE/ace/config-sunos5.9.h b/ACE/ace/config-sunos5.9.h
index 42043928fec..fd2cdd82acb 100644
--- a/ACE/ace/config-sunos5.9.h
+++ b/ACE/ace/config-sunos5.9.h
@@ -13,6 +13,5 @@
 #include "ace/config-sunos5.8.h"
 
 #define ACE_HAS_SENDFILE
-#define ACE_LACKS_THR_CONCURRENCY_FUNCS
 
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h
index 102092a9ea5..cba5b7b8148 100644
--- a/ACE/ace/config-tandem-nsk-mips-v2.h
+++ b/ACE/ace/config-tandem-nsk-mips-v2.h
@@ -109,6 +109,10 @@ typedef enum CMA_T_SCHED_POLICY {
 // Platform supports recvmsg and sendmsg
 #define ACE_HAS_MSG
 
+// Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but its cmsghdr
+// structure does not contain an 'unsigned char cmsg_data[0]' member.
+#define ACE_LACKS_CMSG_DATA_MEMBER
+
 //  Platform defines ACE_HAS_MSG, but lacks msg_accrights{,len}.
 #define ACE_LACKS_MSG_ACCRIGHTS
 
diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h
index f975a979561..bd3500e0d5f 100644
--- a/ACE/ace/config-tandem-nsk-mips-v3.h
+++ b/ACE/ace/config-tandem-nsk-mips-v3.h
@@ -110,6 +110,10 @@ typedef enum CMA_T_SCHED_POLICY {
 // Platform supports recvmsg and sendmsg
 #define ACE_HAS_MSG
 
+// Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but its cmsghdr
+// structure does not contain an 'unsigned char cmsg_data[0]' member.
+#define ACE_LACKS_CMSG_DATA_MEMBER
+
 //  Platform defines ACE_HAS_MSG, but lacks msg_accrights{,len}.
 #define ACE_LACKS_MSG_ACCRIGHTS
 
diff --git a/ACE/ace/config-tru64.h b/ACE/ace/config-tru64.h
index d34d7e0f68a..d0e6556bd23 100644
--- a/ACE/ace/config-tru64.h
+++ b/ACE/ace/config-tru64.h
@@ -23,7 +23,8 @@
 #define ACE_LACKS_CLEARERR
 #endif /* ACE_MT_SAFE == 0 */
 
-#include "ace/config-posix.h"
+// Include unistd.h to define _POSIX_C_SOURCE.
+#include <unistd.h>
 
 // Configuration-specific #defines:
 // 1) g++ or cxx
@@ -168,6 +169,9 @@
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 
 #if DIGITAL_UNIX >= 0x500
+# ifndef ACE_HAS_SNPRINTF
+#   define ACE_HAS_SNPRINTF
+# endif /* ACE_HAS_SNPRINTF */
 # define ACE_HAS_XPG4_MULTIBYTE_CHAR 1
 #endif /* DIGITAL_UNIX >= 0x500 */
 
diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h
index 33f4205fb04..549db4416dd 100644
--- a/ACE/ace/config-unixware-7.1.0.udk.h
+++ b/ACE/ace/config-unixware-7.1.0.udk.h
@@ -199,9 +199,24 @@
 /* Platform supports POSIX Threads */
 #define ACE_HAS_PTHREADS
 
+/* Platform supports POSIX Threads .4a Draft 4 */
+/* #undef ACE_HAS_PTHREADS_DRAFT4 */
+
+/* Platform supports POSIX Threads .4a Draft 6 */
+/* #undef ACE_HAS_PTHREADS_DRAFT6 */
+
+/* Platform supports POSIX Threads .1c Draft 7 */
+/* #undef ACE_HAS_PTHREADS_DRAFT7 */
+
 /* Platform supports POSIX.1c-1995 threads */
 #define ACE_HAS_PTHREADS_STD
 
+/* Platform has pthread_condattr_setkind_np(). */
+/* #undef ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP */
+
+/* Platform has pthread_mutexattr_setkind_np(). */
+/* #undef ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP */
+
 /* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and
    PTHREAD_PROCESS_SHARED values */
 #define ACE_HAS_PTHREAD_PROCESS_ENUM
@@ -394,6 +409,9 @@
 /* Platform needs to #include <sched.h> to get thread scheduling defs. */
 #define ACE_NEEDS_SCHED_H 1
 
+/* Turns off the LM_DEBUG and LM_ERROR logging macros... */
+/* #undef ACE_NLOGGING */
+
 /* The OS/platform supports the poll() event demultiplexor */
 #define ACE_USE_POLL 1
 
diff --git a/ACE/ace/config-vxworks5.x.h b/ACE/ace/config-vxworks5.x.h
index af1cedc425e..df5faa15189 100644
--- a/ACE/ace/config-vxworks5.x.h
+++ b/ACE/ace/config-vxworks5.x.h
@@ -194,7 +194,6 @@
 #define ACE_LACKS_UTSNAME_T
 #define ACE_LACKS_UNAME
 #define ACE_LACKS_STRPTIME
-#define ACE_LACKS_VSNPRINTF
 #define ACE_LACKS_WAIT
 #define ACE_LACKS_WAITPID
 #define ACE_LACKS_DUP2
@@ -246,7 +245,6 @@
 #define ACE_LACKS_TERMIOS_H
 #define ACE_LACKS_POLL_H
 #define ACE_LACKS_WCTYPE_H
-#define ACE_LACKS_SIGVAL_T
 
 // Not sure if these should always be defined.
 #define ACE_LACKS_SYS_UN_H
diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h
index 36069489479..fa680b8c6e4 100644
--- a/ACE/ace/config-vxworks6.2.h
+++ b/ACE/ace/config-vxworks6.2.h
@@ -109,6 +109,7 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SNPRINTF
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
@@ -131,7 +132,6 @@
 #define ACE_LACKS_MPROTECT
 #define ACE_LACKS_MSYNC
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_SIGVAL_T
 #define ACE_LACKS_SYS_PARAM_H
 #define ACE_LACKS_PWD_FUNCTIONS
 #define ACE_LACKS_READDIR_R
@@ -210,7 +210,6 @@
   #define ACE_HAS_SETENV
   #define ACE_HAS_3_PARAM_WCSTOK
   #define ACE_HAS_WCHAR
-  #define ACE_HAS_VFWPRINTF
   #define ACE_SIZEOF_WCHAR 2
 #else
   // We are building for kernel mode
diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h
index 25a36d9bc44..0cd0d9fa800 100644
--- a/ACE/ace/config-vxworks6.3.h
+++ b/ACE/ace/config-vxworks6.3.h
@@ -2,7 +2,7 @@
 // $Id$
 
 // The following configuration file is designed to work for VxWorks
-// 6.3 platforms using one of these compilers:
+// 6.2 platforms using one of these compilers:
 // 1) The GNU g++ compiler that is shipped with VxWorks 6.3
 
 #ifndef ACE_CONFIG_H
@@ -49,6 +49,7 @@
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_NONCONST_GETBY
 #define ACE_HAS_NONCONST_SWAB
+#define ACE_HAS_NONCONST_READV
 #define ACE_LACKS_UNIX_SYSLOG
 #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768
 #define ACE_DEFAULT_THREAD_KEYS 16
@@ -73,6 +74,7 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SNPRINTF
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
@@ -103,7 +105,6 @@
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SBRK
 #define ACE_LACKS_SEEKDIR
-#define ACE_LACKS_SIGVAL_T
 #define ACE_LACKS_SEMBUF_T
 #define ACE_LACKS_SIGINFO_H
 #define ACE_LACKS_SI_ADDR
@@ -123,6 +124,9 @@
 #define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF
 #define ACE_HAS_SIGTIMEDWAIT
 #define ACE_HAS_SIGSUSPEND
+#if !defined (ACE_VXWORKS_SPARE)
+# define ACE_VXWORKS_SPARE spare4
+#endif /* ! ACE_VXWORKS_SPARE */
 #define ACE_HAS_GETIFADDRS
 
 #define ACE_LACKS_SETEGID
@@ -169,7 +173,6 @@
   #define ACE_HAS_SETENV
   #define ACE_HAS_3_PARAM_WCSTOK
   #define ACE_HAS_WCHAR
-  #define ACE_HAS_VFWPRINTF
   #define ACE_SIZEOF_WCHAR 2
   #define ACE_HAS_SHM_OPEN
   #define ACE_HAS_AIO_CALLS
@@ -180,7 +183,6 @@
 #else
   // We are building for kernel mode
   #define ACE_LACKS_SUSECONDS_T
-  #define ACE_LACKS_INTPTR_T
   #define ACE_LACKS_INTTYPES_H
   #define ACE_LACKS_STDINT_H
   #define ACE_LACKS_UNAME
@@ -249,9 +251,6 @@
 // Only when building for kernel mode we can use TSS emulation, in rtp mode
 // we can't use the WIND_TCB struct anymore
 #  define ACE_HAS_TSS_EMULATION
-#  if !defined (ACE_VXWORKS_SPARE)
-#   define ACE_VXWORKS_SPARE spare4
-#  endif /* ! ACE_VXWORKS_SPARE */
 # endif
 // VxWorks has no recursive mutexes. This was set in the past but it doesn't
 // work with the pthread support, so only set it for the time being when pthread
@@ -267,10 +266,10 @@
 
 // Needed include to get all VxWorks CPU types
 #include "types/vxCpu.h"
-#if defined (CPU) && (CPU == PENTIUM || CPU == PENTIUM2 || CPU == PENTIUM3 || CPU == PENTIUM4)
- // If running an Intel Pentium the
- // ACE_OS::gethrtime () can use the RDTSC instruction.
-  # define ACE_HAS_PENTIUM
+#if (CPU == PENTIUM || CPU == PENTIUM2 || CPU == PENTIUM3 || CPU == PENTIUM4)
+// If running an Intel Pentium the
+// ACE_OS::gethrtime () can use the RDTSC instruction.
+# define ACE_HAS_PENTIUM
 #endif
 
 // VxWorks defines the CPU define MAP, undef it to prevent problems with
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
deleted file mode 100644
index fbc957b9b85..00000000000
--- a/ACE/ace/config-vxworks6.4.h
+++ /dev/null
@@ -1,312 +0,0 @@
-//* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for VxWorks
-// 6.4 platforms using one of these compilers:
-// 1) The GNU g++ compiler that is shipped with VxWorks 6.4
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include /**/ "ace/pre.h"
-
-#if ! defined (VXWORKS)
-# define VXWORKS
-#endif /* ! VXWORKS */
-
-#if ! defined (ACE_VXWORKS)
-# define ACE_VXWORKS 0x640
-#endif /* ! ACE_VXWORKS */
-
-#if !defined (__RTP__)
-  // Fix for wrong typedef of time_t in kernel mode
-  #ifndef _TIME_T
-  #define _TIME_T
-  typedef long time_t;
-  #endif
-#endif
-
-
-#if ! defined (__ACE_INLINE__)
-# define __ACE_INLINE__
-#endif /* ! __ACE_INLINE__ */
-
-// Compiler-specific configuration.
-#if defined (__GNUG__)
-# include "ace/config-g++-common.h"
-
-# define ACE_LACKS_IOSTREAM_FX
-# define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
-  // GNU 3.3+ toolchain supports long long types but fails to define this so STL
-  // skips some definitions
-#   if !defined (_GLIBCPP_USE_LONG_LONG)
-#     define _GLIBCPP_USE_LONG_LONG
-#   endif
-# endif /* (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) */
-
-#elif defined (__DCC__)
-# define ACE_HAS_STANDARD_CPP_LIBRARY 1
-# define ACE_TEMPLATES_REQUIRE_SOURCE
-#else  /* ! __GNUG__ && ! ghs && !__DCC__ */
-#  ifdef __cplusplus  /* Let it slide for C compilers. */
-#    error unsupported compiler on VxWorks
-#  endif  /* __cplusplus */
-#endif /* ! __GNUG__ && ! ghs */
-
-// OS-specific configuration
-#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#define ACE_HAS_3_PARAM_READDIR_R
-#define ACE_HAS_NONCONST_GETBY
-#define ACE_HAS_NONCONST_SWAB
-#define ACE_LACKS_UNIX_SYSLOG
-#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_CHARPTR_DL
-#define ACE_HAS_CLOCK_GETTIME
-#define ACE_HAS_CLOCK_SETTIME
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-#define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_DIRENT
-#define ACE_HAS_DLL 0
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_MSG
-#define ACE_HAS_NONCONST_READV
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
-#define ACE_HAS_POSIX_NONBLOCK
-#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_REENTRANT_FUNCTIONS
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_SIGWAIT
-#define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_STRERROR
-#define ACE_HAS_THREADS
-#define ACE_HAS_SYSCTL
-#define ACE_LACKS_EXEC
-#define ACE_LACKS_RLIMIT
-#define ACE_LACKS_FILELOCKS
-#define ACE_LACKS_FORK
-#define ACE_LACKS_GETHOSTENT
-#define ACE_LACKS_GETSERVBYNAME
-#define ACE_LACKS_GETPROTOBYNAME
-#define ACE_LACKS_GETPROTOBYNUMBER
-#define ACE_LACKS_GETIPNODEBYADDR
-#define ACE_LACKS_GETIPNODEBYNAME_IPV6
-#define ACE_LACKS_LSTAT
-#define ACE_LACKS_MADVISE
-#define ACE_LACKS_MALLOC_H
-#define ACE_LACKS_MEMORY_H
-#define ACE_LACKS_MKFIFO
-#define ACE_LACKS_MKSTEMP
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_SYS_PARAM_H
-#define ACE_LACKS_PWD_FUNCTIONS
-#define ACE_LACKS_READLINK
-#define ACE_LACKS_REALPATH
-#define ACE_LACKS_PIPE
-#define ACE_LACKS_RWLOCK_T
-#define ACE_LACKS_SBRK
-#define ACE_LACKS_SEEKDIR
-#define ACE_LACKS_SEMBUF_T
-#define ACE_LACKS_SIGINFO_H
-#define ACE_LACKS_SIGVAL_T
-#define ACE_LACKS_SI_ADDR
-#define ACE_LACKS_SOCKETPAIR
-#define ACE_LACKS_STRRECVFD
-#define ACE_LACKS_SYSV_SHMEM
-#define ACE_LACKS_TELLDIR
-#define ACE_LACKS_TIMESPEC_T
-#define ACE_LACKS_TRUNCATE
-#define ACE_LACKS_UCONTEXT_H
-#define ACE_LACKS_USECONDS_T
-#define ACE_LACKS_UMASK
-#define ACE_LACKS_STRPTIME
-#define ACE_LACKS_MKTEMP
-#define ACE_LACKS_TEMPNAM
-#define ACE_PAGE_SIZE 4096
-#define ACE_THR_PRI_FIFO_DEF 101
-#define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF
-#define ACE_HAS_SIGTIMEDWAIT
-#define ACE_HAS_SIGSUSPEND
-#define ACE_HAS_GETIFADDRS
-
-#define ACE_LACKS_SETEGID
-#define ACE_LACKS_SETPGID
-#define ACE_LACKS_SETREGID
-#define ACE_LACKS_SETREUID
-#define ACE_LACKS_SETSID
-#define ACE_LACKS_SETUID
-#define ACE_LACKS_SETEUID
-#define ACE_LACKS_GETEUID
-#define ACE_LACKS_GETUID
-#define ACE_LACKS_GETPGID
-#define ACE_LACKS_GETEGID
-#define ACE_LACKS_GETGID
-#define ACE_LACKS_SETGID
-
-#define ACE_LACKS_SYS_UIO_H
-#define ACE_LACKS_SYS_IPC_H
-#define ACE_LACKS_SYS_SEM_H
-#define ACE_LACKS_STROPTS_H
-#define ACE_LACKS_SYS_MSG_H
-#define ACE_LACKS_PWD_H
-#define ACE_LACKS_SYS_SHM_H
-#define ACE_LACKS_TERMIOS_H
-#define ACE_LACKS_POLL_H
-#define ACE_LACKS_FCNTL
-
-// Some string things
-#define ACE_LACKS_STRCASECMP
-#define ACE_LACKS_ITOW
-#define ACE_LACKS_WCSDUP
-#define ACE_LACKS_WCSICMP
-#define ACE_LACKS_WCSNICMP
-
-#define ACE_HAS_CHARPTR_SOCKOPT
-#define ACE_LACKS_SYMLINKS
-
-#if defined __RTP__
-  // We are building for RTP mode
-  #define ACE_HAS_SVR4_DYNAMIC_LINKING
-  #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-  #define ACE_LACKS_REGEX_H
-  #define ACE_HAS_SETENV
-  #define ACE_HAS_3_PARAM_WCSTOK
-  #define ACE_HAS_WCHAR
-  #define ACE_HAS_VFWPRINTF
-  #define ACE_SIZEOF_WCHAR 2
-  #define ACE_HAS_SHM_OPEN
-  #define ACE_HAS_AIO_CALLS
-  // VxWorks seems to either not define this or define as zero up till now
-  #if !defined (IOV_MAX) || (IOV_MAX == 0)
-    #define ACE_IOV_MAX 16
-  #endif
-#else
-  // We are building for kernel mode
-  #define ACE_LACKS_SUSECONDS_T
-  #define ACE_LACKS_INTPTR_T
-  #define ACE_LACKS_INTTYPES_H
-  #define ACE_LACKS_STDINT_H
-  #define ACE_LACKS_UNAME
-  #define ACE_LACKS_UTSNAME_T
-  #define ACE_LACKS_RAND_REENTRANT_FUNCTIONS
-  #define ACE_LACKS_DLFCN_H
-  #define ACE_LACKS_WAIT
-  #define ACE_LACKS_WAITPID
-  #define ACE_LACKS_SYS_TIME_H
-  #define ACE_LACKS_SYS_SELECT_H
-  #define ACE_LACKS_STRINGS_H
-  #define ACE_MKDIR_LACKS_MODE
-  #define ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R
-  #define ACE_LACKS_SEARCH_H
-  #define ACE_LACKS_SYSCONF
-  #define ACE_LACKS_GETPPID
-  #define ACE_LACKS_WCHAR_H
-  #define ACE_LACKS_WCTYPE_H
-  #define ACE_LACKS_WCSCAT
-  #define ACE_LACKS_WCSCHR
-  #define ACE_LACKS_WCSCMP
-  #define ACE_LACKS_WCSCPY
-  #define ACE_LACKS_WCSCSPN
-  #define ACE_LACKS_WCSLEN
-  #define ACE_LACKS_WCSNCAT
-  #define ACE_LACKS_WCSNCMP
-  #define ACE_LACKS_WCSNCPY
-  #define ACE_LACKS_WCSPBRK
-  #define ACE_LACKS_WCSRCHR
-  #define ACE_LACKS_WCSSPN
-  #define ACE_LACKS_WCSSTR
-  #define ACE_LACKS_WCSTOK
-  #define ACE_LACKS_TOWLOWER
-  #define ACE_LACKS_TOWUPPER
-  #define ACE_LACKS_WCSTOD
-  #define ACE_LACKS_WCSTOL
-  #define ACE_LACKS_WCSTOUL
-  #define ACE_LACKS_FGETWC
-  #define ACE_LACKS_FGETWS
-  #define ACE_LACKS_FPUTWS
-  #define ACE_HAS_IOCTL_INT_3_PARAM
-  #define ACE_LACKS_MMAP
-  #define ACE_LACKS_MSYNC
-  #define ACE_LACKS_MPROTECT
-  #if !defined (ACE_MAIN)
-  #  define ACE_MAIN ace_main
-  #endif /* ! ACE_MAIN */
-#endif
-
-// It is possible to enable pthread support with VxWorks, when the user decides
-// to use this, we need some more defines
-#if defined ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
-# define ACE_HAS_THREAD_SPECIFIC_STORAGE
-# define ACE_HAS_POSIX_SEM
-# define ACE_LACKS_MUTEXATTR_PSHARED
-# define ACE_LACKS_CONDATTR_PSHARED
-// Include this file, the sys/stat.h file shipped with VxWorks has old types
-// and without this include we get a lot of compile errors. A TSR has been filed
-// so that hopefully in the future we can zap this include
-#include "types/vxTypesOld.h"
-#else
-# define ACE_LACKS_PTHREAD_H
-# if !defined __RTP__
-// Only when building for kernel mode we can use TSS emulation, in rtp mode
-// we can't use the WIND_TCB struct anymore
-#  define ACE_HAS_TSS_EMULATION
-#  if !defined (ACE_VXWORKS_SPARE)
-#   define ACE_VXWORKS_SPARE spare4
-#  endif /* ! ACE_VXWORKS_SPARE */
-# endif
-// VxWorks has no recursive mutexes. This was set in the past but it doesn't
-// work with the pthread support, so only set it for the time being when pthread
-// is disabled
-# define ACE_HAS_RECURSIVE_MUTEXES
-# define ACE_LACKS_COND_T
-# define ACE_HAS_MUTEX_TIMEOUTS
-#endif
-
-#if !defined (ACE_MT_SAFE)
-# define ACE_MT_SAFE 1
-#endif
-
-// Needed include to get all VxWorks CPU types
-#include "types/vxCpu.h"
-#if defined __RTP__
-  #if defined (_VX_CPU) && (_VX_CPU == _VX_PENTIUM || _VX_CPU == _VX_PENTIUM2 || _VX_CPU == _VX_PENTIUM3 || _VX_CPU == _VX_PENTIUM4)
-    // If running an Intel Pentium the
-    // ACE_OS::gethrtime () can use the RDTSC instruction.
-    # define ACE_HAS_PENTIUM
-  #endif
-#else
-  #if defined (CPU) && (CPU == PENTIUM || CPU == PENTIUM2 || CPU == PENTIUM3 || CPU == PENTIUM4)
-   // If running an Intel Pentium the
-   // ACE_OS::gethrtime () can use the RDTSC instruction.
-    # define ACE_HAS_PENTIUM
-  #endif
-#endif
-
-// VxWorks defines the CPU define MAP, undef it to prevent problems with
-// application code
-#if defined (MAP)
-#undef MAP
-#endif /* MAP */
-
-#if !defined (ACE_NEEDS_HUGE_THREAD_STACKSIZE)
-# define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536
-#endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */
-
-#if !defined (ACE_NTRACE)
-# define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-// By default, don't include RCS Id strings in object code.
-#if !defined (ACE_USE_RCSID)
-#define ACE_USE_RCSID 0
-#endif /* !ACE_USE_RCSID */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_H */
-
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 2646135e8a8..91b81ece8a1 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -110,10 +110,21 @@
 # define ACE_LACKS_INLINE_ASSEMBLY
 #endif
 
-#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
-#define ACE_STRCASECMP_EQUIVALENT ::stricmp
-#define ACE_STRNCASECMP_EQUIVALENT ::strnicmp
-#define ACE_HAS_ITOA 1
+#if (__BORLANDC__ >= 0x600)
+# define ACE_LACKS_PTRDIFF_T
+# define ACE_PTRDIFF_T_TYPE std::ptrdiff_t
+# define ACE_HAS_DINKUM_STL
+# undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS
+# define ACE_STRCASECMP_EQUIVALENT std::strcasecmp
+# define ACE_STRNCASECMP_EQUIVALENT std::strncasecmp
+# define ACE_LACKS_WCSDUP
+# define ACE_HAS_3_PARAM_WCSTOK
+#else
+# define ACE_WCSDUP_EQUIVALENT ::_wcsdup
+# define ACE_STRCASECMP_EQUIVALENT ::stricmp
+# define ACE_STRNCASECMP_EQUIVALENT ::strnicmp
+# define ACE_HAS_ITOA 1
+#endif
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_WIN32_BORLAND_H */
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 7beabb8ded6..18ae219fe3d 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -37,8 +37,24 @@
 #  endif  /* !_FILE_OFFSET_BITS */
 #endif /* _WIN64 || WIN64 */
 
-#if !defined (_WIN32_WINNT)
-# define _WIN32_WINNT 0x0400
+// Define this if you're running NT >= 4.0 (Win2K == NT 5).
+//  Setting applies to  : building ACE
+//  Runtime restrictions: System must be Windows NT => 4.0
+#if !defined (ACE_HAS_WINNT4)
+# define ACE_HAS_WINNT4 1      /* assuming Win NT 4.0 or greater */
+#endif
+
+#if (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 != 0)
+# if !defined (_WIN32_WINNT)
+#  define _WIN32_WINNT 0x0400
+# endif
+#else
+// On Win9X, a shared address SHOULD be between the 2nd and 3rd Gb.
+// Note this will not work for NT: The addresses above 2Gb are
+// reserved for the system, so this one will fail.
+# if !defined (ACE_DEFAULT_BASE_ADDR)
+#   define ACE_DEFAULT_BASE_ADDR ((char*) ((2048UL+512UL)*1024UL*1024UL))
+# endif
 #endif
 
 // If the invoking procedure turned off debugging by setting NDEBUG, then
@@ -185,8 +201,14 @@
 // probably don't want too big a value for ACE_IOV_MAX since it may
 // mostly go to waste or the size of the activation record may become
 // excessively large.
+
 #if !defined (ACE_IOV_MAX)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
 # define ACE_IOV_MAX 64
+#else
+// Win 95/98/me need a smaller value than WinNT versions of Windows.
+# define ACE_IOV_MAX 16
+#endif /* #if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 #endif /* ACE_IOV_MAX */
 
 #if !defined (ACE_HAS_WINCE)
@@ -265,7 +287,9 @@
 #define ACE_LACKS_WAIT
 #define ACE_LACKS_IOVEC
 
+#define ACE_HAS_SNPRINTF
 #define ACE_HAS_VFWPRINTF
+#define ACE_HAS_VSWPRINTF
 
 #define ACE_MKDIR_LACKS_MODE
 
@@ -302,8 +326,10 @@
 // Platform supports the /proc file system.
 //define ACE_HAS_PROC_FS
 
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
 // Platform supports the rusage struct.
 #define ACE_HAS_GETRUSAGE
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
 // Compiler/platform supports SVR4 signal typedef.
 //define ACE_HAS_SVR4_SIGNAL_T
@@ -524,19 +550,20 @@
 # define ACE_HAS_IP_MULTICAST
 #endif /* ACE_HAS_WINSOCK2 */
 
-#if !defined (ACE_HAS_WINCE) || defined (PPC)   /* CE only on some CPUs */
-#  define ACE_HAS_INTERLOCKED_EXCHANGEADD
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || \
+    defined (ACE_HAS_WINCE)            /* WinCE 3 has these */
+#  if !defined (ACE_HAS_WINCE) || defined (PPC)   /* CE only on some CPUs */
+#    define ACE_HAS_INTERLOCKED_EXCHANGEADD
+#  endif
+# define ACE_HAS_WIN32_TRYLOCK
 #endif
-#define ACE_HAS_WIN32_TRYLOCK
 
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)
 # define ACE_HAS_SIGNAL_OBJECT_AND_WAIT
 
 // If CancelIO is undefined get the updated sp2-sdk from MS
 # define ACE_HAS_CANCEL_IO
-# define ACE_HAS_WIN32_OVERLAPPED_IO
-# define ACE_HAS_WIN32_NAMED_PIPES
-#endif /* !defined (ACE_USES_WINCE_SEMA_SIMULATION) && !ACE_HAS_PHARLAP */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) */
 
 #if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION)
 # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH
@@ -550,15 +577,6 @@
 # endif /* WINSOCK_VERSION */
 #endif /* ACE_HAS_WINSOCK2_GQOS */
 
-// These are the defaults and can be overridden by a user's config.h
-#if !defined (ACE_DEFAULT_FILE_PERMS)
-#  define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE | \
-                                  FILE_SHARE_DELETE)
-// This alternate used to be used for pre-NT4 systems; may still be needed
-// by knock-offs such as CE and Pharlap.
-//#       define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE)
-#endif /* !defined (ACE_DEFAULT_FILE_PERMS) */
-
 #define ACE_SIZEOF_WCHAR 2
 #define ACE_HAS_MUTEX_TIMEOUTS
 #define ACE_LACKS_STRUCT_DIR
diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h
index 954bc24cc45..53ace409799 100644
--- a/ACE/ace/config-win32-interix.h
+++ b/ACE/ace/config-win32-interix.h
@@ -53,6 +53,7 @@
 #define ACE_SIZEOF_LONG_DOUBLE 12
 #define ACE_PAGE_SIZE 4096
 
+#define ACE_HAS_SNPRINTF
 #define ACE_HAS_SYSV_IPC
 #define ACE_HAS_SVR4_SIGNAL_T
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h
index b9c59685622..50b78b4f4ef 100644
--- a/ACE/ace/config-win32-mingw.h
+++ b/ACE/ace/config-win32-mingw.h
@@ -88,6 +88,15 @@
 # define ACE_HAS_PENTIUM
 #endif
 
+#if !defined (ACE_HAS_WINNT4)
+# if (defined (WINNT) && WINNT == 1) \
+     || (defined (__WINNT__) && __WINNT__ == 1)
+#  define ACE_HAS_WINNT4 1
+# else
+#  define ACE_HAS_WINNT4 0
+# endif
+#endif
+
 #define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d")
 #define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
 
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index b6758dfa96f..9b85888b05b 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -65,22 +65,12 @@
 # error This version of Microsoft Visual C++ is not supported.
 #endif
 
-// MFC changes the behavior of operator new at all MSVC versions from 6 up
-// by throwing a static CMemoryException* instead of std::bad_alloc
-// (see ace/OS_Memory.h). This MFC exception object needs to be cleaned up
-// by calling its Delete() method.
+// MFC changes the behavior of operator new at all MSVC versions from 6 up,
+// see ace/OS_Memory.h (throws a static CMemoryException* instead of std::bad_alloc)
 #if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1)
 #  if !defined (ACE_NEW_THROWS_EXCEPTIONS)
 #    define ACE_NEW_THROWS_EXCEPTIONS
 #  endif
-#  if defined (ACE_bad_alloc)
-#    undef ACE_bad_alloc
-#  endif
-#  define ACE_bad_alloc CMemoryException *e
-#  if defined (ACE_del_bad_alloc)
-#    undef ACE_del_bad_alloc
-#  endif
-#  define ACE_del_bad_alloc e->Delete();
 #endif /* ACE_HAS_MFC && ACE_HAS_MFC==1 */
 
 #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h
index c689e07ab7e..9c312425649 100644
--- a/ACE/ace/os_include/net/os_if.h
+++ b/ACE/ace/os_include/net/os_if.h
@@ -49,10 +49,6 @@
 #  endif /* HPUX && IOR */
 #endif /* !ACE_LACKS_NET_IF_H */
 
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-#  include /**/ <ws2tcpip.h>
-#endif /* ACE_HAS_WINSOCK2 */
-
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
@@ -63,59 +59,6 @@ extern "C"
    struct ifafilt;
 #endif /* ACE_HAS_BROKEN_IF_HEADER */
 
-#if defined (ACE_LACKS_IFREQ)
-struct  ifreq {
-#define IFNAMSIZ        16
-        char    ifr_name[IFNAMSIZ];             /* if name, e.g. "en0" */
-        union {
-                struct  sockaddr ifru_addr;
-                struct  sockaddr ifru_dstaddr;
-                struct  sockaddr ifru_broadaddr;
-                short   ifru_flags;
-                int     ifru_metric;
-                int     ifru_mtu;
-                int     ifru_phys;
-                int     ifru_media;
-                caddr_t ifru_data;
-                int     (*ifru_tap)(struct ifnet *, struct ether_header *, struct mbuf *);
-        } ifr_ifru;
-#define ifr_addr        ifr_ifru.ifru_addr      /* address */
-#define ifr_dstaddr     ifr_ifru.ifru_dstaddr   /* other end of p-to-p link */
-#define ifr_broadaddr   ifr_ifru.ifru_broadaddr /* broadcast address */
-#define ifr_flags       ifr_ifru.ifru_flags     /* flags */
-#define ifr_metric      ifr_ifru.ifru_metric    /* metric */
-#define ifr_mtu         ifr_ifru.ifru_mtu       /* mtu */
-#define ifr_phys        ifr_ifru.ifru_phys      /* physical wire */
-#define ifr_media       ifr_ifru.ifru_media     /* physical media */
-#define ifr_data        ifr_ifru.ifru_data      /* for use by interface */
-#define ifr_tap         ifr_ifru.ifru_tap       /* tap function */
-};
-#endif /* ACE_LACKS_IFREQ */
-
-#if defined (ACE_LACKS_IFCONF)
-struct  ifconf {
-        int     ifc_len;
-        union {
-                caddr_t ifcu_buf;
-                struct  ifreq *ifcu_req;
-        } ifc_ifcu;
-#define ifc_buf ifc_ifcu.ifcu_buf       /* buffer address */
-#define ifc_req ifc_ifcu.ifcu_req       /* array of structures returned */
-        };
-#endif /* ACE_LACKS_IFCONF */
-
-#if !defined (IFF_UP)
-# define IFF_UP 0x1
-#endif /* IFF_UP */
-
-#if !defined (IFF_LOOPBACK)
-# define IFF_LOOPBACK 0x8
-#endif /* IFF_LOOPBACK */
-
-#if !defined (IFF_BROADCAST)
-# define IFF_BROADCAST 0x2
-#endif /* IFF_BROADCAST */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/ace/os_include/netinet/os_in.h b/ACE/ace/os_include/netinet/os_in.h
index f8af16f84fb..9b43db20e0a 100644
--- a/ACE/ace/os_include/netinet/os_in.h
+++ b/ACE/ace/os_include/netinet/os_in.h
@@ -85,14 +85,6 @@ extern "C"
   };
 # endif /* ACE_LACKS_SOCKADDR_IN */
 
-# if defined (ACE_LACKS_SOCKADDR_UN)
-  struct  sockaddr_un {
-          u_char  sun_len;                /* sockaddr len including null */
-          u_char  sun_family;             /* AF_UNIX */
-          char    sun_path[104];          /* path name (gag) */
-  };
-#endif /* ACE_LACKS_SOCKADDR_UN */
-
 # if defined (ACE_LACKS_IP_MREQ)
   struct ip_mreq
   {
@@ -169,10 +161,6 @@ extern "C"
 #   define IPPROTO_IP 0
 # endif /* IPPROTO_IP */
 
-# if !defined (IPPROTO_TCP)
-#   define IPPROTO_TCP 6
-# endif /* IPPROTO_TCP */
-
 # if !defined (INADDR_ANY)
 #   define INADDR_ANY (u_long)0x00000000
 # endif /* INADDR_ANY */
diff --git a/ACE/ace/os_include/netinet/os_tcp.h b/ACE/ace/os_include/netinet/os_tcp.h
index e0d6c4124d6..45fa48657e2 100644
--- a/ACE/ace/os_include/netinet/os_tcp.h
+++ b/ACE/ace/os_include/netinet/os_tcp.h
@@ -34,10 +34,6 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-# if !defined (TCP_NODELAY)
-#   define TCP_NODELAY 0x01
-# endif /* TCP_NODELAY */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/ace/os_include/os_errno.h b/ACE/ace/os_include/os_errno.h
index 6d2656dba16..9c9be161384 100644
--- a/ACE/ace/os_include/os_errno.h
+++ b/ACE/ace/os_include/os_errno.h
@@ -141,10 +141,6 @@ extern int t_errno;
 #  define EBUSY ETIME
 #endif /* EBUSY */
 
-#if !defined (ECANCELED)
-#  define ECANCELED 125
-#endif /* ECANCELED */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/ace/os_include/os_limits.h b/ACE/ace/os_include/os_limits.h
index ea66cdefd93..17dba75622a 100644
--- a/ACE/ace/os_include/os_limits.h
+++ b/ACE/ace/os_include/os_limits.h
@@ -102,11 +102,11 @@ extern "C"
 #  define ACE_IOV_MAX IOV_MAX
 #endif /* ACE_IOV_MAX */
 
-#if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640)) && !defined (__RTP__)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x620)
 #  if defined (PIPE_BUF) && (PIPE_BUF == -1)
 #    undef PIPE_BUF
 #  endif
-#endif /* ACE_VXWORKS */
+#endif /* ACE_VXWORKS == 0x620 */
 
 #if !defined (PIPE_BUF)
 #  define PIPE_BUF 5120
diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h
index c1a4511041c..8266d4b365f 100644
--- a/ACE/ace/os_include/os_signal.h
+++ b/ACE/ace/os_include/os_signal.h
@@ -157,8 +157,12 @@ extern "C"
 
 #if defined (ACE_VXWORKS)
 #  define ACE_NSIG (_NSIGS + 1)
-#elif defined (__Lynx__) || defined (ACE_HAS_RTEMS)
+#elif defined (__Lynx__)
 #  define ACE_NSIG (NSIG + 1)
+#elif defined (ACE_HAS_RTEMS)
+#  define ACE_NSIG (SIGRTMAX)
+#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x600)
+#  define ACE_NSIG _NSIG
 #else
    // All other platforms set NSIG to one greater than the
    // highest-numbered signal.
@@ -167,15 +171,37 @@ extern "C"
 
 #if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES)
    // Prototypes for both signal() and struct sigaction are consistent..
+  //#  if defined (ACE_HAS_SIG_C_FUNC)
+  //   extern "C" {
+  //#  endif /* ACE_HAS_SIG_C_FUNC */
   typedef void (*ACE_SignalHandler)(int);
   typedef void (*ACE_SignalHandlerV)(int);
-#elif defined (ACE_HAS_LYNXOS_SIGNALS) || defined (ACE_HAS_TANDEM_SIGNALS)
+  //#  if defined (ACE_HAS_SIG_C_FUNC)
+  //   }
+  //#  endif /* ACE_HAS_SIG_C_FUNC */
+#elif defined (ACE_HAS_LYNXOS_SIGNALS)
+   typedef void (*ACE_SignalHandler)(...);
+   typedef void (*ACE_SignalHandlerV)(...);
+#elif defined (ACE_HAS_TANDEM_SIGNALS)
+   typedef void (*ACE_SignalHandler)(...);
+   typedef void (*ACE_SignalHandlerV)(...);
+#elif defined (ACE_HAS_IRIX_53_SIGNALS)
+   typedef void (*ACE_SignalHandler)(...);
+   typedef void (*ACE_SignalHandlerV)(...);
+#elif defined (ACE_HAS_SPARCWORKS_401_SIGNALS)
+   typedef void (*ACE_SignalHandler)(int, ...);
+   typedef void (*ACE_SignalHandlerV)(int,...);
+#elif defined (ACE_HAS_SUNOS4_SIGNAL_T)
    typedef void (*ACE_SignalHandler)(...);
    typedef void (*ACE_SignalHandlerV)(...);
 #elif defined (ACE_HAS_SVR4_SIGNAL_T)
    // SVR4 Signals are inconsistent (e.g., see struct sigaction)..
    typedef void (*ACE_SignalHandler)(int);
-   typedef void (*ACE_SignalHandlerV)(void);
+#  if !defined (m88k)     /*  with SVR4_SIGNAL_T */
+     typedef void (*ACE_SignalHandlerV)(void);
+#  else
+     typedef void (*ACE_SignalHandlerV)(int);
+#  endif  /*  m88k */       /*  with SVR4_SIGNAL_T */
 #elif defined (ACE_WIN32)
    typedef void (__cdecl *ACE_SignalHandler)(int);
    typedef void (__cdecl *ACE_SignalHandlerV)(int);
@@ -208,15 +234,19 @@ extern "C"
 
 // Defining POSIX4 real-time signal range.
 #if defined(ACE_HAS_POSIX_REALTIME_SIGNALS)
-#  define ACE_SIGRTMIN SIGRTMIN
-#  define ACE_SIGRTMAX SIGRTMAX
+#define ACE_SIGRTMIN SIGRTMIN
+#define ACE_SIGRTMAX SIGRTMAX
+
 #else /* !ACE_HAS_POSIX_REALTIME_SIGNALS */
-#  ifndef ACE_SIGRTMIN
-#    define ACE_SIGRTMIN 0
-#  endif /* ACE_SIGRTMIN */
-#  ifndef ACE_SIGRTMAX
-#    define ACE_SIGRTMAX 0
-#  endif /* ACE_SIGRTMAX */
+
+#ifndef ACE_SIGRTMIN
+#define ACE_SIGRTMIN 0
+#endif /* ACE_SIGRTMIN */
+
+#ifndef ACE_SIGRTMAX
+#define ACE_SIGRTMAX 0
+#endif /* ACE_SIGRTMAX */
+
 #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */
 
 #if defined (DIGITAL_UNIX)
diff --git a/ACE/ace/os_include/os_stdio.h b/ACE/ace/os_include/os_stdio.h
index cfb1843c563..feeb4371fec 100644
--- a/ACE/ace/os_include/os_stdio.h
+++ b/ACE/ace/os_include/os_stdio.h
@@ -37,7 +37,7 @@
 #  include /**/ <ioLib.h>
 // for remCurIdGet()
 #  include /**/ <remLib.h>
-#  if defined (__RTP__) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640))
+#  if defined (__RTP__) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630))
 #    define L_cuserid       _PARM_L_cuserid
 #  endif
 #endif /* ACE_VXWORKS */
diff --git a/ACE/ace/os_include/sys/os_resource.h b/ACE/ace/os_include/sys/os_resource.h
index 4fa753431de..cd28e932fa1 100644
--- a/ACE/ace/os_include/sys/os_resource.h
+++ b/ACE/ace/os_include/sys/os_resource.h
@@ -70,6 +70,10 @@ extern "C"
      FILETIME ru_utime;
      FILETIME ru_stime;
    };
+#else /* !ACE_WIN32 */
+#   if defined (m88k)
+#     define RUSAGE_SELF 1
+#   endif  /*  m88k */
 #endif /* ACE_WIN32 */
 
 #if defined (ACE_LACKS_RLIMIT_PROTOTYPE)
diff --git a/ACE/ace/os_include/sys/os_socket.h b/ACE/ace/os_include/sys/os_socket.h
index 7b18c047b25..376cf548555 100644
--- a/ACE/ace/os_include/sys/os_socket.h
+++ b/ACE/ace/os_include/sys/os_socket.h
@@ -27,7 +27,13 @@
 #include "ace/os_include/sys/os_uio.h"
 
 #if !defined (ACE_LACKS_SYS_SOCKET_H)
+#  if defined (ACE_HAS_AIX_BROKEN_SOCKET_HEADER)
+#    undef __cplusplus
+#  endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */
 #  include /**/ <sys/socket.h>
+#  if defined (ACE_HAS_AIX_BROKEN_SOCKET_HEADER)
+#    define __cplusplus
+#  endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */
 #endif /* !ACE_LACKS_SYS_SOCKET_H */
 
 #if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
@@ -64,13 +70,6 @@ extern "C"
     };
 # endif /* ACE_LACKS_SOCKADDR */
 
-# if defined (ACE_LACKS_LINGER)
-    struct  linger {
-          int     l_onoff;                /* option on/off */
-          int     l_linger;               /* linger time */
-    };
-# endif /* ACE_LACKS_LINGER */
-
 #if defined (ACE_WIN32)
    struct msghdr
    {
@@ -96,6 +95,13 @@ extern "C"
 #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
    // Control message size to pass a file descriptor.
 #  define ACE_BSD_CONTROL_MSG_LEN sizeof (struct cmsghdr) + sizeof (ACE_HANDLE)
+#  if defined (ACE_LACKS_CMSG_DATA_MACRO)
+#    if defined (ACE_LACKS_CMSG_DATA_MEMBER)
+#      define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))
+#    else
+#      define CMSG_DATA(cmsg) ((cmsg)->cmsg_data)
+#    endif /* ACE_LACKS_CMSG_DATA_MEMBER */
+#  endif /* ACE_LACKS_CMSG_DATA_MACRO */
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
 
 // Increase the range of "address families".  Please note that this
@@ -113,10 +119,6 @@ extern "C"
 #  define AF_LOCAL 1
 #endif /* AF_LOCAL */
 
-#if !defined (AF_UNIX)
-#  define AF_UNIX AF_LOCAL
-#endif /* AF_UNIX */
-
 #if !defined (AF_INET)
 #  define AF_INET 2
 #endif /* AF_INET */
@@ -164,10 +166,6 @@ extern "C"
 #  define SOCK_DGRAM 2
 #endif /* SOCK_DGRAM */
 
-#if !defined (SOCK_SEQPACKET)
-#  define SOCK_SEQPACKET 5
-#endif /* SOCK_SEQPACKET */
-
 #if !defined (SOL_SOCKET)
 #  define SOL_SOCKET 0xffff
 #endif /* SOL_SOCKET */
@@ -176,10 +174,6 @@ extern "C"
 #  define SO_REUSEADDR 0x0004
 #endif /* SO_REUSEADDR */
 
-#if !defined (SO_LINGER)
-#  define SO_LINGER 0x0080
-#endif /* SO_LINGER */
-
 #if !defined (SO_SNDBUF)
 #  define SO_SNDBUF 0x1001
 #endif /* SO_SNDBUF */
@@ -188,14 +182,6 @@ extern "C"
 #  define SO_RCVBUF 0x1002
 #endif /* SO_RCVBUF */
 
-#if !defined (SO_BROADCAST)
-#  define SO_BROADCAST 0x0020
-#endif /* SO_BROADCAST */
-
-#if !defined (SO_ERROR)
-#  define SO_ERROR 0x1007
-#endif /* SO_ERROR */
-
 #if defined (ACE_HAS_IPV6)
 #  if defined (ACE_USES_IPV4_IPV6_MIGRATION)
 #    define ACE_ADDRESS_FAMILY_INET  AF_UNSPEC
diff --git a/ACE/ace/os_include/sys/os_time.h b/ACE/ace/os_include/sys/os_time.h
index d8d061b5d62..7f65f5cb568 100644
--- a/ACE/ace/os_include/sys/os_time.h
+++ b/ACE/ace/os_include/sys/os_time.h
@@ -41,11 +41,11 @@ extern "C"
 #endif /* __cplusplus */
 
 #if defined (ACE_HAS_SVR4_GETTIMEOFDAY)
-# if !defined (SCO)
+# if !defined (m88k) && !defined (SCO)
   int gettimeofday (struct timeval *tp, void * = 0);
 # else
   int gettimeofday (struct timeval *tp);
-# endif  /* !SCO */
+# endif  /*  !m88k && !SCO */
 #elif defined (ACE_HAS_OSF1_GETTIMEOFDAY)
   int gettimeofday (struct timeval *tp, struct timezone * = 0);
 #elif defined (ACE_HAS_VOIDPTR_GETTIMEOFDAY)
diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h
index d9895abdecc..dbf1cfa412f 100644
--- a/ACE/ace/os_include/sys/os_types.h
+++ b/ACE/ace/os_include/sys/os_types.h
@@ -77,7 +77,7 @@ typedef double ACE_timer_t;
 #else
   typedef off_t ACE_OFF_T;
 #endif
-
+  
 #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8
    typedef off_t ACE_LOFF_T;
 #elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || \
@@ -89,7 +89,7 @@ typedef double ACE_timer_t;
    typedef offset_t ACE_LOFF_T;
 #elif defined (WIN32)
    typedef __int64  ACE_LOFF_T;
-#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x640 || ACE_VXWORKS == 0x630 || ACE_VXWORKS == 0x620 || ACE_VXWORKS == 0x551)) || \
+#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x630 || ACE_VXWORKS == 0x620 || ACE_VXWORKS == 0x551)) || \
   defined (ACE_LYNXOS_MAJOR) || \
   (defined (ACE_OPENVMS) && !defined (_LARGEFILE))
    typedef long long ACE_LOFF_T;
diff --git a/ACE/apps/Gateway/Gateway/Makefile.am b/ACE/apps/Gateway/Gateway/Makefile.am
index 5312eb331cb..83392e20564 100644
--- a/ACE/apps/Gateway/Gateway/Makefile.am
+++ b/ACE/apps/Gateway/Gateway/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -44,7 +44,6 @@ noinst_HEADERS = \
   Options.h
 
 ## Makefile.gatewayd.am
-
 noinst_PROGRAMS = gatewayd
 
 gatewayd_CPPFLAGS = \
diff --git a/ACE/apps/Gateway/Makefile.am b/ACE/apps/Gateway/Makefile.am
index e0b818fd319..ff47f4b6ecd 100644
--- a/ACE/apps/Gateway/Makefile.am
+++ b/ACE/apps/Gateway/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Gateway \
diff --git a/ACE/apps/Gateway/Peer/Makefile.am b/ACE/apps/Gateway/Peer/Makefile.am
index b17b963b7b8..843f407270a 100644
--- a/ACE/apps/Gateway/Peer/Makefile.am
+++ b/ACE/apps/Gateway/Peer/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -28,7 +28,6 @@ noinst_HEADERS = \
   Peer.h
 
 ## Makefile.gateway_peerd.am
-
 noinst_PROGRAMS = peerd
 
 peerd_CPPFLAGS = \
diff --git a/ACE/apps/JAWS/Makefile.am b/ACE/apps/JAWS/Makefile.am
index c922c992902..5703744183c 100644
--- a/ACE/apps/JAWS/Makefile.am
+++ b/ACE/apps/JAWS/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         clients \
diff --git a/ACE/apps/JAWS/clients/Blobby/Makefile.am b/ACE/apps/JAWS/clients/Blobby/Makefile.am
index 1e0071f74d1..e3846028703 100644
--- a/ACE/apps/JAWS/clients/Blobby/Makefile.am
+++ b/ACE/apps/JAWS/clients/Blobby/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.blobby.am
-
 noinst_PROGRAMS = blobby
 
 blobby_CPPFLAGS = \
diff --git a/ACE/apps/JAWS/clients/Caching/Makefile.am b/ACE/apps/JAWS/clients/Caching/Makefile.am
index fa89230d919..ba2cde63635 100644
--- a/ACE/apps/JAWS/clients/Caching/Makefile.am
+++ b/ACE/apps/JAWS/clients/Caching/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,24 +16,22 @@ ACE_ROOT = $(top_srcdir)
 
 if BUILD_ACE_FILECACHE
 if !BUILD_ACE_FOR_TAO
+noinst_LTLIBRARIES = libhttp_client.la
 
-noinst_PROGRAMS = http_client
-
-http_client_CPPFLAGS = \
+libhttp_client_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR)
 
-http_client_SOURCES = \
+libhttp_client_la_SOURCES = \
   http_client.cpp \
-  http_handler.cpp \
+  http_handler.cpp
+
+noinst_HEADERS = \
   Local_Locator.inl \
   Locator_Request_Reply.inl \
   URL_Properties.inl \
   http_handler.h
 
-http_client_LDADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACE_FILECACHE
 
diff --git a/ACE/apps/JAWS/clients/Caching/caching.mpc b/ACE/apps/JAWS/clients/Caching/caching.mpc
index 98481c0972e..fce9d81df4f 100644
--- a/ACE/apps/JAWS/clients/Caching/caching.mpc
+++ b/ACE/apps/JAWS/clients/Caching/caching.mpc
@@ -5,7 +5,6 @@ project(http_client) : aceexe {
   avoids   += ace_for_tao
   requires += ace_filecache
 
-  exename = http_client
   Source_Files {
     http_handler.cpp
     http_client.cpp
diff --git a/ACE/apps/JAWS/clients/Makefile.am b/ACE/apps/JAWS/clients/Makefile.am
index 76571aa387d..6f338fd5cc8 100644
--- a/ACE/apps/JAWS/clients/Makefile.am
+++ b/ACE/apps/JAWS/clients/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Blobby \
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/README b/ACE/apps/JAWS/clients/WebSTONE/src/README
index 2061342b7ae..2061342b7ae 100644..100755
--- a/ACE/apps/JAWS/clients/WebSTONE/src/README
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/README
diff --git a/ACE/apps/JAWS/server/Makefile.am b/ACE/apps/JAWS/server/Makefile.am
index 206dce1d281..d13d91ad381 100644
--- a/ACE/apps/JAWS/server/Makefile.am
+++ b/ACE/apps/JAWS/server/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -58,7 +58,6 @@ endif BUILD_ACE_FILECACHE
 if BUILD_ACE_FILECACHE
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
diff --git a/ACE/apps/JAWS2/HTTPU/Makefile.am b/ACE/apps/JAWS2/HTTPU/Makefile.am
deleted file mode 100644
index cd9ae09ec7d..00000000000
--- a/ACE/apps/JAWS2/HTTPU/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
-
-ACE_BUILDDIR = $(top_builddir)
-ACE_ROOT = $(top_srcdir)
-
-
-## Makefile.HTTPU.am
-
-if !BUILD_ACE_FOR_TAO
-if !BUILD_USES_WCHAR
-
-noinst_LTLIBRARIES = libHTTPU.la
-
-libHTTPU_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(srcdir)/.. \
-  -DHTTPU_BUILD_DLL
-
-libHTTPU_la_SOURCES = \
-  http_base.cpp \
-  http_headers.cpp \
-  http_request.cpp \
-  http_response.cpp \
-  http_status.cpp \
-  parse_http_request.cpp \
-  parse_http_response.cpp \
-  parse_url.cpp
-
-noinst_HEADERS = \
-  http_base.h \
-  http_base.inl \
-  http_export.h \
-  http_headers.h \
-  http_headers.inl \
-  http_request.h \
-  http_request.inl \
-  http_response.h \
-  http_response.inl \
-  http_status.h \
-  http_status.inl \
-  parse_http_request.h \
-  parse_http_request.inl \
-  parse_http_response.h \
-  parse_http_response.inl \
-  parse_url.h
-
-endif !BUILD_USES_WCHAR
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/apps/JAWS2/HTTPU/http_base.cpp b/ACE/apps/JAWS2/HTTPU/http_base.cpp
index 80e6e844614..4ffa4f74fde 100644
--- a/ACE/apps/JAWS2/HTTPU/http_base.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_base.cpp
@@ -26,11 +26,11 @@ HTTP_Base::receive (ACE_Message_Block &mb)
 
   switch (this->info_.status ())
     {
-    case JAWS_Header_Info::STATUS_CODE_OK:
+    case JAWS_Header_Info::OK:
       break;
 
-    case JAWS_Header_Info::STATUS_CODE_NO_MEMORY:
-    case JAWS_Header_Info::STATUS_CODE_TOO_LONG:
+    case JAWS_Header_Info::NO_MEMORY:
+    case JAWS_Header_Info::TOO_LONG:
     default:
       this->status_ = STATUS_INTERNAL_SERVER_ERROR;
       break;
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.cpp b/ACE/apps/JAWS2/HTTPU/http_headers.cpp
index 77db706dc15..3f1f5bc27bb 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.cpp
@@ -3,83 +3,74 @@
 #include "ace/RB_Tree.h"
 #include "HTTPU/http_headers.h"
 
-HTTP_Hdr_Node HTTP_HCodes::HTTP ("HTTP", "HTTP%s %s");
-HTTP_Hdr_Node HTTP_HCodes::ACCEPT ("Accept", "Accept: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::ACCEPTCHARSET ("Accept-Charset",
-                                          "Accept-Charset: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::ACCEPTENCODING ("Accept-Encoding",
-                                           "Accept-Encoding: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::ACCEPTLANGUAGE ("Accept-Language",
-                                           "Accept-Language: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::ACCEPTRANGES ("Accept-Ranges",
-                                         "Accept-Ranges: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::AGE ("Age", "Age: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::ALLOW ("Allow", "Allow: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::AUTHORIZATION ("Authorization",
-                                          "Authorization: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::CACHECONTROL ("Cache-Control",
-                                         "Cache-Control: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::CONNECTION ("Connection", "Connection: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::CONTENTENCODING ("Content-Encoding",
-                                            "Content-Encoding: %d\r\n");
-HTTP_Hdr_Node HTTP_HCodes::CONTENTLENGTH ("Content-Length",
-                                          "Content-Length: %d\r\n");
-HTTP_Hdr_Node HTTP_HCodes::CONTENTLOCATION ("Content-Location",
-                                            "Content-Location: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::CONTENTMD5 ("Content-MD5",
-                                       "Content-MD5: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::CONTENTRANGE ("Content-Range",
-                                         "Content-Range: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::CONTENTTYPE ("Content-Type",
-                                        "Content-Type: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::DATE ("Date", "Date: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::ETAG ("ETag", "ETag: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::EXPECT ("Expect", "Expect: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::EXPIRES ("Expires", "Expires: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::FROM ("From", "From: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::HOST ("Host", "Host: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::IFMATCH ("If-Match", "If-Match: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::IFMODIFIEDSINCE ("If-Modified-Since",
-                                            "If-Modified-Since: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::IFNONEMATCH ("If-None-Match",
-                                        "If-None-Match: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::IFRANGE ("If-Range", "If-Range: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::IFUNMODIFIEDSINCE ("If-Unmodified-Since",
-                                              "If-Unmodified-Since: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::LASTMODIFIED ("Last-Modified",
-                                         "Last-Modified: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::LOCATION ("Location", "Location: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::MAXFORWARDS ("Max-Forwards",
-                                        "Max-Forwards: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::PRAGMA ("Pragma", "Pragma: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::PROXYAUTHENTICATE ("Proxy-Authenticate",
-                                              "Proxy-Authenticate: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::PROXYAUTHORIZATION ("Proxy-Authorization",
-                                               "Proxy-Authorization: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::RANGE ("Range", "Range: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::REFERER ("Referer", "Referer: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::SERVER ("Server", "Server: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::TE ("TE", "TE: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::TRAILER ("Trailer", "Trailer: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::TRANSFERENCODING ("Transfer-Encoding",
-                                             "Transfer-Encoding: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::UPGRADE ("Ugrade", "Ugrade: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::USERAGENT ("User-Agent", "User-Agent: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::VARY ("Vary", "Vary: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::VIA ("Via", "Via: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::WARNING ("Warning", "Warning: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::WWWAUTHENTICATE ("WWW-Authenticate",
-                                            "WWW-Authenticate: %s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::GET ("GET", "GET %s HTTP/%s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::HEAD ("HEAD", "HEAD %s HTTP/%s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::POST ("POST", "POST %s HTTP/%s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::PUT ("PUT", "PUT %s HTTP/%s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::QUIT ("QUIT", "QUIT %s HTTP/%s\r\n");
-HTTP_Hdr_Node HTTP_HCodes::DUNNO ("", "");
-HTTP_Hdr_Node HTTP_HCodes::META ("<META", "<META %s>");
-HTTP_Hdr_Node HTTP_HCodes::A ("<A", "<A %s>");
-HTTP_Hdr_Node HTTP_HCodes::SCRIPT ("<SCRIPT", "<SCRIPT %s>");
-HTTP_Hdr_Node HTTP_HCodes::APPLET ("<APPLET", "<APPLET %s>");
+HTTP_Hdr_Node
+
+  HTTP_HCodes::HTTP ("HTTP", "HTTP%s %s"),
+  HTTP_HCodes::ACCEPT ("Accept", "Accept: %s\r\n"),
+  HTTP_HCodes::ACCEPTCHARSET ("Accept-Charset", "Accept-Charset: %s\r\n"),
+  HTTP_HCodes::ACCEPTENCODING ("Accept-Encoding", "Accept-Encoding: %s\r\n"),
+  HTTP_HCodes::ACCEPTLANGUAGE ("Accept-Language", "Accept-Language: %s\r\n"),
+  HTTP_HCodes::ACCEPTRANGES ("Accept-Ranges", "Accept-Ranges: %s\r\n"),
+  HTTP_HCodes::AGE ("Age", "Age: %s\r\n"),
+  HTTP_HCodes::ALLOW ("Allow", "Allow: %s\r\n"),
+  HTTP_HCodes::AUTHORIZATION ("Authorization", "Authorization: %s\r\n"),
+  HTTP_HCodes::CACHECONTROL ("Cache-Control", "Cache-Control: %s\r\n"),
+  HTTP_HCodes::CONNECTION ("Connection", "Connection: %s\r\n"),
+  HTTP_HCodes::CONTENTENCODING ("Content-Encoding",
+                                "Content-Encoding: %d\r\n"),
+  HTTP_HCodes::CONTENTLENGTH ("Content-Length", "Content-Length: %d\r\n"),
+  HTTP_HCodes::CONTENTLOCATION ("Content-Location", "Content-Location: %s\r\n"),
+  HTTP_HCodes::CONTENTMD5 ("Content-MD5", "Content-MD5: %s\r\n"),
+  HTTP_HCodes::CONTENTRANGE ("Content-Range", "Content-Range: %s\r\n"),
+  HTTP_HCodes::CONTENTTYPE ("Content-Type", "Content-Type: %s\r\n"),
+  HTTP_HCodes::DATE ("Date", "Date: %s\r\n"),
+  HTTP_HCodes::ETAG ("ETag", "ETag: %s\r\n"),
+  HTTP_HCodes::EXPECT ("Expect", "Expect: %s\r\n"),
+  HTTP_HCodes::EXPIRES ("Expires", "Expires: %s\r\n"),
+  HTTP_HCodes::FROM ("From", "From: %s\r\n"),
+  HTTP_HCodes::HOST ("Host", "Host: %s\r\n"),
+  HTTP_HCodes::IFMATCH ("If-Match", "If-Match: %s\r\n"),
+  HTTP_HCodes::IFMODIFIEDSINCE ("If-Modified-Since",
+                                "If-Modified-Since: %s\r\n"),
+  HTTP_HCodes::IFNONEMATCH ("If-None-Match", "If-None-Match: %s\r\n"),
+  HTTP_HCodes::IFRANGE ("If-Range", "If-Range: %s\r\n"),
+  HTTP_HCodes::IFUNMODIFIEDSINCE ("If-Unmodified-Since",
+                                  "If-Unmodified-Since: %s\r\n"),
+  HTTP_HCodes::LASTMODIFIED ("Last-Modified", "Last-Modified: %s\r\n"),
+  HTTP_HCodes::LOCATION ("Location", "Location: %s\r\n"),
+  HTTP_HCodes::MAXFORWARDS ("Max-Forwards", "Max-Forwards: %s\r\n"),
+  HTTP_HCodes::PRAGMA ("Pragma", "Pragma: %s\r\n"),
+  HTTP_HCodes::PROXYAUTHENTICATE ("Proxy-Authenticate",
+                                  "Proxy-Authenticate: %s\r\n"),
+  HTTP_HCodes::PROXYAUTHORIZATION ("Proxy-Authorization",
+                                   "Proxy-Authorization: %s\r\n"),
+  HTTP_HCodes::RANGE ("Range", "Range: %s\r\n"),
+  HTTP_HCodes::REFERER ("Referer", "Referer: %s\r\n"),
+  HTTP_HCodes::SERVER ("Server", "Server: %s\r\n"),
+  HTTP_HCodes::TE ("TE", "TE: %s\r\n"),
+  HTTP_HCodes::TRAILER ("Trailer", "Trailer: %s\r\n"),
+  HTTP_HCodes::TRANSFERENCODING ("Transfer-Encoding",
+                                 "Transfer-Encoding: %s\r\n"),
+  HTTP_HCodes::UPGRADE ("Ugrade", "Ugrade: %s\r\n"),
+  HTTP_HCodes::USERAGENT ("User-Agent", "User-Agent: %s\r\n"),
+  HTTP_HCodes::VARY ("Vary", "Vary: %s\r\n"),
+  HTTP_HCodes::VIA ("Via", "Via: %s\r\n"),
+  HTTP_HCodes::WARNING ("Warning", "Warning: %s\r\n"),
+  HTTP_HCodes::WWWAUTHENTICATE ("WWW-Authenticate",
+                                "WWW-Authenticate: %s\r\n"),
+  HTTP_HCodes::GET ("GET", "GET %s HTTP/%s\r\n"),
+  HTTP_HCodes::HEAD ("HEAD", "HEAD %s HTTP/%s\r\n"),
+  HTTP_HCodes::POST ("POST", "POST %s HTTP/%s\r\n"),
+  HTTP_HCodes::PUT ("PUT", "PUT %s HTTP/%s\r\n"),
+  HTTP_HCodes::QUIT ("QUIT", "QUIT %s HTTP/%s\r\n"),
+  HTTP_HCodes::DUNNO ("", ""),
+  HTTP_HCodes::META ("<META", "<META %s>"),
+  HTTP_HCodes::A ("<A", "<A %s>"),
+  HTTP_HCodes::SCRIPT ("<SCRIPT", "<SCRIPT %s>"),
+  HTTP_HCodes::APPLET ("<APPLET", "<APPLET %s>")
+
+  //////////////
+  ;
 
 
 const int &HTTP_HCodes::NUM_HEADER_STRINGS
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h
index 67e423bad83..0e23b23abf4 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.h
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.h
@@ -18,11 +18,6 @@
 #include "JAWS/Parse_Headers.h"
 #include "HTTPU/http_export.h"
 
-// A header file on HP-UX defines SERVER
-#if defined (SERVER)
-#undef SERVER
-#endif /* SERVER */
-
 class HTTP_Headers;
 
 class HTTPU_Export HTTP_Hdr_Node
@@ -31,7 +26,7 @@ class HTTPU_Export HTTP_Hdr_Node
   friend class HTTP_HCodes;
 
 public:
-  operator int (void) const;
+  operator const int (void) const;
   operator const char * (void) const;
   const char * format (void) const;
 
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.inl b/ACE/apps/JAWS2/HTTPU/http_headers.inl
index 3cfbaddae1b..73ea46e57b6 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.inl
@@ -7,7 +7,7 @@
 #endif /* ACE_HAS_INLINED_OSCALLS */
 
 ACE_INLINE
-HTTP_Hdr_Node::operator int (void) const
+HTTP_Hdr_Node::operator const int (void) const
 {
   return this->index_;
 }
diff --git a/ACE/apps/JAWS2/HTTPU/http_status.cpp b/ACE/apps/JAWS2/HTTPU/http_status.cpp
index 99ce69f1f58..4bf70926a97 100644
--- a/ACE/apps/JAWS2/HTTPU/http_status.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_status.cpp
@@ -5,33 +5,28 @@
 const char *
 HTTP_SCode::table_ [HTTP_SCode::SC_TABLE_SIZE];
 
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_OK (200, "OK");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_CREATED (201, "Created");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_ACCEPTED (202, "Accepted");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_NO_CONTENT (204, "No Content");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_MULTIPLE_CHOICES (300,
-                                                          "Multiple Choices");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_MOVED_PERMANENTLY (301,
-                                                           "Moved Permanently");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_MOVED_TEMPORARILY (302,
-                                                           "Moved Temporarily");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_NOT_MODIFIED (304, "Not Modified");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_INSUFFICIENT_DATA (399,
-                                                           "Insufficient Data");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_BAD_REQUEST (400, "Bad Request");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_UNAUTHORIZED (401, "Unauthorized");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_FORBIDDEN (403, "Forbidden");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_NOT_FOUND (404, "Not Found");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_INTERNAL_SERVER_ERROR (500,
-                                                               "Internal Server Error");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_NOT_IMPLEMENTED (501,
-                                                         "Not Implemented");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_BAD_GATEWAY (502, "Bad Gateway");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_SERVICE_UNAVAILABLE (503,
-                                                             "Service Unavailable");
-HTTP_SCode_Node HTTP_SCode_Base::STATUS_QUIT (599, "Quit");
+HTTP_SCode_Node
 
-HTTP_SCode_Node HTTP_SCode_Base::DUMMY (0, 0);
+  HTTP_SCode_Base::STATUS_OK (200, "OK"),
+  HTTP_SCode_Base::STATUS_CREATED (201, "Created"),
+  HTTP_SCode_Base::STATUS_ACCEPTED (202, "Accepted"),
+  HTTP_SCode_Base::STATUS_NO_CONTENT (204, "No Content"),
+  HTTP_SCode_Base::STATUS_MULTIPLE_CHOICES (300, "Multiple Choices"),
+  HTTP_SCode_Base::STATUS_MOVED_PERMANENTLY (301, "Moved Permanently"),
+  HTTP_SCode_Base::STATUS_MOVED_TEMPORARILY (302, "Moved Temporarily"),
+  HTTP_SCode_Base::STATUS_NOT_MODIFIED (304, "Not Modified"),
+  HTTP_SCode_Base::STATUS_INSUFFICIENT_DATA (399, "Insufficient Data"),
+  HTTP_SCode_Base::STATUS_BAD_REQUEST (400, "Bad Request"),
+  HTTP_SCode_Base::STATUS_UNAUTHORIZED (401, "Unauthorized"),
+  HTTP_SCode_Base::STATUS_FORBIDDEN (403, "Forbidden"),
+  HTTP_SCode_Base::STATUS_NOT_FOUND (404, "Not Found"),
+  HTTP_SCode_Base::STATUS_INTERNAL_SERVER_ERROR (500, "Internal Server Error"),
+  HTTP_SCode_Base::STATUS_NOT_IMPLEMENTED (501, "Not Implemented"),
+  HTTP_SCode_Base::STATUS_BAD_GATEWAY (502, "Bad Gateway"),
+  HTTP_SCode_Base::STATUS_SERVICE_UNAVAILABLE (503, "Service Unavailable"),
+  HTTP_SCode_Base::STATUS_QUIT (599, "Quit"),
+
+  HTTP_SCode_Base::DUMMY (0, 0);
 
 HTTP_SCode_Node::HTTP_SCode_Node (int code, const char *code_str)
   : code_ (code),
diff --git a/ACE/apps/JAWS2/HTTPU/httpu.mpc b/ACE/apps/JAWS2/HTTPU/httpu.mpc
deleted file mode 100644
index 8f7aa2ecf5e..00000000000
--- a/ACE/apps/JAWS2/HTTPU/httpu.mpc
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(HTTPU) : acelib {
-    sharedname = HTTPU
-    dynamicflags += HTTPU_BUILD_DLL
-    avoids += uses_wchar ace_for_tao
-    after += JAWS2
-    libs += JAWS2
-
-    specific (automake) {
-      includes += $(srcdir)/..
-    } else {
-      includes += ..
-    }
-
-    Source_Files {
-        *.cpp
-    }
-
-    Template_Files{
-    }
-
-    Header_Files{
-        *.h
-    }
-
-    Inline_Files{
-    }
-}
diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.cpp b/ACE/apps/JAWS2/HTTPU/parse_url.cpp
index 9519ced6897..c1c753d0784 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_url.cpp
+++ b/ACE/apps/JAWS2/HTTPU/parse_url.cpp
@@ -13,7 +13,7 @@ HTTP_Parse_URL::HTTP_Parse_URL (const char *url)
     host_ (0),
     port_ (-1),
     url_path_ (0),
-    error_ (URL_ERROR_NONE),
+    error_ (NONE),
     is_cgi_ (0)
 {
   this->init (url);
@@ -47,7 +47,7 @@ HTTP_Parse_URL::init( const char *url )
    url_ = ACE_OS::strdup( url );
    if ( url_ == 0 )
    {
-      error_ = URL_ERROR_STRDUP;
+      error_ = STRDUP;
       return;
    }
 
@@ -77,14 +77,14 @@ HTTP_Parse_URL::parse_url (void)
   this->parse_scheme (p);
   if (*p == '\0')
     {
-      this->error_ = URL_ERROR_SCHEME;
+      this->error_ = SCHEME;
       return;
     }
 
   // Parse past "//"
   if (*p != '/' || *(p+1) != '/')
     {
-      this->error_ = URL_ERROR_SLASHSLASH;
+      this->error_ = SLASHSLASH;
       return;
     }
   p += 2;
diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.h b/ACE/apps/JAWS2/HTTPU/parse_url.h
index fa05b72ceb3..64260edd2a8 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_url.h
+++ b/ACE/apps/JAWS2/HTTPU/parse_url.h
@@ -31,7 +31,7 @@ public:
   int port (void) const;
   const char *url_path (void) const;
 
-  enum URL_ERROR { URL_ERROR_NONE, URL_ERROR_STRDUP, URL_ERROR_SCHEME, URL_ERROR_SLASHSLASH };
+  enum URL_ERROR { NONE, STRDUP, SCHEME, SLASHSLASH };
 
   int error (void) const { return( error_ ); }
 
@@ -49,12 +49,12 @@ private:
 private:
   char *url_;
 
-  const char *scheme_;
-  const char *user_;
-  const char *passwd_;
-  const char *host_;
+  char *scheme_;
+  char *user_;
+  char *passwd_;
+  char *host_;
   int port_;
-  const char *url_path_;
+  char *url_path_;
 
   int error_;
   int is_cgi_;
diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.cpp b/ACE/apps/JAWS2/JAWS/Concurrency.cpp
index bc557137ac7..955fc4e244a 100644
--- a/ACE/apps/JAWS2/JAWS/Concurrency.cpp
+++ b/ACE/apps/JAWS2/JAWS/Concurrency.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "JAWS/JAWS.h"
 #include "JAWS/Concurrency.h"
 #include "JAWS/IO_Handler.h"
 #include "JAWS/Pipeline.h"
diff --git a/ACE/apps/JAWS2/JAWS/Export.h b/ACE/apps/JAWS2/JAWS/Export.h
index 68f8d135ddf..432b23f6984 100644
--- a/ACE/apps/JAWS2/JAWS/Export.h
+++ b/ACE/apps/JAWS2/JAWS/Export.h
@@ -1,57 +1,38 @@
-// -*- C++ -*-
 // $Id$
+
 // Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s JAWS
+// This file is generated automatically by
+// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
 // ------------------------------
 #ifndef JAWS_EXPORT_H
 #define JAWS_EXPORT_H
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (JAWS_HAS_DLL)
-#  define JAWS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && JAWS_HAS_DLL */
-
-#if !defined (JAWS_HAS_DLL)
-#  define JAWS_HAS_DLL 1
-#endif /* ! JAWS_HAS_DLL */
-
-#if defined (JAWS_HAS_DLL) && (JAWS_HAS_DLL == 1)
-#  if defined (JAWS_BUILD_DLL)
-#    define JAWS_Export ACE_Proper_Export_Flag
-#    define JAWS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define JAWS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* JAWS_BUILD_DLL */
-#    define JAWS_Export ACE_Proper_Import_Flag
-#    define JAWS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define JAWS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* JAWS_BUILD_DLL */
-#else /* JAWS_HAS_DLL == 1 */
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (JAWS_HAS_DLL)
+#  if (JAWS_HAS_DLL == 1)
+#    if defined (JAWS_BUILD_DLL)
+#      define JAWS_Export ACE_Proper_Export_Flag
+#      define JAWS_SINGLETON_DECLARATION(T) \
+              ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    else
+#      define JAWS_Export ACE_Proper_Import_Flag
+#      define JAWS_SINGLETON_DECLARATION(T) \
+              ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    endif /* JAWS_BUILD_DLL */
+#  else
+#    define JAWS_Export
+#    define JAWS_SINGLETON_DECLARATION(T)
+#  endif   /* ! JAWS_HAS_DLL == 1 */
+#else
 #  define JAWS_Export
 #  define JAWS_SINGLETON_DECLARATION(T)
-#  define JAWS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* JAWS_HAS_DLL == 1 */
-
-// Set JAWS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (JAWS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define JAWS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define JAWS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !JAWS_NTRACE */
-
-#if (JAWS_NTRACE == 1)
-#  define JAWS_TRACE(X)
-#else /* (JAWS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define JAWS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (JAWS_NTRACE == 1) */
+#endif     /* JAWS_HAS_DLL */
 
-#endif /* JAWS_EXPORT_H */
+#endif     /* JAWS_EXPORT_H */
+           // End of auto generated file.
 
-// End of auto generated file.
diff --git a/ACE/apps/JAWS2/JAWS/IO.cpp b/ACE/apps/JAWS2/JAWS/IO.cpp
index 210502b391d..3e1873bc0f9 100644
--- a/ACE/apps/JAWS2/JAWS/IO.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO.cpp
@@ -9,6 +9,7 @@
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/Min_Max.h"
 
+#include "JAWS/JAWS.h"
 #include "JAWS/Data_Block.h"
 #include "JAWS/Policy.h"
 #include "JAWS/IO.h"
diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
index 0a96db64f5d..fe957a82103 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
@@ -4,6 +4,7 @@
 #include "ace/Filecache.h"
 #include "ace/OS_NS_unistd.h"
 
+#include "JAWS/JAWS.h"
 #include "JAWS/IO.h"
 #include "JAWS/IO_Handler.h"
 #include "JAWS/IO_Acceptor.h"
diff --git a/ACE/apps/JAWS2/JAWS/JAWS.h b/ACE/apps/JAWS2/JAWS/JAWS.h
new file mode 100644
index 00000000000..3078ea3a8af
--- /dev/null
+++ b/ACE/apps/JAWS2/JAWS/JAWS.h
@@ -0,0 +1,15 @@
+// $Id$
+
+#if defined (JAWS_NTRACE) && (JAWS_NTRACE == 1)
+# define JAWS_TRACE(X)
+#else
+# define JAWS_TRACE(X) ACE_Trace ____ (ACE_TEXT (X), \
+                                       __LINE__, \
+                                       ACE_TEXT (__FILE__))
+#include "ace/Trace.h"
+#endif /* JAWS_NTRACE */
+
+#ifndef JAWS_JAWS_H
+#define JAWS_JAWS_H
+
+#endif /* JAWS_JAWS_H */
diff --git a/ACE/apps/JAWS2/JAWS/Makefile.am b/ACE/apps/JAWS2/JAWS/Makefile.am
index dd00e5870ea..b201afa54bd 100644
--- a/ACE/apps/JAWS2/JAWS/Makefile.am
+++ b/ACE/apps/JAWS2/JAWS/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -68,6 +68,7 @@ noinst_HEADERS = \
   IO.h \
   IO_Acceptor.h \
   IO_Handler.h \
+  JAWS.h \
   Parse_Headers.h \
   Pipeline.h \
   Pipeline_Handler_T.cpp \
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
index 0368acfc6c4..e40809887c5 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
+++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "JAWS/JAWS.h"
+
 #include "JAWS/IO.h"
 #include "JAWS/Pipeline_Tasks.h"
 #include "JAWS/Pipeline_Handler_T.h"
diff --git a/ACE/apps/JAWS2/JAWS/jaws2.mpc b/ACE/apps/JAWS2/JAWS/jaws2.mpc
index 9326bc5bdc3..a7d5754b11a 100644
--- a/ACE/apps/JAWS2/JAWS/jaws2.mpc
+++ b/ACE/apps/JAWS2/JAWS/jaws2.mpc
@@ -3,15 +3,9 @@
 
 project(JAWS2) : acelib {
     sharedname = JAWS2
-    dynamicflags += JAWS_BUILD_DLL
+    dynamicflags = JAWS_BUILD_DLL
     avoids += uses_wchar ace_for_tao
-
-    specific (automake) {
-      includes += $(srcdir)/..
-    } else {
-      includes += ..
-    }
-
+    includes += ..
     Source_Files {
         Assoc_Array.cpp
         Cache_Manager.cpp
diff --git a/ACE/apps/JAWS2/Makefile.am b/ACE/apps/JAWS2/Makefile.am
index d3e0377d4f4..5bc7afdf9fd 100644
--- a/ACE/apps/JAWS2/Makefile.am
+++ b/ACE/apps/JAWS2/Makefile.am
@@ -6,9 +6,8 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
-        JAWS \
-        HTTPU
+        JAWS
 
diff --git a/ACE/apps/JAWS3/Makefile.am b/ACE/apps/JAWS3/Makefile.am
index 84294e864f3..647eab9416b 100644
--- a/ACE/apps/JAWS3/Makefile.am
+++ b/ACE/apps/JAWS3/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         jaws3
diff --git a/ACE/apps/JAWS3/jaws3/Makefile.am b/ACE/apps/JAWS3/jaws3/Makefile.am
index d140de85b12..549790b885c 100644
--- a/ACE/apps/JAWS3/jaws3/Makefile.am
+++ b/ACE/apps/JAWS3/jaws3/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -85,7 +85,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
diff --git a/ACE/apps/JAWS3/jaws3/jaws3.mpc b/ACE/apps/JAWS3/jaws3/jaws3.mpc
index 061c1952cd4..eaa9ecd0196 100644
--- a/ACE/apps/JAWS3/jaws3/jaws3.mpc
+++ b/ACE/apps/JAWS3/jaws3/jaws3.mpc
@@ -6,13 +6,7 @@ project(JAWS3) : acelib {
     dynamicflags = JAWS_BUILD_DLL
     avoids += uses_wchar
     avoids += ace_for_tao
-    
-    specific(automake) {
-      includes += $(srcdir)/..
-    } else {
-      includes += ..
-    }
-
+    includes += ..
     Source_Files {
         Asynch_IO.cpp
         Concurrency.cpp
@@ -78,13 +72,7 @@ project(JAWS3) : acelib {
 project(JAWS3_server) : aceexe {
     avoids += uses_wchar
     avoids += ace_for_tao
-
-    specific(automake) {
-      includes += $(srcdir)/..
-    } else {
-      includes += ..
-    }
-
+    includes += ..
     exename = main
     after += JAWS3
     libs  += JAWS3
diff --git a/ACE/apps/drwho/Makefile.am b/ACE/apps/drwho/Makefile.am
index 286cd94c343..8a6e815e167 100644
--- a/ACE/apps/drwho/Makefile.am
+++ b/ACE/apps/drwho/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 if BUILD_RWHO
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -114,7 +113,6 @@ endif BUILD_RWHO
 if BUILD_RWHO
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
diff --git a/ACE/apps/gperf/Makefile.am b/ACE/apps/gperf/Makefile.am
index 6e296291251..a6030210b21 100644
--- a/ACE/apps/gperf/Makefile.am
+++ b/ACE/apps/gperf/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 
 SUBDIRS = \
@@ -18,6 +18,7 @@ SUBDIRS = \
 
 man_MANS = gperf.1
 
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/ACE/apps/gperf/src/.cvsignore b/ACE/apps/gperf/src/.cvsignore
new file mode 100644
index 00000000000..977dce99c7d
--- /dev/null
+++ b/ACE/apps/gperf/src/.cvsignore
@@ -0,0 +1,2 @@
+gperf
+gperf
diff --git a/ACE/apps/gperf/src/Makefile.am b/ACE/apps/gperf/src/Makefile.am
index fedfd8649ac..623c9054179 100644
--- a/ACE/apps/gperf/src/Makefile.am
+++ b/ACE/apps/gperf/src/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.gperf.am
 
 if !BUILD_USES_WCHAR
-
 bin_PROGRAMS = gperf
 
 gperf_CPPFLAGS = \
diff --git a/ACE/apps/gperf/src/gperf.mpc b/ACE/apps/gperf/src/gperf.mpc
index 81976d37aba..b8dc0ad1d74 100644
--- a/ACE/apps/gperf/src/gperf.mpc
+++ b/ACE/apps/gperf/src/gperf.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(gperf) : aceexe, install, crosscompile {
+project(gperf) : aceexe, core, crosscompile {
   install = $(ACE_ROOT)/bin
   avoids += uses_wchar
   exename = gperf
diff --git a/ACE/apps/gperf/tests/.cvsignore b/ACE/apps/gperf/tests/.cvsignore
new file mode 100644
index 00000000000..d805133eaae
--- /dev/null
+++ b/ACE/apps/gperf/tests/.cvsignore
@@ -0,0 +1,58 @@
+ada.cpp
+ada.cpp
+adadefs.cpp
+adadefs.cpp
+aout
+aout
+aout.out
+aout.out
+c.cpp
+c.cpp
+corba.cpp
+corba.cpp
+cout
+cout
+cout.out
+cout.out
+cpp.cpp
+cpp.cpp
+cppout
+cppout
+cppout.out
+cppout.out
+idl.cpp
+idl.cpp
+iout
+iout
+iout.out
+iout.out
+iout2
+iout2
+iout2.out
+iout2.out
+m3out
+m3out
+m3out.out
+m3out.out
+modula3.cpp
+modula3.cpp
+pascal.cpp
+pascal.cpp
+pout
+pout
+pout.out
+pout.out
+preout
+preout
+preout.out
+preout.out
+tao.cpp
+tao.cpp
+taoout
+taoout
+taoout.out
+taoout.out
+tout
+tout
+tout.out
+tout.out
diff --git a/ACE/apps/gperf/tests/Makefile.am b/ACE/apps/gperf/tests/Makefile.am
index 027d848b869..2a5fb70ce2f 100644
--- a/ACE/apps/gperf/tests/Makefile.am
+++ b/ACE/apps/gperf/tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,7 @@ CLEANFILES =
 BUILT_SOURCES =
 noinst_PROGRAMS =
 
-## Makefile.adainset.am
+## Makefile.adainset.am 
 
 if !BUILD_USES_WCHAR
 
@@ -23,10 +23,14 @@ BUILT_SOURCES += \
   ada.cpp
 
 CLEANFILES += \
-  ada.cpp
+  ada.cpp \
+  ada-stamp
 
-ada.cpp: $(srcdir)/ada.gperf
+ada.cpp: ada-stamp
+
+ada-stamp: $(srcdir)/ada.gperf
 	../src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf > ada.cpp
+	@touch $@
 
 noinst_PROGRAMS += aout
 
@@ -43,7 +47,7 @@ aout_LDADD = \
 
 endif !BUILD_USES_WCHAR
 
-## Makefile.cinset.am
+## Makefile.cinset.am 
 
 if !BUILD_USES_WCHAR
 
@@ -51,10 +55,14 @@ BUILT_SOURCES += \
   c.cpp
 
 CLEANFILES += \
-  c.cpp
+  c.cpp \
+  c-stamp
+
+c.cpp: c-stamp
 
-c.cpp: $(srcdir)/c.gperf
+c-stamp: $(srcdir)/c.gperf
 	../src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf > c.cpp
+	@touch $@
 
 noinst_PROGRAMS += cout
 
@@ -71,7 +79,7 @@ cout_LDADD = \
 
 endif !BUILD_USES_WCHAR
 
-## Makefile.cppinset.am
+## Makefile.cppinset.am 
 
 if !BUILD_USES_WCHAR
 
@@ -79,10 +87,14 @@ BUILT_SOURCES += \
   cpp.cpp
 
 CLEANFILES += \
-  cpp.cpp
+  cpp.cpp \
+  cpp-stamp
 
-cpp.cpp: $(srcdir)/cpp.gperf
+cpp.cpp: cpp-stamp
+
+cpp-stamp: $(srcdir)/cpp.gperf
 	../src/gperf -a -D $(srcdir)/cpp.gperf > cpp.cpp
+	@touch $@
 
 noinst_PROGRAMS += cppout
 
@@ -99,7 +111,7 @@ cppout_LDADD = \
 
 endif !BUILD_USES_WCHAR
 
-## Makefile.iinset.am
+## Makefile.iinset.am 
 
 if !BUILD_USES_WCHAR
 
@@ -107,10 +119,14 @@ BUILT_SOURCES += \
   idl.cpp
 
 CLEANFILES += \
-  idl.cpp
+  idl.cpp \
+  idl-stamp
+
+idl.cpp: idl-stamp
 
-idl.cpp: $(srcdir)/idl.gperf
+idl-stamp: $(srcdir)/idl.gperf
 	../src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf > idl.cpp
+	@touch $@
 
 noinst_PROGRAMS += iout
 
@@ -127,7 +143,7 @@ iout_LDADD = \
 
 endif !BUILD_USES_WCHAR
 
-## Makefile.iinset2.am
+## Makefile.iinset2.am 
 
 if !BUILD_USES_WCHAR
 
@@ -135,11 +151,15 @@ BUILT_SOURCES += \
   iout2_gen/idl.cpp
 
 CLEANFILES += \
-  iout2_gen/idl.cpp
+  iout2_gen/idl.cpp \
+  iout2_gen/idl-stamp
+
+iout2_gen/idl.cpp: iout2_gen/idl-stamp
 
-iout2_gen/idl.cpp: $(srcdir)/idl.gperf
+iout2_gen/idl-stamp: $(srcdir)/idl.gperf
 	mkdir -p iout2_gen
 	../src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp
+	@touch $@
 
 noinst_PROGRAMS += iout2
 
@@ -156,7 +176,7 @@ iout2_LDADD = \
 
 endif !BUILD_USES_WCHAR
 
-## Makefile.m3inset.am
+## Makefile.m3inset.am 
 
 if !BUILD_USES_WCHAR
 
@@ -164,10 +184,14 @@ BUILT_SOURCES += \
   modula3.cpp
 
 CLEANFILES += \
-  modula3.cpp
+  modula3.cpp \
+  modula3-stamp
 
-modula3.cpp: $(srcdir)/modula3.gperf
+modula3.cpp: modula3-stamp
+
+modula3-stamp: $(srcdir)/modula3.gperf
 	../src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf > modula3.cpp
+	@touch $@
 
 noinst_PROGRAMS += m3out
 
@@ -184,7 +208,7 @@ m3out_LDADD = \
 
 endif !BUILD_USES_WCHAR
 
-## Makefile.pinset.am
+## Makefile.pinset.am 
 
 if !BUILD_USES_WCHAR
 
@@ -192,10 +216,14 @@ BUILT_SOURCES += \
   pascal.cpp
 
 CLEANFILES += \
-  pascal.cpp
+  pascal.cpp \
+  pascal-stamp
+
+pascal.cpp: pascal-stamp
 
-pascal.cpp: $(srcdir)/pascal.gperf
+pascal-stamp: $(srcdir)/pascal.gperf
 	../src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf > pascal.cpp
+	@touch $@
 
 noinst_PROGRAMS += pout
 
@@ -212,7 +240,7 @@ pout_LDADD = \
 
 endif !BUILD_USES_WCHAR
 
-## Makefile.preinset.am
+## Makefile.preinset.am 
 
 if !BUILD_USES_WCHAR
 
@@ -220,10 +248,14 @@ BUILT_SOURCES += \
   adadefs.cpp
 
 CLEANFILES += \
-  adadefs.cpp
+  adadefs.cpp \
+  adadefs-stamp
 
-adadefs.cpp: $(srcdir)/adadefs.gperf
+adadefs.cpp: adadefs-stamp
+
+adadefs-stamp: $(srcdir)/adadefs.gperf
 	../src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf > adadefs.cpp
+	@touch $@
 
 noinst_PROGRAMS += preout
 
@@ -240,7 +272,7 @@ preout_LDADD = \
 
 endif !BUILD_USES_WCHAR
 
-## Makefile.taoinset.am
+## Makefile.taoinset.am 
 
 if !BUILD_USES_WCHAR
 
@@ -248,10 +280,14 @@ BUILT_SOURCES += \
   tao.cpp
 
 CLEANFILES += \
-  tao.cpp
+  tao.cpp \
+  tao-stamp
+
+tao.cpp: tao-stamp
 
-tao.cpp: $(srcdir)/tao.gperf
+tao-stamp: $(srcdir)/tao.gperf
 	../src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf > tao.cpp
+	@touch $@
 
 noinst_PROGRAMS += taoout
 
@@ -268,7 +304,7 @@ taoout_LDADD = \
 
 endif !BUILD_USES_WCHAR
 
-## Makefile.tinset.am
+## Makefile.tinset.am 
 
 if !BUILD_USES_WCHAR
 
@@ -276,10 +312,14 @@ BUILT_SOURCES += \
   corba.cpp
 
 CLEANFILES += \
-  corba.cpp
+  corba.cpp \
+  corba-stamp
+
+corba.cpp: corba-stamp
 
-corba.cpp: $(srcdir)/corba.gperf
+corba-stamp: $(srcdir)/corba.gperf
 	../src/gperf -a -o $(srcdir)/corba.gperf > corba.cpp
+	@touch $@
 
 noinst_PROGRAMS += tout
 
diff --git a/ACE/apps/mkcsregdb/Makefile.am b/ACE/apps/mkcsregdb/Makefile.am
index 8c78d17d238..a08f795e30a 100644
--- a/ACE/apps/mkcsregdb/Makefile.am
+++ b/ACE/apps/mkcsregdb/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.mkcsregdb.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS = mkcsregdb
 
 mkcsregdb_CPPFLAGS = \
diff --git a/ACE/apps/soreduce/Makefile.am b/ACE/apps/soreduce/Makefile.am
index 6b0efcb4b99..4f50d294e0d 100644
--- a/ACE/apps/soreduce/Makefile.am
+++ b/ACE/apps/soreduce/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ ACE_ROOT = $(top_srcdir)
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS = soreduce
 
 soreduce_CPPFLAGS = \
diff --git a/ACE/bin/FOCUS/ChangeLog b/ACE/bin/FOCUS/ChangeLog
index b1c66f1ad67..b5323e5e749 100644
--- a/ACE/bin/FOCUS/ChangeLog
+++ b/ACE/bin/FOCUS/ChangeLog
@@ -1,33 +1,3 @@
-Wed Dec 20 10:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * specializations/Reactor_Family/TP_Reactor.spl:
-          Removed specialization of Reactor.inl, the added include
-          is not necessary and causes a circular include problem
-
-Tue Nov 14 12:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * specializations/Wait_Strategy/Wait_On_Leader_Follower.spl:
-        * FOCUS.pl:
-          Added new lf specialization
-
-        * specializations/Wait_Strategy/Wait_On_Read.spl:
-          Updated to work with head
-
-Tue Nov 14 12:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * specializations/Messaging_Strategy/GIOP.spl:
-          Updated to work with current svn head
-
-Tue Nov 14 11:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * specializations/Reactor_Family/TP_Reactor.spl:
-          Updated to work with current svn head
-
-Fri Nov 10 09:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/FOCUS.html:
-          Added tp-reactor reference
-
 Fri Nov 18 17:05:49 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 
         * specializations/Reactor_Family/Select_Reactor_ST.spl:
diff --git a/ACE/bin/FOCUS/FOCUS.pl b/ACE/bin/FOCUS/FOCUS.pl
index d1d4e0e2cb6..e82acfe63cc 100755
--- a/ACE/bin/FOCUS/FOCUS.pl
+++ b/ACE/bin/FOCUS/FOCUS.pl
@@ -48,7 +48,7 @@ sub usage
               . " \n --prefix-path=<path to module root>"
               . " [\n --reactor-spl=<select-mt, select-st, tp-reactor>"
               . " \n --protocol-spl=<iiop>"
-              . " \n --wait-strategy-spl=<rw, lf>"
+              . " \n --wait-strategy-spl=<rw>"
               . " \n --output-prefix=<output path>"
               . " \n --messaging-spl=<giop>"
               . " \n --context-specific-optimizations=<dispatch>"
@@ -94,7 +94,6 @@ my %specialization_table  = (
  "giop", $spl_prefix_path . "specializations/Messaging_Strategy/GIOP.spl",
  "iiop", $spl_prefix_path . "specializations/Protocol_Family/IIOP/iiop.spl",
  "rw",   $spl_prefix_path . "specializations/Wait_Strategy/Wait_On_Read.spl",
- "lf",   $spl_prefix_path . "specializations/Wait_Strategy/Wait_On_Leader_Follower.spl",
  "dispatch", $spl_prefix_path . "specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl");
 
 # Get the command line options
diff --git a/ACE/bin/FOCUS/docs/FOCUS.html b/ACE/bin/FOCUS/docs/FOCUS.html
index ca0c85a0a28..6b00dfb020d 100644
--- a/ACE/bin/FOCUS/docs/FOCUS.html
+++ b/ACE/bin/FOCUS/docs/FOCUS.html
@@ -76,7 +76,7 @@ and specialization:
        </td>
     </tr>
     <tr>
-       <td>--reactor-spl <em>select-st</em>, <em>select-mt</em>, <em>tp-reactor</em></td>
+       <td>--reactor-spl <em>select-st</em>, <em>select-mt</em>, <em>tp</em></td>
        <td>Option to specialize the reactor framework with the
            concrete reactor type.
            <p>select-st: select reactor which no locking. Single threaded case.</p>
diff --git a/ACE/bin/FOCUS/specializations/Messaging_Strategy/GIOP.spl b/ACE/bin/FOCUS/specializations/Messaging_Strategy/GIOP.spl
index eeed13dba37..76e27509848 100644
--- a/ACE/bin/FOCUS/specializations/Messaging_Strategy/GIOP.spl
+++ b/ACE/bin/FOCUS/specializations/Messaging_Strategy/GIOP.spl
@@ -36,13 +36,6 @@
 
 </file>
 
-<file name="On_Demand_Fragmentation_Strategy.cpp">
-
-<!-- Remove Pluggable Messaging include directive -->
-<remove>#include "tao/Pluggable_Messaging.h"</remove>
-
-</file>
-
 <file name="GIOP_Message_Base.h">
 
 <!-- Remove Pluggable Messaging include directive -->
@@ -107,7 +100,7 @@ protected:
 <file name="TAO_Server_Request.cpp">
 
 <!-- Remove Pluggable messaging include altogether -->
-<remove>#include "tao/Pluggable_Messaging.h"</remove>
+<remove>#include "Pluggable_Messaging.h"</remove>
 
 </file>
 
@@ -120,7 +113,7 @@ protected:
 </file>
 
 <file name="Transport.cpp">
- <remove>#include "tao/Pluggable_Messaging.h"</remove>
+ <remove>#include "Pluggable_Messaging.h"</remove>
 </file>
 
 </module>
@@ -150,7 +143,6 @@ protected:
 
 <file name="Asynch_Invocation.cpp">
  <remove>#include "tao/Pluggable_Messaging.h"</remove>
- <replace>#include "tao/GIOP_Message_Base.h"</replace>
 </file>
 
 </module>
@@ -178,7 +170,6 @@ protected:
  <data>
     ACE_NEW (this->messaging_object_,
                TAO_GIOP_Message_Base (orb_core,
-                                      this,
                                       ACE_MAX_DGRAM_SIZE));
  </data>
 </add>
@@ -205,7 +196,7 @@ protected:
  <data>
     ACE_NEW (this->messaging_object_,
                TAO_GIOP_Message_Base (orb_core,
-                                      this));
+                                      ACE_MAX_DGRAM_SIZE));
  </data>
 </add>
 
@@ -236,7 +227,7 @@ protected:
  <data>
     ACE_NEW (this->messaging_object_,
                TAO_GIOP_Message_Base (orb_core,
-                                      this));
+                                      ACE_MAX_DGRAM_SIZE));
  </data>
 </add>
  <remove>#include "tao/GIOP_Message_Lite.h"</remove>
diff --git a/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl b/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl
index 48b17f05e60..f25c5fe5416 100644
--- a/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl
+++ b/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl
@@ -196,10 +196,16 @@ virtual int register_handler (ACE_HANDLE handle,
 <!-- Remove the Reactor_Timer_Interface include -->
 <remove>#include "ace/Reactor_Timer_Interface.h"</remove>
 
+</file>
+
+<!-- Transformations to Reactor.inl -->
+<file name="Reactor.inl">
+
 <add>
  <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
  <data>
-#include "ace/Reactor.h"
+// Check if this is necessary
+#include "ace/Select_Reactor.h"
  </data>
 </add>
 
@@ -326,12 +332,14 @@ ACE_TP_Reactor::register_handler (int signum,
   <replace>// Dev_Poll_Reactor.cpp</replace>
 </substitute>
 
+
 <!-- Do not build the Msg_WFMO_Reactor -->
 <substitute>
   <search>Msg_WFMO_Reactor.cpp</search>
   <replace>// Msg_WFMO_Reactor.cpp</replace>
 </substitute>
 
+
 <!-- Do not build the priority Reactor -->
 <substitute>
   <search>Priority_Reactor.cpp</search>
@@ -374,24 +382,6 @@ ACE_TP_Reactor::register_handler (int signum,
 
 </file>
 
-<file name="GUIResource_Factory.cpp">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-</file>
-
-<file name="GUIResource_Factory.h">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-</file>
-
 </module>
 
 <module name="TAO/tao/Strategies">
diff --git a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl
deleted file mode 100644
index 004ba08fc2d..00000000000
--- a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Wait Strategy Specialization
- *   ===============================
- *   Details all the specialization transformations necessary
- *   to specialize the Wait_Strategy with the TAO_Wait_On_Leader_Follower strategy
- *
- *   @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- *   $Id$
--->
-
-<transform>
-
-<module name="TAO/tao">
-
-<file name="Wait_Strategy.cpp">
-
-<!-- Copy specialized code from the Wait_On_Leader_Follower strategy
-     to this file -->
-
-<copy-from-source>
-
- <!-- Name of the source file from which to copy. In this case, this is
-      the Wait_On_Read source file -->
- <source>Wait_On_Leader_Follower.cpp</source>
-
- <!-- Copy data between the following hooks defined in the aforementioned
-      file -->
- <copy-hook-start>WAIT_STRATEGY_SPL_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>WAIT_STRATEGY_SPL_COPY_HOOK_END</copy-hook-end>
-
- <!-- Destination hook in the Wait_Strategy.h file where the code
-      should be placed -->
- <dest-hook>TAO_WAIT_STRATEGY_SPL_ADD_HOOK</dest-hook>
-
-</copy-from-source>
-
-<!-- Copy include files to the hook to get the necessary include files -->
-<add>
- <hook>WAIT_STRATEGY_SPL_COPY_HOOK_START</hook>
- <data>
-#include "tao/Wait_On_Leader_Follower.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-#include "tao/Transport.h"
-#include "tao/Synch_Reply_Dispatcher.h"
-#include "tao/ORB_Core.h"
- </data>
-</add>
-
-<!-- Once this is done, replace all occurences of TAO_Wait_On_Leader_Follower with
-     TAO_Wait_Strategy -->
-<substitute>
- <search>TAO_Wait_On_Leader_Follower</search>
- <replace>TAO_Wait_Strategy</replace>
-</substitute>
-
-<comment>
- <start-hook>LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<add>
- <hook>LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK</hook>
- <data>
-    return 0;
- </data>
-</add>
-
-</file>
-
-<file name="Wait_Strategy.h">
-
-<!-- Remove all occurances of virtual -->
-<remove>virtual</remove>
-<remove>= 0</remove>
-
-</file>
-
-<file name="default_client.cpp">
-
-<comment>
- <start-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<add>
- <hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</hook>
- <data>
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_Strategy (transport),
-                    0);
- </data>
-</add>
-
-</file>
-
-<file name="tao.mpc">
-
-<!-- Do not build the other Wait strategy classes -->
-<substitute>
- <search>Wait_On_Read.h</search>
- <replace>// Wait_On_Read.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_Read.cpp</search>
- <replace>// Wait_On_Read.cpp</replace>
-</substitute>
-
-<substitute>
- <search>Wait_On_Reactor.h</search>
- <replace>// Wait_On_Reactor.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_Reactor.cpp</search>
- <replace>// Wait_On_Reactor.cpp</replace>
-</substitute>
-
-<substitute>
- <search>Wait_On_Leader_Follower.h</search>
- <replace>// Wait_On_Leader_Follower.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_Leader_Follower.cpp</search>
- <replace>// Wait_On_Leader_Follower.cpp</replace>
-</substitute>
-
-<substitute>
- <search>Wait_On_LF_No_Upcall.h</search>
- <replace>// Wait_On_LF_No_Upcall.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_LF_No_Upcall.cpp</search>
- <replace>// Wait_On_LF_No_Upcall.cpp</replace>
-</substitute>
-
-</file>
-
-</module>
-
-</transform>
diff --git a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl
index 65d6ff48fe7..ab76b9c8eef 100644
--- a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl
+++ b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl
@@ -39,12 +39,12 @@
 <add>
  <hook>WAIT_STRATEGY_SPL_COPY_HOOK_START</hook>
  <data>
-#include "tao/Wait_On_Read.h"
-#include "tao/Transport.h"
-#include "tao/Resume_Handle.h"
-#include "tao/Synch_Reply_Dispatcher.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/ORB_Core.h"
+#include "Wait_On_Read.h"
+#include "Transport.h"
+#include "Resume_Handle.h"
+#include "Synch_Reply_Dispatcher.h"
+#include "Client_Strategy_Factory.h"
+#include "ORB_Core.h"
 #include "ace/Reactor.h"
 #include "ace/Countdown_Time.h"
  </data>
@@ -59,32 +59,6 @@
 
 </file>
 
-<file name="Wait_Strategy.h">
-
-<!-- Remove all occurances of virtual -->
-<remove>virtual</remove>
-<remove>= 0</remove>
-
-</file>
-
-<file name="default_client.cpp">
-
-<comment>
- <start-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<add>
- <hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</hook>
- <data>
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_Strategy (transport),
-                    0);
- </data>
-</add>
-
-</file>
-
 <file name="tao.mpc">
 
 <!-- Do not build the other Wait strategy classes -->
diff --git a/ACE/bin/MakeProjectCreator/config/MPC.cfg b/ACE/bin/MakeProjectCreator/config/MPC.cfg
deleted file mode 100644
index f155b2b5ba5..00000000000
--- a/ACE/bin/MakeProjectCreator/config/MPC.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-includes = $TAO_ROOT/MPC/config, $CIAO_ROOT/MPC/config, $DDS_ROOT/MPC/config
-dynamic_types = $ACE_ROOT/bin/MakeProjectCreator
diff --git a/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb b/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb
index 36b8309f1fc..809140c3fae 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb
@@ -3,7 +3,7 @@
 // $Id$
 
 feature(ace_for_tao) {
-  macros   += ACE_LACKS_ACE_TOKEN ACE_LACKS_MSG_WFMO
+  macros   += ACE_LACKS_ACE_TOKEN
 
   after    += ACE_FOR_TAO
   libs     += ACE_FOR_TAO
diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
index 99cf8d75eec..57348fbca5b 100644
--- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: ipv6 {
+project: zlib, zzip, ipv6 {
   staticflags += ACE_AS_STATIC_LIBS
   includes    += $(ACE_ROOT)
   libpaths    += $(ACE_ROOT)/lib
diff --git a/ACE/bin/MakeProjectCreator/config/acexml.mpb b/ACE/bin/MakeProjectCreator/config/acexml.mpb
index 1ff98f3f917..7097de92b92 100644
--- a/ACE/bin/MakeProjectCreator/config/acexml.mpb
+++ b/ACE/bin/MakeProjectCreator/config/acexml.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: zzip, zlib {
+project {
   avoids   += ace_for_tao
   after    += ACEXML_Parser ACEXML
   libs     += ACEXML_Parser ACEXML
diff --git a/TAO/MPC/config/amh.mpb b/ACE/bin/MakeProjectCreator/config/amh.mpb
index 56648343ec1..56648343ec1 100644
--- a/TAO/MPC/config/amh.mpb
+++ b/ACE/bin/MakeProjectCreator/config/amh.mpb
diff --git a/TAO/MPC/config/ami.mpb b/ACE/bin/MakeProjectCreator/config/ami.mpb
index 9735a3b293d..9735a3b293d 100644
--- a/TAO/MPC/config/ami.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ami.mpb
diff --git a/TAO/MPC/config/anytypecode.mpb b/ACE/bin/MakeProjectCreator/config/anytypecode.mpb
index 4207be85db8..4207be85db8 100644
--- a/TAO/MPC/config/anytypecode.mpb
+++ b/ACE/bin/MakeProjectCreator/config/anytypecode.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/automake.features b/ACE/bin/MakeProjectCreator/config/automake.features
index 77109ba3a07..d78fdef842f 100644
--- a/ACE/bin/MakeProjectCreator/config/automake.features
+++ b/ACE/bin/MakeProjectCreator/config/automake.features
@@ -30,9 +30,3 @@ ace_xtreactor=1
 tao_xtresource=1
 
 wxWindows=1
-
-stl=1
-boost=1
-java=1
-zlib=1
-zzip=1
diff --git a/ACE/bin/MakeProjectCreator/config/avoids_ace_for_tao.mpb b/ACE/bin/MakeProjectCreator/config/avoids_ace_for_tao.mpb
deleted file mode 100644
index d9a8a0a7fd9..00000000000
--- a/ACE/bin/MakeProjectCreator/config/avoids_ace_for_tao.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(ace_for_tao) {
-  avoids += ace_for_tao
-}
diff --git a/ACE/bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb
new file mode 100644
index 00000000000..919f0c4c2c2
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+// $Id$
+
+feature(avoids_corba_e_compact) : taoidldefaults {
+  avoids += corba_e_compact
+}
diff --git a/ACE/bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb
new file mode 100644
index 00000000000..919f0c4c2c2
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+// $Id$
+
+feature(avoids_corba_e_compact) : taoidldefaults {
+  avoids += corba_e_compact
+}
diff --git a/TAO/MPC/config/avstreams.mpb b/ACE/bin/MakeProjectCreator/config/avstreams.mpb
index b48daeacc30..b48daeacc30 100644
--- a/TAO/MPC/config/avstreams.mpb
+++ b/ACE/bin/MakeProjectCreator/config/avstreams.mpb
diff --git a/TAO/MPC/config/avstreamsexe.mpb b/ACE/bin/MakeProjectCreator/config/avstreamsexe.mpb
index 80ab5507cbf..80ab5507cbf 100644
--- a/TAO/MPC/config/avstreamsexe.mpb
+++ b/ACE/bin/MakeProjectCreator/config/avstreamsexe.mpb
diff --git a/TAO/MPC/config/bidir_giop.mpb b/ACE/bin/MakeProjectCreator/config/bidir_giop.mpb
index 55b448e4f6a..55b448e4f6a 100644
--- a/TAO/MPC/config/bidir_giop.mpb
+++ b/ACE/bin/MakeProjectCreator/config/bidir_giop.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_client_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_client_dnc.mpb
new file mode 100644
index 00000000000..5824333c36c
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_client_dnc.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project : security, ifr_client, valuetype, pi, codecfactory {
+  after    += CIAO_DnC_Client
+  includes   += $(CIAO_ROOT) $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE
+  idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(CIAO_ROOT)/DAnCE
+  libs     += CIAO_DnC_Client
+}
diff --git a/CIAO/MPC/config/ciao_component_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
index 9cabf46cf83..9cabf46cf83 100644
--- a/CIAO/MPC/config/ciao_component_dnc.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
diff --git a/CIAO/MPC/config/ciao_config_handlers.mpb b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers.mpb
index 69412b873f1..69412b873f1 100644
--- a/CIAO/MPC/config/ciao_config_handlers.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb
new file mode 100644
index 00000000000..9d36eda836b
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb
@@ -0,0 +1,13 @@
+// $Id$
+
+project : ciao_xml_utils, dynamicany, typecodefactory, exceptions {
+  after += XSC_XML_Handlers
+  libs  += XSC_XML_Handlers
+  macros   += XML_USE_PTHREADS
+  includes += $(CIAO_ROOT)/tools/Config_Handlers
+
+  verbatim(gnuace, macros) {
+   override no_hidden_visibility = 1
+  }
+
+}
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_container_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_container_dnc.mpb
new file mode 100644
index 00000000000..7875cd5d088
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_container_dnc.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : portableserver, ciao_client_dnc {
+  after    += CIAO_DnC_Container
+  libs     += CIAO_DnC_Container
+}
diff --git a/CIAO/MPC/config/ciao_deployment_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
index 45e0fb77341..45e0fb77341 100644
--- a/CIAO/MPC/config/ciao_deployment_stub.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/ACE/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
new file mode 100644
index 00000000000..c62fe02d199
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project : ciao_deployment_stub, portableserver, ciao_events_dnc {
+  after += Deployment_svnt
+  libs  += CIAO_Deployment_svnt
+  includes += $(CIAO_ROOT)/DAnCE/ciao
+  idlflags += -I$(CIAO_ROOT)/DAnCE
+}
diff --git a/CIAO/MPC/config/ciao_domainapplicationmanager_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb
index 31731a84d5d..31731a84d5d 100644
--- a/CIAO/MPC/config/ciao_domainapplicationmanager_dnc.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb
diff --git a/CIAO/MPC/config/ciao_events_base_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb
index de2c8d5a7b9..de2c8d5a7b9 100644
--- a/CIAO/MPC/config/ciao_events_base_dnc.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_events_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_events_dnc.mpb
new file mode 100644
index 00000000000..e3c19ae53d1
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_events_dnc.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project : security, ifr_client, valuetype, pi, codecfactory, ciao_container_dnc, ciao_client_dnc, ciao_rtevent_dnc {
+  includes   += $(CIAO_ROOT)/ciaosvcs/Events
+  idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events
+  libs     += CIAO_DnC_Events
+  after    += CIAO_DnC_Events
+}
diff --git a/CIAO/MPC/config/ciao_executionmanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb
index bea046abd2d..bea046abd2d 100644
--- a/CIAO/MPC/config/ciao_executionmanager_stub.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb
new file mode 100644
index 00000000000..d082eb93f04
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id
+
+project : ciao_targetmanager_stub {
+  includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager
+  libs  += NodeApplicationManager
+  after += NodeApplicationManager
+}
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb
new file mode 100644
index 00000000000..3208af9bd00
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id
+
+project : ciao_deployment_stub {
+  includes += $(CIAO_ROOT)/DAnCE/Interfaces
+  includes += $(CIAO_ROOT)/DAnCE/NodeManager
+  libs     += NodeManager_stub
+  after    += NodeManager_stub
+}
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb
new file mode 100644
index 00000000000..4856402b74b
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id
+
+project : ciao_nodemanager_stub {
+  libs  += NodeManager
+  after += NodeManager_svnt
+}
diff --git a/CIAO/MPC/config/ciao_plan_generator.mpb b/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb
index e234ead3e67..e234ead3e67 100644
--- a/CIAO/MPC/config/ciao_plan_generator.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb
diff --git a/CIAO/MPC/config/ciao_race_component.mpb b/ACE/bin/MakeProjectCreator/config/ciao_race_component.mpb
index dc78b44764f..dc78b44764f 100644
--- a/CIAO/MPC/config/ciao_race_component.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_race_component.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_race_default.mpb b/ACE/bin/MakeProjectCreator/config/ciao_race_default.mpb
new file mode 100644
index 00000000000..26f9fb038c5
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_race_default.mpb
@@ -0,0 +1,4 @@
+project : ciaocidldefaults {
+  includes += $(CIAO_ROOT)/RACE
+  idlflags += -I$(CIAO_ROOT)/RACE
+}
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_race_monitor.mpb b/ACE/bin/MakeProjectCreator/config/ciao_race_monitor.mpb
new file mode 100644
index 00000000000..7bf423b3d0d
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_race_monitor.mpb
@@ -0,0 +1,4 @@
+project : ciao_race_default {
+  after += Local_Monitor
+  libs += Local_Monitor
+}
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb
new file mode 100644
index 00000000000..0d370eca8d8
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project : rtevent_serv, ciao_events_base_dnc {
+  includes   += $(CIAO_ROOT)/ciaosvcs/Events
+  idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events
+  libs     += CIAO_RTEvent
+  after    += CIAO_RTEvent
+}
diff --git a/CIAO/MPC/config/ciao_servant_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
index 6bc5c8d52a0..6bc5c8d52a0 100644
--- a/CIAO/MPC/config/ciao_servant_dnc.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_server_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
new file mode 100644
index 00000000000..380c9d22c90
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc {
+  after += CIAO_DnC_Server
+  libs  += CIAO_DnC_Server
+}
diff --git a/CIAO/MPC/config/ciao_static_dnc_app.mpb b/ACE/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb
index f6792f1f9eb..f6792f1f9eb 100644
--- a/CIAO/MPC/config/ciao_static_dnc_app.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb
new file mode 100644
index 00000000000..107f41f94a7
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id
+
+project : ciao_nodemanager_stub {
+  includes += $(CIAO_ROOT)/DAnCE/TargetManager
+  libs     += TargetManager_stub
+  after    += CIAO_TargetManager_stub
+}
diff --git a/CIAO/MPC/config/ciao_xml_utils.mpb b/ACE/bin/MakeProjectCreator/config/ciao_xml_utils.mpb
index 1167281994f..1167281994f 100644
--- a/CIAO/MPC/config/ciao_xml_utils.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciao_xml_utils.mpb
diff --git a/CIAO/MPC/config/ciaocidldefaults.mpb b/ACE/bin/MakeProjectCreator/config/ciaocidldefaults.mpb
index 3521ffebf88..3521ffebf88 100644
--- a/CIAO/MPC/config/ciaocidldefaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ciaocidldefaults.mpb
diff --git a/CIAO/MPC/config/cidlc.mpb b/ACE/bin/MakeProjectCreator/config/cidlc.mpb
index 38fa6d65e0d..38fa6d65e0d 100644
--- a/CIAO/MPC/config/cidlc.mpb
+++ b/ACE/bin/MakeProjectCreator/config/cidlc.mpb
diff --git a/TAO/MPC/config/codecfactory.mpb b/ACE/bin/MakeProjectCreator/config/codecfactory.mpb
index 3d2a4cbdf68..3d2a4cbdf68 100644
--- a/TAO/MPC/config/codecfactory.mpb
+++ b/ACE/bin/MakeProjectCreator/config/codecfactory.mpb
diff --git a/TAO/MPC/config/codeset.mpb b/ACE/bin/MakeProjectCreator/config/codeset.mpb
index 5ed18925513..5ed18925513 100644
--- a/TAO/MPC/config/codeset.mpb
+++ b/ACE/bin/MakeProjectCreator/config/codeset.mpb
diff --git a/TAO/MPC/config/concurrency.mpb b/ACE/bin/MakeProjectCreator/config/concurrency.mpb
index 7f93021e1a1..7f93021e1a1 100644
--- a/TAO/MPC/config/concurrency.mpb
+++ b/ACE/bin/MakeProjectCreator/config/concurrency.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/concurrency_serv.mpb b/ACE/bin/MakeProjectCreator/config/concurrency_serv.mpb
new file mode 100644
index 00000000000..0d1a4092e57
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/concurrency_serv.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : orbsvcslib, concurrency_skel {
+  after     += CosConcurrency_Serv
+  libs      += TAO_CosConcurrency_Serv
+}
diff --git a/TAO/MPC/config/concurrency_skel.mpb b/ACE/bin/MakeProjectCreator/config/concurrency_skel.mpb
index 0806aa30cbb..0806aa30cbb 100644
--- a/TAO/MPC/config/concurrency_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/concurrency_skel.mpb
diff --git a/TAO/MPC/config/corba_e_compact.mpb b/ACE/bin/MakeProjectCreator/config/corba_e_compact.mpb
index 7e7627a4878..7e7627a4878 100644
--- a/TAO/MPC/config/corba_e_compact.mpb
+++ b/ACE/bin/MakeProjectCreator/config/corba_e_compact.mpb
diff --git a/TAO/MPC/config/corba_e_micro.mpb b/ACE/bin/MakeProjectCreator/config/corba_e_micro.mpb
index 5f14ae228b9..5f14ae228b9 100644
--- a/TAO/MPC/config/corba_e_micro.mpb
+++ b/ACE/bin/MakeProjectCreator/config/corba_e_micro.mpb
diff --git a/TAO/MPC/config/corba_messaging.mpb b/ACE/bin/MakeProjectCreator/config/corba_messaging.mpb
index e2b65dbade4..e2b65dbade4 100644
--- a/TAO/MPC/config/corba_messaging.mpb
+++ b/ACE/bin/MakeProjectCreator/config/corba_messaging.mpb
diff --git a/TAO/MPC/config/core_anytypecode.mpb b/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb
index dfa65b169aa..dfa65b169aa 100644..100755
--- a/TAO/MPC/config/core_anytypecode.mpb
+++ b/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb
diff --git a/TAO/MPC/config/core_minimum_corba.mpb b/ACE/bin/MakeProjectCreator/config/core_minimum_corba.mpb
index dd8dc2f75a4..dd8dc2f75a4 100644
--- a/TAO/MPC/config/core_minimum_corba.mpb
+++ b/ACE/bin/MakeProjectCreator/config/core_minimum_corba.mpb
diff --git a/TAO/MPC/config/csd_framework.mpb b/ACE/bin/MakeProjectCreator/config/csd_framework.mpb
index 27dd3f56694..27dd3f56694 100644
--- a/TAO/MPC/config/csd_framework.mpb
+++ b/ACE/bin/MakeProjectCreator/config/csd_framework.mpb
diff --git a/TAO/MPC/config/csd_pt_test_exe.mpb b/ACE/bin/MakeProjectCreator/config/csd_pt_test_exe.mpb
index 5641add5436..5641add5436 100644
--- a/TAO/MPC/config/csd_pt_test_exe.mpb
+++ b/ACE/bin/MakeProjectCreator/config/csd_pt_test_exe.mpb
diff --git a/TAO/MPC/config/csd_pt_testinf_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_pt_testinf_lib.mpb
index 0c9a8dffa27..0c9a8dffa27 100644
--- a/TAO/MPC/config/csd_pt_testinf_lib.mpb
+++ b/ACE/bin/MakeProjectCreator/config/csd_pt_testinf_lib.mpb
diff --git a/TAO/MPC/config/csd_pt_testservant_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_pt_testservant_lib.mpb
index 1eba36eae83..1eba36eae83 100644
--- a/TAO/MPC/config/csd_pt_testservant_lib.mpb
+++ b/ACE/bin/MakeProjectCreator/config/csd_pt_testservant_lib.mpb
diff --git a/TAO/MPC/config/csd_threadpool.mpb b/ACE/bin/MakeProjectCreator/config/csd_threadpool.mpb
index 6f6cb86f1b2..6f6cb86f1b2 100644
--- a/TAO/MPC/config/csd_threadpool.mpb
+++ b/ACE/bin/MakeProjectCreator/config/csd_threadpool.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_a_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_a_lib.mpb
new file mode 100644
index 00000000000..e9d3edd980e
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_a_lib.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+//$Id$
+
+project : csd_tp_test_lib {
+  after += csd_tp_foo_a_lib
+  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
+  libs += CSD_TP_Foo_A
+  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
+}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_b_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_b_lib.mpb
new file mode 100644
index 00000000000..298cd700ece
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_b_lib.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+//$Id$
+
+project : csd_tp_test_lib {
+  after += csd_tp_foo_b_lib
+  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
+  libs += CSD_TP_Foo_B
+  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
+}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_c_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_c_lib.mpb
new file mode 100644
index 00000000000..4c51d30d318
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_c_lib.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+//$Id$
+
+project : csd_tp_test_lib {
+  after += csd_tp_foo_c_lib
+  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
+  libs += CSD_TP_Foo_C
+  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
+}
diff --git a/TAO/MPC/config/csd_tp_test_exe_a.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_a.mpb
index 7e1cfa624a8..7e1cfa624a8 100644
--- a/TAO/MPC/config/csd_tp_test_exe_a.mpb
+++ b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_a.mpb
diff --git a/TAO/MPC/config/csd_tp_test_exe_b.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_b.mpb
index c7209d22fc2..c7209d22fc2 100644
--- a/TAO/MPC/config/csd_tp_test_exe_b.mpb
+++ b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_b.mpb
diff --git a/TAO/MPC/config/csd_tp_test_exe_c.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_c.mpb
index efe525aff98..efe525aff98 100644
--- a/TAO/MPC/config/csd_tp_test_exe_c.mpb
+++ b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_c.mpb
diff --git a/TAO/MPC/config/csd_tp_test_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_lib.mpb
index f5227147178..f5227147178 100644
--- a/TAO/MPC/config/csd_tp_test_lib.mpb
+++ b/ACE/bin/MakeProjectCreator/config/csd_tp_test_lib.mpb
diff --git a/CIAO/MPC/config/dance_extension_stub.mpb b/ACE/bin/MakeProjectCreator/config/dance_extension_stub.mpb
index 4f5353b87bb..4f5353b87bb 100644
--- a/CIAO/MPC/config/dance_extension_stub.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dance_extension_stub.mpb
diff --git a/TAO/MPC/config/dseventlogadmin.mpb b/ACE/bin/MakeProjectCreator/config/dseventlogadmin.mpb
index 72855e6ced4..72855e6ced4 100644
--- a/TAO/MPC/config/dseventlogadmin.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dseventlogadmin.mpb
diff --git a/TAO/MPC/config/dseventlogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb
index b8eb9882ad3..b8eb9882ad3 100644
--- a/TAO/MPC/config/dseventlogadmin_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb
diff --git a/TAO/MPC/config/dseventlogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb
index 5b39b780f82..5b39b780f82 100644
--- a/TAO/MPC/config/dseventlogadmin_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb
diff --git a/TAO/MPC/config/dslogadmin.mpb b/ACE/bin/MakeProjectCreator/config/dslogadmin.mpb
index 0207a0450ff..0207a0450ff 100644
--- a/TAO/MPC/config/dslogadmin.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dslogadmin.mpb
diff --git a/TAO/MPC/config/dslogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/dslogadmin_serv.mpb
index da0d0c7dae7..da0d0c7dae7 100644
--- a/TAO/MPC/config/dslogadmin_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dslogadmin_serv.mpb
diff --git a/TAO/MPC/config/dslogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/dslogadmin_skel.mpb
index 7a235c2058c..7a235c2058c 100644
--- a/TAO/MPC/config/dslogadmin_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dslogadmin_skel.mpb
diff --git a/TAO/MPC/config/dsnotifylogadmin.mpb b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
index fcd49678617..fcd49678617 100644
--- a/TAO/MPC/config/dsnotifylogadmin.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
diff --git a/TAO/MPC/config/dsnotifylogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb
index 6ca347eb674..6ca347eb674 100644
--- a/TAO/MPC/config/dsnotifylogadmin_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb
diff --git a/TAO/MPC/config/dsnotifylogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb
index 401b2ff3d75..401b2ff3d75 100644
--- a/TAO/MPC/config/dsnotifylogadmin_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb
diff --git a/TAO/MPC/config/dynamicany.mpb b/ACE/bin/MakeProjectCreator/config/dynamicany.mpb
index 24c60ed00c8..24c60ed00c8 100644
--- a/TAO/MPC/config/dynamicany.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dynamicany.mpb
diff --git a/TAO/MPC/config/dynamicinterface.mpb b/ACE/bin/MakeProjectCreator/config/dynamicinterface.mpb
index b2ecd077abe..b2ecd077abe 100644
--- a/TAO/MPC/config/dynamicinterface.mpb
+++ b/ACE/bin/MakeProjectCreator/config/dynamicinterface.mpb
diff --git a/TAO/MPC/config/ec_use_typed_events.mpb b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
index 5d0d9adef6f..5d0d9adef6f 100644
--- a/TAO/MPC/config/ec_use_typed_events.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
diff --git a/TAO/MPC/config/ec_use_typed_events_serv.mpb b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb
index fedf2d3f1ef..fedf2d3f1ef 100644
--- a/TAO/MPC/config/ec_use_typed_events_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/endpointpolicy.mpb b/ACE/bin/MakeProjectCreator/config/endpointpolicy.mpb
new file mode 100644
index 00000000000..740b240e816
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/endpointpolicy.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : taolib, core, portableserver, pi {
+  after   += EndpointPolicy
+  libs    += TAO_EndpointPolicy
+}
diff --git a/TAO/MPC/config/etcl.mpb b/ACE/bin/MakeProjectCreator/config/etcl.mpb
index 95e84d4ee9a..95e84d4ee9a 100644
--- a/TAO/MPC/config/etcl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/etcl.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/event.mpb b/ACE/bin/MakeProjectCreator/config/event.mpb
new file mode 100644
index 00000000000..36f868262fe
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/event.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : orbsvcslib, ec_use_typed_events, minimum_corba {
+  after     += CosEvent
+  libs      += TAO_CosEvent
+  tagchecks += CosEvent
+}
diff --git a/ACE/bin/MakeProjectCreator/config/event_serv.mpb b/ACE/bin/MakeProjectCreator/config/event_serv.mpb
new file mode 100644
index 00000000000..1c536f434b5
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/event_serv.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging_optional, naming, svc_utils, minimum_corba {
+  after     += CosEvent_Serv
+  libs      += TAO_CosEvent_Serv
+}
diff --git a/ACE/bin/MakeProjectCreator/config/event_skel.mpb b/ACE/bin/MakeProjectCreator/config/event_skel.mpb
new file mode 100644
index 00000000000..7b21eb7c9db
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/event_skel.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : orbsvcslib, event, ec_use_typed_events, portableserver, minimum_corba {
+  after     += CosEvent_Skel
+  libs      += TAO_CosEvent_Skel
+}
diff --git a/TAO/MPC/config/fault_tolerance.mpb b/ACE/bin/MakeProjectCreator/config/fault_tolerance.mpb
index 35e964d4df6..35e964d4df6 100644
--- a/TAO/MPC/config/fault_tolerance.mpb
+++ b/ACE/bin/MakeProjectCreator/config/fault_tolerance.mpb
diff --git a/TAO/MPC/config/ftclientorb.mpb b/ACE/bin/MakeProjectCreator/config/ftclientorb.mpb
index 126330da041..126330da041 100644
--- a/TAO/MPC/config/ftclientorb.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ftclientorb.mpb
diff --git a/TAO/MPC/config/ftorb.mpb b/ACE/bin/MakeProjectCreator/config/ftorb.mpb
index 94bafab311a..94bafab311a 100644
--- a/TAO/MPC/config/ftorb.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ftorb.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ftorbutils.mpb b/ACE/bin/MakeProjectCreator/config/ftorbutils.mpb
new file mode 100644
index 00000000000..f06e082ba2f
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ftorbutils.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : iormanip, portableserver, orbsvcslib, portablegroup, minimum_corba {
+  after     += FTORB_Utils 
+  libs      += TAO_FTORB_Utils 
+  tagchecks += FTORB_Utils
+}
diff --git a/ACE/bin/MakeProjectCreator/config/ftrtevent.mpb b/ACE/bin/MakeProjectCreator/config/ftrtevent.mpb
new file mode 100644
index 00000000000..a165bf52c67
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ftrtevent.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : ftorbutils, rtevent_serv, naming, messaging, pi_server, minimum_corba {
+  after     += FtRtEvent
+  libs      += TAO_FtRtEvent
+  tagchecks += FtRtEvent
+}
diff --git a/TAO/MPC/config/ftrteventchannel.mpb b/ACE/bin/MakeProjectCreator/config/ftrteventchannel.mpb
index ca9cfdc46f7..ca9cfdc46f7 100644
--- a/TAO/MPC/config/ftrteventchannel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ftrteventchannel.mpb
diff --git a/TAO/MPC/config/ftrteventclient.mpb b/ACE/bin/MakeProjectCreator/config/ftrteventclient.mpb
index a25da42abaf..a25da42abaf 100644
--- a/TAO/MPC/config/ftrteventclient.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ftrteventclient.mpb
diff --git a/TAO/MPC/config/ftserverorb.mpb b/ACE/bin/MakeProjectCreator/config/ftserverorb.mpb
index 5d1b388707f..5d1b388707f 100644
--- a/TAO/MPC/config/ftserverorb.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ftserverorb.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features
index 975a1baad49..099d5403b20 100644
--- a/ACE/bin/MakeProjectCreator/config/global.features
+++ b/ACE/bin/MakeProjectCreator/config/global.features
@@ -36,9 +36,9 @@ ipv6          = 0
 mfc           = 0
 rpc           = 0
 sctp 	      = 0
-boost         = 0
 dummy_label   = 0
 cidl          = 0
+boost         = 0
 wince         = 0
 uses_wchar    = 0
 ziparchive    = 0
@@ -103,7 +103,8 @@ ZIP_Wrapper = 0
 
 // Feature for CORBA subsets
 corba_e_compact = 0
-corba_e_micro   = 0
+corba_e_micro = 0
+minimum_corba = 0
 
 // Option to disable iiop
 tao_no_iiop = 0
diff --git a/TAO/MPC/config/htiop.mpb b/ACE/bin/MakeProjectCreator/config/htiop.mpb
index cbeec43da74..cbeec43da74 100644
--- a/TAO/MPC/config/htiop.mpb
+++ b/ACE/bin/MakeProjectCreator/config/htiop.mpb
diff --git a/TAO/MPC/config/ifr_client.mpb b/ACE/bin/MakeProjectCreator/config/ifr_client.mpb
index 89cee167fd2..89cee167fd2 100644
--- a/TAO/MPC/config/ifr_client.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ifr_client.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ifrservice.mpb b/ACE/bin/MakeProjectCreator/config/ifrservice.mpb
new file mode 100644
index 00000000000..a580d2d0660
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ifrservice.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project : iortable, svc_utils, typecodefactory, pi_server, minimum_corba {
+  avoids    += ace_for_tao    // Requires ace/Configuration
+  after     += IFRService
+  libs      += TAO_IFRService
+  tagchecks += IFRService
+}
diff --git a/TAO/MPC/config/imr_activator.mpb b/ACE/bin/MakeProjectCreator/config/imr_activator.mpb
index d3363a4ec1b..d3363a4ec1b 100644
--- a/TAO/MPC/config/imr_activator.mpb
+++ b/ACE/bin/MakeProjectCreator/config/imr_activator.mpb
diff --git a/TAO/MPC/config/imr_client.mpb b/ACE/bin/MakeProjectCreator/config/imr_client.mpb
index 41f5d7eb480..41f5d7eb480 100644
--- a/TAO/MPC/config/imr_client.mpb
+++ b/ACE/bin/MakeProjectCreator/config/imr_client.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/imr_locator.mpb b/ACE/bin/MakeProjectCreator/config/imr_locator.mpb
new file mode 100644
index 00000000000..21068dfa9ca
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/imr_locator.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : orbsvcsexe, minimum_corba {
+  after += ImR_Locator
+  libs  += TAO_ImR_Locator
+}
diff --git a/TAO/MPC/config/interceptors.mpb b/ACE/bin/MakeProjectCreator/config/interceptors.mpb
index eda8c6d1bc3..eda8c6d1bc3 100644
--- a/TAO/MPC/config/interceptors.mpb
+++ b/ACE/bin/MakeProjectCreator/config/interceptors.mpb
diff --git a/TAO/MPC/config/iorinterceptor.mpb b/ACE/bin/MakeProjectCreator/config/iorinterceptor.mpb
index d55e844d244..d55e844d244 100644
--- a/TAO/MPC/config/iorinterceptor.mpb
+++ b/ACE/bin/MakeProjectCreator/config/iorinterceptor.mpb
diff --git a/TAO/MPC/config/iormanip.mpb b/ACE/bin/MakeProjectCreator/config/iormanip.mpb
index 7fd064393ef..7fd064393ef 100644
--- a/TAO/MPC/config/iormanip.mpb
+++ b/ACE/bin/MakeProjectCreator/config/iormanip.mpb
diff --git a/TAO/MPC/config/iortable.mpb b/ACE/bin/MakeProjectCreator/config/iortable.mpb
index c8795c0d2b9..c8795c0d2b9 100644
--- a/TAO/MPC/config/iortable.mpb
+++ b/ACE/bin/MakeProjectCreator/config/iortable.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ipv6.mpb b/ACE/bin/MakeProjectCreator/config/ipv6.mpb
index 60ceabf96f0..08ab8437535 100755
--- a/ACE/bin/MakeProjectCreator/config/ipv6.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ipv6.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 feature(ipv6) {
-  specific(vc6, vc7, vc71, vc8, nmake, borland, bmake, bds4) {
+  specific(vc6, vc7, vc71, vc8, nmake, borland, bmake, cbx) {
     lit_libs += iphlpapi
   }
 
diff --git a/TAO/MPC/config/kokyu_dsrt_scheduler_client.mpb b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_client.mpb
index fdab6656196..fdab6656196 100644
--- a/TAO/MPC/config/kokyu_dsrt_scheduler_client.mpb
+++ b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_client.mpb
diff --git a/TAO/MPC/config/kokyu_dsrt_scheduler_server.mpb b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb
index 9277bc2c867..9277bc2c867 100644
--- a/TAO/MPC/config/kokyu_dsrt_scheduler_server.mpb
+++ b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb
diff --git a/TAO/MPC/config/kokyu_dsrt_schedulers.mpb b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb
index 7974628140c..7974628140c 100644
--- a/TAO/MPC/config/kokyu_dsrt_schedulers.mpb
+++ b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb
diff --git a/TAO/MPC/config/lifecycle.mpb b/ACE/bin/MakeProjectCreator/config/lifecycle.mpb
index db47576564a..db47576564a 100644
--- a/TAO/MPC/config/lifecycle.mpb
+++ b/ACE/bin/MakeProjectCreator/config/lifecycle.mpb
diff --git a/TAO/MPC/config/loadbalancing.mpb b/ACE/bin/MakeProjectCreator/config/loadbalancing.mpb
index edd897f4798..edd897f4798 100644
--- a/TAO/MPC/config/loadbalancing.mpb
+++ b/ACE/bin/MakeProjectCreator/config/loadbalancing.mpb
diff --git a/TAO/MPC/config/messaging.mpb b/ACE/bin/MakeProjectCreator/config/messaging.mpb
index 2de4ac8046c..2de4ac8046c 100644
--- a/TAO/MPC/config/messaging.mpb
+++ b/ACE/bin/MakeProjectCreator/config/messaging.mpb
diff --git a/TAO/MPC/config/messaging_optional.mpb b/ACE/bin/MakeProjectCreator/config/messaging_optional.mpb
index ee8637a4d1b..ee8637a4d1b 100644
--- a/TAO/MPC/config/messaging_optional.mpb
+++ b/ACE/bin/MakeProjectCreator/config/messaging_optional.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/minimum_corba.mpb b/ACE/bin/MakeProjectCreator/config/minimum_corba.mpb
new file mode 100644
index 00000000000..be960c02b54
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/minimum_corba.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+feature(minimum_corba) : taoidldefaults {
+  avoids += minimum_corba
+  idlflags += -DTAO_HAS_MINIMUM_POA
+  macros += TAO_HAS_MINIMUM_CORBA=1
+}
diff --git a/TAO/MPC/config/naming.mpb b/ACE/bin/MakeProjectCreator/config/naming.mpb
index a1f4d3b6014..a1f4d3b6014 100644
--- a/TAO/MPC/config/naming.mpb
+++ b/ACE/bin/MakeProjectCreator/config/naming.mpb
diff --git a/TAO/MPC/config/naming_serv.mpb b/ACE/bin/MakeProjectCreator/config/naming_serv.mpb
index 7b1e8caf783..7b1e8caf783 100644
--- a/TAO/MPC/config/naming_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/naming_serv.mpb
diff --git a/TAO/MPC/config/naming_skel.mpb b/ACE/bin/MakeProjectCreator/config/naming_skel.mpb
index 18e010ed2a0..18e010ed2a0 100644
--- a/TAO/MPC/config/naming_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/naming_skel.mpb
diff --git a/TAO/MPC/config/namingexe.mpb b/ACE/bin/MakeProjectCreator/config/namingexe.mpb
index dd564b37aab..dd564b37aab 100644
--- a/TAO/MPC/config/namingexe.mpb
+++ b/ACE/bin/MakeProjectCreator/config/namingexe.mpb
diff --git a/TAO/MPC/config/negotiate_codesets.mpb b/ACE/bin/MakeProjectCreator/config/negotiate_codesets.mpb
index 52e80a81b22..52e80a81b22 100644
--- a/TAO/MPC/config/negotiate_codesets.mpb
+++ b/ACE/bin/MakeProjectCreator/config/negotiate_codesets.mpb
diff --git a/TAO/MPC/config/notification.mpb b/ACE/bin/MakeProjectCreator/config/notification.mpb
index 4893c915927..4893c915927 100644
--- a/TAO/MPC/config/notification.mpb
+++ b/ACE/bin/MakeProjectCreator/config/notification.mpb
diff --git a/TAO/MPC/config/notification_serv.mpb b/ACE/bin/MakeProjectCreator/config/notification_serv.mpb
index 08198cb5825..08198cb5825 100644
--- a/TAO/MPC/config/notification_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/notification_serv.mpb
diff --git a/TAO/MPC/config/notification_skel.mpb b/ACE/bin/MakeProjectCreator/config/notification_skel.mpb
index bba3b2453ee..bba3b2453ee 100644
--- a/TAO/MPC/config/notification_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/notification_skel.mpb
diff --git a/TAO/MPC/config/notify.mpb b/ACE/bin/MakeProjectCreator/config/notify.mpb
index e9f226cf312..e9f226cf312 100644
--- a/TAO/MPC/config/notify.mpb
+++ b/ACE/bin/MakeProjectCreator/config/notify.mpb
diff --git a/TAO/MPC/config/notify_serv.mpb b/ACE/bin/MakeProjectCreator/config/notify_serv.mpb
index e8360b407c5..e8360b407c5 100644
--- a/TAO/MPC/config/notify_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/notify_serv.mpb
diff --git a/TAO/MPC/config/notifytest.mpb b/ACE/bin/MakeProjectCreator/config/notifytest.mpb
index be766db59e0..be766db59e0 100644
--- a/TAO/MPC/config/notifytest.mpb
+++ b/ACE/bin/MakeProjectCreator/config/notifytest.mpb
diff --git a/TAO/MPC/config/objreftemplate.mpb b/ACE/bin/MakeProjectCreator/config/objreftemplate.mpb
index e887919b2c7..e887919b2c7 100644
--- a/TAO/MPC/config/objreftemplate.mpb
+++ b/ACE/bin/MakeProjectCreator/config/objreftemplate.mpb
diff --git a/TAO/MPC/config/orbsvcs_output.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcs_output.mpb
index 95d1feb1d9c..95d1feb1d9c 100644
--- a/TAO/MPC/config/orbsvcs_output.mpb
+++ b/ACE/bin/MakeProjectCreator/config/orbsvcs_output.mpb
diff --git a/TAO/MPC/config/orbsvcsexe.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcsexe.mpb
index b4521e70641..b4521e70641 100644
--- a/TAO/MPC/config/orbsvcsexe.mpb
+++ b/ACE/bin/MakeProjectCreator/config/orbsvcsexe.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb
new file mode 100644
index 00000000000..80575b1d459
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb
@@ -0,0 +1,12 @@
+// -*- MPC -*-
+// $Id$
+
+project : taolib_with_idl, orbsvcs_output, anytypecode {
+  tagname     = TAO_ORBSVCS
+  includes += $(TAO_ROOT)/orbsvcs
+  idlflags += -I$(TAO_ROOT)/orbsvcs -GT
+
+  specific(automake) {
+    includes += $(TAO_BUILDDIR)/orbsvcs
+  }
+}
diff --git a/TAO/MPC/config/pi.mpb b/ACE/bin/MakeProjectCreator/config/pi.mpb
index ec5eee5f587..ec5eee5f587 100644
--- a/TAO/MPC/config/pi.mpb
+++ b/ACE/bin/MakeProjectCreator/config/pi.mpb
diff --git a/TAO/MPC/config/pi_server.mpb b/ACE/bin/MakeProjectCreator/config/pi_server.mpb
index fe48f397cfe..fe48f397cfe 100644
--- a/TAO/MPC/config/pi_server.mpb
+++ b/ACE/bin/MakeProjectCreator/config/pi_server.mpb
diff --git a/TAO/MPC/config/pidl.mpb b/ACE/bin/MakeProjectCreator/config/pidl.mpb
index d9c507e5249..d9c507e5249 100644
--- a/TAO/MPC/config/pidl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/pidl.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/portablegroup.mpb b/ACE/bin/MakeProjectCreator/config/portablegroup.mpb
new file mode 100644
index 00000000000..351cbcb67c1
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/portablegroup.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : naming, messaging, minimum_corba, iormanip {
+  libs      += TAO_PortableGroup
+  after     += PortableGroup
+  tagchecks += PortableGroup
+}
diff --git a/TAO/MPC/config/portableserver.mpb b/ACE/bin/MakeProjectCreator/config/portableserver.mpb
index 2fc99e7a876..2fc99e7a876 100644
--- a/TAO/MPC/config/portableserver.mpb
+++ b/ACE/bin/MakeProjectCreator/config/portableserver.mpb
diff --git a/TAO/MPC/config/property.mpb b/ACE/bin/MakeProjectCreator/config/property.mpb
index a2e1c197764..a2e1c197764 100644
--- a/TAO/MPC/config/property.mpb
+++ b/ACE/bin/MakeProjectCreator/config/property.mpb
diff --git a/TAO/MPC/config/property_serv.mpb b/ACE/bin/MakeProjectCreator/config/property_serv.mpb
index 95588edd33a..95588edd33a 100644
--- a/TAO/MPC/config/property_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/property_serv.mpb
diff --git a/TAO/MPC/config/property_skel.mpb b/ACE/bin/MakeProjectCreator/config/property_skel.mpb
index 6904c4f9cbc..6904c4f9cbc 100644
--- a/TAO/MPC/config/property_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/property_skel.mpb
diff --git a/TAO/MPC/config/psdl.mpb b/ACE/bin/MakeProjectCreator/config/psdl.mpb
index fcc0e4edaa2..fcc0e4edaa2 100644
--- a/TAO/MPC/config/psdl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/psdl.mpb
diff --git a/TAO/MPC/config/rt_client.mpb b/ACE/bin/MakeProjectCreator/config/rt_client.mpb
index 5f8981e1035..5f8981e1035 100644
--- a/TAO/MPC/config/rt_client.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rt_client.mpb
diff --git a/TAO/MPC/config/rt_server.mpb b/ACE/bin/MakeProjectCreator/config/rt_server.mpb
index 6449c3d7762..6449c3d7762 100644
--- a/TAO/MPC/config/rt_server.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rt_server.mpb
diff --git a/TAO/MPC/config/rtcorba.mpb b/ACE/bin/MakeProjectCreator/config/rtcorba.mpb
index 4068c3bcce9..4068c3bcce9 100644
--- a/TAO/MPC/config/rtcorba.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtcorba.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/rtcorbacommon.mpb b/ACE/bin/MakeProjectCreator/config/rtcorbacommon.mpb
new file mode 100644
index 00000000000..12251e5c162
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/rtcorbacommon.mpb
@@ -0,0 +1,13 @@
+// -*- MPC -*-
+// $Id$
+
+project : portableserver, minimum_corba {
+  after    += RTCORBA_Common
+  libs     += RTCORBA_Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  }
+
+  includes += ../Common
+}
diff --git a/TAO/MPC/config/rtcorbaevent.mpb b/ACE/bin/MakeProjectCreator/config/rtcorbaevent.mpb
index f085b540b53..f085b540b53 100644
--- a/TAO/MPC/config/rtcorbaevent.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtcorbaevent.mpb
diff --git a/TAO/MPC/config/rtcosscheduling.mpb b/ACE/bin/MakeProjectCreator/config/rtcosscheduling.mpb
index fabb84f7dd8..fabb84f7dd8 100644
--- a/TAO/MPC/config/rtcosscheduling.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtcosscheduling.mpb
diff --git a/TAO/MPC/config/rtevent.mpb b/ACE/bin/MakeProjectCreator/config/rtevent.mpb
index 7383523938a..7383523938a 100644
--- a/TAO/MPC/config/rtevent.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtevent.mpb
diff --git a/TAO/MPC/config/rtevent_serv.mpb b/ACE/bin/MakeProjectCreator/config/rtevent_serv.mpb
index 60a356c41cc..60a356c41cc 100644
--- a/TAO/MPC/config/rtevent_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtevent_serv.mpb
diff --git a/TAO/MPC/config/rtevent_skel.mpb b/ACE/bin/MakeProjectCreator/config/rtevent_skel.mpb
index ba53e2ae8bc..ba53e2ae8bc 100644
--- a/TAO/MPC/config/rtevent_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtevent_skel.mpb
diff --git a/TAO/MPC/config/rteventexe.mpb b/ACE/bin/MakeProjectCreator/config/rteventexe.mpb
index 6f2dc9d6f02..6f2dc9d6f02 100644
--- a/TAO/MPC/config/rteventexe.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rteventexe.mpb
diff --git a/TAO/MPC/config/rteventlogadmin.mpb b/ACE/bin/MakeProjectCreator/config/rteventlogadmin.mpb
index 4150b18e7e7..4150b18e7e7 100644
--- a/TAO/MPC/config/rteventlogadmin.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rteventlogadmin.mpb
diff --git a/TAO/MPC/config/rteventlogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_serv.mpb
index dbc14cf067f..dbc14cf067f 100644
--- a/TAO/MPC/config/rteventlogadmin_serv.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_serv.mpb
diff --git a/TAO/MPC/config/rteventlogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_skel.mpb
index 920e65f4ab6..920e65f4ab6 100644
--- a/TAO/MPC/config/rteventlogadmin_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_skel.mpb
diff --git a/TAO/MPC/config/rtkokyuevent.mpb b/ACE/bin/MakeProjectCreator/config/rtkokyuevent.mpb
index a57c8b8017c..a57c8b8017c 100644
--- a/TAO/MPC/config/rtkokyuevent.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtkokyuevent.mpb
diff --git a/TAO/MPC/config/rtnotify.mpb b/ACE/bin/MakeProjectCreator/config/rtnotify.mpb
index 1a04eb83922..1a04eb83922 100644
--- a/TAO/MPC/config/rtnotify.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtnotify.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/rtportableserver.mpb b/ACE/bin/MakeProjectCreator/config/rtportableserver.mpb
new file mode 100644
index 00000000000..ee3d17fe942
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/rtportableserver.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : pi, portableserver, rtcorba {
+  after   += RTPortableServer
+  libs    += TAO_RTPortableServer
+}
diff --git a/TAO/MPC/config/rtsched.mpb b/ACE/bin/MakeProjectCreator/config/rtsched.mpb
index bb435139cf7..bb435139cf7 100644
--- a/TAO/MPC/config/rtsched.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtsched.mpb
diff --git a/TAO/MPC/config/rtschedevent.mpb b/ACE/bin/MakeProjectCreator/config/rtschedevent.mpb
index 9c03534d9e0..9c03534d9e0 100644
--- a/TAO/MPC/config/rtschedevent.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtschedevent.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/rtscheduling.mpb b/ACE/bin/MakeProjectCreator/config/rtscheduling.mpb
new file mode 100644
index 00000000000..a746dc72693
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/rtscheduling.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : rtcorba, portableserver, pi, pi_server {
+  after   += RTScheduler
+  libs    += TAO_RTScheduler
+}
diff --git a/TAO/MPC/config/rtscheduling_client.mpb b/ACE/bin/MakeProjectCreator/config/rtscheduling_client.mpb
index c026daffbdc..c026daffbdc 100644
--- a/TAO/MPC/config/rtscheduling_client.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtscheduling_client.mpb
diff --git a/TAO/MPC/config/rtscheduling_server.mpb b/ACE/bin/MakeProjectCreator/config/rtscheduling_server.mpb
index 06b97cea148..06b97cea148 100644
--- a/TAO/MPC/config/rtscheduling_server.mpb
+++ b/ACE/bin/MakeProjectCreator/config/rtscheduling_server.mpb
diff --git a/TAO/MPC/config/security.mpb b/ACE/bin/MakeProjectCreator/config/security.mpb
index 8a192c2d077..8a192c2d077 100644
--- a/TAO/MPC/config/security.mpb
+++ b/ACE/bin/MakeProjectCreator/config/security.mpb
diff --git a/TAO/MPC/config/smart_proxies.mpb b/ACE/bin/MakeProjectCreator/config/smart_proxies.mpb
index b1fc95d4b6c..b1fc95d4b6c 100644
--- a/TAO/MPC/config/smart_proxies.mpb
+++ b/ACE/bin/MakeProjectCreator/config/smart_proxies.mpb
diff --git a/TAO/MPC/config/ssliop.mpb b/ACE/bin/MakeProjectCreator/config/ssliop.mpb
index 3ccf7b3e877..3ccf7b3e877 100644
--- a/TAO/MPC/config/ssliop.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ssliop.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/strategies.mpb b/ACE/bin/MakeProjectCreator/config/strategies.mpb
new file mode 100644
index 00000000000..c087499d5fd
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/strategies.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+project : taolib, anytypecode {
+  avoids  += ace_for_tao     // Requires Unix domain sockets and MEM stuff
+  after   += Strategies
+  libs    += TAO_Strategies
+}
diff --git a/TAO/MPC/config/svc_utils.mpb b/ACE/bin/MakeProjectCreator/config/svc_utils.mpb
index a38a4a962cc..a38a4a962cc 100644
--- a/TAO/MPC/config/svc_utils.mpb
+++ b/ACE/bin/MakeProjectCreator/config/svc_utils.mpb
diff --git a/TAO/MPC/config/tao_flresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_flresource.mpb
index a3baaa8cb43..a3baaa8cb43 100644
--- a/TAO/MPC/config/tao_flresource.mpb
+++ b/ACE/bin/MakeProjectCreator/config/tao_flresource.mpb
diff --git a/TAO/MPC/config/tao_no_iiop.mpb b/ACE/bin/MakeProjectCreator/config/tao_no_iiop.mpb
index a6fc53b3881..a6fc53b3881 100644
--- a/TAO/MPC/config/tao_no_iiop.mpb
+++ b/ACE/bin/MakeProjectCreator/config/tao_no_iiop.mpb
diff --git a/TAO/MPC/config/tao_output.mpb b/ACE/bin/MakeProjectCreator/config/tao_output.mpb
index 12124d9eb31..12124d9eb31 100644
--- a/TAO/MPC/config/tao_output.mpb
+++ b/ACE/bin/MakeProjectCreator/config/tao_output.mpb
diff --git a/TAO/MPC/config/tao_qtresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_qtresource.mpb
index 43bd3fca0b6..43bd3fca0b6 100644
--- a/TAO/MPC/config/tao_qtresource.mpb
+++ b/ACE/bin/MakeProjectCreator/config/tao_qtresource.mpb
diff --git a/TAO/MPC/config/tao_tkresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_tkresource.mpb
index 150a42ab082..150a42ab082 100644
--- a/TAO/MPC/config/tao_tkresource.mpb
+++ b/ACE/bin/MakeProjectCreator/config/tao_tkresource.mpb
diff --git a/TAO/MPC/config/tao_versioning_idl_defaults.mpb b/ACE/bin/MakeProjectCreator/config/tao_versioning_idl_defaults.mpb
index 0d0352fa5fa..0d0352fa5fa 100644
--- a/TAO/MPC/config/tao_versioning_idl_defaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/tao_versioning_idl_defaults.mpb
diff --git a/TAO/MPC/config/tao_xtresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_xtresource.mpb
index 1907319b457..1907319b457 100644
--- a/TAO/MPC/config/tao_xtresource.mpb
+++ b/ACE/bin/MakeProjectCreator/config/tao_xtresource.mpb
diff --git a/TAO/MPC/config/taoclient.mpb b/ACE/bin/MakeProjectCreator/config/taoclient.mpb
index fe00c22e960..fe00c22e960 100644
--- a/TAO/MPC/config/taoclient.mpb
+++ b/ACE/bin/MakeProjectCreator/config/taoclient.mpb
diff --git a/TAO/MPC/config/taodefaults.mpb b/ACE/bin/MakeProjectCreator/config/taodefaults.mpb
index 0343a1e0814..0343a1e0814 100644
--- a/TAO/MPC/config/taodefaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/taodefaults.mpb
diff --git a/TAO/MPC/config/taoexe.mpb b/ACE/bin/MakeProjectCreator/config/taoexe.mpb
index a026aaab695..a026aaab695 100644
--- a/TAO/MPC/config/taoexe.mpb
+++ b/ACE/bin/MakeProjectCreator/config/taoexe.mpb
diff --git a/CIAO/MPC/config/taoidl3toidl2defaults.mpb b/ACE/bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb
index 58e2fb2f896..58e2fb2f896 100644
--- a/CIAO/MPC/config/taoidl3toidl2defaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/taoidldefaults.mpb b/ACE/bin/MakeProjectCreator/config/taoidldefaults.mpb
new file mode 100644
index 00000000000..f62d55ffa67
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/taoidldefaults.mpb
@@ -0,0 +1,65 @@
+// -*- MPC -*-
+// $Id$
+
+project {
+  // Set the idl compiler and flags as template values
+  specific {
+    tao_idl      = $(ACE_ROOT)/bin/tao_idl
+    tao_idl_dep  = $(ACE_ROOT)/bin/tao_idl
+    tao_idlflags = -Ge 1 -Wb,pre_include=ace/pre.h \
+                   -Wb,post_include=ace/post.h -I$(TAO_ROOT)
+  }
+
+  Define_Custom(IDL) {
+    automatic            = 1
+    dependent            = $(TAO_IDL_DEP)
+    command              = $(TAO_IDL)
+    libpath              = $(ACE_ROOT)/lib
+    inputext             = .idl
+    source_pre_extension = C
+    header_pre_extension = C, S
+    source_outputext     = .cpp, .cxx, .cc, .C
+    header_outputext     = .h, .hpp, .hxx, .hh
+    keyword idlflags     = commandflags
+
+    // Inline related options
+    optional(inline_outputext) {
+      commandflags(!-SS && !-Ssi || !-Sci || -GT && !-SS && !-oS) += .inl, .i
+    }
+    optional(inline_pre_extension) {
+      commandflags(!-SS && !-Ssi && !-oS) += S
+    }
+    optional(inline_pre_extension) {
+      commandflags(!-Sci) += C
+    }
+    optional(inline_pre_extension) {
+      commandflags(-GT && !-SS && !-oS) += S_T
+    }
+
+    // Source related options
+    optional(source_pre_extension) {
+      commandflags(!-SS && !-oS) += S
+    }
+    optional(source_pre_extension) {
+      commandflags(-GA && !-oA) += A
+    }
+    optional(header_outputext) {
+      commandflags(-SS && !-oS) += S
+    }
+
+    // Other
+    optional(template_outputext) {
+      commandflags(-GT && !-SS && !-oS) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C
+    }
+    optional(header_pre_extension) {
+      commandflags(-GT && !-SS && !-oS) += S_T
+    }
+    optional(header_pre_extension) {
+      commandflags(-GA && !-oA || -GX) += A
+    }
+  }
+
+  after    += TAO_IDL_EXE
+  idlflags += $(TAO_IDLFLAGS)
+  idlflags += -Sa -St
+}
diff --git a/TAO/MPC/config/taolib.mpb b/ACE/bin/MakeProjectCreator/config/taolib.mpb
index 778075809be..778075809be 100644
--- a/TAO/MPC/config/taolib.mpb
+++ b/ACE/bin/MakeProjectCreator/config/taolib.mpb
diff --git a/TAO/MPC/config/taolib_with_idl.mpb b/ACE/bin/MakeProjectCreator/config/taolib_with_idl.mpb
index cc36293c909..cc36293c909 100644
--- a/TAO/MPC/config/taolib_with_idl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/taolib_with_idl.mpb
diff --git a/TAO/MPC/config/taoserver.mpb b/ACE/bin/MakeProjectCreator/config/taoserver.mpb
index 8c081dfb029..8c081dfb029 100644
--- a/TAO/MPC/config/taoserver.mpb
+++ b/ACE/bin/MakeProjectCreator/config/taoserver.mpb
diff --git a/TAO/MPC/config/time.mpb b/ACE/bin/MakeProjectCreator/config/time.mpb
index 4e5fce894f0..4e5fce894f0 100644
--- a/TAO/MPC/config/time.mpb
+++ b/ACE/bin/MakeProjectCreator/config/time.mpb
diff --git a/TAO/MPC/config/trading.mpb b/ACE/bin/MakeProjectCreator/config/trading.mpb
index 63db829c0cd..63db829c0cd 100644
--- a/TAO/MPC/config/trading.mpb
+++ b/ACE/bin/MakeProjectCreator/config/trading.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/trading_serv.mpb b/ACE/bin/MakeProjectCreator/config/trading_serv.mpb
new file mode 100644
index 00000000000..2b2f3988b3d
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/trading_serv.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : orbsvcslib, trading_skel, dynamicany, svc_utils, iortable {
+  after     += CosTrading_Serv
+  libs      += TAO_CosTrading_Serv
+}
diff --git a/TAO/MPC/config/trading_skel.mpb b/ACE/bin/MakeProjectCreator/config/trading_skel.mpb
index ee926a85d59..ee926a85d59 100644
--- a/TAO/MPC/config/trading_skel.mpb
+++ b/ACE/bin/MakeProjectCreator/config/trading_skel.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/typecodefactory.mpb b/ACE/bin/MakeProjectCreator/config/typecodefactory.mpb
new file mode 100644
index 00000000000..7eadcd76a75
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/typecodefactory.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : ifr_client {
+  libs    += TAO_TypeCodeFactory
+  after   += TypeCodeFactory
+}
diff --git a/TAO/MPC/config/utils.mpb b/ACE/bin/MakeProjectCreator/config/utils.mpb
index 0c9d37b2dea..0c9d37b2dea 100644
--- a/TAO/MPC/config/utils.mpb
+++ b/ACE/bin/MakeProjectCreator/config/utils.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/valuetype.mpb b/ACE/bin/MakeProjectCreator/config/valuetype.mpb
new file mode 100644
index 00000000000..47edd4e94c4
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/valuetype.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project: taolib, anytypecode {
+  after    += Valuetype
+  libs     += TAO_Valuetype
+}
diff --git a/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm b/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
index cdd86016c4d..57ce339f7a9 100644
--- a/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
+++ b/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
@@ -30,7 +30,7 @@ my(%vals)  = ('ACE_ROOT'      => '$(top_srcdir)',
               'CIAO_BUILDDIR' => '$(top_builddir)',
               'TAO_IDL'       => 'ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl' . "\n" .
 				 'TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl' . "\n" .
-                                 'TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf',
+                                 'TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf',
              );
 my(%addon) = ('ACE_ROOT'     => {'CIAO_ROOT'     => '/../..',
                                  'TAO_ROOT'      => '/..',
diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
index fbadaae83c3..8ae76531b3c 100644
--- a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
+++ b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
@@ -13,11 +13,10 @@ package GNUACEWorkspaceCreator;
 use strict;
 
 use GNUACEProjectCreator;
-use MakeWorkspaceBase;
 use WorkspaceCreator;
 
 use vars qw(@ISA);
-@ISA = qw(MakeWorkspaceBase WorkspaceCreator);
+@ISA = qw(WorkspaceCreator);
 
 # ************************************************************
 # Data Section
@@ -35,9 +34,15 @@ sub generate_implicit_project_dependencies {
 }
 
 
-sub workspace_file_prefix {
+sub workspace_file_name {
+  my($self) = shift;
+  return $self->get_modified_workspace_name($base, '');
+}
+
+
+sub workspace_per_project {
   #my($self) = shift;
-  return $base;
+  return 1;
 }
 
 
@@ -46,31 +51,22 @@ sub pre_workspace {
   my($fh)   = shift;
   my($crlf) = $self->crlf();
 
-  print $fh '# -*- makefile -*-', $crlf;
-  $self->workspace_preamble($fh, $crlf, 'GNU ACE Workspace',
-                            '$Id$');
-  print $fh 'MAKEFILE = ', $self->get_modified_workspace_name($base, '', 1),
+  print $fh '# -*- makefile -*-', $crlf,
+            '#-------------------------------------------------------------------------', $crlf,
+            '#       GNU ACE Workspace', $crlf,
+            '#', $crlf,
+            '# $Id$', $crlf,
+            '#', $crlf,
+            '# This file was generated by MPC.  Any changes made directly to', $crlf,
+            '# this file will be lost the next time it is generated.', $crlf,
+            '#', $crlf,
+            '# MPC Command:', $crlf,
+            '# ', $self->create_command_line_string($0, @ARGV), $crlf,
+            '#', $crlf,
+            '#-------------------------------------------------------------------------', $crlf,
+            'MAKEFILE = ', $self->get_modified_workspace_name($base, '', 1),
             $crlf;
 }
-  
-  
-sub write_project_targets {
-  my($self)   = shift;
-  my($fh)     = shift;
-  my($crlf)   = shift;
-  my($target) = shift;
-  my($list)   = shift;
-
-  foreach my $project (@$list) {
-    my($dname) = $self->mpc_dirname($project);
-    my($chdir) = ($dname ne '.');
-    print $fh "\t\@",
-              ($chdir ? "cd $dname && " : ''),
-              "\$(MAKE) -f ",
-              ($chdir ? $self->mpc_basename($project) : $project),
-              " $target$crlf";
-  }
-}
 
 
 sub write_comps {
@@ -89,14 +85,11 @@ sub write_comps {
             "ifeq (\$(findstring k,\$(MAKEFLAGS)),k)$crlf",
             "  KEEP_GOING = -$crlf",
             "endif$crlf$crlf",
-            "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf";
+            "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf",
+            $crlf;
 
   if ($named) {
-    $self->write_named_targets($fh, $crlf, \%targnum, \@list,
-                               'REMAINING_TARGETS := ' .
-                               '$(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)' .
-                               "$crlf$crlf\$(REMAINING_TARGETS)", '', '',
-                               $self->project_target_translation(1), 1);
+    $self->write_named_targets($fh, $crlf, \%targnum, \@list);
   }
   else {
     ## Determine the ordering of the sub-directories
@@ -215,4 +208,58 @@ sub write_comps {
   }
 }
 
+sub write_named_targets {
+  my($self)    = shift;
+  my($fh)      = shift;
+  my($crlf)    = shift;
+  my($targnum) = shift;
+  my($list)    = shift;
+  my($trans)   = $self->project_target_translation(1);
+
+  ## Print out the "all" target
+  print $fh 'all:';
+  foreach my $project (@$list) {
+    print $fh " $$trans{$project}";
+  }
+
+  ## Print out all other targets here
+  print $fh $crlf,
+            'REMAINING_TARGETS := ',
+            '$(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)',
+            "$crlf$crlf\$(REMAINING_TARGETS):$crlf";
+  foreach my $project (@$list) {
+    my($dname) = $self->mpc_dirname($project);
+    print $fh "\t\@",
+              ($dname ne '.' ? "cd $dname && " : ''),
+              "\$(MAKE) -f ",
+              ($dname eq '.' ? $project : $self->mpc_basename($project)),
+              " \$(\@)$crlf";
+  }
+
+  ## Print out each target separately
+  foreach my $project (@$list) {
+    my($dname) = $self->mpc_dirname($project);
+    print $fh $crlf, '.PHONY: ', $$trans{$project},
+              $crlf, $$trans{$project}, ':';
+    if (defined $$targnum{$project}) {
+      foreach my $number (@{$$targnum{$project}}) {
+        print $fh " $$trans{$$list[$number]}";
+      }
+    }
+
+    print $fh $crlf,
+              "\t\@",
+              ($dname ne '.' ? "cd $dname && " : ''),
+              "\$(MAKE) -f ",
+              ($dname eq '.' ? $project : $self->mpc_basename($project)),
+              ' all', $crlf;
+  }
+
+  ## Print out the project_name_list target
+  print $fh $crlf, "project_name_list:$crlf";
+  foreach my $project (sort @$list) {
+    print $fh "\t\@echo $$trans{$project}$crlf";
+  }
+}
+
 1;
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index 72812a24622..7b4339c1c16 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -453,13 +453,13 @@ lib_warning:
 
 <%if(requires)%>
 require_warning:
-	@echo <%project_name%> will not be built due to one of the following disabled make macros:
+	@echo <%project_name%> will not be built due to one of the following disabled features:
 	@echo<%foreach(requires)%> <%require%><%endfor%>
 
 <%endif%>
 <%if(avoids)%>
 avoid_warning:
-	@echo <%project_name%> will not be built due to one of the following enabled make macros:
+	@echo <%project_name%> will not be built due to one of the following enabled features:
 	@echo<%foreach(avoids)%> <%avoid%><%endfor%>
 
 <%endif%>
@@ -484,7 +484,7 @@ PATH              := $(PATH):<%custom_type->libpath%>
 <%endif%>
 <%foreach(custom_type->input_files)%>
 <%if(custom_type->input_file->output_files)%>
-GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%>
+GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%>
 <%if(custom_type->input_file->non_source_output_files)%>
 OBJS_DEPEND_ON_GENERATED = 1
 <%endif%>
@@ -533,12 +533,10 @@ else
 endif
 <%endif%>
 <%endfor%>
-<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->input_file->dependencies)%> <%custom_type->input_file->dependencies%><%endif%><%if(flag_overrides(custom_type->input_file, dependent))%> <%flag_overrides(custom_type->input_file, dependent)%><%else%><%if(custom_type->dependent)%> <%custom_type->dependent%><%endif%><%endif%>
+<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->input_file->dependencies)%> <%custom_type->input_file->dependencies%><%endif%><%if(flag_overrides(custom_type->input_file, dependent))%> <%flag_overrides(custom_type->input_file, dependent)%><%else%><%if(custom_type->dependent)%> <%custom_type->dependent%><%endif%><%endif%>
 <%if(flag_overrides(custom_type->input_file, gendir))%>
-<%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%>
 	$(MKDIR) <%flag_overrides(custom_type->input_file, gendir)%>
 <%endif%>
-<%endif%>
 	<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%if(custom_type->output_option)%><%custom_type->input_file%> <%custom_type->output_option%> $@<%else%><%custom_type->input_file%><%endif%>
 <%if(flag_overrides(custom_type->input_file, postcommand))%>
 <%foreach(custom_type->input_file)%>
@@ -591,7 +589,7 @@ endif
 
 <%endif%>
 <%if(idl_files)%>
-ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%if(!compares(flag_overrides(idl_file, gendir),.))%><%flag_overrides(idl_file, gendir)%>/<%endif%><%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%>
+ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%flag_overrides(idl_file, gendir)%>/<%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%>
 idl_stubs: $(ADDITIONAL_IDL_TARGETS)
 <%if(source_files)%>
 
@@ -602,7 +600,7 @@ FORCED_IDL_STUBS = <%source_files%>
 <%foreach(custom_type->input_files)%>
 <%if(custom_type->input_file->source_output_files)%>
 <%foreach(custom_type->input_file->source_output_files)%>
-FORCED_IDL_STUBS := $(FORCED_IDL_STUBS:<%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>=)
+FORCED_IDL_STUBS := $(FORCED_IDL_STUBS:<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>=)
 <%endfor%>
 <%endif%>
 <%endfor%>
diff --git a/ACE/bin/Makefile.am b/ACE/bin/Makefile.am
index bc5c70469dc..996040dd287 100644
--- a/ACE/bin/Makefile.am
+++ b/ACE/bin/Makefile.am
@@ -29,7 +29,7 @@ envinfo_SOURCES = \
   envinfo.cpp
 
 envinfo_LDADD = \
-  $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/ACE/bin/auto_run_tests.pl b/ACE/bin/auto_run_tests.pl
index 6c7a98aae67..21327ed75ab 100755
--- a/ACE/bin/auto_run_tests.pl
+++ b/ACE/bin/auto_run_tests.pl
@@ -17,7 +17,7 @@ use English;
 use Getopt::Std;
 use Cwd;
 
-use Env qw(ACE_ROOT PATH TAO_ROOT CIAO_ROOT);
+use Env qw(ACE_ROOT PATH);
 
 ################################################################################
 
@@ -118,24 +118,19 @@ foreach my $test_lst (@file_list) {
             print "auto_run_tests: $test\n";
         }
 
-        if ($directory =~ m:^TAO/(.*):) {
-          $directory = $1;
+        $status = 0;
+        if (-d $ACE_ROOT."/$directory") {
+          $status = chdir ($ACE_ROOT."/$directory");
         }
-
-        $status = undef;
-        foreach my $path ($ACE_ROOT."/$directory",
-                          $startdir."/$directory",
-                          $TAO_ROOT."/$directory" )
-          {
-          if (-d $path) {
-            $status = chdir ($path);
-            last;
-          }
+        elsif (-d $startdir."/$directory") {
+          $status = chdir ($startdir."/$directory");
+        }
+        else {
+          $status = chdir ($directory);
         }
-        $status = chdir ($directory) if (! defined($status));
 
         if (!$status) {
-          print STDERR "ERROR: Cannot chdir to $ACE_ROOT/$directory\n";
+          print STDERR "ERROR: Cannot chdir to $ACE_ROOT/$directory";
           next;
         }
 
diff --git a/ACE/bin/ciao_tests.lst b/ACE/bin/ciao_tests.lst
index 062bf79a4c8..57aa377b432 100644
--- a/ACE/bin/ciao_tests.lst
+++ b/ACE/bin/ciao_tests.lst
@@ -5,12 +5,11 @@
 # Each line has its own test, and a test can be followed by a
 # list of configurations it does _not_ run on.
 #
-# Example: TAO\examples\foo\run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
+# Example: TAO\examples\foo\run_test.pl: !MINIMUM !ST
 #
-TAO/CIAO/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO
-TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO
-TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO
-TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/CIAO/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !NOXERCES !ACE_FOR_TAO
+TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !NOXERCES !ACE_FOR_TAO
+TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl: !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl: !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl: !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !STATIC !MINIMUM !ACE_FOR_TAO
diff --git a/ACE/bin/cltime.pl b/ACE/bin/cltime.pl
index a962a20912a..d28eea7b9dc 100755
--- a/ACE/bin/cltime.pl
+++ b/ACE/bin/cltime.pl
@@ -1,4 +1,3 @@
-# $Id$
 use strict;
 
 my($name)  = shift;
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index a0e49ede380..6aa58c130fe 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -123,7 +123,7 @@ sub store_file ($)
     elsif ($name =~ /\/GNUmakefile.*.[^~]$/) {
         push @files_makefile, ($name);
     }
-    elsif ($name =~ /\.(mpc|mwc|mpb|mpt)$/i) {
+    elsif ($name =~ /\.(mpc|mwc|mpb|mpt)/i) {
         push @files_mpc, ($name);
     }
     elsif ($name =~ /\.(icc|ncb|opt|zip)$/i) {
@@ -277,12 +277,12 @@ sub check_for_newline ()
 }
 
 
-# This test checks for files that are not allowed to be in svn
+# This test checks for files that are not allowed to be in cvs
 sub check_for_noncvs_files ()
 {
-    print "Running non svn files check\n";
+    print "Running non cvs files check\n";
     foreach $file (@files_noncvs, @files_dsp, @files_dsw, @files_makefile) {
-        print_error ("File $file should not be in svn!");
+        print_error ("File $file should not be in cvs!");
     }
 }
 
@@ -589,7 +589,7 @@ sub check_for_dependency_file ()
                     $depend = $path . $depend;
                     unless (open (DFILE, $depend)) {
                         print_error ("DEPENDENCY_FILE \"$depend\" not found");
-                        print " Either add \"$depend\" to svn ";
+                        print " Either add \"$depend\" to cvs ";
                         print "or remove DEPENDENCY_FILE variable\n";
                         print " from $file\n\n";
                     }
@@ -747,8 +747,7 @@ sub check_for_versioned_namespace_begin_end ()
         if (/^\s*\w+_END_VERSIONED_NAMESPACE_DECL/) {
           ++$end_count;
         }
-        if ($begin_count > $end_count and
-            /^\s*#\s*include(\s*\/\*\*\/)?\s*"/) {
+        if ($begin_count > $end_count and /^\s*#\s*include\s*/) {
           print_error ("$file:$.: #include directive within Versioned namespace block");
         }
       }
@@ -1449,7 +1448,7 @@ check_for_streams_include () if ($opt_l >= 6);
 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);
-check_for_id_string () if ($opt_l >= 1);
+# 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);
diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl
index 3ff3da8e6c8..20365f58fd6 100755
--- a/ACE/bin/generate_doxygen.pl
+++ b/ACE/bin/generate_doxygen.pl
@@ -31,8 +31,6 @@ $html_output_dir = '.';
              ,'tao_pi'
              ,'tao_pi_server'
              ,'tao_rtportableserver'
-             ,'tao_compression'
-             ,'tao_transportcurrent'
              ,'tao_rtcorba'
              ,'tao_dynamicany'
              ,'tao_dynamicinterface'
diff --git a/ACE/bin/make_release b/ACE/bin/make_release
index 0077bb83598..17fd6602c9f 100755
--- a/ACE/bin/make_release
+++ b/ACE/bin/make_release
@@ -4,7 +4,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 # $Id$
 #
-# Creates an ACE or TAO kit.
+# Creates an ACE or TAO kit.  Intended to be called from the
+# ACE or TAO top-level GNUmakefiles.
 #
 # The first three lines above let this script run without specifying the
 # full path to perl, as long as it is in the user's PATH.
@@ -98,7 +99,7 @@ my $release_filter = '-iname build -prune -o ' .
     '! -name \'*.MAK\' ! -name \'.cvsignore\' -print';
 my $update_versions = 0;
 my $create_zips = 1;
-my $package_dest = "/export/anduriltmp/bczar/packages";
+my $package_dest = ".";
 ########
 ######## Process command line args.
 ########
@@ -164,7 +165,7 @@ if ($kit eq 'ace') {
 
 sub which {
     my $command = shift;
-
+    
     my $cmd = `which $command`;
     chomp ($cmd);
     return $cmd;
@@ -192,7 +193,7 @@ my $touch = which ("touch");
 my $whoami = which ("whoami");
 chop (my $now = `$date +"%a %b %d %T %Y"`);
 
-my $log_line = "$now  $ENV{'SIGNATURE'}  <$ENV{'MAILID'}>";
+my $log_line = "$now  $ENV{'SIGNATURE'}  $ENV{'MAILID'}";
 
 # unless ("$controlled_files") {
 #     chomp ($controlled_files = `$make show_controlled_files`);
@@ -261,7 +262,7 @@ if ($update_versions) {
     $status = &check_workspace () ||
 	&get_and_update_versions () ||
         &tag ();
-
+    
     if ($status != 0) {
 	print "Exited with an error!\n";
     }
@@ -289,56 +290,56 @@ if ($update_versions) {
 	    &ex ("$svn export $repo_root/MPC/tags/$kit_tag $stage_dir/ACE_wrappers/MPC") &&
 		die "$0: failed cvs export of MPC in $stage_dir\n";
 	} else {
-	    &ex ("$svn export ./ACE $stage_dir/ACE_wrappers") &&
+	    &ex ("$svn export ./ACE $stage_dir/ACE_wrappers") && 
 		die "$0: failed svn export of ACE to $stage_dir/ACE_wrappers\n";
 	    &ex ("$svn export ./ACE/MPC $stage_dir/ACE_wrappers/MPC") &&
 		die "$0: failed svn export of MPC to $stage_dir/ACE_wrapper/MPC\n";
 	}
-
+	
 	&ex ("cd $stage_dir/ACE_wrappers  &&  $make ACE-INSTALL")  &&
 	    die "$0: failed make ACE-INSTALL in $stage_dir/ACE_wrappers\n";
     }
-
+    
     if ($kit =~ /tao/) {
 	if ("$kit_tag") {
 	    &ex ("$svn export $repo_root/Middleware/tags/$kit_tag/TAO $stage_dir/ACE_wrappers/TAO > /dev/null") &&
 		die "$0: failed cvs export of $kit_tag in $stage_dir\n";
 	} else {
-	    &ex ("$svn export ./TAO $stage_dir/ACE_wrappers/TAO") &&
+	    &ex ("$svn export ./TAO $stage_dir/ACE_wrappers/TAO") && 
 		die "$0: failed svn export of TAO to $stage_dir/ACE_wrappers/TAO\n";
 	}
 	&ex ("cd $stage_dir/ACE_wrappers/TAO  &&  $make TAO-INSTALL")  &&
 	    die "$0: failed make INSTALL in " .
 	    "$stage_dir/ACE_wrappers/TAO\n";
     }
-
+    
     if ($kit =~ /ciao/) {
 	if ("$kit_tag") {
 	    &ex ("$svn export $repo_root/Middleware/tags/$kit_tag/CIAO $stage_dir/ACE_wrappers/TAO/CIAO > /dev/null") &&
 		die "$0: failed cvs export of $kit_tag in $stage_dir\n";
 	} else {
-	    &ex ("$svn export ./CIAO $stage_dir/ACE_wrappers/TAO/CIAO") &&
+	    &ex ("$svn export ./CIAO $stage_dir/ACE_wrappers/TAO/CIAO") && 
 		die "$0: failed svn export of CIAO to $stage_dir/ACE_wrappers/TAO/CIAO\n";
 	}
-
+	
 	&ex ("cd $stage_dir/ACE_wrappers/TAO/CIAO  &&  $make CIAO-INSTALL")  &&
 	    die "$0: failed make INSTALL in " .
 	    "$stage_dir/ACE_wrappers/TAO/CIAO\n";
-
+	
     }
-
+    
     chdir $stage_dir;
-
+    
     print "Creating source-only kits\n";
     $status = &create_kit (1);
 
     print "Generating makefiles\n";
     $status = &generate_makefiles ();
 
-    if ($status != 0) {
-        die "$0: failed to generate GNUmakefiles\n";
-    }
-
+   if ($status != 0) {
+       die "$0: failed to generate GNUmakefiles\n";
+   }
+    
     print "Creating kits with build files\n";
     $status = &create_kit ();
 
@@ -380,7 +381,7 @@ sub check_workspace () {
 	"MPC/trunk checked out as ACE_ROOT/MPC.\n";
 
     if ("$exec_prefix") {
-	print "$svn status $module\n";
+	print "$svn status $module\n";	
     } else {
 	open (SVNSTATUS, "$svn status $module 2>&1 |")  ||
 	    die "$0: unable to open $svn for status\n";
@@ -388,7 +389,7 @@ sub check_workspace () {
 	    next if m%^\? ACE/include/makeinclude/platform_macros.GNU$%;
 	    next if m%^\? ACE/ace/config.h$%;
 	    next if m%^\s*\?\s*ACE/MPC\s*$%;
-
+	    
 	    push (@out_of_date, $_) if "$_";
 	}
 	close SVNSTATUS;
@@ -406,7 +407,7 @@ sub check_workspace () {
 
 sub get_and_update_versions () {
     # Update the version numbers for the various components.
-    my $retval =
+    my $retval = 
 	get_version ("ACE", 1) ||
 	update_version_files ("ACE") ||
 	update_changelog ("ACE") ||
@@ -416,10 +417,10 @@ sub get_and_update_versions () {
 	get_version ("CIAO", 1) ||
 	update_version_files ("CIAO") ||
 	update_changelog ("CIAO");
-
+    
     # Commit changes
     &ex ("$svn commit -m '$log_line'");
-
+    
     $retval = 1 if $? >> 8;
     return $retval;
 }
@@ -428,7 +429,7 @@ sub get_version {
     my $component = shift;
     my $update_version = shift;
     print "Getting version information for $component\n";
-
+    
     open (VERSION, "< $component/VERSION") ||
 	die "$0: unable to open $component/VERSION: $!\n";
     while (<VERSION>) {
@@ -452,7 +453,7 @@ sub get_version {
         }
     }
     close VERSION;
-
+    
     if ($update_version) {
         # Increment the version count
         if ($release_type eq 'beta') {
@@ -461,12 +462,12 @@ sub get_version {
             $comp_versions{"$component" . "_beta"} = 0;
             ++$comp_versions{"$component" . "_minor"};
         } elsif ($release_type eq 'major' ) {
-            $comp_versions{"$component" . "_beta"} =
+            $comp_versions{"$component" . "_beta"} = 
                 $comp_versions{"$component" . "_minor"} = 0;
             ++$comp_versions{"$component" . "_major"};
         }
     }
-
+    
     if ($release_type eq 'beta') {
 	$comp_versions{"$component" . "_version"} =
 	    $comp_versions{"$component" . "_major"} . '.' .
@@ -477,7 +478,7 @@ sub get_version {
 	    $comp_versions{"$component" . "_major"} . '.' .
 	    $comp_versions{"$component" . "_minor"};
     }
-
+    
     return 0;
 }
 
@@ -490,14 +491,14 @@ sub update_version_files {
     print "Updating version files for $component\n";
 
     my $comp_version = $comp_versions{"$component" . "_version"};
-
+    
     chdir $component || die "Unable to chdir to $component\n";
-
+    
     # Needs to be done for all:
     &ex ("perl -pi -e " .
 	 "'s/$component version .*/$component version $comp_version, released $now./' VERSION");
     return 1 if $? >> 8;
-
+    
     if ("$exec_prefix") {
 	print "$component version " . $comp_versions{$component . "_version"} . "\n";
     } else {
@@ -515,15 +516,10 @@ sub update_version_files {
 
             close VERSION_H;
         }
-
+    
     # Component specific PRF.
     if ($component eq "CIAO") {
         # For CIAO we need to add ACE + TAO versions..
-        &ex ("perl -pi -e 's/CIAO VERSION :.*/CIAO VERSION : " .
-	     $comp_versions{"CIAO_version"} .
-	     "/' PROBLEM-REPORT-FORM");
-        return 1 if $? >> 8;
-
         &ex ("perl -pi -e 's/TAO VERSION :.*/TAO VERSION : " .
 	     $comp_versions{"TAO_version"} .
 	     "/' PROBLEM-REPORT-FORM");
@@ -533,22 +529,17 @@ sub update_version_files {
 	     $comp_versions{"ACE_version"} .
 	     "/' PROBLEM-REPORT-FORM");
         return 1 if $? >> 8;
-
+	
 	chdir "../";
     }
 
     if ($component eq "TAO") {
-        &ex ("perl -pi -e 's/TAO VERSION :.*/TAO VERSION : " .
-	     $comp_versions{"TAO_version"} .
-	     "/' PROBLEM-REPORT-FORM");
-        return 1 if $? >> 8;
-
-        &ex ("perl -pi -e 's/ACE VERSION:.*/ACE VERSION: " .
-	     $comp_versions{"ACE_version"} .
+        &ex ("perl -pi -e 's/ACE VERSION:.*/ACE VERSION: " . 
+	     $comp_versions{"ACE_version"} . 
 	     "/' PROBLEM-REPORT-FORM");
         return 1 if $? >> 8;
 
-
+	
 	chdir "../";
     }
 
@@ -557,7 +548,7 @@ sub update_version_files {
 	&ex ("perl -pi -e 's/$component VERSION:.*/$component VERSION: $comp_version/' " .
 	     "PROBLEM-REPORT-FORM");
 	return 1 if $? >> 8;
-
+	    
 	chdir "../";
     }
 
@@ -598,7 +589,7 @@ sub update_changelog {
         || return 1;
     rename "ChangeLog.bak", "ChangeLog"
         || return 1;
-
+    
     chdir "../";
 
     0;
@@ -715,11 +706,12 @@ sub create_kit {
 
     get_version ("ACE_wrappers", 0);
 
-    # Get version but don't update version count
+
+    # Get version but don't udpate version count
     (my $local_ace_tag = $comp_versions{"ACE_wrappers_version"}) =~ s|_|.|g;
 
     my $suffix = "";
-
+    
     if ($src_only) {
 	$suffix = "-src";
     }
@@ -728,17 +720,21 @@ sub create_kit {
 
     #### Create kits with group write permission.
     umask 002;
-
+    
     my $dest = $install  ?  "$export_dir"  :  'created';
     my $dispose = $install  ?  "$mv"  :  'echo';
-    my $checksum = "$md5sum";
+    my $checksum = $install  ?  "$md5sum"  :  'echo';
     my $cksum_ext = 'md5';
     my $redirect = $install  ?  '>'  :  '\>';
     my $shell_cd = $install  ?  'cd'  :  'echo cd';
 
+    
+#    (my $local_tao_tag = $kit_tag) =~ s|_|.|g;
+#    (my $local_ciao_tag = $kit_tag) =~ s|_|.|g;
+
     # These files don't get LF->CRLF conversions done when making the zip.
     my $bin_files =
-        "\"\\.mak|\\.mdp|\\.ide|\\.exe\|\\.ico\|\\.gz\|\\.zip\|\\.xls\|" .
+        "\"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\|\\.ico\|\\.gz\|\\.zip\|\\.xls\|" .
         "\\.sxd|\\.gif|\\.vcp|\\.vcproj|\\.vcw|\\.sln\|\\.dfm\|\\.jpg\|\\.png\|\\.vsd\|\\.bz2\"";
 
     my $build_command;
@@ -791,18 +787,18 @@ sub create_kit {
     &ex ($checksum_command);
 
     if ($kit eq 'ace+tao' || $kit eq 'ace+tao+ciao') {
-        # Set the release files once again
+        # Set the relese files once again
         my $tmp_rel_file = '';
-
+	
 	if ($src_only == 0) {
 	    $status = &bootstrap_autotools ();
-
+	    
 	    if ($status != 0) {
 		die "$0: failed to bootstrap autotools\n";
 	    }
 	}
 
-        chomp ($tmp_rel_file = `$regmake -f $ace_root/Release show_release_files`);
+        chomp ($tmp_rel_file = `$regmake -f $tao_root/Release show_release_files`);
         $release_files = $base_release_files;
         $release_files .= ' ';
         $release_files .= $tmp_rel_file;
@@ -877,12 +873,12 @@ sub create_kit {
             "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip && " .
             "$dispose $package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $dest && " .
             "$dispose $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 $dest && " .
-            "$cp $dest/ACE$suffix.zip $old_versions_dir/ACE$suffix-$local_ace_tag.zip &&".
-            "$cp $dest/ACE$suffix-lib.zip $old_versions_dir/ACE$suffix-$local_ace_tag-lib.zip &&".
-            "$cp $dest/ACE$suffix.tar.gz $old_versions_dir/ACE$suffix-$local_ace_tag.tar.gz &&".
-            "$cp $dest/ACE$suffix-lib.tar.gz $old_versions_dir/ACE$suffix-$local_ace_tag-lib.tar.gz &&".
-            "$cp $dest/ACE$suffix.tar.bz2 $old_versions_dir/ACE$suffix-$local_ace_tag.tar.bz2 &&".
-            "$cp $dest/ACE$suffix-lib.tar.bz2 $old_versions_dir/ACEsuffix-$local_ace_tag-lib.tar.bz2;";
+            "$cp $dest/ACE$suffix.zip $old_versions_dir/$local_ace_tag.zip &&".
+            "$cp $dest/ACE$suffix-lib.zip $old_versions_dir/$local_ace_tag-lib.zip &&".
+            "$cp $dest/ACE$suffix.tar.gz $old_versions_dir/$local_ace_tag.tar.gz &&".
+            "$cp $dest/ACE$suffix-lib.tar.gz $old_versions_dir/$local_ace_tag-lib.tar.gz &&".
+            "$cp $dest/ACE$suffix.tar.bz2 $old_versions_dir/$local_ace_tag.tar.bz2 &&".
+            "$cp $dest/ACE$suffix-lib.tar.bz2 $old_versions_dir/$local_ace_tag-lib.tar.bz2;";
         $archives = " $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz ".
             "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 ";
     }
diff --git a/ACE/bin/mpc.pl b/ACE/bin/mpc.pl
index c547851e21d..c9a7e37d796 100755
--- a/ACE/bin/mpc.pl
+++ b/ACE/bin/mpc.pl
@@ -15,6 +15,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 require 5.006;
 
 use strict;
+use Config;
 use FindBin;
 use File::Spec;
 use File::Basename;
@@ -25,6 +26,7 @@ if ($^O eq 'VMS') {
   $basePath = VMS::Filespec::unixify($basePath);
 }
 $basePath .= '/MakeProjectCreator';
+unshift(@INC, $basePath . '/modules');
 
 my($mpcroot) = $ENV{MPC_ROOT};
 my($mpcpath) = (defined $mpcroot ? $mpcroot :
@@ -48,7 +50,15 @@ if (! -d "$mpcpath/modules") {
   exit(255);
 }
 
-require Driver;
+require MPC;
+
+# ************************************************************
+# Data Section
+# ************************************************************
+
+my(@creators) = ('GNUACEProjectCreator',
+                 'BorlandProjectCreator',
+                );
 
 # ************************************************************
 # Subroutine Section
@@ -62,5 +72,18 @@ sub getBasePath {
 # Main Section
 # ************************************************************
 
-my($driver) = new Driver($basePath, basename($0));
-exit($driver->run(@ARGV));
+## Allocate a driver
+my($driver) = new MPC();
+
+## Add our creators to the front of the list
+my($creators) = $driver->getCreatorList();
+unshift(@$creators, @creators);
+
+## Add the mpc path to the include paths, but preserve
+## the original @ARGV as it is included in the output of
+## most of the workspace creators.
+my(@args) = ('-include', "$mpcpath/config",
+             '-include', "$mpcpath/templates", @ARGV);
+
+## Execute the driver
+exit($driver->execute($basePath, basename($0), \@args));
diff --git a/ACE/bin/msvc_mpc_auto_compile.pl b/ACE/bin/msvc_mpc_auto_compile.pl
index bc190118b9f..e8d33a815c3 100755
--- a/ACE/bin/msvc_mpc_auto_compile.pl
+++ b/ACE/bin/msvc_mpc_auto_compile.pl
@@ -22,9 +22,9 @@ else {
 @ace_core_dirs = ("$ACE_ROOT\\ace",
                   "$ACE_ROOT\\Kokyu",
                   "$ACE_ROOT\\ACEXML",
+                  "$ACE_ROOT\\protocols",
                   "$ACE_ROOT\\examples",
-                  "$ACE_ROOT\\tests",
-                  "$ACE_ROOT\\protocols");
+                  "$ACE_ROOT\\tests");
 
 @tao_core_dirs = ("$ACE_ROOT\\apps",
                   "$ACE_ROOT\\TAO\\TAO_IDL",
diff --git a/ACE/bin/msvc_static_order.lst b/ACE/bin/msvc_static_order.lst
index c8a5171ecd6..23815a851d3 100644
--- a/ACE/bin/msvc_static_order.lst
+++ b/ACE/bin/msvc_static_order.lst
@@ -118,21 +118,12 @@ 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/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib
-TAO/tests/Smart_Proxies/Collocation/SP_Collocation_Idl
 TAO/tests/Smart_Proxies/Collocation/SP_Collocation_TestStubsLib
-TAO/tests/Collocation/Collocation_Idl
 TAO/tests/Collocation/Collocation_Test_Stub
-TAO/tests/Collocation/Collocation_Diamond
-TAO/tests/TransportCurrent/lib/Current_Test_Lib_Idl
-TAO/tests/TransportCurrent/lib/Current_Test_Lib_Client
-TAO/tests/TransportCurrent/lib/Current_Test_Lib_Server
 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
-TAO/examples/RTScheduling/Job
-TAO/examples/RTScheduling/RTSchedSynch
-TAO/examples/RTScheduling/RTSchedTestLib
 tests/Test_Output
 tests/DLL_Test_Parent
 TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib
diff --git a/ACE/bin/mwc.pl b/ACE/bin/mwc.pl
index c547851e21d..607bccbb8bc 100755
--- a/ACE/bin/mwc.pl
+++ b/ACE/bin/mwc.pl
@@ -15,6 +15,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 require 5.006;
 
 use strict;
+use Config;
 use FindBin;
 use File::Spec;
 use File::Basename;
@@ -25,6 +26,7 @@ if ($^O eq 'VMS') {
   $basePath = VMS::Filespec::unixify($basePath);
 }
 $basePath .= '/MakeProjectCreator';
+unshift(@INC, $basePath . '/modules');
 
 my($mpcroot) = $ENV{MPC_ROOT};
 my($mpcpath) = (defined $mpcroot ? $mpcroot :
@@ -48,7 +50,15 @@ if (! -d "$mpcpath/modules") {
   exit(255);
 }
 
-require Driver;
+require MWC;
+
+# ************************************************************
+# Data Section
+# ************************************************************
+
+my(@creators) = ('GNUACEWorkspaceCreator',
+                 'BorlandWorkspaceCreator',
+                );
 
 # ************************************************************
 # Subroutine Section
@@ -62,5 +72,18 @@ sub getBasePath {
 # Main Section
 # ************************************************************
 
-my($driver) = new Driver($basePath, basename($0));
-exit($driver->run(@ARGV));
+## Allocate a driver
+my($driver) = new MWC();
+
+## Add our creators to the front of the list
+my($creators) = $driver->getCreatorList();
+unshift(@$creators, @creators);
+
+## Add the mpc path to the include paths, but preserve
+## the original @ARGV as it is included in the output of
+## most of the workspace creators.
+my(@args) = ('-include', "$mpcpath/config",
+             '-include', "$mpcpath/templates", @ARGV);
+
+## Execute the driver
+exit($driver->execute($basePath, basename($0), \@args));
diff --git a/ACE/bin/tao_orb_tests.lst b/ACE/bin/tao_orb_tests.lst
index 6f65775fa24..9afcd94e43f 100644
--- a/ACE/bin/tao_orb_tests.lst
+++ b/ACE/bin/tao_orb_tests.lst
@@ -5,26 +5,24 @@
 # Each line has its own test, and a test can be followed by a
 # list of configurations it does _not_ run on.
 #
-# Example: TAO\examples\foo\run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
+# Example: TAO\examples\foo\run_test.pl: !MINIMUM !ST
 #
 # NOTE: This file contains tests only for TAO's ORB. Please do not
 # include things like performance-tests, and examples here.
 
-TAO/tests/Bug_2702_Regression/run_test.pl:
 TAO/tests/ORB_Local_Config/Bunch/run_test.pl:
 TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl: SSL !STATIC
-TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl: !ST !STATIC !ACE_FOR_TAO
 TAO/tests/ORB_Local_Config/Separation/run_test.pl:
 TAO/tests/ORB_Local_Config/Service_Dependency/run_test.pl: !ST !STATIC
 TAO/tests/ORB_Local_Config/Shared/run_test.pl:
 TAO/tests/ORB_Local_Config/Simple/run_test.pl:
 TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl: !ST !STATIC
-TAO/tests/Param_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/tests/Param_Test/run_test_dii.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/tests/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/AMI_Timeouts/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/AMH_Exceptions/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
-TAO/tests/AMH_Oneway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
+TAO/tests/Param_Test/run_test.pl: !MINIMUM !ACE_FOR_TAO
+TAO/tests/Param_Test/run_test_dii.pl: !MINIMUM !ACE_FOR_TAO
+TAO/tests/AMI/run_test.pl: !MINIMUM
+TAO/tests/AMI_Timeouts/run_test.pl: !MINIMUM !ST
+TAO/tests/AMH_Exceptions/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
+TAO/tests/AMH_Oneway/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
 TAO/tests/Collocation/run_test.pl: !ACE_FOR_TAO
 TAO/tests/Collocation_Tests/run_test.pl: !ST
 TAO/tests/Collocation_Opportunities/run_test.pl: !ST
@@ -34,74 +32,74 @@ TAO/tests/CollocationLockup/run_test.pl: !ST !DISABLE_ToFix_LynxOS_x86
 TAO/tests/OctetSeq/run_test.pl: !ACE_FOR_TAO
 TAO/tests/OctetSeq/run_test1.pl: !STATIC !ACE_FOR_TAO
 TAO/tests/OctetSeq/run_test2.pl: !STATIC !ACE_FOR_TAO
-TAO/tests/BiDirectional/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
-TAO/tests/BiDirectional/run_test_ipv6.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR
-TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC
-TAO/tests/BiDirectional_DelayedUpcall/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC
+TAO/tests/BiDirectional/run_test.pl: !MINIMUM !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+TAO/tests/BiDirectional/run_test_ipv6.pl: IPV6 !MINIMUM !GIOP10 !DISABLE_BIDIR
+TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC
+TAO/tests/BiDirectional_DelayedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/Leader_Followers/run_test.pl: !ST !ACE_FOR_TAO
 TAO/tests/Leader_Followers/run_test_mt.pl: !ST !ACE_FOR_TAO
 TAO/tests/Multiple_Inheritance/run_test.pl:
-TAO/tests/Bug_1269_Regression/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Bug_1495_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !DISABLE_INTERCEPTORS
+TAO/tests/Bug_1269_Regression/run_test.pl: !Win32 !MINIMUM
+TAO/tests/Bug_1495_Regression/run_test.pl: !MINIMUM !ST !DISABLE_INTERCEPTORS
 TAO/tests/Bug_1568_Regression/run_test.pl: !NO_MESSAGING
 TAO/tests/Bug_1670_Regression/run_test.pl: !NO_MESSAGING
-TAO/tests/Bug_1270_Regression/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_PPC
-TAO/tests/Bug_1020_Basic_Regression/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/Bug_1020_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32
+TAO/tests/Bug_1270_Regression/run_test.pl: !Win32 !MINIMUM !DISABLE_ToFix_LynxOS_PPC
+TAO/tests/Bug_1020_Basic_Regression/run_test.pl: !Win32 !MINIMUM !ST
+TAO/tests/Bug_1020_Regression/run_test.pl: !MINIMUM !ST !Win32
 TAO/tests/Bug_1254_Regression/run_test.pl:
-TAO/tests/Bug_1361_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !IRIX
-TAO/tests/Bug_1482_Regression/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !DISABLE_ToFix_LynxOS_PPC
-TAO/tests/Bug_1551_Regression/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !IRIX
+TAO/tests/Bug_1361_Regression/run_test.pl: !MINIMUM !ST !Win32 !IRIX
+TAO/tests/Bug_1482_Regression/run_test.pl: !VxWorks !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC
+TAO/tests/Bug_1551_Regression/run_test.pl: !VxWorks !MINIMUM !ST !IRIX
 TAO/tests/Bug_1676_Regression/run_test.pl:
 TAO/tests/Bug_2084_Regression/run_test.pl: !ST
-TAO/tests/Bug_2134_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Bug_2174_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Bug_2134_Regression/run_test.pl: !MINIMUM
+TAO/tests/Bug_2174_Regression/run_test.pl: !MINIMUM
 TAO/tests/Bug_2183_Regression/run_test.pl: !ACE_FOR_TAO
-TAO/tests/Bug_2186_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/tests/Bug_2186_Regression/run_test.pl: !MINIMUM !ACE_FOR_TAO
 TAO/tests/Bug_2188_Regression/run_test.pl:
 TAO/tests/Bug_2201_Regression/run_test.pl:
-TAO/tests/Bug_2234_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
+TAO/tests/Bug_2234_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Bug_2289_Regression/run_test.pl:
-TAO/tests/Bug_2319_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+TAO/tests/Bug_2319_Regression/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
 TAO/tests/Bug_2328_Regression/run_test.pl:
 TAO/tests/Bug_2345_Regression/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
 TAO/tests/Bug_2349_Regression/run_test.pl: !DISABLE_ToFix_LynxOS_x86
-TAO/tests/Bug_2417_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/Bug_2429_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Bug_2417_Regression/run_test.pl: !MINIMUM !ST
+TAO/tests/Bug_2429_Regression/run_test.pl: !MINIMUM
 TAO/tests/Bug_2494_Regression/run_test.pl: !ST
 TAO/tests/Bug_2503_Regression/run_test.pl: !ST
 TAO/tests/Bug_2542_Regression/run_test.pl:
 TAO/tests/Bug_2560_Regression/run_test.pl: !ST
-TAO/tests/Bug_2593_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO
+TAO/tests/Bug_2593_Regression/run_test.pl: !MINIMUM !STATIC !ACE_FOR_TAO
 TAO/tests/Bug_2595_Regression/run_test.pl:
-TAO/tests/Bug_2654_Regression/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Bug_2669_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Bug_2654_Regression/run_test.pl: !ST !MINIMUM
+TAO/tests/Bug_2669_Regression/run_test.pl: !MINIMUM
 TAO/tests/Bug_2683_Regression/run_test.pl:
 TAO/tests/Bug_1476_Test/run_test.pl:
-TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/RTCORBA/Client_Protocol/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO
-TAO/tests/RTCORBA/Collocation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/RTCORBA/Explicit_Binding/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO
-TAO/tests/RTCORBA/Linear_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !DISABLE_ToFix_LynxOS_PPC
-TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
-TAO/tests/RTCORBA/ORB_init/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/RTCORBA/Persistent_IOR/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/RTCORBA/Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO  !ST
-TAO/tests/RTCORBA/Policy_Combinations/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
-TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO
-TAO/tests/RTCORBA/Private_Connection/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl: !VxWorks  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !IPV6 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
-TAO/tests/RTCORBA/RTMutex/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO
-TAO/tests/RTCORBA/Thread_Pool/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO
-TAO/tests/RTScheduling/VoidData/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/RTScheduling/Thread_Cancel/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
-TAO/tests/RTScheduling/DT_Spawn/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/RTScheduling/Current/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
-TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC
+TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !ST
+TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !ST
+TAO/tests/RTCORBA/Client_Protocol/run_test.pl: !MINIMUM !IPV6 !ACE_FOR_TAO
+TAO/tests/RTCORBA/Collocation/run_test.pl: !MINIMUM !ST
+TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl: !MINIMUM !ST
+TAO/tests/RTCORBA/Explicit_Binding/run_test.pl: !VxWorks !MINIMUM !IPV6 !ACE_FOR_TAO
+TAO/tests/RTCORBA/Linear_Priority/run_test.pl: !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC
+TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
+TAO/tests/RTCORBA/ORB_init/run_test.pl: !MINIMUM
+TAO/tests/RTCORBA/Persistent_IOR/run_test.pl: !MINIMUM !ST
+TAO/tests/RTCORBA/Policies/run_test.pl: !MINIMUM  !ST
+TAO/tests/RTCORBA/Policy_Combinations/run_test.pl: !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !ST !ACE_FOR_TAO
+TAO/tests/RTCORBA/Private_Connection/run_test.pl: !MINIMUM
+TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl: !VxWorks  !MINIMUM !ST !IPV6 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
+TAO/tests/RTCORBA/RTMutex/run_test.pl: !MINIMUM !ST
+TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !ST
+TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !VxWorks !MINIMUM !IPV6 !ACE_FOR_TAO
+TAO/tests/RTCORBA/Thread_Pool/run_test.pl: !MINIMUM !ST !ACE_FOR_TAO
+TAO/tests/RTScheduling/VoidData/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/RTScheduling/Thread_Cancel/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
+TAO/tests/RTScheduling/DT_Spawn/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/RTScheduling/Current/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
+TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC
 TAO/tests/OBV/Any/run_test.pl:
 TAO/tests/OBV/Collocated/Forward/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
 TAO/tests/OBV/Factory/run_test.pl:
@@ -118,10 +116,10 @@ TAO/tests/Cache_Growth_Test/run_test.pl:
 TAO/tests/Muxing/run_test.pl: !ST
 TAO/tests/Muxed_GIOP_Versions/run_test.pl: !VxWorks !ST !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/MT_Client/run_test.pl: !ST
-TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR
-TAO/tests/File_IO/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !GIOP10 !DISABLE_BIDIR
+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 !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM
 TAO/tests/Connect_Strategy_Test/run_test.pl:
 # DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST !Tru64
 TAO/tests/Server_Leaks/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
@@ -129,119 +127,114 @@ TAO/tests/Smart_Proxies/Policy/run_test.pl: !VxWorks
 TAO/tests/Smart_Proxies/run_test.pl:
 TAO/tests/Smart_Proxies/dtor/run_test.pl:
 TAO/tests/Stack_Recursion/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC
-TAO/tests/Faults/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/CallbackTest/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/CallbackTest/run_test_ipv6.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/CallbackTest/run_test_mixed_ip.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Faults/run_test.pl: !VxWorks !MINIMUM !ST
+TAO/tests/CallbackTest/run_test.pl: !MINIMUM
+TAO/tests/CallbackTest/run_test_ipv6.pl: IPV6 !MINIMUM
+TAO/tests/CallbackTest/run_test_mixed_ip.pl: IPV6 !MINIMUM
+TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM
 # Disabled Crash On Write on Win32, see bugzilla 959 why
 TAO/tests/Crash_On_Write/run_test.pl: !VxWorks !ST !Win32
-TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM
 TAO/tests/NestedUpcall/Simple/run_test.pl: !ST
 TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl: !ST
 TAO/tests/NestedUpcall/Triangle_Test/run_test.pl:
 TAO/tests/Nested_Event_Loop/run_test.pl: !ACE_FOR_TAO
-TAO/tests/POA/Identity/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/POA/Identity/run_test.pl: !MINIMUM
 TAO/tests/POA/Policies/run_test.pl:
 TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl:
 TAO/tests/POA/Persistent_ID/run_test.pl:
-TAO/tests/POA/Etherealization/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/POA/Etherealization/run_test.pl: !MINIMUM
 TAO/tests/POA/Object_Reactivation/run_test.pl: !ST
 TAO/tests/POA/POA_Destruction/run_test.pl:
-TAO/tests/POA/Default_Servant/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/POA/Single_Threaded_POA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
+TAO/tests/POA/Default_Servant/run_test.pl: !MINIMUM
+TAO/tests/POA/Single_Threaded_POA/run_test.pl: !MINIMUM !ST
 TAO/tests/POA/Non_Servant_Upcalls/run_test.pl: !SUNCC5_1
-TAO/tests/POA/MT_Servant_Locator/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/POA/Bug_2511_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
+TAO/tests/POA/MT_Servant_Locator/run_test.pl: !MINIMUM !ST
+TAO/tests/POA/Bug_2511_Regression/run_test.pl: !MINIMUM
+TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl: !MINIMUM !ST
 TAO/tests/POA/Deactivate_Object/run_test.pl
 TAO/tests/POA/Reference_Counting/run_test.pl
 TAO/tests/POA/Current/run_test.pl:
 TAO/tests/POA/wait_for_completion/run_test.pl:
-TAO/tests/POA/POAManagerFactory/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/POA/EndpointPolicy/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/POA/POAManagerFactory/run_test.pl: !MINIMUM
+TAO/tests/POA/EndpointPolicy/run_test.pl: !MINIMUM
 TAO/tests/IORManipulation/run_test.pl:
-TAO/tests/Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/Timed_Buffered_Oneways/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Policies/run_test.pl: !MINIMUM !ST
+TAO/tests/Timeout/run_test.pl: !MINIMUM
+TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !ST
+TAO/tests/Timed_Buffered_Oneways/run_test.pl: !MINIMUM
 TAO/tests/Single_Read/run_test.pl:
-TAO/tests/Connection_Timeout/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/tests/Connection_Timeout/run_test.pl: !VxWorks !MINIMUM !ACE_FOR_TAO
 #TAO/tests/Connection_Failure/run_test.pl ! Timesout for good reasons
-TAO/tests/MProfile_Connection_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/tests/MProfile_Connection_Timeout/run_test.pl: !MINIMUM !ACE_FOR_TAO
 TAO/tests/Codec/run_test.pl:
 TAO/tests/Bug_1693_Test/run_test.pl:
 TAO/tests/IDL_Test/run_test.pl: !NO_MESSAGING
 TAO/tests/ORB_init/run_test.pl:
 TAO/tests/ORB_destroy/run_test.pl:
 TAO/tests/ORB_shutdown/run_test.pl:
-TAO/tests/DSI_Gateway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/DynAny_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/DSI_Gateway/run_test.pl: !MINIMUM
+TAO/tests/DynAny_Test/run_test.pl: !MINIMUM
 TAO/tests/Connection_Purging/run_test.pl: !VxWorks !ST !ACE_FOR_TAO
 TAO/tests/Server_Connection_Purging/run_test.pl: !VxWorks !Win32
-TAO/tests/LongUpcalls/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Reliable_Oneways/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Blocking_Sync_None/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Oneway_Buffering/run_message_count.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Oneway_Buffering/run_buffer_size.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Oneway_Buffering/run_timeout.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Oneway_Buffering/run_timeout_reactive.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Oneway_Timeouts/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO
-TAO/tests/AMI_Buffering/run_message_count.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/AMI_Buffering/run_buffer_size.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/AMI_Buffering/run_timeout.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/AMI_Buffering/run_timeout_reactive.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/Big_AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/LongUpcalls/run_test.pl: !VxWorks !MINIMUM
+TAO/tests/Reliable_Oneways/run_test.pl: !MINIMUM
+TAO/tests/Blocking_Sync_None/run_test.pl: !MINIMUM
+TAO/tests/Oneway_Buffering/run_message_count.pl: !MINIMUM
+TAO/tests/Oneway_Buffering/run_buffer_size.pl: !MINIMUM
+TAO/tests/Oneway_Buffering/run_timeout.pl: !MINIMUM
+TAO/tests/Oneway_Buffering/run_timeout_reactive.pl: !MINIMUM
+TAO/tests/Oneway_Timeouts/run_test.pl: !MINIMUM !NO_MESSAGING !ACE_FOR_TAO
+TAO/tests/AMI_Buffering/run_message_count.pl: !MINIMUM !ST
+TAO/tests/AMI_Buffering/run_buffer_size.pl: !MINIMUM !ST
+TAO/tests/AMI_Buffering/run_timeout.pl: !MINIMUM !ST
+TAO/tests/AMI_Buffering/run_timeout_reactive.pl: !MINIMUM !ST
+TAO/tests/Big_AMI/run_test.pl: !MINIMUM
 TAO/tests/Big_Oneways/run_test.pl: !ST
 TAO/tests/Big_Twoways/run_test.pl: !ST
 TAO/tests/Big_Reply/run_test.pl: !ST
-TAO/tests/Big_Request_Muxing/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Big_Request_Muxing/run_test.pl: !ST !MINIMUM
 TAO/tests/Oneways_Invoking_Twoways/run_test.pl: !ST
 TAO/tests/Queued_Message_Test/run_test.pl:
 TAO/tests/DLL_ORB/run_test.pl: !STATIC
-TAO/tests/InterOp-Naming/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/InterOp-Naming/run_test.pl: !MINIMUM
 TAO/tests/Multiple/run_test.pl: !VxWorks !SUNCC5_1
-TAO/tests/Exposed_Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO
-TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
-TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
-TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
-TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
-TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
-TAO/tests/Portable_Interceptors/Dynamic/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !GIOP10
-TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !HAS_EXTENDED_FT_INTERCEPTORS
-TAO/tests/Portable_Interceptors/PICurrent/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Slot/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Redirection/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/ORT/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
+TAO/tests/Exposed_Policies/run_test.pl: !MINIMUM !ST !ACE_FOR_TAO
+TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
+TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
+TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
+TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
+TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
+TAO/tests/Portable_Interceptors/Dynamic/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !GIOP10
+TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !HAS_EXTENDED_FT_INTERCEPTORS
+TAO/tests/Portable_Interceptors/PICurrent/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/AMI/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Slot/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/ORT/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Object_Loader/run_test.pl: !VxWorks !STATIC
 TAO/tests/Two_Objects/run_test.pl: !ST
-TAO/tests/TransportCurrent/Framework/run_test.pl -dynamic: !STATIC !DISABLE_INTERCEPTORS !MINIMUM
-TAO/tests/TransportCurrent/Framework/run_test.pl -static: STATIC !DISABLE_INTERCEPTORS !MINIMUM
-TAO/tests/TransportCurrent/IIOP/run_test.pl -dynamic: !STATIC !DISABLE_INTERCEPTORS !MINIMUM
-TAO/tests/TransportCurrent/IIOP/run_test.pl -static: STATIC !DISABLE_INTERCEPTORS !MINIMUM
 TAO/tests/UNKNOWN_Exception/run_test.pl: Exceptions
 TAO/tests/Native_Exceptions/run_test.pl: Exceptions
-TAO/tests/Servant_To_Reference_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
+TAO/tests/Servant_To_Reference_Test/run_test.pl: !MINIMUM !ST
 TAO/tests/Sequence_Unit_Tests/run_test.pl:
 TAO/tests/Typedef_String_Array/run_test.pl:
-TAO/tests/Bug_1535_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Bug_1535_Regression/run_test.pl: !MINIMUM
 TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl:
 TAO/tests/CodeSets/simple/run_test.pl: !VxWorks !GIOP10 !STATIC
 TAO/tests/Hang_Shutdown/run_test.pl: !ST !ACE_FOR_TAO
-TAO/tests/Any/Recursive/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Any/Recursive/run_test.pl:
 TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl: !ST !VxWorks
 TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl: !ST !VxWorks
 TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote: !ST !VxWorks
@@ -271,6 +264,5 @@ TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: !STATIC !ST !VxWorks
 TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: !ST !VxWorks
 TAO/tests/Permanent_Forward/run_test.pl:
 TAO/tests/Parallel_Connect_Strategy/run_test.pl:
-TAO/tests/DII_Collocation_Tests/oneway/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/DII_Collocation_Tests/twoway/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Compression/run_test.pl: ZLIB
+TAO/tests/DII_Collocation_Tests/oneway/run_test.pl: !ST !MINIMUM
+TAO/tests/DII_Collocation_Tests/twoway/run_test.pl: !ST !MINIMUM
diff --git a/ACE/bin/tao_other_tests.lst b/ACE/bin/tao_other_tests.lst
index 4b9d8a0be31..61dbeef9e75 100644
--- a/ACE/bin/tao_other_tests.lst
+++ b/ACE/bin/tao_other_tests.lst
@@ -5,137 +5,136 @@
 # Each line has its own test, and a test can be followed by a
 # list of configurations it does _not_ run on.
 #
-# Example: TAO\examples\foo\run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
+# Example: TAO\examples\foo\run_test.pl: !MINIMUM !ST
 #
 # NOTE: This file contains examples and other service level test  for
 # TAO's. Please do not include regular tests here.
-TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS
-#TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !STATIC !Win32 !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !MINIMUM !ST !Win32 !ACE_FOR_TAO !OpenVMS
+#TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl: !MINIMUM !ST !STATIC !Win32 !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32 !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000: !Win32 !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/AMI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/DSI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/DII/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Latency/Deferred/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Latency/AMI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !ST !Win32 !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Latency/DSI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32 !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Latency/DII/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32 !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Latency/Deferred/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32 !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Throughput/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !OpenVMS
-TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !Win32 !ACE_FOR_TAO !OpenVMS
-TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !SUNCC5_1 !ACE_FOR_TAO
-TAO/examples/POA/POA_BiDir/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_BIDIR
-TAO/examples/POA/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/examples/POA/Default_Servant/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/examples/POA/Explicit_Activation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/examples/POA/FindPOA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/examples/POA/Forwarding/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/examples/POA/NewPOA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/examples/POA/On_Demand_Activation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO
-TAO/examples/POA/On_Demand_Loading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !KCC_Linux !ACE_FOR_TAO
-TAO/examples/POA/Reference_Counted_Servant/run_test.pl: !SUNCC5_1 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/examples/POA/Loader/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !KCC_Linux !ACE_FOR_TAO
+TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !Win32 !OpenVMS
+TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !STATIC !Win32 !ACE_FOR_TAO !OpenVMS
+TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM !SUNCC5_1 !ACE_FOR_TAO
+TAO/examples/POA/POA_BiDir/run_test.pl: !MINIMUM !DISABLE_BIDIR
+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 !ACE_FOR_TAO
+TAO/examples/POA/FindPOA/run_test.pl: !MINIMUM
+TAO/examples/POA/Forwarding/run_test.pl: !MINIMUM
+TAO/examples/POA/NewPOA/run_test.pl: !MINIMUM
+TAO/examples/POA/On_Demand_Activation/run_test.pl: !MINIMUM !STATIC !ACE_FOR_TAO
+TAO/examples/POA/On_Demand_Loading/run_test.pl: !MINIMUM !STATIC !KCC_Linux !ACE_FOR_TAO
+TAO/examples/POA/Reference_Counted_Servant/run_test.pl: !SUNCC5_1 !MINIMUM !ACE_FOR_TAO
+TAO/examples/POA/Loader/run_test.pl: !MINIMUM !STATIC !KCC_Linux !ACE_FOR_TAO
 TAO/examples/POA/RootPOA/run_test.pl
 TAO/examples/Simple/bank/run_test.pl: !NO_MESSAGING
 TAO/examples/Simple/grid/run_test.pl: !NO_MESSAGING
 TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING !Win32
 TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING !Win32
-TAO/examples/Quoter/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO
-TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !SUNCC5_1 !ACE_FOR_TAO
+TAO/examples/Quoter/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32 !ACE_FOR_TAO
+TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !SUNCC5_1 !ACE_FOR_TAO
 TAO/examples/PluggableUDP/tests/Basic/run_test.pl: !STATIC !ST !NO_DIOP !ACE_FOR_TAO
 TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl: !NO_DIOP !ACE_FOR_TAO
-TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
-TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
-TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p SCTP_SEQ: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO SCTP !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
-TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
-TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
-#TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-#TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p SCTP_SEQ: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO SCTP !ACE_FOR_TAO
-TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO SCTP !ACE_FOR_TAO
-TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
-TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl: !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+#TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl: !MINIMUM !ACE_FOR_TAO
+#TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl: !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl: !LynxOS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl: !NO_IFR !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !SUNCC5_1
-TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC
-TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl: !LynxOS !MINIMUM !NO_MESSAGING !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl: !MINIMUM !NO_MESSAGING !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl: !NO_IFR !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl: !MINIMUM !ST !NO_MESSAGING
+TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl: !MINIMUM !STATIC !SUNCC5_1
+TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl: !MINIMUM !STATIC
+TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl: !ST !MINIMUM !ACE_FOR_TAO
 TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC
-TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO
-TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !SUNCC5_1
-TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl:
-TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Event/UDP/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !NO_DIOP
-TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
-TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
-TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl: !NO_MCAST !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl:!MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl:!MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl:!MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_2137_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !STATIC !ACE_FOR_TAO
-TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO
-TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO
-TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO
-TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO
-TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/run_test.pl both_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/run_test.pl nestea_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/run_test.pl nt_service_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO Win32 !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/run_test.pl shutdown: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/run_test.pl perclient: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_EXCEPTIONS !ACE_FOR_TAO
-TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO
-TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO
-TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO
+TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !NO_MESSAGING !ACE_FOR_TAO
+TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM !SUNCC5_1
+TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Event/UDP/run_test.pl: !MINIMUM !ACE_FOR_TAO !NO_DIOP
+TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
+TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl:!ST !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_2137_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:  !MINIMUM !NO_IFR !STATIC !ACE_FOR_TAO
+TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl:  !MINIMUM !NO_IFR !ACE_FOR_TAO
+TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl:  !MINIMUM !NO_IFR !ACE_FOR_TAO
+TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl:  !MINIMUM !NO_IFR !ACE_FOR_TAO
+TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl:  !MINIMUM !NO_IFR !ACE_FOR_TAO
+TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl:  !MINIMUM !NO_IFR !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/run_test.pl both_ir: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/run_test.pl nestea_ir: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_ir: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/run_test.pl nt_service_ir: !MINIMUM Win32 !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/run_test.pl shutdown: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/run_test.pl perclient: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: !MINIMUM !NO_EXCEPTIONS !ACE_FOR_TAO
+TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !STATIC !ST !ACE_FOR_TAO
+TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO
+TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !ST !NO_MESSAGING !ACE_FOR_TAO
 TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.reactive.conf: IPV6 !ST !NO_MESSAGING !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.mt.conf: IPV6 !ST !NOTIFY !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.rt.conf: IPV6 !ST !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
-TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
-TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
-TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IRIX !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
-TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.reactive.conf: IPV6 !ST !NO_MESSAGING !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.mt.conf: IPV6 !ST !NOTIFY !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.rt.conf: IPV6 !ST !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !IRIX !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl: !ST !NO_MESSAGING !MINIMUM !STATIC !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl: !ST !NO_MESSAGING !MINIMUM !STATIC !ACE_FOR_TAO
 TAO/orbsvcs/tests/EC_Mcast/run_test.pl: !NO_MCAST !NO_MESSAGING !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
 # FAILS 'TAO/orbsvcs/tests/EC_Multiple/run_test.pl
 # NO REDIRECTION TAO/examples/Simple/echo/run_test.pl < Echo.idl
@@ -150,16 +149,15 @@ TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: !ST SSL !STATIC !DISABLE_INT
 #Bug 1647. run_test_harsh.pl takes 5 minutes; but there aren't many SSL builds
 TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !SUNCC5_1 !NO_MCAST
+TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !STATIC !SUNCC5_1 !NO_MCAST
 # The following 2 tests use dynamic loading to change the default reactor on Windows
-TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO
-TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO
-TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !NO_LOADAVG !DISABLE_ToFix_LynxOS_x86
-TAO/examples/RTCORBA/Activity/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO
-TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS  !STATIC !ST !ACE_FOR_TAO
-TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ST !ACE_FOR_TAO
+TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO
+TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO
+TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !NO_LOADAVG !DISABLE_ToFix_LynxOS_x86
+TAO/examples/RTCORBA/Activity/run_test.pl: !MINIMUM !ST !ACE_FOR_TAO
+TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS  !STATIC !ST !ACE_FOR_TAO
+TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ST !ACE_FOR_TAO
 TAO/examples/ior_corbaloc/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO
 TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO
 TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO
-TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: IPV6 !NO_MCAST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: IPV6 !MINIMUM
diff --git a/ACE/bin/vx_repo_link.pl b/ACE/bin/vx_repo_link.pl
deleted file mode 100755
index b4ec5f82ed8..00000000000
--- a/ACE/bin/vx_repo_link.pl
+++ /dev/null
@@ -1,217 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-#
-# $Id$
-#
-
-
-use FindBin;
-use lib $FindBin::Bin;
-
-use diagnostics;
-use Time::Local;
-use File::Basename;
-use File::Spec;
-use FileHandle;
-use Cwd;
-
-my $VXDEBUG = (defined $ENV{'VX_REPO_LINK_DEBUG'}) ? $ENV{'VX_REPO_LINK_DEBUG'} : 0;
-my $ace_root = $ENV{'ACE_ROOT'};
-$ace_root =~ s/\//\\/g;
-my $wind_base = $ENV{'WIND_BASE'};
-$wind_base =~ s/\//\\/g;
-my $AR = $ENV{'AR'};
-my $RANLIB = $ENV{'RANLIB'};
-my @lib_arr;
-my $lib;
-my $curdir = cwd();
-$curdir =~ s/\//\\/g;
-
-
-if ($VXDEBUG > 1)
-{
-  print STDERR "AR = ". $AR . "\n";
-  print STDERR "ACE_ROOT = " . $ace_root . "\n";
-  print STDERR "WIND_BASE = " . $wind_base, "\n";
-  print STDERR "curdir = " . $curdir, "\n";
-}
-
-if ($VXDEBUG > 1) {
-  print STDERR "LINKLIBS are:\n";
-}
-
-while ($#ARGV >= 0)
-{
-    if ($ARGV[0] =~ /^-l/) {
-        $lib = shift;
-        $lib =~ s/^-l//;
-        if ($VXDEBUG > 1) {
-          print STDERR $ace_root."/lib/lib".$lib.".a\n";
-        }
-        push @lib_arr, $lib;
-    }
-}
-
-my @lib_registry = ();
-
-my $LINKLIBS = "";
-
-my $libobj_dir = ".lib";
-system("if not exist ".$libobj_dir." mkdir ".$libobj_dir);
-foreach $lib (@lib_arr) {
-  my $libname = $ace_root."\\lib\\lib".$lib.".a";
-  if (-e $libname) {
-    if (! -e $libobj_dir."\\lib".$lib.".a") {
-      if ($VXDEBUG) {
-        print STDERR "Unpacking ".$lib."...\n";
-      }
-      system("cmd /c if exist ".$libobj_dir."\\".$lib." del /q/f ".$libobj_dir."\\".$lib."\\*.*");
-      system("cmd /c (mkdir ".$libobj_dir."\\".$lib." && cd ".$libobj_dir."\\".$lib." && ".$AR." -x ".$libname." && cd ".$curdir.")");
-
-      if ($VXDEBUG) {
-        print STDERR "Processing ".$lib."...\n";
-      }
-
-      my @rpo_arr = glob ($libobj_dir."\\".$lib."\\*.rpo");
-
-      if ($VXDEBUG > 1) {
-        print STDERR "Read #".$#rpo_arr." filenames\n";
-      }
-
-      my $line;
-      my $fh;
-      my $newfh;
-      my $module;
-      foreach $rpo (@rpo_arr) {
-        if ($VXDEBUG > 2) {
-          print STDERR $rpo."\n";
-        }
-        $fh = new FileHandle();
-        $newfh = new FileHandle();
-        $module = basename($rpo, ".rpo");
-        open ($newfh, '>', dirname($rpo)."\\".$module.".__rpo");
-        open ($fh, '<', $rpo);
-        while (defined ($line = readline $fh)) {
-          if ($line =~ /^M /) {
-            $line =~ s/\//\\/g;
-          }
-          elsif ($line =~ /^D /) {
-            $line =~ s/(^D[ ])(.*ACE_wrappers)(.*)/${1}$ace_root${3}/;
-            $line =~ s/\//\\/g;
-          }
-          elsif ($line =~ /^A /) {
-            $line =~ s/('-I)([^ ]*ACE_wrappers)([']|[^']+')/${1}$ace_root${3}/g;
-            $line =~ s/('-I)([^ ]*Tornado[^\/\\]+)([']|[^']+')/${1}$wind_base${3}/g;
-            $line =~ s/('-o' )('.*')/'-o' '$curdir\/$libobj_dir\/$lib\/$module.o'/g;
-            $line =~ s/\//\\/g;
-          }
-          print $newfh $line;
-        }
-        close ($fh);
-        close ($newfh);
-
-        system("cmd /c (del /f/q ".$rpo." && rename ".dirname($rpo)."\\".$module.".__rpo ".basename($rpo).")");
-      }
-
-      $fh = new FileHandle();
-      open($fh, '<', $libobj_dir."\\".$lib."\\.prelink.spec");
-      my $lnkcmd = readline($fh);
-      my $arcmd = readline($fh);
-      my $libdeps = readline($fh);
-      close($fh);
-
-      $lib_registry[++$#lib_registry] = {
-        lib => $lib,
-        linkcmd => $lnkcmd,
-        arcmd => $arcmd,
-        libdeps => (defined $libdeps ? $libdeps : '')
-      };
-    }
-
-    $LINKLIBS = $LINKLIBS." ".$libobj_dir."\\lib".$lib.".a";
-  }
-  else {
-    $LINKLIBS = "-l".$lib." ".$LINKLIBS;
-  }
-}
-
-sub _find_lib_entry
-{
-  my $lib = shift;
-  foreach my $reg (@lib_registry) {
-    if ($reg->{lib} =~ /(^| )$lib( |$)/) {
-      return $reg;
-    }
-  }
-  return undef;
-}
-
-sub _prelink_lib
-{
-  my $lentry = shift;
-  my $stack = shift;
-  my $lib = $lentry->{lib};
-  my $lnkcmd = $lentry->{linkcmd};
-  my $arcmd = $lentry->{arcmd};
-  my @deps = split(' ', $lentry->{libdeps});
-
-  $lnkcmd =~ s/\n//g;
-  $arcmd =~ s/\n//g;
-
-  if ($VXDEBUG) {
-    print STDERR "Prelink requested for ".$lib." (dependend on ".join(' ', @deps).")...\n";
-  }
-
-  # check dependencies
-  foreach my $dep (@deps) {
-    if ($VXDEBUG > 1) {
-      print STDERR "  Checking dependency ".$dep."(stack = ".$stack.")...\n";
-    }
-    if (($stack !~ /\<$dep\>/) && !(-e $libobj_dir."\\lib".$dep.".a")) {
-      my $le = _find_lib_entry ($dep);
-      if (defined $le) {
-        _prelink_lib ($le, $stack." <".$lib.">");
-      }
-    }
-  }
-
-  # prelink library
-  if ($VXDEBUG) {
-    print STDERR "Prelinking ".$lib."...\n";
-  }
-
-  my $objs = join(' ', glob ($libobj_dir."\\".$lib."\\*.o"));
-  my $libs = join(' ', glob ($libobj_dir."\\*.a"));
-  if ($VXDEBUG > 1) {
-    print STDERR " > cmd /c ".$lnkcmd." ".$libobj_dir."\\.prelink_lib ".$objs." ".$libs."\n";
-  }
-  system("cmd /c ".$lnkcmd." ".$libobj_dir."\\.prelink_lib ".$objs." ".$libs);
-  system("cmd /c del /f/q ".$libobj_dir."\\.prelink_lib");
-
-  # build prelinked library
-  if ($VXDEBUG) {
-    print STDERR "Building prelinked lib ".$lib."...\n";
-  }
-
-  $arcmd =~ s/lib$lib/$libobj_dir\\lib$lib/;
-  #$arcmd = $AR." r ".$libobj_dir."\\lib".$lib.".a";
-  $arcmd =~ s/ rv / rc /g;
-  if ($VXDEBUG > 1) {
-    print STDERR "cmd /c echo ".$objs." | ".$arcmd."\n";
-    print STDERR "cmd /c (".$RANLIB." ".$libobj_dir."\\lib".$lib.".a && rmdir /s/q ".$libobj_dir."\\".$lib.")"."\n";
-  }
-  system("cmd /c echo ".$objs." | ".$arcmd);
-  system("cmd /c (".$RANLIB." ".$libobj_dir."\\lib".$lib.".a && rmdir /s/q ".$libobj_dir."\\".$lib.")");
-}
-
-foreach my $libentry (@lib_registry) {
-  if (! -e $libobj_dir."\\lib".$libentry->{lib}.".a") {
-    _prelink_lib ($libentry, "");
-  }
-}
-
-print $LINKLIBS."\n";
-
-1;
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 3d61783c164..8d95e990321 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -11,7 +11,7 @@ dnl
 dnl Note that this macro removes the newline output by the M4
 dnl "esyscmd" built-in.  Unless you understand what you're doing,
 dnl particularly with M4, do not modify this macro definition.
-define([ACE_VERSION], patsubst(esyscmd(grep ACE_VERSION ace/Version.h | sed 's/.*\" *\(.*\)\".*/\1/'), [
+define([ACE_VERSION], patsubst(esyscmd(grep ACE_VERSION ace/Version.h | sed 's/.*\"\(.*\)\".*/\1/'), [
 ]))dnl remove newline ending every `esyscmd' answer
 
 AC_INIT([ACE],
@@ -210,7 +210,7 @@ dnl Determine which subsets to build
 dnl This is done using the autoconf "--enable-foobar" mechanism.
 ACE_CHECK_SUBSETS
 
-dnl Some of the third party libraries (X11, openssl, etc.) depend on
+dnl Some of the third party libraries (X11, openssl, etc.) depend on 
 dnl other libraries.  Check for those before the processing --enable
 dnl options.
 
@@ -492,7 +492,7 @@ AC_CHECK_HEADER([dlfcn.h],
 
      case "$host_os" in
      darwin*)
-	AC_DEFINE([ACE_LD_SEARCH_PATH],
+	AC_DEFINE([ACE_LD_SEARCH_PATH], 
 		  [ACE_LIB_TEXT ("DYLD_LIBRARY_PATH")],
 		  [Define to environment variable used for DLL search path])
 	AC_DEFINE([ACE_DLL_SUFFIX],
@@ -664,7 +664,7 @@ dnl Test for <sys/types.h> out of alphabetical order, since it must
 dnl be (conditionally) #included in other feature tests.
 ACE_CHECK_LACKS_HEADERS(sys/types.h)
 
-ACE_CHECK_LACKS_HEADERS(sys/sysctl.h, [], [],
+ACE_CHECK_LACKS_HEADERS(sys/sysctl.h, [], [], 
 [
 #ifndef ACE_LACKS_SYS_TYPES_H
 # include <sys/types.h>
@@ -1167,32 +1167,6 @@ AC_CHECK_TYPE([sig_atomic_t],
 	      [],
 	      [#include <signal.h>])
 
-AC_CHECK_TYPE([sigval_t],
-	      [],
-	      [AC_DEFINE([ACE_LACKS_SIGVAL_T], 1,
-			 [Define to 1 if the system lacks the type 'sigval_t'.])],
-	      [#include <signal.h>])
-
-if test "$ac_cv_type_sigval_t" = yes; then
-  dnl Depending on the system, the field names of union sigval have
-  dnl either a sival_ (POSIX) or sigval_ (older versions of FreeBSD)
-  dnl prefix.  Define ACE_HAS_SIGVAL_SIGVAL_INT accordingly.
-  AC_CHECK_MEMBER([sigval_t.sigval_int],
-		  [AC_DEFINE([ACE_HAS_SIGVAL_SIGVAL_INT], 1,
-			     [Define to 1 if `sigval_int' is a member of `sigval_t'.])],
-		  [],
-		  [#include <signal.h>])
-
-  dnl Depending on the system, the field names of union sigval have
-  dnl either a sival_ (POSIX) or sigval_ (older versions of FreeBSD)
-  dnl prefix.  Define ACE_HAS_SIGVAL_SIGVAL_PTR accordingly.
-  AC_CHECK_MEMBER([sigval_t.sigval_ptr],
-		  [AC_DEFINE([ACE_HAS_SIGVAL_SIGVAL_PTR], 1,
-			     [Define to 1 if `sigval_ptr' is a member of `sigval_t'.])],
-		  [],
-		  [#include <signal.h>])
-fi
-
 AC_CHECK_TYPE([ssize_t],
 	      [AC_DEFINE([ACE_HAS_SSIZE_T], 1,
 			 [Define to 1 if the system has the type `ssize_t'.])],
@@ -1389,7 +1363,6 @@ if test "$ac_cv_type_siginfo_t" = yes; then
 #endif])
 fi
 
-
 dnl Some platforms need to include sys/types.h before sys/socket.h
 dnl in order for struct msghdr to work.
 dnl Check for msghdr structure.
@@ -1988,13 +1961,17 @@ AC_CHECK_TYPE([uint64_t],
 #include <inttypes.h>
 #endif])
 
-ACE_CACHE_CHECK([for std::numeric_limits<>],
-[ace_cv_func_numeric_limits],
+AC_CACHE_CHECK([for std::numeric_limits<>],
+[ace_func_numeric_limits],
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <limits>],
 		  [return std::numeric_limits<int>::max();])],
 		  [ace_cv_func_numeric_limits=yes],
-		  [ace_cv_func_numeric_limits=no])
-],,[AC_DEFINE([ACE_LACKS_NUMERIC_LIMITS])])
+		  [ace_cv_func_numeric_limits=no])])
+if test $ace_cv_func_numeric_limits = no; then
+  AC_DEFINE([ACE_LACKS_NUMERIC_LIMITS], 1,
+	    [Define to 1 if platfom lacks std::numeric_limits<>.])
+fi
+
 
 dnl Other checks
 
@@ -2407,7 +2384,7 @@ ACE_CACHE_CHECK([for C++ typename keyword],
   ],
   [AC_DEFINE([ACE_HAS_TYPENAME_KEYWORD])],
   [
-   AC_MSG_WARN([$CXX does not support the C++ "typename" keyword.
+   AC_MSG_WARN([$CXX does not support the C++ \"typename\" keyword.
 ACE will require it in the near future.])
   ])
 
@@ -3551,16 +3528,6 @@ ACE_CHECK_LACKS_FUNCS(inet_aton)
 
 ACE_CHECK_LACKS_FUNCS(isatty)
 
-AC_CHECK_FUNC(isastream)
-if test $ac_cv_func_isastream = yes; then
-  AC_CHECK_DECL([isastream],
-                [AC_DEFINE([ACE_HAS_ISASTREAM_PROTOTYPE], 1,
-                           [Define to 1 if platform has the declaration
-                            of isastream().])],
-                [],
-                [#include <stropts.h>])
-fi
-
 ACE_CHECK_HAS_FUNCS(itoa)
 
 dnl Check for 64 bit llseek() or lseek64()
@@ -3596,27 +3563,7 @@ fi
 
 ACE_CHECK_HAS_FUNCS(memchr)
 
-ACE_CHECK_LACKS_FUNCS(mkfifo)
-
-ACE_CHECK_LACKS_FUNCS(mkstemp)
-if test $ac_cv_func_mkstemp = yes; then
-  AC_CHECK_DECL([mkstemp],
-                [],
-                [AC_DEFINE([ACE_LACKS_MKSTEMP_PROTOTYPE], 1,
-                           [Define to 1 if platform lacks the declaration
-                           of mkstemp().])],
-                [#include <stdlib.h>])
-fi
-
-ACE_CHECK_LACKS_FUNCS(mktemp)
-if test $ac_cv_func_mktemp = yes; then
-  AC_CHECK_DECL([mktemp],
-                [],
-                [AC_DEFINE([ACE_LACKS_MKTEMP_PROTOTYPE], 1,
-                           [Define to 1 if platform lacks the declaration
-                           of mktemp().])],
-                [#include <stdlib.h>])
-fi
+ACE_CHECK_LACKS_FUNCS(mkfifo mkstemp mktemp)
 
 ACE_CHECK_LACKS_FUNCS(msync mprotect)
 
@@ -3624,8 +3571,6 @@ ACE_CHECK_LACKS_FUNCS(pipe)
 
 ACE_CHECK_LACKS_FUNCS(qsort)
 
-ACE_CHECK_LACKS_FUNCS(realpath)
-
 ACE_CHECK_LACKS_FUNCS(setegid seteuid setgid)
 
 ACE_CHECK_LACKS_FUNCS([setpgid])
@@ -3708,7 +3653,7 @@ ACE_CHECK_HAS_FUNCS(strnlen)
 
 ACE_CHECK_LACKS_FUNCS(strchr)
 
-# believe it or not, both ACE_LACKS_STRERROR and ACE_HAS_STRERROR
+# believe it or not, both ACE_LACKS_STRERROR and ACE_HAS_STRERROR 
 # feature test macros are currently used.
 ACE_CHECK_HAS_FUNCS(strerror)
 ACE_CHECK_LACKS_FUNCS(strerror)
@@ -4149,64 +4094,18 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
           [
            AC_DEFINE([ACE_HAS_SHM_OPEN])
            AC_MSG_RESULT([yes])
-
-           dnl Now see if running it requires a leading slash.
-           ACE_CACHE_CHECK([if shm_open requires one slash],
-             [ace_cv_shm_open_requires_one_slash],
-             [
-              AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-int main (int argc, char *argv[])
-{
-  const char name[] = "ACE_Foo";
-  const char name2[] = "/ACE_Foo";
-  const int oflag = O_RDWR | O_CREAT;
-  const mode_t mode = 0400;  /* Whatever */
-  int fd = shm_open (name, oflag, mode);
-  if (fd != -1)
-  {
-    close (fd);
-    shm_unlink (name);
-    return 1;    /* Don't need the slash */
-  }
-  fd = shm_open (name2, oflag, mode);
-  if (fd != -1)
-  {
-    close (fd);
-    shm_unlink (name2);
-    return 0;
-  }
-  return 1;  /* Nothing worked, so say 'no' */
-}
-              ]])],[
-               ace_cv_shm_open_requires_one_slash=yes
-              ],[
-               ace_cv_shm_open_requires_one_slash=no
-              ],[
-               dnl action if cross-compiling
-               ace_cv_shm_open_requires_one_slash=no
-              ])
-           ],AC_DEFINE([ACE_SHM_OPEN_REQUIRES_ONE_SLASH]),)
           ],
           [
            AC_MSG_RESULT([no])
           ])
 
-dnl if test "$ace_cv_shm_open_requires_one_slash" = yes; then
-dnl   AC_DEFINE([ACE_SHM_OPEN_REQUIRES_ONE_SLASH])
-dnl fi
-
 ACE_CHECK_HAS_FUNCS(snprintf)
 
 ACE_CHECK_LACKS_FUNCS(tempnam truncate)
 
+dnl Check for MIT pthreads APIs for timed send/recv operations
+ACE_CHECK_HAS_FUNCS(read_timedwait readv_timedwait recv_timedwait recvfrom_timedwait recvmsg_timedwait send_timedwait sendmsg_timedwait sendto_timedwait write_timedwait writev_timedwait)
+
 dnl Save the cache for debugging purposes
 AC_CACHE_SAVE
 
@@ -4368,15 +4267,6 @@ dnl backwards compatibility with Pthread Draft 4 functions of the same
 dnl name.
 
   ACE_CHECK_LACKS_FUNCS(pthread_sigmask)
-  if test $ac_cv_func_pthread_sigmask = yes; then
-    AC_CHECK_DECL([pthread_sigmask],
-		  [AC_DEFINE([ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE], 1,
-			     [Define to 1 if platform has the declaration
-			     of pthread_sigmask().])],
-		  [],
-		  [#include <pthread.h>
-                   #include <signal.h>])
-  fi
 
   AC_CHECK_FUNC([pthread_key_create],
     [AC_DEFINE([ACE_HAS_THREAD_SPECIFIC_STORAGE])],
@@ -4534,9 +4424,9 @@ dnl Check for Unix98 pthreads extensions
 
 dnl Linux's sched_{set,get}affinity interface has changed three times:
 dnl
-dnl In glibc 2.3.2, it was:
+dnl In glibc 2.3.2, it was: 
 dnl
-dnl   int sched_setaffinity(pid_t __pid,
+dnl   int sched_setaffinity(pid_t __pid, 
 dnl                         unsigned int __len, unsigned long * __mask);
 dnl
 dnl In glibc 2.3.3, it was changed to:
@@ -4545,7 +4435,7 @@ dnl   int sched_setaffinity(pid_t __pid, const cpu_set_t* __mask);
 dnl
 dnl And in glibc ?.?.?, it was changed again to:
 dnl
-dnl   int sched_setaffinity(pid_t __pid, size_t __cpusetsize,
+dnl   int sched_setaffinity(pid_t __pid, size_t __cpusetsize, 
 dnl                         const cpu_set_t* __cpuset);
 dnl
 dnl The following feature tests attempt to determine which (if any)
@@ -4591,7 +4481,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
           ],
           [
            AC_MSG_RESULT([2])
-           AC_DEFINE([ACE_HAS_2_PARAM_SCHED_GETAFFINITY], 1,
+           AC_DEFINE([ACE_HAS_2_PARAM_SCHED_GETAFFINITY], 1, 
 		     [Define to 1 if platform has 2 parameter sched_getaffinity()])
           ])
 fi dnl test "$ac_cv_func_sched_getaffinity" = yes
@@ -4620,7 +4510,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
           ],
           [
            AC_MSG_RESULT([2])
-           AC_DEFINE([ACE_HAS_2_PARAM_SCHED_SETAFFINITY], 1,
+           AC_DEFINE([ACE_HAS_2_PARAM_SCHED_SETAFFINITY], 1, 
 		     [Define to 1 if platform has 2 parameter sched_setaffinity()])
           ])
 fi dnl test "$ac_cv_func_sched_setaffinity" = yes
@@ -4992,26 +4882,6 @@ fi dnl End checks for reentrant functions
 
 
 ACE_CHECK_LACKS_FUNCS(readdir_r)
-if test "$ac_cv_func_readdir_r" = yes; then
-dnl The readdir_r() function varies with standards. Check which one we have.
-AC_MSG_CHECKING([for 2- or 3-param readdir_r])
-AC_LINK_IFELSE([AC_LANG_PROGRAM(
-          [[
-#include <dirent.h>
-          ]],
-          [[
-readdir_r(0, 0, 0);
-          ]])],
-          [
-           AC_DEFINE([ACE_HAS_3_PARAM_READDIR_R], 1,
-		     [Define to 1 if platform has 3 parameter readdir_r()])
-           AC_MSG_RESULT([3])
-          ],
-          [
-           AC_MSG_RESULT([2])
-          ])
-fi dnl test "$ac_cv_func_readdir" = yes
-
 
 dnl Disabled until we figure out what to do with the comparator
 dnl function argument inconsistencies between different platforms.
@@ -6223,6 +6093,42 @@ if test "$ace_cv_lib_posix_sigaction_constp_2" = yes; then
   AC_DEFINE([ACE_HAS_SIGACTION_CONSTP2])
 fi
 
+dnl Check if the wait() system call takes a (union wait *) rather than int *
+ACE_CACHE_CHECK([if wait() takes a (union wait *) rather than int *],
+  [ace_cv_lib_wait_takes_union_wait_ptr],
+   [
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/wait.h>
+       ]], [[
+        int* status = 0;
+        int result = 0;
+        result=wait(status);
+       ]])],[
+        ace_cv_lib_wait_takes_union_wait_ptr=no
+       ],[
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+          [[
+#include <sys/wait.h>
+          ]],
+          [[
+           union wait* status = 0;
+           int result = 0;
+           result=wait(status);
+          ]])],
+          [
+           ace_cv_lib_wait_takes_union_wait_ptr=yes
+          ],
+          [
+dnl If we get here then we're screwed! We can't use int* or union wait*.
+dnl It is very unlikely that we will ever get this far.  For the sake
+dnl of setting some result, we'll assume that we can actually use int*.
+           ace_cv_lib_wait_takes_union_wait_ptr=no
+           AC_MSG_WARN([wait() doesn't seem to take either int* or union wait*])
+           AC_MSG_WARN([as an argument.  Going to assume that int* will work.])
+          ])
+       ])
+  ], [AC_DEFINE([ACE_HAS_UNION_WAIT])],)
+
 dnl We need to use the ACE_CONVERT_WARNINGS_TO_ERRORS() macro since
 dnl passing a void * just caused implicit conversion warnings when
 dnl using GNU C++, for example.
@@ -6279,28 +6185,36 @@ fi dnl test "$ace_cv_lib_voidptr_gettimeofday" = no
 dnl Check for gettimeofday() protoype
 if test "$ace_cv_lib_voidptr_gettimeofday" = yes ||
    test "$ace_cv_lib_timezone_gettimeofday" = yes; then
-
-AC_CHECK_DECL([gettimeofday],
-              [
-if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then
-  AC_DEFINE([ACE_HAS_VOIDPTR_GETTIMEOFDAY])
-else
-  AC_DEFINE([ACE_HAS_TIMEZONE_GETTIMEOFDAY])
-fi
-	      ],[
-if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then
-  AC_DEFINE([ACE_HAS_SVR4_GETTIMEOFDAY])
-else
-  AC_DEFINE([ACE_HAS_OSF1_GETTIMEOFDAY])
-fi
-	      ],
-              [
-#include <sys/time.h>
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-	      ])
-
+  ACE_CACHE_CHECK([for gettimeofday() protoype],
+    [ace_cv_lib_has_gettimeofday_prototype],
+    [
+     AC_EGREP_CPP([gettimeofday],
+       [
+#include <time.h>
+       ],
+       [
+dnl We have a gettimeofday prototype
+        ace_cv_lib_has_gettimeofday_prototype=yes
+       ],
+       [
+dnl We don't have a gettimeofday prototype
+        ace_cv_lib_has_gettimeofday_prototype=no
+       ])
+    ],
+    [
+     if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then
+       AC_DEFINE([ACE_HAS_VOIDPTR_GETTIMEOFDAY])
+     else
+       AC_DEFINE([ACE_HAS_TIMEZONE_GETTIMEOFDAY])
+     fi
+    ],
+    [
+     if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then
+       AC_DEFINE([ACE_HAS_SVR4_GETTIMEOFDAY])
+     else
+       AC_DEFINE([ACE_HAS_OSF1_GETTIMEOFDAY])
+     fi
+    ])
 fi dnl Check for gettimeofday() protoype
 
 
@@ -6393,6 +6307,94 @@ dnl The following test should only be run if the above two testsfail.
     ])
   fi
 
+dnl Now check if CMSG_DATA is defined if and only if we have 4.4 BSD
+dnl style struct msghdr members.  If CMSG_DATA isn't defined, then
+dnl we try to figure out what it should be defined to.
+  if test "$ace_cv_lib_4_4bsd_msghdr" = yes; then
+    ACE_CACHE_CHECK([if CMSG_DATA is defined],
+      [ace_cv_lib_cmsg_data],
+      [
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+         [[
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <sys/socket.h>
+#include <sys/un.h>  /* @@ Is this header necessary? */
+         ]],
+         [[
+           cmsghdr ace_cmsg;
+           void * c = CMSG_DATA (&ace_cmsg);
+         ]])],
+         [
+          ace_cv_lib_cmsg_data=yes
+         ],
+         [
+          ace_cv_lib_cmsg_data=no
+dnl Now check which type of CMSG_DATA #define we need.
+          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <sys/socket.h>
+#include <sys/un.h>
+            ]], [[
+             /* This is sloppy.  Oh well. */
+             unsigned char ace_cmsg_data[0];
+
+             cmsghdr ace_cmsg;
+             ace_cmsg.cmsg_data = ace_cmsg_data;
+            ]])],,[
+             AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+               [[
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <sys/socket.h>
+#include <sys/un.h>
+               ]],
+               [[
+                /* This is sloppy.  Oh well. */
+                unsigned char ace_cmsg_data[0];
+
+                cmsghdr ace_cmsg;
+                ace_cmsg.__cmsg_data = ace_cmsg_data;
+               ]])],
+               [
+                AC_MSG_ERROR([cmsgmdr member '__cmsg_data[0]' not supported by ACE's CMSG_DATA macro])
+               ],
+               [
+                AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+                  [[
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <sys/socket.h>
+#include <sys/un.h>
+                  ]],
+                  [[
+                   cmsghdr ace_cmsg;
+                  ]])],
+                  [
+                   AC_CACHE_VAL([ace_cv_lib_cmsg_data_member],
+                                [ace_cv_lib_cmsg_data_member=no])
+                  ],
+                  [
+                   AC_MSG_ERROR([No supported cmsghdr structure exists.  ACE cannot be built without one.])
+                  ])
+               ])
+            ])
+         ])
+      ], ,
+      [
+       AC_DEFINE([ACE_LACKS_CMSG_DATA_MACRO])
+       if test "$ace_cv_lib_cmsg_data_member"=no; then
+         AC_DEFINE([ACE_LACKS_CMSG_DATA_MEMBER])
+       fi
+
+      ])
+  fi dnl test "$ace_cv_lib_4_4bsd_msghdr" = yes
+
 fi dnl End struct msghdr_stuff
 
 dnl
@@ -6687,9 +6689,9 @@ smemcpy (void* dest, const void* src, const size_t n)
 
 // Function pointer
 void* (* test_func) (void *dst, const void* src, size_t);
-
+                                                                                
 namespace { enum { ITERATIONS = 100000 }; }
-
+                                                                                
 #include <sys/time.h>
 #include <time.h>
 
@@ -6698,35 +6700,35 @@ main(int argc, char* argv[])
 {
  struct timeval start, now;
  double value;
-
+                                                                                
  // Test buffer
  char dest [16];
  const void* src = " THIS IS A TEST";
-
+                                                                                
  // We want to test if the loop unrolling is faster for sizes
  // from 1..16
  for (size_t counter = 16; counter >=1; counter--)
  {
    test_func = smemcpy;
-
+                                                                                
    // Warm up
    for (int i = ITERATIONS ; i > 0 ; --i)
      test_func ((void *)dest, src, counter);
-
+                                                                                
    gettimeofday (&start, 0) ;
    for (int j = ITERATIONS ; j > 0 ; --j)
      test_func ((void *)dest, src, counter);
    gettimeofday (&now, 0);
-
+                                                                                
    double fast = 1000000 * (now.tv_sec - start.tv_sec) +
                             now.tv_usec - start.tv_usec ;
-
+                                                                                
    test_func = memcpy;
-
+                                                                                
    // Warm up
    for (int k = ITERATIONS ; k > 0 ; --k)
      test_func ((void *)dest, src, counter);
-
+                                                                                
   gettimeofday (&start, 0) ;
   for (int l = ITERATIONS ; l > 0 ; --l)
      test_func ((void *)dest, src, counter);
@@ -6736,7 +6738,7 @@ main(int argc, char* argv[])
                            now.tv_usec - start.tv_usec ;
   if (fast > slow)
     return 1; // Unrolling was slower than actual memcpy
-
+                                                                                
   if (1.10*fast > slow)
     return 1; // Unrolling was not faster by 10%
  }
@@ -7817,6 +7819,16 @@ AC_CONFIG_FILES([
   ace/Makefile
   ace/QoS/Makefile
   ace/SSL/Makefile
+  ASNMP/Makefile
+  ASNMP/asnmp/Makefile
+  ASNMP/agent/Makefile
+  ASNMP/examples/Makefile
+  ASNMP/examples/get/Makefile
+  ASNMP/examples/next/Makefile
+  ASNMP/examples/set/Makefile
+  ASNMP/examples/trap/Makefile
+  ASNMP/examples/walk/Makefile
+  ASNMP/tests/Makefile
   apps/Makefile
   apps/Gateway/Makefile
   apps/Gateway/Gateway/Makefile
@@ -7827,7 +7839,6 @@ AC_CONFIG_FILES([
   apps/JAWS/clients/Caching/Makefile
   apps/JAWS/server/Makefile
   apps/JAWS2/Makefile
-  apps/JAWS2/HTTPU/Makefile
   apps/JAWS2/JAWS/Makefile
   apps/JAWS3/Makefile
   apps/JAWS3/jaws3/Makefile
@@ -7847,13 +7858,21 @@ AC_CONFIG_FILES([
   netsvcs/clients/Naming/Client/Makefile
   netsvcs/clients/Naming/Dump_Restore/Makefile
   netsvcs/servers/Makefile
+  protocols/Makefile
+  protocols/ace/Makefile
+  protocols/ace/HTBP/Makefile
+  protocols/ace/RMCast/Makefile
+  protocols/ace/TMCast/Makefile
+  protocols/examples/Makefile
+  protocols/examples/RMCast/Makefile
+  protocols/examples/RMCast/Send_Msg/Makefile
   websvcs/Makefile
   websvcs/lib/Makefile
   websvcs/tests/Makefile
 ])
 
 dnl Configure examples if configured...
-if test "$ace_build_examples" = yes; then
+if test $ace_build_examples = yes; then
   AC_CONFIG_FILES([
     examples/Makefile
     examples/APG/Makefile
@@ -7886,7 +7905,6 @@ if test "$ace_build_examples" = yes; then
     examples/Bounded_Packet_Relay/Makefile
     examples/C++NPv1/Makefile
     examples/C++NPv2/Makefile
-    examples/ConfigViewer/Makefile
     examples/Connection/Makefile
     examples/Connection/blocking/Makefile
     examples/Connection/misc/Makefile
@@ -7949,28 +7967,37 @@ if test "$ace_build_examples" = yes; then
     examples/System_V_IPC/Makefile
     examples/System_V_IPC/SV_Message_Queues/Makefile
     examples/System_V_IPC/SV_Semaphores/Makefile
+    examples/TMCast/Makefile
+    examples/TMCast/Member/Makefile
     examples/Threads/Makefile
     examples/Timer_Queue/Makefile
     examples/Web_Crawler/Makefile
   ])
 fi
 
-dnl Configure tests if configured...
-if test "$ace_build_tests" = yes; then
+dnl Configure examples if configured...
+if test $ace_build_tests = yes; then
   AC_CONFIG_FILES([
     performance-tests/Makefile
     performance-tests/Misc/Makefile
     performance-tests/SCTP/Makefile
-    performance-tests/Server_Concurrency/Leader_Follower/Makefile
     performance-tests/Server_Concurrency/Makefile
+    performance-tests/Server_Concurrency/Leader_Follower/Makefile
     performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile
-    performance-tests/Synch-Benchmarks/Base_Test/Makefile
     performance-tests/Synch-Benchmarks/Makefile
-    performance-tests/Synch-Benchmarks/Perf_Test/Makefile
     performance-tests/Synch-Benchmarks/Synch_Lib/Makefile
+    performance-tests/Synch-Benchmarks/Base_Test/Makefile
+    performance-tests/Synch-Benchmarks/Perf_Test/Makefile
     performance-tests/TCP/Makefile
     performance-tests/UDP/Makefile
+    protocols/tests/Makefile
+    protocols/tests/RMCast/Makefile
     tests/Makefile
+    tests/HTBP/Makefile
+    tests/HTBP/Reactor_Tests/Makefile
+    tests/HTBP/Send_Large_Msg/Makefile
+    tests/HTBP/Send_Recv_Tests/Makefile
+    tests/HTBP/ping/Makefile
     tests/SSL/Makefile
   ])
 fi
@@ -7989,23 +8016,6 @@ if test -d $srcdir/ACEXML; then
     ACEXML/tests/Makefile
     ACEXML/tests/util/Makefile
   ])
-  AC_SUBST([ACEXML],[ACEXML])
-fi
-
-if test -d $srcdir/ASNMP; then
-  AC_CONFIG_FILES([
-    ASNMP/Makefile
-    ASNMP/asnmp/Makefile
-    ASNMP/agent/Makefile
-    ASNMP/examples/Makefile
-    ASNMP/examples/get/Makefile
-    ASNMP/examples/next/Makefile
-    ASNMP/examples/set/Makefile
-    ASNMP/examples/trap/Makefile
-    ASNMP/examples/walk/Makefile
-    ASNMP/tests/Makefile
-  ])
-  AC_SUBST([ASNMP],[ASNMP])
 fi
 
 if test -d $srcdir/Kokyu; then
@@ -8018,46 +8028,15 @@ if test -d $srcdir/Kokyu; then
   ])
   AC_SUBST([KOKYU],[Kokyu])
 fi
-
-if test -d $srcdir/protocols; then
-  AC_CONFIG_FILES([
-    protocols/Makefile
-    protocols/ace/Makefile
-    protocols/ace/HTBP/Makefile
-    protocols/ace/RMCast/Makefile
-    protocols/ace/TMCast/Makefile
-  ])
-
-  dnl Configure examples if configured...
-  if test "$ace_build_examples" = yes; then
-    AC_CONFIG_FILES([
-      protocols/examples/Makefile
-      protocols/examples/RMCast/Makefile
-      protocols/examples/RMCast/Send_Msg/Makefile
-      protocols/examples/TMCast/Makefile
-      protocols/examples/TMCast/Member/Makefile
-    ])
-  fi
-
-  dnl Configure tests if configured...
-  if test "$ace_build_tests" = yes; then
-    AC_CONFIG_FILES([
-      protocols/tests/HTBP/Makefile
-      protocols/tests/HTBP/Reactor_Tests/Makefile
-      protocols/tests/HTBP/Send_Large_Msg/Makefile
-      protocols/tests/HTBP/Send_Recv_Tests/Makefile
-      protocols/tests/HTBP/ping/Makefile
-      protocols/tests/Makefile
-      protocols/tests/RMCast/Makefile
-    ])
-  fi
-  AC_SUBST([protocols],[protocols])
-fi
+AM_CONDITIONAL([BUILD_KOKYU],
+               [test -d $srcdir/Kokyu])
 
 if test -d $srcdir/TAO -a X$ace_user_with_tao = Xyes; then
   AC_CONFIG_SUBDIRS([TAO])
   AC_SUBST([TAO],[TAO])
 fi
+AM_CONDITIONAL([BUILD_TAO],
+               [test -d $srcdir/TAO -a X$ace_user_with_tao = Xyes])
 
 dnl Note that the "ACE_VERSION" in the message below is an M4 macro
 dnl that expands to the version of ACE being configured.
diff --git a/ACE/contrib/minizip/crypt.h b/ACE/contrib/minizip/crypt.h
index 94d682073a4..1d6da3d57ad 100644
--- a/ACE/contrib/minizip/crypt.h
+++ b/ACE/contrib/minizip/crypt.h
@@ -1,6 +1,5 @@
 /* crypt.h -- base code for crypt/uncrypt ZIPfile
 
-$Id$
 
 Version 1.01e, February 12th, 2005
 
@@ -39,9 +38,9 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
   unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
 		   * unpredictable manner on 16-bit systems; not a problem
 		   * with any known compiler so far, though */
-
+  
   MINIZIP_UNUSED_ARG(pcrc_32_tab);
-
+  
   temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
   return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
 }
diff --git a/ACE/contrib/minizip/ioapi.c b/ACE/contrib/minizip/ioapi.c
index 2c1867b7670..34775a0a99b 100644
--- a/ACE/contrib/minizip/ioapi.c
+++ b/ACE/contrib/minizip/ioapi.c
@@ -4,8 +4,6 @@
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
-
-   $Id$
 */
 
 #include <stdio.h>
@@ -88,18 +86,18 @@ voidpf ZCALLBACK fopen_file_func ( voidpf opaque,const char* filename,int mode)
 
 
 uLong ZCALLBACK fread_file_func (voidpf opaque,voidpf stream,void* buf,uLong size)
-{
+{   
     uLong ret;
-
+    
     MINIZIP_UNUSED_ARG (opaque);
-
+    
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
 
 uLong ZCALLBACK fwrite_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
-
+   
 {
     uLong ret;
     MINIZIP_UNUSED_ARG (opaque);
@@ -141,7 +139,7 @@ long ZCALLBACK fseek_file_func (voidpf opaque,voidpf stream,uLong offset,int ori
 }
 
 int ZCALLBACK fclose_file_func (voidpf opaque,voidpf stream)
-{
+{ 
     int ret;
     MINIZIP_UNUSED_ARG (opaque);
     ret = fclose((FILE *)stream);
@@ -149,7 +147,7 @@ int ZCALLBACK fclose_file_func (voidpf opaque,voidpf stream)
 }
 
 int ZCALLBACK ferror_file_func (voidpf opaque,voidpf stream)
-{
+{ 
     int ret;
     MINIZIP_UNUSED_ARG (opaque);
     ret = ferror((FILE *)stream);
@@ -157,7 +155,7 @@ int ZCALLBACK ferror_file_func (voidpf opaque,voidpf stream)
 }
 
 void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
- {
+ { 
     pzlib_filefunc_def->zopen_file = fopen_file_func;
     pzlib_filefunc_def->zread_file = fread_file_func;
     pzlib_filefunc_def->zwrite_file = fwrite_file_func;
diff --git a/ACE/contrib/minizip/ioapi.h b/ACE/contrib/minizip/ioapi.h
index 9b695ffaa37..d0b61d4949f 100644
--- a/ACE/contrib/minizip/ioapi.h
+++ b/ACE/contrib/minizip/ioapi.h
@@ -4,8 +4,6 @@
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
-
-   $Id$
 */
 
 #ifndef _ZLIBIOAPI_H
diff --git a/ACE/contrib/minizip/miniunz.c b/ACE/contrib/minizip/miniunz.c
index 3a1d67d2495..f599938884e 100644
--- a/ACE/contrib/minizip/miniunz.c
+++ b/ACE/contrib/minizip/miniunz.c
@@ -3,8 +3,6 @@
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
-
-   $Id$
 */
 
 
diff --git a/ACE/contrib/minizip/minizip.c b/ACE/contrib/minizip/minizip.c
index 1b13ce369c9..f2dfecd8b12 100644
--- a/ACE/contrib/minizip/minizip.c
+++ b/ACE/contrib/minizip/minizip.c
@@ -3,8 +3,6 @@
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
-
-   $Id$
 */
 
 #include <stdio.h>
diff --git a/ACE/contrib/minizip/minizip.mpc b/ACE/contrib/minizip/minizip.mpc
index 99be0e5b02a..10442db1ff4 100644
--- a/ACE/contrib/minizip/minizip.mpc
+++ b/ACE/contrib/minizip/minizip.mpc
@@ -1,6 +1,3 @@
-// -*- MPC -*-
-// $Id$
-
 project (minizip) : zlib{
 
 sharedname = minizip
diff --git a/ACE/contrib/minizip/mztools.c b/ACE/contrib/minizip/mztools.c
index e722a424900..8a50ee43925 100644
--- a/ACE/contrib/minizip/mztools.c
+++ b/ACE/contrib/minizip/mztools.c
@@ -2,7 +2,6 @@
   Additional tools for Minizip
   Code: Xavier Roche '2004
   License: Same as ZLIB (www.gzip.org)
-  $Id$
 */
 
 /* Code */
@@ -63,7 +62,7 @@ uLong* bytesRecovered;
         unsigned int fnsize = READ_16(header + 26); /* file name length */
         unsigned int extsize = READ_16(header + 28); /* extra field length */
         filename[0] = extra[0] = '\0';
-
+        
         /* Header */
         if (fwrite(header, 1, 30, fpOut) == 30) {
           offset += 30;
@@ -71,7 +70,7 @@ uLong* bytesRecovered;
           err = Z_ERRNO;
           break;
         }
-
+        
         /* Filename */
         if (fnsize > 0) {
           if (fread(filename, 1, fnsize, fpZip) == fnsize) {
@@ -104,7 +103,7 @@ uLong* bytesRecovered;
             break;
           }
         }
-
+        
         /* Data */
         {
           int dataSize = cpsize;
@@ -134,7 +133,7 @@ uLong* bytesRecovered;
             }
           }
         }
-
+        
         /* Central directory entry */
         {
           char header[46];
@@ -160,7 +159,7 @@ uLong* bytesRecovered;
           /* Header */
           if (fwrite(header, 1, 46, fpOutCD) == 46) {
             offsetCD += 46;
-
+            
             /* Filename */
             if (fnsize > 0) {
               if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
@@ -173,7 +172,7 @@ uLong* bytesRecovered;
               err = Z_STREAM_ERROR;
               break;
             }
-
+            
             /* Extra field */
             if (extsize > 0) {
               if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
@@ -183,7 +182,7 @@ uLong* bytesRecovered;
                 break;
               }
             }
-
+            
             /* Comment field */
             if (comsize > 0) {
               if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
@@ -193,8 +192,8 @@ uLong* bytesRecovered;
                 break;
               }
             }
-
-
+            
+            
           } else {
             err = Z_ERRNO;
             break;
diff --git a/ACE/contrib/minizip/mztools.h b/ACE/contrib/minizip/mztools.h
index 6e0ddaaf796..eee78dc56b5 100644
--- a/ACE/contrib/minizip/mztools.h
+++ b/ACE/contrib/minizip/mztools.h
@@ -2,7 +2,6 @@
   Additional tools for Minizip
   Code: Xavier Roche '2004
   License: Same as ZLIB (www.gzip.org)
-  $Id$
 */
 
 #ifndef _zip_tools_H
@@ -18,14 +17,14 @@ extern "C" {
 
 #include "unzip.h"
 
-/* Repair a ZIP file (missing central directory)
+/* Repair a ZIP file (missing central directory) 
    file: file to recover
    fileOut: output file after recovery
    fileOutTmp: temporary file name used for recovery
 */
-extern int ZEXPORT unzRepair(const char* file,
-                             const char* fileOut,
-                             const char* fileOutTmp,
+extern int ZEXPORT unzRepair(const char* file, 
+                             const char* fileOut, 
+                             const char* fileOutTmp, 
                              uLong* nRecovered,
                              uLong* bytesRecovered);
 
diff --git a/ACE/contrib/minizip/unzip.c b/ACE/contrib/minizip/unzip.c
index 63f5ce589b5..260c225f477 100644
--- a/ACE/contrib/minizip/unzip.c
+++ b/ACE/contrib/minizip/unzip.c
@@ -4,7 +4,6 @@
    Copyright (C) 1998-2005 Gilles Vollant
 
    Read unzip.h for more info
-   $Id$
 */
 
 /* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
@@ -170,7 +169,7 @@ local int unzlocal_getByte OF((
     int *pi));
 
 local int unzlocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,int *pi)
-
+    
 {
     unsigned char c;
     int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
@@ -198,10 +197,10 @@ local int unzlocal_getShort OF((
     uLong *pX));
 
 local int unzlocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX)
-
+    
 {
     uLong x ;
-    int i = 0;
+    int i;
     int err;
 
     err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
@@ -224,10 +223,10 @@ local int unzlocal_getLong OF((
     uLong *pX));
 
 local int unzlocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX)
-
+    
 {
     uLong x ;
-    int i = 0;
+    int i;
     int err;
 
     err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
@@ -255,7 +254,7 @@ local int unzlocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,voidpf f
 
 /* My own strcmpi / strcasecmp */
 local int strcmpcasenosensitive_internal(const char* fileName1,const char* fileName2)
-
+   
 {
     for (;;)
     {
@@ -297,7 +296,7 @@ local int strcmpcasenosensitive_internal(const char* fileName1,const char* fileN
 
 */
 extern MINIZIP_EXPORT int unzStringFileNameCompare (const char* fileName1,const char* fileName2,int iCaseSensitivity)
-
+   
 {
     if (iCaseSensitivity==0)
         iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
@@ -321,7 +320,7 @@ local uLong unzlocal_SearchCentralDir OF((
     voidpf filestream));
 
 local uLong unzlocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream)
-
+    
 {
     unsigned char* buf;
     uLong uSizeFile;
@@ -487,7 +486,7 @@ extern MINIZIP_EXPORT unzFile unzOpen2 (const char *path, zlib_filefunc_def* pzl
 
 
 extern MINIZIP_EXPORT unzFile unzOpen (const char *path)
-
+   
 {
     return unzOpen2(path, NULL);
 }
@@ -564,7 +563,7 @@ local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
                                               char *szFileName,uLong fileNameBufferSize,
                                               void *extraField,uLong extraFieldBufferSize,
                                               char *szComment,uLong commentBufferSize)
-
+   
 {
     unz_s* s;
     unz_file_info file_info;
@@ -669,7 +668,7 @@ local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
             else
                 err=UNZ_ERRNO;
 		}
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))            
 	    {   if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
                 err=UNZ_ERRNO;
                 lSeek += file_info.size_file_extra - uSizeRead;
diff --git a/ACE/contrib/minizip/unzip.h b/ACE/contrib/minizip/unzip.h
index fc219be38dd..ce87ac196f4 100644
--- a/ACE/contrib/minizip/unzip.h
+++ b/ACE/contrib/minizip/unzip.h
@@ -32,7 +32,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
-   $Id$
 
 */
 
diff --git a/ACE/contrib/minizip/zip.c b/ACE/contrib/minizip/zip.c
index b875cd133f1..05d90481f53 100644
--- a/ACE/contrib/minizip/zip.c
+++ b/ACE/contrib/minizip/zip.c
@@ -7,7 +7,6 @@
    Copyright (C) 1998-2005 Gilles Vollant
 
    Read zip.h for more info
-   $Id$
 */
 
 
@@ -173,7 +172,7 @@ local linkedlist_datablock_internal* allocate_new_datablock()
   return ldi;
 }
 
-local void free_datablock( linkedlist_datablock_internal* ldi)
+local void free_datablock( linkedlist_datablock_internal* ldi)   
 {
   while (ldi!=NULL)
     {
@@ -183,7 +182,7 @@ local void free_datablock( linkedlist_datablock_internal* ldi)
     }
 }
 
-local void init_linkedlist(linkedlist_data* ll)
+local void init_linkedlist(linkedlist_data* ll)   
 {
   ll->first_block = ll->last_block = NULL;
 }
@@ -196,7 +195,7 @@ local void init_linkedlist(linkedlist_data* ll)
 
 
 local int add_data_in_datablock(linkedlist_data* ll,const void* buf,uLong len)
-
+    
 {
   linkedlist_datablock_internal* ldi;
   const unsigned char* from_copy;
@@ -260,7 +259,7 @@ local int add_data_in_datablock(linkedlist_data* ll,const void* buf,uLong len)
 local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
                                 voidpf filestream, uLong x, int nbByte));
 local int ziplocal_putValue (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong x,int nbByte)
-
+    
 {
   unsigned char buf[4];
   int n;
@@ -285,7 +284,7 @@ local int ziplocal_putValue (const zlib_filefunc_def* pzlib_filefunc_def,voidpf
 
 local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
 local void ziplocal_putValue_inmemory (void* dest,uLong x,int nbByte)
-
+   
 {
   unsigned char* buf=(unsigned char*)dest;
   int n;
@@ -307,7 +306,7 @@ local void ziplocal_putValue_inmemory (void* dest,uLong x,int nbByte)
 
 
 local uLong ziplocal_TmzDateToDosDate(const tm_zip* ptm,uLong dosDate)
-
+   
 {
   uLong year = (uLong)ptm->tm_year;
   MINIZIP_UNUSED_ARG(dosDate);
@@ -329,7 +328,7 @@ local int ziplocal_getByte OF((
 			       int *pi));
 
 local int ziplocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,int *pi)
-
+   
 {
   unsigned char c;
   int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
@@ -357,10 +356,10 @@ local int ziplocal_getShort OF((
 				uLong *pX));
 
 local int ziplocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX)
-
+   
 {
   uLong x ;
-  int i = 0;
+  int i;
   int err;
 
   err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
@@ -383,10 +382,10 @@ local int ziplocal_getLong OF((
 			       uLong *pX));
 
 local int ziplocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX)
-
+   
 {
   uLong x ;
-  int i = 0;
+  int i;
   int err;
 
   err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
@@ -423,7 +422,7 @@ local uLong ziplocal_SearchCentralDir OF((
 					  voidpf filestream));
 
 local uLong ziplocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream)
-
+ 
 {
   unsigned char* buf;
   uLong uSizeFile;
@@ -481,7 +480,7 @@ local uLong ziplocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_de
 
 /************************************************************/
 extern MINIZIP_EXPORT zipFile zipOpen2 (const char *pathname,int append,zipcharpc* globalcomment,zlib_filefunc_def* pzlib_filefunc_def)
-
+    
 {
   zip_internal ziinit;
   zip_internal* zi;
@@ -661,7 +660,7 @@ extern MINIZIP_EXPORT zipFile zipOpen2 (const char *pathname,int append,zipcharp
     }
 }
 
-extern MINIZIP_EXPORT zipFile zipOpen (const char *pathname,int append)
+extern MINIZIP_EXPORT zipFile zipOpen (const char *pathname,int append)   
 {
   return zipOpen2(pathname,append,NULL,NULL);
 }
@@ -672,7 +671,7 @@ extern MINIZIP_EXPORT int zipOpenNewFileInZip3 (zipFile file,const char* filenam
 						const char* comment,int method,int level,int raw,
 						int windowBits,int memLevel,int strategy,
 						const char* password,uLong crcForCrypting)
-
+ 
 {
   zip_internal* zi;
   uInt size_filename;
@@ -864,7 +863,7 @@ extern MINIZIP_EXPORT int zipOpenNewFileInZip2(zipFile file,const char* filename
 					       const void* extrafield_local,uInt size_extrafield_local,
 					       const void* extrafield_global,uInt size_extrafield_global,
 					       const char* comment,int method,int level,int raw)
-
+    
 {
   return zipOpenNewFileInZip3 (file, filename, zipfi,
 			       extrafield_local, size_extrafield_local,
@@ -878,7 +877,7 @@ extern MINIZIP_EXPORT int zipOpenNewFileInZip (zipFile file,const char* filename
 					       const void* extrafield_local,uInt size_extrafield_local,
 					       const void* extrafield_global,uInt size_extrafield_global,
 					       const char* comment,int method,int level)
-
+  
 {
   return zipOpenNewFileInZip2 (file, filename, zipfi,
 			       extrafield_local, size_extrafield_local,
diff --git a/ACE/contrib/minizip/zip.h b/ACE/contrib/minizip/zip.h
index 85cda0ebd7b..1de5d815d6d 100644
--- a/ACE/contrib/minizip/zip.h
+++ b/ACE/contrib/minizip/zip.h
@@ -33,7 +33,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
-   $Id$
 
 */
 
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index b2f5f49cfc1..d525f45434e 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -1,5 +1,3 @@
-<!-- $Id$ -->
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML>
 <HEAD>
@@ -327,8 +325,6 @@ please use the links below to download it.
     <A HREF="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/">
       via the web</A>.
   </LI>
-  <li>ACE+TAO+CIAO source code may be obtained from the 
-    <a href="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/ACE-INSTALL.html?revision=HEAD#power">Subversion repository</a>.</li>
   <LI>Stable commercially supported versions of ACE are available from
     the Riverace
     <A HREF="http://www.riverace.com/">
diff --git a/ACE/docs/ace_guidelines.vsmacros b/ACE/docs/ace_guidelines.vsmacros
index 4609babc863..2218c1a14ba 100644
--- a/ACE/docs/ace_guidelines.vsmacros
+++ b/ACE/docs/ace_guidelines.vsmacros
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index d7f652acfa9..bc8c7f2778b 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -1,5 +1,3 @@
-<!-- $Id$ -->
-
 <html>
 <head>
 <title>The realm of the build czar</title>
@@ -84,122 +82,121 @@ well. Here is the procedure followed while cutting a beta:
 <li>The whole process takes somewhere between 8-9 hours, about 2 hours
 for making the release itself and the remaining time for generating
 the doxygen documentation.</li>
-<li>I suggest you take advantage of GNU Screen so that even if your SSH session
-is interrupted, the cutting process can continue.
-<ul>
-<li> type <code>screen</code> to start screen.</li>
-<li> execute commands as normal.  Note that Ctrl-A is special in screen, so you
-need to type Ctrl-A-A to send a Ctrl-A to the shell</li>
-<li> should your sesssion be interrupted, reconnect and type <code>screen -x</code></li>
-<li> when finished, just type exit twice</li>
-</ul>
 <li>Prior to starting this, gather aggregate release notes from all
 developers.  This is usually in the form of an email plea asking for
 a writeup of significant changes since the last beta. Add these notes
 to the NEWS files before cutting the release so that all notes are
 part of the release.</li>
-<li>Checkout a new workspace on <tt>anduril.dre.vanderbilt.edu</tt></li>
+<li>Checkout a new workspace on <tt>deuce.doc.wustl.edu</tt></li>
 <ul>
+<li>In order to do this you must have ssh identity set up, and
+ (unless you like typing your passphrase <b>A LOT</b>) have your
+environment configured so that you can access the CVS repo transparently.
+When you are using the bugzilla account the best you can add the
+public key in .ssh/id_rsa.pub into your .ssh/authorized_keys on
+cvs.doc.wustl.edu
+<em>Need a link here!</em>
+</li>
 <li>
-The best place to create the workspace is under /export/anduriltmp/bczar. Don't use
+The best place to create the workspace is under /project/acetmp. Don't use
 the home directory itself, it is an NFS share and not really fast.
 </li>
-<li>Checkout like this:
-<ul><li>svn co https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk DOC_ROOT</li>
-    <li>svn co https://svn.dre.vanderbilt.edu/DOC/MPC/trunk DOC_ROOT/ACE/MPC</li>
-</ul>
+<li>Set the <code>CVSROOT</code> variable to yourusers@cvs.doc.wustl.edu:/project
+/cvs-repository and CVS_RSH to ssh using SETENV
+</li>
+<li>Checkout like this: <tt>cvs -z 9 checkout ACE_wrappers</tt></li>
 </ul>
-<li> Set $DOC_ROOT to point to the new
-workspace you checked out.</li>
+<li> Do not forget to checkout your MPC repository. Do it like this:
+    <tt>cvs -z 9 co -P ACE_MPC</tt></li>
+<li> If the repository is frozen, remove all users from that file and
+place your user name in the FROZEN file </li>
+<li> Set $ACE_ROOT, $TAO_ROOT and $CIAO_ROOT to point to the new
+workspace you checked out. You must also set <code>$MPC_ROOT</code> to
+be <code>$ACE_ROOT/MPC</code>.</li>
 <li> Set an environment variable SIGNATURE indicating your full
 name. This is used to fill the ChangeLog entry.</li>
-<ul><li>For example,<tt>export SIGNATURE="Chris Cleeland"</tt></li></ul>
+<ul><li>For example,<tt>setenv SIGNATURE "Chris Cleeland"</tt></li></ul>
 <li> Set an environment variable MAILID indicating your mail id. This
 is used to fill the mail id portion of the ChangeLog entry.</li>
-<ul><li>For example,<tt>export MAILID="cleeland@ociweb.com"</tt></li></ul>
-<li> Change directories to to <tt>$DOC_ROOT</tt> </li>
-<li> Tag the release by executing <code>ACE/bin/make_release -v beta -u</code> This will only
-take a couple minutes to complete.</li>
-<li> Create the kits by executing <code>ACE/bin/make_release -k ace+tao+ciao </code>
-
-<ul><li>These commands only tags and creates the kits for the
+<ul><li>For example,<tt>setenv MAILID "cleeland@ociweb.com"</tt></li></ul>
+<li> Change directories to to <tt>$ACE_ROOT</tt> </li>
+<li> Do a <tt>make -f Release allsources</tt> to create a beta kit</li>
+<li> Or do a <tt>make -f Release allsources REL=minor</tt> to create a minor kit</li>
+<ul><li>This command only tags and creates the kits for the
  software itself, not documentation. </li>
-<li>The kits end up in <tt>/export/anduriltmp/bczar/packages</tt></li>
+<li>The kits end up in <tt>/export/project/deuce/ftp/pub/ACE+TAO-distribution</tt></li>
 </ul>
 <p>
 To summarise, the following is a transcript of the steps up to this point executing
 successfully (assumes /project/acetmp/sm exists and is empty): <p>
 <code>
 sm@beatrice ~<br>
-$ ssh bczar@anduril.dre.vanderbilt.edu<br>
+$ ssh bugzilla@deuce.doc.wustl.edu<br>
 No default printer<br>
--bash-3.00$ cd /export/anduriltmp/bczar<br>
--bash-3.00$ export DOC_ROOT=$PWD/DOC_ROOT<br>
--bash-3.00$ export SIGNATURE "Simon McQueen"<br>
--bash-3.00$ export MAILID sm@prismtech.com<br>
--bash-3.00$ svn co https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk DOC_ROOT<br>
--bash-3.00$ svn co https://svn.dre.vanderbilt.edu/DOC/MPC/trunk DOC_ROOT/ACE/MPC<br>
--bash-3.00$ cd DOC_ROOT/<br>
--bash-3.00$ ACE/bin/make_release -v beta -u<br>
--bash-3.00$ ACE/bin/make_release -i -k ace+tao+ciao<br>
+bugzilla@deuce cs/group/bugzilla> cd /project/acetmp/sm<br>
+bugzilla@deuce /project/acetmp/sm> setenv CVSROOT bugzilla@cvs.doc.wustl.edu:/project/cvs-repository<br>
+bugzilla@deuce /project/acetmp/sm> setenv CVS_RSH ssh<br>
+bugzilla@deuce /project/acetmp/sm> setenv ACE_ROOT $PWD/ACE_wrappers<br>
+bugzilla@deuce /project/acetmp/sm> setenv TAO_ROOT $PWD/ACE_wrappers/TAO<br>
+bugzilla@deuce /project/acetmp/sm> setenv CIAO_ROOT $PWD/ACE_wrappers/TAO/CIAO<br>
+bugzilla@deuce /project/acetmp/sm> setenv MPC_ROOT $PWD/ACE_wrappers/MPC<br>
+bugzilla@deuce /project/acetmp/sm> setenv SIGNATURE "Simon McQueen"<br>
+bugzilla@deuce /project/acetmp/sm> setenv MAILID sm@prismtech.com<br>
+bugzilla@deuce /project/acetmp/sm> cvs -z 9 checkout ACE_wrappers<br>
+bugzilla@deuce /project/acetmp/sm> cvs -z 9 co -P ACE_MPC<br>
+bugzilla@deuce /project/acetmp/sm> cd ACE_wrappers/<br>
+bugzilla@deuce acetmp/sm/ACE_wrappers> make -f Release allsources | & tee ../release.log<br>
 </code>
 <p>
 Feel free to cut and paste with suitable edits.
-<li>In the <em>EXTREMELY</em> unlikely event that something goes wrong during the
-<em>tagging</em> of the repo (ie, make_release -v beta -u),
+<li>If something goes wrong and the build needs to be restarted for some reason
 the following files must be returned to the state they were in before the release
-process started and then checked back into SVN:<br><code>
-ACE/ChangeLog<br>
-ACE/PROBLEM-REPORT-FORM<br>
-ACE/VERSION<br>
-ACE/TAO/ChangeLog<br>
-ACE/TAO/PROBLEM-REPORT-FORM<br>
-TAO/VERSION<br>
-CIAO/ChangeLog<br>
-CIAO/PROBLEM-REPORT-FORM<br>
-CIAO/VERSION<br>
-CIAO/ciao/Version.h<br>
-TAO/tao/Version.h<br>
-ace/Version.h<br></code><p>
-The tag will also need to be removed: ACE+TAO+CIAO-X_Y_Z
+process started and then checked back into CVS:<br><code>
+ACE_wrappers/ChangeLog<br>
+ACE_wrappers/PROBLEM-REPORT-FORM<br>
+ACE_wrappers/VERSION<br>
+ACE_wrappers/TAO/ChangeLog<br>
+ACE_wrappers/TAO/PROBLEM-REPORT-FORM<br>
+ACE_wrappers/TAO/VERSION<br>
+ACE_wrappers/TAO/CIAO/ChangeLog<br>
+ACE_wrappers/TAO/CIAO/PROBLEM-REPORT-FORM<br>
+ACE_wrappers/TAO/CIAO/VERSION<br>
+ACE_wrappers/TAO/CIAO/ciao/Version.h<br>
+ACE_wrappers/TAO/tao/Version.h<br>
+ACE_wrappers/ace/Version.h<br></code><p>
+The following tags will also need to be removed: CIAO-0_X_Y, TAO-1_X_Y, and ACE-5_X_Y
 (wher X and Y are the minor and beta release numbers of the release that is to be restarted).<p>
 E.g.:<br>
 <code>
-svn rm https://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z<br />
+cvs tag -d CIAO-0_4_8<br>
+cvs tag -d TAO-1_4_8<br>
+cvs tag -d ACE-5_4_8<br>
 </code>
 
-Note that this <em>only</em> needs to be done if the <em>tagging</em> fails.  If kit creation
-fails, simply restart that process.
-<li>The packages and up by default under /export/doc/latest, you can copy them to the webserver using the following commands. At the moment
-you execute these commands all users can download these packages.</li>
-<code>
-cp /export/doc/latest/ACE* /export/www/download.dre/ACE+TAO-distribution<br>
-cp /export/doc/previous-versions/ACE* /export/www/download.dre/previous_versions<br>
-</code>
+<li>When ready, create a manual tag ACE+TAO+CIAO-X_Y_Z, where X_Y_Z must be replaced by major/minor/beta version (for example 1_4_7).
+    For example, the tag might be: ACE+TAO+CIAO-1_4_8</li>
 <li>Once the distribution is ready, get ready for creating doxygen
 documentation. This is slightly complicated than it requires. We will
 address the complexity soon.</li>
 <li>Login to naboo.dre.vanderbilt.edu as bczar</li>
-<ul><li>After login, ssh to bczar@download.dre.vanderbilt.edu as bczar and check whether ssh succeeds. If not fix the problem. The make script tries to copy the tar.gz files to the website using ssh.</li></ul>
-<li> go to /web/users/isisbuilds/tmp/ACE_wrappers and remove the contents of this directory</li>
+<ul><li>After login, ssh to deuce.doc.wustl.edu as bugzilla and check whether ssh succeeds. If not fix the problem. The make script tries to copy the tar.gz files to the website using ssh.</li></ul>
+<li> go to /web/users/isisbuilds/tmp/ACE_wrappers </li>
+<li> Set the environment variables pointed above. </li>
 <li> Update the workspace with the right version tag </li>
 <code>
 svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/ACE ACE_wrappers<br>
 svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/TAO ACE_wrappers/TAO<br>
 svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/CIAO ACE_wrappers/TAO/CIAO<br>
 </code>
-<li> Set the needed environment variables using</li>
-<code>
-export ACE_ROOT=/web/users/isisbuilds/tmp/ACE_wrappers/ACE_wrappers
-</code>
+
 <li> Run doxygen --version within the shell. </li>
-<li> Open up $ACE_ROOT/bin/generate_rel_manpages in your favorite editor.</li>
+<li> Open up $ACE_ROOT/bin/generate_rel_mangpages in your favorite editor.</li>
 <li> Search for the string 'doxy_version'. </li>
 <li> Check the version specified here. If it is the  same as the one
 you got using doxygen --version then you don't have to worry. </li>
 <li> If it is different change the value of the doxy_version to the one installed on naboo.dre.vanderbilt.edu.</li>
 <li> Now you are ready to create documentation </li>
-<li> Do a <code>cd $ACE_ROOT</code> and then run <tt>make -f Release manpages</tt> to create the doxygen
+<li> Run <tt>make -f Release manpages</tt> to create the doxygen
 documentation.</li>
 <ul><li><b>If you can't leave the terminal window active for 6-9 hours,
  consider prefixing this command with <tt>nohup</tt></b></li></ul>
diff --git a/ACE/docs/bczar/privileges.html b/ACE/docs/bczar/privileges.html
index 299b88c299f..38bd3f26c35 100644
--- a/ACE/docs/bczar/privileges.html
+++ b/ACE/docs/bczar/privileges.html
@@ -1,5 +1,3 @@
-<!-- $Id$ -->
-
 <html>
 <head>
 <title> Build Czar powers </title>
@@ -11,7 +9,7 @@
   failure to do so may result in some form of revolution
   (picture a firing squad).
   </P>
-
+  
   <P>
   Previous generations of the honorable royal family have automated
   the build process as much as possible, but all machines require attention:
@@ -40,7 +38,7 @@
     if needed.
   </P>
   <P>The build Czar should also investigate the errors and warnings
-    reported by a build,
+    reported by a build, 
     contact the person or persons responsible for the failed build and
     prompt them to fix the situation. If that process above fails the
     build Czar should  request help from a volunteer or proceed to fix
@@ -49,7 +47,7 @@
     forced to excomunicate the original developer and report him or
     her to the highest court of the land for whatever punishment is
     deemed appropriate (lashing or bone breaking where not prohibited
-    by law).
+    by law). 
   </P>
   <P>It is extremely important to fix broken builds within the day,
     otherwise the errors tend to accumulate and once the process
diff --git a/ACE/docs/run_test.txt b/ACE/docs/run_test.txt
index e236bcaa4cb..bd483b3105b 100644
--- a/ACE/docs/run_test.txt
+++ b/ACE/docs/run_test.txt
@@ -201,31 +201,13 @@ used when the server doesn't shut down itself.  WaitKill is used when
 it does (such as when the client calls a shutdown method).  Once
 again, we check the return status.
 
+
 @verbatim
 unlink $server_ior;
 
 exit $status;
 @endverbatim
 
-When you need the hostname the test is running on be aware of the
-fact that with VxWorks we do cross host testing, part of the test
-runs on the target, the other part on the host system. In your test
-program add functionality to handle a commandline argument to pass
-in the hostname of the target. In the run_test.pl script you can
-then use the following code as example.
-
-@verbatim
-$TARGETHOSTNAME = "localhost";
-if (PerlACE::is_vxworks_test()) {
-  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'};
-  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210");
- }
- else {
-  $SV = new PerlACE::Process ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210");
- }
-$CL = new PerlACE::Process ("client", " -p 43210 -h $TARGETHOSTNAME");
-@endverbatim
-
 And finally, we unlink any files that were created and then just
 exit with $status.
 
diff --git a/ACE/docs/svn/config b/ACE/docs/svn/config
index b7399bb1636..3c2c12ba42a 100644
--- a/ACE/docs/svn/config
+++ b/ACE/docs/svn/config
@@ -127,6 +127,4 @@ enable-auto-props = yes
 *.ps=svn:mime-type=application/postscript
 *.pdf=svn:mime-type=application/postscript
 *.tab=svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.doxygen=svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.rc=svn:eol-style=native;svn:keywords=Author Date Id Revision
 Change?og*=svn:eol-style=native;svn:keywords=Author Date Id Revision
diff --git a/ACE/docs/svn/svn-prefs.reg b/ACE/docs/svn/svn-prefs.reg
index 200045b5189..9ace7caa0e1 100644
--- a/ACE/docs/svn/svn-prefs.reg
+++ b/ACE/docs/svn/svn-prefs.reg
@@ -31,6 +31,7 @@ REGEDIT4
 "use-commit-times"="yes"
 "#template-root"=""
 "enable-auto-props"="yes"
+
 [HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\tunnels]
 
 [HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\auto-props]
@@ -82,6 +83,4 @@ REGEDIT4
 "*.pdf"="svn:mime-type=application/postscript"
 "*.ps"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.tab"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
-"*.doxygen"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
-"*.rc"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "Change?og*"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
diff --git a/ACE/etc/tao_compression.doxygen b/ACE/etc/tao_compression.doxygen
deleted file mode 100644
index 5ab55ee5206..00000000000
--- a/ACE/etc/tao_compression.doxygen
+++ /dev/null
@@ -1,171 +0,0 @@
-# Doxyfile 1.1.5
-#
-# $Id$
-#
-
-PROJECT_NAME          = TAO_Compression
-PROJECT_NUMBER        = Snapshot
-OUTPUT_DIRECTORY      = .
-OUTPUT_LANGUAGE       = English
-DISABLE_INDEX         = NO
-EXTRACT_ALL           = YES
-EXTRACT_PRIVATE       = YES
-EXTRACT_STATIC        = YES
-HIDE_UNDOC_MEMBERS    = NO
-HIDE_UNDOC_CLASSES    = NO
-BRIEF_MEMBER_DESC     = YES
-REPEAT_BRIEF          = YES
-ALWAYS_DETAILED_SEC   = NO
-FULL_PATH_NAMES       = NO
-STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
-CLASS_DIAGRAMS        = YES
-SOURCE_BROWSER        = YES
-INLINE_SOURCES        = YES
-STRIP_CODE_COMMENTS   = NO
-CASE_SENSE_NAMES      = YES
-HIDE_SCOPE_NAMES      = NO
-VERBATIM_HEADERS      = YES
-SHOW_INCLUDE_FILES    = YES
-JAVADOC_AUTOBRIEF     = NO
-INHERIT_DOCS          = YES
-INLINE_INFO           = YES
-SORT_MEMBER_DOCS      = YES
-DISTRIBUTE_GROUP_DOC  = YES
-TAB_SIZE              = 8
-ENABLED_SECTIONS      =
-SHORT_NAMES           = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-QUIET                 = YES
-WARNINGS              = NO
-WARN_IF_UNDOCUMENTED  = YES
-WARN_FORMAT           = "$file:$line: $text"
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-INPUT                 = TAO/tao/Compression
-FILE_PATTERNS         = *.cpp *.h *.inl *.pidl
-RECURSIVE             =
-EXCLUDE               =
-EXCLUDE_PATTERNS      =
-EXAMPLE_PATH          =
-EXAMPLE_PATTERNS      =
-IMAGE_PATH            =
-INPUT_FILTER          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-ALPHABETICAL_INDEX    = YES
-COLS_IN_ALPHA_INDEX   = 1
-IGNORE_PREFIX         =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/compression
-HTML_HEADER           =
-HTML_FOOTER           =
-HTML_STYLESHEET       =
-HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-GENERATE_LATEX        = NO
-LATEX_OUTPUT          = latex
-COMPACT_LATEX         = NO
-PAPER_TYPE            = a4wide
-EXTRA_PACKAGES        =
-LATEX_HEADER          =
-PDF_HYPERLINKS        = NO
-LATEX_BATCHMODE       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-GENERATE_RTF          = NO
-RTF_OUTPUT            = rtf
-COMPACT_RTF           = NO
-RTF_HYPERLINKS        = NO
-RTF_STYLESHEET_FILE   =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-GENERATE_MAN          = NO
-MAN_OUTPUT            = man
-MAN_EXTENSION         = .3
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-ENABLE_PREPROCESSING  = YES
-MACRO_EXPANSION       = YES
-EXPAND_ONLY_PREDEF    = YES
-SEARCH_INCLUDES       = YES
-INCLUDE_PATH          = TAO .
-PREDEFINED            =
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
-#---------------------------------------------------------------------------
-
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/compression/TAO_Compression.tag
-ALLEXTERNALS          = NO
-PERL_PATH             = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz
-
-HAVE_DOT              = YES
-CLASS_GRAPH           = YES
-COLLABORATION_GRAPH   = YES
-INCLUDE_GRAPH         = YES
-INCLUDED_BY_GRAPH     = YES
-GRAPHICAL_HIERARCHY   = YES
-DOT_MULTI_TARGETS     = YES
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-DOT_PATH              =
-MAX_DOT_GRAPH_WIDTH   = 1024
-MAX_DOT_GRAPH_HEIGHT  = 1024
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
-#---------------------------------------------------------------------------
-
-SEARCHENGINE          = YES
-
diff --git a/ACE/etc/tao_transportcurrent.doxygen b/ACE/etc/tao_transportcurrent.doxygen
deleted file mode 100644
index 9db09e4d6d8..00000000000
--- a/ACE/etc/tao_transportcurrent.doxygen
+++ /dev/null
@@ -1,172 +0,0 @@
-# Doxyfile 1.1.5
-#
-# $Id$
-#
-
-PROJECT_NAME          = TAO_TransportCurrent
-PROJECT_NUMBER        = Snapshot
-OUTPUT_DIRECTORY      = .
-OUTPUT_LANGUAGE       = English
-DISABLE_INDEX         = NO
-EXTRACT_ALL           = YES
-EXTRACT_PRIVATE       = YES
-EXTRACT_STATIC        = YES
-HIDE_UNDOC_MEMBERS    = NO
-HIDE_UNDOC_CLASSES    = NO
-BRIEF_MEMBER_DESC     = YES
-REPEAT_BRIEF          = YES
-ALWAYS_DETAILED_SEC   = NO
-FULL_PATH_NAMES       = NO
-STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
-CLASS_DIAGRAMS        = YES
-SOURCE_BROWSER        = YES
-INLINE_SOURCES        = YES
-STRIP_CODE_COMMENTS   = NO
-CASE_SENSE_NAMES      = YES
-HIDE_SCOPE_NAMES      = NO
-VERBATIM_HEADERS      = YES
-SHOW_INCLUDE_FILES    = YES
-JAVADOC_AUTOBRIEF     = NO
-INHERIT_DOCS          = YES
-INLINE_INFO           = YES
-SORT_MEMBER_DOCS      = YES
-DISTRIBUTE_GROUP_DOC  = YES
-TAB_SIZE              = 8
-ENABLED_SECTIONS      =
-SHORT_NAMES           = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-QUIET                 = YES
-WARNINGS              = NO
-WARN_IF_UNDOCUMENTED  = YES
-WARN_FORMAT           = "$file:$line: $text"
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-INPUT                 = TAO/tao/TransportCurrent
-FILE_PATTERNS         = *.cpp *.h *.inl *.pidl
-RECURSIVE             =
-EXCLUDE               =
-EXCLUDE_PATTERNS      =
-EXAMPLE_PATH          =
-EXAMPLE_PATTERNS      =
-IMAGE_PATH            =
-INPUT_FILTER          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-ALPHABETICAL_INDEX    = YES
-COLS_IN_ALPHA_INDEX   = 1
-IGNORE_PREFIX         =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/transportcurrent
-HTML_HEADER           =
-HTML_FOOTER           =
-HTML_STYLESHEET       =
-HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-GENERATE_LATEX        = NO
-LATEX_OUTPUT          = latex
-COMPACT_LATEX         = NO
-PAPER_TYPE            = a4wide
-EXTRA_PACKAGES        =
-LATEX_HEADER          =
-PDF_HYPERLINKS        = NO
-LATEX_BATCHMODE       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-GENERATE_RTF          = NO
-RTF_OUTPUT            = rtf
-COMPACT_RTF           = NO
-RTF_HYPERLINKS        = NO
-RTF_STYLESHEET_FILE   =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-GENERATE_MAN          = NO
-MAN_OUTPUT            = man
-MAN_EXTENSION         = .3
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-ENABLE_PREPROCESSING  = YES
-MACRO_EXPANSION       = YES
-EXPAND_ONLY_PREDEF    = YES
-SEARCH_INCLUDES       = YES
-INCLUDE_PATH          = TAO .
-PREDEFINED            =
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
-#---------------------------------------------------------------------------
-
-TAGFILES              = html/ace/ACE.tag=../../ace \
-                        html/tao/TAO.tag=.. \
-                        html/tao/pi/TAO_PI.tag=../pi
-GENERATE_TAGFILE      = html/tao/transportcurrent/TAO_TransportCurrent.tag
-ALLEXTERNALS          = NO
-PERL_PATH             = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz
-
-HAVE_DOT              = YES
-CLASS_GRAPH           = YES
-COLLABORATION_GRAPH   = YES
-INCLUDE_GRAPH         = YES
-INCLUDED_BY_GRAPH     = YES
-GRAPHICAL_HIERARCHY   = YES
-DOT_MULTI_TARGETS     = YES
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-DOT_PATH              =
-MAX_DOT_GRAPH_WIDTH   = 1024
-MAX_DOT_GRAPH_HEIGHT  = 1024
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
-#---------------------------------------------------------------------------
-
-SEARCHENGINE          = YES
-
diff --git a/ACE/examples/APG/Active_Objects/.cvsignore b/ACE/examples/APG/Active_Objects/.cvsignore
new file mode 100644
index 00000000000..2af94b7dd8c
--- /dev/null
+++ b/ACE/examples/APG/Active_Objects/.cvsignore
@@ -0,0 +1,4 @@
+AO
+AO
+AO2
+AO2
diff --git a/ACE/examples/APG/Active_Objects/Makefile.am b/ACE/examples/APG/Active_Objects/Makefile.am
index 0ef7451c6c1..4562743bc87 100644
--- a/ACE/examples/APG/Active_Objects/Makefile.am
+++ b/ACE/examples/APG/Active_Objects/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.AO.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += AO
 
 AO_CPPFLAGS = \
@@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.AO2.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += AO2
 
 AO2_CPPFLAGS = \
diff --git a/ACE/examples/APG/Config/.cvsignore b/ACE/examples/APG/Config/.cvsignore
new file mode 100644
index 00000000000..b9f807ab7a6
--- /dev/null
+++ b/ACE/examples/APG/Config/.cvsignore
@@ -0,0 +1,6 @@
+ARGV_Example
+ARGV_Example
+Get_Opt
+Get_Opt
+Get_Opt_Long
+Get_Opt_Long
diff --git a/ACE/examples/APG/Config/Makefile.am b/ACE/examples/APG/Config/Makefile.am
index 5eb39fe51e0..5320bfdf85c 100644
--- a/ACE/examples/APG/Config/Makefile.am
+++ b/ACE/examples/APG/Config/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.ARGV_Example.am
-
 noinst_PROGRAMS = ARGV_Example
 
 ARGV_Example_CPPFLAGS = \
@@ -30,7 +29,6 @@ ARGV_Example_LDADD = \
 ## Makefile.Config_HA_Status.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += HA_Status
 
 HA_Status_CPPFLAGS = \
@@ -47,7 +45,6 @@ HA_Status_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Get_Opt.am
-
 noinst_PROGRAMS += Get_Opt
 
 Get_Opt_CPPFLAGS = \
@@ -62,7 +59,6 @@ Get_Opt_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Get_Opt_Long.am
-
 noinst_PROGRAMS += Get_Opt_Long
 
 Get_Opt_Long_CPPFLAGS = \
diff --git a/ACE/examples/APG/Containers/.cvsignore b/ACE/examples/APG/Containers/.cvsignore
new file mode 100644
index 00000000000..20d09b55a72
--- /dev/null
+++ b/ACE/examples/APG/Containers/.cvsignore
@@ -0,0 +1,24 @@
+Allocator
+Allocator
+Array
+Array
+DLList
+DLList
+Hash_Map
+Hash_Map
+Hash_Map_Hash
+Hash_Map_Hash
+Map_Manager
+Map_Manager
+Map_Manager_Specialization
+Map_Manager_Specialization
+Queues
+Queues
+RB_Tree
+RB_Tree
+RB_Tree_Functors
+RB_Tree_Functors
+Sets
+Sets
+Stacks
+Stacks
diff --git a/ACE/examples/APG/Containers/Makefile.am b/ACE/examples/APG/Containers/Makefile.am
index 4be38993e5a..e5ef96ad6dc 100644
--- a/ACE/examples/APG/Containers/Makefile.am
+++ b/ACE/examples/APG/Containers/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.Allocator.am
-
 noinst_PROGRAMS = Allocator
 
 Allocator_CPPFLAGS = \
@@ -31,7 +30,6 @@ Allocator_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Array.am
-
 noinst_PROGRAMS += Array
 
 Array_CPPFLAGS = \
@@ -49,7 +47,6 @@ Array_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Containers_Hash_Map.am
-
 noinst_PROGRAMS += Hash_Map
 
 Hash_Map_CPPFLAGS = \
@@ -67,7 +64,6 @@ Hash_Map_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Containers_Map_Manager.am
-
 noinst_PROGRAMS += Map_Manager
 
 Map_Manager_CPPFLAGS = \
@@ -87,7 +83,6 @@ Map_Manager_LDADD = \
 ## Makefile.DLList.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += DLList
 
 DLList_CPPFLAGS = \
@@ -107,7 +102,6 @@ DLList_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Hash_Map_Hash.am
-
 noinst_PROGRAMS += Hash_Map_Hash
 
 Hash_Map_Hash_CPPFLAGS = \
@@ -122,7 +116,6 @@ Hash_Map_Hash_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Map_Manager_Specialization.am
-
 noinst_PROGRAMS += Map_Manager_Specialization
 
 Map_Manager_Specialization_CPPFLAGS = \
@@ -140,7 +133,6 @@ Map_Manager_Specialization_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Queues.am
-
 noinst_PROGRAMS += Queues
 
 Queues_CPPFLAGS = \
@@ -158,7 +150,6 @@ Queues_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.RB_Tree.am
-
 noinst_PROGRAMS += RB_Tree
 
 RB_Tree_CPPFLAGS = \
@@ -176,7 +167,6 @@ RB_Tree_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.RB_Tree_Functors.am
-
 noinst_PROGRAMS += RB_Tree_Functors
 
 RB_Tree_Functors_CPPFLAGS = \
@@ -191,7 +181,6 @@ RB_Tree_Functors_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Sets.am
-
 noinst_PROGRAMS += Sets
 
 Sets_CPPFLAGS = \
@@ -209,7 +198,6 @@ Sets_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Stacks.am
-
 noinst_PROGRAMS += Stacks
 
 Stacks_CPPFLAGS = \
diff --git a/ACE/examples/APG/Logging/.cvsignore b/ACE/examples/APG/Logging/.cvsignore
new file mode 100644
index 00000000000..821ee0bc87c
--- /dev/null
+++ b/ACE/examples/APG/Logging/.cvsignore
@@ -0,0 +1,36 @@
+Change_Instance_Default
+Change_Instance_Default
+Change_Mask
+Change_Mask
+Howto_Syslog
+Howto_Syslog
+Simple1
+Simple1
+Simple2
+Simple2
+Trace_Return
+Trace_Return
+Use_Callback
+Use_Callback
+Use_Callback2
+Use_Callback2
+Use_LogManager
+Use_LogManager
+Use_Logger
+Use_Logger
+Use_Logging_Server
+Use_Logging_Server
+Use_Logging_Strategy
+Use_Logging_Strategy
+Use_Multiple_Sinks
+Use_Multiple_Sinks
+Use_Ostream
+Use_Ostream
+Use_Stderr
+Use_Stderr
+Use_Syslog
+Use_Syslog
+Wrap_Macros
+Wrap_Macros
+Wrap_Macros_Alt
+Wrap_Macros_Alt
diff --git a/ACE/examples/APG/Logging/Makefile.am b/ACE/examples/APG/Logging/Makefile.am
index 5a6f92b9fa6..69564edb197 100644
--- a/ACE/examples/APG/Logging/Makefile.am
+++ b/ACE/examples/APG/Logging/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Change_Instance_Default.am
-
 noinst_PROGRAMS = Change_Instance_Default
 
 Change_Instance_Default_CPPFLAGS = \
@@ -32,7 +31,6 @@ Change_Instance_Default_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Change_Mask.am
-
 noinst_PROGRAMS += Change_Mask
 
 Change_Mask_CPPFLAGS = \
@@ -52,7 +50,6 @@ Change_Mask_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Howto_Syslog.am
-
 noinst_PROGRAMS += Howto_Syslog
 
 Howto_Syslog_CPPFLAGS = \
@@ -72,7 +69,6 @@ Howto_Syslog_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Simple1.am
-
 noinst_PROGRAMS += Simple1
 
 Simple1_CPPFLAGS = \
@@ -92,7 +88,6 @@ Simple1_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Simple2.am
-
 noinst_PROGRAMS += Simple2
 
 Simple2_CPPFLAGS = \
@@ -112,7 +107,6 @@ Simple2_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Trace_Return.am
-
 noinst_PROGRAMS += Trace_Return
 
 Trace_Return_CPPFLAGS = \
@@ -132,7 +126,6 @@ Trace_Return_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_Callback.am
-
 noinst_PROGRAMS += Use_Callback
 
 Use_Callback_CPPFLAGS = \
@@ -152,7 +145,6 @@ Use_Callback_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_Callback2.am
-
 noinst_PROGRAMS += Use_Callback2
 
 Use_Callback2_CPPFLAGS = \
@@ -172,7 +164,6 @@ Use_Callback2_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_LogManager.am
-
 noinst_PROGRAMS += Use_LogManager
 
 Use_LogManager_CPPFLAGS = \
@@ -192,7 +183,6 @@ Use_LogManager_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_Logger.am
-
 noinst_PROGRAMS += Use_Logger
 
 Use_Logger_CPPFLAGS = \
@@ -212,7 +202,6 @@ Use_Logger_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_Logging_Server.am
-
 noinst_PROGRAMS += Use_Logging_Server
 
 Use_Logging_Server_CPPFLAGS = \
@@ -232,7 +221,6 @@ Use_Logging_Server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_Logging_Strategy.am
-
 noinst_PROGRAMS += Use_Logging_Strategy
 
 Use_Logging_Strategy_CPPFLAGS = \
@@ -252,7 +240,6 @@ Use_Logging_Strategy_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_Multiple_Sinks.am
-
 noinst_PROGRAMS += Use_Multiple_Sinks
 
 Use_Multiple_Sinks_CPPFLAGS = \
@@ -272,7 +259,6 @@ Use_Multiple_Sinks_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_Ostream.am
-
 noinst_PROGRAMS += Use_Ostream
 
 Use_Ostream_CPPFLAGS = \
@@ -292,7 +278,6 @@ Use_Ostream_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_Stderr.am
-
 noinst_PROGRAMS += Use_Stderr
 
 Use_Stderr_CPPFLAGS = \
@@ -312,7 +297,6 @@ Use_Stderr_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Use_Syslog.am
-
 noinst_PROGRAMS += Use_Syslog
 
 Use_Syslog_CPPFLAGS = \
@@ -332,7 +316,6 @@ Use_Syslog_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Wrap_Macros.am
-
 noinst_PROGRAMS += Wrap_Macros
 
 Wrap_Macros_CPPFLAGS = \
@@ -352,7 +335,6 @@ Wrap_Macros_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Wrap_Macros_Alt.am
-
 noinst_PROGRAMS += Wrap_Macros_Alt
 
 Wrap_Macros_Alt_CPPFLAGS = \
diff --git a/ACE/examples/APG/Logging/Trace.h b/ACE/examples/APG/Logging/Trace.h
index 782a610558e..9c71bad13e3 100644
--- a/ACE/examples/APG/Logging/Trace.h
+++ b/ACE/examples/APG/Logging/Trace.h
@@ -77,10 +77,6 @@ private:
 // Listing 2 code/ch03
 #define TRACE_PREFIX       ACE_TEXT ("TRACE ")
 
-#if defined (TRACE)
-#undef TRACE
-#endif /* TRACE */
-
 #if (ACE_NTRACE == 1)
 #    define TRACE(X)
 #    define TRACE_RETURN(V)     return V;
diff --git a/ACE/examples/APG/Makefile.am b/ACE/examples/APG/Makefile.am
index 5a191de8a82..f79765c9348 100644
--- a/ACE/examples/APG/Makefile.am
+++ b/ACE/examples/APG/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Active_Objects \
diff --git a/ACE/examples/APG/Misc_IPC/.cvsignore b/ACE/examples/APG/Misc_IPC/.cvsignore
new file mode 100644
index 00000000000..155f8a18824
--- /dev/null
+++ b/ACE/examples/APG/Misc_IPC/.cvsignore
@@ -0,0 +1,6 @@
+UDP_Broadcast
+UDP_Broadcast
+UDP_Multicast
+UDP_Multicast
+UDP_Unicast
+UDP_Unicast
diff --git a/ACE/examples/APG/Misc_IPC/Makefile.am b/ACE/examples/APG/Misc_IPC/Makefile.am
index 7c9daa10038..656f63fb00c 100644
--- a/ACE/examples/APG/Misc_IPC/Makefile.am
+++ b/ACE/examples/APG/Misc_IPC/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.UDP_Broadcast.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += UDP_Broadcast
 
 UDP_Broadcast_CPPFLAGS = \
@@ -32,7 +31,6 @@ UDP_Broadcast_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.UDP_Multicast.am
-
 noinst_PROGRAMS += UDP_Multicast
 
 UDP_Multicast_CPPFLAGS = \
@@ -48,7 +46,6 @@ UDP_Multicast_LDADD = \
 ## Makefile.UDP_Unicast.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += UDP_Unicast
 
 UDP_Unicast_CPPFLAGS = \
diff --git a/ACE/examples/APG/Naming/.cvsignore b/ACE/examples/APG/Naming/.cvsignore
new file mode 100644
index 00000000000..e5fd579f85d
--- /dev/null
+++ b/ACE/examples/APG/Naming/.cvsignore
@@ -0,0 +1,10 @@
+Netlocal
+Netlocal
+Netlocal_reader
+Netlocal_reader
+Nodelocal
+Nodelocal
+Nodelocal_shared
+Nodelocal_shared
+Nodelocal_shared_reader
+Nodelocal_shared_reader
diff --git a/ACE/examples/APG/Naming/Makefile.am b/ACE/examples/APG/Naming/Makefile.am
index 29b98dd43d6..f73b1258348 100644
--- a/ACE/examples/APG/Naming/Makefile.am
+++ b/ACE/examples/APG/Naming/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Netlocal.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Netlocal
 
 Netlocal_CPPFLAGS = \
@@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Netlocal_Reader.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Netlocal_reader
 
 Netlocal_reader_CPPFLAGS = \
@@ -58,7 +56,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Nodelocal.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Nodelocal
 
 Nodelocal_CPPFLAGS = \
@@ -78,7 +75,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Nodelocal_Shared.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Nodelocal_shared
 
 Nodelocal_shared_CPPFLAGS = \
@@ -98,7 +94,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Nodelocal_Shared_Reader.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Nodelocal_shared_reader
 
 Nodelocal_shared_reader_CPPFLAGS = \
diff --git a/ACE/examples/APG/Proactor/.cvsignore b/ACE/examples/APG/Proactor/.cvsignore
new file mode 100644
index 00000000000..64b35fb3d57
--- /dev/null
+++ b/ACE/examples/APG/Proactor/.cvsignore
@@ -0,0 +1,2 @@
+HA_Proactive_Status
+HA_Proactive_Status
diff --git a/ACE/examples/APG/Proactor/Makefile.am b/ACE/examples/APG/Proactor/Makefile.am
index 9d23599bcd0..a7632af1d4f 100644
--- a/ACE/examples/APG/Proactor/Makefile.am
+++ b/ACE/examples/APG/Proactor/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.HA_Proactive_Status.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = HA_Proactive_Status
 
 HA_Proactive_Status_CPPFLAGS = \
diff --git a/ACE/examples/APG/Processes/.cvsignore b/ACE/examples/APG/Processes/.cvsignore
new file mode 100644
index 00000000000..187cf413af2
--- /dev/null
+++ b/ACE/examples/APG/Processes/.cvsignore
@@ -0,0 +1,8 @@
+Process_Manager_Death
+Process_Manager_Death
+Process_Manager_Spawn
+Process_Manager_Spawn
+Process_Mutex
+Process_Mutex
+Spawn
+Spawn
diff --git a/ACE/examples/APG/Processes/Makefile.am b/ACE/examples/APG/Processes/Makefile.am
index ea828036b0f..5c45a506304 100644
--- a/ACE/examples/APG/Processes/Makefile.am
+++ b/ACE/examples/APG/Processes/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Process_Manager_Death.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Process_Manager_Death
 
 Process_Manager_Death_CPPFLAGS = \
@@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Process_Manager_Spawn.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Process_Manager_Spawn
 
 Process_Manager_Spawn_CPPFLAGS = \
@@ -52,7 +50,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Process_Mutex.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Process_Mutex
 
 Process_Mutex_CPPFLAGS = \
@@ -70,7 +67,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Spawn.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Spawn
 
 Spawn_CPPFLAGS = \
diff --git a/ACE/examples/APG/Reactor/.cvsignore b/ACE/examples/APG/Reactor/.cvsignore
new file mode 100644
index 00000000000..c2d63b45dcf
--- /dev/null
+++ b/ACE/examples/APG/Reactor/.cvsignore
@@ -0,0 +1,16 @@
+Client
+Client
+HAStatus
+HAStatus
+HAStatus-AC
+HAStatus-AC
+Reschedule
+Reschedule
+Schedule_Timers
+Schedule_Timers
+Timer_Cancel
+Timer_Cancel
+Timer_State_Data
+Timer_State_Data
+Timers
+Timers
diff --git a/ACE/examples/APG/Reactor/Makefile.am b/ACE/examples/APG/Reactor/Makefile.am
index 9e7d494af62..789c0ce7785 100644
--- a/ACE/examples/APG/Reactor/Makefile.am
+++ b/ACE/examples/APG/Reactor/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Client.am
-
 noinst_PROGRAMS = Client
 
 Client_CPPFLAGS = \
@@ -27,7 +26,6 @@ Client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.HAStatus.am
-
 noinst_PROGRAMS += HAStatus
 
 HAStatus_CPPFLAGS = \
@@ -43,7 +41,6 @@ HAStatus_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.HAStatus_AC.am
-
 noinst_PROGRAMS += HAStatus-AC
 
 HAStatus_AC_CPPFLAGS = \
@@ -59,7 +56,6 @@ HAStatus_AC_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Timers.am
-
 noinst_PROGRAMS += Timers
 
 Timers_CPPFLAGS = \
@@ -75,7 +71,6 @@ Timers_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reschedule.am
-
 noinst_PROGRAMS += Reschedule
 
 Reschedule_CPPFLAGS = \
@@ -91,7 +86,6 @@ Reschedule_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Schedule_Timers.am
-
 noinst_PROGRAMS += Schedule_Timers
 
 Schedule_Timers_CPPFLAGS = \
@@ -107,7 +101,6 @@ Schedule_Timers_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Timer_Cancel.am
-
 noinst_PROGRAMS += Timer_Cancel
 
 Timer_Cancel_CPPFLAGS = \
@@ -123,7 +116,6 @@ Timer_Cancel_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Timer_State_Data.am
-
 noinst_PROGRAMS += Timer_State_Data
 
 Timer_State_Data_CPPFLAGS = \
diff --git a/ACE/examples/APG/Shared_Memory/.cvsignore b/ACE/examples/APG/Shared_Memory/.cvsignore
new file mode 100644
index 00000000000..4fbe7c66db3
--- /dev/null
+++ b/ACE/examples/APG/Shared_Memory/.cvsignore
@@ -0,0 +1,10 @@
+Hash_Map
+Hash_Map
+Malloc
+Malloc
+Mem_Map
+Mem_Map
+PI_Malloc
+PI_Malloc
+Pool_Growth
+Pool_Growth
diff --git a/ACE/examples/APG/Shared_Memory/Makefile.am b/ACE/examples/APG/Shared_Memory/Makefile.am
index f5e7623d13b..b114eb0153a 100644
--- a/ACE/examples/APG/Shared_Memory/Makefile.am
+++ b/ACE/examples/APG/Shared_Memory/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Malloc.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Malloc
 
 Malloc_CPPFLAGS = \
@@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Mem_Map.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Mem_Map
 
 Mem_Map_CPPFLAGS = \
@@ -54,7 +52,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.PI_Malloc.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += PI_Malloc
 
 PI_Malloc_CPPFLAGS = \
@@ -73,7 +70,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Pool_Growth.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Pool_Growth
 
 Pool_Growth_CPPFLAGS = \
@@ -92,7 +88,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Shared_Memory_Hash_Map.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Hash_Map
 
 Hash_Map_CPPFLAGS = \
diff --git a/ACE/examples/APG/Signals/.cvsignore b/ACE/examples/APG/Signals/.cvsignore
new file mode 100644
index 00000000000..23774a5d6a0
--- /dev/null
+++ b/ACE/examples/APG/Signals/.cvsignore
@@ -0,0 +1,10 @@
+SigAction
+SigAction
+SigGuard
+SigGuard
+SigHandler
+SigHandler
+SigHandlers
+SigHandlers
+SigInfo
+SigInfo
diff --git a/ACE/examples/APG/Signals/Makefile.am b/ACE/examples/APG/Signals/Makefile.am
index 6106f743c45..ffc67bdd0f0 100644
--- a/ACE/examples/APG/Signals/Makefile.am
+++ b/ACE/examples/APG/Signals/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.SigAction.am
-
 noinst_PROGRAMS = SigAction
 
 SigAction_CPPFLAGS = \
@@ -26,7 +25,6 @@ SigAction_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SigGuard.am
-
 noinst_PROGRAMS += SigGuard
 
 SigGuard_CPPFLAGS = \
@@ -40,7 +38,6 @@ SigGuard_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SigHandler.am
-
 noinst_PROGRAMS += SigHandler
 
 SigHandler_CPPFLAGS = \
@@ -54,7 +51,6 @@ SigHandler_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SigHandlers.am
-
 noinst_PROGRAMS += SigHandlers
 
 SigHandlers_CPPFLAGS = \
@@ -68,7 +64,6 @@ SigHandlers_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SigInfo.am
-
 noinst_PROGRAMS += SigInfo
 
 SigInfo_CPPFLAGS = \
diff --git a/ACE/examples/APG/Sockets/.cvsignore b/ACE/examples/APG/Sockets/.cvsignore
new file mode 100644
index 00000000000..0b2c9d92db4
--- /dev/null
+++ b/ACE/examples/APG/Sockets/.cvsignore
@@ -0,0 +1,8 @@
+Basic
+Basic
+Basic_Robust
+Basic_Robust
+Iovec
+Iovec
+Server
+Server
diff --git a/ACE/examples/APG/Sockets/Makefile.am b/ACE/examples/APG/Sockets/Makefile.am
index 99c4308137c..3409703f567 100644
--- a/ACE/examples/APG/Sockets/Makefile.am
+++ b/ACE/examples/APG/Sockets/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Sockets_Basic.am
-
 noinst_PROGRAMS = Basic
 
 Basic_CPPFLAGS = \
@@ -26,7 +25,6 @@ Basic_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Sockets_Basic_Robust.am
-
 noinst_PROGRAMS += Basic_Robust
 
 Basic_Robust_CPPFLAGS = \
@@ -40,7 +38,6 @@ Basic_Robust_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Sockets_Iovec.am
-
 noinst_PROGRAMS += Iovec
 
 Iovec_CPPFLAGS = \
@@ -54,7 +51,6 @@ Iovec_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Sockets_Server.am
-
 noinst_PROGRAMS += Server
 
 Server_CPPFLAGS = \
diff --git a/ACE/examples/APG/Streams/.cvsignore b/ACE/examples/APG/Streams/.cvsignore
new file mode 100644
index 00000000000..ff318c0de98
--- /dev/null
+++ b/ACE/examples/APG/Streams/.cvsignore
@@ -0,0 +1,2 @@
+Answerer
+Answerer
diff --git a/ACE/examples/APG/Streams/Makefile.am b/ACE/examples/APG/Streams/Makefile.am
index c8992474495..e23f2f22143 100644
--- a/ACE/examples/APG/Streams/Makefile.am
+++ b/ACE/examples/APG/Streams/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ ACE_ROOT = $(top_srcdir)
 
 if BUILD_THREADS
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = Answerer
 
 Answerer_CPPFLAGS = \
diff --git a/ACE/examples/APG/Svc_Config/.cvsignore b/ACE/examples/APG/Svc_Config/.cvsignore
new file mode 100644
index 00000000000..c508d301216
--- /dev/null
+++ b/ACE/examples/APG/Svc_Config/.cvsignore
@@ -0,0 +1,4 @@
+HA_Configurable_Server_Dynamic
+HA_Configurable_Server_Dynamic
+HA_Configurable_Server_Static
+HA_Configurable_Server_Static
diff --git a/ACE/examples/APG/Svc_Config/Makefile.am b/ACE/examples/APG/Svc_Config/Makefile.am
index 4cde367f194..9fa3e2f18b6 100644
--- a/ACE/examples/APG/Svc_Config/Makefile.am
+++ b/ACE/examples/APG/Svc_Config/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.HA_Configurable_Server_Dynamic.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += HA_Configurable_Server_Dynamic
 
 HA_Configurable_Server_Dynamic_CPPFLAGS = \
@@ -37,7 +36,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.HA_Configurable_Server_Static.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += HA_Configurable_Server_Static
 
 HA_Configurable_Server_Static_CPPFLAGS = \
diff --git a/ACE/examples/APG/ThreadManagement/.cvsignore b/ACE/examples/APG/ThreadManagement/.cvsignore
new file mode 100644
index 00000000000..535a0039a50
--- /dev/null
+++ b/ACE/examples/APG/ThreadManagement/.cvsignore
@@ -0,0 +1,18 @@
+Async_Cancel
+Async_Cancel
+Coop_Cancel
+Coop_Cancel
+ExitHandler
+ExitHandler
+Pool
+Pool
+Priorities
+Priorities
+Signals
+Signals
+Signals2
+Signals2
+Start_Hook
+Start_Hook
+State
+State
diff --git a/ACE/examples/APG/ThreadManagement/Makefile.am b/ACE/examples/APG/ThreadManagement/Makefile.am
index 6c555b3c86d..0ed91996db2 100644
--- a/ACE/examples/APG/ThreadManagement/Makefile.am
+++ b/ACE/examples/APG/ThreadManagement/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Async_Cancel.am
-
 noinst_PROGRAMS = Async_Cancel
 
 Async_Cancel_CPPFLAGS = \
@@ -27,7 +26,6 @@ Async_Cancel_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Coop_Cancel.am
-
 noinst_PROGRAMS += Coop_Cancel
 
 Coop_Cancel_CPPFLAGS = \
@@ -42,7 +40,6 @@ Coop_Cancel_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.ExitHandler.am
-
 noinst_PROGRAMS += ExitHandler
 
 ExitHandler_CPPFLAGS = \
@@ -57,7 +54,6 @@ ExitHandler_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Pool.am
-
 noinst_PROGRAMS += Pool
 
 Pool_CPPFLAGS = \
@@ -72,7 +68,6 @@ Pool_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Priorities.am
-
 noinst_PROGRAMS += Priorities
 
 Priorities_CPPFLAGS = \
@@ -87,7 +82,6 @@ Priorities_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Signals.am
-
 noinst_PROGRAMS += Signals
 
 Signals_CPPFLAGS = \
@@ -102,7 +96,6 @@ Signals_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Signals2.am
-
 noinst_PROGRAMS += Signals2
 
 Signals2_CPPFLAGS = \
@@ -117,7 +110,6 @@ Signals2_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Start_Hook.am
-
 noinst_PROGRAMS += Start_Hook
 
 Start_Hook_CPPFLAGS = \
@@ -132,7 +124,6 @@ Start_Hook_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.State.am
-
 noinst_PROGRAMS += State
 
 State_CPPFLAGS = \
diff --git a/ACE/examples/APG/ThreadPools/.cvsignore b/ACE/examples/APG/ThreadPools/.cvsignore
new file mode 100644
index 00000000000..7052a85815f
--- /dev/null
+++ b/ACE/examples/APG/ThreadPools/.cvsignore
@@ -0,0 +1,10 @@
+Futures
+Futures
+LF_ThreadPool
+LF_ThreadPool
+TP_Reactor
+TP_Reactor
+Task_ThreadPool
+Task_ThreadPool
+ThreadPool
+ThreadPool
diff --git a/ACE/examples/APG/ThreadPools/Makefile.am b/ACE/examples/APG/ThreadPools/Makefile.am
index f9e97f36719..f1167e857c5 100644
--- a/ACE/examples/APG/ThreadPools/Makefile.am
+++ b/ACE/examples/APG/ThreadPools/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Futures.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Futures
 
 Futures_CPPFLAGS = \
@@ -33,7 +32,6 @@ Futures_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.LF_ThreadPool.am
-
 noinst_PROGRAMS += LF_ThreadPool
 
 LF_ThreadPool_CPPFLAGS = \
@@ -48,7 +46,6 @@ LF_ThreadPool_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TP_Reactor.am
-
 noinst_PROGRAMS += TP_Reactor
 
 TP_Reactor_CPPFLAGS = \
@@ -63,7 +60,6 @@ TP_Reactor_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Task_ThreadPool.am
-
 noinst_PROGRAMS += Task_ThreadPool
 
 Task_ThreadPool_CPPFLAGS = \
@@ -78,7 +74,6 @@ Task_ThreadPool_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.ThreadPool.am
-
 noinst_PROGRAMS += ThreadPool
 
 ThreadPool_CPPFLAGS = \
diff --git a/ACE/examples/APG/ThreadSafety/.cvsignore b/ACE/examples/APG/ThreadSafety/.cvsignore
new file mode 100644
index 00000000000..7fe1b99d03f
--- /dev/null
+++ b/ACE/examples/APG/ThreadSafety/.cvsignore
@@ -0,0 +1,16 @@
+Atomic_Op
+Atomic_Op
+Barrier
+Barrier
+Mutex
+Mutex
+RW_Lock
+RW_Lock
+Semaphore
+Semaphore
+TSS
+TSS
+Tokens
+Tokens
+Tokens_Deadlock
+Tokens_Deadlock
diff --git a/ACE/examples/APG/ThreadSafety/Makefile.am b/ACE/examples/APG/ThreadSafety/Makefile.am
index 35b216c41fc..e7c52980171 100644
--- a/ACE/examples/APG/ThreadSafety/Makefile.am
+++ b/ACE/examples/APG/ThreadSafety/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.Atomic_Op.am
-
 noinst_PROGRAMS = Atomic_Op
 
 Atomic_Op_CPPFLAGS = \
@@ -28,7 +27,6 @@ Atomic_Op_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Barrier.am
-
 noinst_PROGRAMS += Barrier
 
 Barrier_CPPFLAGS = \
@@ -43,7 +41,6 @@ Barrier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Mutex.am
-
 noinst_PROGRAMS += Mutex
 
 Mutex_CPPFLAGS = \
@@ -60,7 +57,6 @@ Mutex_LDADD = \
 ## Makefile.RW_Lock.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += RW_Lock
 
 RW_Lock_CPPFLAGS = \
@@ -79,7 +75,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Semaphore.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Semaphore
 
 Semaphore_CPPFLAGS = \
@@ -96,7 +91,6 @@ Semaphore_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.TSS.am
-
 noinst_PROGRAMS += TSS
 
 TSS_CPPFLAGS = \
@@ -111,7 +105,6 @@ TSS_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Tokens.am
-
 noinst_PROGRAMS += Tokens
 
 Tokens_CPPFLAGS = \
@@ -126,7 +119,6 @@ Tokens_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Tokens_Deadlock.am
-
 noinst_PROGRAMS += Tokens_Deadlock
 
 Tokens_Deadlock_CPPFLAGS = \
diff --git a/ACE/examples/APG/Threads/.cvsignore b/ACE/examples/APG/Threads/.cvsignore
new file mode 100644
index 00000000000..feb9ec3ab97
--- /dev/null
+++ b/ACE/examples/APG/Threads/.cvsignore
@@ -0,0 +1,12 @@
+Activate
+Activate
+Condition_Variables
+Condition_Variables
+Guards
+Guards
+Message_Blocks
+Message_Blocks
+Message_Queue
+Message_Queue
+Mutexes
+Mutexes
diff --git a/ACE/examples/APG/Threads/Makefile.am b/ACE/examples/APG/Threads/Makefile.am
index c580c298dbd..a5a1b77d76a 100644
--- a/ACE/examples/APG/Threads/Makefile.am
+++ b/ACE/examples/APG/Threads/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Activate.am
-
 noinst_PROGRAMS = Activate
 
 Activate_CPPFLAGS = \
@@ -27,7 +26,6 @@ Activate_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Condition_Variables.am
-
 noinst_PROGRAMS += Condition_Variables
 
 Condition_Variables_CPPFLAGS = \
@@ -42,7 +40,6 @@ Condition_Variables_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Guards.am
-
 noinst_PROGRAMS += Guards
 
 Guards_CPPFLAGS = \
@@ -57,7 +54,6 @@ Guards_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Message_Blocks.am
-
 noinst_PROGRAMS += Message_Blocks
 
 Message_Blocks_CPPFLAGS = \
@@ -72,7 +68,6 @@ Message_Blocks_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Message_Queue.am
-
 noinst_PROGRAMS += Message_Queue
 
 Message_Queue_CPPFLAGS = \
@@ -87,7 +82,6 @@ Message_Queue_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Mutexes.am
-
 noinst_PROGRAMS += Mutexes
 
 Mutexes_CPPFLAGS = \
diff --git a/ACE/examples/APG/Timers/.cvsignore b/ACE/examples/APG/Timers/.cvsignore
new file mode 100644
index 00000000000..9137f2e897a
--- /dev/null
+++ b/ACE/examples/APG/Timers/.cvsignore
@@ -0,0 +1,8 @@
+Alarm
+Alarm
+Task
+Task
+Timers
+Timers
+Upcall
+Upcall
diff --git a/ACE/examples/APG/Timers/Makefile.am b/ACE/examples/APG/Timers/Makefile.am
index 9c09e5a22b8..33976800fec 100644
--- a/ACE/examples/APG/Timers/Makefile.am
+++ b/ACE/examples/APG/Timers/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Alarm.am
-
 noinst_PROGRAMS = Alarm
 
 Alarm_CPPFLAGS = \
@@ -31,7 +30,6 @@ Alarm_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Task.am
-
 noinst_PROGRAMS += Task
 
 Task_CPPFLAGS = \
@@ -50,7 +48,6 @@ Task_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Timers.am
-
 noinst_PROGRAMS += Timers
 
 Timers_CPPFLAGS = \
@@ -68,7 +65,6 @@ Timers_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Upcall.am
-
 noinst_PROGRAMS += Upcall
 
 Upcall_CPPFLAGS = \
diff --git a/ACE/examples/ASX/.cvsignore b/ACE/examples/ASX/.cvsignore
new file mode 100644
index 00000000000..1eb7e8a0b93
--- /dev/null
+++ b/ACE/examples/ASX/.cvsignore
@@ -0,0 +1 @@
+Mess
diff --git a/ACE/examples/ASX/CCM_App/.cvsignore b/ACE/examples/ASX/CCM_App/.cvsignore
new file mode 100644
index 00000000000..955ffdc75d5
--- /dev/null
+++ b/ACE/examples/ASX/CCM_App/.cvsignore
@@ -0,0 +1,4 @@
+client
+client
+server
+server
diff --git a/ACE/examples/ASX/CCM_App/Makefile.am b/ACE/examples/ASX/CCM_App/Makefile.am
index 78ded02a046..e4051c952ad 100644
--- a/ACE/examples/ASX/CCM_App/Makefile.am
+++ b/ACE/examples/ASX/CCM_App/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -23,7 +23,6 @@ libccm_app_la_SOURCES = \
   CCM_App.cpp
 
 ## Makefile.ASX_CCM_App_Server.am
-
 noinst_PROGRAMS = server
 
 server_CPPFLAGS = \
@@ -37,7 +36,6 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.ASX_CCM_App_Client.am
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am
index aefe1873d9d..1664c15834f 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.Event_Server.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = Event_Server
 
 Event_Server_CPPFLAGS = \
diff --git a/ACE/examples/ASX/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Makefile.am
index f00f4c3dd09..b337a11860a 100644
--- a/ACE/examples/ASX/Event_Server/Makefile.am
+++ b/ACE/examples/ASX/Event_Server/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Event_Server \
diff --git a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am b/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am
index f4ba3b5bf56..9407ab5873b 100644
--- a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am
+++ b/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Transceiver.am
-
 noinst_PROGRAMS = Transceiver
 
 Transceiver_CPPFLAGS = \
diff --git a/ACE/examples/ASX/Makefile.am b/ACE/examples/ASX/Makefile.am
index 22df464dcfc..ecfcb575851 100644
--- a/ACE/examples/ASX/Makefile.am
+++ b/ACE/examples/ASX/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         CCM_App \
diff --git a/ACE/examples/ASX/Message_Queue/.cvsignore b/ACE/examples/ASX/Message_Queue/.cvsignore
new file mode 100644
index 00000000000..2b68761db9c
--- /dev/null
+++ b/ACE/examples/ASX/Message_Queue/.cvsignore
@@ -0,0 +1,6 @@
+bounded_buffer
+bounded_buffer
+buffer_stream
+buffer_stream
+priority_buffer
+priority_buffer
diff --git a/ACE/examples/ASX/Message_Queue/Makefile.am b/ACE/examples/ASX/Message_Queue/Makefile.am
index 3305b17bf1f..67e75b6c241 100644
--- a/ACE/examples/ASX/Message_Queue/Makefile.am
+++ b/ACE/examples/ASX/Message_Queue/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.ASX_Message_Queue_Bounded_Buffer.am
-
 noinst_PROGRAMS = bounded_buffer
 
 bounded_buffer_CPPFLAGS = \
@@ -29,7 +28,6 @@ bounded_buffer_LDADD = \
 ## Makefile.ASX_Message_Queue_Buffer_Stream.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += buffer_stream
 
 buffer_stream_CPPFLAGS = \
@@ -45,7 +43,6 @@ buffer_stream_LDADD = \
 endif !BUILD_USES_WCHAR
 
 ## Makefile.ASX_Message_Queue_Priority_Buffer.am
-
 noinst_PROGRAMS += priority_buffer
 
 priority_buffer_CPPFLAGS = \
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am b/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am
index f8ac89a7479..094c82c0f1b 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.UPIPE_Event_Server.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = UPIPE_Event_Server
 
 UPIPE_Event_Server_CPPFLAGS = \
diff --git a/ACE/examples/Bounded_Packet_Relay/.cvsignore b/ACE/examples/Bounded_Packet_Relay/.cvsignore
new file mode 100644
index 00000000000..2f50e8efaee
--- /dev/null
+++ b/ACE/examples/Bounded_Packet_Relay/.cvsignore
@@ -0,0 +1,2 @@
+bpr_thread
+bpr_thread
diff --git a/ACE/examples/Bounded_Packet_Relay/Makefile.am b/ACE/examples/Bounded_Packet_Relay/Makefile.am
index 46e3ffc8ff4..5fb14ba2d05 100644
--- a/ACE/examples/Bounded_Packet_Relay/Makefile.am
+++ b/ACE/examples/Bounded_Packet_Relay/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Bounded_Packet_Relay.am
-
 noinst_PROGRAMS = bpr_thread
 
 bpr_thread_CPPFLAGS = \
diff --git a/ACE/examples/C++NPv1/.cvsignore b/ACE/examples/C++NPv1/.cvsignore
new file mode 100644
index 00000000000..7735c154a0c
--- /dev/null
+++ b/ACE/examples/C++NPv1/.cvsignore
@@ -0,0 +1,14 @@
+RTTPC_logging_server
+RTTPC_logging_server
+iterative_logging_server
+iterative_logging_server
+logging_client
+logging_client
+ppc_logging_server
+ppc_logging_server
+reactive_logging_server
+reactive_logging_server
+reactive_logging_server_ex
+reactive_logging_server_ex
+tpc_logging_server
+tpc_logging_server
diff --git a/ACE/examples/C++NPv1/Makefile.am b/ACE/examples/C++NPv1/Makefile.am
index 7a1b1afee8d..5c46ae7f00d 100644
--- a/ACE/examples/C++NPv1/Makefile.am
+++ b/ACE/examples/C++NPv1/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += iterative_logging_server
 
 iterative_logging_server_CPPFLAGS = \
@@ -41,7 +40,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.C++NPv1_Logging_Client.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += logging_client
 
 logging_client_CPPFLAGS = \
@@ -68,7 +66,6 @@ endif !BUILD_USES_WCHAR
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += ppc_logging_server
 
 ppc_logging_server_CPPFLAGS = \
@@ -93,7 +90,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += RTTPC_logging_server
 
 RTTPC_logging_server_CPPFLAGS = \
@@ -118,7 +114,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += reactive_logging_server
 
 reactive_logging_server_CPPFLAGS = \
@@ -143,7 +138,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += reactive_logging_server_ex
 
 reactive_logging_server_ex_CPPFLAGS = \
@@ -168,7 +162,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += tpc_logging_server
 
 tpc_logging_server_CPPFLAGS = \
diff --git a/ACE/examples/C++NPv2/.cvsignore b/ACE/examples/C++NPv2/.cvsignore
new file mode 100644
index 00000000000..560cd9f1c78
--- /dev/null
+++ b/ACE/examples/C++NPv2/.cvsignore
@@ -0,0 +1,14 @@
+configurable_logging_server
+configurable_logging_server
+display_logfile
+display_logfile
+reactor_logging_server
+reactor_logging_server
+select_reactor_loggin_server
+select_reactor_loggin_server
+sr_configurable_logging_server
+sr_configurable_logging_server
+tp_reactor_logging_server
+tp_reactor_logging_server
+x
+x
diff --git a/ACE/examples/C++NPv2/Makefile.am b/ACE/examples/C++NPv2/Makefile.am
index f6c3d89bc4e..e15da126644 100644
--- a/ACE/examples/C++NPv2/Makefile.am
+++ b/ACE/examples/C++NPv2/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -18,7 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.C++NPv2_AC_CLD.am
 
 if BUILD_SSL
-if BUILD_THREADS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
 
 noinst_LTLIBRARIES += libAC_CLD.la
@@ -43,12 +43,13 @@ noinst_HEADERS += \
   Reactor_Logging_Server_T.cpp
 
 endif !BUILD_USES_WCHAR
-endif BUILD_THREADS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Makefile.C++NPv2_AIO_CLD.am
 
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_LTLIBRARIES += libAIO_CLD.la
 
@@ -69,6 +70,7 @@ noinst_HEADERS += \
   AIO_Client_Logging_Daemon.h \
   Reactor_Logging_Server_T.cpp
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Makefile.C++NPv2_CLD.am
@@ -101,7 +103,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.C++NPv2_Configurable_Log_Server.am
 
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += configurable_logging_server
 
 configurable_logging_server_CPPFLAGS = \
@@ -121,7 +122,6 @@ endif !BUILD_USES_WCHAR
 ## Makefile.C++NPv2_Display_Logfile.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += display_logfile
 
 display_logfile_CPPFLAGS = \
@@ -159,7 +159,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += reactor_logging_server
 
 reactor_logging_server_CPPFLAGS = \
@@ -243,7 +242,6 @@ endif !BUILD_USES_WCHAR
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.C++NPv2_SR_Configurable_Log_Server.am
-
 noinst_PROGRAMS += sr_configurable_logging_server
 
 sr_configurable_logging_server_CPPFLAGS = \
@@ -279,7 +277,6 @@ sr_configurable_logging_server_LDADD = \
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += select_reactor_logging_server
 
 select_reactor_logging_server_CPPFLAGS = \
@@ -306,6 +303,7 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.C++NPv2_TPCLS.am
 
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
 
 noinst_LTLIBRARIES += libTPCLS.la
@@ -330,6 +328,7 @@ noinst_HEADERS += \
   TPC_Logging_Server.h
 
 endif !BUILD_USES_WCHAR
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Makefile.C++NPv2_TPLS.am
@@ -364,7 +363,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += tp_reactor_logging_server
 
 tp_reactor_logging_server_CPPFLAGS = \
@@ -393,7 +391,6 @@ endif !BUILD_ACE_FOR_TAO
 if BUILD_WFMO
 if !BUILD_ACE_FOR_TAO
 if !BUILD_USES_WCHAR
-
 noinst_PROGRAMS += wfmo_reactor_logging_server
 
 wfmo_reactor_logging_server_CPPFLAGS = \
diff --git a/ACE/examples/ConfigViewer/Makefile.am b/ACE/examples/ConfigViewer/Makefile.am
deleted file mode 100644
index af88c534c34..00000000000
--- a/ACE/examples/ConfigViewer/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
-
-ACE_BUILDDIR = $(top_builddir)
-ACE_ROOT = $(top_srcdir)
-
-
-## Makefile.ConfigViewer.am
-
-if BUILD_WXWINDOWS
-
-noinst_LTLIBRARIES = libConfigViewer.la
-
-libConfigViewer_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  $(ACE_WX_CPPFLAGS)
-
-libConfigViewer_la_SOURCES = \
-  ConfigTreeCtrl.cpp \
-  ConfigurationViewer.cpp \
-  MainFrame.cpp \
-  ValueDlg.cpp \
-  ValueListCtrl.cpp
-
-libConfigViewer_la_LDFLAGS = \
- $(ACE_WX_LDFLAGS)
-
-noinst_HEADERS = \
-  ConfigTreeCtrl.h \
-  MainFrame.h \
-  ValueDlg.h \
-  ValueListCtrl.h
-
-endif BUILD_WXWINDOWS
-
-EXTRA_DIST = \
-  ConfigurationViewer.rc
-
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/examples/Connection/Makefile.am b/ACE/examples/Connection/Makefile.am
index 36a9cc8383a..8aa21d598ff 100644
--- a/ACE/examples/Connection/Makefile.am
+++ b/ACE/examples/Connection/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         blocking \
diff --git a/ACE/examples/Connection/blocking/.cvsignore b/ACE/examples/Connection/blocking/.cvsignore
new file mode 100644
index 00000000000..07fde30990a
--- /dev/null
+++ b/ACE/examples/Connection/blocking/.cvsignore
@@ -0,0 +1,4 @@
+acceptor
+acceptor
+connector
+connector
diff --git a/ACE/examples/Connection/blocking/Makefile.am b/ACE/examples/Connection/blocking/Makefile.am
index 60957cddcb2..a12eab920b8 100644
--- a/ACE/examples/Connection/blocking/Makefile.am
+++ b/ACE/examples/Connection/blocking/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Connection_Blocking_Acceptor.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += acceptor
 
 acceptor_CPPFLAGS = \
@@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Connection_Blocking_Connector.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += connector
 
 connector_CPPFLAGS = \
diff --git a/ACE/examples/Connection/misc/.cvsignore b/ACE/examples/Connection/misc/.cvsignore
new file mode 100644
index 00000000000..444ad7e1b3a
--- /dev/null
+++ b/ACE/examples/Connection/misc/.cvsignore
@@ -0,0 +1,4 @@
+handler
+handler
+test_upipe
+test_upipe
diff --git a/ACE/examples/Connection/misc/Makefile.am b/ACE/examples/Connection/misc/Makefile.am
index 58a17aad6c8..ce3790d2851 100644
--- a/ACE/examples/Connection/misc/Makefile.am
+++ b/ACE/examples/Connection/misc/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.Connection_Misc_Handler.am
-
 noinst_PROGRAMS = handler
 
 handler_CPPFLAGS = \
@@ -30,7 +29,6 @@ handler_LDADD = \
 ## Makefile.Connection_Misc_Test_Upipe.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_upipe
 
 test_upipe_CPPFLAGS = \
diff --git a/ACE/examples/Connection/non_blocking/.cvsignore b/ACE/examples/Connection/non_blocking/.cvsignore
new file mode 100644
index 00000000000..0cbd7c83956
--- /dev/null
+++ b/ACE/examples/Connection/non_blocking/.cvsignore
@@ -0,0 +1,16 @@
+lsock_client
+lsock_client
+lsock_server
+lsock_server
+sock_client
+sock_client
+sock_server
+sock_server
+spipe_client
+spipe_client
+spipe_server
+spipe_server
+tli_client
+tli_client
+tli_server
+tli_server
diff --git a/ACE/examples/Connection/non_blocking/Makefile.am b/ACE/examples/Connection/non_blocking/Makefile.am
index 3f168c27031..8395e3a9fbb 100644
--- a/ACE/examples/Connection/non_blocking/Makefile.am
+++ b/ACE/examples/Connection/non_blocking/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Connection_Non_Blocking_LSockClient.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += lsock_client
 
 lsock_client_CPPFLAGS = \
@@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Connection_Non_Blocking_LSockServer.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += lsock_server
 
 lsock_server_CPPFLAGS = \
@@ -54,7 +52,6 @@ lsock_server_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Connection_Non_Blocking_SPipeClient.am
-
 noinst_PROGRAMS += spipe_client
 
 spipe_client_CPPFLAGS = \
@@ -70,7 +67,6 @@ spipe_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Connection_Non_Blocking_SPipeServer.am
-
 noinst_PROGRAMS += spipe_server
 
 spipe_server_CPPFLAGS = \
@@ -86,7 +82,6 @@ spipe_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Connection_Non_Blocking_SockClient.am
-
 noinst_PROGRAMS += sock_client
 
 sock_client_CPPFLAGS = \
@@ -102,7 +97,6 @@ sock_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Connection_Non_Blocking_SockServer.am
-
 noinst_PROGRAMS += sock_server
 
 sock_server_CPPFLAGS = \
@@ -118,7 +112,6 @@ sock_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Connection_Non_Blocking_TLIClient.am
-
 noinst_PROGRAMS += tli_client
 
 tli_client_CPPFLAGS = \
@@ -134,7 +127,6 @@ tli_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Connection_Non_Blocking_TLIServer.am
-
 noinst_PROGRAMS += tli_server
 
 tli_server_CPPFLAGS = \
diff --git a/ACE/examples/DLL/.cvsignore b/ACE/examples/DLL/.cvsignore
new file mode 100644
index 00000000000..c2d3a626997
--- /dev/null
+++ b/ACE/examples/DLL/.cvsignore
@@ -0,0 +1,2 @@
+test_dll
+test_dll
diff --git a/ACE/examples/DLL/Makefile.am b/ACE/examples/DLL/Makefile.am
index 5e76d980938..4973af35bf9 100644
--- a/ACE/examples/DLL/Makefile.am
+++ b/ACE/examples/DLL/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -40,7 +40,6 @@ noinst_HEADERS += \
   Newsweek.h
 
 ## Makefile.DLL_Main.am
-
 noinst_PROGRAMS = test_dll
 
 test_dll_CPPFLAGS = \
diff --git a/ACE/examples/Export/.cvsignore b/ACE/examples/Export/.cvsignore
new file mode 100644
index 00000000000..dec2cbe1fa3
--- /dev/null
+++ b/ACE/examples/Export/.cvsignore
@@ -0,0 +1,2 @@
+test
+test
diff --git a/ACE/examples/Export/Makefile.am b/ACE/examples/Export/Makefile.am
index 671f716aaae..74baf4baf66 100644
--- a/ACE/examples/Export/Makefile.am
+++ b/ACE/examples/Export/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -27,7 +27,6 @@ noinst_HEADERS = \
   dll.h
 
 ## Makefile.Export_Test.am
-
 noinst_PROGRAMS = test
 
 test_CPPFLAGS = \
diff --git a/ACE/examples/IOStream/Makefile.am b/ACE/examples/IOStream/Makefile.am
index 3ad9fe59404..0a99932ce34 100644
--- a/ACE/examples/IOStream/Makefile.am
+++ b/ACE/examples/IOStream/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         client \
diff --git a/ACE/examples/IOStream/client/.cvsignore b/ACE/examples/IOStream/client/.cvsignore
new file mode 100644
index 00000000000..957822b2487
--- /dev/null
+++ b/ACE/examples/IOStream/client/.cvsignore
@@ -0,0 +1 @@
+iostream_client
diff --git a/ACE/examples/IOStream/client/Makefile.am b/ACE/examples/IOStream/client/Makefile.am
index 28b28e0941c..e1225bbb6d5 100644
--- a/ACE/examples/IOStream/client/Makefile.am
+++ b/ACE/examples/IOStream/client/Makefile.am
@@ -6,25 +6,21 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.IOStream_Client.am
+noinst_LTLIBRARIES = libIOStream_Client.la
 
-noinst_PROGRAMS = iostream_client
-
-iostream_client_CPPFLAGS = \
+libIOStream_Client_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR)
 
-iostream_client_SOURCES = \
+libIOStream_Client_la_SOURCES = \
   iostream_client.cpp
 
-iostream_client_LDADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/ACE/examples/IOStream/server/.cvsignore b/ACE/examples/IOStream/server/.cvsignore
new file mode 100644
index 00000000000..8cf9727e75f
--- /dev/null
+++ b/ACE/examples/IOStream/server/.cvsignore
@@ -0,0 +1 @@
+iostream_server
diff --git a/ACE/examples/IOStream/server/Makefile.am b/ACE/examples/IOStream/server/Makefile.am
index f3d195a413b..8b72a1adb62 100644
--- a/ACE/examples/IOStream/server/Makefile.am
+++ b/ACE/examples/IOStream/server/Makefile.am
@@ -6,25 +6,23 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.IOStream_Server.am
+noinst_LTLIBRARIES = libIOStream_Server.la
 
-noinst_PROGRAMS = iostream_server
-
-iostream_server_CPPFLAGS = \
+libIOStream_Server_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR)
 
-iostream_server_SOURCES = \
-  iostream_server.cpp \
-  iostream_server.h
+libIOStream_Server_la_SOURCES = \
+  iostream_server.cpp
 
-iostream_server_LDADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
+noinst_HEADERS = \
+  iostream_server.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/ACE/examples/IPC_SAP/ATM_SAP/.cvsignore b/ACE/examples/IPC_SAP/ATM_SAP/.cvsignore
new file mode 100644
index 00000000000..955ffdc75d5
--- /dev/null
+++ b/ACE/examples/IPC_SAP/ATM_SAP/.cvsignore
@@ -0,0 +1,4 @@
+client
+client
+server
+server
diff --git a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am b/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am
index 45504c71ea1..e3ee4011b05 100644
--- a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.atm_sap_client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -26,7 +25,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.atm_sap_server.am
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
diff --git a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am
index ecc65507d22..bb95a489da6 100644
--- a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         reader \
diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/.cvsignore b/ACE/examples/IPC_SAP/DEV_SAP/reader/.cvsignore
new file mode 100644
index 00000000000..a8dd7d50c82
--- /dev/null
+++ b/ACE/examples/IPC_SAP/DEV_SAP/reader/.cvsignore
@@ -0,0 +1,2 @@
+reader
+reader
diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am
index ebd4eb798b8..bff70f43cd3 100644
--- a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am
+++ b/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.dev_sap_reader.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = reader
 
 reader_CPPFLAGS = \
diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/.cvsignore b/ACE/examples/IPC_SAP/DEV_SAP/writer/.cvsignore
new file mode 100644
index 00000000000..d66df395ab8
--- /dev/null
+++ b/ACE/examples/IPC_SAP/DEV_SAP/writer/.cvsignore
@@ -0,0 +1,2 @@
+writer
+writer
diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am
index b660839e482..613a8d08102 100644
--- a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am
+++ b/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.dev_sap_writer.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = writer
 
 writer_CPPFLAGS = \
diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/.cvsignore b/ACE/examples/IPC_SAP/FIFO_SAP/.cvsignore
new file mode 100644
index 00000000000..5d0734ead63
--- /dev/null
+++ b/ACE/examples/IPC_SAP/FIFO_SAP/.cvsignore
@@ -0,0 +1,10 @@
+FIFO-Msg-client
+FIFO-Msg-client
+FIFO-Msg-server
+FIFO-Msg-server
+FIFO-client
+FIFO-client
+FIFO-server
+FIFO-server
+FIFO-test
+FIFO-test
diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am b/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am
index b207926d2c8..9a9cba4b837 100644
--- a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.Fifo_Sap_Msg_Client.am
-
 noinst_PROGRAMS = FIFO-Msg-client
 
 FIFO_Msg_client_CPPFLAGS = \
@@ -27,7 +26,6 @@ FIFO_Msg_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Fifo_Sap_Msg_Server.am
-
 noinst_PROGRAMS += FIFO-Msg-server
 
 FIFO_Msg_server_CPPFLAGS = \
@@ -43,7 +41,6 @@ FIFO_Msg_server_LDADD = \
 ## Makefile.fifo_sap_client.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += FIFO-client
 
 FIFO_client_CPPFLAGS = \
@@ -61,7 +58,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.fifo_sap_server.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += FIFO-server
 
 FIFO_server_CPPFLAGS = \
@@ -79,7 +75,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.fifo_sap_test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += FIFO-test
 
 FIFO_test_CPPFLAGS = \
diff --git a/ACE/examples/IPC_SAP/FILE_SAP/.cvsignore b/ACE/examples/IPC_SAP/FILE_SAP/.cvsignore
new file mode 100644
index 00000000000..db648aa002d
--- /dev/null
+++ b/ACE/examples/IPC_SAP/FILE_SAP/.cvsignore
@@ -0,0 +1,2 @@
+client
+client
diff --git a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am b/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am
index 64d2126adcf..e39aa964edf 100644
--- a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.file_sap_client.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
diff --git a/ACE/examples/IPC_SAP/Makefile.am b/ACE/examples/IPC_SAP/Makefile.am
index 31c046f885a..87f2a00844b 100644
--- a/ACE/examples/IPC_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         ATM_SAP \
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/.cvsignore b/ACE/examples/IPC_SAP/SOCK_SAP/.cvsignore
new file mode 100644
index 00000000000..07a07ab2d27
--- /dev/null
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/.cvsignore
@@ -0,0 +1,18 @@
+C-inclient
+C-inclient
+C-inserver
+C-inserver
+CPP-inclient
+CPP-inclient
+CPP-inserver
+CPP-inserver
+CPP-memclient
+CPP-memclient
+CPP-memserver
+CPP-memserver
+CPP-unclient
+CPP-unclient
+CPP-unserver
+CPP-unserver
+FD-unclient
+FD-unclient
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am b/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am
index 803dc5bbf7f..50260dc7343 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.Sock_Sap_CPP_Inclient.am
-
 noinst_PROGRAMS = CPP-inclient
 
 CPP_inclient_CPPFLAGS = \
@@ -30,7 +29,6 @@ CPP_inclient_LDADD = \
 ## Makefile.Sock_Sap_CPP_Inserver.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += CPP-inserver
 
 CPP_inserver_CPPFLAGS = \
@@ -50,7 +48,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Sock_Sap_CPP_Memclient.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += CPP-memclient
 
 CPP_memclient_CPPFLAGS = \
@@ -70,7 +67,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Sock_Sap_CPP_Memserver.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += CPP-memserver
 
 CPP_memserver_CPPFLAGS = \
@@ -90,7 +86,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Sock_Sap_CPP_Unclient.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += CPP-unclient
 
 CPP_unclient_CPPFLAGS = \
@@ -110,7 +105,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Sock_Sap_CPP_Unserver.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += CPP-unserver
 
 CPP_unserver_CPPFLAGS = \
@@ -128,7 +122,6 @@ CPP_unserver_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Sock_Sap_C_Inclient.am
-
 noinst_PROGRAMS += C-inclient
 
 C_inclient_CPPFLAGS = \
@@ -144,7 +137,6 @@ C_inclient_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Sock_Sap_C_Inserver.am
-
 noinst_PROGRAMS += C-inserver
 
 C_inserver_CPPFLAGS = \
@@ -162,7 +154,6 @@ C_inserver_LDADD = \
 ## Makefile.Sock_Sap_FD_Unclient.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += FD-unclient
 
 FD_unclient_CPPFLAGS = \
diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/.cvsignore b/ACE/examples/IPC_SAP/SPIPE_SAP/.cvsignore
new file mode 100644
index 00000000000..46bf34bbdfd
--- /dev/null
+++ b/ACE/examples/IPC_SAP/SPIPE_SAP/.cvsignore
@@ -0,0 +1,16 @@
+NPClient
+NPClient
+NPServer
+NPServer
+client
+client
+consumer_msg
+consumer_msg
+consumer_read
+consumer_read
+producer_msg
+producer_msg
+producer_read
+producer_read
+server
+server
diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am
index 9979c8a5751..662c99fc452 100644
--- a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.SPIPE_SAP_Client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -27,7 +26,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SPIPE_SAP_Consumer_Msg.am
-
 noinst_PROGRAMS += consumer_msg
 
 consumer_msg_CPPFLAGS = \
@@ -42,7 +40,6 @@ consumer_msg_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SPIPE_SAP_Consumer_Read.am
-
 noinst_PROGRAMS += consumer_read
 
 consumer_read_CPPFLAGS = \
@@ -57,7 +54,6 @@ consumer_read_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SPIPE_SAP_NPClient.am
-
 noinst_PROGRAMS += NPClient
 
 NPClient_CPPFLAGS = \
@@ -72,7 +68,6 @@ NPClient_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SPIPE_SAP_NPServer.am
-
 noinst_PROGRAMS += NPServer
 
 NPServer_CPPFLAGS = \
@@ -87,7 +82,6 @@ NPServer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SPIPE_SAP_Producer_Msg.am
-
 noinst_PROGRAMS += producer_msg
 
 producer_msg_CPPFLAGS = \
@@ -102,7 +96,6 @@ producer_msg_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SPIPE_SAP_Producer_Read.am
-
 noinst_PROGRAMS += producer_read
 
 producer_read_CPPFLAGS = \
@@ -117,7 +110,6 @@ producer_read_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SPIPE_SAP_Server.am
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am b/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am
index 5a0e4bc3dfb..3df4d11db5b 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/examples/IPC_SAP/TLI_SAP/.cvsignore b/ACE/examples/IPC_SAP/TLI_SAP/.cvsignore
new file mode 100644
index 00000000000..db59757e191
--- /dev/null
+++ b/ACE/examples/IPC_SAP/TLI_SAP/.cvsignore
@@ -0,0 +1,16 @@
+ATM-client
+ATM-client
+ATM-server
+ATM-server
+CPP-client
+CPP-client
+CPP-server
+CPP-server
+db-client
+db-client
+db-server
+db-server
+ftp-client
+ftp-client
+ftp-server
+ftp-server
diff --git a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am b/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am
index 3f9a09726d2..80b48222d22 100644
--- a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.TLI_SAP_ATM_Client.am
-
 noinst_PROGRAMS = ATM-client
 
 ATM_client_CPPFLAGS = \
@@ -26,7 +25,6 @@ ATM_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TLI_SAP_ATM_Server.am
-
 noinst_PROGRAMS += ATM-server
 
 ATM_server_CPPFLAGS = \
@@ -40,7 +38,6 @@ ATM_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TLI_SAP_CPP_Client.am
-
 noinst_PROGRAMS += CPP-client
 
 CPP_client_CPPFLAGS = \
@@ -54,7 +51,6 @@ CPP_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TLI_SAP_CPP_Server.am
-
 noinst_PROGRAMS += CPP-server
 
 CPP_server_CPPFLAGS = \
@@ -68,7 +64,6 @@ CPP_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TLI_SAP_Db_Client.am
-
 noinst_PROGRAMS += db-client
 
 db_client_CPPFLAGS = \
@@ -82,7 +77,6 @@ db_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TLI_SAP_Db_Server.am
-
 noinst_PROGRAMS += db-server
 
 db_server_CPPFLAGS = \
@@ -96,7 +90,6 @@ db_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TLI_SAP_Ftp_Client.am
-
 noinst_PROGRAMS += ftp-client
 
 ftp_client_CPPFLAGS = \
@@ -110,7 +103,6 @@ ftp_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TLI_SAP_Ftp_Server.am
-
 noinst_PROGRAMS += ftp-server
 
 ftp_server_CPPFLAGS = \
diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/.cvsignore b/ACE/examples/IPC_SAP/UPIPE_SAP/.cvsignore
new file mode 100644
index 00000000000..66a3e2ba941
--- /dev/null
+++ b/ACE/examples/IPC_SAP/UPIPE_SAP/.cvsignore
@@ -0,0 +1,6 @@
+ex1
+ex1
+ex2
+ex2
+ex3
+ex3
diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am
index 90563ab7883..60054e3c7c0 100644
--- a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am
+++ b/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.UPIPE_SAP_Ex1.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += ex1
 
 ex1_CPPFLAGS = \
@@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.UPIPE_SAP_Ex2.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += ex2
 
 ex2_CPPFLAGS = \
@@ -52,7 +50,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.UPIPE_SAP_Ex3.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += ex3
 
 ex3_CPPFLAGS = \
diff --git a/ACE/examples/Log_Msg/.cvsignore b/ACE/examples/Log_Msg/.cvsignore
new file mode 100644
index 00000000000..c4e57879139
--- /dev/null
+++ b/ACE/examples/Log_Msg/.cvsignore
@@ -0,0 +1,6 @@
+test_callback
+test_callback
+test_log_msg
+test_log_msg
+test_ostream
+test_ostream
diff --git a/ACE/examples/Log_Msg/Makefile.am b/ACE/examples/Log_Msg/Makefile.am
index 9653b5933dc..c5d038d332d 100644
--- a/ACE/examples/Log_Msg/Makefile.am
+++ b/ACE/examples/Log_Msg/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Log_Msg_Test_Callback.am
-
 noinst_PROGRAMS = test_callback
 
 test_callback_CPPFLAGS = \
@@ -26,7 +25,6 @@ test_callback_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Log_Msg_Test_Log_Msg.am
-
 noinst_PROGRAMS += test_log_msg
 
 test_log_msg_CPPFLAGS = \
@@ -40,7 +38,6 @@ test_log_msg_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Log_Msg_Test_Ostream.am
-
 noinst_PROGRAMS += test_ostream
 
 test_ostream_CPPFLAGS = \
diff --git a/ACE/examples/Logger/Acceptor-server/.cvsignore b/ACE/examples/Logger/Acceptor-server/.cvsignore
new file mode 100644
index 00000000000..76c31d8c56f
--- /dev/null
+++ b/ACE/examples/Logger/Acceptor-server/.cvsignore
@@ -0,0 +1,2 @@
+server_loggerd
+server_loggerd
diff --git a/ACE/examples/Logger/Acceptor-server/Makefile.am b/ACE/examples/Logger/Acceptor-server/Makefile.am
index b970349c834..bf1824c86d3 100644
--- a/ACE/examples/Logger/Acceptor-server/Makefile.am
+++ b/ACE/examples/Logger/Acceptor-server/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Logger_Acceptor_Server.am
-
 noinst_PROGRAMS = server_loggerd
 
 server_loggerd_CPPFLAGS = \
diff --git a/ACE/examples/Logger/Makefile.am b/ACE/examples/Logger/Makefile.am
index 29e3225dcbe..3aa67282ba4 100644
--- a/ACE/examples/Logger/Makefile.am
+++ b/ACE/examples/Logger/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Acceptor-server \
diff --git a/ACE/examples/Logger/client/.cvsignore b/ACE/examples/Logger/client/.cvsignore
new file mode 100644
index 00000000000..6c538132cc9
--- /dev/null
+++ b/ACE/examples/Logger/client/.cvsignore
@@ -0,0 +1,2 @@
+logging_app
+logging_app
diff --git a/ACE/examples/Logger/client/Makefile.am b/ACE/examples/Logger/client/Makefile.am
index 008d881f350..d38d5699588 100644
--- a/ACE/examples/Logger/client/Makefile.am
+++ b/ACE/examples/Logger/client/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Logger_client.am
-
 noinst_PROGRAMS = logging_app
 
 logging_app_CPPFLAGS = \
diff --git a/ACE/examples/Logger/simple-server/.cvsignore b/ACE/examples/Logger/simple-server/.cvsignore
new file mode 100644
index 00000000000..76c31d8c56f
--- /dev/null
+++ b/ACE/examples/Logger/simple-server/.cvsignore
@@ -0,0 +1,2 @@
+server_loggerd
+server_loggerd
diff --git a/ACE/examples/Logger/simple-server/Makefile.am b/ACE/examples/Logger/simple-server/Makefile.am
index d9a43e17ee6..a018d587b98 100644
--- a/ACE/examples/Logger/simple-server/Makefile.am
+++ b/ACE/examples/Logger/simple-server/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Logger_Simple_Server.am
-
 noinst_PROGRAMS = server_loggerd
 
 server_loggerd_CPPFLAGS = \
diff --git a/ACE/examples/Makefile.am b/ACE/examples/Makefile.am
index 9582b2deca2..1e8ba6f626f 100644
--- a/ACE/examples/Makefile.am
+++ b/ACE/examples/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         APG \
@@ -14,7 +14,6 @@ SUBDIRS = \
         Bounded_Packet_Relay \
         C++NPv1 \
         C++NPv2 \
-        ConfigViewer \
         Connection \
         DLL \
         Export \
@@ -28,6 +27,7 @@ SUBDIRS = \
         NT_Service \
         Naming \
         OS \
+        QOS \
         Reactor \
         Registry \
         Service_Configurator \
@@ -36,6 +36,7 @@ SUBDIRS = \
         Smart_Pointers \
         Synch \
         System_V_IPC \
+        TMCast \
         Threads \
         Timer_Queue \
         Web_Crawler
diff --git a/ACE/examples/Map_Manager/Makefile.am b/ACE/examples/Map_Manager/Makefile.am
index b5fc458338f..d5f39e68514 100644
--- a/ACE/examples/Map_Manager/Makefile.am
+++ b/ACE/examples/Map_Manager/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Map_Manager.am
-
 noinst_PROGRAMS = Map_Manager
 
 Map_Manager_CPPFLAGS = \
diff --git a/ACE/examples/Mem_Map/IO-tests/.cvsignore b/ACE/examples/Mem_Map/IO-tests/.cvsignore
new file mode 100644
index 00000000000..80ea1892dab
--- /dev/null
+++ b/ACE/examples/Mem_Map/IO-tests/.cvsignore
@@ -0,0 +1,2 @@
+test_io
+test_io
diff --git a/ACE/examples/Mem_Map/IO-tests/Makefile.am b/ACE/examples/Mem_Map/IO-tests/Makefile.am
index 6466b5e8bb5..9a6e3638c29 100644
--- a/ACE/examples/Mem_Map/IO-tests/Makefile.am
+++ b/ACE/examples/Mem_Map/IO-tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.Mem_Map_IO_Tests.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = test_io
 
 test_io_CPPFLAGS = \
diff --git a/ACE/examples/Mem_Map/Makefile.am b/ACE/examples/Mem_Map/Makefile.am
index 4dec1a54c74..9d8830d2147 100644
--- a/ACE/examples/Mem_Map/Makefile.am
+++ b/ACE/examples/Mem_Map/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         IO-tests \
diff --git a/ACE/examples/Mem_Map/file-reverse/.cvsignore b/ACE/examples/Mem_Map/file-reverse/.cvsignore
new file mode 100644
index 00000000000..cf791234c5e
--- /dev/null
+++ b/ACE/examples/Mem_Map/file-reverse/.cvsignore
@@ -0,0 +1 @@
+file-reverse
diff --git a/ACE/examples/Mem_Map/file-reverse/Makefile.am b/ACE/examples/Mem_Map/file-reverse/Makefile.am
index 16376720175..02a081a6c88 100644
--- a/ACE/examples/Mem_Map/file-reverse/Makefile.am
+++ b/ACE/examples/Mem_Map/file-reverse/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.Mem_Map_File_Reverse.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = file-reverse
 
 file_reverse_CPPFLAGS = \
diff --git a/ACE/examples/Misc/.cvsignore b/ACE/examples/Misc/.cvsignore
new file mode 100644
index 00000000000..a31a7786288
--- /dev/null
+++ b/ACE/examples/Misc/.cvsignore
@@ -0,0 +1,16 @@
+test_XtReactor1
+test_XtReactor2
+test_dump
+test_dump
+test_get_opt
+test_get_opt
+test_profile_timer
+test_profile_timer
+test_read_buffer
+test_read_buffer
+test_set
+test_set
+test_sstring
+test_sstring
+test_trace
+test_trace
diff --git a/ACE/examples/Misc/Makefile.am b/ACE/examples/Misc/Makefile.am
index f1b726742c1..8bb0b8dc8d8 100644
--- a/ACE/examples/Misc/Makefile.am
+++ b/ACE/examples/Misc/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.Misc_Test_Dump.am
-
 noinst_PROGRAMS = test_dump
 
 test_dump_CPPFLAGS = \
@@ -28,7 +27,6 @@ test_dump_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Misc_Test_Get_Opt.am
-
 noinst_PROGRAMS += test_get_opt
 
 test_get_opt_CPPFLAGS = \
@@ -45,7 +43,6 @@ test_get_opt_LDADD = \
 ## Makefile.Misc_Test_Profile_Timer.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_profile_timer
 
 test_profile_timer_CPPFLAGS = \
@@ -62,7 +59,6 @@ test_profile_timer_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Misc_Test_Read_Buffer.am
-
 noinst_PROGRAMS += test_read_buffer
 
 test_read_buffer_CPPFLAGS = \
@@ -77,7 +73,6 @@ test_read_buffer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Misc_Test_Set.am
-
 noinst_PROGRAMS += test_set
 
 test_set_CPPFLAGS = \
@@ -92,7 +87,6 @@ test_set_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Misc_Test_Sstring.am
-
 noinst_PROGRAMS += test_sstring
 
 test_sstring_CPPFLAGS = \
@@ -106,23 +100,7 @@ test_sstring_SOURCES = \
 test_sstring_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Misc_Test_Timestamp.am
-
-noinst_PROGRAMS += test_timestamp
-
-test_timestamp_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-test_timestamp_SOURCES = \
-  test_timestamp.cpp \
-  test_dump.h
-
-test_timestamp_LDADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
 ## Makefile.Misc_Test_Trace.am
-
 noinst_PROGRAMS += test_trace
 
 test_trace_CPPFLAGS = \
diff --git a/ACE/examples/Misc/test_XtReactor1.cpp b/ACE/examples/Misc/test_XtReactor1.cpp
index 62137744cc3..f4bef54aeae 100644
--- a/ACE/examples/Misc/test_XtReactor1.cpp
+++ b/ACE/examples/Misc/test_XtReactor1.cpp
@@ -4,7 +4,7 @@
 // <ecn@clark.net> XtReactor implementation.
 
 #include "ace/OS_main.h"
-#include "ace/XtReactor/XtReactor.h"
+#include "ace/XtReactor.h"
 #include "ace/Reactor.h"
 #include "ace/Message_Block.h"
 #include "ace/Log_Msg.h"
diff --git a/ACE/examples/Misc/test_XtReactor2.cpp b/ACE/examples/Misc/test_XtReactor2.cpp
index 32bf1c9aa6a..2e2f4be0ba2 100644
--- a/ACE/examples/Misc/test_XtReactor2.cpp
+++ b/ACE/examples/Misc/test_XtReactor2.cpp
@@ -4,7 +4,7 @@
 // XtReactor implementation.
 
 #include "ace/OS_main.h"
-#include "ace/XtReactor/XtReactor.h"
+#include "ace/XtReactor.h"
 #include "ace/Reactor.h"
 #include "ace/Message_Block.h"
 #include "ace/Log_Msg.h"
diff --git a/ACE/examples/NT_Service/Makefile.am b/ACE/examples/NT_Service/Makefile.am
index c52c27430d7..fbc93c45f6d 100644
--- a/ACE/examples/NT_Service/Makefile.am
+++ b/ACE/examples/NT_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -17,7 +17,6 @@ ACE_ROOT = $(top_srcdir)
 if BUILD_WINREGISTRY
 if !BUILD_ACE_FOR_TAO
 if !BUILD_WINCE
-
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
diff --git a/ACE/examples/Naming/.cvsignore b/ACE/examples/Naming/.cvsignore
new file mode 100644
index 00000000000..5e535209538
--- /dev/null
+++ b/ACE/examples/Naming/.cvsignore
@@ -0,0 +1,4 @@
+multiple_contexts
+non_existent
+open
+writers
diff --git a/ACE/examples/Naming/Makefile.am b/ACE/examples/Naming/Makefile.am
index a98ffabba50..de8e2353f18 100644
--- a/ACE/examples/Naming/Makefile.am
+++ b/ACE/examples/Naming/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Naming_Multiple_Contexts.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += multiple_contexts
 
 multiple_contexts_CPPFLAGS = \
@@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Naming_Non_Existent.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += non_existent
 
 non_existent_CPPFLAGS = \
@@ -52,7 +50,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Naming_Open.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += open
 
 open_CPPFLAGS = \
@@ -70,7 +67,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Naming_Writers.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += writers
 
 writers_CPPFLAGS = \
diff --git a/ACE/examples/OS/Makefile.am b/ACE/examples/OS/Makefile.am
index 7547a62a438..73458dccc45 100644
--- a/ACE/examples/OS/Makefile.am
+++ b/ACE/examples/OS/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Process
diff --git a/ACE/examples/OS/Process/.cvsignore b/ACE/examples/OS/Process/.cvsignore
new file mode 100644
index 00000000000..c52eac932e5
--- /dev/null
+++ b/ACE/examples/OS/Process/.cvsignore
@@ -0,0 +1,4 @@
+imore
+imore
+process
+process
diff --git a/ACE/examples/OS/Process/Makefile.am b/ACE/examples/OS/Process/Makefile.am
index 70dec285bde..88eac9e35bd 100644
--- a/ACE/examples/OS/Process/Makefile.am
+++ b/ACE/examples/OS/Process/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.OS_Process_Imore.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += imore
 
 imore_CPPFLAGS = \
@@ -32,7 +31,6 @@ imore_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.OS_Process_Process.am
-
 noinst_PROGRAMS += process
 
 process_CPPFLAGS = \
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am b/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am
index 18d655299e0..c4d51897787 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am
@@ -35,8 +35,8 @@ receiver_SOURCES = \
   Receiver_QoS_Event_Handler.h
 
 receiver_LDADD = \
-  $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
-  $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_QOS
 
@@ -62,8 +62,8 @@ sender_SOURCES = \
   Sender_QoS_Event_Handler.h
 
 sender_LDADD = \
-  $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
-  $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_QOS
 
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am b/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am
index 2968f73620a..980d5cf3422 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am
+++ b/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am
@@ -35,8 +35,8 @@ receiver_SOURCES = \
   Receiver_QoS_Event_Handler.h
 
 receiver_LDADD = \
-  $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
-  $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_QOS
 
@@ -62,8 +62,8 @@ sender_SOURCES = \
   Sender_QoS_Event_Handler.h
 
 sender_LDADD = \
-  $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
-  $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_QOS
 
diff --git a/ACE/examples/QOS/Diffserv/Makefile.am b/ACE/examples/QOS/Diffserv/Makefile.am
index ae36afe7032..e94221278a2 100644
--- a/ACE/examples/QOS/Diffserv/Makefile.am
+++ b/ACE/examples/QOS/Diffserv/Makefile.am
@@ -28,8 +28,8 @@ client_SOURCES = \
   diffserv_test.cpp
 
 client_LDADD = \
-  $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
-  $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_QOS
@@ -48,8 +48,8 @@ server_SOURCES = \
   server.cpp
 
 server_LDADD = \
-  $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
-  $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_QOS
 
diff --git a/ACE/examples/QOS/Simple/Makefile.am b/ACE/examples/QOS/Simple/Makefile.am
index 2bda6a145a3..d86d7cd43eb 100644
--- a/ACE/examples/QOS/Simple/Makefile.am
+++ b/ACE/examples/QOS/Simple/Makefile.am
@@ -35,8 +35,8 @@ receiver_SOURCES = \
   Receiver_QoS_Event_Handler.h
 
 receiver_LDADD = \
-  $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
-  $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_QOS
 
@@ -62,8 +62,8 @@ sender_SOURCES = \
   Sender_QoS_Event_Handler.h
 
 sender_LDADD = \
-  $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
-  $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_QOS
 
diff --git a/ACE/examples/Reactor/Dgram/.cvsignore b/ACE/examples/Reactor/Dgram/.cvsignore
new file mode 100644
index 00000000000..94126b14c4e
--- /dev/null
+++ b/ACE/examples/Reactor/Dgram/.cvsignore
@@ -0,0 +1,4 @@
+codgram
+codgram
+dgram
+dgram
diff --git a/ACE/examples/Reactor/Dgram/Makefile.am b/ACE/examples/Reactor/Dgram/Makefile.am
index eb7ba9825aa..797f4b3d75e 100644
--- a/ACE/examples/Reactor/Dgram/Makefile.am
+++ b/ACE/examples/Reactor/Dgram/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.Reactor_Dgram.am
-
 noinst_PROGRAMS = dgram
 
 dgram_CPPFLAGS = \
@@ -29,7 +28,6 @@ dgram_LDADD = \
 ## Makefile.Reactor_Dgram_CO.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += codgram
 
 codgram_CPPFLAGS = \
diff --git a/ACE/examples/Reactor/FIFO/.cvsignore b/ACE/examples/Reactor/FIFO/.cvsignore
new file mode 100644
index 00000000000..955ffdc75d5
--- /dev/null
+++ b/ACE/examples/Reactor/FIFO/.cvsignore
@@ -0,0 +1,4 @@
+client
+client
+server
+server
diff --git a/ACE/examples/Reactor/FIFO/Makefile.am b/ACE/examples/Reactor/FIFO/Makefile.am
index 07f8503af79..5540e860968 100644
--- a/ACE/examples/Reactor/FIFO/Makefile.am
+++ b/ACE/examples/Reactor/FIFO/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Reactor_FIFO_Client.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Reactor_FIFO_Server.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
diff --git a/ACE/examples/Reactor/Makefile.am b/ACE/examples/Reactor/Makefile.am
index aced36e2c87..24d9217302d 100644
--- a/ACE/examples/Reactor/Makefile.am
+++ b/ACE/examples/Reactor/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Dgram \
diff --git a/ACE/examples/Reactor/Misc/.cvsignore b/ACE/examples/Reactor/Misc/.cvsignore
new file mode 100644
index 00000000000..f7cc1865efa
--- /dev/null
+++ b/ACE/examples/Reactor/Misc/.cvsignore
@@ -0,0 +1,16 @@
+demuxing
+demuxing
+early_timeouts
+early_timeouts
+notification
+notification
+pingpong
+pingpong
+reactors
+reactors
+signals_1
+signals_1
+signals_2
+signals_2
+timer_queue
+timer_queue
diff --git a/ACE/examples/Reactor/Misc/Makefile.am b/ACE/examples/Reactor/Misc/Makefile.am
index 94afaf14865..47111585f87 100644
--- a/ACE/examples/Reactor/Misc/Makefile.am
+++ b/ACE/examples/Reactor/Misc/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Reactor_Misc_Demuxing.am
-
 noinst_PROGRAMS = demuxing
 
 demuxing_CPPFLAGS = \
@@ -26,7 +25,6 @@ demuxing_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Misc_Early_Timeouts.am
-
 noinst_PROGRAMS += early_timeouts
 
 early_timeouts_CPPFLAGS = \
@@ -40,7 +38,6 @@ early_timeouts_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Misc_Event_Handler_t.am
-
 noinst_PROGRAMS += event_handler_t
 
 event_handler_t_CPPFLAGS = \
@@ -54,7 +51,6 @@ event_handler_t_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Misc_Notification.am
-
 noinst_PROGRAMS += notification
 
 notification_CPPFLAGS = \
@@ -68,7 +64,6 @@ notification_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Misc_Pingpong.am
-
 noinst_PROGRAMS += pingpong
 
 pingpong_CPPFLAGS = \
@@ -82,7 +77,6 @@ pingpong_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Misc_Reactors.am
-
 noinst_PROGRAMS += reactors
 
 reactors_CPPFLAGS = \
@@ -96,7 +90,6 @@ reactors_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Misc_Signals_1.am
-
 noinst_PROGRAMS += signals_1
 
 signals_1_CPPFLAGS = \
@@ -110,7 +103,6 @@ signals_1_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Misc_Signals_2.am
-
 noinst_PROGRAMS += signals_2
 
 signals_2_CPPFLAGS = \
@@ -124,7 +116,6 @@ signals_2_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Misc_Timer_Queue.am
-
 noinst_PROGRAMS += timer_queue
 
 timer_queue_CPPFLAGS = \
diff --git a/ACE/examples/Reactor/Multicast/.cvsignore b/ACE/examples/Reactor/Multicast/.cvsignore
new file mode 100644
index 00000000000..955ffdc75d5
--- /dev/null
+++ b/ACE/examples/Reactor/Multicast/.cvsignore
@@ -0,0 +1,4 @@
+client
+client
+server
+server
diff --git a/ACE/examples/Reactor/Multicast/Makefile.am b/ACE/examples/Reactor/Multicast/Makefile.am
index 0c533d3670e..60d65e7ebe8 100644
--- a/ACE/examples/Reactor/Multicast/Makefile.am
+++ b/ACE/examples/Reactor/Multicast/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Reactor_Multicast_Client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -28,7 +27,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Multicast_Server.am
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
diff --git a/ACE/examples/Reactor/Ntalker/.cvsignore b/ACE/examples/Reactor/Ntalker/.cvsignore
new file mode 100644
index 00000000000..a9350d173bf
--- /dev/null
+++ b/ACE/examples/Reactor/Ntalker/.cvsignore
@@ -0,0 +1,2 @@
+ntalker
+ntalker
diff --git a/ACE/examples/Reactor/Ntalker/Makefile.am b/ACE/examples/Reactor/Ntalker/Makefile.am
index 8226305413b..6efc3521a32 100644
--- a/ACE/examples/Reactor/Ntalker/Makefile.am
+++ b/ACE/examples/Reactor/Ntalker/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Reactor_Ntalker.am
-
 noinst_PROGRAMS = ntalker
 
 ntalker_CPPFLAGS = \
diff --git a/ACE/examples/Reactor/Proactor/.cvsignore b/ACE/examples/Reactor/Proactor/.cvsignore
new file mode 100644
index 00000000000..34179361b75
--- /dev/null
+++ b/ACE/examples/Reactor/Proactor/.cvsignore
@@ -0,0 +1,7 @@
+test_cancel
+test_end_event_loop
+test_multiple_loops
+test_post_completions
+test_proactor
+test_timeout
+test_udp_proactor
diff --git a/ACE/examples/Reactor/Proactor/Makefile.am b/ACE/examples/Reactor/Proactor/Makefile.am
index a77fead97ec..7f1bc4b8a57 100644
--- a/ACE/examples/Reactor/Proactor/Makefile.am
+++ b/ACE/examples/Reactor/Proactor/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Proactor_Cancel.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_cancel
 
 test_cancel_CPPFLAGS = \
@@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Proactor_End_Event_Loops.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_end_event_loop
 
 test_end_event_loop_CPPFLAGS = \
@@ -55,7 +53,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Proactor_Multiple_Loops.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_multiple_loops
 
 test_multiple_loops_CPPFLAGS = \
@@ -75,7 +72,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Proactor_Post_Completions.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_post_completions
 
 test_post_completions_CPPFLAGS = \
@@ -95,7 +91,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Proactor_Proactor.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_proactor
 
 test_proactor_CPPFLAGS = \
@@ -114,7 +109,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Proactor_Timeout.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_timeout
 
 test_timeout_CPPFLAGS = \
@@ -134,7 +128,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Proactor_Udp_Proactor.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_udp_proactor
 
 test_udp_proactor_CPPFLAGS = \
diff --git a/ACE/examples/Reactor/TP_Reactor/Makefile.am b/ACE/examples/Reactor/TP_Reactor/Makefile.am
index 17eda0d0046..5407cbb10e1 100644
--- a/ACE/examples/Reactor/TP_Reactor/Makefile.am
+++ b/ACE/examples/Reactor/TP_Reactor/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.TP_Reactor_Client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -29,7 +28,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TP_Reactor_Server.am
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am b/ACE/examples/Reactor/WFMO_Reactor/Makefile.am
index c844b6654bd..cfa1c687b6c 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am
+++ b/ACE/examples/Reactor/WFMO_Reactor/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 if BUILD_WFMO
 if !BUILD_WINCE
-
 noinst_PROGRAMS += apc
 
 apc_CPPFLAGS = \
@@ -36,7 +35,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Abandoned.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += abandoned
 
 abandoned_CPPFLAGS = \
@@ -54,7 +52,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Console_Input.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += console_input
 
 console_input_CPPFLAGS = \
@@ -72,7 +69,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Directory_Changes.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += directory_changes
 
 directory_changes_CPPFLAGS = \
@@ -90,7 +86,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Exceptions.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += exceptions
 
 exceptions_CPPFLAGS = \
@@ -108,7 +103,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Handle_Close.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += handle_close
 
 handle_close_CPPFLAGS = \
@@ -126,7 +120,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Multithreading.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += multithreading
 
 multithreading_CPPFLAGS = \
@@ -144,7 +137,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Network_Events.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += network_events
 
 network_events_CPPFLAGS = \
@@ -162,7 +154,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Prerun_State_Changes.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += prerun_state_changes
 
 prerun_state_changes_CPPFLAGS = \
@@ -180,7 +171,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Registration.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += registration
 
 registration_CPPFLAGS = \
@@ -200,7 +190,6 @@ endif BUILD_WFMO
 if BUILD_WFMO
 if !BUILD_ACE_FOR_TAO
 if !BUILD_WINCE
-
 noinst_PROGRAMS += registry_changes
 
 registry_changes_CPPFLAGS = \
@@ -220,7 +209,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Removals.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += removals
 
 removals_CPPFLAGS = \
@@ -238,7 +226,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Suspended_Removals.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += suspended_removals
 
 suspended_removals_CPPFLAGS = \
@@ -258,7 +245,6 @@ endif BUILD_WFMO
 if BUILD_WFMO
 if !BUILD_ACE_FOR_TAO
 if !BUILD_WINCE
-
 noinst_PROGRAMS += talker
 
 talker_CPPFLAGS = \
@@ -278,7 +264,6 @@ endif BUILD_WFMO
 ## Makefile.WFMO_Reactor_Timeouts.am
 
 if BUILD_WFMO
-
 noinst_PROGRAMS += timeouts
 
 timeouts_CPPFLAGS = \
@@ -298,7 +283,6 @@ endif BUILD_WFMO
 if BUILD_WFMO
 if !BUILD_ACE_FOR_TAO
 if !BUILD_WINCE
-
 noinst_PROGRAMS += window_messages
 
 window_messages_CPPFLAGS = \
diff --git a/ACE/examples/Registry/Makefile.am b/ACE/examples/Registry/Makefile.am
index 5118f95341c..1e02e33abb2 100644
--- a/ACE/examples/Registry/Makefile.am
+++ b/ACE/examples/Registry/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 if BUILD_WINREGISTRY
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += iterator
 
 iterator_CPPFLAGS = \
@@ -37,7 +36,6 @@ endif BUILD_WINREGISTRY
 
 if BUILD_WINREGISTRY
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += update
 
 update_CPPFLAGS = \
diff --git a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/Makefile.am
index 3ad9fe59404..0a99932ce34 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am
+++ b/ACE/examples/Service_Configurator/IPC-tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         client \
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/.cvsignore b/ACE/examples/Service_Configurator/IPC-tests/client/.cvsignore
new file mode 100644
index 00000000000..121d4de020f
--- /dev/null
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/.cvsignore
@@ -0,0 +1,10 @@
+local_dgram_test
+local_fifo_test
+local_pipe_test
+local_spipe_test
+local_stream_test
+remote_broadcast_test
+remote_dgram_test
+remote_service_directory_test
+remote_stream_test
+remote_thr_stream_test
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am
index be9dce0feff..b6dd5a3d7b8 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Svc_Cfg_IPC_Client_Bcast.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += remote_broadcast_test
 
 remote_broadcast_test_CPPFLAGS = \
@@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Svc_Cfg_IPC_Client_Loc_Dgram.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += local_dgram_test
 
 local_dgram_test_CPPFLAGS = \
@@ -52,7 +50,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Svc_Cfg_IPC_Client_Loc_Fifo.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += local_fifo_test
 
 local_fifo_test_CPPFLAGS = \
@@ -70,7 +67,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Svc_Cfg_IPC_Client_Loc_Pipe.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += local_pipe_test
 
 local_pipe_test_CPPFLAGS = \
@@ -86,7 +82,6 @@ local_pipe_test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Svc_Cfg_IPC_Client_Loc_Spipe.am
-
 noinst_PROGRAMS += local_spipe_test
 
 local_spipe_test_CPPFLAGS = \
@@ -102,7 +97,6 @@ local_spipe_test_LDADD = \
 ## Makefile.Svc_Cfg_IPC_Client_Loc_Stream.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += local_stream_test
 
 local_stream_test_CPPFLAGS = \
@@ -120,7 +114,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Svc_Cfg_IPC_Client_Rem_Dgram.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += remote_dgram_test
 
 remote_dgram_test_CPPFLAGS = \
@@ -138,7 +131,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Svc_Cfg_IPC_Client_Rem_Stream.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += remote_stream_test
 
 remote_stream_test_CPPFLAGS = \
@@ -154,7 +146,6 @@ remote_stream_test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Svc_Cfg_IPC_Client_Rem_Svc_Dir.am
-
 noinst_PROGRAMS += remote_service_directory_test
 
 remote_service_directory_test_CPPFLAGS = \
@@ -168,7 +159,6 @@ remote_service_directory_test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Svc_Cfg_IPC_Client_Rem_Thr_Stream.am
-
 noinst_PROGRAMS += remote_thr_stream_test
 
 remote_thr_stream_test_CPPFLAGS = \
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/.cvsignore b/ACE/examples/Service_Configurator/IPC-tests/server/.cvsignore
new file mode 100644
index 00000000000..74fdfbc7f93
--- /dev/null
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/.cvsignore
@@ -0,0 +1 @@
+server_test
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am
index fbc788f8cd3..954697dfba3 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -61,7 +61,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Svc_Cfg_IPC_Server_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = server_test
 
 server_test_CPPFLAGS = \
diff --git a/ACE/examples/Service_Configurator/Makefile.am b/ACE/examples/Service_Configurator/Makefile.am
index 8a3ecc74489..1b78bb27757 100644
--- a/ACE/examples/Service_Configurator/Makefile.am
+++ b/ACE/examples/Service_Configurator/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         IPC-tests \
diff --git a/ACE/examples/Service_Configurator/Misc/.cvsignore b/ACE/examples/Service_Configurator/Misc/.cvsignore
new file mode 100644
index 00000000000..ba2906d0666
--- /dev/null
+++ b/ACE/examples/Service_Configurator/Misc/.cvsignore
@@ -0,0 +1 @@
+main
diff --git a/ACE/examples/Service_Configurator/Misc/Makefile.am b/ACE/examples/Service_Configurator/Misc/Makefile.am
index 8006a87957e..f0de4232add 100644
--- a/ACE/examples/Service_Configurator/Misc/Makefile.am
+++ b/ACE/examples/Service_Configurator/Misc/Makefile.am
@@ -6,28 +6,27 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Service_Configurator_Misc_Timer.am
 
-noinst_LTLIBRARIES = libTimer.la
+noinst_LTLIBRARIES = libtimer.la
 
-libTimer_la_CPPFLAGS = \
+libtimer_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -DACE_BUILD_SVC_DLL
 
-libTimer_la_SOURCES = \
+libtimer_la_SOURCES = \
   Timer_Service.cpp
 
 noinst_HEADERS = \
   Timer_Service.h
 
 ## Makefile.Service_Configurator_Misc_Main.am
-
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
@@ -39,7 +38,7 @@ main_SOURCES = \
   Timer_Service.h
 
 main_LDADD = \
-  libTimer.la \
+  libtimer.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
diff --git a/ACE/examples/Shared_Malloc/.cvsignore b/ACE/examples/Shared_Malloc/.cvsignore
new file mode 100644
index 00000000000..c5ad2e56e0e
--- /dev/null
+++ b/ACE/examples/Shared_Malloc/.cvsignore
@@ -0,0 +1,4 @@
+malloc
+multiple
+persistence
+posind
diff --git a/ACE/examples/Shared_Malloc/Makefile.am b/ACE/examples/Shared_Malloc/Makefile.am
index e1f9f4a5ade..baccb0359e0 100644
--- a/ACE/examples/Shared_Malloc/Makefile.am
+++ b/ACE/examples/Shared_Malloc/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Shared_Malloc.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += malloc
 
 malloc_CPPFLAGS = \
@@ -38,7 +37,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Shared_Malloc_Multiple.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += multiple
 
 multiple_CPPFLAGS = \
@@ -60,7 +58,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Shared_Malloc_Persistence.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += persistence
 
 persistence_CPPFLAGS = \
@@ -81,7 +78,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Shared_Malloc_Posind.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += posind
 
 posind_CPPFLAGS = \
diff --git a/ACE/examples/Shared_Memory/.cvsignore b/ACE/examples/Shared_Memory/.cvsignore
new file mode 100644
index 00000000000..7f6e8a792c5
--- /dev/null
+++ b/ACE/examples/Shared_Memory/.cvsignore
@@ -0,0 +1,2 @@
+testmm
+testsv
diff --git a/ACE/examples/Shared_Memory/Makefile.am b/ACE/examples/Shared_Memory/Makefile.am
index f7e9517e1dc..864c7a5b071 100644
--- a/ACE/examples/Shared_Memory/Makefile.am
+++ b/ACE/examples/Shared_Memory/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Shared_Memory_MM.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += testmm
 
 testmm_CPPFLAGS = \
@@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Shared_Memory_SV.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += testsv
 
 testsv_CPPFLAGS = \
diff --git a/ACE/examples/Smart_Pointers/.cvsignore b/ACE/examples/Smart_Pointers/.cvsignore
new file mode 100644
index 00000000000..f309b7d5f8b
--- /dev/null
+++ b/ACE/examples/Smart_Pointers/.cvsignore
@@ -0,0 +1,2 @@
+Widget
+gadget
diff --git a/ACE/examples/Smart_Pointers/Makefile.am b/ACE/examples/Smart_Pointers/Makefile.am
index 88aab9e31d0..4595d7dafaa 100644
--- a/ACE/examples/Smart_Pointers/Makefile.am
+++ b/ACE/examples/Smart_Pointers/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Smart_Pointers_Gadget.am
-
 noinst_PROGRAMS = gadget
 
 gadget_CPPFLAGS = \
@@ -38,7 +37,6 @@ gadget_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Smart_Pointers_Widget.am
-
 noinst_PROGRAMS += Widget
 
 Widget_CPPFLAGS = \
diff --git a/ACE/examples/Synch/.cvsignore b/ACE/examples/Synch/.cvsignore
new file mode 100644
index 00000000000..eea98594a4b
--- /dev/null
+++ b/ACE/examples/Synch/.cvsignore
@@ -0,0 +1 @@
+proc_sema
diff --git a/ACE/examples/Synch/Makefile.am b/ACE/examples/Synch/Makefile.am
index 7e3243cb3b4..09319f393b3 100644
--- a/ACE/examples/Synch/Makefile.am
+++ b/ACE/examples/Synch/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.Synch.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = proc_sema
 
 proc_sema_CPPFLAGS = \
diff --git a/ACE/examples/System_V_IPC/Makefile.am b/ACE/examples/System_V_IPC/Makefile.am
index a505dc9b737..23b52ee8b29 100644
--- a/ACE/examples/System_V_IPC/Makefile.am
+++ b/ACE/examples/System_V_IPC/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         SV_Message_Queues \
diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/.cvsignore b/ACE/examples/System_V_IPC/SV_Message_Queues/.cvsignore
new file mode 100644
index 00000000000..bcdb18d69d8
--- /dev/null
+++ b/ACE/examples/System_V_IPC/SV_Message_Queues/.cvsignore
@@ -0,0 +1,4 @@
+mqclient
+mqserver
+tmqclient
+tmqserver
diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am b/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am
index 8b8ea29e204..eadb6b8df53 100644
--- a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am
+++ b/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.SV_Message_Queues_MQ_Client.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += mqclient
 
 mqclient_CPPFLAGS = \
@@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.SV_Message_Queues_MQ_Server.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += mqserver
 
 mqserver_CPPFLAGS = \
@@ -54,7 +52,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.SV_Message_Queues_TMQ_Client.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += tmqclient
 
 tmqclient_CPPFLAGS = \
@@ -73,7 +70,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.SV_Message_Queues_TMQ_Server.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += tmqserver
 
 tmqserver_CPPFLAGS = \
diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/.cvsignore b/ACE/examples/System_V_IPC/SV_Semaphores/.cvsignore
new file mode 100644
index 00000000000..bb37ee6c9a7
--- /dev/null
+++ b/ACE/examples/System_V_IPC/SV_Semaphores/.cvsignore
@@ -0,0 +1,2 @@
+sem1
+sem2
diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am b/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am
index 14fa043d43b..de9a88952a6 100644
--- a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am
+++ b/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.SV_Semaphores_1.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sem1
 
 sem1_CPPFLAGS = \
@@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.SV_Semaphores_2.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sem2
 
 sem2_CPPFLAGS = \
diff --git a/ACE/examples/TMCast/Makefile.am b/ACE/examples/TMCast/Makefile.am
new file mode 100644
index 00000000000..ad8cc650602
--- /dev/null
+++ b/ACE/examples/TMCast/Makefile.am
@@ -0,0 +1,13 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+SUBDIRS = \
+        Member
+
diff --git a/ACE/examples/TMCast/Member/.cvsignore b/ACE/examples/TMCast/Member/.cvsignore
new file mode 100644
index 00000000000..fa6ecc72251
--- /dev/null
+++ b/ACE/examples/TMCast/Member/.cvsignore
@@ -0,0 +1 @@
+member
diff --git a/ACE/examples/TMCast/Member/Makefile.am b/ACE/examples/TMCast/Member/Makefile.am
new file mode 100644
index 00000000000..fe970a85ef5
--- /dev/null
+++ b/ACE/examples/TMCast/Member/Makefile.am
@@ -0,0 +1,45 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+
+## Makefile.Member.am
+
+if BUILD_EXCEPTIONS
+if BUILD_THREADS
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS = member
+
+member_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
+
+member_SOURCES = \
+  member.cpp
+
+member_LDADD = \
+  $(ACE_BUILDDIR)/protocols/ace/TMCast/libACE_TMCast.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+endif BUILD_THREADS
+endif BUILD_EXCEPTIONS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/examples/TMCast/Member/Member.mpc b/ACE/examples/TMCast/Member/Member.mpc
index 29f274f51f3..29f274f51f3 100644
--- a/ACE/protocols/examples/TMCast/Member/Member.mpc
+++ b/ACE/examples/TMCast/Member/Member.mpc
diff --git a/ACE/protocols/examples/TMCast/Member/README b/ACE/examples/TMCast/Member/README
index 6a62a107a77..6a62a107a77 100644
--- a/ACE/protocols/examples/TMCast/Member/README
+++ b/ACE/examples/TMCast/Member/README
diff --git a/ACE/protocols/examples/TMCast/Member/member.cpp b/ACE/examples/TMCast/Member/member.cpp
index f89c68564ea..f89c68564ea 100644
--- a/ACE/protocols/examples/TMCast/Member/member.cpp
+++ b/ACE/examples/TMCast/Member/member.cpp
diff --git a/ACE/examples/Threads/.cvsignore b/ACE/examples/Threads/.cvsignore
new file mode 100644
index 00000000000..29680be7dcc
--- /dev/null
+++ b/ACE/examples/Threads/.cvsignore
@@ -0,0 +1,22 @@
+auto_event
+barrier1
+barrier2
+cancel
+future1
+future2
+manual_event
+process_mutex
+process_semaphore
+reader_writer
+recursive_mutex
+task_five
+task_four
+task_one
+task_three
+task_two
+thread_manager
+thread_pool
+thread_specific
+token
+tss1
+tss2
diff --git a/ACE/examples/Threads/Makefile.am b/ACE/examples/Threads/Makefile.am
index d9bd5ba8fa5..edd80b72542 100644
--- a/ACE/examples/Threads/Makefile.am
+++ b/ACE/examples/Threads/Makefile.am
@@ -6,14 +6,13 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 
 ## Makefile.Threads_Auto_Event.am
-
 noinst_PROGRAMS = auto_event
 
 auto_event_CPPFLAGS = \
@@ -31,7 +30,6 @@ auto_event_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Barrier1.am
-
 noinst_PROGRAMS += barrier1
 
 barrier1_CPPFLAGS = \
@@ -49,7 +47,6 @@ barrier1_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Barrier2.am
-
 noinst_PROGRAMS += barrier2
 
 barrier2_CPPFLAGS = \
@@ -67,7 +64,6 @@ barrier2_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Cancel.am
-
 noinst_PROGRAMS += cancel
 
 cancel_CPPFLAGS = \
@@ -87,7 +83,6 @@ cancel_LDADD = \
 ## Makefile.Threads_Future1.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += future1
 
 future1_CPPFLAGS = \
@@ -109,7 +104,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Threads_Future2.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += future2
 
 future2_CPPFLAGS = \
@@ -129,7 +123,6 @@ future2_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Threads_Manual_Event.am
-
 noinst_PROGRAMS += manual_event
 
 manual_event_CPPFLAGS = \
@@ -149,7 +142,6 @@ manual_event_LDADD = \
 ## Makefile.Threads_Process_Mutex.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += process_mutex
 
 process_mutex_CPPFLAGS = \
@@ -171,7 +163,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Threads_Process_Semaphore.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += process_semaphore
 
 process_semaphore_CPPFLAGS = \
@@ -191,7 +182,6 @@ process_semaphore_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Threads_Reader_Writer.am
-
 noinst_PROGRAMS += reader_writer
 
 reader_writer_CPPFLAGS = \
@@ -209,7 +199,6 @@ reader_writer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Recursive_Mutex.am
-
 noinst_PROGRAMS += recursive_mutex
 
 recursive_mutex_CPPFLAGS = \
@@ -227,7 +216,6 @@ recursive_mutex_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Task_Five.am
-
 noinst_PROGRAMS += task_five
 
 task_five_CPPFLAGS = \
@@ -245,7 +233,6 @@ task_five_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Task_Four.am
-
 noinst_PROGRAMS += task_four
 
 task_four_CPPFLAGS = \
@@ -263,7 +250,6 @@ task_four_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Task_One.am
-
 noinst_PROGRAMS += task_one
 
 task_one_CPPFLAGS = \
@@ -281,7 +267,6 @@ task_one_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Task_Three.am
-
 noinst_PROGRAMS += task_three
 
 task_three_CPPFLAGS = \
@@ -299,7 +284,6 @@ task_three_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Task_Two.am
-
 noinst_PROGRAMS += task_two
 
 task_two_CPPFLAGS = \
@@ -317,7 +301,6 @@ task_two_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Thread_Manager.am
-
 noinst_PROGRAMS += thread_manager
 
 thread_manager_CPPFLAGS = \
@@ -335,7 +318,6 @@ thread_manager_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Thread_Pool.am
-
 noinst_PROGRAMS += thread_pool
 
 thread_pool_CPPFLAGS = \
@@ -353,7 +335,6 @@ thread_pool_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Thread_Specific.am
-
 noinst_PROGRAMS += thread_specific
 
 thread_specific_CPPFLAGS = \
@@ -368,7 +349,6 @@ thread_specific_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Token.am
-
 noinst_PROGRAMS += token
 
 token_CPPFLAGS = \
@@ -386,7 +366,6 @@ token_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Tss1.am
-
 noinst_PROGRAMS += tss1
 
 tss1_CPPFLAGS = \
@@ -404,7 +383,6 @@ tss1_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Threads_Tss2.am
-
 noinst_PROGRAMS += tss2
 
 tss2_CPPFLAGS = \
diff --git a/ACE/examples/Timer_Queue/.cvsignore b/ACE/examples/Timer_Queue/.cvsignore
new file mode 100644
index 00000000000..6f1917f64c8
--- /dev/null
+++ b/ACE/examples/Timer_Queue/.cvsignore
@@ -0,0 +1,3 @@
+Asynch_Timer_Queue_Test
+Reactor_Timer_Queue_Test
+Thread_Timer_Queue_Test
diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp
index f8b3f9793ab..18d12b8017a 100644
--- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp
+++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp
@@ -206,14 +206,12 @@ signal_handler (int signum)
       break;
       /* NOTREACHED */
 
-#if !defined (ACE_LACKS_UNIX_SIGNALS)
     case SIGQUIT:
       ACE_ERROR ((LM_ERROR,
                   "shutting down on SIGQUIT%a\n",
                   1));
       /* NOTREACHED */
       break;
-#endif
     }
 }
 
@@ -224,12 +222,10 @@ signal_handler (int signum)
 static void
 register_signal_handlers (void)
 {
-#if !defined (ACE_LACKS_UNIX_SIGNALS)
   // Register SIGQUIT (never blocked).
   ACE_Sig_Action sigquit ((ACE_SignalHandler) signal_handler,
 			  SIGQUIT);
   ACE_UNUSED_ARG (sigquit);
-#endif
 
   // Don't let the SIGALRM interrupt the SIGINT handler!
   ACE_Sig_Set ss;
diff --git a/ACE/examples/Timer_Queue/Makefile.am b/ACE/examples/Timer_Queue/Makefile.am
index e969ce3129a..e2109fde6d6 100644
--- a/ACE/examples/Timer_Queue/Makefile.am
+++ b/ACE/examples/Timer_Queue/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -33,7 +33,6 @@ noinst_HEADERS = \
   Thread_Timer_Queue_Test.h
 
 ## Makefile.Timer_Queue_Async.am
-
 noinst_PROGRAMS = Asynch_Timer_Queue_Test
 
 Asynch_Timer_Queue_Test_CPPFLAGS = \
@@ -52,7 +51,6 @@ Asynch_Timer_Queue_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Timer_Queue_Reactor.am
-
 noinst_PROGRAMS += Reactor_Timer_Queue_Test
 
 Reactor_Timer_Queue_Test_CPPFLAGS = \
@@ -71,7 +69,6 @@ Reactor_Timer_Queue_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Timer_Queue_Thread.am
-
 noinst_PROGRAMS += Thread_Timer_Queue_Test
 
 Thread_Timer_Queue_Test_CPPFLAGS = \
diff --git a/ACE/examples/Web_Crawler/.cvsignore b/ACE/examples/Web_Crawler/.cvsignore
new file mode 100644
index 00000000000..ba2906d0666
--- /dev/null
+++ b/ACE/examples/Web_Crawler/.cvsignore
@@ -0,0 +1 @@
+main
diff --git a/ACE/examples/Web_Crawler/Makefile.am b/ACE/examples/Web_Crawler/Makefile.am
index e805ea1e807..00a30a4d2e1 100644
--- a/ACE/examples/Web_Crawler/Makefile.am
+++ b/ACE/examples/Web_Crawler/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.Web_Crawler.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
diff --git a/ACE/html/index.html b/ACE/html/index.html
index c9a823179e0..4160b9807f2 100644
--- a/ACE/html/index.html
+++ b/ACE/html/index.html
@@ -108,16 +108,6 @@
       <p><a href="tao/anytypecode/index.html">TAO_AnyTypeCode:</a>
       TAO AnyTypeCode support</p>
     </li>
-
-    <li>
-      <p><a href="tao/compression/index.html">TAO_Compression:</a>
-      TAO Compression support</p>
-    </li>
-
-    <li>
-      <p><a href="tao/transportcurrent/index.html">TAO_TransportCurrent:</a>
-      TAO Transport Current support</p>
-    </li>
   </ul>
   <hr />
 
diff --git a/ACE/include/makeinclude/macros.GNU b/ACE/include/makeinclude/macros.GNU
index 0ee539d5fb2..b6751f04c2d 100644
--- a/ACE/include/makeinclude/macros.GNU
+++ b/ACE/include/makeinclude/macros.GNU
@@ -20,8 +20,7 @@ TARGETS_LOCAL  = \
 	clobber.local \
 	depend.local \
 	rcs_info.local \
-	idl_stubs.local \
-	svnignore.local
+	idl_stubs.local
 
 TARGETS_NESTED   = \
 	$(TARGETS_LOCAL:.local=.nested)
diff --git a/ACE/include/makeinclude/platform_aix.GNU b/ACE/include/makeinclude/platform_aix.GNU
index 33e9c785263..675b1af991b 100644
--- a/ACE/include/makeinclude/platform_aix.GNU
+++ b/ACE/include/makeinclude/platform_aix.GNU
@@ -1,110 +1,3 @@
 # $Id$
 
-# AIX 5.x using the IBM C Set++ compiler.
-#
-# NOTE! IBM is no longer supporting AIX at any version earlier than 4.3,
-# and Riverace is not testing or supporting ACE on them either. No steps
-# have been taken to intentionally disable anything, but it is not being
-# tested either.
-#
-# NOTE 2! This file is only for use with the older CSet++ compiler, which
-# IBM doesn't sell or support any longer. Riverace doesn't support ACE
-# with it either. This file is still here in case there is some site
-# still using the old compiler, but it is completely unsupported.
-#
-# On 4.1, this file assumes that the user has installed the AIX patch
-# containing the dl*() APIs.  To use these APIs, IBM has created a
-# separate product (free to AIX licensees) called shared library
-# hookable symbols (or slhs/6000).  If they don't have this patch, the
-# sv* commands for compiling and linking will not be present on the
-# system.
-#
-# On 4.2, the AIX fileset bos.rte.bind_cmds must be at version 4.2.0.2 or
-# higher in order to build libACEshr.a, and at 4.2.0.4 or higher for dl*()
-# routines to work properly. Best to apply the update available at:
-# ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff
-# or a successor.
-
-debug ?= 1
-distrib ?= 0
-exceptions ?= 1
-optimize ?= 0
-threads ?= 1
-
-# There's no way to turn off exceptions with IBM C/C++
-ifeq (0,$(exceptions))
-  exceptions = 1
-endif
-
-# In case anything here or in the config depends on OS version number,
-# grab it here and pass it all to the compiler as well.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-
-# aix_build turns on the funky shared library building code.
-aix_build = 1
-# ibmcxx_build turns on the extra step for instantiating and compiling
-# template instances.
-ibmcxx_build = 1
-
-ifeq ($(threads),1)
-CC          = xlc_r
-CXX         = xlC_r
-DLD         = makeC++SharedLib_r
-else
-CC          = xlc
-CXX         = xlC
-DLD         = makeC++SharedLib
-endif
-
-# -qextchk is handy, but produces false type mismatches when linking
-# netsvcs with 3.1.4, so it's disabled.  IBM reports this fixed in 3.6.4.
-TEMPINCDIR   = tempinc
-CCFLAGS     += $(CFLAGS) -qtempinc=$(TEMPINCDIR) -qinfo
-
-# IBM C/C++ compiler 3.6.x produces a bazillion warnings about 0-valued
-# preprocessor defs. Since both 3.1 and 3.4 could be installed, don't ask
-# lslpp for one or the other. Instead, compile a file and see which compiler
-# the user has set up for use. This trick was submitted by Craig Rodrigues
-# <rodrigc@mediaone.net>, originally from the vacpp compiler newsgroup.
-# It relies on the preprocessor defining __xlC__ to the proper version
-# number of the compiler.
-XLCVERSION := $(shell echo "__xlC__" > ./testAIXCompilerVersion.cpp)
-XLCVERSION := $(shell $(CXX) -E ./testAIXCompilerVersion.cpp | tail -1)
-ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
-ifeq ($(XLCVERSION),0x0306)
- CCFLAGS    += -qflag=e:e
-else
- CCFLAGS    += -qflag=w:w
-endif
-CPPFLAGS    += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
-
-# -qinitauto seems useful, but when built with -qinitauto=5F, the
-# Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston)
-DCFLAGS     += -g -qcheck=nobounds:div:null
-
-ACELIB      = -lACE
-LD          = $(CXX)
-
-ifeq ($(AIX_MINOR_VERS),1)
-LLIBS       = -lsvld -ltli_r $(ACELIB)
-LIBS        += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS))
-else
-LIBS        += -ltli_r -ldl
-endif
-
-ARFLAGS     = ruv
-AR          = ar
-LDFLAGS     += -bI:/lib/pse.exp
-# Default OCCFLAGS builds common code for all RS/6000 architectures but
-# this can be set to optimize for your particular computer. The commented
-# out example optimizes for RS/6000 43P.
-# OCCFLAGS is not used by default.  To used it, set optimize=1
-# either in this file or on the command line.
-#OCCFLAGS    += -qarch=ppc -qtune=604
-OCCFLAGS    += -O2 -qarch=com
-RANLIB      = ranlib
-SOFLAGS     = -p 0
-
-SOVERSION  =
-SONAME     =
+include $(ACE_ROOT)/include/makeinclude/platform_aix4_cset++.GNU
diff --git a/ACE/include/makeinclude/platform_aix4.2.GNU b/ACE/include/makeinclude/platform_aix4.2.GNU
new file mode 100644
index 00000000000..395f30adbcb
--- /dev/null
+++ b/ACE/include/makeinclude/platform_aix4.2.GNU
@@ -0,0 +1,3 @@
+# $Id$
+
+include $(ACE_ROOT)/include/makeinclude/platform_aix4_cset++.GNU
\ No newline at end of file
diff --git a/ACE/include/makeinclude/platform_aix4_cset++.GNU b/ACE/include/makeinclude/platform_aix4_cset++.GNU
new file mode 100644
index 00000000000..8bc2b0b3929
--- /dev/null
+++ b/ACE/include/makeinclude/platform_aix4_cset++.GNU
@@ -0,0 +1,110 @@
+# $Id$
+
+# AIX 4.x using the IBM C Set++ compiler.
+#
+# NOTE! IBM is no longer supporting AIX at any version earlier than 4.3,
+# and Riverace is not testing or supporting ACE on them either. No steps
+# have been taken to intentionally disable anything, but it is not being
+# tested either.
+#
+# NOTE 2! This file is only for use with the older CSet++ compiler, which
+# IBM doesn't sell or support any longer. Riverace doesn't support ACE
+# with it either. This file is still here in case there is some site
+# still using the old compiler, but it is completely unsupported.
+#
+# On 4.1, this file assumes that the user has installed the AIX patch
+# containing the dl*() APIs.  To use these APIs, IBM has created a
+# separate product (free to AIX licensees) called shared library
+# hookable symbols (or slhs/6000).  If they don't have this patch, the
+# sv* commands for compiling and linking will not be present on the
+# system.
+#
+# On 4.2, the AIX fileset bos.rte.bind_cmds must be at version 4.2.0.2 or
+# higher in order to build libACEshr.a, and at 4.2.0.4 or higher for dl*()
+# routines to work properly. Best to apply the update available at:
+# ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff
+# or a successor.
+
+debug ?= 1
+distrib ?= 0
+exceptions ?= 1
+optimize ?= 0
+threads ?= 1
+
+# There's no way to turn off exceptions with IBM C/C++
+ifeq (0,$(exceptions))
+  exceptions = 1
+endif
+
+# In case anything here or in the config depends on OS version number,
+# grab it here and pass it all to the compiler as well.
+AIX_MAJOR_VERS := $(shell uname -v)
+AIX_MINOR_VERS := $(shell uname -r)
+
+# aix_build turns on the funky shared library building code.
+aix_build = 1
+# ibmcxx_build turns on the extra step for instantiating and compiling
+# template instances.
+ibmcxx_build = 1
+
+ifeq ($(threads),1)
+CC	    = xlc_r
+CXX	    = xlC_r
+DLD	    = makeC++SharedLib_r
+else
+CC          = xlc
+CXX         = xlC
+DLD	    = makeC++SharedLib
+endif
+
+# -qextchk is handy, but produces false type mismatches when linking
+# netsvcs with 3.1.4, so it's disabled.  IBM reports this fixed in 3.6.4.
+TEMPINCDIR   = tempinc
+CCFLAGS     += $(CFLAGS) -qtempinc=$(TEMPINCDIR) -qinfo
+
+# IBM C/C++ compiler 3.6.x produces a bazillion warnings about 0-valued
+# preprocessor defs. Since both 3.1 and 3.4 could be installed, don't ask
+# lslpp for one or the other. Instead, compile a file and see which compiler
+# the user has set up for use. This trick was submitted by Craig Rodrigues
+# <rodrigc@mediaone.net>, originally from the vacpp compiler newsgroup.
+# It relies on the preprocessor defining __xlC__ to the proper version
+# number of the compiler.
+XLCVERSION := $(shell echo "__xlC__" > ./testAIXCompilerVersion.cpp)
+XLCVERSION := $(shell $(CXX) -E ./testAIXCompilerVersion.cpp | tail -1)
+ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
+ifeq ($(XLCVERSION),0x0306)
+ CCFLAGS    += -qflag=e:e
+else
+ CCFLAGS    += -qflag=w:w
+endif
+CPPFLAGS    += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
+
+# -qinitauto seems useful, but when built with -qinitauto=5F, the
+# Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston)
+DCFLAGS     += -g -qcheck=nobounds:div:null
+
+ACELIB      = -lACE
+LD          = $(CXX)
+
+ifeq ($(AIX_MINOR_VERS),1)
+LLIBS	    = -lsvld -ltli_r $(ACELIB)
+LIBS	    += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS))
+else
+LIBS	    += -ltli_r -ldl
+endif
+
+ARFLAGS	    = ruv
+AR	    = ar
+LDFLAGS	    += -bI:/lib/pse.exp
+# Default OCCFLAGS builds common code for all RS/6000 architectures but
+# this can be set to optimize for your particular computer. The commented
+# out example optimizes for RS/6000 43P.
+# OCCFLAGS is not used by default.  To used it, set optimize=1
+# either in this file or on the command line.
+#OCCFLAGS    += -qarch=ppc -qtune=604
+OCCFLAGS    += -O2 -qarch=com
+RANLIB	    = ranlib
+SOFLAGS	    = -p 0
+
+SOVERSION  =
+SONAME     =
diff --git a/ACE/include/makeinclude/platform_dgux4_epc.GNU b/ACE/include/makeinclude/platform_dgux4_epc.GNU
new file mode 100644
index 00000000000..96080eca81a
--- /dev/null
+++ b/ACE/include/makeinclude/platform_dgux4_epc.GNU
@@ -0,0 +1,23 @@
+# $Id$
+
+# Digital Unix v.4.X using epc?
+# (Apparently based on SunOS 5.x (Solaris 2.x) with SunC++ 4.x)
+
+debug = 1
+
+CC		= gcc
+CXX		= ec++
+## CCFLAGS	+= -relax -tproff
+CCFLAGS		+= $(CFLAGS) -relax -v -eh
+DCFLAGS		+= -g
+DLD		= $(CXX)
+LIBS		+= -lgen -lsocket -ldl -lnsl -lc
+PIC		= -KPIC
+AR		= ar
+ARFLAGS		= -ruv
+RANLIB		= echo
+SOFLAGS		+= -G $(CPPFLAGS)
+#SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+#		  $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
+SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+		  $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/ACE/include/makeinclude/platform_dgux4_ghs.GNU b/ACE/include/makeinclude/platform_dgux4_ghs.GNU
new file mode 100644
index 00000000000..05c5b3ad787
--- /dev/null
+++ b/ACE/include/makeinclude/platform_dgux4_ghs.GNU
@@ -0,0 +1,27 @@
+# $Id$
+
+# DG/UX 4.x using Green Hills Multi's C++ compiler.
+
+debug = 1
+#shared_libs_only = 0
+#static_libs_only = 1
+#static_libs = 1
+
+CC		= cc
+CXX		= ghcx
+CCFLAGS		+= $(CFLAGS) -elf -template=noauto # -ansicxx
+# There was a link-time failure if -g (debugging) was turned on, and Green
+# Hills was not able to try to fix it, so debugging is via ACE_OS::printf :-(
+DCFLAGS		+= # -g
+DLD		= $(CXX) -shared
+LD		= $(CXX)
+LIBS		+= -lthread -lrte -lgen -lsocket -ldl -lnsl # -lc
+PIC		= -pic
+AR		= $(CXX) -archive -o
+ARFLAGS		=
+RANLIB		= echo
+#SOFLAGS		= -G $(CPPFLAGS)
+#SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+#		  $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
+#SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+#		 $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU
index 83dce0bb58a..a32d995bd36 100644
--- a/ACE/include/makeinclude/platform_hpux_aCC.GNU
+++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU
@@ -135,6 +135,14 @@ ifneq ($(exceptions),1)
   CCFLAGS  += +noeh
 endif
 
+# Additionally, on HP-UX 10.20, suppress 495 to shut up the warnings from
+# the system header files.  667 is also suppressed, but the compiler still
+# tells you there was a future error, but at least you can pick out any real
+# errors by quickly scanning the output. 829 is suppressed because the
+# system headers have offending string literals assigned to char *.
+ifeq ($(word 2,$(HPVERS_WORDS)), 10)
+CCFLAGS         += +W495,667,829,908
+endif
 DCCFLAGS        += -g
 DLD             = $(CXX) $(CCFLAGS)
 LD              = $(CXX)
@@ -150,6 +158,9 @@ SOFLAGS         += -b
 
 ifeq ($(distrib),1)
 
+ifeq ($(word 2,$(HPVERS_WORDS)), 10)
+SOFLAGS         += -Wl,-x -Wl,+h/usr/lib/$(@F)
+else
 ifeq ($(buildbits),32)
 SOFLAGS         += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib
 endif
@@ -160,6 +171,7 @@ ifeq ($(buildbits),64)
     SOFLAGS     += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64
   endif
 endif
+endif
 
 endif
 
@@ -202,13 +214,29 @@ else
 endif
 endif
 
-#11.x:
-ifeq ($(threads),1)
-  # If -mt is in CCFLAGS, we don't need to add anything to LIBS; -mt does it.
-  ifeq ($(findstring -mt,$(CCFLAGS)),)
-    ## -L./ must directly preceed the system libraries for 64-bit builds
-    ## with aCC 3.27.  Without this change, libpthread.sl can not be found.
-    LIBS += -L./ -lpthread
+#
+# Grab the appropriate libraries based on the version of HP-UX we're building
+# on and whether or not thread support is being used.
+#
+ifeq ($(word 2,$(HPVERS_WORDS)), 11)
+
+  #11.x:
+  ifeq ($(threads),1)
+    # If -mt is in CCFLAGS, we don't need to add anything to LIBS; -mt does it.
+    ifeq ($(findstring -mt,$(CCFLAGS)),)
+      ## -L./ must directly preceed the system libraries for 64-bit builds
+      ## with aCC 3.27.  Without this change, libpthread.sl can not be found.
+      LIBS += -L./ -lpthread
+    endif
+  endif
+  LIBS          += -lxti -lrt -ldld
+
+else
+
+  # 10.x:
+  LIBS          += -lxti -ldld
+  ifeq ($(threads),1)
+    LIBS                += -lcma
   endif
+
 endif
-LIBS          += -lxti -lrt -ldld
diff --git a/ACE/include/makeinclude/platform_irix5.2.GNU b/ACE/include/makeinclude/platform_irix5.2.GNU
new file mode 100644
index 00000000000..f21ebcb8356
--- /dev/null
+++ b/ACE/include/makeinclude/platform_irix5.2.GNU
@@ -0,0 +1,28 @@
+# $Id$
+
+# Irix 5.2 with gcc 2.6.1
+
+debug = 1
+optimize = 1
+
+MAKE		= gmake
+CC		= gcc
+CXX		= g++
+
+DCFLAGS		+= -g
+DLD		= $(CXX)
+LD		= $(CXX) 
+LDFLAGS		+=
+LIBS		+= -ldl
+OCFLAGS		+= -O2
+PIC		= -fpic
+RANLIB		= echo
+SOFLAGS		=
+SOBUILD		=
+
+# 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/ACE/include/makeinclude/platform_irix5.3_g++.GNU b/ACE/include/makeinclude/platform_irix5.3_g++.GNU
new file mode 100644
index 00000000000..83512d62179
--- /dev/null
+++ b/ACE/include/makeinclude/platform_irix5.3_g++.GNU
@@ -0,0 +1,27 @@
+# $Id$
+
+# Irix 5.3 with GNU C++
+
+debug = 1
+optimize = 1
+
+CC              = gcc
+CXX             = g++
+
+DCFLAGS		+= -g
+DLD             = $(CXX)
+LD		= $(CXX)
+LDFLAGS         += -L$(ACE_ROOT)/lib
+OCFLAGS		+= -O2
+PIC             = -fpic
+RANLIB          = echo
+SOFLAGS         += -shared $(CPPFLAGS)
+SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+                  $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
+
+# 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/ACE/include/makeinclude/platform_irix5.3_sgic++.GNU b/ACE/include/makeinclude/platform_irix5.3_sgic++.GNU
new file mode 100644
index 00000000000..00cd1f6c2e9
--- /dev/null
+++ b/ACE/include/makeinclude/platform_irix5.3_sgic++.GNU
@@ -0,0 +1,25 @@
+# $Id$
+
+# Irix 5.3 with SGI C++
+
+# This suppresses common compiler warnings which appear in the
+# ACE code but should not matter.  The warnings can be turned on
+# again by removing the -woff clause in the CPPFLAGS definition.
+
+debug = 1
+
+CC		= cc
+CXX		= CC
+CCFLAGS		+= $(CFLAGS)
+DCFLAGS		+= -g
+DLD		= $(CXX)
+LD		= $(CXX)
+CPPFLAGS        += -ptused -prelink +pp -woff 3203,3209,3161,3262,3665
+LIBS		=
+PIC		= -KPIC
+AR		= ar
+ARFLAGS		= r
+RANLIB		= echo
+SOFLAGS		+= -shared $(CPPFLAGS) -all
+SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+                  $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/ACE/include/makeinclude/platform_irix6.x_common.GNU b/ACE/include/makeinclude/platform_irix6.x_common.GNU
index a496845a0d7..5338d972dcd 100644
--- a/ACE/include/makeinclude/platform_irix6.x_common.GNU
+++ b/ACE/include/makeinclude/platform_irix6.x_common.GNU
@@ -1,7 +1,7 @@
 # $Id$
 
-xt_reactor ?= 1
-exceptions ?= 1
+xt_reactor = 1
+exceptions = 1
 
 PLATFORM_XT_CPPFLAGS=
 PLATFORM_XT_LIBS=-lXm -lXt -lX11
diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU
index 6249592e166..4e8ca06a59f 100644
--- a/ACE/include/makeinclude/platform_lynxos.GNU
+++ b/ACE/include/makeinclude/platform_lynxos.GNU
@@ -1,7 +1,7 @@
 # $Id$
 #
-# LynxOS with g++.  Defaults to LynxOS Version 4.0.0.  For Version 4.2.0,
-# for example, add "VERSION=4.2.0" to your make invocation.
+# LynxOS with g++.  Defaults to LynxOS Version 4.0.0.  For Version 3.1.0,
+# for example, add "VERSION=3.1.0" to your make invocation.
 
 #### NOTE:  It's best to create a file that includes this one, instead
 #### of symlinking it.  That way, you can easily override the default
@@ -67,7 +67,15 @@ endif # ! LynxOS
 LYNXOS_MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1;}')
 LYNXOS_MINOR = $(shell echo $(VERSION) | awk -F. '{print $$2;}')
 
-shared_libs ?= 1
+ifeq ($(shared_libs_only),1)
+  shared_libs = 1
+  static_libs =
+endif
+ifeq ($(static_libs_only),1)
+  shared_libs =
+  static_libs = 1
+endif
+
 optimize ?= 1
 debug ?= 1
 pipes ?= 1
@@ -100,9 +108,9 @@ ifeq ($(threads),1)
 endif
 
 ifeq ($(shared_libs),1)
-  CPPFLAGS += -DACE_HAS_SVR4_DYNAMIC_LINKING
-  CFLAGS   += -mshared
-  SOFLAGS  += -mshared
+  CFLAGS  += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING
+  CFLAGS  += -DACE_HAS_BROKEN_THREAD_KEYFREE
+  SOFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING
   LIBS    += -ldl
 else
   LIBS    += -lnetinet -lnsl
@@ -111,7 +119,7 @@ endif
 CC              = gcc
 CXX             = g++
 CFLAGS          += -Wpointer-arith -Wall
-CPPFLAGS        += -DACE_LYNXOS_MAJOR=$(LYNXOS_MAJOR) -DACE_LYNXOS_MINOR=$(LYNXOS_MINOR)
+CFLAGS          += -DACE_LYNXOS_MAJOR=$(LYNXOS_MAJOR) -DACE_LYNXOS_MINOR=$(LYNXOS_MINOR)
 DCFLAGS         += -g
 PIC             = -fPIC
 DLD             = $(CXX)
@@ -125,7 +133,7 @@ SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
                   $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
 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/ACE/include/makeinclude/platform_m88k.GNU b/ACE/include/makeinclude/platform_m88k.GNU
new file mode 100644
index 00000000000..0155a3f5e54
--- /dev/null
+++ b/ACE/include/makeinclude/platform_m88k.GNU
@@ -0,0 +1,37 @@
+# $Id$
+
+# SunOS 5.x (Solaris 2.x) with SunC++ 4.x
+
+debug = 1
+optimize = 1
+
+CC		= gcc
+CXX             = g++
+
+
+CFLAGS		+= -w
+DCFLAGS		+= -g
+DLD		= $(CXX)
+LD		= $(CXX)
+INCLDIRS	+= -I$(ACE_ROOT) -I.
+INCLDIRS	+= -I/devel/rmm/v1.0/local/src/threads/include
+LDFLAGS		+= -L $(ACE_ROOT)/lib -L ./
+LDFLAGS		+= -L/devel/rmm/v1.0/local/src/threads/lib
+LIBS		+= -lsocket -ldl -lnsl -lgen -lstdc++ -lg++
+LIBS		+= -lgthreads -lgmalloc
+OCFLAGS		+= -O2
+PIC		= -fpic
+AR		= ar
+ARFLAGS		= ruv
+RANLIB		= /bin/true
+SOFLAGS		+= -G $(CPPFLAGS)
+SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+		  $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
+PRELIB	= @true
+
+# 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) -D__m88k__ $(TEMPLATES_FLAG) -fno-strict-prototypes
diff --git a/ACE/include/makeinclude/platform_osf1_3.2_cxx.GNU b/ACE/include/makeinclude/platform_osf1_3.2_cxx.GNU
new file mode 100644
index 00000000000..a39e943248c
--- /dev/null
+++ b/ACE/include/makeinclude/platform_osf1_3.2_cxx.GNU
@@ -0,0 +1,35 @@
+# $Id$
+
+# This platform macros file is intended to work with Digital UNIX 3.2
+# (OSF/1 3.2g) with CXX 5.7 or later.
+debug ?= 1
+
+# exceptions=1 is the default on this platform. exceptions=0 has not
+# been tested. See the bottom of this file for more. Turning off exceptions
+# on this platform can cause bad things to happen.
+exceptions ?= 1
+
+# We want to test with rtti=1
+rtti ?= 1
+threads ?= 1
+
+CC              = cxx
+CXX             = $(CC)
+CFLAGS          += -threads
+#### CCFLAGS         += -x cxx
+CCFLAGS         += $(CFLAGS) -w0
+DCFLAGS         += -g -O0
+#### DLD             = ld -shared -expect_unresolved '*'
+DLD             = ld
+LD              = $(CXX)
+#### LIBS            += -lpthreads -lmach -lsys5 -lxti -ltli -lcxx -lexc -lc -lrt
+LIBS            += -qltli_r -ltli -qlrt_r -lrt -qlcxxstd_r -lcxxstd -qlcxx_r \
+                   -lcxx -qlots_r -lots -lpthreads -lmach -lexc -lc_r -lc
+#### PIC             = -pic
+ARFLAGS         = cruv
+RANLIB          = /usr/bin/true
+#### SOFLAGS         = -shared
+SOFLAGS         += -L/usr/lib/cmplrs/cxx -rpath /usr/lib/cmplrs/cxx \
+                  -L$(ACE_ROOT)/lib -L./ -g2 -O0 -shared
+SOBUILD         = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
+                  ln $(VSHDIR)$*.o $@
diff --git a/ACE/include/makeinclude/platform_osf1_4.x_cxx.GNU b/ACE/include/makeinclude/platform_osf1_4.x_cxx.GNU
new file mode 100644
index 00000000000..9f6ba9b0ae2
--- /dev/null
+++ b/ACE/include/makeinclude/platform_osf1_4.x_cxx.GNU
@@ -0,0 +1,133 @@
+# $Id$
+
+# This platform macros file is intended to work with
+# Digital UNIX 4.x (OSF/1 4.x), using the cxx compiler..
+
+# Note that TAO has not been tested with debug=0 on this platform. So
+# you should be careful when turning off debug.
+debug ?= 1
+
+# exceptions=1 is the default on this platform. exceptions=0 has not
+# been tested. See the bottom of this file for more. Turning off exceptions
+# on this platform can cause bad things to happen.
+exceptions ?= 1
+
+# We want to test with rtti=1
+rtti ?= 1
+threads ?= 1
+
+# Use of Standard C++ Library requires some flags to be added to the
+# compile line
+#
+stdcpplib ?= 1
+
+CC              = cxx
+CXX             = $(CC)
+
+# Note: Just get the version if it hasnt been defined so far.
+#
+ifndef CXX_VERSION
+  CXX_VERSION := $(shell $(CXX) -V)
+endif # ! CXX_VERSION
+
+#### Note: -thread uses POSIX threads.  If you want to use DCE threads
+####       instead, change "-pthread" to "-threads".
+ifeq ($(threads),1)
+	CFLAGS          += -pthread
+endif
+
+
+
+#### These flags can only be used with cxx Version 6.0 and later.
+#### They are enabled by default; they can be disabled by settting
+#### CXX_VER to CXX_5 either on the make command line, or by
+#### or by setting the CXX_VER environment variable to CXX_5.
+ifneq ($(CXX_VER),CXX_5)
+  WARNING_FLAGS += -w0
+  ifneq (,$(VERBOSE_WARNING))
+    WARNING_FLAGS += -msg_display_number -msg_display_tag
+  endif # VERBOSE_WARNING
+
+  ifneq (,$(optimize))
+    #### See ace/config-cxx-common.h for the meaning of this warning.
+    #### It's not necessary on DU 5.0.
+    WARNING_FLAGS += -msg_disable 1016
+  endif # optimize
+  ifeq (4.,$(findstring 4.,$(shell uname -r)))
+    # 9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
+    WARNING_FLAGS += -msg_disable 9
+  endif
+endif # 6.0 or later
+
+templates ?= automatic
+
+# Turn on the appropriate flags
+#
+ifeq ($(templates), automatic)
+  ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied.
+    TEMPLATES_FLAG = -pt
+    SOFLAGS        += -tall
+  endif
+else
+  ifeq ($(templates), used)
+    ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied.
+      TEMPLATES_FLAG = -pt
+      SOFLAGS        += -tused
+    endif
+  endif # templates == used
+endif # templates == automatic
+
+# Add the extra definitions needed to use the Standard Template Library
+#
+ifeq ($(stdcpplib), 1)
+  CPPFLAGS += -D__USE_STD_IOSTREAM
+endif
+
+# The correct flags to pass to the linker for ELF dynamic shared library
+# versioning
+#
+ifneq ($(SONAME),)
+  SOFLAGS += -soname $(SONAME)
+endif
+
+CCFLAGS         += $(CFLAGS) $(WARNING_FLAGS) $(TEMPLATES_FLAG)
+DCFLAGS         += -g -O0
+DLD             = $(CXX)
+LD              = $(CXX)
+#### The -hidden [...] -non_hidden business avoids multiply defined
+#### symbols between the shared library and libcxxstd.a.  It's the
+#### workaround recommended in PTR 43-4-204.  It must appear before any
+#### linker commands.
+LDFLAGS         += -hidden $(wildcard /usr/lib/libcxxstd.a) -non_hidden
+LIBS            += $(CFLAGS) -lxti -lrt
+MATHLIB         = -lm
+OCFLAGS         += -O3
+PIC             =
+ARFLAGS         = cruvZ
+# This is needed to pull in all the template instantiations from the
+# repository into the library.
+#
+TMPINCDIR       = cxx_repository
+
+# When libraries are archived, a hash index is automatically created
+# so there is no need for ranlib
+#
+RANLIB          = @true
+SOFLAGS         += -shared -use_ld_input $(ACELIB)
+
+LIBS            :=  $(LIBS)
+SOBUILD         = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
+                  ln $(VSHDIR)$*.o $@
+ifeq (0,$(rtti))
+  CCFLAGS += -nortti
+endif # rtti
+
+
+ifeq (0,$(exceptions))
+  #### Disable the default exception handling of cxx >= 6.0.
+  #### This is untested.  exceptions=1 is the default, so it's not used
+  #### by default.
+  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
+    CCFLAGS += -nocleanup
+  endif # 6.x
+endif # ! exceptions
diff --git a/ACE/include/makeinclude/platform_osf1_4.x_g++.GNU b/ACE/include/makeinclude/platform_osf1_4.x_g++.GNU
new file mode 100644
index 00000000000..0a3b841d4cd
--- /dev/null
+++ b/ACE/include/makeinclude/platform_osf1_4.x_g++.GNU
@@ -0,0 +1,34 @@
+# $Id$
+
+# This platform macros file is intended to work with Digital UNIX 4.x
+# (OSF/1 4.x) and GCC in version 2.9.6 or newer
+debug ?= 1
+exceptions ?= 1
+rtti ?= 1
+threads ?= 1
+optimize ?= 1
+
+CC              = gcc
+CXX             = g++
+CFLAGS          += -D_REENTRANT
+
+DCFLAGS         += -g
+LD              = $(CXX)
+DLD             = $(CXX)
+LIBS            += -lpthread -lmach -lexc -lxti -lrt
+OCFLAGS         += -O3
+PIC             = -fpic
+ARFLAGS         = cruvZ
+# When libraries are archived, a hash index is automatically created so there
+# is no need for ranlib
+RANLIB          = /usr/bin/true
+SOFLAGS         += -shared $(CPPFLAGS) $(ACELIB)
+SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
+PRELIB          = @true
+
+# 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/ACE/include/makeinclude/platform_osf1_4.x_rcc.GNU b/ACE/include/makeinclude/platform_osf1_4.x_rcc.GNU
new file mode 100644
index 00000000000..ec88239b058
--- /dev/null
+++ b/ACE/include/makeinclude/platform_osf1_4.x_rcc.GNU
@@ -0,0 +1,28 @@
+# $Id$
+
+# This platform macros file is intended to work with Rational C++ (2.4.1) on
+# Digital UNIX 4.0 (OSF/1 4.0).
+
+debug ?= 1
+exceptions ?= 1
+rtti ?= 1
+threads ?= 1
+optimize ?= 1
+
+CC              = rcc
+CXX             = RCC
+CFLAGS          += -D_REENTRANT
+CCFLAGS         += $(CFLAGS) -nosienna
+DCFLAGS         += -g -O0
+DLD             = $(CXX)
+LD              = $(CXX)
+LIBS            += -lpthread -lc_r -lxti -lrt
+OCFLAGS         += -O4
+PIC             = -pic
+ARFLAGS         = cruvZ
+# When libraries are archived, a hash index is automatically created
+# so there is no need for ranlib
+RANLIB          = /usr/bin/true
+SOFLAGS         += -shared  # -use_ld_input $(ACELIB)
+SOBUILD         = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
+                  ln $(VSHDIR)$*.o $@
diff --git a/ACE/include/makeinclude/platform_qnx_neutrino.GNU b/ACE/include/makeinclude/platform_qnx_neutrino.GNU
index 2bd92551f7b..68bdb5ff4dc 100644
--- a/ACE/include/makeinclude/platform_qnx_neutrino.GNU
+++ b/ACE/include/makeinclude/platform_qnx_neutrino.GNU
@@ -7,10 +7,12 @@ static_libs_only = 1
 
 debug ?= 1
 optimize ?= 1
+repo ?= 1
+
 pipes ?= 1
 
-CC      ?= i386-nto-gcc
-CXX     ?= i386-nto-g++
+CC      = i386-nto-gcc
+CXX     = i386-nto-g++
 
 CFLAGS  += -W -Wall -Wpointer-arith
 DCFLAGS += -g
@@ -20,9 +22,9 @@ LDFLAGS +=
 LIBS    += -lsocket -lstdc++
 OCFLAGS += -O2
 PIC     = -fPIC
-AR     ?= i386-nto-ar
+AR      = i386-nto-ar
 ARFLAGS = ruv
-RANLIB ?= i386-nto-ranlib
+RANLIB  = i386-nto-ranlib
 SOFLAGS += -G $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB  = @true
diff --git a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU
index 344ca621a8e..7c13b512c11 100644
--- a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU
+++ b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU
@@ -4,7 +4,7 @@
 
 nto_version := $(shell uname -a | awk '{ gsub("\\.","", $$3 ); print $$3;}')
 
-inline ?= 1
+inline = 1
 debug ?= 1
 optimize ?= 0
 exceptions ?= 1
@@ -30,8 +30,8 @@ else # debug excludes optimize due to g++ internal compiler error
 	OCFLAGS += -O3
   endif #optimize
 endif #debug
-CC      ?= gcc
-CXX     ?= g++
+CC      = gcc
+CXX     = g++
 
 CFLAGS  += -pipe -W -Wall -Wpointer-arith -DACE_NTO_VERS=$(nto_version)
 CPPFLAGS += -DACE_NTO_VERS=$(nto_version)
@@ -41,13 +41,14 @@ LD      = $(CXX)
 LIBS    += -lsocket -lstdc++ -lm
 
 PIC     = -fPIC
-AR      ?= ar
+AR      = ar
 ARFLAGS = ruv
+#RANLIB  = ranlib
 SOFLAGS += $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 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/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
index 00813ebcffd..0110c5805a3 100644
--- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU
+++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
@@ -12,7 +12,6 @@ threads ?= 1
 
 shared_libs =
 static_libs = 1
-rwho = 0
 
 ifeq (,$(RTEMS_MAKEFILE_PATH))
   default:
@@ -44,7 +43,7 @@ DLD             = $(LD)
 INCLDIRS        +=
 
 LD              = $(CXX)
-LDFLAGS         += -Wl,--allow-multiple-definition -B$(RTEMS_MAKEFILE_PATH)/lib -Wl,-Ttext,0x00100000
+LDFLAGS         += -Wl,--allow-multiple-definition -B$(RTEMS_MAKEFILE_PATH)/lib
 OCFLAGS         += -O
 PIC             =
 
diff --git a/ACE/include/makeinclude/platform_sunos4_g++.GNU b/ACE/include/makeinclude/platform_sunos4_g++.GNU
new file mode 100644
index 00000000000..b80e9a14c2b
--- /dev/null
+++ b/ACE/include/makeinclude/platform_sunos4_g++.GNU
@@ -0,0 +1,33 @@
+# $Id$
+
+# SunOS 4.x (Solaris 1.x) with g++
+
+debug ?= 1
+optimize ?= 1
+
+CC	= gcc
+CXX	= g++
+CFLAGS  += -fno-strict-prototypes
+
+DCFLAGS	+= -g
+DLD	= /bin/ld
+LD	= $(CXX)
+#
+# for G++ v2.6.0
+OCFLAGS	+= -O2
+PIC	= -fpic
+AR	= ar
+ARFLAGS	= ruv
+RANLIB	= ranlib
+SOFLAGS	+= -assert pure-text
+# SOBUILD - compile into .so directly
+SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
+# SOLINK	= $(SOLINK.cc) -o $@ $(LDFLAGS) $<
+PRELIB	= @true
+
+# 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/ACE/include/makeinclude/platform_sunos4_lucid.GNU b/ACE/include/makeinclude/platform_sunos4_lucid.GNU
new file mode 100644
index 00000000000..e062639afca
--- /dev/null
+++ b/ACE/include/makeinclude/platform_sunos4_lucid.GNU
@@ -0,0 +1,21 @@
+# $Id$
+
+# SunOS 4.x (Solaris 1.x) with Lucid
+
+debug = 1
+
+CC		= lcc
+CXX		= lcc
+CFLAGS		= -Xa # use ANSI c complier
+CCFLAGS		= -XF -Xpt- # use c++ ARM compiler with auto templates turned off
+DCFLAGS		+= -g
+DCCFLAGS	+= $(DCFLAGS)
+DLD		= /bin/ld
+LD		= $(CXX)
+LIBS		+=
+PIC		= -pic
+ARFLAGS		= ruv
+RANLIB		= ranlib
+SOFLAGS		+= -assert pure-text
+SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+		  $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/ACE/include/makeinclude/platform_sunos4_sunc++3.x.GNU b/ACE/include/makeinclude/platform_sunos4_sunc++3.x.GNU
new file mode 100644
index 00000000000..2727c38e9f9
--- /dev/null
+++ b/ACE/include/makeinclude/platform_sunos4_sunc++3.x.GNU
@@ -0,0 +1,27 @@
+# $Id$
+
+# SunOS 4.x (Solaris 1.x) with SunC++ 3.x (note that this is a very old C++
+# compiler, based on cfront.  In paricular, it's not the same thing as
+# SunC++ 4.x (which is also known as SPARCWorks 3.x).
+
+debug = 1
+
+CC		= cc
+CXX		= CC
+CCFLAGS		+= $(CFLAGS)
+DCFLAGS		+= -g
+DLD		= /bin/ld
+LD		= $(CXX)
+LIBS		+=
+PIC		= -pic
+AR		= ar
+ARFLAGS		= ruv
+RANLIB		= ranlib
+SOFLAGS		+= -assert pure-text
+SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+		  $(RM) -rf $(VSHDIR)pt$*; mkdir $(VSHDIR)pt$*; \
+		  YYZ="`$(CXX) $(CCFLAGS) $(CPPFLAGS) \
+		  -ptr$(VSHDIR)pt$* -ptr./ptrepository $<`"; \
+		  $(RM) -rf a.out; \
+		  YYZ="`echo $(VSHDIR)pt$*/*.o`"; \
+		  $(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o $(YYZ)
diff --git a/ACE/include/makeinclude/platform_sunos4_sunc++4.x.GNU b/ACE/include/makeinclude/platform_sunos4_sunc++4.x.GNU
new file mode 100644
index 00000000000..5aa1e54ceab
--- /dev/null
+++ b/ACE/include/makeinclude/platform_sunos4_sunc++4.x.GNU
@@ -0,0 +1,24 @@
+# $Id$
+
+# SunOS 4.x (Solaris 1.x) with SunC++ 4.x
+
+debug = 1
+
+CC              = cc
+CXX             = CC
+CCFLAGS		+= $(CFLAGS)
+DCFLAGS		+= -g
+DLD             = $(CXX)
+LD		= $(CXX)
+LIBS            +=
+LDFLAGS		+= $(PIC)
+AR              = CC
+ARFLAGS         = -xar -o
+PIC             = -PIC
+RANLIB          = ranlib
+SOFLAGS         += -G $(CPPFLAGS)
+SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+                  $(SOLINK.cc) $(PIC) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
+
+#### Create template repository to avoid compiler warning.
+TEMPLATE_REPOSITORY = Templates.DB
diff --git a/ACE/include/makeinclude/platform_sunos5_centerline.GNU b/ACE/include/makeinclude/platform_sunos5_centerline.GNU
new file mode 100644
index 00000000000..e70dc213e9d
--- /dev/null
+++ b/ACE/include/makeinclude/platform_sunos5_centerline.GNU
@@ -0,0 +1,22 @@
+# $Id$
+
+# SunOS 5.x (Solaris 2.x) with Centerline C++
+
+debug = 1
+
+CC		= cc
+CXX		= CC
+CFLAGS          += -mt
+CCFLAGS         += $(CFLAGS)
+DCFLAGS		+= -g
+DLD		= $(CXX) -mt
+LD		= $(CXX) -mt
+LIBS		+= -lsocket -ldl -lnsl -lgen
+PIC		= -PIC
+#AR		= CC
+#ARFLAGS	= -xar -o
+ARFLAGS		= ruv
+RANLIB		= echo
+SOFLAGS		+= -G $(CPPFLAGS) $(PTDIRS)
+SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+		  $(SOLINK.cc) $(PIC) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/ACE/include/makeinclude/platform_tru64_cxx.GNU b/ACE/include/makeinclude/platform_tru64_cxx.GNU
index 335c10f362a..72bedef2735 100644
--- a/ACE/include/makeinclude/platform_tru64_cxx.GNU
+++ b/ACE/include/makeinclude/platform_tru64_cxx.GNU
@@ -7,131 +7,11 @@
 #
 include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU
 
-# Note that TAO has not been tested with debug=0 on this platform. So
-# you should be careful when turning off debug.
-debug ?= 1
 
-# exceptions=1 is the default on this platform. exceptions=0 has not
-# been tested. See the bottom of this file for more. Turning off exceptions
-# on this platform can cause bad things to happen.
-exceptions ?= 1
-
-# We want to test with rtti=1
-rtti ?= 1
-threads ?= 1
-
-# Use of Standard C++ Library requires some flags to be added to the
-# compile line
-#
-stdcpplib ?= 1
-
-CC              = cxx
-CXX             = $(CC)
-
-# Note: Just get the version if it hasnt been defined so far.
-#
-ifndef CXX_VERSION
-  CXX_VERSION := $(shell $(CXX) -V)
-endif # ! CXX_VERSION
-
-#### Note: -thread uses POSIX threads.  If you want to use DCE threads
-####       instead, change "-pthread" to "-threads".
-ifeq ($(threads),1)
-  CFLAGS          += -pthread
-endif
-
-#### These flags can only be used with cxx Version 6.0 and later.
-#### They are enabled by default; they can be disabled by settting
-#### CXX_VER to CXX_5 either on the make command line, or by
-#### or by setting the CXX_VER environment variable to CXX_5.
-ifneq ($(CXX_VER),CXX_5)
-  WARNING_FLAGS += -w0
-  ifneq (,$(VERBOSE_WARNING))
-    WARNING_FLAGS += -msg_display_number -msg_display_tag
-  endif # VERBOSE_WARNING
-
-  ifneq (,$(optimize))
-    #### See ace/config-cxx-common.h for the meaning of this warning.
-    #### It's not necessary on DU 5.0.
-    WARNING_FLAGS += -msg_disable 1016
-  endif # optimize
-  ifeq (4.,$(findstring 4.,$(shell uname -r)))
-    # 9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
-    WARNING_FLAGS += -msg_disable 9
-  endif
-endif # 6.0 or later
-
-templates ?= automatic
-
-# Turn on the appropriate flags
+# Include the macro file for osf1_4.x
 #
-ifeq ($(templates), automatic)
-  ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied.
-    TEMPLATES_FLAG = -pt
-    SOFLAGS        += -tall
-  endif
-else
-  ifeq ($(templates), used)
-    ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied.
-      TEMPLATES_FLAG = -pt
-      SOFLAGS        += -tused
-    endif
-  endif # templates == used
-endif # templates == automatic
+include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_cxx.GNU
 
-# Add the extra definitions needed to use the Standard Template Library
-#
-ifeq ($(stdcpplib), 1)
-  CPPFLAGS += -D__USE_STD_IOSTREAM
-endif
-
-# The correct flags to pass to the linker for ELF dynamic shared library
-# versioning
-#
-ifneq ($(SONAME),)
-  SOFLAGS += -soname $(SONAME)
-endif
-
-CCFLAGS         += $(CFLAGS) $(WARNING_FLAGS) $(TEMPLATES_FLAG)
-DCFLAGS         += -g -O0
-DLD             = $(CXX)
-LD              = $(CXX)
-#### The -hidden [...] -non_hidden business avoids multiply defined
-#### symbols between the shared library and libcxxstd.a.  It's the
-#### workaround recommended in PTR 43-4-204.  It must appear before any
-#### linker commands.
-LDFLAGS         += -hidden $(wildcard /usr/lib/libcxxstd.a) -non_hidden
-LIBS            += $(CFLAGS) -lxti -lrt
-MATHLIB         = -lm
-OCFLAGS         += -O3
-PIC             =
-ARFLAGS         = cruvZ
-# This is needed to pull in all the template instantiations from the
-# repository into the library.
-#
-TMPINCDIR       = cxx_repository
-
-# When libraries are archived, a hash index is automatically created
-# so there is no need for ranlib
-#
-RANLIB          = @true
-SOFLAGS         += -shared -use_ld_input $(ACELIB)
-
-LIBS            :=  $(LIBS)
-SOBUILD         = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
-                  ln $(VSHDIR)$*.o $@
-ifeq (0,$(rtti))
-  CCFLAGS += -nortti
-endif # rtti
-
-ifeq (0,$(exceptions))
-  #### Disable the default exception handling of cxx >= 6.0.
-  #### This is untested.  exceptions=1 is the default, so it's not used
-  #### by default.
-  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
-    CCFLAGS += -nocleanup
-  endif # 6.x
-endif # ! exceptions
 
 ### There is a bug with pthreads header file shipped with v1885 of
 ### V5.1. We need to turn this flag to get asm () inline for
diff --git a/ACE/include/makeinclude/platform_tru64_g++.GNU b/ACE/include/makeinclude/platform_tru64_g++.GNU
index 980c13635e8..155d71109f8 100644
--- a/ACE/include/makeinclude/platform_tru64_g++.GNU
+++ b/ACE/include/makeinclude/platform_tru64_g++.GNU
@@ -11,36 +11,9 @@
 #
 include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU
 
-debug ?= 1
-exceptions ?= 1
-rtti ?= 1
-threads ?= 1
-optimize ?= 1
-
-CC              = gcc
-CXX             = g++
-CFLAGS          += -D_REENTRANT
-
-DCFLAGS         += -g
-LD              = $(CXX)
-DLD             = $(CXX)
-LIBS            += -lpthread -lmach -lexc -lxti -lrt
-OCFLAGS         += -O3
-PIC             = -fpic
-ARFLAGS         = cruvZ
-# When libraries are archived, a hash index is automatically created so there
-# is no need for ranlib
-RANLIB          = /usr/bin/true
-SOFLAGS         += -shared $(CPPFLAGS) $(ACELIB)
-SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB          = @true
-
-# Test for template instantiation, add to SOFLAGS if SONAME set,
-# add -E to LDFLAGS if using GNU ld
+# Include the macro file for osf1_4.x
 #
-include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-
-CCFLAGS         += $(CFLAGS) $(TEMPLATES_FLAG)
+include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_g++.GNU
 
 # Include the common macros for all compilers
 #
diff --git a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
index c73e42594b1..df071f82675 100644
--- a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
+++ b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
@@ -161,25 +161,15 @@ ifeq ("$(VXWORKSLINK)","true")
   ifeq ($(SHARED_LIBS),1)
     ##LD_PARTIAL += -L$(ACE_ROOT)/lib -L./ $(LDLIBPATH) $(LD_LINK_PATH)
     PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS)
-	  ifeq ($(VX_SO_BUILD),1)
+	ifeq ($(VX_SO_BUILD),1)
 	  ## Shared lib builds for VxWorks will also build 'import' libraries
-    LIB_INSTALL += $(VLIB:%=$(INSLIB)/%)
-    CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%)
+      LIB_INSTALL += $(VLIB:%=$(INSLIB)/%)
+      CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%)
 	  REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize)
-	  endif
+	endif
   else
     LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH)
-    ifeq (1,$(repo))
-    PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(shell set AR=$(AR) && set RANLIB=$(RANLIB) && perl $(ACE_ROOT)/bin/vx_repo_link.pl $(VLDLIBS)) $(ACE_SHLIBS)
-    ifneq (1,$(VX_KEEP_PRELINK_LIB))
-      POSTLINK = rmdir /s/q .lib && rmdir /s/q $(subst /,\,$(VDIR))
-      REALCLEAN_FILES += .lib
-    else
-      POSTLINK = rmdir /s/q $(subst /,\,$(VDIR))
-    endif
-    else
-    PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(VLDLIBS) $(ACE_SHLIBS)
-    endif
+    PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(VLDLIBS) $(ACE_SHLIBS) $(LIBS)
   endif
   PRJ_OBJS_FOR_LD=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS)
   PRJ_OBJS_FOR_NM=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS)
@@ -208,22 +198,22 @@ ifeq ("$(TOOL)","gnu")
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
 
 ifeq ("$(templates)","automatic")
-	ifdef repo
-		ifeq ("$(VXWORKSLINK)","true")
-  		ifeq ($(VX_APP_BUILD),1)
-				ifneq ($(SHARED_LIBS),1)
-      	LD_PARTIAL += -frepo
-				endif
-  		endif
-		else
-  	#ace_lib_prelink := 1
-  	  LINK.cc          = override
-  	  LINK.cc.override = $(LD_PARTIAL) -frepo
-  	  LDFLAGS          = $(ACE_SHLIBS)
-		endif
-	else
-  C++FLAGS += -fmerge-templates
+ifdef repo
+ifeq ("$(VXWORKSLINK)","true")
+  ifeq ($(VX_APP_BUILD),1)
+	ifneq ($(SHARED_LIBS),1)
+      LD_PARTIAL += -frepo
 	endif
+  endif
+else
+  ace_lib_prelink := 1
+  LINK.cc          = override
+  LINK.cc.override = $(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L$(INSLIB) -L./ $(LDLIBPATH) $(LD_LINK_PATH)
+  LDFLAGS          = $(ACE_SHLIBS)
+endif
+else
+  C++FLAGS += -fmerge-templates
+endif
 endif
 
 # TEMPLATES_FLAG is set by platform_g++_common.GNU
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index 91c59adc0da..05568999af5 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -88,7 +88,7 @@ ifeq ($(TOOL_FAMILY),)
   endif
 endif
 
-ifeq ("$(TOOL_FAMILY)","gnu")
+ifeq ("$(TOOL)","gnu")
   templates ?= automatic
 endif
 
@@ -169,11 +169,9 @@ endif
 
 ifeq ($(rtp),1)
   include $(WIND_USR)/make/defs.default
-  include $(WIND_USR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
   include $(WIND_USR)/make/defs.$(WIND_HOST_TYPE)
-  ifeq ("$(TOOL_FAMILY)","gnu")
-    CPPFLAGS += -mrtp
-  endif
+  include $(WIND_USR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
+  CPPFLAGS += -mrtp
   LDFLAGS := $(filter-out -X, $(LDFLAGS))
   LDFLAGS := $(filter-out -N, $(LDFLAGS))
   LD := $(CPLUS)
@@ -238,7 +236,7 @@ ifeq ($(pthread),1)
   CPPFLAGS += -DACE_HAS_PTHREADS
 endif
 
-ifeq ("$(TOOL_FAMILY)","gnu")
+ifeq ("$(TOOL)","gnu")
 # 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
@@ -268,16 +266,16 @@ endif
 ifneq ($(TEMPLATES_FLAG),) # If specified, add it to the CCFLAGS
   CPPFLAGS += $(TEMPLATES_FLAG)
 endif
-endif  # TOOL_FAMILY == gnu
+endif  # TOOL == gnu
 
-ifeq ("$(TOOL_FAMILY)","diab")
+ifeq ("$(TOOL)","diab")
 ifeq ($(exceptions),1)
   C++FLAGS += -Xexceptions
 else
   C++FLAGS += -Xexceptions-off
 endif
 else
-ifeq ("$(TOOL_FAMILY)","gnu")
+ifeq ("$(TOOL)","gnu")
 ifeq ($(exceptions),1)
   C++FLAGS += -fexceptions
 else
@@ -288,22 +286,18 @@ endif
 
 ifeq (0,$(rtti))
 C++FLAGS += -DACE_LACKS_RTTI
-ifeq ("$(TOOL_FAMILY)","gnu")
+ifeq ("$(TOOL)","gnu")
   C++FLAGS += -fno-rtti
 else
   C++FLAGS += -Xrtti-off
 endif
 endif # rtti
 
-ifeq ("$(TOOL_FAMILY)","diab")
-  LDLIBS += -lstlstd
-endif
-
 ifneq ($(findstring $(VX_CPU_FAMILY),ppc arm),)
-ifeq ("$(TOOL_FAMILY)","diab")
+ifeq ("$(TOOL)","diab")
   C++FLAGS += -Xchar-signed
 else
-ifeq ("$(TOOL_FAMILY)","gnu")
+ifeq ("$(TOOL)","gnu")
   C++FLAGS += -fsigned-char
 endif
 endif
@@ -322,10 +316,10 @@ CCFLAGS         += $(C++FLAGS)
 ifeq (0,$(rtp))
 PIC              =
 else
-  ifeq ("$(TOOL_FAMILY)","diab")
+  ifeq ("$(TOOL)","diab")
     PIC = -Xpic
   else
-  ifeq ("$(TOOL_FAMILY)","gnu")
+  ifeq ("$(TOOL)","gnu")
     PIC = -fpic
   endif
 endif
diff --git a/ACE/include/makeinclude/platform_vxworks6.4.GNU b/ACE/include/makeinclude/platform_vxworks6.4.GNU
deleted file mode 100644
index 25716f6c6eb..00000000000
--- a/ACE/include/makeinclude/platform_vxworks6.4.GNU
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-# VxWorks 6.4
-
-#### Notes:
-#### 1) This file requires that the WIND_BASE and WIND_HOST_TYPE environment
-####    variables be set.  If the target CPU is not SIMNT, then your CPU
-####    environment variable must be set.
-#### 2) The TOOL environment variable may be set to "diab" (default is "gnu").
-#### 3) If perl is not on your path, you'll also need to set your PERL_PATH
-####    environment variable to the full path to perl.
-
-ifeq ($(VXWORKS_VERSION_FLAG),)
-  VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x640
-endif # VXWORKS_VERSION_FLAG
-
-include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.3.GNU
diff --git a/ACE/include/makeinclude/rules.bin.GNU b/ACE/include/makeinclude/rules.bin.GNU
index 1e30819c6de..9337721ce52 100644
--- a/ACE/include/makeinclude/rules.bin.GNU
+++ b/ACE/include/makeinclude/rules.bin.GNU
@@ -42,6 +42,16 @@ ifeq ($(VXWORKSLINK),true)
 $(BIN): $(DEFAULTRULE)
 	mv $(DEFAULTRULE) $@
 else # !VXWORKSLINK
+ifeq ($(CHORUSLINK),true)
+$(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS)
+	$(LINK.cc) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(LDFLAGS) $(POSTLINK)
+#	$(MERGEDIR)/dtool/mkctors $@.xp.o > $@.ct.s
+#	$(CXX) -c $@.ct.s
+#	$(RM) $@.ct.s
+#	$(LD) $(LDOPTIONS) -e _start -o $@ $(MERGEDIR)/lib/crt/crth.u.o $(MERGEDIR)/lib/crt/crt0.o $(MERGEDIR)/lib/crt/crti.o $@.xp.o $@.ct.o $(MERGEDIR)/lib/crt/crtn.o -dn -T $(MERGEDIR)/src/act/slots/act_u.ld
+#	$(RM) $@.xp.o
+#	$(RM) $@.ct.o
+else # !CHORUSLINK
   ifeq (1,$(using_aix_vacpp))
 $(BIN): %: %.icc $(SRC)
 	vacbld_r $< -severitylevel=warning
@@ -50,3 +60,4 @@ $(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS)
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK)
   endif # using_aix_vacpp
 endif
+endif
diff --git a/ACE/include/makeinclude/rules.common.GNU b/ACE/include/makeinclude/rules.common.GNU
index dd354e41a3f..f0b50695f1a 100644
--- a/ACE/include/makeinclude/rules.common.GNU
+++ b/ACE/include/makeinclude/rules.common.GNU
@@ -19,4 +19,3 @@ clobber:          clobber.nested clobber.local
 depend:	          depend.nested depend.local
 rcs_info:         rcs_info.nested rcs_info.local
 idl_stubs:        idl_stubs.nested idl_stubs.local
-svnignore:	  svnignore.nested svnignore.local
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index 2b0ded6127f..49a2ba2dae1 100644
--- a/ACE/include/makeinclude/rules.lib.GNU
+++ b/ACE/include/makeinclude/rules.lib.GNU
@@ -79,12 +79,12 @@ else # VLIBS
   endif # IDL_SRC
 endif # !VLIBS
 
-VLOBJS = $(addprefix $(VDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir $(var)),$(var))))
+VLOBJS = $(addprefix $(VDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(if $(findstring ../,$(var)),$(notdir $(var)),$(var))))
 ifdef LSRC2
   LSRC += $(LSRC2)
 endif
 
-VSHOBJS = $(addprefix $(VSHDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir $(var)),$(var))))
+VSHOBJS = $(addprefix $(VSHDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(if $(findstring ../,$(var)),$(notdir $(var)),$(var))))
 
 ifneq ($(IDL_SRC),)
   $(VLOBJS) $(VSHOBJS): $(IDL_SRC)
@@ -108,56 +108,34 @@ endif # shared_libs
 ace_lib_prelink ?= 0
 aix_build ?= 0
 
-ifeq (1,$(VXWORKS))
-
-  ifeq (1,$(ace_lib_prelink))
-.PHONY: ace-templ_inst
-
-ace-templ_inst:
-	-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $(VLOBJS) $(LDFLAGS) $(ACE_SHLIBS)
-	-$(RM) ace-templ_inst
-
-$(VLIB): $(VLOBJS) ace-templ_inst
-  else
 $(VLIB): $(VLOBJS)
-  endif
-  ifeq (1,$(repo))
-	@echo $(LINK.cc) $(LINK_OUTPUT_FLAG) > .prelink.spec
-	@echo xargs $(AR) $(ARFLAGS) $(notdir $@) $(AREXTRA) >> .prelink.spec
-	@if not [""]==["$(ACE_SHLIBS)"] @echo $(subst -l,,$(ACE_SHLIBS)) >> .prelink.spec
-	@echo Add .rpo files
-	echo .prelink.spec $(foreach rpo,$(patsubst %.o,%.rpo,$(filter %.o, $?)),$(shell if exist $(rpo) echo $(rpo))) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
-  endif
-	@echo Add .o files
-	echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
-	-chmod a+r $@
-  ifneq (,$(RANLIB))
-	-$(RANLIB) $@
-  endif # RANLIB
-
-else # !VXWORKS
 
-$(VLIB): $(VLOBJS)
-  ifeq (1,$(repo))
-    ifneq (,$(ACELIB))
+ifeq (1,$(repo))
+  ifneq (,$(ACELIB))
     #### With repo, link in all of the ace object files to the lib.
     #### This avoids multiple instantiations.  We haven't found it to
     #### be necessary with shared libs, so just do it for static libs.
     vpath %.$(OBJEXT) $(ACE_ROOT)/ace/$(VDIR)
 
     $(VLIB): $(ACE_ROOT)/ace/$(VDIR)*.$(OBJEXT)
-    endif # ! ACELIB
-  endif # repo
-  ifdef PRELIB
+  endif # ! ACELIB
+endif # repo
+
+ifdef PRELIB
 	$(PRELIB)
-  endif
-  ifeq (1,$(ace_lib_prelink))
+endif
+ifeq (1,$(ace_lib_prelink))
         #### Attempt a link (which will fail), to add template instantiations
         #### to lib files, for example.
+  ifeq (1,$(VXWORKS))
+        #### In VxWorks builds we would like to see the output here.
+	-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS)
+  else
 	-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR)
-  endif # ace_lib_prelink
+  endif
+endif # ace_lib_prelink
 	echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
-  ifdef ibmcxx_build
+ifdef ibmcxx_build
 # This is required to get AIX IBM C/C++ to instantiate and compile the needed
 # templates.
                       if test -s ./$(TEMPINCDIR)/*.C; \
@@ -166,13 +144,11 @@ $(VLIB): $(VLOBJS)
 		$(RM) dummy; \
 		$(AR) $(ARFLAGS) $@ $(TEMPINCDIR)/*.$(OBJEXT); \
 	fi
-  endif
+endif
 	-chmod a+r $@
-  ifneq (,$(RANLIB))
+ifneq (,$(RANLIB))
 	-$(RANLIB) $@
-  endif # RANLIB
-
-endif # !VXWORKS
+endif # RANLIB
 
 # Note that if you don't want to build shared libraries, just remove the
 # $(VSHOBJS)
diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU
index 67878326f76..71e37f61733 100644
--- a/ACE/include/makeinclude/rules.local.GNU
+++ b/ACE/include/makeinclude/rules.local.GNU
@@ -90,46 +90,28 @@ endif # static_link = 1
 
 OS ?=
 
-# Define a canned command set to create the output object directory if needed.
-ifeq ($(vxworks_ntbuild),1)
-define mk_obj_out_dir
-@if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
-@echo > $(dir $@).creation_stamp
-endef
-else
-define mk_obj_out_dir
-@-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
-endef
-endif
-
-$(VDIR)%.o: %.c
-	$(mk_obj_out_dir)
+$(VDIR)%.o: %.c $(VDIR)%.creation_stamp
 	$(COMPILE.c) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
 
-$(VDIR)%.o: %.cpp
-	$(mk_obj_out_dir)
+$(VDIR)%.o: %.cpp $(VDIR)%.creation_stamp
 	$(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
 
-$(VDIR)%.o: %.C
-	$(mk_obj_out_dir)
+$(VDIR)%.o: %.C $(VDIR)%.creation_stamp
 	$(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
 
-$(VDIR)%.o: %.cc
-	$(mk_obj_out_dir)
+$(VDIR)%.o: %.cc $(VDIR)%.creation_stamp
 	$(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
 
-$(VDIR)%.o: %.cxx
-	$(mk_obj_out_dir)
+$(VDIR)%.o: %.cxx $(VDIR)%.creation_stamp
 	$(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
 
   ifneq (,$(COMPILE.rc))
-$(VDIR)%.rc.o: %.rc
-	$(mk_obj_out_dir)
+$(VDIR)%.rc.o: %.rc $(VDIR)%.creation_stamp
 	$(COMPILE.rc) $< $@
 	${MVCMD}
   endif # COMPILE.rc
@@ -144,55 +126,67 @@ ifndef SOLINK
 # that the service configurator needs to be able to function).
 # 970104 Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
   ifdef (ESOBUILD)
-$(VSHDIR)%.$(SOEXT): %.cpp
-	$(mk_obj_out_dir)
+$(VSHDIR)%.$(SOEXT): %.cpp $(VSHDIR)%.creation_stamp
 	$(ESOBUILD)
   else # ! ESOBUILD
-$(VSHDIR)%.$(SOEXT): %.cpp
-	$(mk_obj_out_dir)
+$(VSHDIR)%.$(SOEXT): %.cpp $(VSHDIR)%.creation_stamp
 	$(SOBUILD)
   endif # ESOBUILD
 
   ifeq ($(split), 1)
-$(VSHDIR)%.$(OBJEXT): %.cpp
-	$(mk_obj_out_dir)
+$(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR)%.creation_stamp
 	$(COMPILE.cc) $(PIC) SPLIT/`echo $< | sed "s/.cpp/_S\*/"`
 	mv *.$(OBJEXT) $(VSHDIR)
   else # ! split
 
-$(VSHDIR)%.$(OBJEXT): %.cpp
-	$(mk_obj_out_dir)
+$(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR)%.creation_stamp
 	$(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
 
   endif # split
 
-$(VSHDIR)%.$(OBJEXT): %.cc
-	$(mk_obj_out_dir)
+$(VSHDIR)%.$(OBJEXT): %.cc $(VSHDIR)%.creation_stamp
 	$(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
 
-$(VSHDIR)%.$(OBJEXT): %.C
-	$(mk_obj_out_dir)
+$(VSHDIR)%.$(OBJEXT): %.C $(VSHDIR)%.creation_stamp
 	$(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
 
-$(VSHDIR)%.$(OBJEXT): %.cxx
-	$(mk_obj_out_dir)
+$(VSHDIR)%.$(OBJEXT): %.cxx $(VSHDIR)%.creation_stamp
 	$(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
 
-$(VSHDIR)%.$(OBJEXT): %.c
-	$(mk_obj_out_dir)
+$(VSHDIR)%.$(OBJEXT): %.c $(VSHDIR)%.creation_stamp
 	$(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
 
   ifneq (,$(COMPILE.rc))
-$(VSHDIR)%.rc.$(OBJEXT): %.rc
-	$(mk_obj_out_dir)
+$(VSHDIR)%.rc.$(OBJEXT): %.rc $(VSHDIR)%.creation_stamp
 	$(COMPILE.rc) $< $@
   endif # COMPILE.rc
 
-$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT)
-	$(mk_obj_out_dir)
+$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT) $(VSHDIR)%.creation_stamp
 	$(SOLINK)
 endif # SOLINK
 
+ifeq ($(vxworks_ntbuild),1)
+$(VDIR)%.creation_stamp:
+	@if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
+	@echo > $@
+else
+.PHONY: $(VDIR)%.creation_stamp
+$(VDIR)%.creation_stamp:
+	@-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
+endif
+
+ifneq ($(VDIR),$(VSHDIR))
+  ifeq ($(vxworks_ntbuild),1)
+$(VSHDIR)%.creation_stamp:
+	@if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
+	@echo > $@
+  else
+.PHONY: $(VSHDIR)%.creation_stamp
+$(VSHDIR)%.creation_stamp:
+	@-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
+  endif
+endif
+
 #----------------------------------------------------------------------------
 #       Library generation targets
 #----------------------------------------------------------------------------
@@ -497,10 +491,3 @@ SPLIT:
 	@echo "Splitting source files..."
 	@$(ACE_ROOT)/bin/split-cpp -s Svc_Conf_l.cpp -s Svc_Conf_y.cpp $(LSRC)
 	@echo "done."
-
-svnignore.local:
-	if [ "n$(BIN)" != "n" ]; then \
-	  (svn propget svn:ignore .; echo $(BIN)) | sort | uniq | sed '/^$$/d' >SvNiGnOrE; \
-	  svn propset svn:ignore -F SvNiGnOrE .; \
-	  rm SvNiGnOrE; \
-	fi
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index e3f13eb7363..77b1aed4442 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -57,10 +57,6 @@
 #  templates	    Type of template instantiation to perform. Can be one of
 #                   automatic, used. Defaults to automatic.
 #  threads          Build with thread support.
-#  trio             Indicate build with trio; adds PLATFORM_TRIO_CPPFLAGS
-#                   to CPPFLAGS, PLATFORM_TRIO_LDFLAGS to LDFLAGS, and
-#                   PLATFORM_TRIO_LIBS to LIBS. For more information on
-#                   trio, see http://sourceforge.net/projects/ctrio/
 #  xt               Build with Xt (X11 Toolkit) support.
 #  fl               Build with FlTk (Fast Light Toolkit) support.
 #  tk               Build with Tk (Tcl/Tk) support.
@@ -462,18 +458,6 @@ ifeq ($(threads),0)
   override threads =
 endif # threads
 
-trio ?=
-ifeq ($(trio),0)
-  override trio =
-endif # trio
-
-ifdef trio
-  CPPFLAGS += -DACE_HAS_TRIO $(PLATFORM_TRIO_CPPFLAGS)
-  LDFLAGS += $(PLATFORM_TRIO_LDFLAGS)
-  LIBS += -ltrio $(PLATFORM_TRIO_LIBS)
-  ACE_MAKE_OPTIONS += trio
-endif # trio
-
 # ace_for_tao subsetting is disabled by default.
 ace_for_tao ?=
 ifeq ($(ace_for_tao),0)
@@ -557,7 +541,7 @@ endif
 
 rapi ?=
 ifeq ($(rapi),0)
-   override rapi =
+     override rapi =
 endif #rapi
 
 ifneq ($(rapi),)
@@ -574,9 +558,9 @@ endif #rapi
 
 # if any sctp implementation is present then add
 ifneq ($(sctp),)
-  CPPFLAGS += -DACE_HAS_SCTP $(PLATFORM_SCTP_CPPFLAGS)
-  LDFLAGS  += $(PLATFORM_SCTP_LDFLAGS)
-  LIBS     += $(PLATFORM_SCTP_LIBS)
+ CPPFLAGS += -DACE_HAS_SCTP $(PLATFORM_SCTP_CPPFLAGS)
+ LDFLAGS  += $(PLATFORM_SCTP_LDFLAGS)
+ LIBS     += $(PLATFORM_SCTP_LIBS)
   ACE_MAKE_OPTIONS += sctp
 endif
 
@@ -602,21 +586,17 @@ else
     ACE_MAKE_OPTIONS += ssl
   endif
 endif
-
-## These are related to MPC.  When 'requires' is used in a project
-## it controls whether or not the project is generated.  There is also
-## a second level of control in platform macros and thus requires
-## some features to be set here as well.
 ec_typed_events ?= 1
-zlib ?= 1
 
 ifeq ($(exceptions),0)
+  ifeq ($(ACE_HAS_GNUG_PRE_2_8),0)
     #### Disable the default exception handling of g++ >= 2.8.0.
     ifneq ($(ACE_GNUG_ON_UNIXWARE),)
       CCFLAGS += -fcheck-new
     else
       CCFLAGS += -fno-exceptions -fcheck-new
     endif # ! ACE_GNUG_ON_UNIXWARE
+  endif # ! ACE_HAS_GNUG_PRE_2_8
 else  # exceptions
   CPPFLAGS += -DACE_HAS_EXCEPTIONS
   ifndef include_env
@@ -625,6 +605,17 @@ else  # exceptions
   ifeq ($(include_env),1)
     CPPFLAGS += -DACE_ENV_BKWD_COMPAT
   endif
+  ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
+    #### Enable exception handling with g++ < 2.8.0.  Not recommended,
+    #### but provided here for completeness.
+    CCFLAGS += -fhandle-exceptions
+#  else  # ! ACE_HAS_GNUG_PRE_2_8
+#  ifeq ($(ACE_HAS_GNUG_PRE_2_8),0)
+#    #### Disable this warning on g++ >= 2.8.0 if exceptions are enabled,
+#    #### it gets confused and reports too many bogus warnings.
+#    CCFLAGS += -Wno-uninitialized
+#  endif # g++ > 2.8.0
+  endif # ! ACE_HAS_GNUG_PRE_2_8
   ACE_MAKE_OPTIONS += exceptions
 endif # exceptions
 
diff --git a/ACE/m4/ace.m4 b/ACE/m4/ace.m4
index 4d91810008d..96b7d334767 100644
--- a/ACE/m4/ace.m4
+++ b/ACE/m4/ace.m4
@@ -487,12 +487,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
  ACE_ENABLE_TK_REACTOR
  ACE_ENABLE_XT_REACTOR
 
- # placeholder for WxWindows/wxWidgets support
- AM_CONDITIONAL([BUILD_WXWINDOWS], false)
-
- ACE_PATH_ZLIB
- ACE_PATH_ZZIP
-
  AC_ARG_ENABLE([gperf],
   AS_HELP_STRING(--enable-gperf,compile the gperf program [[[yes]]]),
   [
@@ -625,7 +619,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
  ACE_ENABLE_CDR_SWAP_ON_READ
  ACE_ENABLE_CDR_SWAP_ON_WRITE
  ACE_ENABLE_CDR_ALIGNMENT
- ACE_ENABLE_REACTOR_NOTIFICATION_QUEUE
  ACE_ENABLE_STRDUP_EMULATION
  ACE_ENABLE_WCSDUP_EMULATION
 ])
@@ -1010,32 +1003,6 @@ if test X$ace_user_cdr_alignment = Xno; then
 fi
 ])
 
-# ACE_ENABLE_REACTOR_NOTIFICATION_QUEUE
-#---------------------------------------------------------------------------
-AC_DEFUN([ACE_ENABLE_REACTOR_NOTIFICATION_QUEUE],
-[AC_ARG_ENABLE([ace-reactor-notification-queue],
-               AS_HELP_STRING([--enable-ace-reactor-notification-queue],
-                              [configure Reactor to use a user-space queue for notifications [[no]]]),
-	       [case "${enableval}" in
-		 yes)
-		  ace_user_reactor_notification_queue=yes
-		  ;;
-		 no)
-		  ace_user_reactor_notification_queue=no
-		  ;;
-		 *)
-		  AC_MSG_ERROR(bad value ${enableval} for --enable-ace-reactor-notification-queue)
-		  ;;
-		esac],[
-		  ace_user_reactor_notification_queue=no
-		])
-if test X$ace_user_reactor_notification_queue = Xyes; then
-  AC_DEFINE([ACE_HAS_REACTOR_NOTIFICATION_QUEUE], 1,
-	    [Define to 1 to configure Reactor to use a user-space queue for notifications])
-fi
-])
-
-
 # ACE_ENABLE_STRDUP_EMULATION
 #---------------------------------------------------------------------------
 AC_DEFUN([ACE_ENABLE_STRDUP_EMULATION],
@@ -1317,115 +1284,6 @@ AM_CONDITIONAL([BUILD_X11], [test X$no_x != Xyes])
 ])
 
 
-# ACE_PATH_ZLIB
-#---------------------------------------------------------------------------
-# Find zlib Libraries, flags, etc.
-AC_DEFUN([ACE_PATH_ZLIB],
-[
-ACE_ZLIB_CPPFLAGS=""
-ACE_ZLIB_LDFLAGS=""
-
-dnl TODO: default to false, at least until we add a check to see if
-dnl the zlib library is usable.
-AC_ARG_WITH([zlib],
-  AS_HELP_STRING([--with-zlib@<:@=DIR@:>@],
-		 [root directory of zlib installation]),
-  [
-  ace_with_zlib="${withval}"
-  if test "${ace_with_zlib}" != yes; then
-       ace_zlib_include="${ace_with_zlib}/include"
-       ace_zlib_libdir="${ace_with_zlib}/lib"
-  fi
-  ],[ace_with_zlib=no])
-
-dnl TODO: let's wait and see before adding options to specify header
-dnl and library location separately.
-dnl
-dnl AC_ARG_WITH([zlib_include],
-dnl   AS_HELP_STRING([--with-zlib-include=DIR],
-dnl 		 [specify exact include dir for zlib headers]),
-dnl   [ace_zlib_include="$withval"])
-dnl 
-dnl AC_ARG_WITH([zlib_libdir],
-dnl   AS_HELP_STRING([--with-zlib-libdir=DIR],
-dnl 		 [specify exact include dir for zlib libraries]),
-dnl   [ace_zlib_libdir="$withval"])
-
-if test "${ace_zlib_include}"; then
-  ACE_ZLIB_CPPFLAGS="-I$ace_zlib_include"
-fi
-
-if test "${ace_zlib_libdir}"; then
-  ACE_ZLIB_LDFLAGS="-L$ace_zlib_libdir"
-fi
-
-ACE_ZLIB_CPPFLAGS="${ACE_ZLIB_CPPFLAGS} -DZLIB"
-
-if test "${ace_with_zlib}" != no; then
-  ACE_ZLIB_LIBS="-lz"
-  AC_SUBST(ACE_ZLIB_CPPFLAGS)
-  AC_SUBST(ACE_ZLIB_LDFLAGS)
-  AC_SUBST(ACE_ZLIB_LIBS)
-fi
-AM_CONDITIONAL([BUILD_ZLIB], test "${ace_with_zlib}" != no)
-])
-
-
-# ACE_PATH_ZZIP
-#---------------------------------------------------------------------------
-# Find zziplib Libraries, flags, etc.
-AC_DEFUN([ACE_PATH_ZZIP],
-[AC_REQUIRE([ACE_PATH_ZLIB])
-
-ACE_ZZIP_CPPFLAGS=""
-ACE_ZZIP_LDFLAGS=""
-
-dnl TODO: default to false, at least until we add a check to see if
-dnl the zlib library is usable.
-AC_ARG_WITH([zzip],
-  AS_HELP_STRING([--with-zzip@<:@=DIR@:>@],
-		 [root directory of zzip installation]),
-  [
-  ace_with_zzip="${withval}"
-  if test "${ace_with_zzip}" != yes; then
-       ace_zzip_include="${ace_with_zzip}/include"
-       ace_zzip_libdir="${ace_with_zzip}/lib"
-  fi
-  ],[ace_with_zzip=no])
-
-dnl TODO: let's wait and see before adding options to specify header
-dnl and library location separately.
-dnl
-dnl AC_ARG_WITH([zzip_include],
-dnl   AS_HELP_STRING([--with-zzip-include=DIR],
-dnl 		 [specify exact include dir for zzip headers]),
-dnl   [ace_zzip_include="$withval"])
-dnl 
-dnl AC_ARG_WITH([zzip_libdir],
-dnl   AS_HELP_STRING([--with-zzip-libdir=DIR],
-dnl 		 [specify exact include dir for zzip libraries]),
-dnl   [ace_zzip_libdir="$withval"])
-
-if test "${ace_zzip_include}"; then
-  ACE_ZZIP_CPPFLAGS="-I$ace_zzip_include"
-fi
-
-if test "${ace_zzip_libdir}"; then
-  ACE_ZZIP_LDFLAGS="-L$ace_zzip_libdir"
-fi
-
-ACE_ZZIP_CPPFLAGS="${ACE_ZZIP_CPPFLAGS} -DUSE_ZZIP"
-
-if test "${ace_with_zzip}" != no; then
-  ACE_ZZIP_LIBS="-lzzip"
-  AC_SUBST(ACE_ZZIP_CPPFLAGS)
-  AC_SUBST(ACE_ZZIP_LDFLAGS)
-  AC_SUBST(ACE_ZZIP_LIBS)
-fi
-AM_CONDITIONAL([BUILD_ZZIP], test "${ace_with_zzip}" != no)
-])
-
-
 # ACE_ENABLE_FL_REACTOR
 #---------------------------------------------------------------------------
 AC_DEFUN([ACE_ENABLE_FL_REACTOR],
@@ -1559,5 +1417,3 @@ AM_CONDITIONAL([BUILD_ACE_XTREACTOR],
 AM_CONDITIONAL([BUILD_TAO_XTRESOURCE],
                [test X$ace_user_enable_xt_reactor = Xyes])
 ])
-
-
diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4
index 20f03f2be12..09a7dbac2b4 100644
--- a/ACE/m4/config_h.m4
+++ b/ACE/m4/config_h.m4
@@ -573,6 +573,16 @@ AH_TEMPLATE([ACE_AUTO_PTR_LACKS_RESET],
 [Compiler/platform standard C++ auto_ptr implementation lacks
    reset() method])
 
+AH_TEMPLATE([ACE_LACKS_CMSG_DATA_MACRO],
+[Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but does not define
+   CMSG_DATA (cmsg) macro.])
+
+AH_TEMPLATE([ACE_LACKS_CMSG_DATA_MEMBER],
+[Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but its cmsghdr
+   structure does not contain an 'unsigned char cmsg_data[0]' member.
+   (This may be 'unsigned char __cmsg_data[0]' on some platforms, in
+   which case we need another macro.)])
+
 AH_TEMPLATE([ACE_LACKS_READDIR_R],[Platform lacks readdir_r()])
 
 AH_TEMPLATE([ACE_LACKS_INLINE_FUNCTIONS],
@@ -593,7 +603,6 @@ AH_TEMPLATE([ACE_HAS_SEMUN],
 [Compiler/platform defines a union semun for SysV shared memory ])
 
 AH_TEMPLATE([ACE_HAS_SHM_OPEN],[Platform has shm_open()])
-AH_TEMPLATE([ACE_SHM_OPEN_REQUIRES_ONE_SLASH],[shm_open() requires a leading slash in name])
 
 AH_TEMPLATE([ACE_HAS_SIGISMEMBER_BUG],
 [Platform has bug with sigismember() (HP/UX 11).])
@@ -731,6 +740,9 @@ AH_TEMPLATE([ACE_HAS_TSS_EMULATION],
 AH_TEMPLATE([ACE_HAS_UCONTEXT_T],
 [Platform supports ucontext_t (which is used in the extended signal API).])
 
+AH_TEMPLATE([ACE_HAS_UNION_WAIT],
+[The wait() system call takes a (union wait *) rather than int *])
+
 AH_TEMPLATE([ACE_HAS_UNIXWARE_SVR4_SIGNAL_T],
 [Has inconsistent SVR4 signal stuff, but not the same as the other
    platforms])
@@ -960,8 +972,6 @@ 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_NUMERIC_LIMITS],[Platform lacks std::numeric_limits<>])
-
 AH_TEMPLATE([ACE_LACKS_UNIX_DOMAIN_SOCKETS],
 [ACE platform has no UNIX domain sockets])
 
diff --git a/ACE/netsvcs/Makefile.am b/ACE/netsvcs/Makefile.am
index d4bf0e1c092..422221e4029 100644
--- a/ACE/netsvcs/Makefile.am
+++ b/ACE/netsvcs/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         lib \
diff --git a/ACE/netsvcs/clients/Logger/Makefile.am b/ACE/netsvcs/clients/Logger/Makefile.am
index e5877d7e6f2..8c3ae8decb3 100644
--- a/ACE/netsvcs/clients/Logger/Makefile.am
+++ b/ACE/netsvcs/clients/Logger/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.direct_logging.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += direct_logging
 
 direct_logging_CPPFLAGS = \
@@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.indirect_logging.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += indirect_logging
 
 indirect_logging_CPPFLAGS = \
diff --git a/ACE/netsvcs/clients/Makefile.am b/ACE/netsvcs/clients/Makefile.am
index 5d7b4bd7e99..c959505ff73 100644
--- a/ACE/netsvcs/clients/Makefile.am
+++ b/ACE/netsvcs/clients/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Logger \
diff --git a/ACE/netsvcs/clients/Naming/Client/Makefile.am b/ACE/netsvcs/clients/Naming/Client/Makefile.am
index 7298e846310..548b9be4a8e 100644
--- a/ACE/netsvcs/clients/Naming/Client/Makefile.am
+++ b/ACE/netsvcs/clients/Naming/Client/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -34,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Netsvcs_Client_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am
index 0d0cced7cb4..38ed1977b42 100644
--- a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am
+++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -34,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Netsvcs_Dump_Restore.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
diff --git a/ACE/netsvcs/clients/Naming/Makefile.am b/ACE/netsvcs/clients/Naming/Makefile.am
index ad4d7a0b8af..883b9bab54d 100644
--- a/ACE/netsvcs/clients/Naming/Makefile.am
+++ b/ACE/netsvcs/clients/Naming/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Client \
diff --git a/ACE/netsvcs/clients/Tokens/collection/Makefile.am b/ACE/netsvcs/clients/Tokens/collection/Makefile.am
index d2aa7bf8c1b..9d3fbcc5ddd 100644
--- a/ACE/netsvcs/clients/Tokens/collection/Makefile.am
+++ b/ACE/netsvcs/clients/Tokens/collection/Makefile.am
@@ -15,4 +15,4 @@ noinst_PROGRAMS = \
 
 collection_SOURCES = collection.cpp
 collection_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                   $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+                   $(top_builddir)/ace/libACE.la
diff --git a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am b/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am
index 5e25ccd0fb3..d995e71620b 100644
--- a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am
+++ b/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am
@@ -16,4 +16,4 @@ noinst_PROGRAMS = \
 deadlock_detection_test_SOURCES = deadlock_detection_test.cpp
 deadlock_detection_test_LDADD = \
                    $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                   $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+                   $(top_builddir)/ace/libACE.la
diff --git a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am b/ACE/netsvcs/clients/Tokens/invariant/Makefile.am
index 83b621b5a42..37817911015 100644
--- a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am
+++ b/ACE/netsvcs/clients/Tokens/invariant/Makefile.am
@@ -16,5 +16,5 @@ noinst_PROGRAMS = \
 invariant_SOURCES = invariant.cpp
 invariant_LDADD = \
   $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-  $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(top_builddir)/ace/libACE.la
 
diff --git a/ACE/netsvcs/clients/Tokens/manual/Makefile.am b/ACE/netsvcs/clients/Tokens/manual/Makefile.am
index 4a2cbf60788..b2945a96bd3 100644
--- a/ACE/netsvcs/clients/Tokens/manual/Makefile.am
+++ b/ACE/netsvcs/clients/Tokens/manual/Makefile.am
@@ -16,7 +16,7 @@ noinst_PROGRAMS = \
 manual_SOURCES = manual.cpp
 manual_LDADD = \
   $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-  $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(top_builddir)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am b/ACE/netsvcs/clients/Tokens/mutex/Makefile.am
index 56dd1efccf2..63d02af7d97 100644
--- a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am
+++ b/ACE/netsvcs/clients/Tokens/mutex/Makefile.am
@@ -16,6 +16,6 @@ noinst_PROGRAMS = \
 test_mutex_SOURCES = test_mutex.cpp
 test_mutex_LDADD = \
   $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-  $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(top_builddir)/ace/libACE.la
 
 
diff --git a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am b/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am
index 972d8a64faa..265a3a09558 100644
--- a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am
+++ b/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am
@@ -16,5 +16,5 @@ noinst_PROGRAMS = \
 rw_locks_SOURCES = rw_locks.cpp
 rw_locks_LDADD = \
   $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-  $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la
+  $(top_builddir)/ace/libACE.la
 
diff --git a/ACE/netsvcs/lib/Makefile.am b/ACE/netsvcs/lib/Makefile.am
index 54b8ed75617..7614800dc4e 100644
--- a/ACE/netsvcs/lib/Makefile.am
+++ b/ACE/netsvcs/lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/netsvcs/servers/Makefile.am b/ACE/netsvcs/servers/Makefile.am
index 576581b8be5..ded1ad91998 100644
--- a/ACE/netsvcs/servers/Makefile.am
+++ b/ACE/netsvcs/servers/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.Netsvcs_server.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
diff --git a/ACE/performance-tests/Makefile.am b/ACE/performance-tests/Makefile.am
index 8893d7354cb..1aac8a5c388 100644
--- a/ACE/performance-tests/Makefile.am
+++ b/ACE/performance-tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Misc \
diff --git a/ACE/performance-tests/Misc/Makefile.am b/ACE/performance-tests/Misc/Makefile.am
index e454644170b..d6b7af67f43 100644
--- a/ACE/performance-tests/Misc/Makefile.am
+++ b/ACE/performance-tests/Misc/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Misc_Basic_Perf.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += basic_perf
 
 basic_perf_CPPFLAGS = \
@@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Misc_Childbirth_Time.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += childbirth_time
 
 childbirth_time_CPPFLAGS = \
@@ -56,7 +54,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Misc_Context_Switch_Time.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += context_switch_time
 
 context_switch_time_CPPFLAGS = \
@@ -74,7 +71,6 @@ context_switch_time_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Misc_Preempt.am
-
 noinst_PROGRAMS += preempt
 
 preempt_CPPFLAGS = \
@@ -92,7 +88,6 @@ preempt_LDADD = \
 ## Makefile.Misc_Test_Mutex.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_mutex
 
 test_mutex_CPPFLAGS = \
@@ -112,7 +107,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Misc_Test_Naming.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_naming
 
 test_naming_CPPFLAGS = \
@@ -132,7 +126,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Misc_Test_Singleton.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += test_singleton
 
 test_singleton_CPPFLAGS = \
diff --git a/ACE/performance-tests/SCTP/Makefile.am b/ACE/performance-tests/SCTP/Makefile.am
index 31ae3d50200..8532440e3f6 100644
--- a/ACE/performance-tests/SCTP/Makefile.am
+++ b/ACE/performance-tests/SCTP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.SCTP_SOCK_SEQPACK_Association_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += SOCK_SEQPACK_Association_Test
 
 SOCK_SEQPACK_Association_Test_CPPFLAGS = \
@@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.SCTP_SOCK_SEQPACK_Clt.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += SOCK_SEQPACK_clt
 
 SOCK_SEQPACK_clt_CPPFLAGS = \
@@ -58,7 +56,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.SCTP_SOCK_SEQPACK_Srv.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += SOCK_SEQPACK_srv
 
 SOCK_SEQPACK_srv_CPPFLAGS = \
@@ -78,7 +75,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.SCTP_SOCK_STREAM_Clt.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += SOCK_STREAM_clt
 
 SOCK_STREAM_clt_CPPFLAGS = \
@@ -98,7 +94,6 @@ SOCK_STREAM_clt_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.SCTP_SOCK_STREAM_Srv.am
-
 noinst_PROGRAMS += SOCK_STREAM_srv
 
 SOCK_STREAM_srv_CPPFLAGS = \
diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am
index f4369f7ad34..38021abd626 100644
--- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am
+++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Svr_Conc_Leader_Follower.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += leader_follower
 
 leader_follower_CPPFLAGS = \
@@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Svr_Conc_Leader_Follower_RT_CORBA.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += RT_CORBA_Leader_Follower
 
 RT_CORBA_Leader_Follower_CPPFLAGS = \
diff --git a/ACE/performance-tests/Server_Concurrency/Makefile.am b/ACE/performance-tests/Server_Concurrency/Makefile.am
index 5d8482ab96d..9a5b0c57e66 100644
--- a/ACE/performance-tests/Server_Concurrency/Makefile.am
+++ b/ACE/performance-tests/Server_Concurrency/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Leader_Follower \
diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am
index a2573d401c8..feb7783689d 100644
--- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am
+++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
 ## Makefile.Svr_Conc_Queue_Based_Workers.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += workers
 
 workers_CPPFLAGS = \
@@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Svr_Conc_Queue_Based_Workers_RTCorba.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += RT_CORBA_Workers
 
 RT_CORBA_Workers_CPPFLAGS = \
diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
index f5f4158d270..b050480b9bc 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
+++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,27 +16,18 @@ ACE_ROOT = $(top_srcdir)
 
 if !BUILD_ACE_FOR_TAO
 
-noinst_LTLIBRARIES = libBase_Test.la
+noinst_LTLIBRARIES = libSynch_Benchmarks_Base_Test.la
 
-libBase_Test_la_CPPFLAGS = \
+libSynch_Benchmarks_Base_Test_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(srcdir)/..
 
-libBase_Test_la_SOURCES = \
+libSynch_Benchmarks_Base_Test_la_SOURCES = \
   Baseline_Test.cpp \
   base_test.cpp \
   mutex_test.cpp
 
-../Synch_Lib:
-	mkdir -p ../Synch_Lib
-
-libBase_Test_la_DEPENDENCIES = \
-  ../Synch_Lib
-
-libBase_Test_la_LDFLAGS = \
- -L../Synch_Lib
-
 noinst_HEADERS = \
   Baseline_Test.h \
   Baseline_Test.inl
diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
index 47d16a47bb3..7b0de88e4c9 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
+++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
@@ -7,10 +7,5 @@ project : acelib {
   after    += Synch_Lib
   libs     += Synch_Lib
   libpaths += ../Synch_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/..
-  } else {
-    includes += ..
-  }
+  includes += ..
 }
diff --git a/ACE/performance-tests/Synch-Benchmarks/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Makefile.am
index 068a35d9c61..f0272750af1 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Makefile.am
+++ b/ACE/performance-tests/Synch-Benchmarks/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -18,7 +18,6 @@ SUBDIRS = \
         .
 
 ## Makefile.Synch_Benchmarks.am
-
 noinst_PROGRAMS = synch_driver
 
 synch_driver_CPPFLAGS = \
@@ -28,9 +27,6 @@ synch_driver_CPPFLAGS = \
 synch_driver_SOURCES = \
   synch_driver.cpp
 
-synch_driver_LDFLAGS = \
-  -LSynch_Lib
-
 synch_driver_LDADD = \
   $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la \
   $(ACE_BUILDDIR)/ace/libACE.la
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
index ac4f8fc9a00..99d37c3aa72 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,14 +16,14 @@ ACE_ROOT = $(top_srcdir)
 
 if !BUILD_ACE_FOR_TAO
 
-noinst_LTLIBRARIES = libPerf_Test.la
+noinst_LTLIBRARIES = libSynch_Benchmarks_Perf_Test.la
 
-libPerf_Test_la_CPPFLAGS = \
+libSynch_Benchmarks_Perf_Test_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(srcdir)/..
 
-libPerf_Test_la_SOURCES = \
+libSynch_Benchmarks_Perf_Test_la_SOURCES = \
   Adaptive_Lock_Performance_Test_Base.cpp \
   Benchmark_Performance.cpp \
   Performance_Test.cpp \
@@ -46,15 +46,6 @@ libPerf_Test_la_SOURCES = \
   sysvsema_test.cpp \
   token_test.cpp
 
-../Synch_Lib:
-	mkdir -p ../Synch_Lib
-
-libPerf_Test_la_DEPENDENCIES = \
-  ../Synch_Lib
-
-libPerf_Test_la_LDFLAGS = \
- -L../Synch_Lib
-
 noinst_HEADERS = \
   Adaptive_Lock_Performance_Test_Base.h \
   Benchmark_Performance.h \
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
index a76c10f94ee..f6a879deacd 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
@@ -7,10 +7,5 @@ project : acelib {
   after    += Synch_Lib
   libs     += Synch_Lib
   libpaths += ../Synch_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/..
-  } else {
-    includes += ..
-  }
+  includes += ..
 }
diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am
index 673ec4a0155..05c71adde0c 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am
+++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/performance-tests/TCP/Makefile.am b/ACE/performance-tests/TCP/Makefile.am
index 828ad0bbbb5..3ebae23da8e 100644
--- a/ACE/performance-tests/TCP/Makefile.am
+++ b/ACE/performance-tests/TCP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.TCP.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = tcp_test
 
 tcp_test_CPPFLAGS = \
diff --git a/ACE/performance-tests/UDP/Makefile.am b/ACE/performance-tests/UDP/Makefile.am
index 011333ed50e..e9dc7db03f2 100644
--- a/ACE/performance-tests/UDP/Makefile.am
+++ b/ACE/performance-tests/UDP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
 ## Makefile.UDP.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS = udp_test
 
 udp_test_CPPFLAGS = \
diff --git a/ACE/protocols/Makefile.am b/ACE/protocols/Makefile.am
index 3547585e9d1..4c77b57e08a 100644
--- a/ACE/protocols/Makefile.am
+++ b/ACE/protocols/Makefile.am
@@ -9,13 +9,7 @@
 ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
-        ace 
-
-if BUILD_EXAMPLES
-SUBDIRS += examples
-endif
-
-if BUILD_TESTS
-SUBDIRS += tests
-endif
+        ace \
+        examples \
+        tests
 
diff --git a/ACE/protocols/ace/HTBP/HTBP.mpc b/ACE/protocols/ace/HTBP/HTBP.mpc
index 4684bb8fee1..ada3fc8530d 100644
--- a/ACE/protocols/ace/HTBP/HTBP.mpc
+++ b/ACE/protocols/ace/HTBP/HTBP.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project(HTBP) : acelib, install {
+project(HTBP) : acelib, core {
   avoids      += ace_for_tao
   sharedname   = ACE_HTBP
   dynamicflags = HTBP_BUILD_DLL
diff --git a/ACE/protocols/ace/HTBP/Makefile.am b/ACE/protocols/ace/HTBP/Makefile.am
index bd824576b86..7c777cfec2b 100644
--- a/ACE/protocols/ace/HTBP/Makefile.am
+++ b/ACE/protocols/ace/HTBP/Makefile.am
@@ -6,9 +6,9 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
-includedir = @includedir@/ace/HTBP
+includedir = @includedir@/protocols/ace/HTBP
 pkgconfigdir = @libdir@/pkgconfig
 
 ACE_BUILDDIR = $(top_builddir)
@@ -72,7 +72,7 @@ CLEANFILES = \
   ACE_HTBP.pc
 
 ACE_HTBP.pc: ${top_builddir}/config.status ${srcdir}/ACE_HTBP.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ACE_HTBP.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE_HTBP.pc.in
 
 endif !BUILD_ACE_FOR_TAO
 
diff --git a/ACE/protocols/ace/Makefile.am b/ACE/protocols/ace/Makefile.am
index c476b3583bc..d62d1164dcc 100644
--- a/ACE/protocols/ace/Makefile.am
+++ b/ACE/protocols/ace/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         HTBP \
diff --git a/ACE/protocols/ace/RMCast/Makefile.am b/ACE/protocols/ace/RMCast/Makefile.am
index 51e73d4041e..3859cf8563f 100644
--- a/ACE/protocols/ace/RMCast/Makefile.am
+++ b/ACE/protocols/ace/RMCast/Makefile.am
@@ -6,9 +6,9 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
-includedir = @includedir@/ace/RMCast
+includedir = @includedir@/protocols/ace/RMCast
 pkgconfigdir = @libdir@/pkgconfig
 
 ACE_BUILDDIR = $(top_builddir)
@@ -67,7 +67,7 @@ CLEANFILES = \
   ACE_RMCast.pc
 
 ACE_RMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_RMCast.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ACE_RMCast.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE_RMCast.pc.in
 
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
diff --git a/ACE/protocols/ace/RMCast/RMCast.mpc b/ACE/protocols/ace/RMCast/RMCast.mpc
index 98ada5b3d6c..f77bd4d942c 100644
--- a/ACE/protocols/ace/RMCast/RMCast.mpc
+++ b/ACE/protocols/ace/RMCast/RMCast.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project(RMCast) : acelib, install, threads {
+project(RMCast) : acelib, core, threads {
   avoids = ace_for_tao
   sharedname   = ACE_RMCast
   dynamicflags = ACE_RMCAST_BUILD_DLL
diff --git a/ACE/protocols/ace/TMCast/Makefile.am b/ACE/protocols/ace/TMCast/Makefile.am
index c524083fd92..13f369142f4 100644
--- a/ACE/protocols/ace/TMCast/Makefile.am
+++ b/ACE/protocols/ace/TMCast/Makefile.am
@@ -6,9 +6,9 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
-includedir = @includedir@/ace/TMCast
+includedir = @includedir@/protocols/ace/TMCast
 pkgconfigdir = @libdir@/pkgconfig
 
 ACE_BUILDDIR = $(top_builddir)
@@ -57,7 +57,7 @@ CLEANFILES = \
   ACE_TMCast.pc
 
 ACE_TMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_TMCast.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ACE_TMCast.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/ACE_TMCast.pc.in
 
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
diff --git a/ACE/protocols/ace/TMCast/TMCast.mpc b/ACE/protocols/ace/TMCast/TMCast.mpc
index 7e09cb3e822..1ff937a0a1a 100644
--- a/ACE/protocols/ace/TMCast/TMCast.mpc
+++ b/ACE/protocols/ace/TMCast/TMCast.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project : acelib, install, exceptions, threads {
+project : acelib, core, exceptions, threads {
   avoids = ace_for_tao
   sharedname    = ACE_TMCast
   dynamicflags += TMCAST_BUILD_DLL
diff --git a/ACE/protocols/examples/Makefile.am b/ACE/protocols/examples/Makefile.am
index b435d1c3fe2..fd0f6f9494d 100644
--- a/ACE/protocols/examples/Makefile.am
+++ b/ACE/protocols/examples/Makefile.am
@@ -6,9 +6,8 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
-        RMCast \
-        TMCast
+        RMCast
 
diff --git a/ACE/protocols/examples/RMCast/Makefile.am b/ACE/protocols/examples/RMCast/Makefile.am
index ef4f29c4f65..784d3215def 100644
--- a/ACE/protocols/examples/RMCast/Makefile.am
+++ b/ACE/protocols/examples/RMCast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Send_Msg
diff --git a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am b/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am
index eb9a09d771f..a49d0afa6c7 100644
--- a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am
+++ b/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/protocols/examples/TMCast/Makefile.am b/ACE/protocols/examples/TMCast/Makefile.am
deleted file mode 100644
index 358fc18ef31..00000000000
--- a/ACE/protocols/examples/TMCast/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
-
-SUBDIRS = \
-        Member
-
diff --git a/ACE/protocols/examples/TMCast/Member/Makefile.am b/ACE/protocols/examples/TMCast/Member/Makefile.am
deleted file mode 100644
index c5c5c31c34f..00000000000
--- a/ACE/protocols/examples/TMCast/Member/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
-
-ACE_BUILDDIR = $(top_builddir)
-ACE_ROOT = $(top_srcdir)
-
-
-## Makefile.Member.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = member
-
-member_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols
-
-member_SOURCES = \
-  member.cpp
-
-member_LDADD = \
-  $(ACE_BUILDDIR)/protocols/ace/TMCast/libACE_TMCast.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/tests/HTBP/Makefile.am b/ACE/protocols/tests/HTBP/Makefile.am
deleted file mode 100644
index d38309ca6a4..00000000000
--- a/ACE/protocols/tests/HTBP/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
-
-SUBDIRS = \
-        Reactor_Tests \
-        Send_Large_Msg \
-        Send_Recv_Tests \
-        ping
-
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am b/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am
deleted file mode 100644
index 153e1206bb1..00000000000
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
-
-ACE_BUILDDIR = $(top_builddir)
-ACE_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Reactor_Tests_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols
-
-client_SOURCES = \
-  client.cpp \
-  test_config.h
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Reactor_Tests_Server.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols
-
-server_SOURCES = \
-  server.cpp \
-  test_config.h
-
-server_LDADD = \
-  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am b/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am
deleted file mode 100644
index 870836f47f4..00000000000
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
-
-ACE_BUILDDIR = $(top_builddir)
-ACE_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Send_Large_Msg_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(top_builddir)/tests/libTest_Output.la \
-  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Send_Large_Msg_Server.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(top_builddir)/tests/libTest_Output.la \
-  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am b/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am
deleted file mode 100644
index c9628903cf1..00000000000
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
-
-ACE_BUILDDIR = $(top_builddir)
-ACE_ROOT = $(top_srcdir)
-
-
-## Makefile.SendRecv_Test.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = SendRecv_Test
-
-SendRecv_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols
-
-SendRecv_Test_SOURCES = \
-  SendRecv_Test.cpp
-
-SendRecv_Test_LDADD = \
-  $(top_builddir)/tests/libTest_Output.la \
-  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/tests/HTBP/htbptest.mpb b/ACE/protocols/tests/HTBP/htbptest.mpb
deleted file mode 100644
index ca87bbf8542..00000000000
--- a/ACE/protocols/tests/HTBP/htbptest.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-//
-// $Id$
-project : aceexe, htbp {
-  after += Test_Output
-  libs += Test_Output
-}
diff --git a/ACE/protocols/tests/HTBP/ping/Makefile.am b/ACE/protocols/tests/HTBP/ping/Makefile.am
deleted file mode 100644
index b59b297e535..00000000000
--- a/ACE/protocols/tests/HTBP/ping/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
-
-ACE_BUILDDIR = $(top_builddir)
-ACE_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Ping_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Ping_Server.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/tests/Makefile.am b/ACE/protocols/tests/Makefile.am
index 7bb6fdd829e..fd0f6f9494d 100644
--- a/ACE/protocols/tests/Makefile.am
+++ b/ACE/protocols/tests/Makefile.am
@@ -6,9 +6,8 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
-        HTBP \
         RMCast
 
diff --git a/ACE/protocols/tests/RMCast/Makefile.am b/ACE/protocols/tests/RMCast/Makefile.am
index dadabcac905..3c832d00c1c 100644
--- a/ACE/protocols/tests/RMCast/Makefile.am
+++ b/ACE/protocols/tests/RMCast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/tests/.cvsignore b/ACE/tests/.cvsignore
new file mode 100755
index 00000000000..052901de3e2
--- /dev/null
+++ b/ACE/tests/.cvsignore
@@ -0,0 +1,306 @@
+ACE_Init_Test
+ACE_Init_Test
+ACE_Test
+ACE_Test
+ARGV_Test
+ARGV_Test
+Aio_Platform_Test
+Aio_Platform_Test
+Arg_Shifter_Test
+Arg_Shifter_Test
+Atomic_Op_Test
+Atomic_Op_Test
+Auto_IncDec_Test
+Auto_IncDec_Test
+Barrier_Test
+Barrier_Test
+Basic_Types_Test
+Basic_Types_Test
+Bound_Ptr_Test
+Bound_Ptr_Test
+Buffer_Stream_Test
+Buffer_Stream_Test
+Bug_1576_Regression_Test
+Bug_1576_Regression_Test
+CDR_Array_Test
+CDR_Array_Test
+CDR_File_Test
+CDR_File_Test
+CDR_Test
+CDR_Test
+Cache_Map_Manager_Test
+Cache_Map_Manager_Test
+Cached_Accept_Conn_Test
+Cached_Accept_Conn_Test
+Cached_Allocator_Test
+Cached_Allocator_Test
+Cached_Conn_Test
+Cached_Conn_Test
+Capabilities_Test
+Capabilities_Test
+Codecs_Test
+Codecs_Test
+Collection_Test
+Collection_Test
+Config_Test
+Config_Test
+Conn_Test
+Conn_Test
+DLL_Test
+DLL_Test
+DLList_Test
+DLList_Test
+Date_Time_Test
+Date_Time_Test
+Dev_Poll_Reactor_Test
+Dev_Poll_Reactor_Test
+Dirent_Test
+Dirent_Test
+Dynamic_Priority_Test
+Dynamic_Priority_Test
+Enum_Interfaces_Test
+Enum_Interfaces_Test
+Env_Value_Test
+Env_Value_Test
+FIFO_Test
+FIFO_Test
+FlReactor_Test
+FlReactor_Test
+Framework_Component_Test
+Framework_Component_Test
+Future_Set_Test
+Future_Set_Test
+Future_Test
+Future_Test
+Get_Opt_Test
+Get_Opt_Test
+Handle_Set_Test
+Handle_Set_Test
+Hash_Map_Bucket_Iterator_Test
+Hash_Map_Bucket_Iterator_Test
+Hash_Map_Manager_Test
+Hash_Map_Manager_Test
+High_Res_Timer_Test
+High_Res_Timer_Test
+INET_Addr_Test
+INET_Addr_Test
+INET_Addr_Test_IPV6
+INET_Addr_Test_IPV6
+IOStream_Test
+IOStream_Test
+Lazy_Map_Manager_Test
+Lazy_Map_Manager_Test
+Log_Msg_Test
+Log_Msg_Test
+Logging_Strategy_Test
+Logging_Strategy_Test
+MEM_Stream_Test
+MEM_Stream_Test
+MM_Shared_Memory_Test
+MM_Shared_Memory_Test
+MT_Reactor_Timer_Test
+MT_Reactor_Timer_Test
+MT_Reactor_Upcall_Test
+MT_Reactor_Upcall_Test
+MT_Reference_Counted_Event_Handler_Test
+MT_Reference_Counted_Event_Handler_Test
+MT_Reference_Counted_Notify_Test
+MT_Reference_Counted_Notify_Test
+MT_SOCK_Test
+MT_SOCK_Test
+Malloc_Test
+Malloc_Test
+Map_Manager_Test
+Map_Manager_Test
+Map_Test
+Map_Test
+Max_Default_Port_Test
+Max_Default_Port_Test
+Max_Default_Port_Test_IPV6
+Max_Default_Port_Test_IPV6
+Memcpy_Test
+Mem_Map_Test
+Mem_Map_Test
+Message_Block_Test
+Message_Block_Test
+Message_Queue_Notifications_Test
+Message_Queue_Notifications_Test
+Message_Queue_Test
+Message_Queue_Test
+Message_Queue_Test_Ex
+Message_Queue_Test_Ex
+Multicast_Test
+Multicast_Test
+Multicast_Test_IPV6
+Multicast_Test_IPV6
+Multihomed_INET_Addr_Test
+Multihomed_INET_Addr_Test
+Multihomed_INET_Addr_Test_IPV6
+Multihomed_INET_Addr_Test_IPV6
+Naming_Test
+Naming_Test
+Network_Adapters_Test
+Network_Adapters_Test
+New_Fail_Test
+New_Fail_Test
+NonBlocking_Conn_Test
+NonBlocking_Conn_Test
+Notify_Performance_Test
+Notify_Performance_Test
+OS_Test
+OS_Test
+Object_Manager_Test
+Object_Manager_Test
+Obstack_Test
+Obstack_Test
+OrdMultiSet_Test
+OrdMultiSet_Test
+Pipe_Test
+Pipe_Test
+Priority_Buffer_Test
+Priority_Buffer_Test
+Priority_Reactor_Test
+Priority_Reactor_Test
+Priority_Task_Test
+Priority_Task_Test
+Proactor_Scatter_Gather_Test
+Proactor_Scatter_Gather_Test
+Proactor_Test
+Proactor_Test
+Proactor_Test_IPV6
+Proactor_Test_IPV6
+Proactor_Timer_Test
+Proactor_Timer_Test
+Process_Manager_Test
+Process_Manager_Test
+Process_Mutex_Test
+Process_Mutex_Test
+Process_Strategy_Test
+Process_Strategy_Test
+QtReactor_Test
+QtReactor_Test
+QtReactor_Test_moc.cpp
+QtReactor_Test_moc.cpp
+RB_Tree_Test
+RB_Tree_Test
+Reactor_Dispatch_Order_Test
+Reactor_Dispatch_Order_Test
+Reactor_Exceptions_Test
+Reactor_Exceptions_Test
+Reactor_Notification_Queue_Test
+Reactor_Notification_Queue_Test
+Reactor_Notify_Test
+Reactor_Notify_Test
+Reactor_Performance_Test
+Reactor_Performance_Test
+Reactor_Registration_Test
+Reactor_Registration_Test
+Reactor_Timer_Test
+Reactor_Timer_Test
+Reactors_Test
+Reactors_Test
+Reader_Writer_Test
+Reader_Writer_Test
+Recursive_Condition_Bug_Test
+Recursive_Condition_Bug_Test
+Recursive_Condition_Test
+Recursive_Condition_Test
+Recursive_Mutex_Test
+Recursive_Mutex_Test
+Refcounted_Auto_Ptr_Test
+Refcounted_Auto_Ptr_Test
+Reference_Counted_Event_Handler_Test
+Reference_Counted_Event_Handler_Test
+Reverse_Lock_Test
+Reverse_Lock_Test
+SOCK_Connector_Test
+SOCK_Connector_Test
+SOCK_Dgram_Bcast_Test
+SOCK_Dgram_Bcast_Test
+SOCK_Dgram_Test
+SOCK_Dgram_Test
+SOCK_SEQPACK_SCTP_Test
+SOCK_SEQPACK_SCTP_Test
+SOCK_Send_Recv_Test
+SOCK_Send_Recv_Test
+SOCK_Send_Recv_Test_IPV6
+SOCK_Send_Recv_Test_IPV6
+SOCK_Test
+SOCK_Test
+SOCK_Test_IPv6
+SOCK_Test_IPv6
+SPIPE_Test
+SPIPE_Test
+SString_Test
+SString_Test
+SV_Shared_Memory_Test
+SV_Shared_Memory_Test
+Semaphore_Test
+Semaphore_Test
+Service_Config_Test
+Service_Config_Test
+Signal_Test
+Signal_Test
+Sigset_Ops_Test
+Sigset_Ops_Test
+Simple_Message_Block_Test
+Simple_Message_Block_Test
+Svc_Handler_Test
+Svc_Handler_Test
+TP_Reactor_Test
+TP_Reactor_Test
+TSS_Static_Test
+TSS_Static_Test
+TSS_Test
+TSS_Test
+Task_Ex_Test
+Task_Ex_Test
+Task_Test
+Task_Test
+Thread_Manager_Test
+Thread_Manager_Test
+Thread_Mutex_Test
+Thread_Mutex_Test
+Thread_Pool_Reactor_Resume_Test
+Thread_Pool_Reactor_Resume_Test
+Thread_Pool_Reactor_Test
+Thread_Pool_Reactor_Test
+Thread_Pool_Test
+Thread_Pool_Test
+Time_Service_Test
+Time_Service_Test
+Time_Value_Test
+Time_Value_Test
+Timeprobe_Test
+Timeprobe_Test
+Timer_Cancellation_Test
+Timer_Cancellation_Test
+Timer_Queue_Reference_Counting_Test
+Timer_Queue_Reference_Counting_Test
+Timer_Queue_Test
+Timer_Queue_Test
+TkReactor_Test
+TkReactor_Test
+Token_Strategy_Test
+Token_Strategy_Test
+Tokens_Test
+Tokens_Test
+UPIPE_SAP_Test
+UPIPE_SAP_Test
+UUIDTest
+UUIDTest
+Unbounded_Set_Test
+Unbounded_Set_Test_Ex
+Unbounded_Set_Test_Ex
+Upgradable_RW_Test
+Upgradable_RW_Test
+Vector_Test
+Vector_Test
+WFMO_Reactor_Test
+WFMO_Reactor_Test
+XtAthenaReactor_Test
+XtAthenaReactor_Test
+XtMotifReactor_Test
+XtMotifReactor_Test
+XtReactor_Test
+test.reg
diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp
index 0e7e18f52d8..bb06c6b8d31 100644
--- a/ACE/tests/ARGV_Test.cpp
+++ b/ACE/tests/ARGV_Test.cpp
@@ -21,51 +21,21 @@
 #include "ace/Argv_Type_Converter.h"
 #include "test_config.h"
 
-ACE_RCSID (tests, ARGV_Test, "$Id$")
+ACE_RCSID(tests, ARGV_Test, "$Id$")
 
 static void
-consume_arg (int argc, ACE_TCHAR *argv[])
+consume_arg (int &argc, ACE_TCHAR *argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
-  if (arg_shifter.is_anything_left ())
+  if (arg_shifter.is_anything_left ()) 
     arg_shifter.consume_arg (1);
   // Once we initialize an arg_shifter, we must iterate through it all!
-  while ((arg_shifter.is_anything_left ()))
+  while ((arg_shifter.is_anything_left ())) 
     arg_shifter.ignore_arg (1);
 }
 
 static int
-test_simple_argv (ACE_TCHAR *argv[])
-{
-  // From command line.
-  ACE_ARGV cl (argv);
-
-  // My own stuff.
-  ACE_ARGV my;
-
-  // Add to my stuff.
-  my.add (ACE_TEXT ("-ORBEndpoint iiop://localhost:12345"));
-
-  // Combine the two (see the ace/ARGV.h constructors documentation).
-  ACE_ARGV a (cl.argv (),
-              my.argv ());
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("argc = %d\n"),
-              a.argc ()));
-
-  // Print the contents of the combined <ACE_ARGV>.
-  for (int i = 0; i < a.argc (); i++)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT (" (%d) %s\n"),
-                i,
-                a.argv ()[i]));
-
-  return 0;
-}
-
-static int
 test_argv_type_converter (void)
 {
   char *argv[20];
@@ -95,7 +65,7 @@ test_argv_type_converter (void)
     consume_arg ( ct3.get_argc (), ct3.get_TCHAR_argv ());
   }
 
-  {
+  { 
     for (size_t i = 0; i < 4; i++)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT (" (%d) %s\n"),
@@ -103,7 +73,7 @@ test_argv_type_converter (void)
                   ACE_TEXT_CHAR_TO_TCHAR (argv[i])));
   }
 
-  for (size_t i = 0; save_argv[i]; ++i)
+  for (size_t i = 0; save_argv[i]; ++i) 
     ACE_OS_Memory::free (save_argv[i]);
 
   return 0;
@@ -130,146 +100,53 @@ test_argv_type_converter2 (void)
     consume_arg ( ct.get_argc (), ct.get_TCHAR_argv ());
   }
 
-  consume_arg (argc, argv);
+  consume_arg ( argc, argv);
 
   {
     for (size_t i = 0; i < 4; i++)
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT (" (%d) %s\n"),
+				  ACE_TEXT (" (%d) %s\n"),
                   i,
                   argv[i]));
   }
 
-  for (size_t i = 0; save_argv[i]; ++i)
+  for (size_t i = 0; save_argv[i]; ++i) 
     ACE_OS_Memory::free (save_argv[i]);
 
   return 0;
 }
 
-static int
-test_argv_buf (void)
-{
-  pid_t parent_pid = ACE_OS::getpid ();
-
-  ACE_TCHAR *l_argv[3];
-  ACE_TCHAR pid_str[100];
-  // 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"),
-                   static_cast <long> (parent_pid),
-                   1);
-
-  // We're going to create a new process that runs this program again,
-  // so we need to indicate that it's the child.
-  const ACE_TCHAR *t = ACE_TEXT (".")
-                       ACE_DIRECTORY_SEPARATOR_STR
-                       ACE_TEXT ("Signal_Test")
-                       ACE_PLATFORM_EXE_SUFFIX
-                       ACE_TEXT (" -c");
-  l_argv[0] = const_cast <ACE_TCHAR *> (t);
-  l_argv[1] = pid_str;
-  l_argv[2] = 0;
-
-  ACE_ARGV my_argv (l_argv);
-
-  // This shouldn't have any quotes in it.
-  ACE_DEBUG ((LM_DEBUG, "%s\n", my_argv.buf ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argc: %d\n"), my_argv.argc ()));
-  return 0;
-}
-
-static int
-test_argv_quotes (void)
+int
+run_main (int, ACE_TCHAR *argv[])
 {
-  const ACE_TCHAR *argv[] = { ACE_TEXT ("first without quotes"),
-                              ACE_TEXT ("'second in single quotes'"),
-                              ACE_TEXT ("\"third in double quotes\""),
-                         0
-                       };
-  int argc = 3;
-
-  // (argc, argv)
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** argv ***\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argc: %d\n"), argc));
-
-  for (int i = 0; i < argc; ++i)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argv[%02d] = %s\n"), i, argv[i]));
-
-  // args
-  ACE_ARGV args;
-  for (int i = 0; i < argc; ++i)
-    args.add (argv[i]);
-  args.add (ACE_TEXT ("'fourth in single quotes'"));
-  args.add (ACE_TEXT ("\"fifth in double quotes\""));
-  args.add (ACE_TEXT ("sixth without any quotes"));
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-1 ***\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args.argc ()));
-
-  for (int i = 0; i < args.argc (); ++i)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args[%02d]: %s\n"), i, args[i]));
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args.argc ()));
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-2 ***\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args.argc ()));
-
-  for (int i = 0; i < args.argc (); ++i)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argv ()[%02d]: %s\n"),
-                i, args.argv ()[i]));
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args.argc ()));
-
-  // args2
-  ACE_ARGV args2;
-  for (int i = 0; i < argc; ++i)
-    args2.add (argv[i], true);
-  args2.add (ACE_TEXT ("'fourth in single quotes'"), true);
-  args2.add (ACE_TEXT ("\"fifth in double quotes\""), true);
-  args2.add (ACE_TEXT ("sixth without any quotes"), true);
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-3 ***\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args2.argc ()));
-
-  for (int i = 0; i < args2.argc (); ++i)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args[%02d]: %s\n"), i, args2[i]));
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args2.argc ()));
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-4 ***\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args2.argc ()));
-
-  for (int i = 0; i < args2.argc (); ++i)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argv ()[%02d]: %s\n"),
-                i, args2.argv ()[i]));
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args2.argc ()));
+  ACE_START_TEST (ACE_TEXT ("ARGV_Test"));
 
-  // args3
-  ACE_ARGV args3(argv);
+  // From command line.
+  ACE_ARGV cl (argv);
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-5 ***\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args3.argc ()));
+  // My own stuff.
+  ACE_ARGV my;
 
-  for (int i = 0; i < args3.argc (); ++i)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args[%02d]: %s\n"), i, args3[i]));
+  // Add to my stuff.
+  my.add (ACE_TEXT ("-ORBEndpoint iiop://localhost:12345"));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args3.argc ()));
+  // Combine the two (see the ace/ARGV.h constructors documentation).
+  ACE_ARGV a (cl.argv (),
+              my.argv ());
 
-  return 0;
-}
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("argc = %d\n"),
+              a.argc ()));
 
-int
-run_main (int, ACE_TCHAR *argv[])
-{
-  ACE_START_TEST (ACE_TEXT ("ARGV_Test"));
+  // Print the contents of the combined <ACE_ARGV>.
+  for (int i = 0; i < a.argc (); i++)
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT (" (%d) %s\n"),
+                i,
+                a.argv ()[i]));
 
-  test_simple_argv (argv);
   test_argv_type_converter2 ();
   test_argv_type_converter ();
-  test_argv_quotes ();
-  test_argv_buf ();
 
   ACE_END_TEST;
   return 0;
diff --git a/ACE/tests/Bug_1890_Regression_Test.cpp b/ACE/tests/Bug_1890_Regression_Test.cpp
index 8a8cade4d90..a28c8302b77 100644
--- a/ACE/tests/Bug_1890_Regression_Test.cpp
+++ b/ACE/tests/Bug_1890_Regression_Test.cpp
@@ -14,7 +14,7 @@
 
 #include "ace/Pipe.h"
 #include "ace/Event_Handler.h"
-#include "ace/Select_Reactor.h"
+#include "ace/Reactor.h"
 
 ACE_RCSID (tests,
            Bug_1890_Regression_Test,
@@ -95,19 +95,18 @@ run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Bug_1890_Regression_Test"));
 
-  ACE_Select_Reactor select_reactor;
-  ACE_Reactor reactor (&select_reactor);
+  ACE_Reactor * reactor = ACE_Reactor::instance();
 
   // Create the timer, this is the main driver for the test
   Timer * timer = new Timer;
 
   // Initialize the timer and register with the reactor
-  if (-1 == timer->open(&reactor))
+  if (-1 == timer->open(reactor))
   {
       ACE_ERROR_RETURN ((LM_ERROR, "Cannot initialize timer\n"), -1);
   }
 
-  reactor.run_reactor_event_loop();
+  reactor->run_reactor_event_loop();
 
   // Verify that the results are what we expect
   if (!timer->check_expected_results())
@@ -117,7 +116,6 @@ run_main (int, ACE_TCHAR *[])
 
   // Cleanup
   timer->close();
-  delete timer;
 
   ACE_END_TEST;
 
@@ -246,7 +244,7 @@ int Timer::handle_timeout(ACE_Time_Value const &, void const *)
       return 0;
     }
 
-    reactor()->end_reactor_event_loop();
+    reactor()->end_event_loop();
 
     return 0;
 }
diff --git a/ACE/tests/Bug_2368_Regression_Test.cpp b/ACE/tests/Bug_2368_Regression_Test.cpp
index 94e11107e7d..8441abe346f 100644
--- a/ACE/tests/Bug_2368_Regression_Test.cpp
+++ b/ACE/tests/Bug_2368_Regression_Test.cpp
@@ -111,13 +111,11 @@ run_main (int, ACE_TCHAR *[])
 
   if (!handleA_close_called)
     ACE_ERROR ((LM_ERROR,
-                "Handle close hasn't been called for A. "
-                "This test failure caused by the unresolved bug is EXPECTED!\n"));
+                "Handle close hasn't been called for A\n"));
 
   if (!handleB_close_called)
     ACE_ERROR ((LM_ERROR,
-                "Handle close hasn't been called for B. "
-                "This test failure caused by the unresolved bug is EXPECTED!\n"));
+                "Handle close hasn't been called for B\n"));
 
   ACE_END_TEST;
 
diff --git a/ACE/tests/Bug_2653_Regression_Test.cpp b/ACE/tests/Bug_2653_Regression_Test.cpp
index 74b87288894..6735eab20e5 100644
--- a/ACE/tests/Bug_2653_Regression_Test.cpp
+++ b/ACE/tests/Bug_2653_Regression_Test.cpp
@@ -211,7 +211,6 @@ run_main (int, ACE_TCHAR *[])
   wd.activate (THR_DETACHED);
   test_for_spin(tp_reactor);
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing for spin\n")));
-  wd.wait ();
 
   ACE_END_TEST;
   return 0;
diff --git a/ACE/tests/Bug_2659_Regression_Test.cpp b/ACE/tests/Bug_2659_Regression_Test.cpp
deleted file mode 100644
index 2dd48ea3bce..00000000000
--- a/ACE/tests/Bug_2659_Regression_Test.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Bug_2659_Regression_Test.cpp
-//
-// = DESCRIPTION
-//       Reproduces the problems reported in bug 2659:
-//        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2659
-//
-// = AUTHOR
-//    Ciju John <johnc at ociweb>
-//
-// ============================================================================
-
-#include "test_config.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/Task.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Thread_Manager.h"
-#include "ace/TP_Reactor.h"
-
-#if !defined (ACE_LACKS_UNIX_SIGNALS)
-
-bool reactor_task_ready = false;
-
-
-//#define RUN_DEBUG 1
-
-#if defined RUN_DEBUG
-
-#define EE_DEBUG(CNAME,MNAME,LOC) \
-EntryExit ee (CNAME,MNAME,LOC)
-
-class EntryExit
-{
-public:
-  EntryExit (const ACE_TCHAR* class_name, const ACE_TCHAR *method_name
-       , void *location = 0)
-  {
-    class_name_ [20] = method_name_[20] = 0;
-
-    ACE_OS::strncpy (class_name_, class_name, 20);
-    ACE_OS::strncpy (method_name_, method_name, 20);
-    location_ = location;
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Entry %@ %s::%s\n")
-         , location, class_name, method_name));
-  };
-
-  ~EntryExit ()
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Exit %@ %s::%s\n")
-         , location_, class_name_, method_name_));
-  };
-
-private:
-  ACE_TCHAR class_name_[21];
-  ACE_TCHAR method_name_[21];
-  void *location_;
-};
-
-#else
-
-#define EE_DEBUG(CNAME,MNAME,LOC)
-
-#endif // if defined RUN_DEBUG
-
-
-
-static void
-handle_signal (int )
-{
-  EE_DEBUG ("", "handle_signal", 0);
-
-  // Dummy signal handler
-}
-
-class ReactorTask : public ACE_Task_Base
-{
-public:
-
-  virtual ~ReactorTask ()
-  {
-    EE_DEBUG ("ReactorTask", "~ReactorTask", this);
-  };
-
-  virtual int svc (void )
-  {
-    EE_DEBUG ("ReactorTask", "svc", this);
-
-    // Register a valid signal handler
-    // so process doesn't die upon receiving signal
-    ACE_Sig_Action sa ((ACE_SignalHandler) &::handle_signal, SIGUSR1);
-    ACE_UNUSED_ARG (sa);
-
-    if (simulate_perform_work () == -1) {
-      ACE_ERROR_RETURN ((LM_ERROR,
-       ACE_TEXT ("(%P|%t) ERROR: simulated_perform_work failed.\n"))
-      , -1);
-    }
-
-    return 0;
-  };
-
-private:
-  int simulate_perform_work ()
-  {
-    EE_DEBUG ("ReactorTask", "simulate_perform_work", this);
-
-    // Create a reactor which doesn't automatically restart
-    // upon interruption
-    ACE_TP_Reactor tp_reactor (ACE_TP_Reactor::DEFAULT_SIZE
-             , 0);
-
-    reactor_task_ready = true;
-
-    // This will return upon signal interruption
-    return tp_reactor.handle_events ();
-  }
-};
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("Bug_2659_Regression_Test"));
-  EE_DEBUG ("", "run_main", 0);
-
-  ReactorTask reactor_task;
-
-  if (reactor_task.activate () == -1) {
-    ACE_ERROR_RETURN ((LM_ERROR,
-           ACE_TEXT ("(%P|%t) Task activation failed.\n"))
-          , -1);
-  }
-
-  ACE_Thread_Manager *thread_manager = reactor_task.thr_mgr ();
-  if (thread_manager == 0) {
-    ACE_ERROR_RETURN ((LM_ERROR,
-           ACE_TEXT ("(%P|%t) No Thread Manager found.\n"))
-          , -1);
-  }
-
-  while (!reactor_task_ready) {
-    ACE_OS:: sleep (1);
-  }
-
-  if (thread_manager->kill_all (SIGUSR1) == -1) {
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Task signalling failed.\n"))
-          , -1);
-  }
-
-  if (reactor_task.wait () == -1) {
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Task wait failed.\n"))
-          , -1);
-  }
-
-  ACE_END_TEST;
-
-  return 0;
-}
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("Bug_2659_Regression_Test"));
-  ACE_ERROR ((LM_INFO,
-              ACE_TEXT ("The Unix Signals capability is not supported on this platform\n")));
-  ACE_END_TEST;
-  return 0;
-}
-#endif /* !defined (ACE_LACKS_UNIX_SIGNALS) */
diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp
index 92f92631073..ec837123c5d 100644
--- a/ACE/tests/CDR_File_Test.cpp
+++ b/ACE/tests/CDR_File_Test.cpp
@@ -406,7 +406,9 @@ run_main (int argc, ACE_TCHAR *argv[])
                        filename.get_path_name ()),
                       1);
 
-#if !defined (VXWORKS)
+#if (!defined (ACE_WIN32) \
+     || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1)) && \
+    !defined (VXWORKS)
 # define TEST_CAN_UNLINK_IN_ADVANCE
 #endif
 
diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp
index b4f2c206f72..ca61076c4ed 100644
--- a/ACE/tests/CDR_Test.cpp
+++ b/ACE/tests/CDR_Test.cpp
@@ -560,44 +560,7 @@ run_main (int argc, ACE_TCHAR *argv[])
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Long stream[2] - no errors\n\n")
-              ACE_TEXT ("Testing consolidation\n\n")));
-
-  ACE_OutputCDR output (30);
-  CDR_Test_Types test_types;
-
-  if (test_types.test_put (output) != 0)
-    return 1;
-
-  if (output.begin () == output.end ())
-    ACE_DEBUG ((LM_WARNING,
-                ACE_TEXT ("Only one block needed; test no effective.\n")));
-  else
-    {
-      if (output.consolidate () != 0)
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("consolidate")));
-    }
-
-  ACE_InputCDR input (output);
-  if (debug > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Output CDR: \n")));
-      ACE_HEX_DUMP ((LM_DEBUG,
-                     input.rd_ptr(),
-                     64));
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Input CDR: \n")));
-      ACE_HEX_DUMP ((LM_DEBUG,
-                     input.rd_ptr(),
-                     64));
-    }
-
-  if (test_types.test_get (input) != 0)
-    return 1;
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Consolidation - no errors\n\n")));
+              ACE_TEXT ("Long stream[2] - no errors\n\n")));
 
   ACE_END_TEST;
   return 0;
diff --git a/ACE/tests/FlReactor_Test.cpp b/ACE/tests/FlReactor_Test.cpp
index 7e476287853..0b34751da3c 100644
--- a/ACE/tests/FlReactor_Test.cpp
+++ b/ACE/tests/FlReactor_Test.cpp
@@ -27,7 +27,7 @@
 ACE_RCSID(tests, FlReactor_Test, "$Id$")
 
 
-#include "ace/FlReactor/FlReactor.h"
+#include "ace/FlReactor.h"
 #include "ace/Event_Handler.h"
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
diff --git a/ACE/protocols/tests/HTBP/HTBP_Config.conf b/ACE/tests/HTBP/HTBP_Config.conf
index 49dfd238ec3..49dfd238ec3 100644
--- a/ACE/protocols/tests/HTBP/HTBP_Config.conf
+++ b/ACE/tests/HTBP/HTBP_Config.conf
diff --git a/ACE/tests/HTBP/Makefile.am b/ACE/tests/HTBP/Makefile.am
new file mode 100644
index 00000000000..7fd964b7c84
--- /dev/null
+++ b/ACE/tests/HTBP/Makefile.am
@@ -0,0 +1,16 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+SUBDIRS = \
+        Reactor_Tests \
+        Send_Large_Msg \
+        Send_Recv_Tests \
+        ping
+
diff --git a/ACE/protocols/tests/HTBP/README b/ACE/tests/HTBP/README
index 65a2bde0320..65a2bde0320 100644
--- a/ACE/protocols/tests/HTBP/README
+++ b/ACE/tests/HTBP/README
diff --git a/ACE/tests/HTBP/Reactor_Tests/.cvsignore b/ACE/tests/HTBP/Reactor_Tests/.cvsignore
new file mode 100644
index 00000000000..955ffdc75d5
--- /dev/null
+++ b/ACE/tests/HTBP/Reactor_Tests/.cvsignore
@@ -0,0 +1,4 @@
+client
+client
+server
+server
diff --git a/ACE/tests/HTBP/Reactor_Tests/Makefile.am b/ACE/tests/HTBP/Reactor_Tests/Makefile.am
new file mode 100644
index 00000000000..813229103d5
--- /dev/null
+++ b/ACE/tests/HTBP/Reactor_Tests/Makefile.am
@@ -0,0 +1,64 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.Reactor_Tests_Client.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
+
+client_SOURCES = \
+  client.cpp \
+  test_config.h
+
+client_LDADD = \
+  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
+## Makefile.Reactor_Tests_Server.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
+
+server_SOURCES = \
+  server.cpp \
+  test_config.h
+
+server_LDADD = \
+  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc b/ACE/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc
index 61e59146a93..61e59146a93 100755
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc
+++ b/ACE/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/tests/HTBP/Reactor_Tests/client.cpp
index 2813d9116f3..2813d9116f3 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
+++ b/ACE/tests/HTBP/Reactor_Tests/client.cpp
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/inside.conf b/ACE/tests/HTBP/Reactor_Tests/inside.conf
index a5bcbc14420..a5bcbc14420 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/inside.conf
+++ b/ACE/tests/HTBP/Reactor_Tests/inside.conf
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/run_test.pl b/ACE/tests/HTBP/Reactor_Tests/run_test.pl
index ae4c56c7fb2..ae4c56c7fb2 100755
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/run_test.pl
+++ b/ACE/tests/HTBP/Reactor_Tests/run_test.pl
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/tests/HTBP/Reactor_Tests/server.cpp
index 87a914163c2..87a914163c2 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
+++ b/ACE/tests/HTBP/Reactor_Tests/server.cpp
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/tests/HTBP/Reactor_Tests/test_config.h
index efd4eb7bcc6..efd4eb7bcc6 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
+++ b/ACE/tests/HTBP/Reactor_Tests/test_config.h
diff --git a/ACE/tests/HTBP/Send_Large_Msg/.cvsignore b/ACE/tests/HTBP/Send_Large_Msg/.cvsignore
new file mode 100644
index 00000000000..955ffdc75d5
--- /dev/null
+++ b/ACE/tests/HTBP/Send_Large_Msg/.cvsignore
@@ -0,0 +1,4 @@
+client
+client
+server
+server
diff --git a/ACE/tests/HTBP/Send_Large_Msg/Makefile.am b/ACE/tests/HTBP/Send_Large_Msg/Makefile.am
new file mode 100644
index 00000000000..2773356439b
--- /dev/null
+++ b/ACE/tests/HTBP/Send_Large_Msg/Makefile.am
@@ -0,0 +1,64 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.Send_Large_Msg_Client.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
+
+client_SOURCES = \
+  client.cpp
+
+client_LDADD = \
+  $(top_builddir)/tests/libTest_Output.la \
+  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
+## Makefile.Send_Large_Msg_Server.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
+
+server_SOURCES = \
+  server.cpp
+
+server_LDADD = \
+  $(top_builddir)/tests/libTest_Output.la \
+  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc b/ACE/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc
index d973b59748f..d973b59748f 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc
+++ b/ACE/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp b/ACE/tests/HTBP/Send_Large_Msg/client.cpp
index 62cd9140da8..62cd9140da8 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
+++ b/ACE/tests/HTBP/Send_Large_Msg/client.cpp
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/run_test.pl b/ACE/tests/HTBP/Send_Large_Msg/run_test.pl
index 6b295afbf17..6b295afbf17 100755
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/run_test.pl
+++ b/ACE/tests/HTBP/Send_Large_Msg/run_test.pl
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp b/ACE/tests/HTBP/Send_Large_Msg/server.cpp
index 7b7f51cf1b9..7b7f51cf1b9 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
+++ b/ACE/tests/HTBP/Send_Large_Msg/server.cpp
diff --git a/ACE/tests/HTBP/Send_Recv_Tests/.cvsignore b/ACE/tests/HTBP/Send_Recv_Tests/.cvsignore
new file mode 100644
index 00000000000..b82dc859445
--- /dev/null
+++ b/ACE/tests/HTBP/Send_Recv_Tests/.cvsignore
@@ -0,0 +1,2 @@
+SendRecv_Test
+SendRecv_Test
diff --git a/ACE/tests/HTBP/Send_Recv_Tests/Makefile.am b/ACE/tests/HTBP/Send_Recv_Tests/Makefile.am
new file mode 100644
index 00000000000..03775f077a4
--- /dev/null
+++ b/ACE/tests/HTBP/Send_Recv_Tests/Makefile.am
@@ -0,0 +1,42 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+
+## Makefile.SendRecv_Test.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS = SendRecv_Test
+
+SendRecv_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
+
+SendRecv_Test_SOURCES = \
+  SendRecv_Test.cpp
+
+SendRecv_Test_LDADD = \
+  $(top_builddir)/tests/libTest_Output.la \
+  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp
index d462a11c3d3..d462a11c3d3 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp
+++ b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc
index 64a40f688d1..64a40f688d1 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc
+++ b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc
diff --git a/ACE/tests/HTBP/htbptest.mpb b/ACE/tests/HTBP/htbptest.mpb
new file mode 100644
index 00000000000..c12f33ef7ba
--- /dev/null
+++ b/ACE/tests/HTBP/htbptest.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+//
+// $Id$
+project : aceexe, htbp {
+  libs += Test_Output
+}
diff --git a/ACE/tests/HTBP/ping/.cvsignore b/ACE/tests/HTBP/ping/.cvsignore
new file mode 100644
index 00000000000..955ffdc75d5
--- /dev/null
+++ b/ACE/tests/HTBP/ping/.cvsignore
@@ -0,0 +1,4 @@
+client
+client
+server
+server
diff --git a/ACE/tests/HTBP/ping/Makefile.am b/ACE/tests/HTBP/ping/Makefile.am
new file mode 100644
index 00000000000..279d82a03c0
--- /dev/null
+++ b/ACE/tests/HTBP/ping/Makefile.am
@@ -0,0 +1,62 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.Ping_Client.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
+
+client_SOURCES = \
+  client.cpp
+
+client_LDADD = \
+  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
+## Makefile.Ping_Server.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
+
+server_SOURCES = \
+  server.cpp
+
+server_LDADD = \
+  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ACE/protocols/tests/HTBP/ping/client.cpp b/ACE/tests/HTBP/ping/client.cpp
index e7753faab6d..e7753faab6d 100644
--- a/ACE/protocols/tests/HTBP/ping/client.cpp
+++ b/ACE/tests/HTBP/ping/client.cpp
diff --git a/ACE/protocols/tests/HTBP/ping/ping.mpc b/ACE/tests/HTBP/ping/ping.mpc
index 61e59146a93..61e59146a93 100755
--- a/ACE/protocols/tests/HTBP/ping/ping.mpc
+++ b/ACE/tests/HTBP/ping/ping.mpc
diff --git a/ACE/protocols/tests/HTBP/ping/run_test.pl b/ACE/tests/HTBP/ping/run_test.pl
index ae4c56c7fb2..ae4c56c7fb2 100755
--- a/ACE/protocols/tests/HTBP/ping/run_test.pl
+++ b/ACE/tests/HTBP/ping/run_test.pl
diff --git a/ACE/protocols/tests/HTBP/ping/server.cpp b/ACE/tests/HTBP/ping/server.cpp
index d20d46b8b09..d20d46b8b09 100644
--- a/ACE/protocols/tests/HTBP/ping/server.cpp
+++ b/ACE/tests/HTBP/ping/server.cpp
diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp
index f9c60764bca..f9c60764bca 100644..100755
--- a/ACE/tests/Integer_Truncate_Test.cpp
+++ b/ACE/tests/Integer_Truncate_Test.cpp
diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp
index 71645e2ca0b..4436a90b26c 100644
--- a/ACE/tests/Log_Msg_Test.cpp
+++ b/ACE/tests/Log_Msg_Test.cpp
@@ -231,7 +231,7 @@ test_log_msg_features (const ACE_TCHAR *program)
                 cleanup));
 
 // Don't try this on VxWorks, it will result in an overflow and end the test.
-// Platforms that define ACE_LACKS_VSNPRINTF are candidates to fail here.
+// Platforms that don't define ACE_HAS_SNPRINTF are candidates to fail here.
 // This then proves that logging to big messages is problematic but on VxWorks
 // we know this and we want to rest of the test to continue
 #if !defined (VXWORKS)
@@ -503,14 +503,14 @@ Log_Spec_Verify::log (ACE_Log_Record &log_record)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("Log_Spec_Verify, unrecognized test: %s\n"),
                   b));
-      ++this->fail_;
+      this->fail_++;
     }
 
   if (b != log_record.msg_data () && ACE_OS::strcmp (b, expect) != 0)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Test %s failed; expected %s\n"),
                   log_record.msg_data (), expect));
-      ++this->fail_;
+      this->fail_++;
     }
 
   return;
@@ -557,9 +557,6 @@ test_format_specs (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%}%ITWO\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%}%IONE\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%}%IENDINDENTING\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%W\n"), ACE_TEXT_WIDE ("My string test\n")));
-  ACE_TCHAR* nill_string = 0;
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%W\n"), nill_string));
   errno = ENOENT;
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%m %p\n"), ACE_TEXT("perror")));
   return 0;
diff --git a/ACE/tests/Makefile.am b/ACE/tests/Makefile.am
index 72f1f504760..0de38407ea0 100644
--- a/ACE/tests/Makefile.am
+++ b/ACE/tests/Makefile.am
@@ -6,24 +6,25 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 SUBDIRS = \
         . \
+        HTBP \
         SSL
 
 
 ## Makefile.Test_Output.am
 
 noinst_SCRIPTS = run_test.pl run_test.lst
+
 dist_check_SCRIPTS = run_test.pl run_test.lst
 TESTS = $(noinst_PROGRAMS)
 TESTS_ENVIRONMENT = $(srcdir)/run_test.pl -t
 
-
 noinst_LTLIBRARIES = libTest_Output.la
 
 libTest_Output_la_CPPFLAGS = \
@@ -39,7 +40,6 @@ noinst_HEADERS = \
   test_config.h
 
 ## Makefile.ACE_Init_Test.am
-
 noinst_PROGRAMS = ACE_Init_Test
 
 ACE_Init_Test_CPPFLAGS = \
@@ -60,7 +60,6 @@ EXTRA_DIST = \
 
 
 ## Makefile.ACE_Test.am
-
 noinst_PROGRAMS += ACE_Test
 
 ACE_Test_CPPFLAGS = \
@@ -76,7 +75,6 @@ ACE_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.ARGV_Test.am
-
 noinst_PROGRAMS += ARGV_Test
 
 ARGV_Test_CPPFLAGS = \
@@ -92,7 +90,6 @@ ARGV_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Aio_Platform_Test.am
-
 noinst_PROGRAMS += Aio_Platform_Test
 
 Aio_Platform_Test_CPPFLAGS = \
@@ -108,7 +105,6 @@ Aio_Platform_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Arg_Shifter_Test.am
-
 noinst_PROGRAMS += Arg_Shifter_Test
 
 Arg_Shifter_Test_CPPFLAGS = \
@@ -124,7 +120,6 @@ Arg_Shifter_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Array_Map_Test.am
-
 noinst_PROGRAMS += Array_Map_Test
 
 Array_Map_Test_CPPFLAGS = \
@@ -140,7 +135,6 @@ Array_Map_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Atomic_Op_Test.am
-
 noinst_PROGRAMS += Atomic_Op_Test
 
 Atomic_Op_Test_CPPFLAGS = \
@@ -156,7 +150,6 @@ Atomic_Op_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Auto_Event_Test.am
-
 noinst_PROGRAMS += Auto_Event_Test
 
 Auto_Event_Test_CPPFLAGS = \
@@ -172,7 +165,6 @@ Auto_Event_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Auto_IncDec_Test.am
-
 noinst_PROGRAMS += Auto_IncDec_Test
 
 Auto_IncDec_Test_CPPFLAGS = \
@@ -188,7 +180,6 @@ Auto_IncDec_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Barrier_Test.am
-
 noinst_PROGRAMS += Barrier_Test
 
 Barrier_Test_CPPFLAGS = \
@@ -268,7 +259,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Based_Pointer_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Based_Pointer_Test
 
 Based_Pointer_Test_CPPFLAGS = \
@@ -286,7 +276,6 @@ Based_Pointer_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Basic_Types_Test.am
-
 noinst_PROGRAMS += Basic_Types_Test
 
 Basic_Types_Test_CPPFLAGS = \
@@ -304,7 +293,6 @@ Basic_Types_Test_LDADD = \
 ## Makefile.Bound_Ptr_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Bound_Ptr_Test
 
 Bound_Ptr_Test_CPPFLAGS = \
@@ -323,7 +311,6 @@ Bound_Ptr_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Buffer_Stream_Test.am
-
 noinst_PROGRAMS += Buffer_Stream_Test
 
 Buffer_Stream_Test_CPPFLAGS = \
@@ -339,7 +326,6 @@ Buffer_Stream_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Bug_1576_Regression_Test.am
-
 noinst_PROGRAMS += Bug_1576_Regression_Test
 
 Bug_1576_Regression_Test_CPPFLAGS = \
@@ -354,24 +340,7 @@ Bug_1576_Regression_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Bug_1890_Regression_Test.am
-
-noinst_PROGRAMS += Bug_1890_Regression_Test
-
-Bug_1890_Regression_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-Bug_1890_Regression_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  Bug_1890_Regression_Test.cpp
-
-Bug_1890_Regression_Test_LDADD = \
-  libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
 ## Makefile.Bug_2368_Regression_Test.am
-
 noinst_PROGRAMS += Bug_2368_Regression_Test
 
 Bug_2368_Regression_Test_CPPFLAGS = \
@@ -387,7 +356,6 @@ Bug_2368_Regression_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Bug_2497_Regression_Test.am
-
 noinst_PROGRAMS += Bug_2497_Regression_Test
 
 Bug_2497_Regression_Test_CPPFLAGS = \
@@ -402,58 +370,9 @@ Bug_2497_Regression_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Bug_2540_Regression_Test.am
-
-noinst_PROGRAMS += Bug_2540_Regression_Test
-
-Bug_2540_Regression_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-Bug_2540_Regression_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  Bug_2540_Regression_Test.cpp
-
-Bug_2540_Regression_Test_LDADD = \
-  libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Makefile.Bug_2653_Regression_Test.am
-
-noinst_PROGRAMS += Bug_2653_Regression_Test
-
-Bug_2653_Regression_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-Bug_2653_Regression_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  Bug_2653_Regression_Test.cpp
-
-Bug_2653_Regression_Test_LDADD = \
-  libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Makefile.Bug_2659_Regression_Test.am
-
-noinst_PROGRAMS += Bug_2659_Regression_Test
-
-Bug_2659_Regression_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-Bug_2659_Regression_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  Bug_2659_Regression_Test.cpp
-
-Bug_2659_Regression_Test_LDADD = \
-  libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
 ## Makefile.CDR_Array_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += CDR_Array_Test
 
 CDR_Array_Test_CPPFLAGS = \
@@ -473,7 +392,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.CDR_File_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += CDR_File_Test
 
 CDR_File_Test_CPPFLAGS = \
@@ -493,7 +411,6 @@ CDR_File_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.CDR_Test.am
-
 noinst_PROGRAMS += CDR_Test
 
 CDR_Test_CPPFLAGS = \
@@ -509,7 +426,6 @@ CDR_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Cache_Map_Manager_Test.am
-
 noinst_PROGRAMS += Cache_Map_Manager_Test
 
 Cache_Map_Manager_Test_CPPFLAGS = \
@@ -528,7 +444,6 @@ Cache_Map_Manager_Test_LDADD = \
 ## Makefile.Cached_Accept_Conn_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Cached_Accept_Conn_Test
 
 Cached_Accept_Conn_Test_CPPFLAGS = \
@@ -549,7 +464,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Cached_Allocator_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Cached_Allocator_Test
 
 Cached_Allocator_Test_CPPFLAGS = \
@@ -569,7 +483,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Cached_Conn_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Cached_Conn_Test
 
 Cached_Conn_Test_CPPFLAGS = \
@@ -590,7 +503,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Capabilities_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Capabilities_Test
 
 Capabilities_Test_CPPFLAGS = \
@@ -611,7 +523,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if BUILD_ACE_CODECS
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Codecs_Test
 
 Codecs_Test_CPPFLAGS = \
@@ -630,7 +541,6 @@ endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACE_CODECS
 
 ## Makefile.Collection_Test.am
-
 noinst_PROGRAMS += Collection_Test
 
 Collection_Test_CPPFLAGS = \
@@ -649,7 +559,6 @@ Collection_Test_LDADD = \
 ## Makefile.Config_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Config_Test
 
 Config_Test_CPPFLAGS = \
@@ -670,7 +579,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Conn_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Conn_Test
 
 Conn_Test_CPPFLAGS = \
@@ -722,7 +630,6 @@ noinst_HEADERS += \
   test_config.h
 
 ## Makefile.DLL_Test.am
-
 noinst_PROGRAMS += DLL_Test
 
 DLL_Test_CPPFLAGS = \
@@ -743,7 +650,6 @@ DLL_Test_LDADD = \
 ## Makefile.DLList_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += DLList_Test
 
 DLList_Test_CPPFLAGS = \
@@ -763,7 +669,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Date_Time_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Date_Time_Test
 
 Date_Time_Test_CPPFLAGS = \
@@ -781,7 +686,6 @@ Date_Time_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Dev_Poll_Reactor_Test.am
-
 noinst_PROGRAMS += Dev_Poll_Reactor_Test
 
 Dev_Poll_Reactor_Test_CPPFLAGS = \
@@ -797,7 +701,6 @@ Dev_Poll_Reactor_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Dirent_Test.am
-
 noinst_PROGRAMS += Dirent_Test
 
 Dirent_Test_CPPFLAGS = \
@@ -813,7 +716,6 @@ Dirent_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Dynamic_Priority_Test.am
-
 noinst_PROGRAMS += Dynamic_Priority_Test
 
 Dynamic_Priority_Test_CPPFLAGS = \
@@ -829,7 +731,6 @@ Dynamic_Priority_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Enum_Interfaces_Test.am
-
 noinst_PROGRAMS += Enum_Interfaces_Test
 
 Enum_Interfaces_Test_CPPFLAGS = \
@@ -845,7 +746,6 @@ Enum_Interfaces_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Env_Value_Test.am
-
 noinst_PROGRAMS += Env_Value_Test
 
 Env_Value_Test_CPPFLAGS = \
@@ -863,7 +763,6 @@ Env_Value_Test_LDADD = \
 ## Makefile.FIFO_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += FIFO_Test
 
 FIFO_Test_CPPFLAGS = \
@@ -929,7 +828,6 @@ noinst_HEADERS += \
   Framework_Component_DLL_Export.h
 
 ## Makefile.Framework_Component_Test.am
-
 noinst_PROGRAMS += Framework_Component_Test
 
 Framework_Component_Test_CPPFLAGS = \
@@ -948,7 +846,6 @@ Framework_Component_Test_LDADD = \
 ## Makefile.Future_Set_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Future_Set_Test
 
 Future_Set_Test_CPPFLAGS = \
@@ -968,7 +865,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Future_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Future_Test
 
 Future_Test_CPPFLAGS = \
@@ -986,7 +882,6 @@ Future_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Get_Opt_Test.am
-
 noinst_PROGRAMS += Get_Opt_Test
 
 Get_Opt_Test_CPPFLAGS = \
@@ -1004,7 +899,6 @@ Get_Opt_Test_LDADD = \
 ## Makefile.Handle_Set_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Handle_Set_Test
 
 Handle_Set_Test_CPPFLAGS = \
@@ -1022,7 +916,6 @@ Handle_Set_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Hash_Map_Bucket_Iterator_Test.am
-
 noinst_PROGRAMS += Hash_Map_Bucket_Iterator_Test
 
 Hash_Map_Bucket_Iterator_Test_CPPFLAGS = \
@@ -1038,7 +931,6 @@ Hash_Map_Bucket_Iterator_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Hash_Map_Manager_Test.am
-
 noinst_PROGRAMS += Hash_Map_Manager_Test
 
 Hash_Map_Manager_Test_CPPFLAGS = \
@@ -1054,7 +946,6 @@ Hash_Map_Manager_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Hash_Multi_Map_Manager_Test.am
-
 noinst_PROGRAMS += Hash_Multi_Map_Manager_Test
 
 Hash_Multi_Map_Manager_Test_CPPFLAGS = \
@@ -1072,7 +963,6 @@ Hash_Multi_Map_Manager_Test_LDADD = \
 ## Makefile.High_Res_Timer_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += High_Res_Timer_Test
 
 High_Res_Timer_Test_CPPFLAGS = \
@@ -1090,7 +980,6 @@ High_Res_Timer_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.INET_Addr_Test.am
-
 noinst_PROGRAMS += INET_Addr_Test
 
 INET_Addr_Test_CPPFLAGS = \
@@ -1106,7 +995,6 @@ INET_Addr_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.INET_Addr_Test_IPV6.am
-
 noinst_PROGRAMS += INET_Addr_Test_IPV6
 
 INET_Addr_Test_IPV6_CPPFLAGS = \
@@ -1122,7 +1010,6 @@ INET_Addr_Test_IPV6_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.IOStream_Test.am
-
 noinst_PROGRAMS += IOStream_Test
 
 IOStream_Test_CPPFLAGS = \
@@ -1137,24 +1024,7 @@ IOStream_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Integer_Truncate_Test.am
-
-noinst_PROGRAMS += Integer_Truncate_Test
-
-Integer_Truncate_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-Integer_Truncate_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  Integer_Truncate_Test.cpp
-
-Integer_Truncate_Test_LDADD = \
-  libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
 ## Makefile.Lazy_Map_Manager_Test.am
-
 noinst_PROGRAMS += Lazy_Map_Manager_Test
 
 Lazy_Map_Manager_Test_CPPFLAGS = \
@@ -1170,9 +1040,6 @@ Lazy_Map_Manager_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Library_Unload.am
-
-if !BUILD_WINCE
-
 noinst_PROGRAMS += UnloadLibACE
 
 UnloadLibACE_SOURCES = \
@@ -1222,12 +1089,9 @@ UnloadLibACE_SOURCES = \
   Upgradable_RW_Test.h \
   test_config.h
 
-endif !BUILD_WINCE
-
 ## Makefile.Log_Msg_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Log_Msg_Test
 
 Log_Msg_Test_CPPFLAGS = \
@@ -1245,7 +1109,6 @@ Log_Msg_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Logging_Strategy_Test.am
-
 noinst_PROGRAMS += Logging_Strategy_Test
 
 Logging_Strategy_Test_CPPFLAGS = \
@@ -1263,7 +1126,6 @@ Logging_Strategy_Test_LDADD = \
 ## Makefile.MEM_Stream_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += MEM_Stream_Test
 
 MEM_Stream_Test_CPPFLAGS = \
@@ -1284,7 +1146,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.MM_Shared_Memory_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += MM_Shared_Memory_Test
 
 MM_Shared_Memory_Test_CPPFLAGS = \
@@ -1302,7 +1163,6 @@ MM_Shared_Memory_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.MT_Reactor_Timer_Test.am
-
 noinst_PROGRAMS += MT_Reactor_Timer_Test
 
 MT_Reactor_Timer_Test_CPPFLAGS = \
@@ -1319,7 +1179,6 @@ MT_Reactor_Timer_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.MT_Reactor_Upcall_Test.am
-
 noinst_PROGRAMS += MT_Reactor_Upcall_Test
 
 MT_Reactor_Upcall_Test_CPPFLAGS = \
@@ -1335,7 +1194,6 @@ MT_Reactor_Upcall_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.MT_Ref_Counted_Event_Handler_Test.am
-
 noinst_PROGRAMS += MT_Reference_Counted_Event_Handler_Test
 
 MT_Reference_Counted_Event_Handler_Test_CPPFLAGS = \
@@ -1351,7 +1209,6 @@ MT_Reference_Counted_Event_Handler_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.MT_Reference_Counted_Notify_Test.am
-
 noinst_PROGRAMS += MT_Reference_Counted_Notify_Test
 
 MT_Reference_Counted_Notify_Test_CPPFLAGS = \
@@ -1367,7 +1224,6 @@ MT_Reference_Counted_Notify_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.MT_SOCK_Test.am
-
 noinst_PROGRAMS += MT_SOCK_Test
 
 MT_SOCK_Test_CPPFLAGS = \
@@ -1385,7 +1241,6 @@ MT_SOCK_Test_LDADD = \
 ## Makefile.Malloc_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Malloc_Test
 
 Malloc_Test_CPPFLAGS = \
@@ -1404,7 +1259,6 @@ Malloc_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Manual_Event_Test.am
-
 noinst_PROGRAMS += Manual_Event_Test
 
 Manual_Event_Test_CPPFLAGS = \
@@ -1422,7 +1276,6 @@ Manual_Event_Test_LDADD = \
 ## Makefile.Map_Manager_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Map_Manager_Test
 
 Map_Manager_Test_CPPFLAGS = \
@@ -1442,7 +1295,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Map_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Map_Test
 
 Map_Test_CPPFLAGS = \
@@ -1461,7 +1313,6 @@ Map_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Max_Default_Port_Test.am
-
 noinst_PROGRAMS += Max_Default_Port_Test
 
 Max_Default_Port_Test_CPPFLAGS = \
@@ -1478,7 +1329,6 @@ Max_Default_Port_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Max_Default_Port_Test_IPV6.am
-
 noinst_PROGRAMS += Max_Default_Port_Test_IPV6
 
 Max_Default_Port_Test_IPV6_CPPFLAGS = \
@@ -1496,7 +1346,6 @@ Max_Default_Port_Test_IPV6_LDADD = \
 ## Makefile.Mem_Map_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Mem_Map_Test
 
 Mem_Map_Test_CPPFLAGS = \
@@ -1516,7 +1365,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Memcpy_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Memcpy_Test
 
 Memcpy_Test_CPPFLAGS = \
@@ -1536,7 +1384,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Message_Block_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Message_Block_Test
 
 Message_Block_Test_CPPFLAGS = \
@@ -1554,7 +1401,6 @@ Message_Block_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Message_Queue_Notifications_Test.am
-
 noinst_PROGRAMS += Message_Queue_Notifications_Test
 
 Message_Queue_Notifications_Test_CPPFLAGS = \
@@ -1572,7 +1418,6 @@ Message_Queue_Notifications_Test_LDADD = \
 ## Makefile.Message_Queue_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Message_Queue_Test
 
 Message_Queue_Test_CPPFLAGS = \
@@ -1592,7 +1437,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Message_Queue_Test_Ex.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Message_Queue_Test_Ex
 
 Message_Queue_Test_Ex_CPPFLAGS = \
@@ -1611,7 +1455,6 @@ Message_Queue_Test_Ex_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Multicast_Test.am
-
 noinst_PROGRAMS += Multicast_Test
 
 Multicast_Test_CPPFLAGS = \
@@ -1627,7 +1470,6 @@ Multicast_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Multicast_Test_IPV6.am
-
 noinst_PROGRAMS += Multicast_Test_IPV6
 
 Multicast_Test_IPV6_CPPFLAGS = \
@@ -1645,7 +1487,6 @@ Multicast_Test_IPV6_LDADD = \
 ## Makefile.Multihomed_INET_Addr_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Multihomed_INET_Addr_Test
 
 Multihomed_INET_Addr_Test_CPPFLAGS = \
@@ -1665,7 +1506,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Multihomed_INET_Addr_Test_IPV6.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Multihomed_INET_Addr_Test_IPV6
 
 Multihomed_INET_Addr_Test_IPV6_CPPFLAGS = \
@@ -1686,7 +1526,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if BUILD_ACE_OTHER
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Naming_Test
 
 Naming_Test_CPPFLAGS = \
@@ -1705,7 +1544,6 @@ endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACE_OTHER
 
 ## Makefile.Network_Adapters_Test.am
-
 noinst_PROGRAMS += Network_Adapters_Test
 
 Network_Adapters_Test_CPPFLAGS = \
@@ -1722,7 +1560,6 @@ Network_Adapters_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.New_Fail_Test.am
-
 noinst_PROGRAMS += New_Fail_Test
 
 New_Fail_Test_CPPFLAGS = \
@@ -1738,7 +1575,6 @@ New_Fail_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.NonBlocking_Conn_Test.am
-
 noinst_PROGRAMS += NonBlocking_Conn_Test
 
 NonBlocking_Conn_Test_CPPFLAGS = \
@@ -1757,7 +1593,6 @@ NonBlocking_Conn_Test_LDADD = \
 ## Makefile.Notify_Performance_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Notify_Performance_Test
 
 Notify_Performance_Test_CPPFLAGS = \
@@ -1775,7 +1610,6 @@ Notify_Performance_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.OS_Test.am
-
 noinst_PROGRAMS += OS_Test
 
 OS_Test_CPPFLAGS = \
@@ -1791,7 +1625,6 @@ OS_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Object_Manager_Test.am
-
 noinst_PROGRAMS += Object_Manager_Test
 
 Object_Manager_Test_CPPFLAGS = \
@@ -1807,7 +1640,6 @@ Object_Manager_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Obstack_Test.am
-
 noinst_PROGRAMS += Obstack_Test
 
 Obstack_Test_CPPFLAGS = \
@@ -1823,7 +1655,6 @@ Obstack_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.OrdMultiSet_Test.am
-
 noinst_PROGRAMS += OrdMultiSet_Test
 
 OrdMultiSet_Test_CPPFLAGS = \
@@ -1839,7 +1670,6 @@ OrdMultiSet_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Pipe_Test.am
-
 noinst_PROGRAMS += Pipe_Test
 
 Pipe_Test_CPPFLAGS = \
@@ -1855,7 +1685,6 @@ Pipe_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Priority_Buffer_Test.am
-
 noinst_PROGRAMS += Priority_Buffer_Test
 
 Priority_Buffer_Test_CPPFLAGS = \
@@ -1873,7 +1702,6 @@ Priority_Buffer_Test_LDADD = \
 ## Makefile.Priority_Reactor_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Priority_Reactor_Test
 
 Priority_Reactor_Test_CPPFLAGS = \
@@ -1892,7 +1720,6 @@ Priority_Reactor_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Priority_Task_Test.am
-
 noinst_PROGRAMS += Priority_Task_Test
 
 Priority_Task_Test_CPPFLAGS = \
@@ -1910,7 +1737,6 @@ Priority_Task_Test_LDADD = \
 ## Makefile.Proactor_Scatter_Gather_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Proactor_Scatter_Gather_Test
 
 Proactor_Scatter_Gather_Test_CPPFLAGS = \
@@ -1930,7 +1756,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Proactor_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Proactor_Test
 
 Proactor_Test_CPPFLAGS = \
@@ -1951,7 +1776,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Proactor_Test_IPV6.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Proactor_Test_IPV6
 
 Proactor_Test_IPV6_CPPFLAGS = \
@@ -1971,7 +1795,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Proactor_Timer_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Proactor_Timer_Test
 
 Proactor_Timer_Test_CPPFLAGS = \
@@ -1991,7 +1814,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Process_Manager_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Process_Manager_Test
 
 Process_Manager_Test_CPPFLAGS = \
@@ -2009,7 +1831,6 @@ Process_Manager_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Process_Manual_Event_Test.am
-
 noinst_PROGRAMS += Process_Manual_Event_Test
 
 Process_Manual_Event_Test_CPPFLAGS = \
@@ -2027,7 +1848,6 @@ Process_Manual_Event_Test_LDADD = \
 ## Makefile.Process_Mutex_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Process_Mutex_Test
 
 Process_Mutex_Test_CPPFLAGS = \
@@ -2047,7 +1867,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Process_Semaphore_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Process_Semaphore_Test
 
 Process_Semaphore_Test_CPPFLAGS = \
@@ -2067,7 +1886,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Process_Strategy_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Process_Strategy_Test
 
 Process_Strategy_Test_CPPFLAGS = \
@@ -2097,7 +1915,7 @@ CLEANFILES = \
   QtReactor_Test_moc.cpp
 
 QtReactor_Test_moc.cpp: $(srcdir)/QtReactor_Test.h
-	$(QTDIR)/bin/moc  $(srcdir)/QtReactor_Test.h -o QtReactor_Test_moc.cpp
+	$(QTDIR)/bin/moc  -o QtReactor_Test_moc.cpp $(srcdir)/QtReactor_Test.h
 
 noinst_PROGRAMS += QtReactor_Test
 
@@ -2125,7 +1943,6 @@ endif BUILD_QT
 endif BUILD_ACE_QTREACTOR
 
 ## Makefile.RB_Tree_Test.am
-
 noinst_PROGRAMS += RB_Tree_Test
 
 RB_Tree_Test_CPPFLAGS = \
@@ -2142,7 +1959,6 @@ RB_Tree_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Dispatch_Order_Test.am
-
 noinst_PROGRAMS += Reactor_Dispatch_Order_Test
 
 Reactor_Dispatch_Order_Test_CPPFLAGS = \
@@ -2158,7 +1974,6 @@ Reactor_Dispatch_Order_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Exceptions_Test.am
-
 noinst_PROGRAMS += Reactor_Exceptions_Test
 
 Reactor_Exceptions_Test_CPPFLAGS = \
@@ -2174,7 +1989,6 @@ Reactor_Exceptions_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Notification_Queue_Test.am
-
 noinst_PROGRAMS += Reactor_Notification_Queue_Test
 
 Reactor_Notification_Queue_Test_CPPFLAGS = \
@@ -2192,7 +2006,6 @@ Reactor_Notification_Queue_Test_LDADD = \
 ## Makefile.Reactor_Notify_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Reactor_Notify_Test
 
 Reactor_Notify_Test_CPPFLAGS = \
@@ -2212,7 +2025,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Reactor_Performance_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Reactor_Performance_Test
 
 Reactor_Performance_Test_CPPFLAGS = \
@@ -2231,7 +2043,6 @@ Reactor_Performance_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Reactor_Registration_Test.am
-
 noinst_PROGRAMS += Reactor_Registration_Test
 
 Reactor_Registration_Test_CPPFLAGS = \
@@ -2249,7 +2060,6 @@ Reactor_Registration_Test_LDADD = \
 ## Makefile.Reactor_Timer_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Reactor_Timer_Test
 
 Reactor_Timer_Test_CPPFLAGS = \
@@ -2267,7 +2077,6 @@ Reactor_Timer_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Reactors_Test.am
-
 noinst_PROGRAMS += Reactors_Test
 
 Reactors_Test_CPPFLAGS = \
@@ -2283,7 +2092,6 @@ Reactors_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reader_Writer_Test.am
-
 noinst_PROGRAMS += Reader_Writer_Test
 
 Reader_Writer_Test_CPPFLAGS = \
@@ -2299,7 +2107,6 @@ Reader_Writer_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Recursive_Condition_Bug_Test.am
-
 noinst_PROGRAMS += Recursive_Condition_Bug_Test
 
 Recursive_Condition_Bug_Test_CPPFLAGS = \
@@ -2315,7 +2122,6 @@ Recursive_Condition_Bug_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Recursive_Condition_Test.am
-
 noinst_PROGRAMS += Recursive_Condition_Test
 
 Recursive_Condition_Test_CPPFLAGS = \
@@ -2331,7 +2137,6 @@ Recursive_Condition_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Recursive_Mutex_Test.am
-
 noinst_PROGRAMS += Recursive_Mutex_Test
 
 Recursive_Mutex_Test_CPPFLAGS = \
@@ -2349,7 +2154,6 @@ Recursive_Mutex_Test_LDADD = \
 ## Makefile.Refcounted_Auto_Ptr_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Refcounted_Auto_Ptr_Test
 
 Refcounted_Auto_Ptr_Test_CPPFLAGS = \
@@ -2368,7 +2172,6 @@ Refcounted_Auto_Ptr_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Reference_Counted_Event_Handler_Test.am
-
 noinst_PROGRAMS += Reference_Counted_Event_Handler_Test
 
 Reference_Counted_Event_Handler_Test_CPPFLAGS = \
@@ -2384,7 +2187,6 @@ Reference_Counted_Event_Handler_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reverse_Lock_Test.am
-
 noinst_PROGRAMS += Reverse_Lock_Test
 
 Reverse_Lock_Test_CPPFLAGS = \
@@ -2400,7 +2202,6 @@ Reverse_Lock_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SOCK_Connector_Test.am
-
 noinst_PROGRAMS += SOCK_Connector_Test
 
 SOCK_Connector_Test_CPPFLAGS = \
@@ -2418,7 +2219,6 @@ SOCK_Connector_Test_LDADD = \
 ## Makefile.SOCK_Dgram_Bcast_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += SOCK_Dgram_Bcast_Test
 
 SOCK_Dgram_Bcast_Test_CPPFLAGS = \
@@ -2436,7 +2236,6 @@ SOCK_Dgram_Bcast_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.SOCK_Dgram_Test.am
-
 noinst_PROGRAMS += SOCK_Dgram_Test
 
 SOCK_Dgram_Test_CPPFLAGS = \
@@ -2451,30 +2250,9 @@ SOCK_Dgram_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.SOCK_Netlink_Test.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += SOCK_Netlink_Test
-
-SOCK_Netlink_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-SOCK_Netlink_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  SOCK_Netlink_Test.cpp
-
-SOCK_Netlink_Test_LDADD = \
-  libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.SOCK_SEQPACK_SCTP_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += SOCK_SEQPACK_SCTP_Test
 
 SOCK_SEQPACK_SCTP_Test_CPPFLAGS = \
@@ -2492,7 +2270,6 @@ SOCK_SEQPACK_SCTP_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.SOCK_Send_Recv_Test.am
-
 noinst_PROGRAMS += SOCK_Send_Recv_Test
 
 SOCK_Send_Recv_Test_CPPFLAGS = \
@@ -2508,7 +2285,6 @@ SOCK_Send_Recv_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SOCK_Send_Recv_Test_IPV6.am
-
 noinst_PROGRAMS += SOCK_Send_Recv_Test_IPV6
 
 SOCK_Send_Recv_Test_IPV6_CPPFLAGS = \
@@ -2524,7 +2300,6 @@ SOCK_Send_Recv_Test_IPV6_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SOCK_Test.am
-
 noinst_PROGRAMS += SOCK_Test
 
 SOCK_Test_CPPFLAGS = \
@@ -2540,7 +2315,6 @@ SOCK_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SOCK_Test_IPv6.am
-
 noinst_PROGRAMS += SOCK_Test_IPv6
 
 SOCK_Test_IPv6_CPPFLAGS = \
@@ -2558,7 +2332,6 @@ SOCK_Test_IPv6_LDADD = \
 ## Makefile.SPIPE_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += SPIPE_Test
 
 SPIPE_Test_CPPFLAGS = \
@@ -2576,7 +2349,6 @@ SPIPE_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.SString_Test.am
-
 noinst_PROGRAMS += SString_Test
 
 SString_Test_CPPFLAGS = \
@@ -2594,7 +2366,6 @@ SString_Test_LDADD = \
 ## Makefile.SV_Shared_Memory_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += SV_Shared_Memory_Test
 
 SV_Shared_Memory_Test_CPPFLAGS = \
@@ -2614,7 +2385,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Semaphore_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Semaphore_Test
 
 Semaphore_Test_CPPFLAGS = \
@@ -2632,7 +2402,6 @@ Semaphore_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Sendfile_Test.am
-
 noinst_PROGRAMS += Sendfile_Test
 
 Sendfile_Test_CPPFLAGS = \
@@ -2664,7 +2433,6 @@ noinst_HEADERS += \
   Service_Config_DLL_Export.h
 
 ## Makefile.Service_Config_Test.am
-
 noinst_PROGRAMS += Service_Config_Test
 
 Service_Config_Test_CPPFLAGS = \
@@ -2680,7 +2448,6 @@ Service_Config_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Signal_Test.am
-
 noinst_PROGRAMS += Signal_Test
 
 Signal_Test_CPPFLAGS = \
@@ -2696,7 +2463,6 @@ Signal_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Sigset_Ops_Test.am
-
 noinst_PROGRAMS += Sigset_Ops_Test
 
 Sigset_Ops_Test_CPPFLAGS = \
@@ -2712,7 +2478,6 @@ Sigset_Ops_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Simple_Message_Block_Test.am
-
 noinst_PROGRAMS += Simple_Message_Block_Test
 
 Simple_Message_Block_Test_CPPFLAGS = \
@@ -2730,7 +2495,6 @@ Simple_Message_Block_Test_LDADD = \
 ## Makefile.Svc_Handler_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Svc_Handler_Test
 
 Svc_Handler_Test_CPPFLAGS = \
@@ -2750,7 +2514,6 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.TP_Reactor_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += TP_Reactor_Test
 
 TP_Reactor_Test_CPPFLAGS = \
@@ -2769,7 +2532,6 @@ TP_Reactor_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.TSS_Static_Test.am
-
 noinst_PROGRAMS += TSS_Static_Test
 
 TSS_Static_Test_CPPFLAGS = \
@@ -2785,7 +2547,6 @@ TSS_Static_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.TSS_Test.am
-
 noinst_PROGRAMS += TSS_Test
 
 TSS_Test_CPPFLAGS = \
@@ -2801,7 +2562,6 @@ TSS_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Task_Ex_Test.am
-
 noinst_PROGRAMS += Task_Ex_Test
 
 Task_Ex_Test_CPPFLAGS = \
@@ -2818,7 +2578,6 @@ Task_Ex_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Task_Test.am
-
 noinst_PROGRAMS += Task_Test
 
 Task_Test_CPPFLAGS = \
@@ -2834,7 +2593,6 @@ Task_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Thread_Manager_Test.am
-
 noinst_PROGRAMS += Thread_Manager_Test
 
 Thread_Manager_Test_CPPFLAGS = \
@@ -2850,7 +2608,6 @@ Thread_Manager_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Thread_Mutex_Test.am
-
 noinst_PROGRAMS += Thread_Mutex_Test
 
 Thread_Mutex_Test_CPPFLAGS = \
@@ -2868,7 +2625,6 @@ Thread_Mutex_Test_LDADD = \
 ## Makefile.Thread_Pool_Reactor_Resume_Test.am
 
 if BUILD_ACE_OTHER
-
 noinst_PROGRAMS += Thread_Pool_Reactor_Resume_Test
 
 Thread_Pool_Reactor_Resume_Test_CPPFLAGS = \
@@ -2889,7 +2645,6 @@ endif BUILD_ACE_OTHER
 ## Makefile.Thread_Pool_Reactor_Test.am
 
 if BUILD_ACE_OTHER
-
 noinst_PROGRAMS += Thread_Pool_Reactor_Test
 
 Thread_Pool_Reactor_Test_CPPFLAGS = \
@@ -2908,7 +2663,6 @@ Thread_Pool_Reactor_Test_LDADD = \
 endif BUILD_ACE_OTHER
 
 ## Makefile.Thread_Pool_Test.am
-
 noinst_PROGRAMS += Thread_Pool_Test
 
 Thread_Pool_Test_CPPFLAGS = \
@@ -2924,7 +2678,6 @@ Thread_Pool_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Time_Service_Test.am
-
 noinst_PROGRAMS += Time_Service_Test
 
 Time_Service_Test_CPPFLAGS = \
@@ -2940,7 +2693,6 @@ Time_Service_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Time_Value_Test.am
-
 noinst_PROGRAMS += Time_Value_Test
 
 Time_Value_Test_CPPFLAGS = \
@@ -2956,7 +2708,6 @@ Time_Value_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Timeprobe_Test.am
-
 noinst_PROGRAMS += Timeprobe_Test
 
 Timeprobe_Test_CPPFLAGS = \
@@ -2972,7 +2723,6 @@ Timeprobe_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Timer_Cancellation_Test.am
-
 noinst_PROGRAMS += Timer_Cancellation_Test
 
 Timer_Cancellation_Test_CPPFLAGS = \
@@ -2988,7 +2738,6 @@ Timer_Cancellation_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Timer_Queue_Reference_Counting_Test.am
-
 noinst_PROGRAMS += Timer_Queue_Reference_Counting_Test
 
 Timer_Queue_Reference_Counting_Test_CPPFLAGS = \
@@ -3006,7 +2755,6 @@ Timer_Queue_Reference_Counting_Test_LDADD = \
 ## Makefile.Timer_Queue_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Timer_Queue_Test
 
 Timer_Queue_Test_CPPFLAGS = \
@@ -3054,7 +2802,6 @@ endif BUILD_TK
 endif BUILD_ACE_TKREACTOR
 
 ## Makefile.Token_Strategy_Test.am
-
 noinst_PROGRAMS += Token_Strategy_Test
 
 Token_Strategy_Test_CPPFLAGS = \
@@ -3072,7 +2819,6 @@ Token_Strategy_Test_LDADD = \
 ## Makefile.Tokens_Test.am
 
 if BUILD_ACE_TOKEN
-
 noinst_PROGRAMS += Tokens_Test
 
 Tokens_Test_CPPFLAGS = \
@@ -3092,7 +2838,6 @@ endif BUILD_ACE_TOKEN
 ## Makefile.UPIPE_SAP_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += UPIPE_SAP_Test
 
 UPIPE_SAP_Test_CPPFLAGS = \
@@ -3113,7 +2858,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if BUILD_ACE_UUID
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += UUIDTest
 
 UUIDTest_CPPFLAGS = \
@@ -3132,7 +2876,6 @@ endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACE_UUID
 
 ## Makefile.Unbounded_Set_Test.am
-
 noinst_PROGRAMS += Unbounded_Set_Test
 
 Unbounded_Set_Test_CPPFLAGS = \
@@ -3150,7 +2893,6 @@ Unbounded_Set_Test_LDADD = \
 ## Makefile.Upgradable_RW_Test.am
 
 if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += Upgradable_RW_Test
 
 Upgradable_RW_Test_CPPFLAGS = \
@@ -3169,7 +2911,6 @@ Upgradable_RW_Test_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Vector_Test.am
-
 noinst_PROGRAMS += Vector_Test
 
 Vector_Test_CPPFLAGS = \
@@ -3185,7 +2926,6 @@ Vector_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.WFMO_Reactor_Test.am
-
 noinst_PROGRAMS += WFMO_Reactor_Test
 
 WFMO_Reactor_Test_CPPFLAGS = \
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index 5b260a680a0..88c2bd5e669 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -44,7 +44,9 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC;
 
 #if !defined (linux) && !defined (ACE_OPENVMS) \
     && !(defined (ACE_WIN32) \
-         && (defined (ghs) || defined (__MINGW32__) )) \
+         && (defined (ghs) \
+             || defined (__MINGW32__) \
+             || (!defined(ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)))) \
     && !(defined (__OpenBSD__) && defined (ACE_HAS_PTHREADS))
 #define ACE_TEST_REMAP_ON_FAULT
 // Linux seems to have problem when calling mmap from the signal handler.
@@ -74,9 +76,12 @@ static const void *PARENT_BASE_ADDR = ACE_DEFAULT_BASE_ADDR;
 // Note that on HP-UX on PA-RISC hardware, a single range of a file
 // cannot be mapped into multiple virtual address ranges, even across
 // processes.  So, though the whole PI pointer thing is tested here,
-// it isn't actually using multiple address ranges.
+// it isn't actually using multiple address ranges.  Also, on Win9x,
+// you need to map shared views to the same address.
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX))
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX)) \
+     && !(defined (ACE_WIN32) \
+          && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)))
 # define CHILD_ADDR_DELTA (1024*1024)
 #else
 # define CHILD_ADDR_DELTA 0
@@ -302,16 +307,14 @@ child (void)
   return 0;
 }
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) \
+    && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0))
 // On Win9x/Me, a shared address needs to be on the shared arena,
 // betweeen the second and third megabyte in the virtual address space
 // of the process. Also, a mapped view of a file is shared on the same
 // virtual address on every 32 bit process.  On WinNT/2k, memory above
 // 2Gb is reserved for the system.  So, we need to check at runtime
 // (we want an ACE_HAS_WINNT4 == 0 ace to run on either).
-// To catch any odd case arising from Pharlap and/or WinCE, do the
-// run time check and run the NT4-or-better code unless we're on
-// CE or something other than NT4 (Pharlap reports itself as NT 3.51).
 static void
 get_base_addrs (void)
 {
@@ -320,20 +323,20 @@ get_base_addrs (void)
   if (::GetVersionEx(&vinfo) == 0)
     return;
 
-  if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT &&
-      vinfo.dwMajorVersion >= 4)
+  if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
     PARENT_BASE_ADDR = (char*) (64 * 1024*1024);
   else
     PARENT_BASE_ADDR = (char*) ((2048UL + 512UL)*(1024UL*1024UL));
 
   CHILD_BASE_ADDR = CHILD_ADDR_DELTA + (char*) PARENT_BASE_ADDR;
 }
-#endif /* defined (ACE_WIN32) */
+#endif /* defined (ACE_WIN32) && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) */
 
 int
 run_main (int argc, ACE_TCHAR *[])
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) \
+    && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0))
   get_base_addrs();
 #endif
 
diff --git a/ACE/tests/Manual_Event_Test.cpp b/ACE/tests/Manual_Event_Test.cpp
index 3c914698d56..1b28d846a71 100644
--- a/ACE/tests/Manual_Event_Test.cpp
+++ b/ACE/tests/Manual_Event_Test.cpp
@@ -47,6 +47,9 @@ static int test_result = 0;
 // state is 0).
 static ACE_Manual_Event evt ((unsigned int) 0);
 
+// Default number of iterations.
+static int n_iterations = 10;
+
 // Number of worker threads.
 static long n_workers = 10;
 
@@ -71,7 +74,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:n:"));
 
   int c;
 
@@ -81,6 +84,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
     case 'w':
       n_workers = ACE_OS::atoi (get_opt.opt_arg ());
       break;
+    case 'n':
+      n_iterations = ACE_OS::atoi (get_opt.opt_arg ());
+      break;
     default:
       print_usage_and_die ();
       break;
diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp
index 27ae29f0470..4198ca5b6fd 100644
--- a/ACE/tests/Message_Queue_Test.cpp
+++ b/ACE/tests/Message_Queue_Test.cpp
@@ -299,7 +299,7 @@ single_thread_performance_test (int queue_type = 0)
                       -1);
       message = "ACE_Message_Queue_Vx, single thread test";
     }
-#elif defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#elif defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
   else
     {
       ACE_NEW_RETURN (msgq,
@@ -495,7 +495,7 @@ performance_test (int queue_type = 0)
                       -1);
       message = "ACE_Message_Queue_Vx";
     }
-#elif defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#elif defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
   else
     {
       ACE_NEW_RETURN (queue_wrapper.q_,
@@ -659,7 +659,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   if (status == 0)
     status = single_thread_performance_test ();
 
-# if defined (VXWORKS) || defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+# if defined (VXWORKS) || (defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0))
   // Test ACE_Message_Queue_Vx. or ACE_Message_Queue_NT
   if (status == 0)
     status = single_thread_performance_test (1);
@@ -668,7 +668,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   if (status == 0)
     status = performance_test ();
 
-# if defined (VXWORKS) || defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+# if defined (VXWORKS) || (defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0))
   // Test ACE_Message_Queue_Vx or ACE_Message_Queue_NT
   if (status == 0)
     status = performance_test (1);
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index d270a19d66c..fa7b058e4e4 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -92,7 +92,7 @@ rename_test (void)
     }
   ACE_OS::fclose (f);
 
-#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX)
+#if defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 0
   // Can't rename if new_file exists already.
   ACE_OS::unlink (new_file);
 #endif
@@ -524,78 +524,6 @@ string_emulation_test (void)
   return 0;
 }
 
-// Test ACE_OS::snprintf
-int
-snprintf_test (void)
-{
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing snprintf\n")));
-
-  int error_count = 0;
-  const int BUFFER_SIZE = 4;
-  char buf[2*BUFFER_SIZE];
-  int retval;
-
-  ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE);
-  retval = ACE_OS::snprintf (buf, BUFFER_SIZE, "%d", 123);
-  if (retval != 3)
-    {
-      ACE_ERROR ((LM_ERROR,
-		  ACE_TEXT ("[1] ACE_OS::snprintf() returns %d, should be 3\n"),
-                  retval));
-      ++error_count;
-    }
-
-  ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE);
-  retval = ACE_OS::snprintf (buf, BUFFER_SIZE, "%d", 1234);
-
-  // HP-UX has broken vsnprintf
-#if !defined (HPUX)
-  if (retval != 4)
-    {
-      ACE_ERROR ((LM_ERROR,
-		  ACE_TEXT ("[2] ACE_OS::snprintf() returns %d, should be 4\n"),
-                  retval));
-      ++error_count;
-    }
-#endif /* !HPUX */
-
-  if (buf[3] != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-		  ACE_TEXT ("[3] ACE_OS::snprintf() doesn't terminate string correctly\n")));
-      ++error_count;
-    }
-  else if (ACE_OS::strcmp(buf, "123") != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-		  ACE_TEXT ("[4] ACE_OS::snprintf() incorrect output\n")));
-      ++error_count;
-    }
-
-  ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE);
-  retval = ACE_OS::snprintf (buf, BUFFER_SIZE, "%d", 12345);
-  if (retval != 5)
-    {
-      ACE_ERROR ((LM_ERROR,
-		  ACE_TEXT ("[5] ACE_OS::snprintf() returns %d, should be 5\n"),
-                  retval));
-      ++error_count;
-    }
-  else if (buf[3] != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-		  ACE_TEXT ("[6] ACE_OS::snprintf() doesn't terminate string correctly\n")));
-      ++error_count;
-    }
-  else if (ACE_OS::strcmp(buf, "123") != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-		  ACE_TEXT ("[6] ACE_OS::snprintf() incorrect output\n")));
-      ++error_count;
-    }
-
-  return error_count;
-}
 
 static int
 ctime_r_test (void)
@@ -911,11 +839,6 @@ run_main (int, ACE_TCHAR *[])
   if ((result = string_emulation_test ()) != 0)
     status = result;
 
-#if !defined (ACE_LACKS_VSNPRINTF) || defined (ACE_HAS_TRIO)
-  if ((result = snprintf_test ()) != 0)
-    status = result;
-#endif /* !ACE_LACKS_VSNPRINTF || ACE_HAS_TRIO */
-
   if ((result = ctime_r_test ()) != 0)
     status = result;
 
diff --git a/ACE/tests/Proactor_Scatter_Gather_Test.cpp b/ACE/tests/Proactor_Scatter_Gather_Test.cpp
index acc7e11c5b7..a3cbb335a34 100644
--- a/ACE/tests/Proactor_Scatter_Gather_Test.cpp
+++ b/ACE/tests/Proactor_Scatter_Gather_Test.cpp
@@ -28,7 +28,7 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if ((defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_HAS_WINCE))
   // This currently only works on Win32 platforms (NT SP2 and above).
   // Support for Unix platforms supporting POSIX aio calls should be added in future.
 
@@ -1482,4 +1482,4 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
-#endif  /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif  /* (ACE_HAS_WINNT4 && ACE_HAS_WINNT4 != 0) && !ACE_HAS_WINCE) */
diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp
index 28a5dbcff8a..9d739b2d5e3 100644
--- a/ACE/tests/Proactor_Test.cpp
+++ b/ACE/tests/Proactor_Test.cpp
@@ -20,7 +20,7 @@ ACE_RCSID (tests,
            Proactor_Test,
            "$Id$")
 
-#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS))
+#if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
   // This only works on Win32 platforms and on Unix platforms
   // supporting POSIX aio calls.
 
@@ -50,7 +50,7 @@ ACE_RCSID (tests,
 #include "ace/Atomic_Op.h"
 #include "ace/Synch_Traits.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 
 #  include "ace/WIN32_Proactor.h"
 
@@ -60,7 +60,7 @@ ACE_RCSID (tests,
 #  include "ace/POSIX_CB_Proactor.h"
 #  include "ace/SUN_Proactor.h"
 
-#endif /* ACE_WIN32 */
+#endif /* defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) */
 
 #include "Proactor_Test.h"
 
@@ -205,7 +205,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
 
   ACE_ASSERT (this->proactor_ == 0);
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 
   ACE_UNUSED_ARG (type_proactor);
   ACE_UNUSED_ARG (max_op);
@@ -269,7 +269,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
       break;
   }
 
-#endif /* ACE_WIN32 */
+#endif // (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 
   // always delete implementation  1 , not  !(proactor_impl == 0)
   ACE_NEW_RETURN (this->proactor_,
@@ -1281,7 +1281,7 @@ Client::initiate_write_stream (void)
 
   static const size_t complete_message_length = ACE_OS::strlen (complete_message);
 
-#if defined (ACE_WIN32)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 
   ACE_Message_Block *mb1 = 0,
                     *mb2 = 0,
@@ -1319,7 +1319,7 @@ Client::initiate_write_stream (void)
                         ACE_TEXT ("Client::ACE_Asynch_Stream::writev")),
                        -1);
     }
-#else /* ACE_WIN32 */
+#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
   ACE_Message_Block *mb = 0;
 
@@ -1346,7 +1346,7 @@ Client::initiate_write_stream (void)
                         ACE_TEXT ("write")),
                        -1);
     }
-#endif /* ACE_WIN32 */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
   this->io_count_++;
   this->total_w_++;
@@ -1362,7 +1362,7 @@ Client::initiate_read_stream (void)
   static const size_t complete_message_length =
     ACE_OS::strlen (complete_message);
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   ACE_Message_Block *mb1 = 0,
                     *mb2 = 0,
                     *mb3 = 0,
@@ -1411,7 +1411,7 @@ Client::initiate_read_stream (void)
                          ACE_TEXT ("Client::ACE_Asynch_Read_Stream::readv")),
                         -1);
     }
-#else /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
   // Try to read more chunks
   size_t blksize = ( complete_message_length > BUFSIZ ) ?
@@ -1444,7 +1444,7 @@ Client::initiate_read_stream (void)
                          ACE_TEXT ("read")),
                         -1);
     }
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
   this->io_count_++;
   this->total_r_++;
@@ -1495,7 +1495,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
                     ACE_TEXT ("error"),
                     result.error ()));
 
-#if defined (ACE_WIN32)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
         size_t bytes_transferred = result.bytes_transferred ();
         char index = 0;
         for (ACE_Message_Block* mb_i = &mb;
@@ -1526,7 +1526,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
                         index,
                         mb_i->rd_ptr ()));
           }
-#else /* ACE_WIN32 */
+#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
         // write 0 at string end for proper printout (if end of mb, it's 0 already)
         mb.rd_ptr()[0]  = '\0';
         // move rd_ptr backwards as required for printout
@@ -1535,7 +1535,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
                     ACE_TEXT ("%s = %s\n"),
                     ACE_TEXT ("message_block"),
                     mb.rd_ptr ()));
-#endif /* ACE_WIN32 */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("**** end of message ****************\n")));
@@ -1638,7 +1638,7 @@ Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
                     ACE_TEXT ("error"),
                     result.error ()));
 
-#if defined (ACE_WIN32)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
         char index = 0;
         for (ACE_Message_Block* mb_i = &mb;
              mb_i != 0;
@@ -1654,14 +1654,14 @@ Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
                         index,
                         mb_i->rd_ptr ()));
           }
-#else /* ACE_WIN32 */
+#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
         // write 0 at string end for proper printout
         mb.rd_ptr()[result.bytes_transferred ()]  = '\0'; // for proper printout
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %s\n"),
                     ACE_TEXT ("message_block"),
                     mb.rd_ptr ()));
-#endif /* ACE_WIN32 */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("**** end of message ****************\n")));
@@ -1934,4 +1934,4 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
-#endif  /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif  /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS */
diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp
index 003f6915612..7ac9443d0ae 100644
--- a/ACE/tests/Proactor_Test_IPV6.cpp
+++ b/ACE/tests/Proactor_Test_IPV6.cpp
@@ -20,7 +20,7 @@ ACE_RCSID (tests,
            Proactor_Test,
            "$Id$")
 
-#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS))
+#if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
   // This only works on Win32 platforms and on Unix platforms
   // supporting POSIX aio calls.
 
@@ -50,7 +50,7 @@ ACE_RCSID (tests,
 #include "ace/Atomic_Op.h"
 #include "ace/Synch_Traits.h"
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 
 #  include "ace/WIN32_Proactor.h"
 
@@ -60,7 +60,7 @@ ACE_RCSID (tests,
 #  include "ace/POSIX_CB_Proactor.h"
 #  include "ace/SUN_Proactor.h"
 
-#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */
+#endif /* defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) */
 
 #include "Proactor_Test.h"
 
@@ -1678,7 +1678,7 @@ Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
                     ACE_TEXT ("error"),
                     result.error ()));
 
-#if defined (ACE_WIN32)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
         char index = 0;
         for (ACE_Message_Block* mb_i = &mb;
              mb_i != 0;
@@ -1694,14 +1694,14 @@ Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
                         index,
                         mb_i->rd_ptr ()));
           }
-#else /* ACE_WIN32 */
+#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
         // write 0 at string end for proper printout
         mb.rd_ptr()[result.bytes_transferred ()]  = '\0'; // for proper printout
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %s\n"),
                     ACE_TEXT ("message_block"),
                     mb.rd_ptr ()));
-#endif /* ACE_WIN32 */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("**** end of message ****************\n")));
@@ -1981,4 +1981,4 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
-#endif  /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif  /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS */
diff --git a/ACE/tests/Proactor_Timer_Test.cpp b/ACE/tests/Proactor_Timer_Test.cpp
index 7d81bcb5ef1..b93bc7dc78f 100644
--- a/ACE/tests/Proactor_Timer_Test.cpp
+++ b/ACE/tests/Proactor_Timer_Test.cpp
@@ -27,7 +27,7 @@ ACE_RCSID (tests,
            Proactor_Timer_Test,
            "$Id$")
 
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
   // This only works on Win32 platforms and on Unix platforms
   // supporting POSIX aio calls.
 
@@ -38,7 +38,7 @@ ACE_RCSID (tests,
 #include "ace/Asynch_IO.h"
 
 static int    done = 0;
-static size_t counter = 0;
+static size_t count = 0;
 static int    odd = 0;
 
 class Time_Handler : public ACE_Handler
@@ -100,29 +100,29 @@ Time_Handler::Time_Handler (void)
 void
 Time_Handler::handle_time_out (const ACE_Time_Value &, const void *arg)
 {
-  size_t current_counter = *(reinterpret_cast<const size_t *> (arg));
-  if (current_counter != counter)
+  size_t current_count = *(reinterpret_cast<const size_t *> (arg));
+  if (current_count != count)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("Expected timer %d, not %d\n"),
-                counter,
-                current_counter));
+                count,
+                current_count));
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("[%@] Timer id %d with counter #%d|%d expired.\n"),
+              ACE_TEXT ("[%@] Timer id %d with count #%d|%d expired.\n"),
               this,
               this->timer_id (),
-              counter,
-              current_counter));
+              count,
+              current_count));
 
-  if (current_counter == (ACE_MAX_TIMERS - 1))
+  if (current_count == (ACE_MAX_TIMERS - 1))
     done = 1;
-  else if (counter == ACE_MAX_TIMERS - 1)
+  else if (count == ACE_MAX_TIMERS - 1)
     {
       done = 1;
       return;
     }
 
-  counter += (1 + odd);
+  count += (1 + odd);
   return;
 }
 
@@ -213,7 +213,7 @@ test_registering_one_handler (void)
   size_t which[ACE_MAX_TIMERS];
 
   done = 0;
-  counter = 0;
+  count = 0;
   long secs = 0;
   size_t i = 0;
   for ( ; i < ACE_MAX_TIMERS; i++, secs++)
@@ -241,7 +241,7 @@ test_canceling_odd_timers (void)
   size_t which[ACE_MAX_TIMERS];
 
   done = 0;
-  counter = 1;
+  count = 1;
   odd = 1;
   size_t i = 0;
   long secs = 0;
@@ -340,4 +340,4 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
-#endif  /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
+#endif  /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS */
diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp
index 1bbb2d43c74..c228802988b 100644
--- a/ACE/tests/QtReactor_Test.cpp
+++ b/ACE/tests/QtReactor_Test.cpp
@@ -51,7 +51,7 @@ ACE_RCSID (tests,
 
 #include "ace/OS_NS_time.h"
 #include "ace/Time_Value.h"
-#include "ace/QtReactor/QtReactor.h"
+#include "ace/QtReactor.h"
 #include "ace/Event_Handler.h"
 #include "ace/Acceptor.h"
 #include "ace/Connector.h"
diff --git a/ACE/tests/RB_Tree_Test.cpp b/ACE/tests/RB_Tree_Test.cpp
index 1b3658d72b1..c276a96cafd 100644
--- a/ACE/tests/RB_Tree_Test.cpp
+++ b/ACE/tests/RB_Tree_Test.cpp
@@ -97,413 +97,279 @@ run_main (int, ACE_TCHAR *[])
   str_int_test.run_test ();
   str_str_test.run_test ();
 
-// ======= Stress Test contributed by Klaus H. Wolf <hw@cyland.com> =========
+// ======= Stress Test contributed by Klaus H. Wolf <hw@cyland.com> ==================
 
   ACE_RB_Tree<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex> tree;
 
   tree.bind (ACE_CString ("51"),  1);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("13"),  2);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("36"),  3);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("15"),  4);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("22"),  5);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("25"),  6);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("42"),  7);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("48"),  8);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("03"),  9);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("56"), 10);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("28"), 11);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("55"), 12);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("21"), 13);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("62"), 14);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("18"), 15);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("20"), 16);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("26"), 17);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("29"), 18);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("50"), 19);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("05"), 20);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("59"), 21);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("65"), 22);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("66"), 23);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("45"), 24);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("34"), 25);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("27"), 26);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("40"), 27);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("30"), 28);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("64"), 29);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("11"), 30);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("16"), 31);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("47"), 32);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("10"), 33);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("37"), 34);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("09"), 35);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("54"), 36);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("23"), 37);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("44"), 38);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("19"), 39);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("00"), 40);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("04"), 41);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("63"), 42);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("08"), 43);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("39"), 44);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("31"), 45);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("02"), 46);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("33"), 47);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("60"), 48);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("61"), 49);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("57"), 50);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("43"), 51);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("46"), 52);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("38"), 53);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("01"), 54);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("12"), 55);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("24"), 56);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("52"), 57);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("07"), 58);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("14"), 59);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("06"), 60);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("58"), 61);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("49"), 62);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("17"), 63);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("53"), 64);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("32"), 65);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("35"), 66);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.bind (ACE_CString ("41"), 67);
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
 
   tree.unbind (ACE_CString ("51"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("13"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("36"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("15"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("22"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("25"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("42"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("48"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("03"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("56"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("28"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("55"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("21"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("62"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("18"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("20"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("26"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("29"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("50"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("05"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("59"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("65"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("66"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("45"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("34"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("27"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("40"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("30"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("64"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("11"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("16"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("47"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("10"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("37"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("09"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("54"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("23"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("44"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("19"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("00"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("04"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("63"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("08"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("39"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("31"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("02"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("33"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("60"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("61"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("57"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("43"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("46"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("38"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("01"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("12"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("24"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("52"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("07"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("14"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("06"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("58"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("49"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("17"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("53"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("32"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("35"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
   tree.unbind (ACE_CString ("41"));
-  if (0 != tree.test_invariant ())
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n")));
+  ACE_ASSERT (tree.test_invariant () == 0);
 
 // ======== End Stress Test ===================
 
@@ -566,32 +432,20 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (v
     {
       INT_ID item;
       int k = order_index_ [i];
-      if (!(k >= 0 && k < entry_count_))
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Assert failure at line %l\n")));
+      ACE_ASSERT (k >= 0 && k < entry_count_);
 
       // Test the new stable ACE_Hash_Map_Manager_Ex compliant interface.
-      if (0 != stable_tree_.bind (key_array_ [k], item_array_ [k]))
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Stable bind %p\n"),
-                    ACE_TEXT ("failure")));
-
-      if (0 != stable_tree_.find (key_array_ [k], item) ||
-          item != item_array_ [k])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Stable find %p\n"),
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (stable_tree_.bind (key_array_ [k],
+                                     item_array_ [k]) == 0);
+      ACE_ASSERT (stable_tree_.find (key_array_ [k], item) == 0
+                  && item == item_array_ [k]);
 
       // Test the deprecated interface.
-      if (0 == deprecated_tree_.insert (key_array_ [k], item_array_ [k]))
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Deprecated insert %p\n"),
-                    ACE_TEXT ("failure")));
-
-      if (0 == deprecated_tree_.find (key_array_ [k]) ||
-          *deprecated_tree_.find (key_array_ [k]) != item_array_ [k])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Deprecated find %p\n"),
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (deprecated_tree_.insert (key_array_ [k],
+                                           item_array_ [k]) != 0);
+      ACE_ASSERT (deprecated_tree_.find (key_array_ [k]) != 0
+                  && *deprecated_tree_.find (key_array_ [k]) ==
+                     item_array_ [k]);
    }
 }
 
@@ -615,32 +469,16 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_it
       INT_ID item;
 
       item = (*stable_fwd_iter_).item ();
-      if (item != item_array_ [i])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Stable fwd iter, pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [i]);
 
       item = (*stable_rev_iter_).item ();
-      if (item != item_array_ [entry_count_ - i - 1])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Stable rev iter, pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [entry_count_ - i - 1]);
 
       item = (*deprecated_fwd_iter_).item ();
-      if (item != item_array_ [i])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Deprecated fwd iter, pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [i]);
 
       item = (*deprecated_rev_iter_).item ();
-      if (item != item_array_ [entry_count_ - i - 1])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Deprecated rev iter, pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [entry_count_ - i - 1]);
 
       // Advance each iterator.
       ++stable_fwd_iter_;
@@ -657,18 +495,11 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_it
 
 
   // Make sure each item in each tree has been visited
-  if (stable_fwd_iter_.done () != 1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Stable fwd iter not done but should be\n")));
-  if (stable_rev_iter_.done () != 1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Stable fwd iter not done but should be\n")));
-  if (deprecated_fwd_iter_.done () != 1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Stable fwd iter not done but should be\n")));
-  if (deprecated_rev_iter_.done () != 1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Stable fwd iter not done but should be\n")));
+  ACE_ASSERT (stable_fwd_iter_.done () == 1);
+  ACE_ASSERT (stable_rev_iter_.done () == 1);
+  ACE_ASSERT (deprecated_fwd_iter_.done () == 1);
+  ACE_ASSERT (deprecated_rev_iter_.done () == 1);
+
 }
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
@@ -683,11 +514,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration
       INT_ID item;
 
       item = (*part_rev_iter_).item ();
-      if (item != item_array_ [i])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Partial rev iter, pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [i]);
       part_rev_iter_++;
     }
 
@@ -697,11 +524,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration
       INT_ID item;
 
       item = (*part_fwd_iter_).item ();
-      if (item != item_array_ [k])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Partial fwd iter, pass %d %p\n"),
-                    k,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [k]);
       part_fwd_iter_++;
     }
 }
@@ -717,18 +540,10 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (vo
     {
       // Test the new stable ACE_Hash_Map_Manager_Ex compliant
       // interface.
-      if (stable_tree_.unbind (key_array_ [i]) != 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Stable tree, failure pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("unbind")));
+      ACE_ASSERT (stable_tree_.unbind (key_array_ [i]) == 0);
 
       // Test the deprecated interface.
-      if (deprecated_tree_.remove (key_array_ [i]) != 1)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Deprecated tree, failure pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("remove")));
+      ACE_ASSERT (deprecated_tree_.remove (key_array_ [i]) == 1);
     }
 }
 
@@ -753,32 +568,17 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_ite
       INT_ID item;
 
       item = (*stable_fwd_iter_).item ();
-      if (item != item_array_ [i])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Stable fwd iter, pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [i]);
+
 
       item = (*stable_rev_iter_).item ();
-      if (item != item_array_ [entry_count_ - i])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Stable rev iter, pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [entry_count_ - i]);
 
       item = (*deprecated_fwd_iter_).item ();
-      if (item != item_array_ [i])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Deprecated fwd iter, pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [i]);
 
       item = (*deprecated_rev_iter_).item ();
-      if (item != item_array_ [entry_count_ - i])
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Deprecated rev iter, pass %d %p\n"),
-                    i,
-                    ACE_TEXT ("failure")));
+      ACE_ASSERT (item == item_array_ [entry_count_ - i]);
 
       // Advance each iterator via postfix increment.
       stable_fwd_iter_++;
@@ -788,18 +588,10 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_ite
     }
 
   // Make sure each item in each tree has been visited a second time.
-  if (stable_fwd_iter_.done () != 1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Stable fwd iter not done but should be\n")));
-  if (stable_rev_iter_.done () != 1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Stable rev iter not done but should be\n")));
-  if (deprecated_fwd_iter_.done () != 1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Deprecated fwd iter not done but should be\n")));
-  if (deprecated_rev_iter_.done () != 1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Deprecated rev iter not done but should be\n")));
+  ACE_ASSERT (stable_fwd_iter_.done () == 1);
+  ACE_ASSERT (stable_rev_iter_.done () == 1);
+  ACE_ASSERT (deprecated_fwd_iter_.done () == 1);
+  ACE_ASSERT (deprecated_rev_iter_.done () == 1);
 }
 
 
diff --git a/ACE/tests/SPIPE_Test.cpp b/ACE/tests/SPIPE_Test.cpp
index 31e0ae86653..22a4427af44 100644
--- a/ACE/tests/SPIPE_Test.cpp
+++ b/ACE/tests/SPIPE_Test.cpp
@@ -32,7 +32,9 @@
 
 ACE_RCSID(tests, SPIPE_Test, "SPIPE_Test.cpp,v 4.36 2002/03/06 21:48:03 nanbor Exp")
 
-#if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES)
+#if defined (ACE_HAS_STREAM_PIPES) \
+    || (defined (ACE_WIN32) && defined(ACE_HAS_WINNT4) \
+        && (ACE_HAS_WINNT4 !=0))
 # define TEST_HAS_STREAM_PIPES
 #endif
 
@@ -62,7 +64,7 @@ client (void *)
   if (cli_stream.close () == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("close")));
 
-#if defined (ACE_HAS_WIN32_NAMED_PIPES)
+#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
 
   // Wait for server to get ready...
   ACE_OS::sleep (1);
@@ -132,7 +134,7 @@ server (void *)
   new_stream.close ();
   acceptor.close ();
 
-#if defined (ACE_HAS_WIN32_NAMED_PIPES)
+#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   // Initialize an NT bytestream named pipe listener.
   if (acceptor.open (ACE_SPIPE_Addr (rendezvous),
                      1,
@@ -175,7 +177,7 @@ server (void *)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End of connection. Closing handle\n")));
   new_stream.close ();
   acceptor.close ();
-#endif /* defined (ACE_HAS_WIN32NAMED_PIPES) */
+#endif /* (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
   return 0;
 }
diff --git a/ACE/tests/SSL/Makefile.am b/ACE/tests/SSL/Makefile.am
index ee10293e8ca..c3ae6261b1b 100644
--- a/ACE/tests/SSL/Makefile.am
+++ b/ACE/tests/SSL/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -45,6 +45,7 @@ endif BUILD_SSL
 ## Makefile.Thread_Pool_Reactor_SSL_Test.am
 
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Thread_Pool_Reactor_SSL_Test
 
@@ -68,6 +69,7 @@ Thread_Pool_Reactor_SSL_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Clean up template repositories, etc.
diff --git a/ACE/tests/SV_Shared_Memory_Test.cpp b/ACE/tests/SV_Shared_Memory_Test.cpp
index 305e3785c96..f8351395346 100644
--- a/ACE/tests/SV_Shared_Memory_Test.cpp
+++ b/ACE/tests/SV_Shared_Memory_Test.cpp
@@ -140,15 +140,6 @@ run_main (int, ACE_TCHAR *[])
 
 #if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK) && \
     !defined(ACE_LACKS_SYSV_SHMEM)
-
-  // Check whether allocator was initialized.
-  if (myallocator ().bad ()) 
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-			 ACE_TEXT ("Unable to initialize allocator\n")),
-			 -1);
-    }
-
   char *shm = reinterpret_cast<char *> (myallocator ().malloc (SHMSZ));
 
   // Create the mutex and synch before spawning the child process, to
diff --git a/ACE/tests/Svc_Handler_Test.cpp b/ACE/tests/Svc_Handler_Test.cpp
index 09393447ba2..c36d8483e08 100644
--- a/ACE/tests/Svc_Handler_Test.cpp
+++ b/ACE/tests/Svc_Handler_Test.cpp
@@ -101,7 +101,9 @@ run_main (int argc, ACE_TCHAR *argv[])
                          file.get_path_name ()),
                         1);
 
-#if !defined (VXWORKS)
+#if (!defined (ACE_WIN32) \
+     || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1)) && \
+    !defined (VXWORKS)
 # define TEST_CAN_UNLINK_IN_ADVANCE
 #endif
 
diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp
deleted file mode 100644
index c31e7ec2223..00000000000
--- a/ACE/tests/Thread_Creation_Threshold_Test.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Thread_Creation_Threshold_Test.cpp
-//
-// = DESCRIPTION
-//     This test program stresses how many threads can be
-//     consecutively (not simultaneously) created on a platform.
-//     Rather than testing exhaustively, it establishes a
-//     semi-arbitrary upper limit (MAX_THREAD)of threads.  The limit
-//     is only partly arbitrary because it was chosen as a value that
-//     exceeded an observed upper limit on the values that Solaris 9
-//     will accept as arguments to thr_concurrency(), used by
-//     ACE_OS::thr_create(THR_NEW_LWP).
-//
-// = AUTHOR
-//    Chris Cleeland <cleeland@ociweb.com>
-//
-// ============================================================================
-
-#include "test_config.h"
-#include "ace/Task.h"
-
-ACE_RCSID(tests, Thread_Pool_Test, "$Id$")
-
-#if defined (ACE_HAS_THREADS)
-#include "ace/Lock_Adapter_T.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_unistd.h"
-
-// Number of iterations to run the test.
-const int THREADS_PER_POOL = 1000;
-const unsigned long MAX_THREAD = 100000;
-
-namespace
-{
-  // Change this to 'true' if you want lots of debugging messages in the log
-  const bool PRINT_DEBUG_MSGS = true;
-}
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>
-{
-  // = TITLE
-  //   Defines a thread pool abstraction based on the <ACE_Task>.
-public:
-  Thread_Pool (int n_threads);
-  // Create the thread pool containing <n_threads>.
-
-  ~Thread_Pool (void);
-  // Destructor...
-
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-  void start();
-  // Start the threads in the pool.
-
-  unsigned long total_threads()
-    {
-      return this->total_activated_threads_.value();
-    }
-
-  int n_threads_;
-  // Number of threads to spawn.
-
-  bool operator! ();
-  // Returns true iff failed_ == false.
-
-private:
-  virtual int open (void * = 0);
-  // Spawn the threads in the pool.
-
-  virtual int close (u_long);
-  // Close hook.
-
-  ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> total_activated_threads_;
-  // Total number of threads activated through this thread pool ever.
-
-  bool doprint_;
-  // Flag set only in worker threads to indicate whether they should print
-  // debug messages.
-
-  bool failed_;
-  // Flag indicating that start() failed.
-};
-
-bool
-Thread_Pool::operator!()
-{
-  return ! this->failed_;
-}
-
-Thread_Pool::~Thread_Pool (void)
-{
-}
-
-int
-Thread_Pool::close (u_long)
-{
-  if (this->doprint_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) worker thread closing down\n")));
-  return 0;
-}
-
-Thread_Pool::Thread_Pool (int n_threads)
-  : n_threads_ (n_threads)
-  , total_activated_threads_ (0)
-  , doprint_ (false)
-  , failed_ (false)
-{
-}
-
-void
-Thread_Pool::start ()
-{
-  this->failed_ = false;
-  if (this->open () == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-		  ACE_TEXT ("(%P|%t) thread activation ")
-		  ACE_TEXT ("failed after %u threads\n"),
-		  this->total_threads()));
-      this->failed_ = true;
-    }
-}
-
-int
-Thread_Pool::svc (void)
-{
-  unsigned long t = ++this->total_activated_threads_;
-  if (PRINT_DEBUG_MSGS) // change this to 'true' for debugging
-    this->doprint_ = (t > 65530);
-
-  if (this->doprint_)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT("  (%P|%t) thread started.\n")));
-
-  // Note that the <ACE_Task::svc_run> method automatically removes us
-  // from the <ACE_Thread_Manager> when the thread exits.
-  return 0;
-}
-
-namespace {
-  void no_op() { }
-}
-
-int
-Thread_Pool::open (void *)
-{
-  if (PRINT_DEBUG_MSGS)
-    ACE_DEBUG ((LM_DEBUG,
-		ACE_TEXT ("(%P|%t) pool start %d threads..."),
-		this->n_threads_));
-
-  if (this->total_activated_threads_ >= (65534 - this->n_threads_))
-    no_op ();
-
-  // Create a pool of worker threads.
-  if (this->activate (THR_NEW_LWP,
-                      this->n_threads_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("activate failed")),
-                      -1);
-
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
-
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("Thread_Creation_Threshold_Test"));
-
-#if defined (ACE_HAS_THREADS)
-  ACE_DEBUG ((LM_DEBUG,
-	      ACE_TEXT ("(%P|%t) will try to start and kill up")
-	      ACE_TEXT (" to %u threads sequentially\n"),
-	      MAX_THREAD));
-  int initial_pool_size = 50;
-
-  // Create the worker tasks.
-  Thread_Pool thread_pool (initial_pool_size);
-
-  while (!thread_pool && thread_pool.total_threads() < MAX_THREAD)
-    {
-      // Activate the task's thread pool, produce the messages that are,
-      // produce the messages that are consumed by the threads in the
-      // thread pool, and demonstrate how to shutdown by enqueueing
-      // "empty" messages into the queue.
-      thread_pool.start ();
-
-      // Wait for all the threads to reach their exit point, at which
-      // point the barrier in the destructor of the <ACE_Task> portion of
-      // <Thread_Pool> will return.
-      if (thread_pool.wait () == -1)
-        return 1;
-
-      if (PRINT_DEBUG_MSGS)
-	ACE_DEBUG ((LM_DEBUG,
-		    ACE_TEXT ("%u total threads\n"),
-		    thread_pool.total_threads()));
-
-      int& n_threads = thread_pool.n_threads_;
-      const unsigned long THREAD_THRESHOLD = 63336;
-      if (thread_pool.total_threads() >= (THREAD_THRESHOLD - n_threads))
-        n_threads = 1;
-    }
-  
-  ACE_DEBUG ((LM_DEBUG,
-	      ACE_TEXT ("%u total threads successfully started and died;")
-	      ACE_TEXT (" expected %u.\n"),
-	      thread_pool.total_threads (),
-	      MAX_THREAD));
-#else
-  ACE_ERROR ((LM_INFO,
-              ACE_TEXT ("threads not supported on this platform\n")));
-#endif /* ACE_HAS_THREADS */
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/ACE/tests/Time_Value_Test.cpp b/ACE/tests/Time_Value_Test.cpp
index 764b23f406d..13fd8fe3bda 100644
--- a/ACE/tests/Time_Value_Test.cpp
+++ b/ACE/tests/Time_Value_Test.cpp
@@ -227,10 +227,6 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (tv7 == tv8); // That's right!  See above . . .
   ACE_ASSERT (tv9 == tv6);
 
-  ACE_Time_Value tv10 (1);
-
-  ACE_ASSERT (tv10.sec() == 1);
-
   // test multiplication by double
   // test simple multiplication
   tv1.set (1, 1);
diff --git a/ACE/tests/TkReactor_Test.cpp b/ACE/tests/TkReactor_Test.cpp
index 7987d44dcce..cee329ef5b2 100644
--- a/ACE/tests/TkReactor_Test.cpp
+++ b/ACE/tests/TkReactor_Test.cpp
@@ -34,7 +34,7 @@ ACE_RCSID (tests,
 #include "ace/SOCK_Connector.h"
 #include "ace/Service_Config.h"
 #include "ace/Thread_Manager.h"
-#include "ace/TkReactor/TkReactor.h"
+#include "ace/TkReactor.h"
 #include "ace/OS_NS_unistd.h"
 
 #include <tcl.h>
diff --git a/ACE/tests/UPIPE_SAP_Test.cpp b/ACE/tests/UPIPE_SAP_Test.cpp
index 296d746fbb6..24d08fdc5f7 100644
--- a/ACE/tests/UPIPE_SAP_Test.cpp
+++ b/ACE/tests/UPIPE_SAP_Test.cpp
@@ -27,8 +27,9 @@
 
 ACE_RCSID(tests, UPIPE_SAP_Test, "$Id$")
 
-#if defined (ACE_HAS_THREADS) && \
-    (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES))
+#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \
+        (defined (ACE_WIN32) && \
+         defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)))
 
 // Global pattern
 static ACE_UPIPE_Addr addr (ACE_TEXT ("pattern"));
@@ -137,15 +138,16 @@ acceptor (void *args)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) exiting thread\n")));
   return 0;
 }
-#endif /* ACE_HAS_THREADS && (ACE_HAS_STREAM_PIPES || ACE_HAS_WIN32_NAMED_PIPES) */
+#endif /* ACE_HAS_THREADS && defined ACE_HAS_STREAM_PIPES || (ACE_WIN32&&NT4)*/
 
 int
 run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("UPIPE_SAP_Test"));
 
-#if defined (ACE_HAS_THREADS) && \
-    (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES))
+#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \
+        (defined (ACE_WIN32) && \
+         defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)))
 
   ACE_UPIPE_Acceptor acc (addr);
 
@@ -176,7 +178,7 @@ run_main (int, ACE_TCHAR *[])
 #else
   ACE_ERROR ((LM_INFO, ACE_TEXT ("UPIPE is not supported on this platform\n")));
 #endif /* !defined (ACE_HAS_THREADS) */
-#endif /* ACE_HAS_THREADS && (ACE_HAS_STREAM_PIPES || ACE_HAS_WIN32_NAMED_PIPES) */
+#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) && NT4) */
 
   ACE_END_TEST;
   return 0;
diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp
index 8d30c021f08..f18484b6b82 100644
--- a/ACE/tests/Unload_libACE.cpp
+++ b/ACE/tests/Unload_libACE.cpp
@@ -150,16 +150,10 @@ main (int, char **)
           char buf[BUFSIZ];
 
           strcpy (buf, ace_root);
-          strcat (buf, "/lib/lib");
-#if defined (ACE_LIB_NAME)
-          strcat (buf, ACE_LIB_NAME);
-#else
-          strcat (buf, "ACE");
-#endif /* ACE_LIB_NAME */
 #if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1))
-          strcat (buf, ".sl");
+          strcat (buf, "/lib/libACE.sl");
 #else
-          strcat (buf, ".so");
+          strcat (buf, "/lib/libACE.so");
 #endif /* (__hpux) */
 
           handle = dlopen (buf, RTLD_LAZY);
diff --git a/ACE/tests/XtAthenaReactor_Test.cpp b/ACE/tests/XtAthenaReactor_Test.cpp
index cf0530ee552..d5abb90c4e0 100644
--- a/ACE/tests/XtAthenaReactor_Test.cpp
+++ b/ACE/tests/XtAthenaReactor_Test.cpp
@@ -32,7 +32,7 @@ ACE_RCSID (tests,
            XtAthenaReactor_Test,
            "$Id$")
 
-#include "ace/XtReactor/XtReactor.h"
+#include "ace/XtReactor.h"
 #include "ace/Event_Handler.h"
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
diff --git a/ACE/tests/XtMotifReactor_Test.cpp b/ACE/tests/XtMotifReactor_Test.cpp
index 7aabc230fbb..643b1e9dfbd 100644
--- a/ACE/tests/XtMotifReactor_Test.cpp
+++ b/ACE/tests/XtMotifReactor_Test.cpp
@@ -31,7 +31,7 @@
 ACE_RCSID (tests,
            XtMotifReactor_Test,
            "$Id$")
-#include "ace/XtReactor/XtReactor.h"
+#include "ace/XtReactor.h"
 #include "ace/Event_Handler.h"
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
diff --git a/ACE/tests/log/.cvsignore b/ACE/tests/log/.cvsignore
new file mode 100755
index 00000000000..397b4a7624e
--- /dev/null
+++ b/ACE/tests/log/.cvsignore
@@ -0,0 +1 @@
+*.log
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index 4568e8ba530..3efda344bde 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -19,7 +19,6 @@ ACE_Init_Test: MSVC
 ACE_Test
 Aio_Platform_Test
 Arg_Shifter_Test
-ARGV_Test
 Array_Map_Test
 Atomic_Op_Test
 Auto_Event_Test
@@ -34,7 +33,6 @@ Bug_1890_Regression_Test
 Bug_2368_Regression_Test
 Bug_2497_Regression_Test
 Bug_2540_Regression_Test
-Bug_2659_Regression_Test: !ST
 Bug_2653_Regression_Test: !ST
 CDR_Array_Test: !ACE_FOR_TAO
 CDR_File_Test: !ACE_FOR_TAO
@@ -151,7 +149,6 @@ Thread_Mutex_Test: !DISABLE_ToFix_LynxOS_PPC
 Thread_Pool_Reactor_Resume_Test: !DISABLE_ToFix_LynxOS_PPC !ST
 Thread_Pool_Reactor_Test: !DISABLE_ToFix_LynxOS_PPC
 Thread_Pool_Test: !DISABLE_ToFix_LynxOS_PPC
-Thread_Creation_Threshold_Test
 Time_Service_Test: !STATIC !DISABLED !missing_netsvcs TOKEN !Unicos
 Time_Value_Test
 Timeprobe_Test
diff --git a/ACE/tests/run_test.pl b/ACE/tests/run_test.pl
index 6b3a49fe7b3..b7fc961454e 100755
--- a/ACE/tests/run_test.pl
+++ b/ACE/tests/run_test.pl
@@ -107,11 +107,6 @@ sub run_program ($)
 {
     my $program = shift;
 
-    ## Print it out before we check for the executable
-    ## if the executable doesn't exist, the error will show
-    ## up as part of the previous test.
-    print "auto_run_tests: tests/$program\n";
-
     unlink <log/$program*.log>;
     unlink "core";
 
@@ -133,6 +128,7 @@ sub run_program ($)
        }
     }
 
+    print "auto_run_tests: tests/$program\n";
     my $start_time = time();
     $status = $P->SpawnWaitKill (400);
     my $time = time() - $start_time;
diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h
index 135b001628c..21ff4cdf67c 100644
--- a/ACE/tests/test_config.h
+++ b/ACE/tests/test_config.h
@@ -72,20 +72,16 @@ const size_t ACE_MAX_ITERATIONS = 10;
 const size_t ACE_MAX_PROCESSES = 10;
 const size_t ACE_MAX_THREADS = 4;
 
-#ifndef ACE_START_TEST
 #define ACE_START_TEST(NAME) \
   const ACE_TCHAR *program = NAME; \
   ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM | ACE_Log_Msg::VERBOSE_LITE); \
   if (ace_file_stream::instance()->set_output (program) != 0) \
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %D\n"), program))
-#endif /* ACE_START_TEST */
 
-#ifndef ACE_END_TEST
 #define ACE_END_TEST \
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %D\n"), program)); \
   ace_file_stream::instance()->close ()
-#endif /* ACE_END_TEST */
 
 #define ACE_CLOSE_TEST_LOG ace_file_stream::instance()->close ()
 
@@ -101,9 +97,9 @@ const size_t ACE_MAX_THREADS = 4;
   ACE_LOG_MSG->set_flags(ACE_Log_Msg::SILENT); \
   ace_file_stream::instance()->close ();
 
-#if defined (ACE_VXWORKS)
+#if defined (VXWORKS)
   // This is the only way I could figure out to avoid an error
-  // about attempting to unlink a non-existent file.
+  // about attempting to unlink a non-existant file.
 
 #include "ace/OS_NS_fcntl.h"
 
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 64b74caa8aa..5efee793fd4 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -999,13 +999,6 @@ project(Thread Pool Test) : acetest {
   }
 }
 
-project(Thread Creation Threshold Test) : acetest {
-  exename = Thread_Creation_Threshold_Test
-  Source_Files {
-    Thread_Creation_Threshold_Test.cpp
-  }
-}
-
 project(Timeprobe Test) : acetest {
   exename = Timeprobe_Test
   Source_Files {
@@ -1374,7 +1367,7 @@ project(Based Pointer Test) : acetest {
   }
 }
 
-project(Library Unload): unload_libace {
+project(Library Unload) {
   avoids += wince
   exename = UnloadLibACE
   staticflags += ACE_AS_STATIC_LIBS
@@ -1384,10 +1377,3 @@ project(Library Unload): unload_libace {
   Resource_Files {
   }
 }
-
-project(Bug_2659_Regression_Test) : acetest {
-  exename = Bug_2659_Regression_Test
-  Source_Files {
-    Bug_2659_Regression_Test.cpp
-  }
-}
diff --git a/ACE/tests/unload_libace.mpb b/ACE/tests/unload_libace.mpb
deleted file mode 100644
index 7fe13bae305..00000000000
--- a/ACE/tests/unload_libace.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(ace_for_tao) {
-  macros += ACE_LIB_NAME=\\"ACE_FOR_TAO\\"
-}
\ No newline at end of file
diff --git a/ACE/websvcs/Makefile.am b/ACE/websvcs/Makefile.am
index 038bf2ff84f..be02feea0e1 100644
--- a/ACE/websvcs/Makefile.am
+++ b/ACE/websvcs/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         lib \
diff --git a/ACE/websvcs/lib/Makefile.am b/ACE/websvcs/lib/Makefile.am
index 689c2933594..0536fecbb66 100644
--- a/ACE/websvcs/lib/Makefile.am
+++ b/ACE/websvcs/lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/websvcs/tests/Makefile.am b/ACE/websvcs/tests/Makefile.am
index 7e366240ae7..868befa72a0 100644
--- a/ACE/websvcs/tests/Makefile.am
+++ b/ACE/websvcs/tests/Makefile.am
@@ -6,13 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Websvcs_Test.am
-
 noinst_PROGRAMS = Test_Url_Addr
 
 Test_Url_Addr_CPPFLAGS = \
diff --git a/CIAO/CIAO-INSTALL.html b/CIAO/CIAO-INSTALL.html
index 680b36d0f9c..b8298e6a907 100644
--- a/CIAO/CIAO-INSTALL.html
+++ b/CIAO/CIAO-INSTALL.html
@@ -86,7 +86,10 @@
     <ul>
       <li>
         Open up <code>$ACE_ROOT/bin/MakeProjectCreator/config/default.features</code>
-      and set <code>cidl=1</code> and <code>boost=1</code>, each on its own line.
+      and set cidl=1.
+      <li>
+        Open up <code>$ACE_ROOT/bin/MakeProjectCreator/config/global.features</code>
+      and set boost=1.
       <li>
         Make sure you set cidl=1, boost=1, and exceptions=1 in <code>$ACE_ROOT/include/makeinclude/platfrom_macros.GNU</code>.
       <li>
@@ -108,7 +111,10 @@
       <li>
         If you have not created it already, create the file <code>%ACE_ROOT%/bin/MakeProjectCreator/config/default.features</code>
         and add <code>cidl=1</code> and <code>boost=1</code> to it, each on its own 
-        line.
+        line. An easy way to do this is to copy the file <code>global.features</code> (in the 
+        same directory) as <code>default.features</code>
+        and modify the appropriate lines in the new file, leaving everything else the 
+        same.
       <li>
         Install the <a href="http://www.boost.org">Boost</a>
       libraries on your machine. For Windows, you can download either the 
diff --git a/CIAO/CIAO_TAO_DAnCE.mwc b/CIAO/CIAO_TAO_DAnCE.mwc
index baef8d92409..062f27d1462 100644
--- a/CIAO/CIAO_TAO_DAnCE.mwc
+++ b/CIAO/CIAO_TAO_DAnCE.mwc
@@ -4,7 +4,6 @@
 workspace {
   $(ACE_ROOT)/ace
   $(ACE_ROOT)/apps/gperf/src
-  $(ACE_ROOT)/contrib/minizip
   $(ACE_ROOT)/ACEXML
   $(TAO_ROOT)/tao
   $(TAO_ROOT)/TAO_IDL
diff --git a/CIAO/CIDLC/ExecutorMappingGenerator.cpp b/CIAO/CIDLC/ExecutorMappingGenerator.cpp
index 369fbbaac02..c30f11ce59f 100644
--- a/CIAO/CIDLC/ExecutorMappingGenerator.cpp
+++ b/CIAO/CIDLC/ExecutorMappingGenerator.cpp
@@ -1940,7 +1940,7 @@ generate (CommandLine const& cl,
 
     if (swapping)
     {
-      os << "#include <CIAO_UpgradeableContext.idl>" << endl;
+      os << "#include <UpgradeableContext.idl>" << endl;
     }
 
     Traversal::TranslationUnit unit;
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 2589ec2c963..89db2249a85 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,1095 +1,2559 @@
-Sun Jan  7 18:44:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Nov  6 17:48:56 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * DAnCE/NodeApplicationManager/URL_Parser.cpp:
-          No need to set members to 0 in destructor
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.cpp:
 
-        * DAnCE/RepositoryManager/URL_Parser.cpp:
-          Fixed conversion warning and memory leak
-
-Sun Jan  7 12:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_ClientContainerInterceptor.idl:
-        * ciao/CCM_ClientContainerInterceptorRegistration.idl:
-        * ciao/CCM_ContainerClientRequestInfo.idl:
-        * ciao/CCM_ContainerInterceptor.idl:
-        * ciao/CCM_ContainerRequestInfo.idl:
-        * ciao/CCM_ContainerServantRequestInfo.idl:
-        * ciao/CCM_ContainerServerRequestInfo.idl:
-        * ciao/CCM_ContainerStubRequestInfo.idl:
-        * ciao/CCM_ExtensionComponent.idl:
-        * ciao/CCM_ExtensionContext.idl:
-        * ciao/CCM_InvalidRegistration.idl:
-        * ciao/CCM_QoS.idl:
-        * ciao/CCM_ServantContainerInterceptor.idl:
-        * ciao/CCM_ServantContainerInterceptorRegistration.idl:
-        * ciao/CCM_ServerContainerInterceptor.idl:
-        * ciao/CCM_ServerContainerInterceptorRegistration.idl:
-        * ciao/CCM_StubContainerInterceptor.idl:
-        * ciao/CCM_StubContainerInterceptorRegistration.idl:
-          Added interfaces from QoS for CCM spec (OMG 06-04-15). We
-          don't have an implementation yet, just the interfaces at
-          this moment
-
-Fri Jan  5 12:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Changed signature of generated ciao_push_event() method,
+          with additional typecode parameter, also added this arg
+          to a generated call to the CIAO Event Service version
+          of this method.
 
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-          Fixed conversion warnings
+Thu Oct 26 14:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-        * DAnCE/RepositoryManager/URL_Parser.cpp:
-          Improved layout and documentation
+  * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
+    Use ACE_OS methods, this fixes bugzilla 2691.
+          Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
+          for reporting this issue
 
-Wed Jan  3 19:32:05 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+Wed Oct 25 14:54:03 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
 
-        * CIAO_TAO_DAnCE.mwc:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp:
+        * CCF/CCF/CIDL/SemanticAction/Composition.hpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Component.hpp:
+        * CCF/CCF/IDL3/SemanticAction/EventType.hpp:
+        * CCF/CCF/IDL3/SemanticAction/Home.hpp:
 
-          Added $(ACE_ROOT)/contrib/minizip since the RepositoryManager can
-          use minizip if the zlib feature is enabled.
+          Minor fixes and cleanups.
 
-Wed Jan  3 07:01:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * CCF/CCF/IDL2/Parsing/Recovery.hpp:
+        * CCF/CCF/IDL2/Parser.hpp:
+        * CCF/CCF/IDL2/Parser.cpp:
+        * CCF/CCF/CIDL/Parser.hpp:
+        * CCF/CCF/CIDL/Parser.cpp:
+        * CCF/CCF/IDL3/Parser.hpp:
+        * CCF/CCF/IDL3/Parser.cpp:
 
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-          Fixed conversion warnings
+          Added syntax errors to every grammar rule.
 
-        * DAnCE/RepositoryManager/URL_Parser.cpp:
-          Initialise pointer with 0
+Wed Oct 25 11:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Jan  3 16:18:36 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+  * examples/Null_Component/StaticDAnCEApp.mpc:
+    Enabled this project in all builds
 
-        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
+Mon Oct 23 19:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Use the install base project instead of the deprecated core base
-          project.
+  * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+    Added missing CORBA::string_dup to fix crash with BCB
 
-Thu Dec 28 12:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Oct 20 06:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-          Doxygen improvements
+  * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
+    Changed the HomeAttributes generation in such a way that it
+    also compiles with BCB6
 
-Mon Dec 25 16:19:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+  * examples/Null_Component/*:
+    New example, a component with just one interface. This can be used
+    to analyze the core footprint and see what we can reduce
+          Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
+          for creating this example
 
-        * Merry Christmas everyone!!!
+Thu Oct 19 23:22:49 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-Wed Dec 20 06:37:27 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+        * DAnCE/RepositoryManager/RepositoryManager.mpc
+          Modified this file to make sure RepositoryManager project is built
+          after minizip project.
 
-        * MPC/config/ciao_rtevent_dnc.mpb:
-        * MPC/config/ciao_events_dnc.mpb:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
-        * ciao/CCM_Core.mpc:
+Thu Oct 19 10:47:12 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
 
-          Fixed linking errors on OS X.
+        * DAnCE/TargetManager/CmpClient.cpp
+        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+        * examples/BasicSP/EC/controller.cpp
+        * examples/Display/RateGen/controller.cpp
+        * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+          Changed the naked atoi () to ACE_OS::atoi (), again thanks to Abdul
+          for reporiting this.
 
-Wed Dec 13 08:35:48 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+Wed Oct 18 14:00:04 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp:
+        * docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
+          (parse_args): Changed the naked atoi() to ACE_OS::atoi().
+          Thanks to Abdul for reporting this.
 
-          Fixed warnings on NoInterceptors_Core build related to
-          type conversion.
+Wed Oct 18 12:05:00 UTC 2006  Simon Massey  <sma@prismtech.com>
 
-Wed Dec 13 07:57:02 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+        * DAnCE/TargetManager/DomainDataManager.cpp
+          Removed warnings about unused local variables (line 186 & 558)
 
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp:
+Wed Oct 18 09:50:00 UTC 2006  Simon Massey  <sma@prismtech.com>
 
-          Fixed a fuzz error.
+        * DAnCE/TargetManager/CmpClient.cpp
+          Removed warning about unused local variable (line 154)
 
-Wed Dec 13 07:29:10 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+Tue Oct 17 21:23:27 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
+        * DAnCE/RepositoryManager/README
+        * DAnCE/RepositoryManager/RepositoryManager.mpc
+        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp
+        * DAnCE/RepositoryManager/ZIP_Wrapper.h
+          Updated these files to use minizip under $ACE_ROOT/contrib/minizip.
 
-          Fixed Debian_GCC_4.0 compilation error by removing
-          unnecessary common for enum definition.
+Tue Oct 17 13:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Dec 13 07:19:13 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
+    Several small layout changes and use ACE_ERROR for
+    errors
 
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h:
+Tue Oct 17 13:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed a compilation error in Win2003_VC71_Versioned_Namespace
-          build by removing the unnecessary declaration.
+  * DAnCE/NodeApplication/RTNodeApp_Configurator.{h,cpp}:
+    Moved destructor implementation to cpp file
 
-Wed Dec 13 06:45:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Oct 17 13:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * examples/Swapping/Sender/Sender_exec.h:
-          Fixed include because of file name changes
+  * DAnCE/NodeManager/CIAO_Monitor.h:
+    Doxygen improvements
 
-Tue Dec 12 20:55:02 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+  * DAnCE/NodeManager/NAM_Map.{h,cpp}:
+    Made is_available a const method
 
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp:
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h:
+  * DAnCE/NodeManager/Node_Manager.cpp:
+    Use bool
 
-          Modified the ciao_push_event() in this base class to fix
-          BCC warnings.
+  * DAnCE/NodeManager/Node_Manager_Impl.cpp:
+          Use ACE_ERROR together with LM_ERROR
 
-Tue Dec 12 20:21:03 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+Tue Oct 17 12:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h:
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
+  * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
+  * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+  * DAnCE/NodeApplication/RTConfig_Manager.cpp:
+          Use ACE_ERROR together with LM_ERROR
 
-          Fixed the fuzz errors.
+  * DAnCE/NodeApplication/NodeApplication_Impl.inl:
+          Initialise pointers with 0
 
-Tue Dec 12 20:15:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+  * DAnCE/NodeApplication/Configurator_Factory.{h,cpp}:
+  * DAnCE/NodeApplication/Container_Impl.cpp:
+  * DAnCE/NodeApplication/NodeApplication_Core.cpp:
+    Use bool and const improvements, doxygen improvements
 
-        * ciao/CCM_Component.idl:
-        * ciao/CCM_Core.mpc:
-        * ciao/CCM_EventBase.idl:
-        * ciao/CCM_EventConsumerBase.idl:
-        * ciao/CCM_HomeConfiguration.idl:
-        * ciao/CCM_HomeConfigurator.idl:
-        * ciao/CCM_Object.idl:
-        * ciao/CCM_PrimaryKeyBase.idl:
-        * ciao/CCM_SessionComponent.idl:
-        * ciao/CCM_StateIdFactory.idl:
-        * ciao/Servant_Impl_Base.h:
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl:
+Mon Oct 16 19:52:15 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+          Updated the re_launch_plan () function for Repoman integration.
+
+        * DAnCE/RepositoryManager/README
+        * DAnCE/RepositoryManager/RepositoryManager.cpp
+        * DAnCE/RepositoryManager/RepositoryManager.mpc
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
+        * examples/BasicSP/RepoMan_Usage.html
+          Fixed some warnings on Liunx.
+          Fixed the "Deamon" typos.
+
+Mon Oct 16 15:11:40 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/TM_Client.mpc:
+          Fixed the linking error in Mac and in FC5 Static
+
+Mon Oct 16 11:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+       * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+         BUILD CZAR. Due to the removal of
+         DAnCE/NodeApplication/NodeApp_Configurator.cpp to correct
+         the fuze error below, this "other" project's MPC needed to
+         be updated. (Why is this dependancy here?)
+
+Mon Oct 16 11:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+       * DAnCE/NodeApplication/NodeApp_Configurator.cpp
+       * DAnCE/TargetManager/DomainEvents.idl
+         BUILD CZAR. Removed Fuzz errors after no user action to correct.
+
+Mon Oct 16 08:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/ADD_Handler.cpp:
+        * tools/Config_Handlers/DP_Handler.cpp:
+        * tools/Config_Handlers/IDREF_Base.cpp:
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp:
+        * tools/Config_Handlers/RT-CCM/PS_Handler.cpp:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp
+        * DAnCE/RepositoryManager/
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+          Use ACE_ERROR together with LM_ERROR
+
+        * RACE/Controller/Component/Controller.idl:
+          Changed some comments to doxygen style
+
+        * DAnCE/RepositoryManager/PC_Updater_T.cpp:
+          Const change
+
+        * DAnCE/RepositoryManager/RepositoryManager.cpp:
+          Layout changes
+
+        * DAnCE/RepositoryManager/RM_Helper.cpp:
+          Use strcmp to compare two strings and several layout changes
+
+        * DAnCE/RepositoryManager/RM_Helper.h:
+        * DAnCE/RepositoryManager/ZIP_Wrapper.h:
+          Doxygen changes
+
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+          Documentation changes
+
+        * DAnCE/RepositoryManager/URL_Parser.{h,cpp}:
+          Use bool for debug_
+
+        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
+          Initialise pointers with 0
+
+Mon Oct 16 08:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl:
+          Simplified this file by using the new ciao_static_dnc_app base
+          project.
+
+Fri Oct 13 17:57:12 2006  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
+
+        * docs/schema/SANet_Network.xsd
+        * docs/schema/Task_Map.xsd
+
+        Added SA-POP schemas.
+
+Fri Oct 13 17:54:58 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/TargetManager.mpc:
+          Addressed the problems coming up in Mac. Changed the project
+          inheritence of the TM Component.
+
+Fri Oct 13 17:43:29 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+          Addressed an error in the last check-in.
+
+Thu Oct 12 17:36:58 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/CmpClient.cpp:
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
         * DAnCE/TargetManager/DomainEvents.idl:
-          Added remarks about compliance and another set of splitting
-          idl files in smaller ones
+        * DAnCE/TargetManager/TM_Client.mpc:
+        * DAnCE/TargetManager/TargetManager.idl:
+        * DAnCE/TargetManager/TargetManager.mpc:
+        * DAnCE/TargetManager/TargetManagerExt.idl:
+        * DAnCE/TargetManager/TargetManager_exec.h:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Added the functionality to detect any add/delete to the Domain.
+          Added the feature to relay events to anyone interested for the above.
 
-        * ciao/CCM_Event.idl:
-        * ciao/CCM_Events.idl:
-          Renamed Event to Events
+        * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl:
+          Changed the test script to test the above
+
+Fri Oct 13 16:51:49 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * docs/imgs/dance_arch.jpg:
+        * docs/imgs/static_dance_arch.jpg:
+        * docs/imgs/static_dance_impl.jpg:
+
+          Fixed corrupted files. Thanks to Sowayan Abudullah
+          <abdullah dot sowayan at lmco dot com>
+          for reporting this.
+
+>>>>>>> .merge-right.r75088
+Tue Oct 10 19:13:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl:
+          Fixed compile error.
+          Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
+          for reporting this.
+
+Tue Oct 10 17:56:51 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
+          Modify these files to get the artifacts names when using http reference.
 
-        * ciao/CCM_HomeConfigurator.idl:
-        * ciao/CCM_HomeConfiguration.idl:
-          Renamed Configurator to Configuration
+Tue Oct 10 14:24:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Dec 12 14:48:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
+          Layout improvements, use ACE_ERROR with LM_ERROR
+
+        * DAnCE/ExecutionManager/DAM_Map.cpp:
+          Const improvements
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.h:
+          Layout changes
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Use ACE_ERROR with LM_ERROR
+
+        * DAnCE/NodeApplicationManager/ImplementationInfo.h:
+          Documentation improvements
+
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
+          Const improvements
+
+        * DAnCE/NodeApplicationManager/HTTP_Handler.cpp:
+          Const improvements
+
+Tue Oct 10 09:28:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/CCM_Base.idl:
-        * ciao/CCM_CCM2Context.idl:
-        * ciao/CCM_ComponentId.idl:
-        * ciao/CCM_Configurator.idl:
+          Removed a remark about RTF 1.1, method is now according to the spec
+
+        * ciao/CCM_Component.idl:
         * ciao/CCM_Container.idl:
-        * ciao/CCM_Container_Ex.idl:
-        * ciao/CCM_Core.mpc:
-        * ciao/CCM_Entity2Context.idl:
         * ciao/CCM_Event.idl:
-        * ciao/CCM_ExecutorLocator.idl:
-        * ciao/CCM_HomeConfigurator.idl:
-        * ciao/CCM_SessionComponent.idl:
-        * ciao/CCM_SessionContext.idl:
-        * ciao/CCM_StandardConfigurator.idl:
-        * ciao/CCM_StateIdFactory.idl:
-        * ciao/Deployment_NodeApplication.idl:
-          Moved more interfaces to their own file
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
-          Removed virtual keywords, not needed
+        * ciao/Deployment.idl:
+        * ciao/Target_Data.idl
+          Updated some documentation and added some todos about things which
+          are CIAO specific
+
+        * ciao/Server_init.cpp:
+          With LM_ERROR use ACE_ERROR
+
+        * ciao/Dynamic_Component_Activator.{h,cpp}:
+          Removed some invalid comments and a mutex that was not used at all
+
+        * ciao/Context_Impl_Base.h:
+          Documentation update
+
+Thu Oct 05 00:35:37 2006  William R. Otte  wotte@dre.vanderbilt.edu
+
+        * CIAO version 0.5.3 released.
+
+Wed Oct  4 08:12:24 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * NEWS:
+
+          Updated with entries for the CIDL compiler work.
+
+Tue Oct  3 15:16:40 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * NEWS:
+
+          Updated the NEWS to add the changes for Repoman and Plan_Generator
+          projects.
+
+Tue Oct  3 12:49:16 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
+
+        * NEWS:
+
+          Updated the NEWS to add the changes for CoSMIC Quoter tutorial
+
+Mon Oct  2 09:28:58 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/index.html:
+          Corrected linked to OMG spec
+
+Mon Oct  2 08:58:58 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-          Const changes and improved some messages
+          Set the nodemanager in the static nodeapplication manager.
+          Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
+          for reporting this.
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+          Doxygen improvement
+
+Thu Sep 28 16:47:58 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
+        Added the base projects to Plan_Launcher_Impl project to include
+        required libs. Added null head files to the Plan_Launcher project to
+        remove the unnecessary dependency on other libs.
+
+Thu Sep 28 15:57:53 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
+        Fixed the "undefined reference" error on FC5_Static build.
+
+        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
+        Modified this file to handle the possible RepoMan null reference error.
+
+Tue Sep 26 21:05:48 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
+        Fixed the "conversion from '_var' to 'CORBA::Object*'" warning.
+
+Tue Sep 26 15:52:12 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * docs/tutorials/Quoter/Simple/Broker/Broker.cidl:
+        * docs/tutorials/Quoter/Simple/Distributor/Distributor.cidl:
+
+        Added missing semicolons.
+
+Mon Sep 25 23:19:15 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
+        Modified the fetch_reference_naming () to remove its arguments related
+        to Repoman.
 
         * DAnCE/Plan_Generator/PCVisitor.h:
-        * DAnCE/Plan_Generator/PCVisitorBase.h:
-          Doxygen changes
+        Adjusted the order of the data members of Plan_Generator_i class.
 
-        * tools/Config_Handlers/DynAny_Handler.mpc:
-          layout changes
 
-Tue Dec 12 10:08:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Sep 25 19:46:37 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-        * MPC/config/taoidl3toidl2defaults.mpb:
-          Moved from TAO to here
+        * DAnCE/Plan_Generator/Plan_Generator.mpc (project): Fixed the MPC
+          file by removing the "requires += RepositoryManager" as this
+          project, as well as other projects that depend on this, will not
+          be built unless RepositoryManager=1 is set.
 
-Mon Dec  11 20:55:39 UTC 2006  Gan Deng <gan.deng@vanderbilt.edu>
+Mon Sep 25 14:42:03 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-        * ciao/CCM_Event.idl:
+        * DAnCE/Plan_Launcher/Plan_Launcher.mpc: Fixed the mpc file.
 
-          Modified the "ciao_push_event" operation to pass in "source_id",
-          which is used to identify the sources of the publisher ports to
-          support event filtering mechanism.
+Mon Sep 25 13:06:05 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
 
-        * ciao/Deployment_Events.idl:
+        * CCF/CCF/IDL2/SemanticAction/Operation.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Operation.hpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp:
+        * CCF/CCF/CIDL/SemanticAction/Composition.cpp:
+        * CCF/CCF/CIDL/SemanticAction/Composition.hpp:
 
-          Added new IDL definitions to support RTEC federation, such as
-          AddrServer, UDPSender, UPDReceiver, etc.
+        Move some operator<< operators to the global scope so that they
+        do not hide others.
 
-        * ciao/Deployment_NodeApplication.idl:
+Sun Sep 24 21:06:07 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-          Modified the "install_es" operation to install one service object
-          per invocation, instead of a sequence of objects.
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+        Removed the unnecessary Repoman head file.
 
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        * DAnCE/NodeApplication/NodeApplication_Impl.h:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h:
+Sat Sep 23 04:31:13 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
+        * DAnCE/RepositoryManager/RMadmin.cpp
+        * ciao/RepositoryManager.idl
+        Added the replace argument in installPackage () and createPackage ()
+        functions and extend the functionalities of these two functions based
+        on the latest D&C spec.
+
+Sat Sep 23 04:07:59 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/Plan_Generator
+        * DAnCE/Plan_Generator/PCVisitor.cpp
+        * DAnCE/Plan_Generator/PCVisitor.h
+        * DAnCE/Plan_Generator/PCVisitorBase.cpp
+        * DAnCE/Plan_Generator/PCVisitorBase.h
+        * DAnCE/Plan_Generator/PCVisitorBase.inl
+        * DAnCE/Plan_Generator/Plan_Generator.mpc
+        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
+        * DAnCE/Plan_Generator/Plan_Generator_Impl.h
+        * DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h
+        Added these files which implement the Plan_Generator project. This
+        project is used to retrieve information from Repoman and generate/modify
+        DeploymentPlans based on different demands.
+
+        * DAnCE/Planner
+        * DAnCE/Planner/Node_T.cpp
+        * DAnCE/Planner/Node_T.h
+        * DAnCE/Planner/Node_T.inl
+        * DAnCE/Planner/PCVisitor.cpp
+        * DAnCE/Planner/PCVisitor.h
+        * DAnCE/Planner/PCVisitorBase.cpp
+        * DAnCE/Planner/PCVisitorBase.h
+        * DAnCE/Planner/PCVisitorBase.inl
+        * DAnCE/Planner/Planner.cpp
+        * DAnCE/Planner/Planner.mpc
+        Deleted these files. The planner project has been replaced by the more
+        useful Plan_Generator project.
+
+        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+        Modified these files.
+
+        * DAnCE/Plan_Generator/PCVisitor.cpp
+        * DAnCE/Plan_Generator/PCVisitor.h
+        * DAnCE/Plan_Generator/PCVisitorBase.cpp
+        * DAnCE/Plan_Generator/PCVisitorBase.h
+        * DAnCE/Plan_Generator/PCVisitorBase.inl
+        Deleted these files.
+        Removed the Plan_Launcher's dependence on RepoMan. Use Plan_Generator
+        to retrieve information from Repoman and generate/modify DeploymentPlans.
+
+Fri Sep 22 09:27:25 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Interface.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Operation.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Interface.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Operation.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/String.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Enum.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/IntExpression.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/String.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Elements.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/ValueType.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/IntExpression.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Name.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Elements.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp.m4:
+        * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Array.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Name.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Union.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Native.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Union.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Attribute.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Exception.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Translation.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/TypeId.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Graph.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Attribute.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Sequence.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Member.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp.m4:
+        * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Literals.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Graph.tpp:
+        * CCF/CCF/IDL2/SemanticGraph/Literals.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Struct.hpp:
+        * CCF/CCF/IDL2/SemanticGraph/Module.hpp:
+
+        * CCF/CCF/CIDL/SemanticGraph/Executor.cpp:
+        * CCF/CCF/CIDL/SemanticGraph/Composition.cpp:
+        * CCF/CCF/CIDL/SemanticGraph/Executor.hpp:
+        * CCF/CCF/CIDL/SemanticGraph/Composition.hpp:
+
+        * CCF/CCF/IDL3/SemanticGraph/Component.cpp:
+        * CCF/CCF/IDL3/SemanticGraph/EventType.cpp:
+        * CCF/CCF/IDL3/SemanticGraph/Component.hpp:
+        * CCF/CCF/IDL3/SemanticGraph/EventType.hpp:
+        * CCF/CCF/IDL3/SemanticGraph/Home.hpp:
+
+
+        Add file name and line information to every semantic
+        graph node. This information is used in diagnostics.
+
+
+        * CCF/CCF/IDL2/SemanticAction/Typedef.hpp:
+        * CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp:
+
+        Adjust semantic actions interface to provide a way to derive
+        line numbers.
+
+
+        * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Native.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.hpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Exception.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Struct.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp:
+
+        * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/EventTypeFactory.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp:
+        * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp:
+
+        * CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp:
+        * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp:
+
+        Propagate file name and line number from tokens to semantic
+        graph nodes. Use file and line numbers when printing error
+        messages.
+
+
+        * CCF/CCF/IDL2/Token.hpp:
+        * CCF/CCF/IDL2/Parser.hpp:
+        * CCF/CCF/IDL2/Parser.cpp:
+
+        Fix a number of bugs in error handling and recover.
+
+
+        * CIDLC/cidlc.cpp:
+
+        Use file name and line number when creating the translation
+        unit object.
+
+
+Wed Sep 20 04:05:42 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
+
+        * docs\tutorials\CoSMIC\02.html
+
+        Added some useful links to various resources to help readers reduce
+        learning curve.Added a small section that mentions that a Node Map file
+        has to be created in order to get Quoter example working. Again,
+        Thanks to Sowayan Abdullah from LMCO for his help in improving the
+        cosmic documentations.
+
+
+Mon Sep 18 03:26:22 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Utils/XML_Helper.h
+
+          Fixed compile error by removing extra ;.
+
+Fri Sep 15 21:28:47 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * ciao/Deployment_Core.idl
+
+          Removed the unnecessary event type definition for RTEC since
+          they are no longer used.
+
+Sun Sep 10 09:20:18 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Utils/XML_Helper.cpp
+        * tools/Config_Handlers/Utils/XML_Helper.h
+
+          Removed workaround from previous commit, as Ossama Othman has
+          provided the proper fix in the G++ macros.
+
+Fri Sep  8 00:28:27 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Utils/XML_Helper.cpp
+        * tools/Config_Handlers/Utils/XML_Helper.h
+
+          Made the export declaration on the singleton typedef
+          contingent on a Microsoft compiler, as the GCC included
+          with FC5 was not defining the symbol as a result.
+
+Fri Sep  1 03:09:38 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
+
+        * docs\tutorials\CoSMIC\index.html
+        * docs\tutorials\CoSMIC\01.html
+
+        Updated index.html to change the cosmic version.Updated 01.html
+        to reflect recent changes of idl_to_picml. Thanks to Sowayan Abdullah
+        from LMCO for his help in improving the cosmic documentations.
+
+Thu Aug 31 22:45:09 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/RepositoryManager/RepositoryManager.mpc
+          Modified this file to include $(CIAO_ROOT)/tools/Config_Handlers
+          in the RMAdmin project.
+
+Wed Aug 30 17:16:18 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+          Added more changes to this file to fix the "reference to
+          ACE_Singleton<CIAO::Config_Handlers::XML_Helper, ACE_Null_Mutex>
+          ::instance()'"warnings with FC5_Static build.
+
+Tue Aug 29 23:08:20 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+          Fixed the "reference to `ACE_Singleton<CIAO::Config_Handlers
+          ::XML_Helper, ACE_Null_Mutex>::instance()'"warnings with
+          FC5_Static build.
+
+        * DAnCE/RepositoryManager/RMadmin.cpp
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+          Removed unnecessary using of CIAO::Config_Handlers::XML_Helper.
+
+Mon Aug 28 12:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Modified to accomodate the changes made above by adding only
-          one ciao event service object reference to the map.
+        * ciao/Container_Base.cpp:
+          Fixed some compile warnings with gcc 2.96
 
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl:
+Thu Aug 24 15:44:08 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-          Removed the inheritance relationship between Consumer_Config and
-          Supplier_Config object. The reason why it was there is because
-          of a tightly coupled design long time ago.
+        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
+          Changed some of the command-line options.
 
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp:
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h:
+        * examples/BasicSP/RepoMan_Usage.html
+          Made some minor changes.
 
-          Added a virtual function "ciao_push_event" and provides a
-          default implementation, which is essentially a no_op impl.
+Thu Aug 24 000:41:16 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-        * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp:
-        * ciaosvcs/Events/CIAO_EventService_Factory_impl.h:
+        * DAnCE/Plan_Launcher/PCVisitor.cpp
+        * DAnCE/Plan_Launcher/PCVisitor.h
+        * DAnCE/Plan_Launcher/PCVisitorBase.cpp
+        * DAnCE/Plan_Launcher/PCVisitorBase.h
+          Solved the "'class has virtual functions but non-virtual destructor"
+          warnings.
 
-          Modified the factory method "create" by passing in the
-          string identifier for the service object.
+Wed Aug 23 17:57:15 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl:
+        * DAnCE/Plan_Launcher/PCVisitorBase.h
+          Solved the "invalid use of undefined type 'struct PCVisitorBase'"
+          warnings.
 
-          Added new operations to create gateways object to support
-          event channel federations.
+Wed Aug 23 15:22:36 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h:
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc:
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp:
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h:
+        * DAnCE/Plan_Launcher/PCVisitor.cpp
+          Solved the "unused parameter" warning.
 
-          Added the implementation and MPC files to support event
-          channel federations in CIAO_Event_Service.
+Wed Aug 23 000:04:06 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
+        * DAnCE/RepositoryManager/README
+          Made some minor changes.
+
+Wed Aug 23 000:00:43 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * examples/BasicSP/descriptors/basicNodeDaemon.pl
+          Use "$ENV{'ACE_ROOT'}/bin" to point to the location of lib file.
+
+Tue Aug 22 23:47:06 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+          Modified these files for RepoMan integration.
+
+        * DAnCE/Plan_Launcher/PCVisitor.cpp
+        * DAnCE/Plan_Launcher/PCVisitor.h
+        * DAnCE/Plan_Launcher/PCVisitorBase.cpp
+        * DAnCE/Plan_Launcher/PCVisitorBase.h
+        * DAnCE/Plan_Launcher/PCVisitorBase.inl
+          Added these files for RepoMan integration.
+
+        * examples/BasicSP/RepoMan_Usage.html
+          Added this file, which explains how to run the BasicSP example using
+          the integrated RepoMan.
+
+Mon Aug 21 15:19:25 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * examples/Hello/descriptors/run_test.pl:
+        * examples/Hello/descriptors/run_test_without_ns.pl: Fixed the
+          environment variable DANCE_ROOT to point to CIAO_ROOT/DAnCE.
+
+Thu Aug 17 16:09:09 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/RepositoryManager/Options.cpp
+        * DAnCE/RepositoryManager/RMadmin.cpp
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+          Reimplemented the findNamesByType () and getAllTypes () operations
+          of Repository Manager, which use the newly generated
+          ACE_Hash_MultiMap_Manager class and its corresponding classes.
+
+Mon Aug 14 15:46:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Utils/XML_Helper.h
+
+          Fixed a compile error for pedantic GCC4.
+
+Sun Aug 13 15:18:00 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * CCF/CCF/CodeGenerationKit/Regex.hpp:
+
+          Reimplemented regex wrapper to allow building CIDLC on
+          platforms without wchat_t support (e.g., Cygwin/Mingw).
+
+Fri Aug 11 11:46:17 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * CCF/CCF/IDL2/SemanticGraph/Name.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Name.hpp:
+
+          Added support for IDL (underscore) escaping. Added support
+          for custom name printers.
+
+        * CIDLC/UnescapedNamePrinter.hpp:
+
+          Name printer that prints names unescaped (without the IDL
+          underscore).
+
+        * CIDLC/CxxNamePrinter.cpp:
+        * CIDLC/CxxNamePrinter.hpp:
+
+          Name printer that escapes C++ keywords.
+
+        * CIDLC/CorbaTypeNameEmitters.cpp:
+        * CIDLC/DescriptorGenerator.cpp:
+        * CIDLC/ExecImplHeaderGenerator.cpp:
+        * CIDLC/ExecImplSourceGenerator.cpp:
         * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/RepositoryIdGenerator.cpp:
         * CIDLC/ServantSourceGenerator.cpp:
+        * CIDLC/ExecImplGenerator.cpp:
+        * CIDLC/UtilityTypeNameEmitters.cpp:
+        * CIDLC/ServantGenerator.cpp:
+        * CIDLC/CompositionEmitter.cpp:
 
-          Automatically generate the implementation code of
-          ciao_push_event for component in the servant code.
+          Updated to handle IDL and C++ name escaping. This fixes
+          bugzilla bug #2427.
 
-        * DAnCE/NodeApplication/NodeApplication.cpp:
+Fri Aug 11 07:30:35 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-          Explicitly add the init_svcs() operation to the
-          NA component server implementation. We should figure
-          out a way to see whether we can avoid doing this at
-          this level.
+        * tools/Config_Handlers/Utils/XML_Helper.h
+        * DAnCE/RepositoryManager/RMadmin.cpp
 
-        * DAnCE/NodeManager/Node_Manager.cpp:
+          Fixes for a compiler error in the version of GCC shipped with
+          FC5.
 
-          Enhanced NM to pass in service configuration file explicitly.
-          Also fixed a bug about controlling ORBDebugLevel.
+Wed Aug  9 18:53:48 UTC 2006  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
-        * docs/schema/CIAOEvents.xsd:
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
+          DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+          DAnCE/NodeApplication/RTNodeApp_Configurator.cpp:
+          examples/Hello/descriptors_RTCCM/rt-example.cdp:
+          examples/Hello/descriptors_RTCCM/rt-config-example.csr:
 
-          Enhanced the CIAOEvents schema to support event channel
-          federation configuration.
+        Fixed the RT-CCM code to conform to the schema changes. Made changes
+        to the descriptors directory to fix the working example for RT-CCM.
 
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp:
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp:
+        Thanks to Nanbor Wang for helping fix the codebase.
 
-          Config handlers enhancement to support the above
-          schema changes.
+Tue Aug  8 07:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/tests/NodeApplicationTest/run_test.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
+        * CIAO-INSTALL.html:
+          Removed vc6 info
 
-          Modified to use environment variables instead of relative paths.
+Fri Aug  4 21:40:46 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * examples/Hello/Sender/Sender_exec.cpp:
-        * examples/Hello/Receiver/Receiver_exec.cpp:
+        * docs/tutorials/CoSMIC/01.html
+        * docs/tutorials/CoSMIC/02.html
+        * docs/tutorials/CoSMIC/03.html
+        * docs/tutorials/CoSMIC/04.html
+        * docs/tutorials/CoSMIC/style.css
+        * docs/tutorials/CoSMIC/index.html
 
-          Modified to explicitly print out the contents of the received msgs.
+          Style fixes, grammatical and spelling corrections, clarifications.
 
-        * examples/Hello/descriptors_events/ciao-events-example-collocated.ced:
-        * examples/Hello/descriptors_events/ciao-events-example-with-federation.ced:
-        * examples/Hello/descriptors_events/ciao-events-example-with-filters.ced:
-        * examples/Hello/descriptors_events/ciao-events-example.ced:
-        * examples/Hello/descriptors_events/ciao-events-federation-mcast.ced:
-        * examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced:
-        * examples/Hello/descriptors_events/ciao-events-federation-udp-two-hosts.ced:
-        * examples/Hello/descriptors_events/ciao-events-federation-udp.ced:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp:
-        * examples/Hello/descriptors_events/NodeManagerMap.dat:
-        * examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat:
-        * examples/Hello/descriptors_events/rtec.conf:
-        * examples/Hello/descriptors_events/run_NodeDaemons.pl:
-        * examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl:
-        * examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl:
+Thu Aug  3 20:38:39 UTC 2006  Nanbor Wang  <nanbor (at) txcorp (dot) com>
 
-          Added a bunch of test cases for CIAO Event Service.
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
 
-Fri Dec  8 22:59:14 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Fixed RT-CCM support.
 
-        * tools/tools.mwc:
+Thu Aug  3 15:33:11 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
 
-          Added IDL3_to_IDL2 directory to the list.
+        * docs/cidlc.html:
 
-Fri Dec  8 000:09:04 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Regenerated to include the -D and -I options.
 
-        * bin/generate_component_mpc.pl:
+Wed Aug  2 18:52:14 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
 
-          Another typo found by Abdullah Sowayan <abdullah.sowayan@lmco.com>.
+        * CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp:
 
-Thu Dec  7 20:22:57 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Added option types: flag or value.
 
-        * bin/generate_component_mpc.pl:
+        * CCF/CCF/CodeGenerationKit/CommandLineParser.cpp:
+        * CCF/CCF/CodeGenerationKit/CommandLineParser.hpp:
+        * CCF/CCF/CodeGenerationKit/CommandLine.hpp:
 
-          Fixed bug that omits necessary space between items in 'after'
-          line, if it contains more than one item. Thanks to Abdullah
-          Sowayan <abdullah.sowayan@lmco.com> for reporting the bug.
+          Reimplemented to use hand-coded parser instead of Spirit. The
+          new implementation takes into account the option types.
 
-Thu Dec  7 19:15:04 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp:
+        * CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp:
 
-        * bin/generate_component_mpc.pl:
+          Removed.
 
-          Fixed typo, had 'ciao_server_dnc', should have been
-          'ciao_servant_dnc'. Thanks to Abdullah Sowayan
-          <abdullah.sowayan@lmco.com> for reporting the mistake.
+        * CIDLC/cidlc.cpp:
+        * CIDLC/ServantGenerator.hpp:
+        * CIDLC/ServantGenerator.cpp:
+        * CIDLC/DescriptorGenerator.hpp:
+        * CIDLC/DescriptorGenerator.cpp:
+        * CIDLC/ExecutorMappingGenerator.hpp:
+        * CIDLC/ExecutorMappingGenerator.cpp:
+        * CIDLC/ExecImplGenerator.cpp:
+        * CIDLC/ExecImplGenerator.hpp:
 
-Thu Dec  7 19:04:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Updated with the option types. This fixes bugzilla bug #2426.
 
-        * tools/Config_Handlers/DynAny_Handler.mpc:
 
-          Removed taolib and anytypecode base projects, since they are
-          already pulled in by typecodefactory.
+Fri Jul 28 17:53:57 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
 
-Thu Dec  7 13:47:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * CCF/CCF/IDL2/SemanticGraph/Translation.cpp:
 
-        * DAnCE/DomainApplicationManager/Deployment_Configuration (init):
-          Use ACE_Read_Buffer to read the file and parse it contents. This way
-          we are independent of a fixed buffer length, especially on systems
-          with multiple network cards and IPv6 enabled the IORs can get huge.
+          Reimplemented a chunk of code that resulted in what appears to
+          be invalid code generation by the Intel C++ compiler. This
+          fixes bugzilla bug #2387.
 
-Thu Dec  7 11:48:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jul 27 18:08:47 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * ciao/CCM_Core.mpc:
-        * MPC/config/ciao_server_dnc.mpb:
-          Don't build DnC server with minimum corba and CORBA/e, this was
-          disabled in the past implicitly because we used security as
-          MPC base project but because that has been removed we now
-          have to explicitly disable this project
+        * CIAO_TAO.mwc
+        * CIAO_TAO_DAnCE.mwc
 
-Thu Dec  7 11:34:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Replaced relative references to ACE/TAO with absolute references
+          using environment variables.
 
-        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
-          Added some todo's, check whether the narrow on the NamingContext
-          did succeed, use CORBA::ULong for the sequence index
+Mon Jul 24 15:45:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
-          Use a CORBA::String_var to store the uuid string
+        * Subversion conversion completed at revision 73730
 
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-          Added some todo's, check whether the narrow on the NamingContext
-          did succeed, layout changes, fixed bugzilla bug 2729, thanks to Abdul
-          for reporting that.
+Sun Jul 23 15:44:43 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
-          Doxygen improvements
+        * Repository frozen for repository conversion
 
-Wed Dec  6 11:26:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sat Jul 22 21:34:57 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        * ciao/CIAO_ServerResources.idl:
-        * ciao/Deployment_NodeApplicationManager.idl:
-        * DAnCE/NodeApplication/NodeApplication_Impl.h:
-        * DAnCE/NodeManager/MonitorCB.h:
-        * DAnCE/NodeManager/MonitorController.h:
-        * DAnCE/TargetManager/DomainDataManager.h:
-        * tools/Config_Handlers/DD_Handler.h:
-          Doxygen documentation updates
+        * ciao/Container_Base.cpp
 
-        * MPC/config/ciao_container_dnc.mpb:
-        * ciao/CCM_Core.mpc:
-          Added avoids_corba_e_compact as base project
+          Fixed a runtime Segfault bug about destroying POA.  The problem
+          is because a Session_Container creates 2 POAs, one of which is called
+          facet_cons_POA which uses the Servant_Activator policy to activate component
+          ports (facets, consumers) on demand, then the Servant_Activator object
+          was deleted when the Session_Container object is out of scope in its
+          destructor. But when the ORB finally shuts itself down, it tries
+          to clean all the resources including the facet_cons_POA, since the
+          Servant_Activator attached to this POA is long gone, a segfault
+          occurs in the cleaning up phase. The right fix is to destroy all the POAs
+          associated with this Session_Container in its destructor together with the
+          Servant_Activator. Thanks Phlip <phlip2005 @ gmail.com> for a
+          bug report.
 
-Tue Dec  5 11:45:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jul 20 22:03:31 UTC 2006  Nanbor Wang  <nanbor (at) txcorp (dot) com>
 
-        * ciao/CCM_Core.mpc:
-        * MPC/config/ciao_container_dnc.mpb:
-          Don't build Dnc_Container with corba/e compact has been enabled
+        * docs/schema/ServerResourceUsage.txt: Revised the document to
+          change how a policy set should be hooked into a component
+          instance.  This needs to be changed to reflect recent changed in
+          DnC schema.
 
-        * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc:
-          Simplified this MPC file
+Thu Jul 20 01:10:58 UTC 2006  Vipul Singh  <vipuls@dre.vanderbilt.edu>
 
-Mon Dec  4 12:14:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/RepositoryManager/PC_Updater.cpp: Removed the variable name
+          from the arguments in function definition in empty functions to
+          fix warnings.
 
-        * MPC/config/*:
-          All CIAO base projects are moved from
-          ACE_wrappers/bin/MakeProjectCreator/config to this directory
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h: Changed declaration
+          at a few places from const static to static const to fix a few
+          warnings, also removed an unnecessarily defined namespace.
 
-Mon Dec  4 12:35:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: Made a few
+          changes to fix the warnings and to keep the code in sync with
+          the changes made to RepositoryManager_Impl.h. Fixed code which
+          passed non POD types to a varargs function(ACE_DEBUG) which
+          resulted in aborts at runtime.
 
-        * DAnCE/TargetManager/TM_Client.mpc:
-          Simplified this file using more base projects
+        * DAnCE/RepositoryManager/URL_Parser.cpp: Assigned value to ptr before
+          if condition to fix a few warnings.
 
-Mon Dec  4 12:29:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jul 19 08:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/TargetManager/DomainDataManager.h:
-          Documentation changes
+        * tools/Config_Handlers/Config_Handlers.mpc:
+          Use exceptions as base project
 
-        * DAnCE/TargetManager/TargetManager.mpc:
-          Simplified this file using more base projects
+Mon Jul 17 17:49:41 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-Mon Dec  4 12:24:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
 
-        * MPC
-        * MPC/config
-          New directory for the base projects specifically for CIAO
+          Use new ACE_CString::size_type type to hold string
+          position/index value, instead of "int".  Addresses "comparison
+          between signed and unsigned" warnings.
 
-Mon Dec  4 12:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sat Jul 15 04:21:13 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
-          Use include from CIAO_ROOT and removed using namespace
+        * DAnCE/RepositoryManager/README.txt:
+          Remove this file.
 
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
-          Simplified this file
+        * DAnCE/RepositoryManager/README:
+          Add this file.
 
-Mon Dec  4 11:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jul 13 18:42:08 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-          Simplified by using the base projects
+        * DAnCE/RepositoryManager/RM_Helper.h:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+          Fixed a minor error.
 
-Mon Dec  4 11:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jul 12 14:00:59 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-          Converted the NodeApplication into a library and build
-          an exe using this library. Will prevent duplicate compilation
-          of part of the code. Fixes bugzilla bug 2739.
+        * DAnCE/RepositoryManager/RM_Helper.cpp:
+          Fixed the "comparison between signed and unsigned integer" warning.
 
-        * DAnCE/NodeApplication/CIAO_NodeApplication_export.h:
-          New export file:
+Tue Jul 11 23:19:58 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+        * DAnCE/RepositoryManager/RM_Helper.h:
+        * DAnCE/RepositoryManager/RM_Helper.cpp:
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+          Fixed the "conversion from '__int64' to 'size_t', possible loss
+          of data" warnings.
 
-        * DAnCE/NodeApplication/Configurator_Factory.h:
-        * DAnCE/NodeApplication/Container_Impl.h:
-        * DAnCE/NodeApplication/NodeApplication_Core.h:
-        * DAnCE/NodeApplication/NodeApplication_Impl.h:
-          Added export macro to export the class from the new NodeApplication
-          library.
+Sun Jul 09 06:01:14 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/NodeApplication/NodeApplication.mpc:
-          Added new library project and use this in the executable.
+        * CIAO version 0.5.2 released.
 
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-          Use the new NodeApplication library and the new base projects
-          I added for CIAO
+Wed Jul  5 15:31:18 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.{h,cpp,inl}:
-          Moved destructor from inline to cpp method and small code improvements
+        * NEWS
+          Updated the NEWS file to add the changes of Repoman.
 
-        * DAnCE/NodeManager/NodeManager.mpc:
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
-          Simplified by using the new base projects
+Tue Jul  4 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Small improvements
+        * ciao/Home_Servant_Impl_T.cpp:
+        * ciao/Dynamic_Component_Servant_T.cpp:
+        * ciao/Swapping_Servant_Home_Impl_T.cpp:
+          Fixed compile problems with VxWorks 5.5.1 and GCC 2.96
 
-Mon Dec  4 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jul  4 06:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * CIAO-INSTALL.html:
-          Updated build instructions
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc:
+          Don't build this project in the ace_for_tao configuration
 
-        * ciao/Dynamic_Component_Activator.cpp:
-          Removed not needed return statements in a void method
+Mon Jul  3 16:20:54 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * ciao/Dynamic_Component_Activator.h:
-          Changed guard in file to match filename
+        * NEWS
 
-        * ciao/Home_Servant_Impl_T.cpp:
+          Updated the NEWS file.
+
+Tue Jun 27 13:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/RepositoryManager/RM_Helper.cpp:
           Layout changes
 
-        * ciao/Port_Activator.{h,cpp}:
-          The name methods did really change oid, so renamed name
-          to oid and added a new name method to return the name
-          member
+Fri Jun 23 13:45:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
 
-        * ciao/Servant_Activator.cpp:
-          Const changes and updated for Port Activator changes
+          Added $(TAO_ROOT) to the 'includes' line of the executable
+          project, due to a change in the way TAO/Version.h is
+          included.
 
-        * ciao/Servant_Impl_Base.cpp:
-          Small code improvements
+Thu Jun 22 18:47:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-          Const changes
+        * ciao/Dynamic_Component_Servant_T.cpp:
+        * ciao/Dynamic_Component_Servant_T.h:
+        * ciao/Swapping_Servant_Home_Impl_T.cpp:
+        * ciao/Swapping_Servant_Home_Impl_T.h:
 
-        * DAnCE/NodeApplication/Container_Impl.cpp:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Made changes to template code corresponding to those in
+
+          Mon Jun 19 14:52:25 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Mon Jun 19 14:52:25 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ciao/Home_Servant_Impl_T.cpp:
+        * ciao/Home_Servant_Impl_T.h:
+        * ciao/Servant_Impl_T.cpp
+        * ciao/Servant_Impl_T.h:
+
+          Reduced the number of template parameters in
+          the component servant and home servant template
+          base classes.
+
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+
+          Changes to generated servant code corresponding
+          the the changes in servant base class code
+          described above.
+
+Thu Jun 15 20:13:02 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/IDL3_to_IDL2/be_helper.cpp:
+
+          Uncommented code that outputs our copyright notice. This
+          change also elinates an unused arg warning for the
+          copyright notice string.
+
+        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
+
+          Added a newline after opening the file for better readability.
+
+Thu Jun 15 18:37:43 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc:
+
+          Added ciao_deployment_stub as a base project for
+          CIAO_Events_Handlers, to eliminate 'unresolved symbol'
+          linking errors. Thanks to Ming Xiong <ming.xiong@vanderbilt.edu>
+          for suggesting the fix.
+
+Thu Jun 15 15:10:58 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/IDL3_to_IDL2/be_extern.h:
+        * tools/IDL3_to_IDL2/be_init.cpp:
+        * tools/IDL3_to_IDL2/be_produce.cpp:
+
+          Changes to keep this backend in sync with changes to the
+          TAO_IDL front end - see TAO ChangeLog entry of a few
+          minutes ago.
+
+Thu Jun  8 16:07:05 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ciao/Servant_Impl_Utils_T.cpp (describe_multiplex_receptacle):
+
+          Fixed an error in instantiation of a
+          Components::ConnectionDescription valuetype - the actual
+          constructor call should have been on the OBV_* subclass.
+
+Thu Jun  8 12:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/Planner/PCVisitor.cpp:
+          Fixed parameter never used warnings
+
+Wed Jun  7 21:39:00 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
+
+          Removed unneeded base projects.
+
+Wed Jun  7 21:07:11 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ciao/Servant_Impl_Utils_T.cpp:
+
+          Fixed CORBA memory management rule violations in
+          Servant_Impl_Base static template methods
+          describe_pub_event_source(), describe_simplex_receptacle() and
+          describe_multiplex_receptacle(). Thanks to Phlip
+          <phlip2005@gmail.com> for reporting a problem in
+          get_all_receptacles() that uncovered the above violations.
+
+Wed Jun  7 16:52:45 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        *  tools/Config_Handlers/Config_Handlers.mpc
+
+           Fix for linking error in Visual Studio.
+
+Wed Jun  7 06:04:45 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * CIDLC/ExecutorMappingGenerator.cpp
+
+          Modified to generate an include of CCM_Container.idl.
+
+        * ciao/Components.idl
+        * ciao/ComponentsC.h
+        * ciao/ComponentsS.h
+
+          Changed Components.idl to include CCM_Component.idl instead of
+          CCM_Container.idl.  This removes a dependancy on the container
+          library for stub projects.
+
+          Note this commit may be rolled back later based on discussions
+          on the dance-dev list, I am making it preemptively to resolve
+          scoreboard problems.
+
+Tue Jun  6 20:32:53 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Config_Handlers.mpc
+        * tools/Config_Handlers/Property_Handler.h
+
+          Compile fixes for Borland.
+
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/XMLSchema/Writer.hpp
+
+          Fixes for Borland ICEs.
+
+Tue Jun  6 13:48:59 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Config_Handlers_Common_Export.h
+
+          Missing file from previous commit.
+
+Mon Jun  5 20:34:51 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/RepositoryManager/RepositoryManager.mpc
+        * DAnCE/TargetManager/TM_Client.mpc
+        * RACE/Controller/Component/Controller.mpc
+        * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+        * examples/BasicSP/BasicSP.mpc
+        * examples/BasicSP/BMClosedED/BMClosedED.mpc
+        * examples/BasicSP/BMDevice/BMDevice.mpc
+        * examples/BasicSP/BMDisplay/BMDisplay.mpc
+        * examples/BasicSP/EC/EC.mpc
+        * examples/Display/Display_Base/Display_Base.mpc
+        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+        * examples/Hello/Hello_Base/Hello_Base.mpc
+        * examples/Hello/Receiver/Receiver.mpc
+        * examples/Hello/Sender/Sender.mpc
+        * examples/Swapping/Hello_Base/Hello_Base.mpc
+        * examples/Swapping/Receiver/Receiver.mpc
+        * examples/Swapping/Sender/Sender.mpc
+        * performance-tests/Protocols/common/Protocols.mpc
+        * tests/Bug_2130_Regression/interfaces/ENW.mpc
+        * tests/CIDL/CodeGen/CodeGen.mpc
+        * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
+        * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
+        * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
+        * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
+        * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
+        * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
+        * tests/IDL3/Events/Abstract/Abstract.mpc
+        * tests/IDL3/Events/Regular/Regular.mpc
+        * tests/IDL3/Homes/Attributes/HomeAttributes.mpc
+        * tests/IDL3/Homes/Basic/Basic.mpc
+        * tests/IDL3/Homes/Factory/Factory.mpc
+        * tests/IDL3/Homes/Finder/Finder.mpc
+        * tests/IDL3/Homes/Inheritance/Inheritance.mpc
+        * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
+        * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
+        * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
+        * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
+        * tests/IDL3/ImpliedIDL/Events/Events.mpc
+        * tests/IDL3/ImpliedIDL/Homes/Homes.mpc
+        * tests/IDL3/Lookup/lookup_test.mpc
+        * tests/Minimum/Minimum_Base/Minimum.mpc
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+
+          Fixes for linking errors/warnings in OS X.
+
+        * tools/Config_Handlers/Any_Handler.h
+        * tools/Config_Handlers/CEPE_Handler.h
+        * tools/Config_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/Config_Handlers.mpc
+        * tools/Config_Handlers/DataType_Handler.h
+        * tools/Config_Handlers/ERE_Handler.h
+        * tools/Config_Handlers/Req_Handler.h
+        * tools/Config_Handlers/SatisfierProperty_Handler.h
+
+          Factored certain elements used by both the deployment
+          and packaging handlers into a seperate library, also
+          fixes for linking errors in OS X.
+
+Fri Jun  2 18:55:41 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/Config_Handlers/Config_Handlers.mpc:
+        * DAnCE/TargetManager/TargetManager.mpc:
+        * DAnCE/TargetManager/TM_Client.mpc:
+
+          Shortened long lines.
+
+Fri Jun  2 12:17:12 UTC 2006    Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rules.ciao.GNU:
+          Added setting of TAO_IDL3_TO_IDL2 and TAO_IDL3_TO_IDL2_DEP when
+          they are not set, needed for cross compilation
+
+Thu Jun  1 21:23:51 UTC 2006    <ming.xiong@vanderbilt.edu>
+
+        * examples/Hello/descriptors/run_test.pl
+          Changed the codes so that it will correctly destroy all
+          running processes upon failure.
+
+Thu Jun  1 16:03:26 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * DAnCE/Planner/Planner.cpp:
+
+          Added global qualifier (double colon) to the specialization
+          and typedef of the planner's Node class, to avoid an
+          'ambiguous symbol' error in VC8, which is presumably confusing
+          it with Deployment::Node.
+
+Thu Jun  1 15:49:47 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/Planner/Node_T.h
+        * DAnCE/Planner/Planner.cpp
+
+          Modified some minor errors.
+
+Thu Jun  1 12:55:07 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * examples/Display/NavDisplay/NavDisplay.mpc:
+
+          Fixed typo.
+
+Wed May 31 18:46:37 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * examples/Display/NavDisplay/NavDisplay.mpc:
+
+          Added 'libs += Display_Base_stub' to the
+          Display_Base_NaviDisplay_stub project so that VC8, with its
+          parallel builds, will know about the dependency that VC7.1
+          seems to get from the 'after' line.
+
+Wed May 31 18:17:11 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * DAnCE/TargetManager/TM_Client.mpc:
+
+          Cosmetic changes.
+
+Wed May 31 17:08:17 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/Planner/Planner.mpc
+        * DAnCE/Planner/Planner.cpp
+
+          Removed the generated file of Repoman (RepositoryManagerDaemonC.*)
+          included in the Planner project and use the RepositoryManagerC.*.
+
+Wed May 31 16:49:12 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+
+          Made some minor changes.
+
+Tue May 30 10:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeManager/MonitorController.cpp:
+          Fixed typo
+
+Tue May 30 06:16:58 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
+
+        * tools/Config_Handlers/XSCRT/Elements.hpp:
+
+          Added a fix for Sun C++ <= 5.7 template instantiation issue.
+
+Tue May 30 00:00:22 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
+
+        * DAnCE/Planner/Node_T.h:
+        * DAnCE/Planner/Node_T.inl:
+        * DAnCE/Planner/Node_T.cpp:
+        * DAnCE/Planner/PCVisitor.h:
+        * DAnCE/Planner/PCVisitor.cpp:
+        * DAnCE/Planner/PCVisitorBase.h:
+        * DAnCE/Planner/PCVisitorBase.inl:
+        * DAnCE/Planner/PCVisitorBase.cpp:
+        * DAnCE/Planner/Planner.mpc:
+        * DAnCE/Planner/Planner.cpp:
+
+          Checking in the Planner for DAnCE which creates a Deployment
+          Plan on the fly (in-memory).
+
+        * RACE/Input_Adapters/LocationUpdater/Injector.cpp:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cdp:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cidl:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater.idl:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_deployment.dat:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec_export.h:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_stub_export.h:
+        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_svnt_export.h:
+        * RACE/Input_Adapters/LocationUpdater/Location_Updater.mpc.disable:
+        * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.h:
+        * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.inl:
+        * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.cpp:
+        * RACE/Input_Adapters/LocationUpdater/PlanUpdater.h:
+        * RACE/Input_Adapters/LocationUpdater/PlanUpdater.cpp:
+        * RACE/Input_Adapters/LocationUpdater/README.txt:
+
+          Adding the LocationUpdater which is a RACE input adapter which
+          updates the locations of the implementation artifact to reclect
+          the ones available in the RepositoryManager. Please see the README
+          and the code for more info.
+
+        * RACE/Input_Adapters/PlanGenerator/Injector.cpp:
+        * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.h:
+        * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.inl:
+        * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.cpp:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.h:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cidl:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cpp:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.idl:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.mpc.disable:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_deployment.dat:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec_export.h:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_stub_export.h:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_svnt_export.h:
+        * RACE/Input_Adapters/PlanGenerator/README.txt:
+
+          Adding the PlanGenerator which is a RACE input adapter which queries
+          the RepositoryManager for an installation name, retrieves the corresponding
+          PackageConfiguration, and builds the DeploymentPlan on the fly. Please see
+          the README and the code for more info.
+
+Mon May 29 21:58:18 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+
+          Got rid of the code that updates the loader path for the
+          libraries downloaded via HTTP. Now this has to be done
+          manually.
+
+        * DAnCE/RepositoryManager/PC_Updater.cpp:
+        * DAnCE/RepositoryManager/README.txt:
         * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-          Throw NO_MEMORY when allocation fails
 
-        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
-          Throw BAD_PARAM when an incorrect method parameter has been passed
+          Changing the way library names are matched to be more general.
+          Some additions to the README
+          A minor change to one of the functions
 
-        * DAnCE/NodeManager/BaseMonitor.h:
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-        * DAnCE/NodeManager/NodeManager_Impl.h:
-          Doxygen changes
+Mon May 29 19:07:54 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Fixed a comment
+        * DAnCE/NodeApplication/Configurator_Factory.cpp:
+        * DAnCE/NodeManager/MonitorController.cpp:
+        * examples/Swapping/Sender/Sender_exec.cpp:
 
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
-          Use true/false for bool
+          Changed C-style casts from void* to pointer-to-function
+          to two-step reinterpret_cast<>s, with ptrdiff_t as a
+          temporary intermediate. C++ forbids casting directly
+          between pointer-to-object and pointer-to-function, and
+          some the newer compilers are catching it.
 
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-          Layout changes
+Mon May 29 17:44:01 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Removed not needed includes, made messages dependent
-          on the debug level, added missing duplicate
+        * examples/Display/Display_Base/Display_Base.mpc:
 
-        * DAnCE/TargetManager/TargetManager_exec.h:
-          Don't use std:: for auto_ptr
+          Changed the base project of Display_Base_stub from
+          ciao_client_dnc to ciao_events_base_dnc, in order to pull
+          in a needed dependency on CIAO_DnC_Container. Thanks to
+          Ming Xiong <mxiong@dre.vanderbilt.edu> for supplying the
+          fix.
 
-        * DAnCE/TargetManager/TargetManagerExt.idl:
-          Removed commented out include
+Mon May 29 15:32:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * DAnCE/TargetManager/TargetManagerImpl.idl:
-          Removed empty lines
+        * examples/Display/NavDisplay/NavDisplay.mpc:
 
-        * DAnCE/tests/NodeApplicationTest/run_test.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
-        * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl:
-        * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl:
-        * examples/Display/descriptors/basicNodeDaemon.pl:
-        * examples/Display/descriptors/run_NodeDaemons.pl:
-        * examples/Hello/descriptors/run_NodeDaemons.pl:
-          Use $ACE_ROOT/bin with use lib. This fixes bugzilla bug 2737,
-          thanks for Abdul for reporting this.
+          Cosmetic changes (shortened long lines).
 
-        * docs/tutorials/Quoter/Simple/01.html:
-          Update from Abdul
+        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc:
 
-Fri Dec  1 16:27:34 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Changed 'after +=' and 'libs +=' lines to reflect recent
+          changes to other examples/Display projects.
 
-        * bin/generate_component_mpc.pl:
+Fri May 26 13:57:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Fixed generation of export files. Thanks to Abdullah
-          Sowayan <abdullah.sowayan@lmco.com> for reporting
-          the problem.
+        * DAnCE/RepositoryManager/RMAdmin.cpp(ACE_TMAIN):
 
-Fri Dec  1 13:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Fixed unused variable warning, cosmetic changes.
 
-        * docs/tutorials/CoSMIC/index.html:
-        * docs/tutorials/Quoter/Simple/index.html:
-          Updated download location of ACE/TAO/CIAO
+Fri May 26 12:59:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Fri Dec  1 11:26:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeManager/NAM_Map.cpp:
+          Make the equality test explicit to work with the revised octet
+          sequence implementation.
 
-        * DAnCE/ExecutionManager/Execution_Manager.cpp:
-          Fixed invalid check whether we have a nil POA or not
+Thu May 25 19:02:52 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Fri Dec  1 11:17:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ciao/Container_Base.cpp(ciao_install_home):
 
-        * DAnCE/TargetManager/Deployment_Configuration.{h,cpp}:
-          Removed these files, not used in the mpc file
+          Changed the single-step reinterpret_cast of the component
+          DLL entry points to be a two-step process: first to the
+          integer type 'ptrdiff_t' then to the desired pointer-to-
+          function type. A single cast won't work because casting
+          from pointer-to-object (even void*) to pointer-to-function
+          directly is not allowed in C++.
 
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.{h,cpp}:
-          Close the file handle, part of the fix for bugzilla bug 2733
+Thu May 25 11:50:39 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * DAnCE/TargetManager/DomainDataManager.{h,cpp}:
-          Const changes, sequences have a CORBA::ULong as length, not int.
-          Added some todo's and use a little bit more ACE
+        * ciao/Container_Base.cpp:
+          Replace the use of static_cast in ciao_install_home with
+          reinterpret_cast since void* sources are involved.
 
-        * DAnCE/TargetManager/TargetManager.cidl:
-          Removed empty line
+Wed May 24 17:35:53 UTC 2006  Nanbor Wang  <nanbor@exothermic.txcorp.com>
 
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Fixed memory management and the way we check for a nil
-          reference
+        * examples/Display/RateGen/RateGen.mpc: Fixed the project
+          dependency for controller.
 
-Fri Dec  1 09:01:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue May 23 22:46:58 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
 
-        * bin/generate_component_mpc.pl:
-          Layout improvements, thanks to Abdul for making this
-          update.
+        * DAnCE/RepositoryManager/Options.cpp
+        * DAnCE/RepositoryManager/Options.h
+        * DAnCE/RepositoryManager/RMadmin.cpp
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+        * DAnCE/RepositoryManager/RepositoryManager.cpp
 
-Thu Nov 30 12:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added the code to save the state of the RepoMan at exit and
+          load the state of it at start.
 
-        * DAnCE/ExecutionManager/Execution_Manager.cpp:
-          Removed not needed ACE_TRY_CHECK
+Tue May 23 14:31:11 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
 
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
-          Const improvement
+        * DAnCE/RepositoryManager/Options.cpp
+        * DAnCE/RepositoryManager/Options.h
+        * DAnCE/RepositoryManager/RMadmin.cpp
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+        * DAnCE/RepositoryManager/RepositoryManager.cpp
 
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-          Initialise pointer with 0, removed code after return
-          added added a todo
+          Added the naming service & the implementation of createPackage
+          function to RepoMan.
 
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-          Doxygen improvement
+Mon May 22 18:49:14 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
-          Lot of layout changes to make the code a little bit more
-          readable, more has to be done to this file
+        * ciao/Container_Base.cpp(ciao_install_home):
+
+          Changed C-style casts of DLL entrypoints to static_cast<>s
+          to the appropriate pointer to function. This change is
+          intended to eliminate warnings from gcc 4.0.
+
+Fri May 19 16:49:32 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+        * DAnCE/NodeApplicationManager/URL_Parser.cpp:
+        * DAnCE/NodeManager/Node_Manager.cpp:
+
+          Minor changes to eliminate scoreboard warnings, and to bring
+          code in line with the ACE style guidelines.
+
+Thu May 18 20:28:00 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com>
+
+        * examples/Display/GPS/GPS_Impl.ccd:
+        * examples/Display/NavDisplay/NavDisplay_Impl.ccd:
+        * examples/Display/RateGen/RateGen_Impl.ccd:
+
+        Removed these generated files from CVS.
+
+Thu May 18 11:28:52 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+
+        * examples/Display/Display_Base/GNUmakefile:
+        * examples/Display/Display_Base/GNUmakefile.Display_Base_stub:
+        * examples/Display/Display_Base/GNUmakefile.Display_Base_svnt:
+
+          Removed these files from CVS.
+
+Wed May 17 21:20:46 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com>
+
+        * TAO/CIAO/examples/Display:
+          Ported the Display example to use the new CIAO framework
+
+
+Tue May 16 12:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
+        * README:
+          Removed mentioning of vc6
+
+Mon May 15 20:48:52 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * CIDLC/ServantSourceGenerator.cpp (generate):
+
+          Removed commented-out code.
+
+        * CIDLC/ServantHeaderGenerator.cpp (generate_facets):
+
+          Fixed cut-and-paste error that was causing facet servant
+          class declaration to get skipped when the composition is
+          defined inside one or more IDL modules.
+
+Fri May 12 07:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/Utils/Functors.h:
+          Added a workaround for specific for BCB6, should fix the gcc4
+          internal compiler errors
+
+Fri May 12 07:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/XSCRT/Elements.hpp:
+          The work around is needed for < gcc 3.3 and also BCB6, so make
+          it a little bit more easier to handle this.
+
+Thu May 11 21:24:45 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * CIDLC/Literals.cpp:
+        * CIDLC/Literals.hpp:
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantHeaderGenerator.hpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.hpp:
+        * CIDLC/UtilityTypeNameEmitters.cpp:
+        * CIDLC/UtilityTypeNameEmitters.hpp:
+
+          Change code generation for facet servant classes to be
+          defined in a special namespace created from a prefix
+          and a flattened version of the name of the scope
+          containing the interface that supports the facet. This
+          change enables facets in the same translation unit
+          using the same interface to use a single source code
+          definition (an internal check in the CIDL compiler
+          guarantees that the facet servant class is generated
+          once per interface per translation unit). The fact
+          that the actual facet servant class type is an instantiation
+          of a template class ensures that the same interface type
+          used as a facet in multiple translation units in a build
+          will not produce multiple-definition link errors,
+          although in this case there will be duplicated code.
+          Thanks to James Hill <j.hill@vanderbilt.edu> for providing
+          the multiple-facet-single-translation-unit use case
+          and to Nanbor Wang <nanbor@txcorp.com> for his comments
+          on the proposed solution.
+
+Wed May 10 14:04:57 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/NodeManager/MonitorCB.cpp
+        * DAnCE/TargetManager/CmpClient.cpp
+        * DAnCE/TargetManager/DomainDataManager.cpp
+
+        Fixes for warnings.
+
+Mon May  8 20:41:43 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
+
+        * bin/PerlCIAO/perlciao.mpc:
+
+        Fixing a fuzz build error due to a missing Id tag
+
+Mon May  8 15:33:58 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
+
+        * DAnCE/RepositoryManager/HTTP_Client.h:
+        * DAnCE/RepositoryManager/HTTP_Client.cpp:
+        * DAnCE/RepositoryManager/HTTP_Handler.h:
+        * DAnCE/RepositoryManager/HTTP_Handler.cpp:
+        * DAnCE/RepositoryManager/Options.h:
+        * DAnCE/RepositoryManager/Options.cpp:
+        * DAnCE/RepositoryManager/PC_Updater.h:
+        * DAnCE/RepositoryManager/PC_Updater.cpp:
+        * DAnCE/RepositoryManager/PC_Updater_T.h:
+        * DAnCE/RepositoryManager/PC_Updater_T.cpp:
+        * DAnCE/RepositoryManager/README.txt:
+        * DAnCE/RepositoryManager/RM_Helper.h:
+        * DAnCE/RepositoryManager/RM_Helper.cpp:
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager.cpp:
+        * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+        * DAnCE/RepositoryManager/URL_Parser.h:
+        * DAnCE/RepositoryManager/URL_Parser.cpp:
         * DAnCE/RepositoryManager/ZIP_Wrapper.h:
-          Doyxgen improvements and removed not needed include
+        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
 
-        * DAnCE/TargetManager/CmpClient.cpp:
-          Use true/false for a bool
+        Updating the RepositoryManager with the latest changes from the
+        escher repository. Adding my newest changes. Adding some new
+        minor features.
+
+        * bin/PerlCIAO/TestUtils.base:
+        * bin/PerlCIAO/TestUtils.pm:
+        * bin/PerlCIAO/TestUtils_Base.pm:
+        * bin/PerlCIAO/generate_container.pl:
+        * bin/PerlCIAO/perlciao.mpc:
+
+        This is a set of test utilities tailored towards testing CIAO components.
+        It provides a nice and quick interface provising the common functionality
+        necessary to run a CIAO test and perform clean-up on failure. This utils
+        are a wrapper around the $ACE_ROOT/bin/PerlACE/ utilities. I will check in
+        an example of how test utils are used shortly.
+
+        * tools/Config_Handlers/IDD_Handler.cpp:
+
+        Fixing a bug in the PackageConfiguration reverse handler.
+
+
+Fri May  5 15:36:47 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
+
+        * docs/cidlc.html Added documentation for the CIDL compiler.
+          Thanks to Boris for contributing this.
+
+        * docs/index.html: Fixed some broken links to the tutorials and added
+          a link to Ming's tutorial example that shows how to use CoSMIC.
+
+Fri May  5 16:58:17 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * DAnCE/ExecutionManager/Execution_Manager.cpp (CIAO): Fixed the
+          parsing of command line options.
+
+Thu May  4 21:35:01 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/ADD_Handler.cpp
+        * tools/Config_Handlers/DP_Handler.cpp
+
+        Fixed a reverse handler bug.
+
+Thu May  4 08:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/RepositoryManager/PC_Updater.cpp:
+          Fixed compilation error
 
-        * DAnCE/TargetManager/Deployment_Configuration.cpp:
-          Use bool and use 0 instead of NULL
+Wed May  3 22:11:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/schema/Basic_Deployment_Data.xsd
+        * docs/schema/ccd.xsd
+        * docs/schema/cdd.xsd
+        * docs/schema/cdp.xsd
+        * docs/schema/cid.xsd
+        * docs/schema/cpd.xsd
+        * docs/schema/iad.xsd
+        * docs/schema/pcd.xsd
+        * docs/schema/toplevel.xsd
+
+          Schema propagated from the ARMS repo.
+
+Wed May  3 12:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Config_Handlers/Utils/Functors.h:
+          Made the FUNC argument just return void, this fixes the errors with this
+          template with BCB on my system, hopefully it doesn't break other
+          compilers
+
+Tue May  2 03:04:50 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/NodeApplication.cpp:  Removed the code
+          snippet that bootstraps the NodeApplication process at a
+          specific OS priority.
+
+Wed Apr 26 21:25:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Config_Handlers.mpc
+        * tools/Config_Handlers/Property_Handler.h
+        * tools/Config_Handlers/SatisfierProperty_Handler.h
+        * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+        * tools/Config_Handlers/Utils/Functors.h
+
+          Introduced a workaround for a ICE in GCC 4.0.22.
+
+Wed Apr 26 13:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/DP_Handler.cpp:
+        * tools/Config_Handlers/XML_File_Intf.cpp:
+        * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp:
+        * tools/Config_Handlers/XSCRT/XMLSchema.hpp:
+        * tools/Config_Handlers/XSCRT/Elements.hpp:
+        * tools/Config_Handlers/XSCRT/XML.hpp:
+          Removed workarounds for vc6 again
+
+        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h:
+          Added missing post.h
+
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h:
+        * tools/Config_Handlers/Package_Handlers/PC_Intf.h:
+          Fixed incorrect file tags
+
+Wed Apr 26 08:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/TargetManager/DomainDataManager.h:
-          Doxygen changes
+          Fixed compile problem in gcc4 build
 
-        * DAnCE/TargetManager/DomainEvents.idl:
-          Removed not needed include
+Tue Apr 25 21:27:05 UTC 2006  William R. Otte <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/TargetManager.mpc
+
+          Linking problems for Borland.
+
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
 
+          More compile fixes for Borland.
+Tue Apr 25 20:12:25 UTC 2006  William R. Otte <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.h
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
+        * ciao/Deployment_Core.idl
+        * tools/Config_Handlers/ADD_Handler.cpp
+        * tools/Config_Handlers/CCD_Handler.cpp
+        * tools/Config_Handlers/CEPE_Handler.cpp
+        * tools/Config_Handlers/CEPE_Handler.h
+        * tools/Config_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/DP_Handler.cpp
+        * tools/Config_Handlers/Deployment.hpp
+        * tools/Config_Handlers/ERE_Handler.cpp
+        * tools/Config_Handlers/ERE_Handler.h
+        * tools/Config_Handlers/MDD_Handler.cpp
+        * tools/Config_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/PCD_Handler.h
+        * tools/Config_Handlers/Property_Handler.cpp
+        * tools/Config_Handlers/Property_Handler.h
+        * tools/Config_Handlers/Req_Handler.cpp
+        * tools/Config_Handlers/Req_Handler.h
+        * tools/Config_Handlers/SatisfierProperty_Handler.cpp
+        * tools/Config_Handlers/SatisfierProperty_Handler.h
+        * tools/Config_Handlers/cdp.hpp
+        * tools/Config_Handlers/toplevel.hpp
+        * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.h
+
+        Compilation fixes for borland, some cosmetic fixes as well.
+
+Tue Apr 25 09:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/CPD_Handler.h:
+          ComponentPortDescription is a struct, so also forward declare it
+          as a struct
+
+Mon Apr 24 18:53:22 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * CIDLC/ServantSourceGenerator.cpp
+
+          Fixed a code generation problem caused by careless merging.
+
+Mon Apr 24 18:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/ADD_Handler.cpp:
+        * tools/Config_Handlers/DP_Handler.cpp:
+        * tools/Config_Handlers/ID_Handler.h:
+          Removed incorrect semi colons
+
+Mon Apr 24 06:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/IDREF_Base.cpp:
+          Removed not needed semi colon that caused compile errors in some
+          builds
+
+Sun Apr 23 11:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/Utils/XML_Helper.h:
+          Fixed compile error
+
+Sat Apr 22 21:13:10 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp
+        * tools/Config_Handlers/Deployment.hpp
+        * tools/Config_Handlers/ccd.hpp
+        * tools/Config_Handlers/cdd.hpp
+        * tools/Config_Handlers/cdp.hpp
+        * tools/Config_Handlers/cid.hpp
+        * tools/Config_Handlers/cpd.hpp
+        * tools/Config_Handlers/iad.hpp
+        * tools/Config_Handlers/pcd.hpp
+        * tools/Config_Handlers/toplevel.hpp
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+
+        Compile errors.
+
+Fri Apr 21 16:24:46 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Merge from the ARMS Escher repository.
+
+          Changelog entries to follow:
+
+   Tue Apr 11 09:29:12 UTC 2006    <wotte@blade35.isislab.vanderbilt.edu>
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.h
+        * DAnCE/NodeManager/Node_Manager.cpp
+
+        Additional debugging/compile fixes.
+
+  Tue Apr 11 08:30:42 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * ciao/Deployment_Core.idl
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+        * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
+        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
+
+          Modified to passivate (and reactivate later) shared components
+          when tearing down an assembly.
+
+  Sun Apr  9 01:03:19 UTC 2006    <wotte@blade35.isislab.vanderbilt.edu>
+
+        * M APRIL_DEMO.mwc
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/ExecutionManager/Execution_Manager.cpp
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeManager/MonitorCB.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
+        * DAnCE/NodeManager/Node_Manager.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+
+          Various compile/runtime fixes.
+
+  Fri Apr  7 15:47:34 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+
+          Modified to enforce passivation occured on all components
+          before any connections are removed.
+
+  Fri Apr  7 03:28:03 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
+
+        * tools/Config_Handlers/Utils/XML_Helper.cpp:
+
+          Replaced "throw;" (which Stroustrup tells us causes an abort)
+          with "throw 0;" (kind of like an unnamed exception, which is
+          clearly what the author of this code intended).
+
+        * ciao/Packaging_Data.idl:
+
+          I've had occasion to use this file with the IFR Service, and
+          I've found that the IFR Service backend chokes on a bunch of
+          stuff here.  The stuff that it chokes on has been protected with
+          "#ifndef AVOID_IFR_CRASH" so that you can protect the backend
+          from crashing if you pass -DAVOID_IFR_CRASH to tao_ifr.
+
+        * ciao/Servant_Impl_Base.cpp:
+        * ciao/Servant_Impl_Base.h:
+
+          Implemented the add_receptacle operation.
+
+  Fri Apr  7 02:55:37 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
+
+          Added ACE_CATCHANY and ACE_CATCHALL blocks in
+          Plan_Launcher_i::launch_plan to avoid crashing in case of CORBA
+          fault.
+
+  Fri Apr  7 02:54:29 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
+
+        * DAnCE/NodeApplication/Configurator_Factory.cpp:
+
+          Options beginning with "-ORB" are explicitly ignored.  This
+          avoids having an "-ORB" option mistakenly parsed as being a
+          "-o <ior_output_file>" option.
+
+  Fri Apr  7 02:51:31 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
+
+        * CIDLC/ServantSourceGenerator.cpp:
+
+        Added code to support "get_all_receptacles" operation.
+
+  Fri Apr  7 02:47:02 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
+
+        * CCF/CCF/IDL2/SemanticGraph/Enum.hpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp:
+
+        Made a couple small changes that keep the CIDLC from coughing on
+        enums
+
+  Fri Apr  7 02:37:34 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+
+          Fixed a bug in detecting External connection and Internal
+          connections. Earlier when an external component is detected,
+          not *all* connections associated with this components are
+          purged from the to-be-removed connections list. Added another
+          helper method <purge_connections> to accomplish this task.
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+
+          Modified to reuse rebind() instead of bind() to avoid
+          redeployment duplicate instance errors.
+
+  Thu Apr  6 15:02:59 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/NodeApplication.cpp:
+
+        Modified the NodeApplications to up at OS priority 20 instead of
+        50.
+
+  Thu Apr  6 00:35:35 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
+
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+        * DAnCE/NodeManager/MonitorCB.cpp:
+        * DAnCE/NodeManager/MonitorController.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+
+        * DAnCE/TargetManager/DomainDataManager.cpp:
         * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Layout changes
 
-        * DAnCE/TargetManager/TM_Client.mpc:
-          Removed not needed includes
+          Fixed the TM component removal problem. Changed/Removed
+          debug messages.
 
-Wed Nov 29 21:26:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+  Wed Apr  5 16:54:20 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * docs/generate_component_mpc.html:
+        * tools/Config_Handlers/Any_Handler.cpp
+        * tools/Config_Handlers/DP_Handler.cpp
+        * tools/Config_Handlers/IDD_Handler.cpp
+        * tools/Config_Handlers/MDD_Handler.cpp
+        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
 
-          New file, documentation for the Perl script
-          generate_component_mpc.pl, in CIAO_ROOT/bin.
+          Improvements to output more information in the reverse handler.
 
-        * bin/generate_component_mpc.pl:
 
-          Changes mainly to correct problems with MPC files
-          generated for non-component builds, i.e., from some IDL
-          file used in common by multiple component builds, such
-          as the definition of a port interface. Also made changes
-          and added a new command line option to help minimize the
-          amount of code generated from IDL and minimize the
-          dependencies of the generated makefile or project.
+  Thu Mar 30 22:10:53 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
-Wed Nov 29 15:43:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeApplication/Container_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * ciao/Home_Servant_Impl_T.cpp
+        * ciao/Servant_Activator.cpp
+        * tools/Config_Handlers/DD_Handler.cpp
+        * tools/Config_Handlers/IDREF_Base.cpp
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+
+        Disabled excessive debugging.
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
+
+        Disabled RT-CCM support.
+
+        * DAnCE/TargetManager/DomainDataManager.cpp
+
+        Added error messages.
+
+  Wed Mar 29 21:34:07 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
 
         * DAnCE/NodeManager/CIAO_Monitor.cpp:
-          Don't use plain new, fixes bugzilla bug 2732. Thanks to Abdul
-          for reporting this
+          Fixed a Access Error in the monitor.
 
-Wed Nov 29 12:48:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeManager/MonitorCB.cpp:
+        * DAnCE/NodeManager/MonitorController.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+          Added to have graceful termination.
 
-        * ciao/*.idl:
-          Added ciao/ as prefix to the include path. This way it is clear
-          where we are including a file from.
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Update to turn off monitors at the end.
 
-Tue Nov 28 21:38:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+  Mon Mar 27 22:39:25 UTC 2006  William R. Otte    <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/RTNodeApplication:
-          Zapped, not used anymore
+        * tools/Config_Handlers/Utils/XML_Helper.cpp
+        * tools/Config_Handlers/Utils/XML_Helper.h
 
-Tue Nov 28 19:33:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+  Mon Mar 27 20:10:09 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-        * ciao/Deployment_DomainApplicationManager.idl:
-          Added comments about more details which are not compliant according
-          to the spec
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+          (get_node_manager):
+
+          Modified this method to re-throw the caught exception.
+
+  Sun Mar 26 22:10:16 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
         * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-          Use native bool instead of int
 
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h:
-          Reordered includes and improved doxygen documentation
+        Added code to handle exceptions while trying to connect to the
+        node managers in get_node_manager ().
 
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-          Const changes, use ACE_ERROR for error messages
+        * DAnCE/TargetManager/DomainDataManager.cpp:
 
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-          Const changes, use more ACE and little cleanup
+        Added debug messages.
 
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-          Doxygen improvement
+        * RACE/Controller/Component/RACE_common.h:
 
-        * DAnCE/NodeManager/MonitorCB.cpp:
-          Code layout changes
+        Added a new file to define the RACE_DEBUG and RACE_ERROR macros.
+
+  Mon Mar 27 00:22:02 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+
+          Modified to allow ccm_passicate to be called on all components
+          before actually deactivating any components.
+
+  Thu Mar 23 23:18:56 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * DAnCE/NodeManager/MonitorController.cpp (svc):
+
+        Removed an unwanted debug statement.
+
+  Thu Mar 23 22:54:25 UTC 2006  Nishanth Shankarn  <nshankar@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+
+        Removed an unwanted debug statement.
 
-        * DAnCE/NodeManager/MonitorCB.h:
-          Doxygen changes and added some todo's
+  Thu Mar 23 19:40:54 UTC 2006  Nishanth Shankarn  <nshankar@dre.vanderbilt.edu>
 
+        * APRIL_DEMO.mwc:
+        * CIAO.mwc:
+        * CIAODAnCE.mwc:
+        * CIAOTAO.mwc:
+        * CIAO_TAO_DAnCE.mwc:
+
+        Modified the mwc files so that they exclude the RACE/hog_string
+        directory.
+
+  Thu Mar 23 18:04:58 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+
+        Fixed a bug in set_priority method.
+
+  Wed Mar 22 19:32:37 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
+
+        Modified to make debug statements debug_level controlled.
+
+  Wed Mar 22 00:51:11 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
+
+        Modified to find the corresponding NAM when given a plan_uuid.
+
+  Wed Mar 22 02:12:58 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
+
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+        * DAnCE/NodeManager/MonitorCB.cpp:
         * DAnCE/NodeManager/MonitorController.cpp:
-          Use bool and small improvements
 
-        * DAnCE/NodeManager/Node_Manager.cpp:
-          Use the correct value for the lenght of the buffer passed
-          to hostname
+        Removed some of the debug statements
+
+  Tue Mar 21 19:12:57 UTC 2006  Nishanth Shankarn  <nshankar@dre.vanderbilt.edu>
+
+        * RACE/hog_string/hog.cdp:
+
+        Fixed the plan id.
+
+  Mon Mar 20 21:07:50 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+
+          turning off the HTTP capability for Linux until I figure out why
+          it affects the loading of libraries.
+
+  Mon Mar 20 20:40:37 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+
+          Changed loader path delimiter on Unix-like systems from ';' to ':'
+
+
+  Mon Mar 20 17:22:22 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/HTTP_Client.h:
+        * DAnCE/NodeApplicationManager/HTTP_Client.cpp:
+        * DAnCE/NodeApplicationManager/HTTP_Handler.h:
+        * DAnCE/NodeApplicationManager/HTTP_Handler.cpp:
+        * DAnCE/NodeApplicationManager/URL_Parser.h:
+        * DAnCE/NodeApplicationManager/URL_Parser.cpp:
+
+          Oops. Forgot to add the actual HTTP code.
+
+  Mon Mar 20 04:27:48 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.h:
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
+
+          Adding HTTP capability to DAnCE.
 
+        * DAnCE/RepositoryManager/HTTP_Client.h:
+        * DAnCE/RepositoryManager/HTTP_Client.cpp:
+        * DAnCE/RepositoryManager/HTTP_Handler.h:
+        * DAnCE/RepositoryManager/HTTP_Handler.cpp:
+        * DAnCE/RepositoryManager/Options.h:
+        * DAnCE/RepositoryManager/Options.cpp:
+        * DAnCE/RepositoryManager/PC_Updater.h:
+        * DAnCE/RepositoryManager/PC_Updater.cpp:
+        * DAnCE/RepositoryManager/PC_Updater_T.h:
+        * DAnCE/RepositoryManager/PC_Updater_T.cpp:
+        * DAnCE/RepositoryManager/RM_Helper.h:
+        * DAnCE/RepositoryManager/RM_Helper.cpp:
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager.mpc:
+        * DAnCE/RepositoryManager/RepositoryManager.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+        * DAnCE/RepositoryManager/URL_Parser.h:
+        * DAnCE/RepositoryManager/URL_Parser.cpp:
+        * DAnCE/RepositoryManager/ZIP_Wrapper.h:
+        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
+
+          Porting the RepositoryManager to the newest XML config handlers.
+          Also migrating the code from the DOC repository to ensure the gap
+          between the code in this repository and that in cvs.doc.wustl.edu
+          repo is closed.
+
+
+          NOTE: I still have some testing left, but before that I need to
+          compile the CoSMIC version from this repository and regenerate
+          a bunch of descriptors because all the example descriptors are
+          broken.
+
+  Sat Mar 18 22:33:10 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * DAnCE/Interfaces/NodeManager.idl
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.h
+        * ciao/Deployment.idl
+
+          Put the struct Sched_Params definition outside of the NAM
+          interface.
+          Cleaned up the code a bit.
+
+  Sun Mar 19 16:52:54 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/CmpClient.cpp:
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Updated to implement the commitResource and releaseResource
+          function
+
+  Sat Mar 18 19:01:18 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/NodeApplication.cpp:
+
+        Enhanced the NodeApplication to run in realtime priority mode.
+
+  Fri Mar 17 06:36:18 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
+
+        * DAnCE/Interfaces/NodeManager.idl:
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+
+        * DAnCE/NodeManager/MonitorCB.cpp:
+        * DAnCE/NodeManager/MonitorController.h:
+        * DAnCE/NodeManager/MonitorController.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.h:
         * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Small improvements and added some todo's
+        * ciao/Deployment.idl:
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
-          Cleanup
+          Implemented the set_priority method on the NodeManager
+          and NodeApplicationManager interface. Removed some of the debug
+          messages
 
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-          Made some debug lines dependent on a debug level
+  Thu Mar 16 03:54:39 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/DD_Handler.cpp:
+          Updated the handler to handle optional parameters
+
+  Tue Mar 14 07:01:28 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.h:
+          Updated to make it portable in windows
 
-Tue Nov 28 16:11:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+        * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp:
+          Fixed the entry point.
 
+  Mon Mar 13 23:04:32 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
+
+        * tools/Config_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/DataType_Handler.h
+        * tools/Config_Handlers/ID_Handler.h
+        * tools/Config_Handlers/Property_Handler.h
+        * tools/Config_Handlers/Req_Handler.h
+        * tools/Config_Handlers/SatisfierProperty_Handler.h
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
         * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-        * DAnCE/NodeManager/Monitor.mpc
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.h
+        * tools/Config_Handlers/Utils/XercesString.h
 
-          Fixes for link errors in OS X.
+          Fixed linking/warnings on Windows.
 
-Tue Nov 28 11:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+  Mon Mar 13 18:27:27 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-        * CIDLC/ExecutorMappingGenerator.cpp:
-          Updated because of idl file rename
+        * DAnCE/TargetManager/TargetManager.mpc:
+          Changed the projects to depend on NodeManager_Stub. This will fix the
+          linking errors in Windows.
 
-Tue Nov 28 10:42:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+  Mon Mar 13 17:36:28 UTC 2006  Krishnakumar B  <kitty@dre.vanderbilt.edu>
 
-        * ciao/*:
-        * *:
-          Renamed a lot of idl files, if the file contains interfaces/types
-          from the DAnCE spec, added Deployment_ as prefix, if they are
-          containing CIAO specific interfaces, added CIAO_. This way we can
-          more easily see if we have spec compliant IDL or not.
+        * CIDLC/ServantSourceGenerator.cpp (namespace): Updated the
+          generated code to set the component id on the component context
+          class to allow retrieving the id at run-time from an executor
+          implementation.
 
-Tue Nov 28 09:50:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+  Mon Mar 13 17:28:44 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
 
-        * ciao/CCM_Home.idl:
-        * ciao/CCM_Object.idl:
-          Moved CCMHome again to its own file
+        * DAnCE/ExecutionManager/Execution_Manager.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
 
-        * ciao/Security.idl:
-          CIAO uses an interface of the security service but we don't
-          do a thing with it, so just define a local interface within
-          CIAO and use that for the moment, saves 250Kb of footprint
+          Fixes for nameservice discovery of EM.
 
-        * ciao/CCM_Context.idl:
-          Use the local security interface
+        * docs/schema/toplevel.xsd
 
-        * ciao/ExectionManager.idl:
-          Added todo
+          Minor correction to schema.
 
-        * ciao/CCM_Core.idl:
-          Added new file
+  Fri Mar 10 17:03:26 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
 
-Mon Nov 27 18:34:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
 
-        * ciao/NodeApplicationManager.idl:
-        * ciao/Deployment_ApplicationManager.idl:
-          Moved ApplicationManager interface to its own file
+          Fixed minor bug in URI interface.
 
-        * ciao/CCM_Core.mpc:
-          Added new file
+  Thu Mar  9 22:26:17 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * ciao/DomainApplicationManager.idl:
-        * ciao/TargetManager.idl:
-          Updated includes
+        * ciao/Context_Impl_Base.cpp:
+        * ciao/Context_Impl_Base.h:
 
-        * ciao/Target_Data.idl:
-          Moved ResourceNotAvailable also to the new
-          Deyloyment_ApplicationManger file
+          Added CORBA::String_var member to store the component instance
+          id, also added a pair of set/get methods called _ciao_instance_id.
 
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-          Removed include of memory, not portable and not used.
-          Fixes bugzilla bug 2730. Thanks to Abdul for reporting
-          this.
+  Wed Mar  8 19:07:31 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
 
-Mon Nov 27 15:41:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
 
-        * ciao/Deployment_Core.idl:
-        * ciao/Deployment_Container.idl:
-        * ciao/Deployment_NodeApplication.idl:
-          Moved types from Core to the other files and added remarks
-          to all CIAO specific types
+          Add error message for connection failure.
 
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h:
-        * DAnCE/NodeApplicationManager/ImplementationInfo.h:
-          Updated includes because of the move above
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
 
-Mon Nov 27 14:55:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Disabled this project.
 
-        * ciao/CCM_Core.mpc:
-          Added new Deployment_DeploymentPlan
+        * DAnCE/TargetManager/TargetManager_exec.cpp
+        * DAnCE/TargetManager/TargetManager_exec.h
 
-        * ciao/Deployment_Data.idl
-        * ciao/Deployment_DeploymentPlan.idl:
-          Moved types related to DeploymentPlan to their own file
+          Fix entry point problems.
 
-        * ciao/Deployment_Data.idl
-          Removed RequirementSatisfier, it is superfluous.
+  Wed Mar  8 19:29:20 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-        * ciao/Deployment.idl:
-          No need to include Deployment_Data
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+        * DAnCE/TargetManager/TargetManagerExt.idl:
+        * DAnCE/TargetManager/TargetManager_exec.h:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Added the structure in the TMExt interface to maintain the
+          mapping between hostname to NM refs.
 
-        * ciao/Target_Data.idl:
-          Removed not needed include
+  Wed Mar  8 14:40:41 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * ciao/Deployment_Connection.idl:
-        * ciao/TargetManager.idl:
-        * RACE/Output_Adapters/Interface/PlanEgress.idl:
-        * RACE/Plan_Analyzer/Interface/PlanIngress.idl:
-        * RACE/Planner_Manager/Interface/Planner_Manager_I.idl:
-        * RACE/Planners/Interface/Planner_I.idl:
-          Updated include because of move above
+        * tools//Config_Handlers/Deployment.cpp
+        * tools//Config_Handlers/Deployment.hpp
+        * tools//Config_Handlers/GNUmakefile
+        * tools//Config_Handlers/cdd.cpp
+        * tools//Config_Handlers/cdd.hpp
+        * tools//Config_Handlers/pcd.cpp
+        * tools//Config_Handlers/pcd.hpp
+        * tools//Config_Handlers/toplevel.cpp
+        * tools//Config_Handlers/toplevel.hpp
+        * tools//Config_Handlers/Package_Handlers/PCD_Handler.cpp
+        * tools//Config_Handlers/Package_Handlers/PCD_Handler.h
 
-        * tools/Config_Handlers/DnC_Dump.{h,cpp}:
-          Removed RequirementSatisfier
+        New generated code.
 
-Mon Nov 27 14:11:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+  Wed Mar  8 03:11:02 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-        * ciao/Deployment.idl:
-          Removed LastConfiguration, it is not used and has been zapped
-          from the DAnCE spec
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Implement the Signal Handler for the process NodeManager. And
+          set the option avoid_zombies=0
 
-Mon Nov 27 14:04:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ciao/Deployment_Core.idl:
-        * ciao/Deployment_NodeApplication.idl:
-          Moved ESInstallationInfo to NodeApplication file
+        * DAnCE/NodeManager/MonitorController.h:
+        * DAnCE/NodeManager/MonitorController.cpp:
 
-        * ciao/Deployment.idl:
-          LastConfiguration doesn't seem used, added a comment to that
-          exception.
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Implement ComponentID to Process Id mapping
 
-        * ciao/NodeApplicationManager.idl:
-          Doxygen improvement
+  Tue Mar  7 23:26:41 UTC 2006  Nilabja Roy  <nilabjar@localhost.localdomain>
 
-Mon Nov 27 13:23:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/TargetManager/DomainDataManager.cpp
+        * DAnCE/TargetManager/TargetManagerExt.idl
+        * DAnCE/TargetManager/TargetManager.mpc:
+        Changed to depend on the NodeManager_Stub, so that
+        CIAO::NodeManager can be used.
 
-        * ciao/NodeApplicationManager.idl:
-          Doxygen improvement
+  Tue Mar  7 03:14:50 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Changed to add the Comp_id to Proc_id mapping
 
-        * ciao/Deployment_Core.idl:
-          Removed InvalidLocation exception, not used and not in the DAnCE
-          spec
+        * DAnCE/NodeManager/CIAO_Monitor.h:
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+          Changed to add the percentage cpu same as vmstat
 
-Mon Nov 27 13:10:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeManager/MonitorController.h:
+        * DAnCE/NodeManager/MonitorController.cpp:
+          Changed to add the Comp_id to Proc_id mapping
 
-        * ciao/Deployment_Core.idl
-        * ciao/Deployment_Container.idl
-        * ciao/Deployment_NodeApplication.idl
-          Moved some interfaces from Core to their own files
+        * DAnCE/NodeManager/NodeManager_Impl.h:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+          Changed to add the Comp_id to Proc_id mapping
 
-        * ciao/CCM_Core.mpc:
-          Updated because of split above and added some more flags to
-          reduce the amount of generated files
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+          Changed to add interface to RACE
 
-        * ciao/DomainApplicationManager.idl:
-        * ciao/NodeApplication_CallBack.idl
-          Updated include
+        * DAnCE/TargetManager/TargetManagerExt.idl:
+        * DAnCE/TargetManager/TargetManager_exec.h:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Changed to add interface to RACE
 
-        * DAnCE/NodeApplication/Container_Impl.h:
-        * DAnCENodeApplication/NodeApplication_Impl.h:
-        * DAnCEtests/NodeApplicationTest/NodeApp_test_client.cpp:
-        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp:
-        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
-        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_simple.cpp:
-          Updated includes because of refactoring above
+        * DAnCE/TargetManager/descriptors/Domain.cdd:
+          Updated to the latest xsd
 
-Mon Nov 27 09:40:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-          Instead of the http files in this library, use the HTTP
-          classes from the TAO lib
+        * docs/schema/cdd.xsd:
+          Changed the Domain definations
 
-        * DAnCE/RepositoryManager/HTTP_Client.cpp
-        * DAnCE/RepositoryManager/HTTP_Client.h
-        * DAnCE/RepositoryManager/HTTP_Handler.cpp
-        * DAnCE/RepositoryManager/HTTP_Handler.h
-          Removed, not needed anymore, these files did move to the TAO
-          lib to support http:// ior and we are reusing them now in
-          CIAO
+  Mon Mar  6 19:46:54 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-          Removed the files above
+        * DAnCE/Interfaces/NodeManager.idl
+        * DAnCE/NodeManager/NodeManager_Impl.h
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+
+        Added the set_priority method to modify the priority of
+        NodeApplication process.
+
+  Wed Mar  1 20:56:16 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/TargetManager_exec.h
+        * DAnCE/TargetManager/TargetManager_exec.cpp
+        * DAnCE/TargetManager/TargetManagerExt.idl:
 
-Mon Nov 27 09:36:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Added method to TargetManagerExt interface to obtain references to
+        the NodeManagers.
+
+
+  Fri Feb 24 22:55:51 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Basic_Deployment_Data.cpp
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp
+        * tools/Config_Handlers/CEPE_Handler.cpp
+        * tools/Config_Handlers/CEPE_Handler.h
+        * tools/Config_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/CRDD_Handler.cpp
+        * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+        * tools/Config_Handlers/Config_Handlers.mpc
+        * tools/Config_Handlers/DP_Handler.cpp
+        * tools/Config_Handlers/DP_Handler.h
+        * tools/Config_Handlers/DataType_Handler.cpp
+        * tools/Config_Handlers/DataType_Handler.h
+        * tools/Config_Handlers/DnC_Dump.cpp
+        * tools/Config_Handlers/ERE_Handler.h
+        * tools/Config_Handlers/IDD_Handler.cpp
+        * tools/Config_Handlers/IDREF_Base.cpp
+        * tools/Config_Handlers/IDREF_Base.h
+        * tools/Config_Handlers/ID_Handler.cpp
+        * tools/Config_Handlers/ID_Handler.h
+        * tools/Config_Handlers/IRDD_Handler.cpp
+        * tools/Config_Handlers/IRDD_Handler.h
+        * tools/Config_Handlers/MDD_Handler.cpp
+        * tools/Config_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/Property_Handler.h
+        * tools/Config_Handlers/RDD_Handler.cpp
+        * tools/Config_Handlers/Req_Handler.cpp
+        * tools/Config_Handlers/Req_Handler.h
+        * tools/Config_Handlers/STD_PCD_Handler.h
+        * tools/Config_Handlers/ccd.cpp
+        * tools/Config_Handlers/ccd.hpp
+        * tools/Config_Handlers/cid.cpp
+        * tools/Config_Handlers/cid.hpp
+        * tools/Config_Handlers/cpd.cpp
+        * tools/Config_Handlers/cpd.hpp
+        * tools/Config_Handlers/iad.cpp
+        * tools/Config_Handlers/iad.hpp
+        * tools/Config_Handlers/pcd.cpp
+        * tools/Config_Handlers/pcd.hpp
+        * tools/Config_Handlers/test.cdp
+        * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CAD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CID_Handler.h
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
+        * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/IAD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
+        * tools/Config_Handlers/Package_Handlers/PC_Intf.h
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+        * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.h
+        * tools/Config_Handlers/Package_Handlers/test.cpp
+        * tools/Config_Handlers/Package_Handlers/descriptors/package.tpd
+        * tools/Config_Handlers/Utils/Exceptions.h
+        * tools/Config_Handlers/Utils/Functors.h
+        * tools/Config_Handlers/Utils/XML_Error_Handler.cpp
+        * tools/Config_Handlers/Utils/XML_Helper.h
+        * tools/Config_Handlers/XMLSchema/Writer.hpp
+
+          Package handlers and changes necessary to support them.
+
+Fri Apr 21 08:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIDLC/ServantSourceGenerator.cpp:
+          Removed usage of ACE_NESTED_CLASS
+
+        * DAnCE/RepositoryManager/PC_Updater.cpp:
+          Fixed compile errors
+
+Thu Apr 20 13:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/DnC_Dump.cpp:
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+          Fixed compile error
+
+Thu Apr 20 09:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
+        * tools/Config_Handlers/RT-CCM/CLA_Handler.cpp:
+          Fixed compile error
+
+Wed Apr 19 19:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
         * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-          Instead of the http files in this library, use the HTTP
-          classes from the TAO lib
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Fixed usage of sequences. The sequences now return
+          a pointer on the subscript operators, not _var which was not according
+          to the spec.
 
-        * DAnCE/NodeApplicationManager/URL_Parser.h:
-          Doxygen improvements
+Wed Apr 19 14:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/NodeApplicationManager/HTTP_Client.cpp:
-        * DAnCE/NodeApplicationManager/HTTP_Client.h:
-        * DAnCE/NodeApplicationManager/HTTP_Handler.cpp:
-        * DAnCE/NodeApplicationManager/HTTP_Handler.h:
-          Removed, not needed anymore, these files did move to the TAO
-          lib to support http:// ior and we are reusing them now in
-          CIAO
+        * tools/Config_Handlers/XMLSchema/Types.hpp:
+          Removed vc6 workaround
 
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-          Removed the files above
+Wed Apr 19 13:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Nov 27 09:33:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * docs/schema/xsc-banner.h:
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp:
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
+          Removed include of vc6-4786.h
 
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Removed include of errno.h. It is not portable, but it seems
-          it isn't needed at all. Thanks to Abdul for reporting this,
-          this fixes bugzilla bug 2726.
-
-Mon Nov 27 08:59:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/tutorials/Quoter:
-          Extended this tutorial with more documentations. Thanks to
-          Abdul for delivering these files. This fixes bugzilla 2717
-
-Fri Nov 24 13:59:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
-          Added check whether we got a valid NodeImplementationInfo back
-          and not a nill pointer. Fixes bugzilla bug 2692 finally.
-          Thanks to Abdul for pointing out the need for this check
-
-Fri Nov 24 09:41:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc:
-          Don't build this project in ace_for_tao configuration
-
-Thu Nov 23 12:34:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Home.idl:
-        * ciao/CCM_Object.idl:
-          Moved CCMHome again to its own file now the idl compiler has
-          been fixed to handle this correctly
-
-Wed Nov 22 20:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Dynamic_Component_Servant_Base.h:
-          Removed the character c from the first line which drove the
-          compilers really crazy
-
-Wed Nov 22 19:31:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Home.idl:
-        * ciao/CCM_Object.idl:
-          Moved CCMHome to CCMObject, when these are in seperate files
-          the generated code for components is not correct. We want to have
-          these interfaces in seperate files but we can sort out this
-          later.
-
-Wed Nov 22 14:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Dynamic_Component_Servant_Base.h:
-          Fixed pragme once warning
-
-Wed Nov 22 11:05:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Base.idl
-        * ciao/CCM_CCM2Context.idl
-        * ciao/CCM_CCMException.idl
-        * ciao/CCM_Component.idl
-        * ciao/CCM_Configurator.idl
-        * ciao/CCM_Container.idl
-        * ciao/CCM_Container_Ex.idl
-        * ciao/CCM_Context.idl
-        * ciao/CCM_Cookie.idl
-        * ciao/CCM_Core.mpc
-        * ciao/CCM_EnterpriseComponent.idl
-        * ciao/CCM_EntityComponent.idl
-        * ciao/CCM_EntityContext.idl
-        * ciao/CCM_Enumeration.idl
-        * ciao/CCM_Event.idl
-        * ciao/CCM_Home.idl
-        * ciao/CCM_HomeConfigurator.idl
-        * ciao/CCM_HomeExecutorBase.idl
-        * ciao/CCM_HomeFinder.idl
-        * ciao/CCM_HomeRegistration.idl
-        * ciao/CCM_KeylessCCMHome.idl
-        * ciao/CCM_Navigation.idl
-        * ciao/CCM_Object.idl
-        * ciao/CCM_ProxyHomeRegistration.idl
-        * ciao/CCM_Receptacle.idl
-        * ciao/CCM_Session2Context.idl
-        * ciao/CCM_SessionSynchronization.idl
-        * ciao/CCM_StandardConfigurator.idl
-        * ciao/Client_init.cpp
-        * ciao/Components.idl
-        * ciao/Cookies.h
-        * ciao/CosPersistentState.idl
-        * ciao/Deployment.idl
-        * ciao/Deployment_Application.idl
-        * ciao/Deployment_Base.idl
-        * ciao/Deployment_Connection.idl
-        * ciao/Deployment_Core.idl
-        * ciao/Deployment_Data.idl
-        * ciao/Deployment_TargetData.idl
-        * ciao/DomainApplicationManager.idl
-        * ciao/Home_Servant_Impl_Base.h
-        * ciao/NodeApplicationManager.idl
-        * ciao/NodeManager.idl
-        * ciao/Servant_Impl_Base.h
-        * ciao/Servant_Impl_T.cpp
-        * ciao/Server_init.cpp
-        * ciao/StandardConfigurator_Impl.h
-        * ciao/SwapExec.idl
-        * ciao/Swapping_Servant_Home_Impl_Base.h
-        * ciao/Target_Data.idl
-        * ciao/TargetManager.idl
-        * ciao/UpgradeableContext.idl
-          Splitted the huge idl files into smaller parts. The CCM files are almost done,
-          the Deployment files do need some more iterations to get smaller files that
-          contain an interface with the types they need. This way the linker can optimize
-          objects out during a static compilation
-
-        * ciao/CIAO_Value.idl:
-        * ciao/Container_Base.pidl:
-          Removed, not used at all
-
-        * ciao/ComponentsC.h:
-        * ciao/ComponentsS.h:
-          Removed, will be generated by tao_idl
-
-        * DAnCE/Interfaces/NodeManagerDaemon.idl
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
-        * DAnCE/NodeManager/MonitorController.h
-        * DAnCE/TargetManager/CmpClient.cpp
-        * DAnCE/TargetManager/DomainDataManager.h
-        * DAnCE/TargetManager/DomainEvents.idl
-        * DAnCE/TargetManager/TargetManager.cidl
-        * DAnCE/TargetManager/TargetManager.mpc
-        * tools/Config_Handlers/DD_Handler.cpp
-        * tools/Config_Handlers/DnC_Dump.h
-        * examples/Hello/Sender/starter.cpp
-          Updated because of rename above
+Wed Apr 19 13:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/TargetManager/TargetManager.idl:
-          Renamed to TargetManagerImpl.idl, this is the interface
-          it contains.
+        * tools/Config_Handlers/STD_PC_Intf.cpp:
+        * tools/Config_Handlers/XSCRT/XMLSchema.hpp:
+        * tools/Config_Handlers/XSCRT/Elements.hpp:
+        * tools/Config_Handlers/XSCRT/XML.hpp:
+        * tools/Config_Handlers/DP_Handler.cpp:
+        * tools/Config_Handlers/DP_Handler.cpp:
+          Removed vc6 workarounds
 
-        * DAnCE/NodeApplication/Container_Impl.cpp
-        * DAnCE/NodeApplication/Container_Impl.h
-          Removed get_homes(), it is not in the base idl
+Wed Apr 19 11:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * examples/Display/Display_Base/Display_Base.mpc
-        * examples/Display/GPS/GPS.mpc
-        * examples/Display/NavDisplay/NavDisplay.mpc
-        * examples/Display/RateGen/RateGen.mpc
-        * RACE/common/RACE_common.mpc
-        * RACE/Input_Adapters/Base/Input_Adapter.mpc
-        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
-        * RACE/Output_Adapters/Base/Output_Adapter.mpc
-        * RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
-        * RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
-        * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
-        * RACE/Planner_Manager/Component/Planner_Manager.mpc
-        * RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
-        * RACE/Planners/Base/Planner.mpc
-        * RACE/Planners/Interface/Planner_Interface.mpc
-        * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
-        * tests/IDL3/ImpliedIDL/All/all.mpc
-        * tests/IDL3/Lookup/lookup_test.mpc
-        * tests/Minimum/Minimum_Base/Minimum.mpc
-        * tests/Minimum/Receiver/Receiver.mpc
-        * tests/Minimum/Sender/Sender.mpc
-          Simplified these mpc files, the -GT option is not added by
-          orbsvcslib anymore and -Sc is deprecated
+        * tools/Config_Handlers/DnC_Dump.{h,cpp}:
+          Updated for string manager change in TAO
 
-        * tests/IDL3/Events/Any/main.cpp:
-        * tests/IDL3/Events/Any/README:
-        * tests/IDL3/Events/Any/run_test.pl:
-          Updated this test to reproduce a problem with valuetype
-          insertion into an any. This test will now fail until
-          Jeff Parsons commits some idl compiler changes
+        * ciao/Servant_Impl_Base.cpp:
+          Updated for sequence change
+
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp
+        * tools/Config_Handlers/Deployment.hpp
+        * tools/Config_Handlers/ccd.hpp
+        * tools/Config_Handlers/cdd.hpp
+        * tools/Config_Handlers/cdp.hpp
+        * tools/Config_Handlers/cid.hpp
+        * tools/Config_Handlers/cpd.hpp
+        * tools/Config_Handlers/iad.hpp
+        * tools/Config_Handlers/pcd.hpp
+        * tools/Config_Handlers/toplevel.hpp
+          Removed vc6 workarounds
 
-Mon Nov 20 08:16:34 2006  Simon McQueen  <sm@prismtech.com>
+        * tools/Config_Handlers/vc6-4786.h
+          Removed
 
-        * CIAO version 0.5.4 released.
+Tue Apr 18 20:55:05 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * CIAO version 0.5.1 released.
 
 Local Variables:
 mode: change-log
 add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
 indent-tabs-mode: nil
 End:
-
diff --git a/CIAO/ChangeLogs/ChangeLog-06b b/CIAO/ChangeLogs/ChangeLog-06b
deleted file mode 100644
index b7797cca18a..00000000000
--- a/CIAO/ChangeLogs/ChangeLog-06b
+++ /dev/null
@@ -1,2752 +0,0 @@
-Fri Nov 17 16:08:43 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * performace-tests/Protocols/common/Protocols_svnt_export.h:
-
-          Removed this file, renamed as the one added below.
-
-        * performace-tests/Protocols/common/Protocols_skel_export.h:
-
-          New file, renamed from the one removed above.
-
-        * performace-tests/Protocols/Sender/Sender.idl:
-        * performace-tests/Protocols/Sender/Sender.mpc:
-        * performace-tests/Protocols/Receiver/Receiver.mpc:
-        * performace-tests/Protocols/Receiver/Receiver.idl:
-        * performace-tests/Protocols/common/Protocols.mpc:
-        * performace-tests/Protocols/common/Protocols.idl:
-
-          Fixes to incorrect generation by generate_component_mpc.pl,
-          similar to those in
-
-          Wed Nov 15 19:56:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          Also removed include of Components.idl from Protocols.idl,
-          since it contains no component or eventtype declarations,
-          and added the include to Sender.idl and Receiver.idl.
-
-Thu Nov 16 14:41:24 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h:
-        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h:
-
-          Removed these files, added as renamed below.
-
-        * tests/Bug_2130_Regression/interfaces/ENW_skel_export.h:
-        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h:
-
-          New files, renamed from those removed above.
-
-        * tests/Bug_2130_Regression/interfaces/ENW.mpc:
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc:
-        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc:
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc:
-        * docs/tutorials/Quoter/Simple/Broker/Broker.mpc:
-
-          Fixes to incorrect generation by generate_component_mpc.pl,
-          similar to those in
-
-          Wed Nov 15 19:56:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Wed Nov 15 19:56:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/Display/Display_Base/Display_Base_svnt_export.h:
-
-          Removed this file, and added it as named below.
-
-        * examples/Display/Display_Base/Display_Base_skel_export.h:
-
-          New file, renamed from the one removed above.
-
-        * examples/Display/Display_Base/Display_Base.mpc:
-
-          Fixed incorrect export macros that were originally generated
-          by generate_component_mpc.pl. Also removed the -GT IDL
-          compiler command line option, which generated unnecessar
-          tie classes and template files (added by a base MPC project),
-          and made cosmetic changes to line breaks. Finally,
-          renamed project Display_Base_svnt to Display_Base_skel,
-          to eliminate confusion since the projects in this MPC
-          file are object-based, not component-based. The export
-          macros and export include files were also renamed, as
-          described above, consistently with these last changes.
-
-        * examples/GPS/GPS.mpc:
-        * examples/NavDisplay/NavDisplay.mpc:
-        * examples/RateGen/RateGen.mpc:
-
-          Renamed references to the Display_Base_svnt lib to be
-          consistent with the name change above, removed -GT
-          from the command line options passed to the IDL compiler,
-          and added -SS (suppress skeleton file generation) and
-          -St (suppress typecode and Any operator generation) from
-          *_svnt projects, and removed 'idlflags' line from
-          *_exec projects without IDL files.
-
-Wed Nov 15 10:30:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-
-          Entries submitted by Shanshan Jiang and Johnny Willemsen.
-
-Tue Nov 14 16:27:55 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/Null_Component/Null_Component.mpc:
-
-          Updated lib names in 'libs +=...' lines, overlooked in
-
-          Mon Nov 13 16:54:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Tue Nov 14 09:00:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-
-          Entry submitted by Boris Kolpackov.
-
-Mon Nov 13 16:54:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/Null_Component/Null_Interface_svnt_export.h:
-
-          Removed this file, renamed as below.
-
-        * examples/Null_Component/Null_Interface_skel_export.h:
-
-          Added this file, renamed from removed file above.
-
-        * examples/Null_Component/Null_Interface.mpc:
-
-          Renamed several things corresponding to the renaming
-          change above and replace export macro definition in
-          the skel project with separate stub and skel export
-          macro definitions and corresponding included. Also
-          added typecode/Any suppression command line option
-          -St to IDL compiler execution for both stub and skel
-          projects, and reduced MPC base project dependencies
-          (and thus link dependencies) to a minimum.
-
-        * examples/Null_Component/Null_Component.mpc:
-        * examples/Null_Component/StaticDAnCEApp.mpc:
-
-          Renamed items corresponding to change above.
-
-Fri Nov 10 16:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Hello/Hello_Base/Hello_Base.mpc:
-        * examples/Hello/Receiver/Receiver.mpc:
-        * examples/Hello/Sender/Sender.mpc:
-          Removed deprecated -Sc option from idlflags
-
-Wed Nov  8 20:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Null_Component/*:
-          Added some modelling files I got also from Abdul and removed the .ccd file
-          I committed by accident
-
-Wed Nov  8 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
-          Fixed a small memory leaks and other problems. This fixes bugzilla
-          2692. Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
-          for reporting these issues.
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
-          A few small improvements
-
-Sun Nov  5 19:16:57 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-          Removed the use of STL iostream.
-          Use ACE DLL decorator, prefix, suffix for DLL file names.
-
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-          Removed the use of STL iostream.
-
-Fri Nov  3 03:03:24 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-        * DAnCE/RepositoryManager/PC_Updater.cpp
-          Modified these files to differentiate the location field of
-          deploymentplan for different platforms.
-
-Thu Nov  2 22:54:12 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/ServnatSourceGenerator.cpp:
-
-          Added generation of code to register eventtype factories with
-          the container ORB for components with publish and emit ports
-          (generation of such registration for components with consume
-          ports already existed). This additional registration is necessary
-          if the component sends an event using a CIAO Event Service
-          event channel that is collocated with it.
-
-Thu Nov  2 20:22:46 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp (main):
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp (main):
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp (main):
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
-        * DAnCE/NodeManager/Node_Manager.cpp (main): Replaced exit() with
-          ACE_OS::exit().  Thanks to Abdul Sowayan for reporting this.
-          This fixes bugid #2695.
-
-Mon Oct 30 19:13:03 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/IDL3/Events/Any/EventAny.idl:
-        * tests/IDL3/Events/Any/Any.mpc:
-        * tests/IDL3/Events/Any/main.cpp:
-        * tests/IDL3/Events/Any/README:
-        * tests/IDL3/Events/Any/run_test.pl:
-
-          New test, to ensure that IDL eventtypes are
-          inserted/extracted from Anys correctly, and that
-          the resulting Anys are marshaled/demarshaled
-          correctly.
-
-        * tests/IDL3/Events/Regular/Regular.mpc:
-
-          Added backslashes to shorted 'idlflags' line.
-
-Mon Oct 30 13:26:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * DAnCE/TargetManager/CmpClient.cpp
-          BUILDCZAR removing old scoreboard warning.
-
-Thu Oct 26 14:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-    * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
-          Use ACE_OS methods, this fixes bugzilla 2691.
-          Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
-          for reporting this issue
-
-Wed Oct 25 14:54:03 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp:
-        * CCF/CCF/CIDL/SemanticAction/Composition.hpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Component.hpp:
-        * CCF/CCF/IDL3/SemanticAction/EventType.hpp:
-        * CCF/CCF/IDL3/SemanticAction/Home.hpp:
-
-          Minor fixes and cleanups.
-
-        * CCF/CCF/IDL2/Parsing/Recovery.hpp:
-        * CCF/CCF/IDL2/Parser.hpp:
-        * CCF/CCF/IDL2/Parser.cpp:
-        * CCF/CCF/CIDL/Parser.hpp:
-        * CCF/CCF/CIDL/Parser.cpp:
-        * CCF/CCF/IDL3/Parser.hpp:
-        * CCF/CCF/IDL3/Parser.cpp:
-
-          Added syntax errors to every grammar rule.
-
-Wed Oct 25 11:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Null_Component/StaticDAnCEApp.mpc:
-          Enabled this project in all builds
-
-Mon Oct 23 19:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-          Added missing CORBA::string_dup to fix crash with BCB
-
-Fri Oct 20 06:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
-          Changed the HomeAttributes generation in such a way that it
-          also compiles with BCB6
-
-        * examples/Null_Component/*:
-          New example, a component with just one interface. This can be used
-          to analyze the core footprint and see what we can reduce
-          Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
-          for creating this example
-
-Thu Oct 19 23:22:49 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-          Modified this file to make sure RepositoryManager project is built
-          after minizip project.
-
-Thu Oct 19 10:47:12 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * DAnCE/TargetManager/CmpClient.cpp
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
-        * examples/BasicSP/EC/controller.cpp
-        * examples/Display/RateGen/controller.cpp
-        * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
-          Changed the naked atoi () to ACE_OS::atoi (), again thanks to Abdul
-          for reporiting this.
-
-Wed Oct 18 14:00:04 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
-          (parse_args): Changed the naked atoi() to ACE_OS::atoi().
-          Thanks to Abdul for reporting this.
-
-Wed Oct 18 12:05:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * DAnCE/TargetManager/DomainDataManager.cpp
-          Removed warnings about unused local variables (line 186 & 558)
-
-Wed Oct 18 09:50:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * DAnCE/TargetManager/CmpClient.cpp
-          Removed warning about unused local variable (line 154)
-
-Tue Oct 17 21:23:27 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/README
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp
-        * DAnCE/RepositoryManager/ZIP_Wrapper.h
-          Updated these files to use minizip under $ACE_ROOT/contrib/minizip.
-
-Tue Oct 17 13:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-          Several small layout changes and use ACE_ERROR for
-          errors
-
-Tue Oct 17 13:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplication/RTNodeApp_Configurator.{h,cpp}:
-          Moved destructor implementation to cpp file
-
-Tue Oct 17 13:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-          Doxygen improvements
-
-        * DAnCE/NodeManager/NAM_Map.{h,cpp}:
-          Made is_available a const method
-
-        * DAnCE/NodeManager/Node_Manager.cpp:
-          Use bool
-
-        * DAnCE/NodeManager/Node_Manager_Impl.cpp:
-          Use ACE_ERROR together with LM_ERROR
-
-Tue Oct 17 12:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
-          Use ACE_ERROR together with LM_ERROR
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.inl:
-          Initialise pointers with 0
-
-        * DAnCE/NodeApplication/Configurator_Factory.{h,cpp}:
-        * DAnCE/NodeApplication/Container_Impl.cpp:
-        * DAnCE/NodeApplication/NodeApplication_Core.cpp:
-          Use bool and const improvements, doxygen improvements
-
-Mon Oct 16 19:52:15 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-          Updated the re_launch_plan () function for Repoman integration.
-
-        * DAnCE/RepositoryManager/README
-        * DAnCE/RepositoryManager/RepositoryManager.cpp
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
-        * examples/BasicSP/RepoMan_Usage.html
-          Fixed some warnings on Liunx.
-          Fixed the "Deamon" typos.
-
-Mon Oct 16 15:11:40 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/TM_Client.mpc:
-          Fixed the linking error in Mac and in FC5 Static
-
-Mon Oct 16 11:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-       * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-         BUILD CZAR. Due to the removal of
-         DAnCE/NodeApplication/NodeApp_Configurator.cpp to correct
-         the fuze error below, this "other" project's MPC needed to
-         be updated. (Why is this dependancy here?)
-
-Mon Oct 16 11:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-       * DAnCE/NodeApplication/NodeApp_Configurator.cpp
-       * DAnCE/TargetManager/DomainEvents.idl
-         BUILD CZAR. Removed Fuzz errors after no user action to correct.
-
-Mon Oct 16 08:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/ADD_Handler.cpp:
-        * tools/Config_Handlers/DP_Handler.cpp:
-        * tools/Config_Handlers/IDREF_Base.cpp:
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp:
-        * tools/Config_Handlers/RT-CCM/PS_Handler.cpp:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp
-        * DAnCE/RepositoryManager/
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-          Use ACE_ERROR together with LM_ERROR
-
-        * RACE/Controller/Component/Controller.idl:
-          Changed some comments to doxygen style
-
-        * DAnCE/RepositoryManager/PC_Updater_T.cpp:
-          Const change
-
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-          Layout changes
-
-        * DAnCE/RepositoryManager/RM_Helper.cpp:
-          Use strcmp to compare two strings and several layout changes
-
-        * DAnCE/RepositoryManager/RM_Helper.h:
-        * DAnCE/RepositoryManager/ZIP_Wrapper.h:
-          Doxygen changes
-
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-          Documentation changes
-
-        * DAnCE/RepositoryManager/URL_Parser.{h,cpp}:
-          Use bool for debug_
-
-        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
-          Initialise pointers with 0
-
-Mon Oct 16 08:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl:
-          Simplified this file by using the new ciao_static_dnc_app base
-          project.
-
-Fri Oct 13 17:57:12 2006  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
-
-        * docs/schema/SANet_Network.xsd
-        * docs/schema/Task_Map.xsd
-
-        Added SA-POP schemas.
-
-Fri Oct 13 17:54:58 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/TargetManager.mpc:
-          Addressed the problems coming up in Mac. Changed the project
-          inheritence of the TM Component.
-
-Fri Oct 13 17:43:29 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-          Addressed an error in the last check-in.
-
-Thu Oct 12 17:36:58 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/CmpClient.cpp:
-        * DAnCE/TargetManager/DomainDataManager.h:
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-        * DAnCE/TargetManager/DomainEvents.idl:
-        * DAnCE/TargetManager/TM_Client.mpc:
-        * DAnCE/TargetManager/TargetManager.idl:
-        * DAnCE/TargetManager/TargetManager.mpc:
-        * DAnCE/TargetManager/TargetManagerExt.idl:
-        * DAnCE/TargetManager/TargetManager_exec.h:
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Added the functionality to detect any add/delete to the Domain.
-          Added the feature to relay events to anyone interested for the above.
-
-        * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl:
-          Changed the test script to test the above
-
-Tue Oct 10 19:13:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl:
-          Fixed compile error.
-          Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
-          for reporting this.
-
-Tue Oct 10 17:56:51 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
-          Modify these files to get the artifacts names when using http reference.
-
-Tue Oct 10 14:24:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
-          Layout improvements, use ACE_ERROR with LM_ERROR
-
-        * DAnCE/ExecutionManager/DAM_Map.cpp:
-          Const improvements
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h:
-          Layout changes
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-          Use ACE_ERROR with LM_ERROR
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.h:
-          Documentation improvements
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
-          Const improvements
-
-        * DAnCE/NodeApplicationManager/HTTP_Handler.cpp:
-          Const improvements
-
-Tue Oct 10 09:28:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Base.idl:
-          Removed a remark about RTF 1.1, method is now according to the spec
-
-        * ciao/CCM_Component.idl:
-        * ciao/CCM_Container.idl:
-        * ciao/CCM_Event.idl:
-        * ciao/Deployment.idl:
-        * ciao/Target_Data.idl
-          Updated some documentation and added some todos about things which
-          are CIAO specific
-
-        * ciao/Server_init.cpp:
-          With LM_ERROR use ACE_ERROR
-
-        * ciao/Dynamic_Component_Activator.{h,cpp}:
-          Removed some invalid comments and a mutex that was not used at all
-
-        * ciao/Context_Impl_Base.h:
-          Documentation update
-
-Thu Oct 05 00:35:37 2006  William R. Otte  wotte@dre.vanderbilt.edu
-
-        * CIAO version 0.5.3 released.
-
-Wed Oct  4 08:12:24 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * NEWS:
-
-          Updated with entries for the CIDL compiler work.
-
-Tue Oct  3 15:16:40 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * NEWS:
-
-          Updated the NEWS to add the changes for Repoman and Plan_Generator
-          projects.
-
-Tue Oct  3 12:49:16 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * NEWS:
-
-          Updated the NEWS to add the changes for CoSMIC Quoter tutorial
-
-Mon Oct  2 09:28:58 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/index.html:
-          Corrected linked to OMG spec
-
-Mon Oct  2 08:58:58 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-          Set the nodemanager in the static nodeapplication manager.
-          Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
-          for reporting this.
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-          Doxygen improvement
-
-Thu Sep 28 16:47:58 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
-        Added the base projects to Plan_Launcher_Impl project to include
-        required libs. Added null head files to the Plan_Launcher project to
-        remove the unnecessary dependency on other libs.
-
-Thu Sep 28 15:57:53 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
-        Fixed the "undefined reference" error on FC5_Static build.
-
-        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
-        Modified this file to handle the possible RepoMan null reference error.
-
-Tue Sep 26 21:05:48 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-        Fixed the "conversion from '_var' to 'CORBA::Object*'" warning.
-
-Tue Sep 26 15:52:12 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * docs/tutorials/Quoter/Simple/Broker/Broker.cidl:
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor.cidl:
-
-        Added missing semicolons.
-
-Mon Sep 25 23:19:15 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-        Modified the fetch_reference_naming () to remove its arguments related
-        to Repoman.
-
-        * DAnCE/Plan_Generator/PCVisitor.h:
-        Adjusted the order of the data members of Plan_Generator_i class.
-
-
-Mon Sep 25 19:46:37 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/Plan_Generator/Plan_Generator.mpc (project): Fixed the MPC
-          file by removing the "requires += RepositoryManager" as this
-          project, as well as other projects that depend on this, will not
-          be built unless RepositoryManager=1 is set.
-
-Mon Sep 25 14:42:03 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc: Fixed the mpc file.
-
-Mon Sep 25 13:06:05 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * CCF/CCF/IDL2/SemanticAction/Operation.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Operation.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp:
-        * CCF/CCF/CIDL/SemanticAction/Composition.cpp:
-        * CCF/CCF/CIDL/SemanticAction/Composition.hpp:
-
-        Move some operator<< operators to the global scope so that they
-        do not hide others.
-
-Sun Sep 24 21:06:07 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-        Removed the unnecessary Repoman head file.
-
-Sat Sep 23 04:31:13 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
-        * DAnCE/RepositoryManager/RMadmin.cpp
-        * ciao/RepositoryManager.idl
-        Added the replace argument in installPackage () and createPackage ()
-        functions and extend the functionalities of these two functions based
-        on the latest D&C spec.
-
-Sat Sep 23 04:07:59 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Generator
-        * DAnCE/Plan_Generator/PCVisitor.cpp
-        * DAnCE/Plan_Generator/PCVisitor.h
-        * DAnCE/Plan_Generator/PCVisitorBase.cpp
-        * DAnCE/Plan_Generator/PCVisitorBase.h
-        * DAnCE/Plan_Generator/PCVisitorBase.inl
-        * DAnCE/Plan_Generator/Plan_Generator.mpc
-        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
-        * DAnCE/Plan_Generator/Plan_Generator_Impl.h
-        * DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h
-        Added these files which implement the Plan_Generator project. This
-        project is used to retrieve information from Repoman and generate/modify
-        DeploymentPlans based on different demands.
-
-        * DAnCE/Planner
-        * DAnCE/Planner/Node_T.cpp
-        * DAnCE/Planner/Node_T.h
-        * DAnCE/Planner/Node_T.inl
-        * DAnCE/Planner/PCVisitor.cpp
-        * DAnCE/Planner/PCVisitor.h
-        * DAnCE/Planner/PCVisitorBase.cpp
-        * DAnCE/Planner/PCVisitorBase.h
-        * DAnCE/Planner/PCVisitorBase.inl
-        * DAnCE/Planner/Planner.cpp
-        * DAnCE/Planner/Planner.mpc
-        Deleted these files. The planner project has been replaced by the more
-        useful Plan_Generator project.
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-        Modified these files.
-
-        * DAnCE/Plan_Generator/PCVisitor.cpp
-        * DAnCE/Plan_Generator/PCVisitor.h
-        * DAnCE/Plan_Generator/PCVisitorBase.cpp
-        * DAnCE/Plan_Generator/PCVisitorBase.h
-        * DAnCE/Plan_Generator/PCVisitorBase.inl
-        Deleted these files.
-        Removed the Plan_Launcher's dependence on RepoMan. Use Plan_Generator
-        to retrieve information from Repoman and generate/modify DeploymentPlans.
-
-Fri Sep 22 09:27:25 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Interface.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Operation.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Interface.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Operation.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/String.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Enum.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/IntExpression.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/String.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Elements.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/ValueType.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/IntExpression.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Name.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Elements.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp.m4:
-        * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Array.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Name.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Union.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Native.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Union.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Attribute.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Exception.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Translation.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/TypeId.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Graph.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Attribute.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Sequence.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Member.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp.m4:
-        * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Literals.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Graph.tpp:
-        * CCF/CCF/IDL2/SemanticGraph/Literals.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Struct.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Module.hpp:
-
-        * CCF/CCF/CIDL/SemanticGraph/Executor.cpp:
-        * CCF/CCF/CIDL/SemanticGraph/Composition.cpp:
-        * CCF/CCF/CIDL/SemanticGraph/Executor.hpp:
-        * CCF/CCF/CIDL/SemanticGraph/Composition.hpp:
-
-        * CCF/CCF/IDL3/SemanticGraph/Component.cpp:
-        * CCF/CCF/IDL3/SemanticGraph/EventType.cpp:
-        * CCF/CCF/IDL3/SemanticGraph/Component.hpp:
-        * CCF/CCF/IDL3/SemanticGraph/EventType.hpp:
-        * CCF/CCF/IDL3/SemanticGraph/Home.hpp:
-
-
-        Add file name and line information to every semantic
-        graph node. This information is used in diagnostics.
-
-
-        * CCF/CCF/IDL2/SemanticAction/Typedef.hpp:
-        * CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp:
-
-        Adjust semantic actions interface to provide a way to derive
-        line numbers.
-
-
-        * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Native.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Exception.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Struct.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp:
-
-        * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/EventTypeFactory.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp:
-
-        * CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp:
-        * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp:
-
-        Propagate file name and line number from tokens to semantic
-        graph nodes. Use file and line numbers when printing error
-        messages.
-
-
-        * CCF/CCF/IDL2/Token.hpp:
-        * CCF/CCF/IDL2/Parser.hpp:
-        * CCF/CCF/IDL2/Parser.cpp:
-
-        Fix a number of bugs in error handling and recover.
-
-
-        * CIDLC/cidlc.cpp:
-
-        Use file name and line number when creating the translation
-        unit object.
-
-
-Wed Sep 20 04:05:42 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * docs\tutorials\CoSMIC\02.html
-
-        Added some useful links to various resources to help readers reduce
-        learning curve.Added a small section that mentions that a Node Map file
-        has to be created in order to get Quoter example working. Again,
-        Thanks to Sowayan Abdullah from LMCO for his help in improving the
-        cosmic documentations.
-
-
-Mon Sep 18 03:26:22 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Utils/XML_Helper.h
-
-          Fixed compile error by removing extra ;.
-
-Fri Sep 15 21:28:47 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * ciao/Deployment_Core.idl
-
-          Removed the unnecessary event type definition for RTEC since
-          they are no longer used.
-
-Sun Sep 10 09:20:18 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Utils/XML_Helper.cpp
-        * tools/Config_Handlers/Utils/XML_Helper.h
-
-          Removed workaround from previous commit, as Ossama Othman has
-          provided the proper fix in the G++ macros.
-
-Fri Sep  8 00:28:27 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Utils/XML_Helper.cpp
-        * tools/Config_Handlers/Utils/XML_Helper.h
-
-          Made the export declaration on the singleton typedef
-          contingent on a Microsoft compiler, as the GCC included
-          with FC5 was not defining the symbol as a result.
-
-Fri Sep  1 03:09:38 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * docs\tutorials\CoSMIC\index.html
-        * docs\tutorials\CoSMIC\01.html
-
-        Updated index.html to change the cosmic version.Updated 01.html
-        to reflect recent changes of idl_to_picml. Thanks to Sowayan Abdullah
-        from LMCO for his help in improving the cosmic documentations.
-
-Thu Aug 31 22:45:09 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-          Modified this file to include $(CIAO_ROOT)/tools/Config_Handlers
-          in the RMAdmin project.
-
-Wed Aug 30 17:16:18 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-          Added more changes to this file to fix the "reference to
-          ACE_Singleton<CIAO::Config_Handlers::XML_Helper, ACE_Null_Mutex>
-          ::instance()'"warnings with FC5_Static build.
-
-Tue Aug 29 23:08:20 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-          Fixed the "reference to `ACE_Singleton<CIAO::Config_Handlers
-          ::XML_Helper, ACE_Null_Mutex>::instance()'"warnings with
-          FC5_Static build.
-
-        * DAnCE/RepositoryManager/RMadmin.cpp
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-          Removed unnecessary using of CIAO::Config_Handlers::XML_Helper.
-
-Mon Aug 28 12:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Container_Base.cpp:
-          Fixed some compile warnings with gcc 2.96
-
-Thu Aug 24 15:44:08 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-          Changed some of the command-line options.
-
-        * examples/BasicSP/RepoMan_Usage.html
-          Made some minor changes.
-
-Thu Aug 24 000:41:16 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/PCVisitor.cpp
-        * DAnCE/Plan_Launcher/PCVisitor.h
-        * DAnCE/Plan_Launcher/PCVisitorBase.cpp
-        * DAnCE/Plan_Launcher/PCVisitorBase.h
-          Solved the "'class has virtual functions but non-virtual destructor"
-          warnings.
-
-Wed Aug 23 17:57:15 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/PCVisitorBase.h
-          Solved the "invalid use of undefined type 'struct PCVisitorBase'"
-          warnings.
-
-Wed Aug 23 15:22:36 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/PCVisitor.cpp
-          Solved the "unused parameter" warning.
-
-Wed Aug 23 000:04:06 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/README
-          Made some minor changes.
-
-Wed Aug 23 000:00:43 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * examples/BasicSP/descriptors/basicNodeDaemon.pl
-          Use "$ENV{'ACE_ROOT'}/bin" to point to the location of lib file.
-
-Tue Aug 22 23:47:06 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-          Modified these files for RepoMan integration.
-
-        * DAnCE/Plan_Launcher/PCVisitor.cpp
-        * DAnCE/Plan_Launcher/PCVisitor.h
-        * DAnCE/Plan_Launcher/PCVisitorBase.cpp
-        * DAnCE/Plan_Launcher/PCVisitorBase.h
-        * DAnCE/Plan_Launcher/PCVisitorBase.inl
-          Added these files for RepoMan integration.
-
-        * examples/BasicSP/RepoMan_Usage.html
-          Added this file, which explains how to run the BasicSP example using
-          the integrated RepoMan.
-
-Mon Aug 21 15:19:25 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * examples/Hello/descriptors/run_test.pl:
-        * examples/Hello/descriptors/run_test_without_ns.pl: Fixed the
-          environment variable DANCE_ROOT to point to CIAO_ROOT/DAnCE.
-
-Thu Aug 17 16:09:09 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/Options.cpp
-        * DAnCE/RepositoryManager/RMadmin.cpp
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-          Reimplemented the findNamesByType () and getAllTypes () operations
-          of Repository Manager, which use the newly generated
-          ACE_Hash_MultiMap_Manager class and its corresponding classes.
-
-Mon Aug 14 15:46:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Utils/XML_Helper.h
-
-          Fixed a compile error for pedantic GCC4.
-
-Sun Aug 13 15:18:00 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * CCF/CCF/CodeGenerationKit/Regex.hpp:
-
-          Reimplemented regex wrapper to allow building CIDLC on
-          platforms without wchat_t support (e.g., Cygwin/Mingw).
-
-Fri Aug 11 11:46:17 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
-
-        * CCF/CCF/IDL2/SemanticGraph/Name.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Name.hpp:
-
-          Added support for IDL (underscore) escaping. Added support
-          for custom name printers.
-
-        * CIDLC/UnescapedNamePrinter.hpp:
-
-          Name printer that prints names unescaped (without the IDL
-          underscore).
-
-        * CIDLC/CxxNamePrinter.cpp:
-        * CIDLC/CxxNamePrinter.hpp:
-
-          Name printer that escapes C++ keywords.
-
-        * CIDLC/CorbaTypeNameEmitters.cpp:
-        * CIDLC/DescriptorGenerator.cpp:
-        * CIDLC/ExecImplHeaderGenerator.cpp:
-        * CIDLC/ExecImplSourceGenerator.cpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/RepositoryIdGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/ExecImplGenerator.cpp:
-        * CIDLC/UtilityTypeNameEmitters.cpp:
-        * CIDLC/ServantGenerator.cpp:
-        * CIDLC/CompositionEmitter.cpp:
-
-          Updated to handle IDL and C++ name escaping. This fixes
-          bugzilla bug #2427.
-
-Fri Aug 11 07:30:35 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Utils/XML_Helper.h
-        * DAnCE/RepositoryManager/RMadmin.cpp
-
-          Fixes for a compiler error in the version of GCC shipped with
-          FC5.
-
-Wed Aug  9 18:53:48 UTC 2006  Jaiganesh B  <jai.dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
-          DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-          DAnCE/NodeApplication/RTNodeApp_Configurator.cpp:
-          examples/Hello/descriptors_RTCCM/rt-example.cdp:
-          examples/Hello/descriptors_RTCCM/rt-config-example.csr:
-
-        Fixed the RT-CCM code to conform to the schema changes. Made changes
-        to the descriptors directory to fix the working example for RT-CCM.
-
-        Thanks to Nanbor Wang for helping fix the codebase.
-
-Tue Aug  8 07:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO-INSTALL.html:
-          Removed vc6 info
-
-Fri Aug  4 21:40:46 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/tutorials/CoSMIC/01.html
-        * docs/tutorials/CoSMIC/02.html
-        * docs/tutorials/CoSMIC/03.html
-        * docs/tutorials/CoSMIC/04.html
-        * docs/tutorials/CoSMIC/style.css
-        * docs/tutorials/CoSMIC/index.html
-
-          Style fixes, grammatical and spelling corrections, clarifications.
-
-Thu Aug  3 20:38:39 UTC 2006  Nanbor Wang  <nanbor (at) txcorp (dot) com>
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-
-          Fixed RT-CCM support.
-
-Thu Aug  3 15:33:11 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
-
-        * docs/cidlc.html:
-
-          Regenerated to include the -D and -I options.
-
-Wed Aug  2 18:52:14 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp:
-
-          Added option types: flag or value.
-
-        * CCF/CCF/CodeGenerationKit/CommandLineParser.cpp:
-        * CCF/CCF/CodeGenerationKit/CommandLineParser.hpp:
-        * CCF/CCF/CodeGenerationKit/CommandLine.hpp:
-
-          Reimplemented to use hand-coded parser instead of Spirit. The
-          new implementation takes into account the option types.
-
-        * CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp:
-        * CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp:
-
-          Removed.
-
-        * CIDLC/cidlc.cpp:
-        * CIDLC/ServantGenerator.hpp:
-        * CIDLC/ServantGenerator.cpp:
-        * CIDLC/DescriptorGenerator.hpp:
-        * CIDLC/DescriptorGenerator.cpp:
-        * CIDLC/ExecutorMappingGenerator.hpp:
-        * CIDLC/ExecutorMappingGenerator.cpp:
-        * CIDLC/ExecImplGenerator.cpp:
-        * CIDLC/ExecImplGenerator.hpp:
-
-          Updated with the option types. This fixes bugzilla bug #2426.
-
-
-Fri Jul 28 17:53:57 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/IDL2/SemanticGraph/Translation.cpp:
-
-          Reimplemented a chunk of code that resulted in what appears to
-          be invalid code generation by the Intel C++ compiler. This
-          fixes bugzilla bug #2387.
-
-Thu Jul 27 18:08:47 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * CIAO_TAO.mwc
-        * CIAO_TAO_DAnCE.mwc
-
-          Replaced relative references to ACE/TAO with absolute references
-          using environment variables.
-
-Mon Jul 24 15:45:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * Subversion conversion completed at revision 73730
-
-Sun Jul 23 15:44:43 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * Repository frozen for repository conversion
-
-Sat Jul 22 21:34:57 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciao/Container_Base.cpp
-
-          Fixed a runtime Segfault bug about destroying POA.  The problem
-          is because a Session_Container creates 2 POAs, one of which is called
-          facet_cons_POA which uses the Servant_Activator policy to activate component
-          ports (facets, consumers) on demand, then the Servant_Activator object
-          was deleted when the Session_Container object is out of scope in its
-          destructor. But when the ORB finally shuts itself down, it tries
-          to clean all the resources including the facet_cons_POA, since the
-          Servant_Activator attached to this POA is long gone, a segfault
-          occurs in the cleaning up phase. The right fix is to destroy all the POAs
-          associated with this Session_Container in its destructor together with the
-          Servant_Activator. Thanks Phlip <phlip2005 @ gmail.com> for a
-          bug report.
-
-Thu Jul 20 22:03:31 UTC 2006  Nanbor Wang  <nanbor (at) txcorp (dot) com>
-
-        * docs/schema/ServerResourceUsage.txt: Revised the document to
-          change how a policy set should be hooked into a component
-          instance.  This needs to be changed to reflect recent changed in
-          DnC schema.
-
-Thu Jul 20 01:10:58 UTC 2006  Vipul Singh  <vipuls@dre.vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/PC_Updater.cpp: Removed the variable name
-          from the arguments in function definition in empty functions to
-          fix warnings.
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h: Changed declaration
-          at a few places from const static to static const to fix a few
-          warnings, also removed an unnecessarily defined namespace.
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: Made a few
-          changes to fix the warnings and to keep the code in sync with
-          the changes made to RepositoryManager_Impl.h. Fixed code which
-          passed non POD types to a varargs function(ACE_DEBUG) which
-          resulted in aborts at runtime.
-
-        * DAnCE/RepositoryManager/URL_Parser.cpp: Assigned value to ptr before
-          if condition to fix a few warnings.
-
-Wed Jul 19 08:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/Config_Handlers.mpc:
-          Use exceptions as base project
-
-Mon Jul 17 17:49:41 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-
-          Use new ACE_CString::size_type type to hold string
-          position/index value, instead of "int".  Addresses "comparison
-          between signed and unsigned" warnings.
-
-Sat Jul 15 04:21:13 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/README.txt:
-          Remove this file.
-
-        * DAnCE/RepositoryManager/README:
-          Add this file.
-
-Thu Jul 13 18:42:08 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RM_Helper.h:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-          Fixed a minor error.
-
-Wed Jul 12 14:00:59 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RM_Helper.cpp:
-          Fixed the "comparison between signed and unsigned integer" warning.
-
-Tue Jul 11 23:19:58 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-        * DAnCE/RepositoryManager/RM_Helper.h:
-        * DAnCE/RepositoryManager/RM_Helper.cpp:
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-          Fixed the "conversion from '__int64' to 'size_t', possible loss
-          of data" warnings.
-
-Sun Jul 09 06:01:14 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO version 0.5.2 released.
-
-Wed Jul  5 15:31:18 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * NEWS
-          Updated the NEWS file to add the changes of Repoman.
-
-Tue Jul  4 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Home_Servant_Impl_T.cpp:
-        * ciao/Dynamic_Component_Servant_T.cpp:
-        * ciao/Swapping_Servant_Home_Impl_T.cpp:
-          Fixed compile problems with VxWorks 5.5.1 and GCC 2.96
-
-Tue Jul  4 06:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc:
-          Don't build this project in the ace_for_tao configuration
-
-Mon Jul  3 16:20:54 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * NEWS
-
-          Updated the NEWS file.
-
-Tue Jun 27 13:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/RepositoryManager/RM_Helper.cpp:
-          Layout changes
-
-Fri Jun 23 13:45:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
-
-          Added $(TAO_ROOT) to the 'includes' line of the executable
-          project, due to a change in the way TAO/Version.h is
-          included.
-
-Thu Jun 22 18:47:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Dynamic_Component_Servant_T.cpp:
-        * ciao/Dynamic_Component_Servant_T.h:
-        * ciao/Swapping_Servant_Home_Impl_T.cpp:
-        * ciao/Swapping_Servant_Home_Impl_T.h:
-
-          Made changes to template code corresponding to those in
-
-          Mon Jun 19 14:52:25 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Mon Jun 19 14:52:25 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Home_Servant_Impl_T.cpp:
-        * ciao/Home_Servant_Impl_T.h:
-        * ciao/Servant_Impl_T.cpp
-        * ciao/Servant_Impl_T.h:
-
-          Reduced the number of template parameters in
-          the component servant and home servant template
-          base classes.
-
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-
-          Changes to generated servant code corresponding
-          the the changes in servant base class code
-          described above.
-
-Thu Jun 15 20:13:02 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/be_helper.cpp:
-
-          Uncommented code that outputs our copyright notice. This
-          change also elinates an unused arg warning for the
-          copyright notice string.
-
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
-          Added a newline after opening the file for better readability.
-
-Thu Jun 15 18:37:43 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc:
-
-          Added ciao_deployment_stub as a base project for
-          CIAO_Events_Handlers, to eliminate 'unresolved symbol'
-          linking errors. Thanks to Ming Xiong <ming.xiong@vanderbilt.edu>
-          for suggesting the fix.
-
-Thu Jun 15 15:10:58 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/be_extern.h:
-        * tools/IDL3_to_IDL2/be_init.cpp:
-        * tools/IDL3_to_IDL2/be_produce.cpp:
-
-          Changes to keep this backend in sync with changes to the
-          TAO_IDL front end - see TAO ChangeLog entry of a few
-          minutes ago.
-
-Thu Jun  8 16:07:05 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Servant_Impl_Utils_T.cpp (describe_multiplex_receptacle):
-
-          Fixed an error in instantiation of a
-          Components::ConnectionDescription valuetype - the actual
-          constructor call should have been on the OBV_* subclass.
-
-Thu Jun  8 12:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Planner/PCVisitor.cpp:
-          Fixed parameter never used warnings
-
-Wed Jun  7 21:39:00 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
-
-          Removed unneeded base projects.
-
-Wed Jun  7 21:07:11 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Servant_Impl_Utils_T.cpp:
-
-          Fixed CORBA memory management rule violations in
-          Servant_Impl_Base static template methods
-          describe_pub_event_source(), describe_simplex_receptacle() and
-          describe_multiplex_receptacle(). Thanks to Phlip
-          <phlip2005@gmail.com> for reporting a problem in
-          get_all_receptacles() that uncovered the above violations.
-
-Wed Jun  7 16:52:45 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        *  tools/Config_Handlers/Config_Handlers.mpc
-
-           Fix for linking error in Visual Studio.
-
-Wed Jun  7 06:04:45 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * CIDLC/ExecutorMappingGenerator.cpp
-
-          Modified to generate an include of CCM_Container.idl.
-
-        * ciao/Components.idl
-        * ciao/ComponentsC.h
-        * ciao/ComponentsS.h
-
-          Changed Components.idl to include CCM_Component.idl instead of
-          CCM_Container.idl.  This removes a dependancy on the container
-          library for stub projects.
-
-          Note this commit may be rolled back later based on discussions
-          on the dance-dev list, I am making it preemptively to resolve
-          scoreboard problems.
-
-Tue Jun  6 20:32:53 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Config_Handlers.mpc
-        * tools/Config_Handlers/Property_Handler.h
-
-          Compile fixes for Borland.
-
-        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
-        * tools/Config_Handlers/XMLSchema/Writer.hpp
-
-          Fixes for Borland ICEs.
-
-Tue Jun  6 13:48:59 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Config_Handlers_Common_Export.h
-
-          Missing file from previous commit.
-
-Mon Jun  5 20:34:51 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-        * DAnCE/TargetManager/TM_Client.mpc
-        * RACE/Controller/Component/Controller.mpc
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
-        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
-        * examples/BasicSP/BasicSP.mpc
-        * examples/BasicSP/BMClosedED/BMClosedED.mpc
-        * examples/BasicSP/BMDevice/BMDevice.mpc
-        * examples/BasicSP/BMDisplay/BMDisplay.mpc
-        * examples/BasicSP/EC/EC.mpc
-        * examples/Display/Display_Base/Display_Base.mpc
-        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
-        * examples/Hello/Hello_Base/Hello_Base.mpc
-        * examples/Hello/Receiver/Receiver.mpc
-        * examples/Hello/Sender/Sender.mpc
-        * examples/Swapping/Hello_Base/Hello_Base.mpc
-        * examples/Swapping/Receiver/Receiver.mpc
-        * examples/Swapping/Sender/Sender.mpc
-        * performance-tests/Protocols/common/Protocols.mpc
-        * tests/Bug_2130_Regression/interfaces/ENW.mpc
-        * tests/CIDL/CodeGen/CodeGen.mpc
-        * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
-        * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
-        * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
-        * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
-        * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
-        * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
-        * tests/IDL3/Events/Abstract/Abstract.mpc
-        * tests/IDL3/Events/Regular/Regular.mpc
-        * tests/IDL3/Homes/Attributes/HomeAttributes.mpc
-        * tests/IDL3/Homes/Basic/Basic.mpc
-        * tests/IDL3/Homes/Factory/Factory.mpc
-        * tests/IDL3/Homes/Finder/Finder.mpc
-        * tests/IDL3/Homes/Inheritance/Inheritance.mpc
-        * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
-        * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
-        * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
-        * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
-        * tests/IDL3/ImpliedIDL/Events/Events.mpc
-        * tests/IDL3/ImpliedIDL/Homes/Homes.mpc
-        * tests/IDL3/Lookup/lookup_test.mpc
-        * tests/Minimum/Minimum_Base/Minimum.mpc
-        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-
-          Fixes for linking errors/warnings in OS X.
-
-        * tools/Config_Handlers/Any_Handler.h
-        * tools/Config_Handlers/CEPE_Handler.h
-        * tools/Config_Handlers/CPD_Handler.h
-        * tools/Config_Handlers/Config_Handlers.mpc
-        * tools/Config_Handlers/DataType_Handler.h
-        * tools/Config_Handlers/ERE_Handler.h
-        * tools/Config_Handlers/Req_Handler.h
-        * tools/Config_Handlers/SatisfierProperty_Handler.h
-
-          Factored certain elements used by both the deployment
-          and packaging handlers into a seperate library, also
-          fixes for linking errors in OS X.
-
-Fri Jun  2 18:55:41 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/Config_Handlers/Config_Handlers.mpc:
-        * DAnCE/TargetManager/TargetManager.mpc:
-        * DAnCE/TargetManager/TM_Client.mpc:
-
-          Shortened long lines.
-
-Fri Jun  2 12:17:12 UTC 2006    Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rules.ciao.GNU:
-          Added setting of TAO_IDL3_TO_IDL2 and TAO_IDL3_TO_IDL2_DEP when
-          they are not set, needed for cross compilation
-
-Thu Jun  1 21:23:51 UTC 2006    <ming.xiong@vanderbilt.edu>
-
-        * examples/Hello/descriptors/run_test.pl
-          Changed the codes so that it will correctly destroy all
-          running processes upon failure.
-
-Thu Jun  1 16:03:26 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/Planner/Planner.cpp:
-
-          Added global qualifier (double colon) to the specialization
-          and typedef of the planner's Node class, to avoid an
-          'ambiguous symbol' error in VC8, which is presumably confusing
-          it with Deployment::Node.
-
-Thu Jun  1 15:49:47 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Planner/Node_T.h
-        * DAnCE/Planner/Planner.cpp
-
-          Modified some minor errors.
-
-Thu Jun  1 12:55:07 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/Display/NavDisplay/NavDisplay.mpc:
-
-          Fixed typo.
-
-Wed May 31 18:46:37 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/Display/NavDisplay/NavDisplay.mpc:
-
-          Added 'libs += Display_Base_stub' to the
-          Display_Base_NaviDisplay_stub project so that VC8, with its
-          parallel builds, will know about the dependency that VC7.1
-          seems to get from the 'after' line.
-
-Wed May 31 18:17:11 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/TargetManager/TM_Client.mpc:
-
-          Cosmetic changes.
-
-Wed May 31 17:08:17 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/Planner/Planner.mpc
-        * DAnCE/Planner/Planner.cpp
-
-          Removed the generated file of Repoman (RepositoryManagerDaemonC.*)
-          included in the Planner project and use the RepositoryManagerC.*.
-
-Wed May 31 16:49:12 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-
-          Made some minor changes.
-
-Tue May 30 10:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/MonitorController.cpp:
-          Fixed typo
-
-Tue May 30 06:16:58 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
-
-        * tools/Config_Handlers/XSCRT/Elements.hpp:
-
-          Added a fix for Sun C++ <= 5.7 template instantiation issue.
-
-Tue May 30 00:00:22 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/Planner/Node_T.h:
-        * DAnCE/Planner/Node_T.inl:
-        * DAnCE/Planner/Node_T.cpp:
-        * DAnCE/Planner/PCVisitor.h:
-        * DAnCE/Planner/PCVisitor.cpp:
-        * DAnCE/Planner/PCVisitorBase.h:
-        * DAnCE/Planner/PCVisitorBase.inl:
-        * DAnCE/Planner/PCVisitorBase.cpp:
-        * DAnCE/Planner/Planner.mpc:
-        * DAnCE/Planner/Planner.cpp:
-
-          Checking in the Planner for DAnCE which creates a Deployment
-          Plan on the fly (in-memory).
-
-        * RACE/Input_Adapters/LocationUpdater/Injector.cpp:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cdp:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cidl:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater.idl:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_deployment.dat:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec_export.h:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_stub_export.h:
-        * RACE/Input_Adapters/LocationUpdater/LocationUpdater_svnt_export.h:
-        * RACE/Input_Adapters/LocationUpdater/Location_Updater.mpc.disable:
-        * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.h:
-        * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.inl:
-        * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.cpp:
-        * RACE/Input_Adapters/LocationUpdater/PlanUpdater.h:
-        * RACE/Input_Adapters/LocationUpdater/PlanUpdater.cpp:
-        * RACE/Input_Adapters/LocationUpdater/README.txt:
-
-          Adding the LocationUpdater which is a RACE input adapter which
-          updates the locations of the implementation artifact to reclect
-          the ones available in the RepositoryManager. Please see the README
-          and the code for more info.
-
-        * RACE/Input_Adapters/PlanGenerator/Injector.cpp:
-        * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.h:
-        * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.inl:
-        * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.cpp:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.h:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cidl:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cpp:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.idl:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.mpc.disable:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_deployment.dat:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec_export.h:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_stub_export.h:
-        * RACE/Input_Adapters/PlanGenerator/PlanGenerator_svnt_export.h:
-        * RACE/Input_Adapters/PlanGenerator/README.txt:
-
-          Adding the PlanGenerator which is a RACE input adapter which queries
-          the RepositoryManager for an installation name, retrieves the corresponding
-          PackageConfiguration, and builds the DeploymentPlan on the fly. Please see
-          the README and the code for more info.
-
-Mon May 29 21:58:18 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-
-          Got rid of the code that updates the loader path for the
-          libraries downloaded via HTTP. Now this has to be done
-          manually.
-
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-        * DAnCE/RepositoryManager/README.txt:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-
-          Changing the way library names are matched to be more general.
-          Some additions to the README
-          A minor change to one of the functions
-
-Mon May 29 19:07:54 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/NodeApplication/Configurator_Factory.cpp:
-        * DAnCE/NodeManager/MonitorController.cpp:
-        * examples/Swapping/Sender/Sender_exec.cpp:
-
-          Changed C-style casts from void* to pointer-to-function
-          to two-step reinterpret_cast<>s, with ptrdiff_t as a
-          temporary intermediate. C++ forbids casting directly
-          between pointer-to-object and pointer-to-function, and
-          some the newer compilers are catching it.
-
-Mon May 29 17:44:01 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/Display/Display_Base/Display_Base.mpc:
-
-          Changed the base project of Display_Base_stub from
-          ciao_client_dnc to ciao_events_base_dnc, in order to pull
-          in a needed dependency on CIAO_DnC_Container. Thanks to
-          Ming Xiong <mxiong@dre.vanderbilt.edu> for supplying the
-          fix.
-
-Mon May 29 15:32:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/Display/NavDisplay/NavDisplay.mpc:
-
-          Cosmetic changes (shortened long lines).
-
-        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc:
-
-          Changed 'after +=' and 'libs +=' lines to reflect recent
-          changes to other examples/Display projects.
-
-Fri May 26 13:57:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RMAdmin.cpp(ACE_TMAIN):
-
-          Fixed unused variable warning, cosmetic changes.
-
-Fri May 26 12:59:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * DAnCE/NodeManager/NAM_Map.cpp:
-          Make the equality test explicit to work with the revised octet
-          sequence implementation.
-
-Thu May 25 19:02:52 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Container_Base.cpp(ciao_install_home):
-
-          Changed the single-step reinterpret_cast of the component
-          DLL entry points to be a two-step process: first to the
-          integer type 'ptrdiff_t' then to the desired pointer-to-
-          function type. A single cast won't work because casting
-          from pointer-to-object (even void*) to pointer-to-function
-          directly is not allowed in C++.
-
-Thu May 25 11:50:39 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ciao/Container_Base.cpp:
-          Replace the use of static_cast in ciao_install_home with
-          reinterpret_cast since void* sources are involved.
-
-Wed May 24 17:35:53 UTC 2006  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * examples/Display/RateGen/RateGen.mpc: Fixed the project
-          dependency for controller.
-
-Tue May 23 22:46:58 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/Options.cpp
-        * DAnCE/RepositoryManager/Options.h
-        * DAnCE/RepositoryManager/RMadmin.cpp
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-        * DAnCE/RepositoryManager/RepositoryManager.cpp
-
-          Added the code to save the state of the RepoMan at exit and
-          load the state of it at start.
-
-Tue May 23 14:31:11 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/Options.cpp
-        * DAnCE/RepositoryManager/Options.h
-        * DAnCE/RepositoryManager/RMadmin.cpp
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-        * DAnCE/RepositoryManager/RepositoryManager.cpp
-
-          Added the naming service & the implementation of createPackage
-          function to RepoMan.
-
-Mon May 22 18:49:14 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Container_Base.cpp(ciao_install_home):
-
-          Changed C-style casts of DLL entrypoints to static_cast<>s
-          to the appropriate pointer to function. This change is
-          intended to eliminate warnings from gcc 4.0.
-
-Fri May 19 16:49:32 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-        * DAnCE/NodeApplicationManager/URL_Parser.cpp:
-        * DAnCE/NodeManager/Node_Manager.cpp:
-
-          Minor changes to eliminate scoreboard warnings, and to bring
-          code in line with the ACE style guidelines.
-
-Thu May 18 20:28:00 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com>
-
-        * examples/Display/GPS/GPS_Impl.ccd:
-        * examples/Display/NavDisplay/NavDisplay_Impl.ccd:
-        * examples/Display/RateGen/RateGen_Impl.ccd:
-
-        Removed these generated files from CVS.
-
-Thu May 18 11:28:52 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-
-        * examples/Display/Display_Base/GNUmakefile:
-        * examples/Display/Display_Base/GNUmakefile.Display_Base_stub:
-        * examples/Display/Display_Base/GNUmakefile.Display_Base_svnt:
-
-          Removed these files from CVS.
-
-Wed May 17 21:20:46 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com>
-
-        * TAO/CIAO/examples/Display:
-          Ported the Display example to use the new CIAO framework
-
-
-Tue May 16 12:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * README:
-          Removed mentioning of vc6
-
-Mon May 15 20:48:52 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/ServantSourceGenerator.cpp (generate):
-
-          Removed commented-out code.
-
-        * CIDLC/ServantHeaderGenerator.cpp (generate_facets):
-
-          Fixed cut-and-paste error that was causing facet servant
-          class declaration to get skipped when the composition is
-          defined inside one or more IDL modules.
-
-Fri May 12 07:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/Utils/Functors.h:
-          Added a workaround for specific for BCB6, should fix the gcc4
-          internal compiler errors
-
-Fri May 12 07:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/XSCRT/Elements.hpp:
-          The work around is needed for < gcc 3.3 and also BCB6, so make
-          it a little bit more easier to handle this.
-
-Thu May 11 21:24:45 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/Literals.cpp:
-        * CIDLC/Literals.hpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantHeaderGenerator.hpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.hpp:
-        * CIDLC/UtilityTypeNameEmitters.cpp:
-        * CIDLC/UtilityTypeNameEmitters.hpp:
-
-          Change code generation for facet servant classes to be
-          defined in a special namespace created from a prefix
-          and a flattened version of the name of the scope
-          containing the interface that supports the facet. This
-          change enables facets in the same translation unit
-          using the same interface to use a single source code
-          definition (an internal check in the CIDL compiler
-          guarantees that the facet servant class is generated
-          once per interface per translation unit). The fact
-          that the actual facet servant class type is an instantiation
-          of a template class ensures that the same interface type
-          used as a facet in multiple translation units in a build
-          will not produce multiple-definition link errors,
-          although in this case there will be duplicated code.
-          Thanks to James Hill <j.hill@vanderbilt.edu> for providing
-          the multiple-facet-single-translation-unit use case
-          and to Nanbor Wang <nanbor@txcorp.com> for his comments
-          on the proposed solution.
-
-Wed May 10 14:04:57 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/MonitorCB.cpp
-        * DAnCE/TargetManager/CmpClient.cpp
-        * DAnCE/TargetManager/DomainDataManager.cpp
-
-        Fixes for warnings.
-
-Mon May  8 20:41:43 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * bin/PerlCIAO/perlciao.mpc:
-
-        Fixing a fuzz build error due to a missing Id tag
-
-Mon May  8 15:33:58 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/HTTP_Client.h:
-        * DAnCE/RepositoryManager/HTTP_Client.cpp:
-        * DAnCE/RepositoryManager/HTTP_Handler.h:
-        * DAnCE/RepositoryManager/HTTP_Handler.cpp:
-        * DAnCE/RepositoryManager/Options.h:
-        * DAnCE/RepositoryManager/Options.cpp:
-        * DAnCE/RepositoryManager/PC_Updater.h:
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-        * DAnCE/RepositoryManager/PC_Updater_T.h:
-        * DAnCE/RepositoryManager/PC_Updater_T.cpp:
-        * DAnCE/RepositoryManager/README.txt:
-        * DAnCE/RepositoryManager/RM_Helper.h:
-        * DAnCE/RepositoryManager/RM_Helper.cpp:
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-        * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/RepositoryManager/URL_Parser.h:
-        * DAnCE/RepositoryManager/URL_Parser.cpp:
-        * DAnCE/RepositoryManager/ZIP_Wrapper.h:
-        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
-
-        Updating the RepositoryManager with the latest changes from the
-        escher repository. Adding my newest changes. Adding some new
-        minor features.
-
-        * bin/PerlCIAO/TestUtils.base:
-        * bin/PerlCIAO/TestUtils.pm:
-        * bin/PerlCIAO/TestUtils_Base.pm:
-        * bin/PerlCIAO/generate_container.pl:
-        * bin/PerlCIAO/perlciao.mpc:
-
-        This is a set of test utilities tailored towards testing CIAO components.
-        It provides a nice and quick interface provising the common functionality
-        necessary to run a CIAO test and perform clean-up on failure. This utils
-        are a wrapper around the $ACE_ROOT/bin/PerlACE/ utilities. I will check in
-        an example of how test utils are used shortly.
-
-        * tools/Config_Handlers/IDD_Handler.cpp:
-
-        Fixing a bug in the PackageConfiguration reverse handler.
-
-
-Fri May  5 15:36:47 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * docs/cidlc.html Added documentation for the CIDL compiler.
-          Thanks to Boris for contributing this.
-
-        * docs/index.html: Fixed some broken links to the tutorials and added
-          a link to Ming's tutorial example that shows how to use CoSMIC.
-
-Fri May  5 16:58:17 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/Execution_Manager.cpp (CIAO): Fixed the
-          parsing of command line options.
-
-Thu May  4 21:35:01 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/ADD_Handler.cpp
-        * tools/Config_Handlers/DP_Handler.cpp
-
-        Fixed a reverse handler bug.
-
-Thu May  4 08:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-          Fixed compilation error
-
-Wed May  3 22:11:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/schema/Basic_Deployment_Data.xsd
-        * docs/schema/ccd.xsd
-        * docs/schema/cdd.xsd
-        * docs/schema/cdp.xsd
-        * docs/schema/cid.xsd
-        * docs/schema/cpd.xsd
-        * docs/schema/iad.xsd
-        * docs/schema/pcd.xsd
-        * docs/schema/toplevel.xsd
-
-          Schema propagated from the ARMS repo.
-
-Wed May  3 12:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * Config_Handlers/Utils/Functors.h:
-          Made the FUNC argument just return void, this fixes the errors with this
-          template with BCB on my system, hopefully it doesn't break other
-          compilers
-
-Tue May  2 03:04:50 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication.cpp:  Removed the code
-          snippet that bootstraps the NodeApplication process at a
-          specific OS priority.
-
-Wed Apr 26 21:25:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Config_Handlers.mpc
-        * tools/Config_Handlers/Property_Handler.h
-        * tools/Config_Handlers/SatisfierProperty_Handler.h
-        * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-        * tools/Config_Handlers/Utils/Functors.h
-
-          Introduced a workaround for a ICE in GCC 4.0.22.
-
-Wed Apr 26 13:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/DP_Handler.cpp:
-        * tools/Config_Handlers/XML_File_Intf.cpp:
-        * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp:
-        * tools/Config_Handlers/XSCRT/XMLSchema.hpp:
-        * tools/Config_Handlers/XSCRT/Elements.hpp:
-        * tools/Config_Handlers/XSCRT/XML.hpp:
-          Removed workarounds for vc6 again
-
-        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h:
-          Added missing post.h
-
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h:
-        * tools/Config_Handlers/Package_Handlers/PC_Intf.h:
-          Fixed incorrect file tags
-
-Wed Apr 26 08:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/TargetManager/DomainDataManager.h:
-          Fixed compile problem in gcc4 build
-
-Tue Apr 25 21:27:05 UTC 2006  William R. Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/TargetManager.mpc
-
-          Linking problems for Borland.
-
-        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
-
-          More compile fixes for Borland.
-Tue Apr 25 20:12:25 UTC 2006  William R. Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.h
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
-        * ciao/Deployment_Core.idl
-        * tools/Config_Handlers/ADD_Handler.cpp
-        * tools/Config_Handlers/CCD_Handler.cpp
-        * tools/Config_Handlers/CEPE_Handler.cpp
-        * tools/Config_Handlers/CEPE_Handler.h
-        * tools/Config_Handlers/CPD_Handler.cpp
-        * tools/Config_Handlers/CPD_Handler.h
-        * tools/Config_Handlers/DP_Handler.cpp
-        * tools/Config_Handlers/Deployment.hpp
-        * tools/Config_Handlers/ERE_Handler.cpp
-        * tools/Config_Handlers/ERE_Handler.h
-        * tools/Config_Handlers/MDD_Handler.cpp
-        * tools/Config_Handlers/PCD_Handler.cpp
-        * tools/Config_Handlers/PCD_Handler.h
-        * tools/Config_Handlers/Property_Handler.cpp
-        * tools/Config_Handlers/Property_Handler.h
-        * tools/Config_Handlers/Req_Handler.cpp
-        * tools/Config_Handlers/Req_Handler.h
-        * tools/Config_Handlers/SatisfierProperty_Handler.cpp
-        * tools/Config_Handlers/SatisfierProperty_Handler.h
-        * tools/Config_Handlers/cdp.hpp
-        * tools/Config_Handlers/toplevel.hpp
-        * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
-        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
-        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.h
-
-        Compilation fixes for borland, some cosmetic fixes as well.
-
-Tue Apr 25 09:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/CPD_Handler.h:
-          ComponentPortDescription is a struct, so also forward declare it
-          as a struct
-
-Mon Apr 24 18:53:22 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * CIDLC/ServantSourceGenerator.cpp
-
-          Fixed a code generation problem caused by careless merging.
-
-Mon Apr 24 18:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/ADD_Handler.cpp:
-        * tools/Config_Handlers/DP_Handler.cpp:
-        * tools/Config_Handlers/ID_Handler.h:
-          Removed incorrect semi colons
-
-Mon Apr 24 06:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/IDREF_Base.cpp:
-          Removed not needed semi colon that caused compile errors in some
-          builds
-
-Sun Apr 23 11:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/Utils/XML_Helper.h:
-          Fixed compile error
-
-Sat Apr 22 21:13:10 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
-        * tools/Config_Handlers/Basic_Deployment_Data.hpp
-        * tools/Config_Handlers/Deployment.hpp
-        * tools/Config_Handlers/ccd.hpp
-        * tools/Config_Handlers/cdd.hpp
-        * tools/Config_Handlers/cdp.hpp
-        * tools/Config_Handlers/cid.hpp
-        * tools/Config_Handlers/cpd.hpp
-        * tools/Config_Handlers/iad.hpp
-        * tools/Config_Handlers/pcd.hpp
-        * tools/Config_Handlers/toplevel.hpp
-        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
-
-        Compile errors.
-
-Fri Apr 21 16:24:46 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * Merge from the ARMS Escher repository.
-
-          Changelog entries to follow:
-
-   Tue Apr 11 09:29:12 UTC 2006    <wotte@blade35.isislab.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.h
-        * DAnCE/NodeManager/Node_Manager.cpp
-
-        Additional debugging/compile fixes.
-
-  Tue Apr 11 08:30:42 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciao/Deployment_Core.idl
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
-
-          Modified to passivate (and reactivate later) shared components
-          when tearing down an assembly.
-
-  Sun Apr  9 01:03:19 UTC 2006    <wotte@blade35.isislab.vanderbilt.edu>
-
-        * M APRIL_DEMO.mwc
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/ExecutionManager/Execution_Manager.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeManager/MonitorCB.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * DAnCE/NodeManager/Node_Manager.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-
-          Various compile/runtime fixes.
-
-  Fri Apr  7 15:47:34 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-
-          Modified to enforce passivation occured on all components
-          before any connections are removed.
-
-  Fri Apr  7 03:28:03 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
-
-        * tools/Config_Handlers/Utils/XML_Helper.cpp:
-
-          Replaced "throw;" (which Stroustrup tells us causes an abort)
-          with "throw 0;" (kind of like an unnamed exception, which is
-          clearly what the author of this code intended).
-
-        * ciao/Packaging_Data.idl:
-
-          I've had occasion to use this file with the IFR Service, and
-          I've found that the IFR Service backend chokes on a bunch of
-          stuff here.  The stuff that it chokes on has been protected with
-          "#ifndef AVOID_IFR_CRASH" so that you can protect the backend
-          from crashing if you pass -DAVOID_IFR_CRASH to tao_ifr.
-
-        * ciao/Servant_Impl_Base.cpp:
-        * ciao/Servant_Impl_Base.h:
-
-          Implemented the add_receptacle operation.
-
-  Fri Apr  7 02:55:37 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-
-          Added ACE_CATCHANY and ACE_CATCHALL blocks in
-          Plan_Launcher_i::launch_plan to avoid crashing in case of CORBA
-          fault.
-
-  Fri Apr  7 02:54:29 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
-
-        * DAnCE/NodeApplication/Configurator_Factory.cpp:
-
-          Options beginning with "-ORB" are explicitly ignored.  This
-          avoids having an "-ORB" option mistakenly parsed as being a
-          "-o <ior_output_file>" option.
-
-  Fri Apr  7 02:51:31 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
-
-        * CIDLC/ServantSourceGenerator.cpp:
-
-        Added code to support "get_all_receptacles" operation.
-
-  Fri Apr  7 02:47:02 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
-
-        * CCF/CCF/IDL2/SemanticGraph/Enum.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp:
-
-        Made a couple small changes that keep the CIDLC from coughing on
-        enums
-
-  Fri Apr  7 02:37:34 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-
-          Fixed a bug in detecting External connection and Internal
-          connections. Earlier when an external component is detected,
-          not *all* connections associated with this components are
-          purged from the to-be-removed connections list. Added another
-          helper method <purge_connections> to accomplish this task.
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-
-          Modified to reuse rebind() instead of bind() to avoid
-          redeployment duplicate instance errors.
-
-  Thu Apr  6 15:02:59 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication.cpp:
-
-        Modified the NodeApplications to up at OS priority 20 instead of
-        50.
-
-  Thu Apr  6 00:35:35 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-        * DAnCE/NodeManager/MonitorCB.cpp:
-        * DAnCE/NodeManager/MonitorController.cpp:
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-
-          Fixed the TM component removal problem. Changed/Removed
-          debug messages.
-
-  Wed Apr  5 16:54:20 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Any_Handler.cpp
-        * tools/Config_Handlers/DP_Handler.cpp
-        * tools/Config_Handlers/IDD_Handler.cpp
-        * tools/Config_Handlers/MDD_Handler.cpp
-        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
-        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
-
-          Improvements to output more information in the reverse handler.
-
-
-  Thu Mar 30 22:10:53 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/Container_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * ciao/Home_Servant_Impl_T.cpp
-        * ciao/Servant_Activator.cpp
-        * tools/Config_Handlers/DD_Handler.cpp
-        * tools/Config_Handlers/IDREF_Base.cpp
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
-
-        Disabled excessive debugging.
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-
-        Disabled RT-CCM support.
-
-        * DAnCE/TargetManager/DomainDataManager.cpp
-
-        Added error messages.
-
-  Wed Mar 29 21:34:07 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-          Fixed a Access Error in the monitor.
-
-        * DAnCE/NodeManager/MonitorCB.cpp:
-        * DAnCE/NodeManager/MonitorController.cpp:
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Added to have graceful termination.
-
-        * DAnCE/TargetManager/DomainDataManager.h:
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Update to turn off monitors at the end.
-
-  Mon Mar 27 22:39:25 UTC 2006  William R. Otte    <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Utils/XML_Helper.cpp
-        * tools/Config_Handlers/Utils/XML_Helper.h
-
-  Mon Mar 27 20:10:09 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
-          (get_node_manager):
-
-          Modified this method to re-throw the caught exception.
-
-  Sun Mar 26 22:10:16 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-
-        Added code to handle exceptions while trying to connect to the
-        node managers in get_node_manager ().
-
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-
-        Added debug messages.
-
-        * RACE/Controller/Component/RACE_common.h:
-
-        Added a new file to define the RACE_DEBUG and RACE_ERROR macros.
-
-  Mon Mar 27 00:22:02 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-
-          Modified to allow ccm_passicate to be called on all components
-          before actually deactivating any components.
-
-  Thu Mar 23 23:18:56 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/MonitorController.cpp (svc):
-
-        Removed an unwanted debug statement.
-
-  Thu Mar 23 22:54:25 UTC 2006  Nishanth Shankarn  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-
-        Removed an unwanted debug statement.
-
-  Thu Mar 23 19:40:54 UTC 2006  Nishanth Shankarn  <nshankar@dre.vanderbilt.edu>
-
-        * APRIL_DEMO.mwc:
-        * CIAO.mwc:
-        * CIAODAnCE.mwc:
-        * CIAOTAO.mwc:
-        * CIAO_TAO_DAnCE.mwc:
-
-        Modified the mwc files so that they exclude the RACE/hog_string
-        directory.
-
-  Thu Mar 23 18:04:58 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-
-        Fixed a bug in set_priority method.
-
-  Wed Mar 22 19:32:37 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-
-        Modified to make debug statements debug_level controlled.
-
-  Wed Mar 22 00:51:11 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-
-        Modified to find the corresponding NAM when given a plan_uuid.
-
-  Wed Mar 22 02:12:58 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-        * DAnCE/NodeManager/MonitorCB.cpp:
-        * DAnCE/NodeManager/MonitorController.cpp:
-
-        Removed some of the debug statements
-
-  Tue Mar 21 19:12:57 UTC 2006  Nishanth Shankarn  <nshankar@dre.vanderbilt.edu>
-
-        * RACE/hog_string/hog.cdp:
-
-        Fixed the plan id.
-
-  Mon Mar 20 21:07:50 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-
-          turning off the HTTP capability for Linux until I figure out why
-          it affects the loading of libraries.
-
-  Mon Mar 20 20:40:37 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-
-          Changed loader path delimiter on Unix-like systems from ';' to ':'
-
-
-  Mon Mar 20 17:22:22 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/HTTP_Client.h:
-        * DAnCE/NodeApplicationManager/HTTP_Client.cpp:
-        * DAnCE/NodeApplicationManager/HTTP_Handler.h:
-        * DAnCE/NodeApplicationManager/HTTP_Handler.cpp:
-        * DAnCE/NodeApplicationManager/URL_Parser.h:
-        * DAnCE/NodeApplicationManager/URL_Parser.cpp:
-
-          Oops. Forgot to add the actual HTTP code.
-
-  Mon Mar 20 04:27:48 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h:
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-
-          Adding HTTP capability to DAnCE.
-
-        * DAnCE/RepositoryManager/HTTP_Client.h:
-        * DAnCE/RepositoryManager/HTTP_Client.cpp:
-        * DAnCE/RepositoryManager/HTTP_Handler.h:
-        * DAnCE/RepositoryManager/HTTP_Handler.cpp:
-        * DAnCE/RepositoryManager/Options.h:
-        * DAnCE/RepositoryManager/Options.cpp:
-        * DAnCE/RepositoryManager/PC_Updater.h:
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-        * DAnCE/RepositoryManager/PC_Updater_T.h:
-        * DAnCE/RepositoryManager/PC_Updater_T.cpp:
-        * DAnCE/RepositoryManager/RM_Helper.h:
-        * DAnCE/RepositoryManager/RM_Helper.cpp:
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager.mpc:
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/RepositoryManager/URL_Parser.h:
-        * DAnCE/RepositoryManager/URL_Parser.cpp:
-        * DAnCE/RepositoryManager/ZIP_Wrapper.h:
-        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
-
-          Porting the RepositoryManager to the newest XML config handlers.
-          Also migrating the code from the DOC repository to ensure the gap
-          between the code in this repository and that in cvs.doc.wustl.edu
-          repo is closed.
-
-
-          NOTE: I still have some testing left, but before that I need to
-          compile the CoSMIC version from this repository and regenerate
-          a bunch of descriptors because all the example descriptors are
-          broken.
-
-  Sat Mar 18 22:33:10 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/Interfaces/NodeManager.idl
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.h
-        * ciao/Deployment.idl
-
-          Put the struct Sched_Params definition outside of the NAM
-          interface.
-          Cleaned up the code a bit.
-
-  Sun Mar 19 16:52:54 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/CmpClient.cpp:
-        * DAnCE/TargetManager/DomainDataManager.h:
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Updated to implement the commitResource and releaseResource
-          function
-
-  Sat Mar 18 19:01:18 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication.cpp:
-
-        Enhanced the NodeApplication to run in realtime priority mode.
-
-  Fri Mar 17 06:36:18 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
-
-        * DAnCE/Interfaces/NodeManager.idl:
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-
-        * DAnCE/NodeManager/MonitorCB.cpp:
-        * DAnCE/NodeManager/MonitorController.h:
-        * DAnCE/NodeManager/MonitorController.cpp:
-        * DAnCE/NodeManager/NodeManager_Impl.h:
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-        * ciao/Deployment.idl:
-
-          Implemented the set_priority method on the NodeManager
-          and NodeApplicationManager interface. Removed some of the debug
-          messages
-
-  Thu Mar 16 03:54:39 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/DD_Handler.cpp:
-          Updated the handler to handle optional parameters
-
-  Tue Mar 14 07:01:28 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-        * DAnCE/NodeManager/NodeManager_Impl.h:
-          Updated to make it portable in windows
-
-        * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp:
-          Fixed the entry point.
-
-  Mon Mar 13 23:04:32 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
-
-        * tools/Config_Handlers/CPD_Handler.h
-        * tools/Config_Handlers/DataType_Handler.h
-        * tools/Config_Handlers/ID_Handler.h
-        * tools/Config_Handlers/Property_Handler.h
-        * tools/Config_Handlers/Req_Handler.h
-        * tools/Config_Handlers/SatisfierProperty_Handler.h
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
-        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
-        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.h
-        * tools/Config_Handlers/Utils/XercesString.h
-
-          Fixed linking/warnings on Windows.
-
-  Mon Mar 13 18:27:27 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/TargetManager.mpc:
-          Changed the projects to depend on NodeManager_Stub. This will fix the
-          linking errors in Windows.
-
-  Mon Mar 13 17:36:28 UTC 2006  Krishnakumar B  <kitty@dre.vanderbilt.edu>
-
-        * CIDLC/ServantSourceGenerator.cpp (namespace): Updated the
-          generated code to set the component id on the component context
-          class to allow retrieving the id at run-time from an executor
-          implementation.
-
-  Mon Mar 13 17:28:44 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/Execution_Manager.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-
-          Fixes for nameservice discovery of EM.
-
-        * docs/schema/toplevel.xsd
-
-          Minor correction to schema.
-
-  Fri Mar 10 17:03:26 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
-
-        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
-
-          Fixed minor bug in URI interface.
-
-  Thu Mar  9 22:26:17 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Context_Impl_Base.cpp:
-        * ciao/Context_Impl_Base.h:
-
-          Added CORBA::String_var member to store the component instance
-          id, also added a pair of set/get methods called _ciao_instance_id.
-
-  Wed Mar  8 19:07:31 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-
-          Add error message for connection failure.
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
-
-          Disabled this project.
-
-        * DAnCE/TargetManager/TargetManager_exec.cpp
-        * DAnCE/TargetManager/TargetManager_exec.h
-
-          Fix entry point problems.
-
-  Wed Mar  8 19:29:20 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/DomainDataManager.h:
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-        * DAnCE/TargetManager/TargetManagerExt.idl:
-        * DAnCE/TargetManager/TargetManager_exec.h:
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Added the structure in the TMExt interface to maintain the
-          mapping between hostname to NM refs.
-
-  Wed Mar  8 14:40:41 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools//Config_Handlers/Deployment.cpp
-        * tools//Config_Handlers/Deployment.hpp
-        * tools//Config_Handlers/GNUmakefile
-        * tools//Config_Handlers/cdd.cpp
-        * tools//Config_Handlers/cdd.hpp
-        * tools//Config_Handlers/pcd.cpp
-        * tools//Config_Handlers/pcd.hpp
-        * tools//Config_Handlers/toplevel.cpp
-        * tools//Config_Handlers/toplevel.hpp
-        * tools//Config_Handlers/Package_Handlers/PCD_Handler.cpp
-        * tools//Config_Handlers/Package_Handlers/PCD_Handler.h
-
-        New generated code.
-
-  Wed Mar  8 03:11:02 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-          Implement the Signal Handler for the process NodeManager. And
-          set the option avoid_zombies=0
-
-
-        * DAnCE/NodeManager/MonitorController.h:
-        * DAnCE/NodeManager/MonitorController.cpp:
-
-        * DAnCE/TargetManager/DomainDataManager.h:
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Implement ComponentID to Process Id mapping
-
-  Tue Mar  7 23:26:41 UTC 2006  Nilabja Roy  <nilabjar@localhost.localdomain>
-
-        * DAnCE/TargetManager/DomainDataManager.cpp
-        * DAnCE/TargetManager/TargetManagerExt.idl
-        * DAnCE/TargetManager/TargetManager.mpc:
-        Changed to depend on the NodeManager_Stub, so that
-        CIAO::NodeManager can be used.
-
-  Tue Mar  7 03:14:50 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-          Changed to add the Comp_id to Proc_id mapping
-
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-          Changed to add the percentage cpu same as vmstat
-
-        * DAnCE/NodeManager/MonitorController.h:
-        * DAnCE/NodeManager/MonitorController.cpp:
-          Changed to add the Comp_id to Proc_id mapping
-
-        * DAnCE/NodeManager/NodeManager_Impl.h:
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Changed to add the Comp_id to Proc_id mapping
-
-        * DAnCE/TargetManager/DomainDataManager.h:
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-          Changed to add interface to RACE
-
-        * DAnCE/TargetManager/TargetManagerExt.idl:
-        * DAnCE/TargetManager/TargetManager_exec.h:
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Changed to add interface to RACE
-
-        * DAnCE/TargetManager/descriptors/Domain.cdd:
-          Updated to the latest xsd
-
-
-        * docs/schema/cdd.xsd:
-          Changed the Domain definations
-
-  Mon Mar  6 19:46:54 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/Interfaces/NodeManager.idl
-        * DAnCE/NodeManager/NodeManager_Impl.h
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-
-        Added the set_priority method to modify the priority of
-        NodeApplication process.
-
-  Wed Mar  1 20:56:16 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/TargetManager_exec.h
-        * DAnCE/TargetManager/TargetManager_exec.cpp
-        * DAnCE/TargetManager/TargetManagerExt.idl:
-
-        Added method to TargetManagerExt interface to obtain references to
-        the NodeManagers.
-
-
-  Fri Feb 24 22:55:51 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Basic_Deployment_Data.cpp
-        * tools/Config_Handlers/Basic_Deployment_Data.hpp
-        * tools/Config_Handlers/CEPE_Handler.cpp
-        * tools/Config_Handlers/CEPE_Handler.h
-        * tools/Config_Handlers/CPD_Handler.cpp
-        * tools/Config_Handlers/CPD_Handler.h
-        * tools/Config_Handlers/CRDD_Handler.cpp
-        * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
-        * tools/Config_Handlers/Config_Handlers.mpc
-        * tools/Config_Handlers/DP_Handler.cpp
-        * tools/Config_Handlers/DP_Handler.h
-        * tools/Config_Handlers/DataType_Handler.cpp
-        * tools/Config_Handlers/DataType_Handler.h
-        * tools/Config_Handlers/DnC_Dump.cpp
-        * tools/Config_Handlers/ERE_Handler.h
-        * tools/Config_Handlers/IDD_Handler.cpp
-        * tools/Config_Handlers/IDREF_Base.cpp
-        * tools/Config_Handlers/IDREF_Base.h
-        * tools/Config_Handlers/ID_Handler.cpp
-        * tools/Config_Handlers/ID_Handler.h
-        * tools/Config_Handlers/IRDD_Handler.cpp
-        * tools/Config_Handlers/IRDD_Handler.h
-        * tools/Config_Handlers/MDD_Handler.cpp
-        * tools/Config_Handlers/PCD_Handler.cpp
-        * tools/Config_Handlers/Property_Handler.h
-        * tools/Config_Handlers/RDD_Handler.cpp
-        * tools/Config_Handlers/Req_Handler.cpp
-        * tools/Config_Handlers/Req_Handler.h
-        * tools/Config_Handlers/STD_PCD_Handler.h
-        * tools/Config_Handlers/ccd.cpp
-        * tools/Config_Handlers/ccd.hpp
-        * tools/Config_Handlers/cid.cpp
-        * tools/Config_Handlers/cid.hpp
-        * tools/Config_Handlers/cpd.cpp
-        * tools/Config_Handlers/cpd.hpp
-        * tools/Config_Handlers/iad.cpp
-        * tools/Config_Handlers/iad.hpp
-        * tools/Config_Handlers/pcd.cpp
-        * tools/Config_Handlers/pcd.hpp
-        * tools/Config_Handlers/test.cdp
-        * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CAD_Handler.h
-        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CID_Handler.h
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
-        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
-        * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/IAD_Handler.h
-        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
-        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/PCD_Handler.h
-        * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
-        * tools/Config_Handlers/Package_Handlers/PC_Intf.h
-        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-        * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.h
-        * tools/Config_Handlers/Package_Handlers/test.cpp
-        * tools/Config_Handlers/Package_Handlers/descriptors/package.tpd
-        * tools/Config_Handlers/Utils/Exceptions.h
-        * tools/Config_Handlers/Utils/Functors.h
-        * tools/Config_Handlers/Utils/XML_Error_Handler.cpp
-        * tools/Config_Handlers/Utils/XML_Helper.h
-        * tools/Config_Handlers/XMLSchema/Writer.hpp
-
-          Package handlers and changes necessary to support them.
-
-Fri Apr 21 08:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIDLC/ServantSourceGenerator.cpp:
-          Removed usage of ACE_NESTED_CLASS
-
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-          Fixed compile errors
-
-Thu Apr 20 13:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/DnC_Dump.cpp:
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-          Fixed compile error
-
-Thu Apr 20 09:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/RT-CCM/CLA_Handler.cpp:
-          Fixed compile error
-
-Wed Apr 19 19:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-          Fixed usage of sequences. The sequences now return
-          a pointer on the subscript operators, not _var which was not according
-          to the spec.
-
-Wed Apr 19 14:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/XMLSchema/Types.hpp:
-          Removed vc6 workaround
-
-Wed Apr 19 13:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/schema/xsc-banner.h:
-        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp:
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
-          Removed include of vc6-4786.h
-
-Wed Apr 19 13:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/STD_PC_Intf.cpp:
-        * tools/Config_Handlers/XSCRT/XMLSchema.hpp:
-        * tools/Config_Handlers/XSCRT/Elements.hpp:
-        * tools/Config_Handlers/XSCRT/XML.hpp:
-        * tools/Config_Handlers/DP_Handler.cpp:
-        * tools/Config_Handlers/DP_Handler.cpp:
-          Removed vc6 workarounds
-
-Wed Apr 19 11:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/DnC_Dump.{h,cpp}:
-          Updated for string manager change in TAO
-
-        * ciao/Servant_Impl_Base.cpp:
-          Updated for sequence change
-
-Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/Basic_Deployment_Data.hpp
-        * tools/Config_Handlers/Deployment.hpp
-        * tools/Config_Handlers/ccd.hpp
-        * tools/Config_Handlers/cdd.hpp
-        * tools/Config_Handlers/cdp.hpp
-        * tools/Config_Handlers/cid.hpp
-        * tools/Config_Handlers/cpd.hpp
-        * tools/Config_Handlers/iad.hpp
-        * tools/Config_Handlers/pcd.hpp
-        * tools/Config_Handlers/toplevel.hpp
-          Removed vc6 workarounds
-
-        * tools/Config_Handlers/vc6-4786.h
-          Removed
-
-Tue Apr 18 20:55:05 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * CIAO version 0.5.1 released.
-
-Local Variables:
-mode: change-log
-add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
-indent-tabs-mode: nil
-End:
diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
index 5f6e141f48f..7692884e278 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
@@ -1,11 +1,10 @@
 // $Id$
 
 #include "Deployment_Configuration.h"
-#include "ciao/CIAO_common.h"
 
 #include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/Read_Buffer.h"
+
+const int NAME_BUFSIZE = 1024;
 
 CIAO::Deployment_Configuration::Deployment_Configuration (CORBA::ORB_ptr o)
   : orb_ (CORBA::ORB::_duplicate (o))
@@ -20,6 +19,8 @@ CIAO::Deployment_Configuration::~Deployment_Configuration (void)
 int
 CIAO::Deployment_Configuration::init (const char *filename)
 {
+  // @@ We should change to use ACE_Configuration here.
+
   if (filename == 0)
     {
       ACE_ERROR ((LM_ERROR, "DANCE (%P|%t) Deployment_Configuration.cpp"
@@ -33,51 +34,33 @@ CIAO::Deployment_Configuration::init (const char *filename)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "DAnCE (%P|%t) Deployment_Configuration.cpp:"
-                         "Fail to open node manager map data file: <%s>\n",
+                         "Fail to open node manager map data file: %s : \n",
                          filename),
                          -1);
     }
 
-  // Get a read buffer, this will close the stream when we are ready
-  ACE_Read_Buffer reader (inf, true);
-
-  bool first = true;
-  char* string = 0;
+  char destination[NAME_BUFSIZE], ior[NAME_BUFSIZE];
+  int first = 1;
 
-  // Read from the file line by line
-  while ((string = reader.read ('\n', '\0')) != 0)
+  while (fscanf (inf, "%s %s", destination, ior ) != EOF)
     {
-      // Search from the right to the first space
-      const char* ior_start = ACE_OS::strrchr (string, ' ');
-      // Search from the left to the first space
-      const char* dest_end = ACE_OS::strchr (string, ' ');
-      // The destination is first followed by some spaces
-      ACE_CString destination (string, dest_end - string);
-      // And then the IOR
-      ACE_CString ior (ior_start + 1, ACE_OS::strlen (ior_start + 1) - 1);
-      if (this->deployment_info_.bind (destination.c_str (), ior.c_str ()) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "DAnCE (%P|%t) Deployment_Configuration, "
-                             "failed to bind destination <%s>\n",
-                             destination.c_str ()),
-                             -1);
-        }
-
-      if (CIAO::debug_level () > 5)
+      // This should not fail!!
+      //
+      if (this->deployment_info_.bind (destination, ior) != 0)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "DAnCE (%P|%t) Deployment_Configuration, "
-                      "read <%s> <%s>\n", destination.c_str (), ior.c_str ()));
+          ACE_ERROR ((LM_ERROR,
+                      "DAnCE (%P|%t) Deployment_Configuration.cpp:"
+                      "Reuse existing node in the cached map: [%s]\n",
+                      destination));
         }
 
       if (first)
         {
           this->default_node_manager_.IOR_ = ior;
-          first = false;
+          first = 0;
         }
     }
-
+  ACE_OS::fclose (inf);
   return 0;
 }
 
@@ -85,7 +68,7 @@ const char *
 CIAO::Deployment_Configuration::get_node_manager_ior (const char *name) const
 {
   if (name == 0)
-    return this->get_default_node_manager_ior ();
+    return get_default_node_manager_ior ();
 
   ACE_Hash_Map_Entry
     <ACE_CString,
@@ -95,8 +78,8 @@ CIAO::Deployment_Configuration::get_node_manager_ior (const char *name) const
                                    entry) != 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "DAnCE (%P|%t) Deployment_Configuration, "
-                  "get_node_manager_ior, failed to find IOR for destination <%s>\n",
+                  "DAnCE (%P|%t) Deployment_Configuration.cpp:"
+                  "Failed to find IOR for destination [%s] : \n",
                   name));
       return 0;
     }
@@ -126,17 +109,18 @@ CIAO::Deployment_Configuration::get_node_manager (const char *name
   if (this->deployment_info_.find (ACE_CString (name),
                                    entry) != 0)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                        "DAnCE (%P|%t) Deployment_Configuration.cpp:"
-                        "Failed to find IOR for destination <%s>\n",
-                        name),
-                        0);
+      ACE_ERROR ((LM_ERROR,
+                  "DAnCE (%P|%t) Deployment_Configuration.cpp:"
+                  "Failed to find IOR for destination [%s] : \n",
+                  name));
+      return 0;
     }
 
   if (CORBA::is_nil (entry->int_id_.node_manager_.in ()))
     {
       ACE_TRY
         {
+
           CORBA::Object_var temp = this->orb_->string_to_object
                                    (entry->int_id_.IOR_.c_str ()
                                     ACE_ENV_ARG_PARAMETER);
diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
index 16b2edc85f4..f4b828b3f20 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
+++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
@@ -23,13 +23,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_NodeManagerC.h"
+#include "ciao/NodeManagerC.h"
+#include "DomainApplicationManager/DomainApplicationManager_Export.h"
+#include "ace/SString.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "ace/SString.h"
 
-#include "DomainApplicationManager/DomainApplicationManager_Export.h"
-
 namespace CIAO
 {
   /**
@@ -64,7 +64,7 @@ namespace CIAO
     Deployment_Configuration (CORBA::ORB_ptr o);
 
     /// Destructor
-    ~Deployment_Configuration (void);
+    virtual ~Deployment_Configuration (void);
 
     /**
      * Init method takes the filename to a configuration file which
@@ -82,7 +82,7 @@ namespace CIAO
      * @retval 0 if no valid name were found.  When @c name = 0, then
      * this function behave exactly as get_default_activator_ior.
      */
-    const char *get_node_manager_ior (const char *name) const;
+    virtual const char *get_node_manager_ior (const char *name) const;
 
     /**
      * Return the default NodeManager the DomainApplicationManager
@@ -92,12 +92,12 @@ namespace CIAO
      *
      * @retval 0 if no valid daemon is configured.
      */
-    const char *get_default_node_manager_ior () const;
+    virtual const char *get_default_node_manager_ior () const;
 
     /**
      * @retval nil if no valid name were found.
      */
-    ::Deployment::NodeManager_ptr
+    virtual ::Deployment::NodeManager_ptr
     get_node_manager (const char *name
                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
@@ -108,7 +108,7 @@ namespace CIAO
      *
      * @retval nil if no valid daemon is configured.
      */
-    ::Deployment::NodeManager_ptr
+    virtual ::Deployment::NodeManager_ptr
     get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   protected:
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
index 0fa9d1eaafb..263fb68e16e 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (DomainApplicationManager): ciao_deployment_svnt, naming  {
+project (DomainApplicationManager): ciao_deployment_svnt  {
   sharedname = DomainApplicationManager
   after += ExecutionManager_stub
 
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 2ccae73ade2..a8b60e4c0f4 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -2,7 +2,7 @@
 
 #include "DomainApplicationManager_Impl.h"
 #include "ExecutionManager/Execution_Manager_Impl.h"
-#include "ciao/Deployment_NodeApplicationManagerC.h"
+#include "ciao/NodeApplicationManagerC.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
@@ -254,7 +254,7 @@ get_plan_info (void)
 
   // Error: If there are no nodes in the plan => No nodes to deploy the
   // components
-  CORBA::ULong const length = this->plan_.instance.length ();
+  const CORBA::ULong length = this->plan_.instance.length ();
 
   if (length == 0)
     {
@@ -1464,7 +1464,7 @@ start (ACE_ENV_SINGLE_ARG_DECL)
       for (i = 0; i < this->num_child_plans_; ++i)
         {
           // Get the NodeApplication object reference.
-          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry;
 
           if (this->artifact_map_.find (this->node_manager_names_[i],
                                         entry) != 0)
@@ -2040,7 +2040,7 @@ purge_connections (Deployment::Connections_var & connections,
     }
 }
 
-const Deployment::Properties *
+Deployment::Properties *
 CIAO::DomainApplicationManager_Impl::
 get_connection_QoS_configuration (const Deployment::Requirement & requirement)
 {
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index cf13d10250c..b628b699462 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -28,18 +28,16 @@
 #include "ace/Vector_T.h"
 #include "ace/Functor.h"
 #include "ace/OS_NS_string.h"
-
-#include "ciao/Deployment_DomainApplicationManagerS.h"
+#include "ciao/DomainApplicationManagerS.h"
 #include "ciao/Deployment_common.h"
 
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 
-#include "ciao/CIAO_common.h"
-#include "ciao/Deployment_EventsC.h"
-
 #include "Deployment_Configuration.h"
 #include "DomainApplicationManager_Export.h"
+#include "ciao/CIAO_common.h"
+#include "ciao/Deployment_EventsC.h"
 
 namespace CIAO
 {
@@ -61,9 +59,9 @@ namespace CIAO
   {
   public:
 
-    /// External_Connections means we search all the connections including
-    /// the connectiosn for external/shared components of this plan which hold
-    /// port objrefs of components within this plan
+    // External_Connections means we search all the connections including
+    // the connectiosn for external/shared components of this plan which hold
+    // port objrefs of components within this plan
     enum Connection_Search_Type
       {
         External_Connections,
@@ -199,6 +197,7 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                       Deployment::StartError));
 
+
     /**
      * Starts the application. Raises the StartError exception if
      * starting the application fails.
@@ -210,7 +209,7 @@ namespace CIAO
     /**
      * Terminates a running application. Raises the StopError
      * exception if an error occurs during termination. Raises the
-     * InvalidReference exception if the appliction reference is
+     * InvalidReference exception if the appliction referen is
      * unknown.
      */
     virtual void destroyApplication (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
@@ -273,8 +272,8 @@ namespace CIAO
     /**
      * Construct <Component_Binding_Info> struct for the component instance.
      *
-     * @param name component instance name
-     * @param child_uuid child plan uuid string
+     * @para name component instance name
+     * @para child_uuid child plan uuid string
      */
     CIAO::Component_Binding_Info *
       populate_binding_info (const ACE_CString& name,
@@ -285,7 +284,7 @@ namespace CIAO
      * Fetch the plan_uuid info from the internally cached shared component
      * list.
      *
-     * @param name component instance name
+     * @para name component instance name
      */
     CIAO::Component_Binding_Info *
       populate_binding_info (const ACE_CString& name);
@@ -300,7 +299,7 @@ namespace CIAO
      * A helper function to add a list of shared components into
      * the cached shared component list.
      *
-     * @param shared A list of shared components to be added.
+     * @para shared A list of shared components to be added.
      */
     void add_shared_components (const Deployment::ComponentPlans & shared);
 
@@ -308,7 +307,7 @@ namespace CIAO
      * A private function to check whether a component is in the shared
      * component list.
      *
-     * @param name The name of a component instance.
+     * @para name The name of a component instance.
      */
     bool is_shared_component (const char * name);
 
@@ -383,7 +382,7 @@ namespace CIAO
     void
     purge_connections (Deployment::Connections_var & connections,
                        const char * inst);
-
+                       
     /**
      * The first step in finish_launching an application in the
      * domain-level.  We install all the CIAO_Event_Service objects
@@ -409,7 +408,7 @@ namespace CIAO
      * deployment requirement. The deployment requirement only specifies
      * an identifier/reference to the EventServiceDeploymentDescriptions.
      */
-    virtual const Deployment::Properties *
+    virtual Deployment::Properties *
     get_connection_QoS_configuration (
       const Deployment::Requirement & requirement);
 
diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.h b/CIAO/DAnCE/ExecutionManager/DAM_Map.h
index 73a1d97bed4..1e6914db7f3 100644
--- a/CIAO/DAnCE/ExecutionManager/DAM_Map.h
+++ b/CIAO/DAnCE/ExecutionManager/DAM_Map.h
@@ -13,7 +13,7 @@
 #define CIAO_DAM_MAP_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/Deployment_DomainApplicationManagerC.h"
+#include "ciao/DomainApplicationManagerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index 736eaa5f885..7e5ffea6540 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,9 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc, ciao_executionmanager_stub {
+project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc {
   exename = Execution_Manager
 
+  after += ExecutionManager_stub
+  libs += ExecutionManager_stub
+
   IDL_Files {
   }
 
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 71d2280ef31..545da80c14b 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -168,7 +168,7 @@ namespace CIAO
           ACE_TRY_CHECK;
 
 
-          if (CORBA::is_nil (poa.in ()))
+          if (poa.in () == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "(%P|%t) CIAO_ExecutionManager: "
                                "Nil POA panic error, returning \n"),
@@ -189,6 +189,9 @@ namespace CIAO
             daemon_servant->_this ();
 
           TAO::Utils::Implicit_Deactivator de (daemon_servant);
+
+          ACE_TRY_CHECK;
+
           bool retval = false;
 
           if (register_with_ns_)
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
index 85f7ebd005d..cef9bce35b9 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
@@ -218,7 +218,7 @@ namespace CIAO
           Deployment::DeploymentPlan_var plan = dam->getPlan ();
 
           // If any component is still running, then we return.
-          CORBA::ULong const inst_lenth = plan->instance.length ();
+          CORBA::ULong inst_lenth = plan->instance.length ();
           for (CORBA::ULong i = 0; i < inst_lenth; ++i)
             {
               if (this->is_component_running (plan->instance[i].name.in (),
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
index cbbdd3094a1..174fc793c99 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
@@ -166,7 +166,7 @@ namespace CIAO
       PortableServer::POA_var poa_;
 
       /// Path to the initialization file
-      ACE_CString const init_file_;
+      const ACE_CString init_file_;
 
       /// A map which caches the DomainApplicationManager object ref.
       DAM_Map map_;
diff --git a/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl b/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl
index 01942fd3afa..121901c4b21 100644
--- a/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl
+++ b/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl
@@ -8,7 +8,7 @@
  * to terminate the process cleanly.
  */
 
-#include "ciao/Deployment_ExecutionManager.idl"
+#include "ciao/ExecutionManager.idl"
 
 module CIAO
 {
diff --git a/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl b/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
index 617df0f080f..034929e86bf 100644
--- a/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
+++ b/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
@@ -6,8 +6,7 @@
  * @brief Controling interface for managing and controling CIAO daemon.
  */
 
-#include "ciao/Deployment_NodeManager.idl"
-#include "ciao/Deployment_NodeApplicationManager.idl"
+#include "ciao/NodeManager.idl"
 
 module CIAO
 {
@@ -25,7 +24,7 @@ module CIAO
 
     // Shutdown the daemon process.
     oneway void shutdown ();
-
+    
     /// RACE specific extension.
     /// Modify the priority of a node application process.
     long set_priority (in string plan_id,
diff --git a/CIAO/DAnCE/NodeApplication/CIAO_NodeApplication_export.h b/CIAO/DAnCE/NodeApplication/CIAO_NodeApplication_export.h
deleted file mode 100644
index b9ebab3d7cb..00000000000
--- a/CIAO/DAnCE/NodeApplication/CIAO_NodeApplication_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl NODEAPPLICATION
-// ------------------------------
-#ifndef NODEAPPLICATION_EXPORT_H
-#define NODEAPPLICATION_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (NODEAPPLICATION_HAS_DLL)
-#  define NODEAPPLICATION_HAS_DLL 1
-#endif /* ! NODEAPPLICATION_HAS_DLL */
-
-#if defined (NODEAPPLICATION_HAS_DLL) && (NODEAPPLICATION_HAS_DLL == 1)
-#  if defined (NODEAPPLICATION_BUILD_DLL)
-#    define NODEAPPLICATION_Export ACE_Proper_Export_Flag
-#    define NODEAPPLICATION_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define NODEAPPLICATION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* NODEAPPLICATION_BUILD_DLL */
-#    define NODEAPPLICATION_Export ACE_Proper_Import_Flag
-#    define NODEAPPLICATION_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define NODEAPPLICATION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* NODEAPPLICATION_BUILD_DLL */
-#else /* NODEAPPLICATION_HAS_DLL == 1 */
-#  define NODEAPPLICATION_Export
-#  define NODEAPPLICATION_SINGLETON_DECLARATION(T)
-#  define NODEAPPLICATION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* NODEAPPLICATION_HAS_DLL == 1 */
-
-// Set NODEAPPLICATION_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (NODEAPPLICATION_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define NODEAPPLICATION_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define NODEAPPLICATION_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !NODEAPPLICATION_NTRACE */
-
-#if (NODEAPPLICATION_NTRACE == 1)
-#  define NODEAPPLICATION_TRACE(X)
-#else /* (NODEAPPLICATION_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define NODEAPPLICATION_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (NODEAPPLICATION_NTRACE == 1) */
-
-#endif /* NODEAPPLICATION_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/NodeApplication/Configurator_Factory.h b/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
index d80f12c3cee..0dfdf8bbcce 100644
--- a/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
+++ b/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
@@ -18,13 +18,12 @@
 #define CIAO_CONFIGURATOR_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "CIAO_NodeApplication_export.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "ace/Task.h"
 #include "ace/SString.h"
@@ -50,7 +49,7 @@ namespace CIAO
    * developers can plug in their own system configuration needs into
    * the whole system.
    */
-  class NODEAPPLICATION_Export NodeApplication_Options
+  class NodeApplication_Options
   {
   public:
     // default ctor.
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
index 7b57887f458..a0c46092990 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
@@ -1,8 +1,7 @@
 // $Id$
 
 #include "Container_Impl.h"
-#include "ciao/CCM_StandardConfiguratorC.h"
-#include "ciao/CCM_KeylessCCMHomeC.h"
+#include "ciao/CCM_ComponentC.h" // for calling StandardConfigurator interface
 
 #include "orbsvcs/CosNamingC.h"
 
@@ -45,7 +44,7 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies
     {
       ACE_NEW_THROW_EX (this->container_,
                         CIAO::Session_Container (this->orb_.in (), this),
-                        CORBA::NO_MEMORY ());
+                        CORBA::INTERNAL ());
       ACE_CHECK_RETURN (-1);
     }
   else
@@ -53,7 +52,7 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies
       ACE_NEW_THROW_EX (this->container_,
                         CIAO::Session_Container (this->orb_.in (), this, 1,
                                                  this->static_entrypts_maps_),
-                        CORBA::NO_MEMORY ());
+                        CORBA::INTERNAL ());
       ACE_CHECK_RETURN (-1);
     }
 
@@ -262,7 +261,7 @@ CIAO::Container_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_NEW_THROW_EX (retval,
                     ::Deployment::Properties,
-                    CORBA::NO_MEMORY ());
+                    CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
   *retval = this->properties_;
@@ -369,6 +368,35 @@ CIAO::Container_Impl::remove_home (const char * comp_ins_name
     ACE_THROW (::Components::RemoveFailure ());
 }
 
+::Components::CCMHomes *
+CIAO::Container_Impl::get_homes (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  CIAO_TRACE ("CIAO::Container_Impl::get_homes");
+  Components::CCMHomes * tmp = 0;
+  ACE_NEW_THROW_EX (tmp,
+                    Components::CCMHomes (),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  Components::CCMHomes_var retval (tmp);
+
+  CORBA::ULong const len = this->home_map_.current_size ();
+  retval->length (len);
+
+
+  CORBA::ULong i = 0;
+  const Home_Iterator end = this->home_map_.end ();
+  for (Home_Iterator iter (this->home_map_.begin ());
+       iter != end;
+       ++iter, ++i)
+  {
+    retval[i] = Components::CCMHome::_duplicate ( (*iter).int_id_);
+  }
+
+  return retval._retn ();
+}
+
 // Remove all homes and components
 void
 CIAO::Container_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
@@ -485,7 +513,7 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name
   if (this->naming_map_.find (str, naming_context) == 0)
     {
 
-      bool const result =
+      bool result =
         unregister_with_ns (
                             naming_context.c_str (),
                             this->orb_.in ()
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.h b/CIAO/DAnCE/NodeApplication/Container_Impl.h
index 3a6c91ae2b5..0549841ce53 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.h
@@ -19,15 +19,15 @@
 #define CIAO_CONTAINER_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "CIAO_NodeApplication_export.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_ContainerS.h"
-#include "ciao/Deployment_NodeApplicationC.h"
+#include "ciao/Deployment_CoreS.h"
 #include "ciao/Container_Base.h"
+//#include "ciao/Swapping_Container.h"
 #include "ace/SString.h"
 #include "ciao/Server_init.h"  // write_IOR function & NameUtility
 #include "ciao/CIAO_common.h" // CIAO::debug_level
@@ -45,7 +45,7 @@ namespace CIAO
    * interface and is used to manage the lifecycle of the installed
    * components and homes.
    */
-  class NODEAPPLICATION_Export Container_Impl
+  class Container_Impl
     : public virtual POA_Deployment::Container
   {
   public:
@@ -127,6 +127,11 @@ namespace CIAO
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Components::RemoveFailure));
 
+    // Get all homes
+    virtual ::Components::CCMHomes *
+      get_homes (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
     bool
     register_with_ns (const char * obj_name,
                       CORBA::ORB_ptr orb,
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index a801e308c5c..b87578e5a4e 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,32 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project(NoOp_Configurator): ciao_deployment_stub {
-  sharedname   = CIAO_NoOp_Configurator
-  dynamicflags = NOOP_CONFIGURATOR_BUILD_DLL
-
-  Source_Files {
-    NoOp_Configurator.cpp
-  }
-}
-
-project(NodeApplicationLib): ciao_server_dnc, ciao_events_dnc, ciao_noop_configurator {
-  sharedname   = CIAO_NodeApplication
-  dynamicflags = NODEAPPLICATION_BUILD_DLL
+project(NodeApplication): ciao_server_dnc, ciao_events_dnc {
+  after += NoOp_Configurator
+  libs  += CIAO_NoOp_Configurator
+  exename   = NodeApplication
 
   Source_Files {
     Configurator_Factory.cpp
     Container_Impl.cpp
     NodeApplication_Core.cpp
     NodeApplication_Impl.cpp
+    NodeApplication.cpp
   }
 }
 
-project(NodeApplication): ciao_server_dnc, ciao_events_dnc, ciao_nodeapplication, ciao_noop_configurator {
-  exename   = NodeApplication
+project(NoOp_Configurator): ciao_deployment_stub {
+  sharedname   = CIAO_NoOp_Configurator
+  dynamicflags = NOOP_CONFIGURATOR_BUILD_DLL
 
   Source_Files {
-    NodeApplication.cpp
+    NoOp_Configurator.cpp
   }
 }
 
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
index 1b8516dcce8..dedc2ab3e43 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ciao/CIAO_NodeApplication_CallBackC.h"
+#include "ciao/NodeApplication_CallBackC.h"
 #include "ace/Sched_Params.h"
 #include "NodeApplication_Impl.h"
 #include "NodeApplication_Core.h"
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
index aceef49209c..3a8795eccea 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
@@ -19,13 +19,12 @@
 #define CIAO_NODEAPPLICATION_CORE_H
 #include /**/ "ace/pre.h"
 
-#include "CIAO_NodeApplication_export.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "ace/Task.h"
 #include "ace/Auto_Ptr.h"
@@ -40,7 +39,7 @@ namespace CIAO
    * @brief An ACE_Task subclass that allow the ORB thread to be run
    * as separate thread when RT behaviors are needed.
    */
-  class NODEAPPLICATION_Export NodeApplication_Core
+  class NodeApplication_Core
     : public virtual ACE_Task_Base
   {
   public:
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 02cc88b3830..6cf9b2b9de7 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -31,7 +31,7 @@ CIAO::NodeApplication_Impl::create_all_containers (
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create all the containers here based on the input node_impl_info.
-  CORBA::ULong const len = container_infos.length ();
+  const CORBA::ULong len = container_infos.length ();
 
   for (CORBA::ULong i = 0; i < len; ++i)
     {
@@ -88,7 +88,7 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
 
   ACE_TRY
     {
-      CORBA::ULong const length = connections.length ();
+      const CORBA::ULong length = connections.length ();
 
       // For every connection struct we finish the connection.
       for (CORBA::ULong i = 0; i < length; ++i)
@@ -311,7 +311,7 @@ CIAO::NodeApplication_Impl::install (
       // the ComponentInfo for components installed in each container.
       // Merge all the returned ComponentInfo, which will be used
       // as the return value of this method.
-      CORBA::ULong const num_containers = container_infos.length ();
+      const CORBA::ULong num_containers = container_infos.length ();
       for (CORBA::ULong i = 0; i < num_containers; ++i)
         {
           Deployment::ComponentInfos_var comp_infos =
@@ -333,7 +333,7 @@ CIAO::NodeApplication_Impl::install (
       // installed on this NodeApplication. I know we can delegates these to the
       // undelying containers, but in that case, we should loop
       // all the containers to find the component object reference. - Gan
-      CORBA::ULong const comp_len = retv->length ();
+      const CORBA::ULong comp_len = retv->length ();
       for (CORBA::ULong len = 0;
           len < comp_len;
           ++len)
@@ -448,9 +448,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name
 
   if (CORBA::is_nil (comp_state.objref_.in ()))
     {
-      ACE_ERROR ((LM_ERROR,
-                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "comp is nil\n"));
+      ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
       throw Deployment::StartError ();
     }
 
@@ -475,33 +473,23 @@ CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
     return;
 
   // For each container, invoke <remove> operation to remove home and components.
-  CORBA::ULong const set_size = this->container_set_.size ();
+  const CORBA::ULong set_size = this->container_set_.size ();
   for (CORBA::ULong i = 0; i < set_size; ++i)
     {
-      if (CIAO::debug_level () > 5)
-        {
-          ACE_DEBUG ((LM_DEBUG, "NA: calling remove on container %i\n"));
-        }
-
+      ACE_DEBUG ((LM_DEBUG, "NA: calling remove on container %i\n"));
       this->container_set_.at(i)->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // Remove all containers
   // Maybe we should also deactivate container object reference.
-  if (CIAO::debug_level () > 5)
-    {
-      ACE_DEBUG ((LM_DEBUG, "NA: remove all\n"));
-    }
-
+  ACE_DEBUG ((LM_DEBUG, "NA: remove all\n"));
   this->container_set_.remove_all ();
 
   if (CIAO::debug_level () > 1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Removed all containers from this NodeApplication!\n"));
-    }
+    ACE_DEBUG ((LM_DEBUG, "Removed all containers from this NodeApplication!\n"));
 
-  // For static deployment, ORB will be shutdown in the Static_NodeManager
+  //For static deployment, ORB will be shutdown in the Static_NodeManager
   if (this->static_entrypts_maps_ == 0)
     {
       this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
@@ -606,6 +594,7 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref
   ACE_CHECK;
 
   // Should we remove the server still, even if the previous call failed.
+
   if (this->container_set_.remove (cref) == -1)
     {
       ACE_THROW (::Components::RemoveFailure ());
@@ -633,64 +622,64 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
     {
       ACE_DEBUG ((LM_DEBUG, "\nNodeApplication_Impl::install_es() called.\n\n"));
 
-      CIAO_Event_Service_var ciao_es =
-        es_factory_.create (es_info.type, es_info.name.in ());
+          CIAO_Event_Service_var ciao_es =
+            es_factory_.create (es_info.type, es_info.name.in ());
 
-		  // Set up the event channel federations
-      if (es_info.type == CIAO::RTEC)
-        {
-          // Narrow the event service to CIAO_RT_Event_Service
-          ::CIAO::CIAO_RT_Event_Service_var ciao_rtes =
-            ::CIAO::CIAO_RT_Event_Service::_narrow (ciao_es.in ());
-
-          if (CORBA::is_nil (ciao_rtes.in ()))
-            ACE_THROW (::Deployment::InstallationFailure ());
-
-          // Set up the event channel federations
-          for (CORBA::ULong j = 0; j < es_info.addr_servs.length (); ++j)
-		        {
-			        bool retv = 
-			        ciao_rtes->create_addr_serv (
-				        es_info.addr_servs[j].name.in (),
-				        es_info.addr_servs[j].port,
-				        es_info.addr_servs[j].address);
-
-			        if (retv == false)
-			        {
-				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n"));
-				        ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
-			        }
-		        }
-
-		      for (CORBA::ULong j = 0; j < es_info.senders.length (); ++j)
-		        {
-			        bool retv = 
-			        ciao_rtes->create_sender (
-				        es_info.senders[j].addr_serv_id.in ());
-
-			        if (retv == false)
-			        {
-				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n"));
-				        ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
-			        }
-		        }
-
-		      for (CORBA::ULong j = 0; j < es_info.receivers.length (); ++j)
-		        {
-			        bool retv = 
-			        ciao_rtes->create_receiver (
-				        es_info.receivers[j].addr_serv_id.in (),
-				        es_info.receivers[j].is_multicast,
-				        es_info.receivers[j].listen_port);
-
-			        if (retv == false)
-			        {
-				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n"));
-				        ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
-			        }
-		        }
-        }
-      return ciao_es._retn ();
+          // Set up the event channel federation configurations
+          if (es_info.type == CIAO::RTEC)
+            {
+              // Narrow the event service to CIAO_RT_Event_Service
+              ::CIAO::CIAO_RT_Event_Service_var ciao_rtes =
+                ::CIAO::CIAO_RT_Event_Service::_narrow (ciao_es);
+
+              if (CORBA::is_nil (ciao_rtes.in ()))
+                ACE_THROW (::Deployment::InstallationFailure ());
+
+              // Set up the event channel federations
+              for (CORBA::ULong j = 0; j < es_info.addr_servs.length (); ++j)
+                {
+                  bool retv = 
+                    ciao_rtes->create_addr_serv (
+                      es_info.addr_servs[j].name.in (),
+                      es_info.addr_servs[j].port,
+                      es_info.addr_servs[j].address);
+
+                  if (retv == false)
+                    {
+                      ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n"));
+                      ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+                    }
+                }
+              for (CORBA::ULong j = 0; j < es_info.senders.length (); ++j)
+                {
+                  bool retv = 
+                    ciao_rtes->create_sender (
+                      es_info.senders[j].addr_serv_id.in ());
+
+                  if (retv == false)
+                    {
+                      ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n"));
+                      ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+                    }
+                }
+
+              for (CORBA::ULong j = 0; j < es_info.receivers.length (); ++j)
+                {
+                  bool retv = 
+                    ciao_rtes->create_receiver (
+                      es_info.receivers[j].addr_serv_id.in (),
+                      es_info.receivers[j].is_multicast,
+                      es_info.receivers[j].listen_port);
+
+                  if (retv == false)
+                    {
+                      ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n"));
+                      ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+                    }
+                }
+            }
+
+          return ciao_es._retn ();
     }
   ACE_CATCHANY
     {
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index d682b0a58c6..a5e7e256974 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -15,7 +15,7 @@
 #define NODEAPPLICATION_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "CIAO_NodeApplication_export.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,7 +26,7 @@
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "tao/ORB.h"
-#include "ciao/Deployment_NodeApplicationS.h"
+#include "ciao/Deployment_CoreS.h"
 #include "ciao/Server_init.h"
 #include "ciao/CIAO_common.h"
 #include "ciao/Object_Set_T.h"
@@ -62,7 +62,7 @@ namespace CIAO
   // @@ Gan, as we discussed before can you please wrap this
   // implementation in a namespace Node_Application or whatever to
   // signify that it belongs to another software piece of CIAO?
-  class NODEAPPLICATION_Export NodeApplication_Impl
+  class NodeApplication_Impl
     : public virtual POA_Deployment::NodeApplication
   {
   public:
@@ -86,6 +86,8 @@ namespace CIAO
     virtual ~NodeApplication_Impl (void);
 
     /**
+     * @method finishLaunch
+     *
      * @brief This operation dose 2 things.
      *        1. Get the external connction (facet and Event source)
      *           and connect them to the local receptacle/event sink.
@@ -104,6 +106,9 @@ namespace CIAO
                        Deployment::StartError,
                        Deployment::InvalidConnection));
 
+    /**
+     * @method start
+     */
     virtual void
     start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
@@ -113,16 +118,25 @@ namespace CIAO
      *
      *-----------------------------------------------------------*/
 
+    /**
+     * @method ciao_preactivate
+     */
     virtual void
     ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StartError));
 
+    /**
+     * @method ciao_postactivate
+     */
     virtual void
     ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StartError));
 
+    /**
+     * @method ciao_passivate
+     */
     virtual void
     ciao_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
index 6b899bd345d..40d58ad24ab 100644
--- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
+++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
@@ -249,7 +249,7 @@ CIAO::RTResource_Config_Manager::init_resources
   const CIAO::DAnCE::PolicySets &sets = server_resource.orb_config.policy_set;
   for (CORBA::ULong i = 0; i < sets.length (); ++i)
     {
-      CORBA::ULong const np = sets[i].policies.length ();
+      CORBA::ULong np = sets[i].policies.length ();
       if (np == 0)
         continue;
 
@@ -309,7 +309,7 @@ CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name
     {
       ACE_ERROR ((LM_ERROR,
                   "Invalid name string found in \"find_threadpool_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
     }
 
 
@@ -335,7 +335,7 @@ CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name
     {
       ACE_ERROR ((LM_ERROR,
                   "Invalid name string found in \"find_priority_bands_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
     }
 
   PB_MAP::ENTRY *entry = 0;
@@ -362,7 +362,7 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name
     {
       ACE_ERROR ((LM_ERROR,
                   "Invalid name string found in \"find_policies_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
     }
 
 
diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
index 6527b7f607d..a487ea72d98 100644
--- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
+++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
@@ -25,7 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/RTCORBA/RTCORBA.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 #include "ace/Null_Mutex.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
diff --git a/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp b/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
index 741d4263188..1fbf001845d 100644
--- a/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
+++ b/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "RTNodeApp_Configurator.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 
 CIAO::RTNodeApp_Configurator::~RTNodeApp_Configurator ()
diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
index e31a2e6bc91..01808650980 100644
--- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -3,17 +3,16 @@
 #include "Containers_Info_Map.h"
 #include "ciao/CIAO_Config.h"
 #include "ciao/CIAO_common.h"
-#include "ciao/CIAO_ServerResourcesC.h"
 
 //Added for HTTP
 #include "URL_Parser.h"              //for parsing the URL
-#include "tao/HTTP_Client.h"         //the HTTP client class to downloading packages
+#include "HTTP_Client.h"             //the HTTP client class to downloading packages
 #include "ace/Message_Block.h"       //for ACE_Message_Block
 #include "ace/OS_NS_fcntl.h"         //for open
 #include "ace/OS_NS_unistd.h"        //for close
 #include "ace/OS_NS_sys_stat.h"      //for filesize and mkdir
 #include "ace/OS_NS_string.h"        //for string functions
-#include "ace/streams.h"
+
 
 namespace CIAO
 {
@@ -466,6 +465,11 @@ is_shared_component (ACE_CString & name)
                                                      ACE_CString &arti_name,
                                                      ACE_CString &path)
   {
+
+    ACE_DEBUG ((LM_INFO,
+                "Attempting to download %s\n",
+                location));
+
     // Figure out the file name.
     char* name = const_cast<char*> (location);
     char* p = 0;
@@ -502,22 +506,9 @@ is_shared_component (ACE_CString & name)
       return false;
     }
 
-#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 prefix (ACE_DLL_PREFIX);
-    ACE_TString suffix (ACE_DLL_SUFFIX);
-
-    ACE_CString new_name (name);
-    new_name = prefix + new_name;
-#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-    new_name += decorator;
-#endif
-    new_name += suffix;
-
     path = HTTP_DOWNLOAD_PATH;
     path += "/";
-    path += new_name;
+    path += name;
 
     if (!this->write_to_disk (path.c_str (), *mb))
     {
@@ -525,7 +516,7 @@ is_shared_component (ACE_CString & name)
       return false;
     }
 
-    mb->release ();
+    mb->release ();    
     return true;
   }
 
@@ -538,60 +529,12 @@ is_shared_component (ACE_CString & name)
   CIAO::Containers_Info_Map::retrieve_via_HTTP (const char* URL,
                                                 ACE_Message_Block &mb)
   {
-    ACE_CString loc (URL);
-
-    // Figure out the file name.
-    char* name_ = const_cast<char*> (URL);
-    char* p = 0;
-
-    while (true)
-      {
-        p = ACE_OS::strstr (name_, "/");
-
-        if (0 == p)
-          {
-            p = ACE_OS::strstr (name_, "\\");
-          }
-
-        if (0 == p)
-          {
-            break;
-          }
-        else
-          {
-            name_ = ++p;
-            continue;
-          }
-      }
-
-    ACE_CString name (name_);
-    loc = loc.substr (0, loc.length() - name.length ());
-
-#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 prefix (ACE_DLL_PREFIX);
-    ACE_TString suffix (ACE_DLL_SUFFIX);
-
-    ACE_CString new_name (name);
-    new_name = prefix + new_name;
-#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-    new_name += decorator;
-#endif
-    new_name += suffix;
-
-    loc = loc + new_name;
-
-    ACE_DEBUG ((LM_INFO,
-                "Attempting to download %s\n",
-                loc.c_str ()));
-
     URL_Parser *parser = TheURL_Parser::instance ();
-    if (!parser->parseURL (const_cast<char*> (loc.c_str ())))
-      return false;
+    if (!parser->parseURL (const_cast<char*> (URL)))
+    return false;
 
     // Create a client
-    TAO_HTTP_Client client;
+    HTTP_Client client;
 
     // Open the client
     if (client.open (parser->filename_,
diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
index 93f6b70c5cc..4ef8ef289bc 100644
--- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
+++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
@@ -19,7 +19,6 @@
 //added for the HTTP support
 #include "ace/Message_Block.h"      //for ACE_Message_Block
 
-#include "ciao/Deployment_ContainerC.h"
 #include "ciao/DeploymentC.h"
 #include "ace/SString.h"
 #include "CIAO_NAM_Export.h"
diff --git a/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.cpp b/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.cpp
new file mode 100644
index 00000000000..1b2d6afc519
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.cpp
@@ -0,0 +1,55 @@
+// $Id$
+
+// HTTP_Client.cpp, Stoyan
+
+#include "HTTP_Client.h"
+#include "HTTP_Handler.h"
+#include "ace/OS_NS_string.h"
+
+HTTP_Client::HTTP_Client (void)
+{
+}
+
+HTTP_Client::~HTTP_Client (void)
+{
+  this->close ();
+}
+
+// initialize address and filename. No network i/o in open
+int
+HTTP_Client::open (const ACE_TCHAR *filename,
+                   const ACE_TCHAR *hostname,
+                   u_short port)
+{
+  filename_ = ACE_OS::strdup (filename);
+  inet_addr_.set (port, hostname);
+  return 0;
+}
+
+// read from connection length bytes from offset, into Message block
+int
+HTTP_Client::read (ACE_Message_Block *mb)
+{
+  // Create a HTTP_Client Reader
+  HTTP_Reader HTTP_reader (mb, filename_);
+  HTTP_Handler *brp = &HTTP_reader;
+
+  // Connect to the server
+  if (connector_.connect (brp, inet_addr_) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Client::read():Connector error"), -1);
+
+  return HTTP_reader.byte_count ();
+}
+
+// close down the HTTP_Client
+int
+HTTP_Client::close (void)
+{
+  if (filename_)
+    {
+      ACE_OS::free ((void *) filename_);
+      filename_ = 0;
+    }
+  return 0;
+}
+
diff --git a/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.h b/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.h
new file mode 100644
index 00000000000..1a62fb10bcc
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.h
@@ -0,0 +1,71 @@
+
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    HTTP_Client.h
+ *
+ *  $Id$
+ *
+ *   This is the HTTP_Client class, which is the API for doing file
+ *   uploads/downloads.
+ *
+ *  @author Stoyan Paunov
+ */
+//=============================================================================
+
+
+#ifndef HTTP_Client_H
+#define HTTP_Client_H
+
+
+#include "ace/INET_Addr.h"
+#include "ace/Svc_Handler.h"
+#include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
+#include "ace/Message_Block.h"
+#include "HTTP_Handler.h"
+
+/**
+ * @class HTTP_Client
+ *
+ * @brief HTTP_Client is intended to provide application API to
+ * classes that wish to do network i/o at a very
+ * high level of abstraction.
+ *
+ * This class provides the ability to retrieve data from
+ * the network, of specified length and offset, and potentially
+ * use any protocol "under the hood" to do so. It currently
+ * uses HTTP. See HTTP_Handler also.
+ */
+class HTTP_Client
+{
+public:
+  HTTP_Client (void);
+  ~HTTP_Client (void);
+
+  /// Initializes the class with the given filename, hostname and port.
+  /// it should be called with the filename, before any read/write calls
+  int open (const ACE_TCHAR *filename,
+            const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST,
+            u_short port = 80);
+
+  /// Starts a connection, and reads a file from the server into
+  /// Message_Block mb
+  int read (ACE_Message_Block *mb);
+
+  /// Frees memory allocated for filename.
+  int close ();
+
+private:
+  /// Store the internet address of the server
+  ACE_INET_Addr inet_addr_;
+
+  /// The filename
+  ACE_TCHAR *filename_;
+
+  /// The connector endpoint to initiate the client connection
+  ACE_Connector<HTTP_Handler, ACE_SOCK_CONNECTOR> connector_;
+};
+
+#endif /* HTTP_Client_H */
diff --git a/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.cpp b/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.cpp
new file mode 100644
index 00000000000..de9a339d29d
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.cpp
@@ -0,0 +1,204 @@
+// $Id$
+
+// HTTP_Handler.cpp, Stoyan
+
+#include "HTTP_Handler.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_strings.h"
+
+// Empty constructor for compliance with new Connector behavior.
+HTTP_Handler::HTTP_Handler (void)
+{
+}
+
+// Always use this constructor
+HTTP_Handler::HTTP_Handler (ACE_Message_Block * mb,
+                            ACE_TCHAR *filename) :
+  mb_ (mb),
+  filename_ (ACE_OS::strdup (filename)),
+  bytecount_ (0)
+{
+}
+
+HTTP_Handler::~HTTP_Handler (void)
+{
+  if (filename_)
+    {
+      ACE_OS::free (filename_);
+      filename_ = 0;
+    }
+}
+
+// Called by Connector after connection is established
+int
+HTTP_Handler::open (void *)
+{
+  if (this->send_request () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():send_request failed\n"), -1);
+
+  if (this->receive_reply () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():receive_reply failed\n"), -1);
+  return 0;
+
+}
+
+// No-op
+int
+HTTP_Handler::close (u_long)
+{
+  return 0;
+}
+
+// Always overridden by the derived classes
+int
+HTTP_Handler::send_request (void)
+{
+  return -1;
+}
+
+// Always overridden by the derived classes
+int
+HTTP_Handler::receive_reply (void)
+{
+  return -1;
+}
+
+// used to retrieve the number of bytes read/written by the
+// last operation on the Blob
+size_t
+HTTP_Handler::byte_count (void)
+{
+  return bytecount_;
+}
+
+// Reader **************************************************
+
+HTTP_Reader::HTTP_Reader (ACE_Message_Block * mb,
+                          ACE_TCHAR *filename,
+                          const char *request_prefix,
+                          const char *request_suffix) :
+  HTTP_Handler (mb, filename),
+  request_prefix_ (request_prefix),
+  request_suffix_ (request_suffix)
+{
+}
+
+// Send the HTTP request
+int
+HTTP_Reader::send_request (void)
+{
+  char mesg [MAX_HEADER_SIZE];
+
+  // Check to see if the request is too big
+  if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_)
+                         + ACE_OS::strlen (filename_)
+                         + ACE_OS::strlen (request_suffix_) + 4))
+    ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1);
+
+  // Create a message to send to the server requesting retrieval of the file
+  int const len =
+    ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_);
+
+  // Send the message to server
+  if (peer ().send_n (mesg, len) != len)
+    ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1);
+
+
+  return 0;
+}
+
+// Recieve the HTTP Reply
+int
+HTTP_Reader::receive_reply (void)
+{
+  size_t num_recvd = 0;
+  char buf [MTU+1];
+  char *buf_ptr = 0;
+  size_t bytes_read = 0;
+
+  // Receive the first MTU bytes and strip the header off.
+  // Note that we assume that the header will fit into MTU bytes.
+
+  if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0)
+    {
+      //Make sure that response type is 200 OK
+      if (ACE_OS::strstr (buf,"200 OK") == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                            "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1);
+
+      // Search for the header termination string "\r\n\r\n", or "\n\n". If
+      // found, move past it to get to the data portion.
+      if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0)
+        buf_ptr += 4;
+      else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0)     //for compatibility with JAWS
+        buf_ptr += 2;
+      else
+        buf_ptr = buf;
+
+      // Determine number of data bytes read. This is equal to the
+      // total bytes read minus number of header bytes.
+      bytes_read = num_recvd - (buf_ptr - buf);
+
+    }
+  else
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
+
+  // ***************************************************************
+  // At this point, we have stripped off the header and are ready to
+  // process data. buf_ptr points to the data
+
+  //set the size of the ACE_Message_Block to the current bytes read
+  //NOTE: this function reallocates if necessary
+  //this->mb_->size (bytes_read);
+
+  ACE_Message_Block* temp  = 0;   //pointer used temporarily
+                             //for memory allocations before
+                             //chaining to Message_Block
+
+  ACE_Message_Block* curr = this->mb_;
+
+  ACE_NEW_RETURN (temp, ACE_Message_Block (bytes_read), -1);
+  curr->cont (temp);
+
+  curr = curr->cont ();
+
+  // Copy over all the data bytes into our message buffer.
+  if (curr->copy (buf_ptr, bytes_read) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
+                          "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1);
+
+  //read the rest of the data into a number of ACE_Message_Blocks and
+  //chain them together in a link list fashion
+
+  num_recvd = 0;
+
+  do
+  {
+    if (curr->space () == 0)
+    {
+      ACE_NEW_RETURN (temp, ACE_Message_Block (MTU), -1);
+      curr->cont (temp);
+      curr = curr->cont ();
+    }
+
+  if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0)
+    {
+      //move the write pointer
+      curr->wr_ptr (num_recvd);
+
+      //increment bytes_read
+      bytes_read += num_recvd;
+
+    }
+  else
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
+
+  }while (num_recvd != 0);
+
+  // Set the byte count to number of bytes received
+  this->bytecount_ = bytes_read;
+
+  return 0;
+}
+
diff --git a/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.h b/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.h
new file mode 100644
index 00000000000..d1e9aae2894
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.h
@@ -0,0 +1,86 @@
+
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    HTTP_Handler.h
+ *
+ *  $Id$
+ *
+ *   HTTP_Handler is a base class for HTTP_Reader and
+ *   HTTP_Writer which are created in response to calls to
+ *   read/write, as appropriate
+ *
+ *
+ *  @author Stoyan Paunov
+ */
+//=============================================================================
+
+
+#ifndef HTTP_HANDLER_H
+#define HTTP_HANDLER_H
+
+#include "ace/SOCK_Stream.h"
+#include "ace/Svc_Handler.h"
+#include "ace/Message_Block.h"
+
+/**
+ * @class HTTP_Handler
+ * class to retrieve data via HTTP
+ */
+class HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+{
+public:
+  /// Null constructor, insures that it works properly with Connector
+  HTTP_Handler (void);
+
+  /// Always use this constructor to make HTTP_Handlers
+  HTTP_Handler (ACE_Message_Block *mb,
+                ACE_TCHAR *filename);
+
+  /// returns the number of bytes read/written in the last operation.
+  size_t byte_count (void);
+
+  /// Activate this instance of the <HTTP_Handler>
+  virtual int open (void * = 0);
+
+  /// Close down the Blob
+  virtual int close (u_long flags = 0);
+
+  ~HTTP_Handler (void);
+
+protected:
+  virtual int send_request (void);
+  virtual int receive_reply (void);
+
+  ACE_Message_Block *mb_;
+  ACE_TCHAR *filename_;
+  size_t bytecount_;
+  enum
+  {
+    /// The handler assumes that the first 2048 bytes of a server response
+    /// contains the header
+    MAX_HEADER_SIZE = 2048,
+
+    /// set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS
+    MTU = BUFSIZ
+  };
+};
+
+class HTTP_Reader : public HTTP_Handler
+{
+public:
+  HTTP_Reader (ACE_Message_Block *mb,
+                   ACE_TCHAR *filename,
+                   const char *request_prefix = "GET",
+                   const char *request_suffix = "HTTP/1.0\r\n\r\n");
+
+private:
+  //NOTE: these functions return -1 on error
+  int send_request (void);
+  int receive_reply (void);
+  const char *request_prefix_;
+  const char *request_suffix_;
+};
+
+#endif /* HTTP_HANDLER_H */
diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index af905369dcf..436715588c4 100644
--- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -3,7 +3,6 @@
 #define CIAO_IMPLEMENTATION_INFO_CPP
 
 #include "ImplementationInfo.h"
-#include "ciao/CIAO_ServerResourcesC.h"
 #include "ace/SString.h"
 
 CIAO::NodeImplementationInfoHandler::
@@ -31,9 +30,11 @@ CIAO::NodeImplementationInfoHandler::node_impl_info (void) const
 void
 CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
 {
-  CORBA::ULong const instance_len = plan_.instance.length ();
+  const CORBA::ULong instance_len = plan_.instance.length ();
   const char * target_resource_id = 0;
 
+  CORBA::ULong i;
+
   // Iterate over the instance list to find whether any server resource
   // has been specified
   // TODO: We shoud do some sanity check here, since all the component
@@ -47,7 +48,7 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
   // ServerResource file will be deployed in the same NA.  However,
   // those using different ServerResource files should be deployed to
   // different NAs.  Something to be fixed later.
-  for (CORBA::ULong i = 0; i < instance_len; ++i)
+  for (i = 0; i < instance_len; ++i)
     {
       if (this->plan_.instance[i].deployedResource.length () != 0)
         {
diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
index 2b935d9d637..de6fc2d8cab 100644
--- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
+++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_NodeApplicationC.h"
+#include "ciao/DeploymentC.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 #include "Containers_Info_Map.h"
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index a145a6f09f2..0d06d8c4154 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -1,17 +1,30 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_extension_stub, ciao_nodeapplication {
+project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_extension_stub {
 
   sharedname   = NodeApplicationManager
   after       += NodeManager_stub CIAO_TargetManager_stub
+  idlflags    += -Wb,export_include=CIAO_NAM_Export.h -Wb,export_macro=CIAO_NAM_Export
   dynamicflags = CIAO_NAM_BUILD_DLL
+  dynamicflags += NOOP_CONFIGURATOR_BUILD_DLL
 
+// @@TODO: This ../NodeApplication business need to go.  It would be better
+// to factor that stuff into a separate lib, ie. NodeApplication_Impl
+// and link it in.  For the time being, since the release is so close,
+// i will leave it the way it is.
   Source_Files {
     NodeApplicationManager_Impl.cpp
     ImplementationInfo.cpp
     Containers_Info_Map.cpp
     URL_Parser.cpp
+    HTTP_Handler.cpp
+    HTTP_Client.cpp
+    ../NodeApplication/NodeApplication_Core.cpp
+    ../NodeApplication/NodeApplication_Impl.cpp
+    ../NodeApplication/Container_Impl.cpp
+    ../NodeApplication/Configurator_Factory.cpp
+    ../NodeApplication/NoOp_Configurator.cpp
   }
 
   Header_Files {
@@ -19,6 +32,8 @@ project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_ex
     ImplementationInfo.h
     Containers_Info_Map.h
     URL_Parser.h
-    CIAO_NAM_Export.h
+    HTTP_Handler.h
+    HTTP_Client.h
+    NodeApplicationManager_Export.h
   }
 }
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 82398062b5f..203d3db3a71 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -8,7 +8,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/Vector_T.h"
 #include "ciao/Container_Base.h"
-#include "ciao/CIAO_ServerResourcesC.h"
 #include "NodeApplication/NodeApplication_Impl.h"
 #include "ace/Reactor.h"
 
@@ -60,7 +59,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_NEW_THROW_EX (retv,
                     Deployment::Connections (),
-                    CORBA::NO_MEMORY ());
+                    CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong len = retv->length ();
@@ -78,15 +77,15 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
       // Get all the facets first
       Components::FacetDescriptions_var facets;
 
-      if (this->is_shared_component (comp_name))
+      if (is_shared_component (comp_name))
         {
-          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is shared\n",
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n",
                       comp_name.c_str ()));
           facets = this->node_manager_->get_all_facets (comp_name);
         }
       else
         {
-          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting "
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting"
                       "all facets\n",
                       comp_name.c_str ()));
           facets = ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -106,15 +105,15 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
       // Get all the event consumers
       Components::ConsumerDescriptions_var consumers;
 
-      if (this->is_shared_component (comp_name))
+      if (is_shared_component (comp_name))
         {
-          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is shared\n",
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n",
                       comp_name.c_str ()));
           consumers = this->node_manager_->get_all_consumers (comp_name);
         }
       else
         {
-          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting "
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting"
                       "all facets\n",
                       comp_name.c_str ()));
           consumers =
@@ -132,10 +131,10 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
                       comp_name.c_str ()));
         }
 
-      CORBA::ULong const facet_len = facets->length ();
-      CORBA::ULong const consumer_len = consumers->length ();
+      CORBA::ULong facet_len = facets->length ();
+      CORBA::ULong consumer_len = consumers->length ();
 
-      CORBA::ULong const curr_len = retv->length ();
+      CORBA::ULong curr_len = retv->length ();
       retv->length (curr_len + facet_len + consumer_len);
 
       CORBA::ULong i = 0;
@@ -941,7 +940,7 @@ create_node_application (const ACE_CString & options
 
   ACE_NEW_THROW_EX (prop,
                     Deployment::Properties,
-                    CORBA::NO_MEMORY ());
+                    CORBA::INTERNAL ());
   ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
 
   // @@ Create a new callback servant.
@@ -1220,8 +1219,3 @@ create_node_application (const ACE_CString & options
 
   return nodeapp_obj._retn ();
 }
-
-CIAO::NodeApplicationManager_Impl_Base::~NodeApplicationManager_Impl_Base (void)
-{
-}
-
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index fdaa59ba216..c0312cd6384 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -30,7 +30,7 @@
 #include "ace/OS_NS_sys_wait.h"
 #include "ace/Process_Manager.h"
 #include "ciao/NodeApp_CB_Impl.h"
-#include "ciao/Deployment_NodeApplicationManagerS.h"
+#include "ciao/NodeApplicationManagerS.h"
 #include "ciao/CIAO_common.h"
 #include "CIAO_NAM_Export.h"
 #include "ImplementationInfo.h"
@@ -364,6 +364,7 @@ namespace CIAO
   };
 
 
+
   struct Static_Config_EntryPoints_Maps;
 
   /**
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
index e744e953876..5bf4e642a0e 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
@@ -20,6 +20,11 @@ NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
 }
 
 ACE_INLINE
+CIAO::NodeApplicationManager_Impl_Base::~NodeApplicationManager_Impl_Base (void)
+{
+}
+
+ACE_INLINE
 void
 CIAO::NodeApplicationManager_Impl_Base::
 parse_config_value (ACE_CString & str
diff --git a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp
index 5d211603614..f79e086dd89 100644
--- a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp
@@ -111,5 +111,8 @@ void URL_Parser::Error (void)
 URL_Parser::~URL_Parser (void)
 {
   delete [] this->hostname_;
+  this->hostname_ = 0;
+
   ACE_OS::free (this->filename_);
+  this->filename_ = 0;
 }
diff --git a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h
index 0aec98cec65..aaaeab4960c 100644
--- a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h
+++ b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h
@@ -9,6 +9,7 @@
  *
  *  Parses a URL into its logical chunks
  *
+ *
  *  @author Stoyan Paunov
  */
 //=============================================================================
@@ -34,10 +35,10 @@ public:
 
   friend class ACE_Singleton <URL_Parser, ACE_Null_Mutex>;
 
-  /// Parses commandline arguments
+  /// parses commandline arguments
   bool parse_args (int argc, ACE_TCHAR *argv[]);
 
-  // Return false on failure
+  //return false on failure
   bool parseURL (char* url);
 
   void Error (void);
@@ -54,12 +55,12 @@ public:
   /// turns on verbosity
   int debug_;
 
-  /// Destructor
+  //destructor
   ~URL_Parser (void);
 
 protected:
-  /// protected constructor, singleton
   URL_Parser (void);
+  // protected constructor, singleton
 };
 
 
diff --git a/CIAO/DAnCE/NodeManager/BaseMonitor.h b/CIAO/DAnCE/NodeManager/BaseMonitor.h
index d05e798b523..fc34383aa06 100644
--- a/CIAO/DAnCE/NodeManager/BaseMonitor.h
+++ b/CIAO/DAnCE/NodeManager/BaseMonitor.h
@@ -13,7 +13,7 @@
 #ifndef MONITOR_BASEH
 #define MONITOR_BASEH
 #include "tao/ORB.h"
-#include "ciao/Deployment_TargetManagerC.h"
+#include "TargetManagerC.h"
 
 namespace CIAO
 {
@@ -23,33 +23,33 @@ namespace CIAO
     public:
       virtual ~MonitorBase () {};
 
-      /**
-       * This function is called by the controller to initialize
-       * parameters.
-       * @param  domain The Initital domain for this host
-       * @param  target_manager  TargetManager_ptr
-       * @param  interval The time interval after which updates need to be send.
+      /** @function initialize_params
+       *  @param  domain The Initital domain for this host
+       *  @param  target_manager  TargetManager_ptr
+       *  @param  interval The time interval after whic updates need to be send.
+       *  @description  This function is called by the controller to initialize
+       *                parameters.
        */
       virtual int initialize_params (
                                      ::Deployment::Domain& domain,
                                      ::Deployment::TargetManager_ptr target_manager,
                                      int interval
                                      )=0;
-      /**
-       * This function is called by the controller
-       *  to start up the monitor.
-       * @param orb The ORB pointer
+      /** @function start
+       *  @param  ORB_ptr The ORB pointer
+       *  @description  This function is called by the controller
+       *                to start up the monitor.
        */
-      virtual int start (CORBA::ORB_ptr orb) = 0;
-      /**
-       * This function is called by the controller
-       * to stop the monitor.
+      virtual int start (CORBA::ORB_ptr)=0;
+      /** @function stop
+       *  @description  This function is called by the controller
+       *                to stop the monitor.
        */
       virtual int stop ()=0;
-      /**
-       * This function is called by the controller
-       * to get the current data.
-       * @return The current Domain data
+      /** @function get_current_data
+       *  @return ::Deployment::Domain* The current Domain data
+       *  @description  This function is called by the controller
+       *                to get the current data.
        */
       virtual ::Deployment::Domain* get_current_data ()=0;
     };
diff --git a/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp b/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
index 9d9417da520..cbd494ac776 100644
--- a/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
+++ b/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
@@ -14,11 +14,10 @@
 #include "CIAO_common.h"
 #include "ace/OS_NS_stdio.h"
 
+
 extern "C" ACE_Proper_Export_Flag CIAO::MonitorBase * CIAO::createMonitor ()
 {
-  CIAO::CIAO_Monitor* monitor = 0;
-  ACE_NEW_RETURN (monitor, CIAO::CIAO_Monitor, 0);
-  return monitor;
+  return new CIAO::CIAO_Monitor ();
 }
 
 CIAO::CIAO_Monitor::CIAO_Monitor ()
@@ -99,11 +98,19 @@ int CIAO::CIAO_Monitor::stop ()
       //read the cpu in idle time ..
       fscanf (load_file, "%ld", &idle_time);
 
+
+      if (CIAO::debug_level () > 9)
+      {
+        //  ACE_DEBUG ((LM_DEBUG , "Current load is %d\n",current_load));
+      }
+
       ACE_OS::fclose (load_file);
 
-      // Calculate the percent CPU
-      long const current_user_cpu = user_cpu - prev_user_cpu_;
-      long const total_cpu_usage = user_cpu + user_cpu_low + sys_cpu +
+
+   // Calculate the percent CPU
+
+      long current_user_cpu = user_cpu - prev_user_cpu_;
+      long total_cpu_usage = user_cpu + user_cpu_low + sys_cpu +
         idle_time - prev_user_cpu_ - prev_idle_time_ - prev_sys_cpu_
         - prev_user_cpu_low_;
 
@@ -131,17 +138,19 @@ int CIAO::CIAO_Monitor::stop ()
        i < current_domain_->node[0].resource.length ();
        i++)
     {
-      if (!ACE_OS::strcmp (current_domain_->node[0].resource[i].name, "Processor"))
+      if (!strcmp (current_domain_->node[0].resource[i].name, "Processor"))
         {
+          // ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::The Resource found\n"));
           for (unsigned int j = 0;
                j < current_domain_->node[0].resource[i].property.length ();
                j++)
             {
-              if (!ACE_OS::strcmp (
+              if (!strcmp (
                            current_domain_
                            ->node[0].resource[i].property[j].name.in (),
                            "LoadAverage"))
                 {
+                  //ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::The property found\n"));
                   current_domain_->node[0].resource[i].property[j].kind =
                     ::Deployment::Quantity;
                   current_domain_->node[0].resource[i].property[j].value =
@@ -151,5 +160,11 @@ int CIAO::CIAO_Monitor::stop ()
         }
     }
 
+
+  if (CIAO::debug_level () > 9)
+    {
+      //ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::Exiting from the get_current_data function\n"));
+    }
+
   return current_domain_.get ();
 }
diff --git a/CIAO/DAnCE/NodeManager/CIAO_Monitor.h b/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
index 5a134538701..e317288b02a 100644
--- a/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
+++ b/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
@@ -18,6 +18,7 @@
 
 #include "BaseMonitor.h"
 #include "ace/Auto_Ptr.h"
+#include <memory>
 
 /**
  * @namespace CIAO
@@ -43,12 +44,12 @@ namespace CIAO
      */
     CIAO_Monitor ();
 
-    /**
-     * This function is called by the controller to initialize
-     * parameters.
-     * @param domain The Initial Domain for this host
-     * @param target_manager TargetManager_ptr
-     * @param interval The time interval after whic updates need to be send.
+    /** @function initialize_params
+     *  @param domain The Initial Domain for this host
+     *  @param   target_manager TargetManager_ptr
+     *  @param   interval The time interval after whic updates need to be send.
+     *  @description This function is called by the controller to initialize
+     *               parameters.
      */
     virtual int  initialize_params (
                                     ::Deployment::Domain& domain,
@@ -56,25 +57,30 @@ namespace CIAO
                                     int interval
                                     );
     /**
-     * Destructor
+     * @function Destructor
      */
     virtual ~CIAO_Monitor ();
 
-    /**
-     * This method will starts up the Monitor in this case,
-     * @param orb The orb needed for resolving.
-     * @return -1 on error
+    /** @function start.
+     *  @brief This method will starts up the Monitor
+     *  in this case,
+     *  @param orb The orb needed for resolving.
+     *  @return -1 on error
      */
     int start (CORBA::ORB_ptr orb);
 
     /**
-     * This method will stop the Monitor in this case
+     * @function stop.
+     * @brief This method will starts up the Monitor
+     *  in this case
      * @return -1 on error
      */
     int stop ();
 
     /**
-     * This function retrieves the current Domain data
+     * @function get_current_date.
+     * @brief This function retrieves the current
+     * Domain data
      * @return -1 on error
      */
     ::Deployment::Domain* get_current_data ();
diff --git a/CIAO/DAnCE/NodeManager/Monitor.mpc b/CIAO/DAnCE/NodeManager/Monitor.mpc
index 9ccc91f0025..b4f5f55cd31 100644
--- a/CIAO/DAnCE/NodeManager/Monitor.mpc
+++ b/CIAO/DAnCE/NodeManager/Monitor.mpc
@@ -8,7 +8,7 @@ project(*monitorlib): ciao_client_dnc, ciao_events_base_dnc {
   includes += $(CIAO_ROOT)/DAnCE/TargetManager
   sharedname = ciaomonlib
 
-  libs += TargetManager_stub CIAO_Deployment_stub NodeManager_stub
+  libs += TargetManager_stub CIAO_Deployment_stub
 
   IDL_Files {
   }
diff --git a/CIAO/DAnCE/NodeManager/MonitorCB.cpp b/CIAO/DAnCE/NodeManager/MonitorCB.cpp
index e7893327b8a..e1bef3e8144 100644
--- a/CIAO/DAnCE/NodeManager/MonitorCB.cpp
+++ b/CIAO/DAnCE/NodeManager/MonitorCB.cpp
@@ -15,13 +15,12 @@
 #include "CIAO_common.h"
 
 
-CIAO::MonitorCB::MonitorCB (
-  CORBA::ORB_ptr orb,
-  Deployment::TargetManager_ptr target,
-  int interval) :
-    orb_ (orb),
-    target_mgr_ (target),
-    interval_ (interval)
+CIAO::MonitorCB::MonitorCB (CORBA::ORB_ptr orb,
+                      Deployment::TargetManager_ptr target,
+                      int interval
+                      ):orb_ (orb),
+                        target_mgr_ (target),
+                        interval_ (interval)
 {
 }
 
diff --git a/CIAO/DAnCE/NodeManager/MonitorCB.h b/CIAO/DAnCE/NodeManager/MonitorCB.h
index 777625bc9e0..66cb25db287 100644
--- a/CIAO/DAnCE/NodeManager/MonitorCB.h
+++ b/CIAO/DAnCE/NodeManager/MonitorCB.h
@@ -14,7 +14,9 @@
 #ifndef MONITOR_CBH
 #define MONITOR_CBH
 
-#include "ciao/Deployment_TargetManagerC.h"
+#include "TargetManagerC.h"
+
+
 
 /**
  * @namespace CIAO
@@ -36,28 +38,27 @@ namespace CIAO
     {
     public:
       /**
-       *  @param orb The ORB pointer
-       *  @param target The TargetManager reference
+       *  @constructor
+       *  @param _orb The ORB pointer
+       *  @param The TargetManager reference
        *  @param interval The time interval to sent update
        */
-      MonitorCB (CORBA::ORB_ptr orb, Deployment::TargetManager_ptr target, int interval);
+      MonitorCB (CORBA::ORB_ptr _orb,Deployment::TargetManager_ptr,int interval);
       /**
-       *  This function is called by the monitor to
-       *               update Domain data, which is then sent to
-       *               TM.
+       *  @function update_data
        *  @param  data Contains the updated Domain data
        *  @return int indicates success.
-       *  @todo Check return value, seems not used at this moment
+       *  @description This function is called by the monitor to
+       *               update Domain data, which is then sent to
+       *               TM.
        */
       int update_data (::Deployment::Domain& data);
     private:
       /// The ORB pointer
-      /// @todo Make this a _var
       CORBA::ORB_ptr orb_;
 
       /// The Target Manager pointer to send back the
       /// update
-      /// @todo Make this a _var
       ::Deployment::TargetManager_ptr target_mgr_;
 
       /// The interval after which updates need to be send
diff --git a/CIAO/DAnCE/NodeManager/MonitorController.cpp b/CIAO/DAnCE/NodeManager/MonitorController.cpp
index 76bd148613b..cff6b86df1b 100644
--- a/CIAO/DAnCE/NodeManager/MonitorController.cpp
+++ b/CIAO/DAnCE/NodeManager/MonitorController.cpp
@@ -48,16 +48,14 @@ CIAO::MonitorController::MonitorController (
     orb_ (orb),
     initial_domain_ (domain),
     node_mgr_ (node_mgr),
-    monitor_cpu_usage_ (false),
-    add_component_pid_ (true)
+    monitor_cpu_usage_ (0),
+    add_component_pid_ (1)
 {
 }
 
 int
 CIAO::MonitorController::svc (void)
 {
-  // @todo. Investigate whether we can't use the reactor with a timer
-  // eventhandler for this monitor controller, would safe us a thread
   ACE_DLL dll;
 
   // Forming the library name.
@@ -107,12 +105,13 @@ CIAO::MonitorController::svc (void)
     for (unsigned int i = 0;i < initial_domain_.node[0].resource.length ();i++)
       {
         if (!strcmp (initial_domain_.node[0].resource[i].name, "Processor"))
-          monitor_cpu_usage_ = true;
+          monitor_cpu_usage_ = 1;
       }
 
     // Wait for system to stabilize itself
     ACE_OS::sleep (interval);
 
+
     // The loop in which UpdateData is called
     while (!terminating ())
       {
@@ -122,13 +121,15 @@ CIAO::MonitorController::svc (void)
 
         // if monitoring of cpu is enable , monitor , else dont do
         // anything
-        ::Deployment::Domain* domain = 0;
+        ::Deployment::Domain* domain;
 
         if (monitor_cpu_usage_)
           domain = monitor_->get_current_data ();
         else
           domain = &initial_domain_;
 
+
+
         // ****** add component data *******************
 
         NodeManager_Impl_Base::Component_Ids cids =
@@ -173,7 +174,7 @@ CIAO::MonitorController::svc (void)
                 //                            CORBA::Long (cids.process_id_)));
               }
             // set the add_component_pid_ to 0
-            add_component_pid_ = false;
+            add_component_pid_ = 0;
           }
 
         //******add compoennt data
diff --git a/CIAO/DAnCE/NodeManager/MonitorController.h b/CIAO/DAnCE/NodeManager/MonitorController.h
index 4da2dfb322f..83714d682ef 100644
--- a/CIAO/DAnCE/NodeManager/MonitorController.h
+++ b/CIAO/DAnCE/NodeManager/MonitorController.h
@@ -18,7 +18,7 @@
 #include "NodeManager_svnt_export.h"
 #include "Deployment_BaseC.h"
 
-#include "TargetManager/TargetManagerImplC.h"
+#include "TargetManager/TargetManagerC.h"
 #include "ace/Task.h"
 #include "ace/Auto_Ptr.h"
 
@@ -53,6 +53,7 @@ namespace CIAO
     {
     public:
       /**
+       * @function svc.
        * @brief The main function containing the
        * entire activity.
        *
@@ -62,6 +63,7 @@ namespace CIAO
        */
       int svc (void);
       /**
+       * @function terminate.
        * @brief The terminate function
        *
        * This function is called to terminate the
@@ -81,8 +83,9 @@ namespace CIAO
     protected:
 
       /**
+       * @function terminating.
        * @brief returns the terminating flag
-       * @return bool The terminating state of the thread
+       * @return bool The terminting state of the thread
        */
       bool terminating ();
 
@@ -98,11 +101,10 @@ namespace CIAO
       /// The terminate flag_
       bool terminate_flag_;
 
-      /// Thread Mutex for synchronizing call
+      //Thread Mutex for synchronizing call
       ACE_SYNCH_MUTEX lock_;
 
-      /// the ORB pointer ..
-      /// @todo Make this a _var
+      // the ORB pointer ..
       CORBA::ORB_ptr orb_;
 
       /// The initial domain
@@ -111,10 +113,10 @@ namespace CIAO
       /// The Node Manager
       ::CIAO::NodeManager_Impl_Base* node_mgr_;
 
-      /// Flag tells ; what to monitor
+      /// flag tells ; what to monitor
       bool monitor_cpu_usage_;
 
-      /// To add component pid or not ..
+      /// TO add component pid or not ..
       bool add_component_pid_;
     };
 
diff --git a/CIAO/DAnCE/NodeManager/NodeManager.mpc b/CIAO/DAnCE/NodeManager/NodeManager.mpc
index e58cc2d27d4..01b11fa563a 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -2,8 +2,11 @@
 // $Id$
 
 //For static D&C, the NodeManager should be available as a linkable library
-project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub, ciao_server_dnc, ciao_nodeapplicationmanager, ciao_nodemanager_stub {
+project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub, ciao_server_dnc  {
   sharedname = NodeManager
+  after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NoOp_Configurator
+  libs += NodeManager_stub NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
+  includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/Interfaces $(CIAO_ROOT)/DAnCE/TargetManager
   dynamicflags = NODEMANAGER_SVNT_BUILD_DLL
 
   IDL_Files {
@@ -18,9 +21,10 @@ project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, i
   }
 }
 
-project(NodeManager): ciao_server_dnc, iortable, ifr_client, dance_extension_stub, ciao_nodeapplicationmanager, ciao_targetmanager_stub, ciao_nodemanager_stub {
-  after += NodeManager_svnt
-  libs += NodeManager
+project(NodeManager): ciao_server_dnc, iortable, ifr_client, dance_extension_stub  {
+  after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NodeManager_svnt
+  libs += NodeManager_stub NodeManager NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
+  includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/TargetManager
   exename = NodeManager
 
   IDL_Files {
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 7ef8a09de85..4c3a7d3437c 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -1,8 +1,9 @@
 // $Id$
 
 #include "NodeManager_Impl.h"
-#include "DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h"
+#include "../NodeApplicationManager/NodeApplicationManager_Impl.h"
 #include "ace/Log_Msg.h"
+#include <errno.h>
 
 CIAO::NodeManager_Impl_Base::NodeManager_Impl_Base (const char *name,
                                                     CORBA::ORB_ptr orb,
@@ -31,7 +32,7 @@ CIAO::NodeManager_Impl_Base::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      // Create the call back poa for NAM.
+      //create the call back poa for NAM.
       PortableServer::POAManager_var mgr
         = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -99,9 +100,8 @@ CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain,
     {
       ACE_DEBUG ((LM_DEBUG , "Before Activate\n"));
     }
-
-  // Activate the Monitor Controller to
-  // start the monitoring
+  /// Activate the Monitor Controller to
+  //start the monitoring
   monitor_controller_->activate ();
 
   if (CIAO::debug_level () > 9)
@@ -163,10 +163,8 @@ get_all_facets (ACE_CString & name)
   Component_Facets_Map::ENTRY *entry = 0;
 
   if (this->comp_facets_map_.find (name.c_str (), entry) != 0)
-    {
-      ACE_ERROR ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - "
-                  "No component with name [%s] was found in the NodeManager\n", name.c_str ()));
-    }
+    ACE_ERROR ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - "
+                "No component with name [%s] was found in the NodeManager\n", name.c_str ()));
 
   CORBA::ULong const facet_len = entry->int_id_->length ();
 
@@ -192,10 +190,8 @@ get_all_consumers (ACE_CString & name)
   Component_Consumers_Map::ENTRY *entry = 0;
 
   if (this->comp_consumers_map_.find (name.c_str (), entry) != 0)
-    {
-      ACE_ERROR ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - "
-                  "Component [%s] was not found in the NodeManager\n", name.c_str ()));
-    }
+    ACE_ERROR ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - "
+                "Component [%s] was not found in the NodeManager\n", name.c_str ()));
 
   CORBA::ULong const consumer_len = entry->int_id_->length ();
 
@@ -527,7 +523,7 @@ CIAO::NodeManager_Impl_Base::get_shared_components_i (void)
        iter != end;
        ++iter)
     {
-      CORBA::ULong const curr_len = retv->length ();
+      CORBA::ULong curr_len = retv->length ();
       retv->length (curr_len + 1);
       (*retv)[curr_len].name = (*iter).c_str ();
 
@@ -555,20 +551,17 @@ CIAO::NodeManager_Impl_Base::get_shared_components_i (void)
 CORBA::StringSeq *
 CIAO::NodeManager_Impl_Base::shared_components_seq (void)
 {
-  CORBA::StringSeq * retv = 0;
+  CORBA::StringSeq * retv;
   ACE_NEW_RETURN (retv, CORBA::StringSeq, 0);
   retv->length (0);
 
-  // @todo rewrite to just set the length once and then copy the strings
-  // to reduce allocations
-
   ACE_Unbounded_Set<ACE_CString>::iterator end = this->shared_components_.end ();
   for (ACE_Unbounded_Set<ACE_CString>::iterator
          iter = this->shared_components_.begin ();
        iter != end;
        ++iter)
     {
-      CORBA::ULong const curr_len = retv->length ();
+      CORBA::ULong curr_len = retv->length ();
       retv->length (curr_len + 1);
       (*retv)[curr_len] = (*iter).c_str ();
     }
@@ -605,7 +598,7 @@ validate_plan (const Deployment::DeploymentPlan &plan)
 
   for (i = 0; i < plan.instance.length (); ++i)
     {
-      const char * my_resource_id = 0;
+      const char * my_resource_id;
       if (plan.instance[i].deployedResource.length () == 0)
         {
           continue;
@@ -660,7 +653,7 @@ create_node_app_manager (CORBA::ORB_ptr orb,
                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CIAO::NodeApplicationManager_Impl_Base *app_mgr = 0;
+  CIAO::NodeApplicationManager_Impl_Base *app_mgr;
   ACE_NEW_THROW_EX (app_mgr,
                     CIAO::NodeApplicationManager_Impl (orb,
                                                        poa),
@@ -692,11 +685,9 @@ create_node_app_manager (CORBA::ORB_ptr orb,
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CIAO::debug_level () > 10)
-    {
-      ACE_DEBUG ((LM_DEBUG, "creating static_node_app_manager\n"));
-    }
+    ACE_DEBUG ((LM_DEBUG, "creating static_node_app_manager\n"));
 
-  CIAO::NodeApplicationManager_Impl_Base *app_mgr = 0;
+  CIAO::NodeApplicationManager_Impl_Base *app_mgr;
   ACE_NEW_THROW_EX (app_mgr,
                     CIAO::Static_NodeApplicationManager_Impl (orb,
                                                               poa,
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
index fbf9d42177d..6881a53c1e2 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
@@ -184,7 +184,7 @@ namespace CIAO
                              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))=0;
 
-    /// Actual implementation of the @c get_shared_components IDL operation
+    /// Actual implementation of the <get_shared_components> IDL operation
     virtual ::Deployment::ComponentPlans *
     get_shared_components_i (void);
 
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index 2ee63eef187..889a53d826d 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
         {
           ACE_DEBUG ((LM_DEBUG, "Use -s <NodeApplicationPath> to specify \
                                  executable path\n"));
-          ACE_OS::exit (1);
+          exit (1);
         }
 
       // Get reference to Root POA.
@@ -248,11 +248,11 @@ main (int argc, char *argv[])
         {
           char name [MAXHOSTNAMELEN + 1];
 
-          if (ACE_OS::hostname (name, MAXHOSTNAMELEN + 1) == -1)
+          if (ACE_OS::hostname (name, 100) == -1)
             {
               ACE_ERROR ((LM_ERROR,
                           "gethostname call failed! \n"));
-              ACE_OS::exit (1);
+              exit (1);
             }
 
           // Register this name with the Naming Service
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitor.h b/CIAO/DAnCE/Plan_Generator/PCVisitor.h
index 8417bc8a630..2560c95e68c 100644
--- a/CIAO/DAnCE/Plan_Generator/PCVisitor.h
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitor.h
@@ -11,7 +11,7 @@
  *  PackagingData.idl
  *
  *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- *         Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+ *         Shanshan Jiang <shanshan.jiang@vanderbilt.edu> 
  */
 //========================================================================
 
@@ -35,12 +35,12 @@
 class  PCVisitor : public PCVisitorBase
 {
 public:
-  /// Constructor
+  //constructor
   PCVisitor (Deployment::DeploymentPlan &plan,
              Deployment::PackageConfiguration &pc,
              bool modify);
 
-  /// Entry point to protected Visitor functions
+  ///Entry point to protected Visitor functions
   int Visit ();
 
 protected:
@@ -115,7 +115,7 @@ protected:
 protected:
   void update_execParameter (Deployment::ImplementationArtifactDescription& iad,
                              Deployment::ArtifactDeploymentDescription& add);
-
+                              
 private:
   Deployment::DeploymentPlan& plan_;
   Deployment::PackageConfiguration& pc_;
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
index ac34dc4d261..bd68eb18ca5 100644
--- a/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
@@ -13,7 +13,7 @@
  *  operations which involve sequences and delegates the calls to
  *  the operations which handle single elements from the sequence type.
  *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
+ *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu> 
  */
 //========================================================================
 
@@ -40,13 +40,14 @@
 class  PCVisitorBase
 {
 public:
-  /// Constructor
+  //constructor
   PCVisitorBase (void);
 
-  /// Destructor
-  virtual ~PCVisitorBase (void);
+  //destructor
+  virtual
+  ~PCVisitorBase (void);
 
-  /// Function what dispatches sequences
+  ///function what dispatches sequences
   template <typename SEQ>
   friend void visit_sequence (SEQ &seq, PCVisitorBase& v);
 
@@ -57,7 +58,7 @@ public:
   void Visit (Deployment::PackageConfiguration &pc) = 0;
   void Visit (Deployment::PackageConfigurations &pcs);
 
-  /// ComponentPackageDescription descendents
+  //ComponentPackageDescription descendents
   virtual
   void Visit (Deployment::ComponentPackageDescription &cpd) = 0;
   void Visit (Deployment::ComponentPackageDescriptions &cpds);
@@ -154,7 +155,7 @@ void Accept (PCVisitorBase &v, T& element_to_visit)
 template <typename SEQ>
 void visit_sequence (SEQ &seq, PCVisitorBase& v)
 {
-   CORBA::ULong const size = seq.length ();
+   const CORBA::ULong size = seq.length ();
 
    for (CORBA::ULong i = 0; i < size; ++i)
    {
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
index 10b0d3b0ee3..d3dc5f7f5d8 100644
--- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
@@ -13,7 +13,6 @@ namespace CIAO
 {
   namespace Plan_Generator
   {
-    // @todo make this a private method
     static CORBA::Object_ptr
     fetch_reference_naming (CORBA::ORB_ptr orb,
                             const char *repoman_name = 0
@@ -29,14 +28,9 @@ namespace CIAO
                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      if (CORBA::is_nil (pns.in ()))
-        {
-          return CORBA::Object::_nil ();
-        }
-
       CosNaming::Name name (1);
       name.length (1);
-
+      
       name[0].id = CORBA::string_dup (repoman_name);
 
       return pns->resolve (name
@@ -58,19 +52,22 @@ namespace CIAO
       if (rm_use_naming)
         {
           obj = fetch_reference_naming (orb, rm_name ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
       else
         {
           obj = orb->string_to_object (rm_name ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
 
       this->rm_ = Deployment::RepositoryManager::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       if (CORBA::is_nil (this->rm_.in ()))
         {
           ACE_ERROR ((LM_ERROR,
-            "(%P|%t) CIAO_PlanGenerator: nil Repository "
-            "Manager reference, narrow failed\n"));
+            "(%P|%t) CIAO_PlanGenerator: nil Repository"
+            " Manager reference, narrow failed\n"));
           return false;
         }
 
@@ -113,7 +110,7 @@ namespace CIAO
             {
               CORBA::StringSeq_var seq = this->rm_->findNamesByType (package);
 
-              for (CORBA::ULong i = 0; i < seq->length (); ++i)
+              for (size_t i = 0; i < seq->length (); ++i)
                 {
                   pc = this->rm_->findPackageByName (seq[i]);
 
@@ -142,9 +139,9 @@ namespace CIAO
         }
 
       ::Deployment::PackageConfiguration_var pc;
-
+      
       CORBA::StringSeq_var seq = rm_->findNamesByType (specific_type);
-      for (CORBA::ULong i = 0; i < seq->length (); ++i)
+      for (size_t i = 0; i < seq->length (); ++i)
         {
           pc = rm_->findPackageByName (seq[i]);
 
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
index 3fbfef3a9c6..78acb005d72 100644
--- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
@@ -1,7 +1,7 @@
 /**
  * $Id$
  * @file Plan_Generator_Impl.h
- * @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+ * @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu> 
  *
  * Contains the Plan_Generator_i class, which can be used to generate/modify
  * DeploymentPlans.
@@ -10,7 +10,7 @@
 #ifndef PLAN_GENERATOR_IMPL_H
 #define PLAN_GENERATOR_IMPL_H
 
-#include "ciao/Deployment_RepositoryManagerC.h"
+#include "ciao/RepositoryManagerC.h"
 #include "Plan_Generator_Impl_Export.h"
 
 namespace CIAO
@@ -53,7 +53,7 @@ namespace CIAO
       bool generate_plan (Deployment::DeploymentPlan &plan,
                           const char *package_uri,
                           bool use_package_name);
-
+      
       /**
        * @fn generate_plan
        * @brief Use the specific type of a package to get the PackageConfiguration
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index 1d023c774bc..73f208c72b1 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -202,7 +202,7 @@ namespace CIAO
 
           if (mode == pl_mode_start || mode == pl_mode_interactive)  // initial deployment
             {
-              CORBA::String_var uuid;
+              const char* uuid = 0;
 
               if (package_names != 0)
                 uuid = launcher.launch_plan (deployment_plan_url,
@@ -215,14 +215,14 @@ namespace CIAO
                                              use_package_name,
                                              use_repoman);
 
-              if (uuid.in () == 0)
+              if (uuid == 0)
                 {
                   ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error launching plan\n"));
                   return -1;
                 }
 
-              ACE_DEBUG ((LM_DEBUG, "Plan_Launcher returned UUID is %s\n", uuid.in ()));
-              dapp_mgr = launcher.get_dam (uuid.in ());
+              ACE_DEBUG ((LM_DEBUG, "Plan_Launcher returned UUID is %s\n", uuid));
+              dapp_mgr = launcher.get_dam (uuid);
 
               // Write out DAM ior if requested
               if (mode == pl_mode_start)
@@ -238,7 +238,7 @@ namespace CIAO
 
                   // Tear down the assembly
                   ACE_DEBUG ((LM_DEBUG,
-                              "Plan_Launcher: destroy the application.....\n"));
+                              "Plan_Launcher: destroy the application....."));
                   if (! launcher.teardown_plan (uuid))
                       ACE_DEBUG ((LM_DEBUG,
                                   "(%P|%t) CIAO_PlanLauncher:tear down assembly failed: "
@@ -248,9 +248,9 @@ namespace CIAO
           else if (mode == pl_mode_redeployment && new_deployment_plan_url != 0) // do redeployment
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "Plan_Launcher: reconfigure application assembly.....\n"));
+                          "Plan_Launcher: reconfigure application assembly....."));
 
-              CORBA::String_var uuid;
+              const char* uuid;
 
               if (package_names != 0)
                 uuid = launcher.re_launch_plan (new_deployment_plan_url,
@@ -263,7 +263,7 @@ namespace CIAO
                                                 use_package_name,
                                                 use_repoman);
 
-              if (uuid.in () == 0)
+              if (uuid == 0)
                 {
                   ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error re-launching plan\n"));
                   return -1;
@@ -285,14 +285,14 @@ namespace CIAO
 
               // Tear down the assembly
               ACE_DEBUG ((LM_DEBUG,
-                          "Plan_Launcher: destroy the application.....\n"));
+                          "Plan_Launcher: destroy the application....."));
               launcher.teardown_plan (dapp_mgr.in ());
             }
           else if (mode == pl_mode_stop_by_uuid) // tear down by plan_uuid
             {
               // Tear down the assembly
               ACE_DEBUG ((LM_DEBUG,
-                          "Plan_Launcher: destroy the application.....\n"));
+                          "Plan_Launcher: destroy the application....."));
               if (! launcher.teardown_plan (plan_uuid))
                 {
                   ACE_ERROR ((LM_ERROR,
@@ -336,5 +336,7 @@ int
 ACE_TMAIN (int argc,
            ACE_TCHAR *argv[])
 {
+  //ACE_DEBUG ((LM_DEBUG, "NEW PLAN LAUNCHER\n"));
+
   return run_main_implementation (argc, argv);
 }
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
index 73d1890288b..7a8793ec559 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
@@ -4,11 +4,13 @@
 #include "Config_Handlers/XML_File_Intf.h"
 #include "Config_Handlers/DnC_Dump.h"
 
+#include <iostream>
+#include <string>
+
 namespace CIAO
 {
   namespace Plan_Launcher
   {
-    // @todo make this a private method
     static CORBA::Object_ptr
     fetch_reference_naming (CORBA::ORB_ptr orb
                             ACE_ENV_ARG_DECL)
@@ -23,11 +25,6 @@ namespace CIAO
                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      if (CORBA::is_nil (pns.in ()))
-        {
-          return CORBA::Object::_nil ();
-        }
-
       CosNaming::Name name (1);
       name.length (1);
 
@@ -55,15 +52,19 @@ namespace CIAO
       // EM
       if (em_ior == 0)
         {
-          obj = fetch_reference_naming (orb);
+          obj = fetch_reference_naming (orb ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
       else
         {
-          obj = orb->string_to_object (em_ior);
+          obj = orb->string_to_object (em_ior
+                                       ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
 
       this->em_ = ::CIAO::ExecutionManagerDaemon::_narrow (obj.in ()
                                                            ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       if (CORBA::is_nil (this->em_.in ()))
         {
@@ -81,13 +82,9 @@ namespace CIAO
         }
 
       if (use_repoman)
-        {
-          return pg_.init (orb, rm_use_naming, rm_name);
-        }
-      else
-        {
-          return true;
-        }
+        return pg_.init (orb, rm_use_naming, rm_name);
+
+      return true;
     }
 
 
@@ -99,10 +96,7 @@ namespace CIAO
                                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Parsing plan...\n"));
-        }
+      ACE_DEBUG ((LM_DEBUG, "Parsing plan...\n"));
 
       CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri);
 
@@ -113,14 +107,10 @@ namespace CIAO
       // artifacts in DeploymentPlan.
       if (use_repoman)
         {
-          // @todo check return value
           pg_.generate_plan (plan, package_uri, use_package_name);
         }
 
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Parsing complete....\n"));
-        }
+      ACE_DEBUG ((LM_DEBUG, "Parsing complete....\n"));
 
       return this->launch_plan (plan.in ());
     }
@@ -139,50 +129,50 @@ namespace CIAO
               return 0;
             }
 
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("CIAO::Plan_Launcher_i: " )
-                ACE_TEXT ("about to call this->em_->preparePlan\n")));
-            }
-
-          ::Deployment::DomainApplicationManager_var dam (this->em_->preparePlan (plan, 1));
-
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("CIAO::Plan_Launcher_i: " )
-                ACE_TEXT ("after to call this->em_->preparePlan\n")));
-            }
+        if (CIAO::debug_level () > 9)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("CIAO::Plan_Launcher_i: " )
+              ACE_TEXT ("about to call this->em_->preparePlan\n")));
+          }
 
-          if (CORBA::is_nil (dam.in ()))
-            {
-              ACE_ERROR ((LM_ERROR,
-                "(%P|%t) CIAO_PlanLauncher:preparePlan call failed: "
-                "nil DomainApplicationManager reference\n"));
-              return 0;
-            }
+        ::Deployment::DomainApplicationManager_var dam (this->em_->preparePlan (plan, 1));
 
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                "CIAO_PlanLauncher: Obtained DAM ref \n"));
-            }
+        if (CIAO::debug_level () > 9)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("CIAO::Plan_Launcher_i: " )
+              ACE_TEXT ("after to call this->em_->preparePlan\n")));
+          }
 
-          ::Deployment::Properties_var properties;
-          ACE_NEW_RETURN (properties,
-              Deployment::Properties,
-              0);
+        if (CORBA::is_nil (dam.in ()))
+          {
+            ACE_ERROR ((LM_ERROR,
+              "(%P|%t) CIAO_PlanLauncher:preparePlan call failed: "
+              "nil DomainApplicationManager reference\n"));
+            return 0;
+          }
 
-          if (CIAO::debug_level ())
+        if (CIAO::debug_level () > 9)
           {
             ACE_DEBUG ((LM_DEBUG,
-              "CIAO_PlanLauncher: start Launch application...\n"));
+              "CIAO_PlanLauncher: Obtained DAM ref \n"));
           }
 
-          // Dont not start the Application immediately since it violates
-          // the semantics of component activation sequence
-          int start = 0;
+        ::Deployment::Properties_var properties;
+        ACE_NEW_RETURN (properties,
+            Deployment::Properties,
+            0);
+
+        if (CIAO::debug_level ())
+        {
+          ACE_DEBUG ((LM_DEBUG,
+            "CIAO_PlanLauncher: start Launch application...\n"));
+        }
+
+	  // Dont not start the Application immediately since it vialtes
+	  // the semantics of component activation sequence
+	  int start = 0;
 
           dam->startLaunch (properties.in (), 0);
 
@@ -270,7 +260,9 @@ namespace CIAO
       ACE_ENDTRY;
       ACE_CHECK_RETURN (0);
 
-      return CORBA::string_dup (plan.UUID.in ());
+      std::string * retv = new std::string (plan.UUID.in ());
+
+      return (*retv).c_str ();
     }
 
     ::Deployment::DomainApplicationManager_ptr
@@ -299,23 +291,20 @@ namespace CIAO
               this->em_->getManager (uuid);
 
           if (!::CORBA::is_nil (dapp_mgr.in ()))
-            {
-              dapp_mgr->destroyApplication ();
-
-              if (CIAO::debug_level ())
-                {
-                  ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-                }
-
-              // Note that we should ask the DAM to tell EM whether the DAM should
-              // be destroyed
-              this->destroy_dam_by_plan (uuid);
-            }
+          {
+            dapp_mgr->destroyApplication ();
+            if (CIAO::debug_level ())
+              {
+                ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+              }
+
+            // Note that we should ask the DAM to tell EM whether the DAM should
+            // be destroyed
+            this->destroy_dam_by_plan (uuid);
+          }
         }
       ACE_CATCHANY
         {
-          // @todo the destroy_dam_by_plan could give a stoperror exception
-          // we should handle
           ACE_ERROR ((LM_ERROR, "Unable to find DomainApplicationManager "
                       "for plan with uuid: %s\n", uuid));
           return false;
@@ -370,17 +359,13 @@ namespace CIAO
                                           ACE_ENV_ARG_DECL)
     {
       if (CIAO::debug_level ())
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO_PlanLauncher: destroy the manager.....\n"));
-        }
+        ACE_DEBUG ((LM_DEBUG,
+                    "CIAO_PlanLauncher: destroy the manager.....\n"));
 
       this->em_->destroyManagerByPlan (plan_uuid);
 
       if (CIAO::debug_level ())
-        {
-          ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-        }
+        ACE_DEBUG ((LM_DEBUG, "[success]\n"));
     }
 
     const char *
@@ -400,10 +385,11 @@ namespace CIAO
       // artifacts in DeploymentPlan.
       if (use_repoman)
         {
-          // @todo use return value
           pg_.generate_plan (plan, package_uri, use_package_name);
         }
 
+      //::Deployment::DnC_Dump::dump (plan.in ());
+
       return this->re_launch_plan (plan.in ());
     }
 
@@ -423,12 +409,12 @@ namespace CIAO
       this->em_->perform_redeployment (plan);
 
       if (CIAO::debug_level ())
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO_PlanLauncher: new plan redeployed ...\n"));
-        }
+        ACE_DEBUG ((LM_DEBUG,
+                    "CIAO_PlanLauncher: new plan redeployed ...\n"));
+
+      std::string * retv = new std::string (plan.UUID.in ());
 
-      return CORBA::string_dup (plan.UUID.in ());
+      return (*retv).c_str ();
     }
   }
 }
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
index 23ea6abc722..085ee4d8c0c 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
@@ -10,6 +10,7 @@
 #define PLAN_LAUNCHER_IMPL_H
 
 #include "Plan_Launcher_Impl_Export.h"
+#include "ciao/DeploymentS.h"
 #include "ciao/CIAO_common.h"
 #include "DAnCE/ExecutionManager/DAM_Map.h"
 #include "DAnCE/Interfaces/ExecutionManagerDaemonC.h"
@@ -32,7 +33,7 @@ namespace CIAO
           : error_ (error)
         {
         }
-
+        
         ACE_CString error_;
       };
 
@@ -41,31 +42,33 @@ namespace CIAO
 
       bool init (const char *em_ior,
                  CORBA::ORB_ptr orb,
-                 bool use_repoman = false,
-                 bool rm_use_naming = false,
+                 bool use_repoman = 0,
+                 bool rm_use_naming = 0,
                  const char *rm_name = 0
                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       /**
+       * @fn launch_plan
        * @brief Launch a plan, given a deployment plan URI
-       * @param deployment_plan_uri A uri that points ot a valid deployment plan
+       * @param plan_uri A uri that points ot a valid deployment plan
        * @returns a string containing the UUID of the plan. Null indicates failure.
        */
       const char * launch_plan (const char *deployment_plan_uri,
                                 const char *package_uri = 0,
-                                bool use_package_name = true,
-                                bool use_repoman = false
+                                bool use_package_name = 1,
+                                bool use_repoman = 0
                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((Deployment_Failure));
 
       const char * re_launch_plan (const char *deployment_plan_uri,
                                    const char *package_uri = 0,
-                                   bool use_package_name = true,
-                                   bool use_repoman = false
+                                   bool use_package_name = 1,
+                                   bool use_repoman = 0
                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((Deployment_Failure));
 
       /**
+       * @fn launch_plan
        * @brief Launch a plan, given an IDL deployment plan
        * @param plan A valid IDL deployment plan
        * @returns a string containing the UUID of the plan. Null indicates failure.
diff --git a/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
new file mode 100644
index 00000000000..edef34a145c
--- /dev/null
+++ b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
@@ -0,0 +1,154 @@
+// $Id$
+
+#include "ciao/NodeApplication_CallBackC.h"
+#include "ciao/CIAO_common.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
+#include "ace/Null_Mutex.h"
+#include "NodeApplication_Task.h"
+#include "RTServer_Impl.h"
+
+#if !defined (__ACE_INLINE__)
+# include "NodeApplication_Task.inl"
+#endif /* __ACE_INLINE__ */
+
+int
+CIAO::NodeApplication_Task::svc ()
+{
+  ACE_TRY_NEW_ENV
+    {
+      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;
+
+      object =
+        this->orb_->resolve_initial_references ("RootPOA"
+                                                ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (object.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // ...
+      CIAO::RTServer::RTNodeApplication_Impl *nodeapp_servant;
+
+      ACE_NEW_RETURN (nodeapp_servant,
+                      CIAO::RTServer::RTNodeApplication_Impl (this->orb_.in (),
+                                                              rt_orb.in (),
+                                                              root_poa.in ()),
+                      -1);
+
+      PortableServer::ServantBase_var safe_servant (nodeapp_servant);
+
+      // Configuring NodeApplication.
+      PortableServer::ObjectId_var cs_oid
+        = root_poa->activate_object (nodeapp_servant
+                                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      object = root_poa->id_to_reference (cs_oid.in ()
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      Deployment::NodeApplication_var nodeapp_obj =
+        Deployment::NodeApplication::_narrow (object.in ()
+                                              ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (nodeapp_obj.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Unable to activate RTNodeApplication object\n"),
+                          -1);
+
+      /** @@ We need to call NodeApplication servant's init method.
+       * But it's not sure to me where exactly we can get the
+       * Properties needed by the init method at this moment. There are two
+       * ways to set the property of the NodeApplication:
+       * 1. call init remotely from NodeApplicationManager
+       * 2. call init locally on the servant of NodeApplication.
+       */
+      bool retval = nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (retval)
+        {
+          ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
+                               initializing the session container!"));
+          return 1;
+      }
+
+      CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in ()
+                                                            ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (this->options_.ior_output_filename_.length () != 0)
+        CIAO::Utility::write_IOR (this->options_.ior_output_filename_.c_str (),
+                                  str.in ());
+
+      // End Deployment part
+      if (CIAO::debug_level () > 10)
+        {
+          ACE_DEBUG ((LM_INFO, "RTNodeApplication IOR: %s\n", str.in ()));
+
+        }
+
+      Deployment::NodeApplicationManager_var nodeapp_man;
+      Deployment::Properties_var prop = new Deployment::Properties;
+
+      if (this->options_.use_callback_)
+        {
+          object = this->orb_->string_to_object (this->options_.callback_ior_.c_str ()
+                                                 ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          CIAO::NodeApplication_Callback_var nam_callback
+            = CIAO::NodeApplication_Callback::_narrow (object.in ()
+                                                       ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          Deployment::Properties_out properties_out (prop.out ());
+
+          nodeapp_man
+            = nam_callback->register_node_application (nodeapp_obj.in (),
+                                                       properties_out
+                                                       ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "Running RTNodeApplication...\n"));
+
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "Exiting RTNodeApplication...\n"));
+  return 0;
+}
diff --git a/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h
new file mode 100644
index 00000000000..521dd9a4806
--- /dev/null
+++ b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h
@@ -0,0 +1,82 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    NodeApplication_Task.h
+ *
+ *  $Id$
+ *
+ *  An ACE_Task subclass that manages the RT-ORB thread for CIAO's RT
+ *  NodeApplication.
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+
+
+#ifndef CIAO_NODEAPPLICATION_TASK_H
+#define CIAO_NODEAPPLICATION_TASK_H
+#include /**/ "ace/pre.h"
+
+#include "tao/ORB_Core.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/ORB.h"
+#include "ace/Task.h"
+#include "ace/SString.h"
+
+namespace CIAO
+{
+  /**
+   * @class NodeApplication_task
+   *
+   * @brief An ACE_Task subclass that manages the RT-ORB therad
+   */
+  class NodeApplication_Task
+    : public ACE_Task_Base
+  {
+  public:
+    // We can add a rt-task configuration facility here.
+    typedef struct _options
+    {
+      // default ctor.
+      _options () : use_callback_ (1) {}
+
+      // The name of the file to write stringified IOR to.
+      ACE_CString ior_output_filename_;
+
+      // Stringified IOR of a CIAO's callback object.
+      ACE_CString callback_ior_;
+
+      // CIAO ComponentServer uses the callback object to pass it's
+      // own object reference back to NodeApplicationManager.
+      int use_callback_;
+
+      // RTCAD extension filename.
+      ACE_CString rtcad_filename_;
+    } Options;
+
+    NodeApplication_Task (ACE_Thread_Manager &thread_manager,
+                          CORBA::ORB_ptr orb,
+                          Options &opts);
+
+    int svc (void);
+
+  protected:
+    CORBA::ORB_var orb_;
+
+    // ComponentServer config options.
+    Options options_;
+  };
+
+}
+
+#if defined (__ACE_INLINE__)
+# include "NodeApplication_Task.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_NODEAPPLICAITON_TASK_H */
diff --git a/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl
new file mode 100644
index 00000000000..b2923cde8aa
--- /dev/null
+++ b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl
@@ -0,0 +1,11 @@
+// -*- C++ -*-   $Id$
+
+ACE_INLINE
+CIAO::NodeApplication_Task::NodeApplication_Task (ACE_Thread_Manager &tm,
+                                                  CORBA::ORB_ptr o,
+                                                  CIAO::NodeApplication_Task::Options &opts)
+  : ACE_Task_Base (&tm),
+    orb_ (CORBA::ORB::_duplicate (o)),
+    options_ (opts)
+{
+}
diff --git a/CIAO/DAnCE/RTNodeApplication/README b/CIAO/DAnCE/RTNodeApplication/README
new file mode 100644
index 00000000000..b7d013f07b5
--- /dev/null
+++ b/CIAO/DAnCE/RTNodeApplication/README
@@ -0,0 +1,40 @@
+$Id$
+
+This directory contains the deprecated RTNodeApplication
+implementation.  It will be removed shortly.
+
+* Currently, the RTNodeApplication does not support configuring of any
+  RT policies.
+
+* RTNodeApplication supports the following command line flags:
+
+  * -n : Do not try to call back NodeApplicationManager.  This is only
+         useful when testing the server and the server is not created
+         by a NodeApplicationManager.
+
+  * -o <filename> : Specify the filename NodeApplication will write
+                    IOR to.  This is only useful when debugging also.
+
+  * -k <IOR> : Specify the callback IOR to the NodeApplicationManager.
+
+* Corresponding files to old RTNodeApplication:
+
+  RTNodeApplication.cpp: Main program
+
+  NodeApplication_Task.*: ACE_Task class for spawning the thread for
+                          RT-NodeApplication using the right scheduling
+                          strategy.
+
+  RTNodeApplication_Impl.* : Actual RTNodeApplication server implementation.
+
+  senv.sh: A simple shell script for setting up the run-time
+           environment when starting NodeDaemon with sudo.
+           This is necessary because the RTNodeApplication needs to
+           spawn threads with real-time scheduling class.  This
+           operation requires the process to be run by privileged user.
+           You may need to tweak this shell script to suit your need.
+           Here's an example of how to use the script:
+
+            $ sudo senv.sh $CIAO_ROOT/DAnCE/NodeManager/NodeManager \
+                -ORBEndpoint iiop://localhost:10000 \
+                -s $CIAO_ROOT/DAnCE/RTNodeApplication/RTNodeApplication
diff --git a/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp b/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
new file mode 100644
index 00000000000..86e56f99cb3
--- /dev/null
+++ b/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
@@ -0,0 +1,171 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+#include "NodeApplication_Task.h"
+#include "ciao/Server_init.h"
+
+int
+parse_args (int argc,
+            char *argv[],
+            CIAO::NodeApplication_Task::Options &opts)
+{
+  ACE_Get_Opt get_opts (argc, argv, "nk:o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'n':
+        opts.use_callback_ = 0;
+        break;
+
+      case 'o':  // get the file name to write to
+       opts.ior_output_filename_ = get_opts.opt_arg ();
+      break;
+
+      case 'k':  // get the activator callback IOR
+       opts.callback_ior_ = get_opts.opt_arg ();
+      break;
+
+      case '?':  // display help for use of the server.
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s\n"
+                           "-n Don't not try to callback NodeApplicationManager (testing)\n"
+                           "-o <ior_output_file>\n"
+                           "-k <activator_callback_ior>\n"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  if (opts.use_callback_ && opts.callback_ior_.length () == 0)
+    ACE_ERROR_RETURN ((LM_ERROR, "Callback IOR to NodeApplicationManager is required.\n"),
+                      -1);
+
+  return 0;
+}
+
+const char *
+sched_policy_name (int sched_policy)
+{
+  const char *name = 0;
+
+  switch (sched_policy)
+    {
+    case ACE_SCHED_OTHER:
+      name = "SCHED_OTHER";
+      break;
+    case ACE_SCHED_RR:
+      name = "SCHED_RR";
+      break;
+    case ACE_SCHED_FIFO:
+      name = "SCHED_FIFO";
+      break;
+    }
+
+  return name;
+}
+
+/// The following check is taken from $(TAO_ROOT)/tests/RTCORBA/
+void
+check_supported_priorities (CORBA::ORB_ptr orb)
+{
+  int sched_policy =
+    orb->orb_core ()->orb_params ()->ace_sched_policy ();
+
+  // Check that we have sufficient priority range to run,
+  // i.e., more than 1 priority level.
+  int max_priority =
+    ACE_Sched_Params::priority_max (sched_policy);
+  int min_priority =
+    ACE_Sched_Params::priority_min (sched_policy);
+
+  if (max_priority == min_priority)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Not enough priority levels with the %s scheduling policy\n"
+                  "on this platform to run, terminating program....\n"
+                  "Check svc.conf options\n",
+                  sched_policy_name (sched_policy)));
+
+      ACE_OS::exit (2);
+    }
+}
+
+
+int
+main (int argc, char **argv)
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc,
+                         argv,
+                         ""
+                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // Register value factories for the server side.
+      CIAO::Server_init (orb.in ());
+
+      CIAO::NodeApplication_Task::Options options;
+
+      int result =
+        parse_args (argc, argv, options);
+
+      if (result != 0)
+        return result;
+
+      // Make sure we can support multiple priorities that are required
+      // for this test.
+      // check_supported_priorities (orb.in());
+
+      // Thread Manager for managing task.
+      ACE_Thread_Manager thread_manager;
+
+      // Create task.
+      CIAO::NodeApplication_Task cs_task (thread_manager,
+                                          orb.in (),
+                                          options);
+
+      // Task activation flags.
+      long flags =
+        THR_NEW_LWP |
+        THR_JOINABLE |
+        orb->orb_core ()->orb_params ()->thread_creation_flags ();
+
+      // Activate task.
+      result =
+        cs_task.activate (flags);
+      if (result == -1)
+        {
+          if (errno == EPERM)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "Cannot create thread with scheduling policy %s\n"
+                                 "because the user does not have the appropriate privileges, terminating program....\n"
+                                 "Check svc.conf options and/or run as root\n",
+                                 sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())),
+                                2);
+            }
+          else
+            // Unexpected error.
+            ACE_ASSERT (0);
+        }
+
+      // Wait for task to exit.
+      result =
+        thread_manager.wait ();
+      ACE_ASSERT (result != -1);
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp
new file mode 100644
index 00000000000..597b8c76d6d
--- /dev/null
+++ b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp
@@ -0,0 +1,13 @@
+// $Id$
+
+#include "RTServer_Impl.h"
+#include "ciao/CIAO_common.h"
+
+#if !defined (__ACE_INLINE__)
+# include "RTServer_Impl.inl"
+#endif /* __ACE_INLINE__ */
+
+CIAO::RTServer::RTNodeApplication_Impl::~RTNodeApplication_Impl ()
+{
+}
+
diff --git a/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h
new file mode 100644
index 00000000000..fdcca084ed5
--- /dev/null
+++ b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h
@@ -0,0 +1,77 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    RTServer_Impl.h
+ *
+ *  $Id$
+ *
+ *  This file contains real-time extended implementations for the
+ *  servants of
+ *         Deployment::NodeApplication
+ *
+ *  It will also contain the real-time extended version of
+ *  CIAO::Session_Container.
+ *
+ *  Currently, they are only used in the RTComponentServer
+ *  implementation.
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+
+
+#ifndef CIAO_RTSERVER_IMPL_H
+#define CIAO_RTSERVER_IMPL_H
+#include /**/ "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ciao/NodeApplication_Impl.h"
+#include "ciao/Container_Base.h"
+#include "tao/RTCORBA/RTCORBA.h"
+
+namespace CIAO
+{
+  namespace RTServer
+  {
+    /**
+     * @class RTNodeApplication
+     *
+     * @brief Real-time extention servant implementation of
+     *        Deployment::NodeApplication
+     *
+     * This class implements the Deployment::NodeApplication
+     * interface as defined by the DnC spcification.  As the interface
+     * implies, this is actually part of the deployment interface and is
+     * used to manage the lifecycle of containers running on the server.
+     */
+    class RTNodeApplication_Impl
+      : public virtual CIAO::NodeApplication_Impl
+    {
+    public:
+      /// Constructor
+      RTNodeApplication_Impl (CORBA::ORB_ptr o,
+                              RTCORBA::RTORB_ptr rto,
+                              PortableServer::POA_ptr p);
+
+      /// Destructor
+      virtual ~RTNodeApplication_Impl (void);
+
+    protected:
+      RTCORBA::RTORB_var rtorb_;
+    };
+
+  }
+}
+
+#if defined (__ACE_INLINE__)
+# include "RTServer_Impl.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_RTSERVER_IMPL_H */
diff --git a/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.inl b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.inl
new file mode 100644
index 00000000000..aa1679b88a3
--- /dev/null
+++ b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.inl
@@ -0,0 +1,13 @@
+/* -*- C++ -*- */
+// $Id$
+
+ACE_INLINE
+CIAO::RTServer::RTNodeApplication_Impl::RTNodeApplication_Impl (CORBA::ORB_ptr o,
+                                                                RTCORBA::RTORB_ptr rto,
+                                                                PortableServer::POA_ptr p)
+  : NodeApplication_Impl (o, p),
+    rtorb_ (RTCORBA::RTORB::_duplicate (rto))
+{
+}
+
+
diff --git a/CIAO/DAnCE/RepositoryManager/HTTP_Client.cpp b/CIAO/DAnCE/RepositoryManager/HTTP_Client.cpp
new file mode 100644
index 00000000000..73a8071f305
--- /dev/null
+++ b/CIAO/DAnCE/RepositoryManager/HTTP_Client.cpp
@@ -0,0 +1,59 @@
+// $Id$
+
+// HTTP_Client.cpp, Stoyan
+
+#include "HTTP_Client.h"
+#include "HTTP_Handler.h"
+#include "ace/OS_NS_string.h"
+
+HTTP_Client::HTTP_Client (void)
+{
+}
+
+HTTP_Client::~HTTP_Client (void)
+{
+  this->close ();
+}
+
+// initialize address and filename. No network i/o in open
+int
+HTTP_Client::open (const ACE_TCHAR *filename,
+                   const ACE_TCHAR *hostname,
+                   u_short port)
+{
+  filename_ = ACE_OS::strdup (filename);
+  inet_addr_.set (port, hostname);
+  return 0;
+}
+
+// read from connection length bytes from offset, into Message block
+int
+HTTP_Client::read (ACE_Message_Block *mb)
+{
+
+  // Create a HTTP_Client Reader
+  HTTP_Reader HTTP_reader (mb, filename_);
+  HTTP_Handler *brp = &HTTP_reader;
+
+  // Connect to the server
+  if (connector_.connect (brp, inet_addr_) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Client::read():Connector error"), -1);
+
+  return HTTP_reader.byte_count ();
+
+}
+
+// close down the HTTP_Client
+int
+HTTP_Client::close (void)
+{
+
+  if (filename_)
+    {
+      ACE_OS::free ((void *) filename_);
+      filename_ = 0;
+    }
+  return 0;
+
+}
+
diff --git a/CIAO/DAnCE/RepositoryManager/HTTP_Client.h b/CIAO/DAnCE/RepositoryManager/HTTP_Client.h
new file mode 100644
index 00000000000..ac0f9cbea92
--- /dev/null
+++ b/CIAO/DAnCE/RepositoryManager/HTTP_Client.h
@@ -0,0 +1,72 @@
+
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    HTTP_Client.h
+ *
+ *  $Id$
+ *
+ *   This is the HTTP_Client class, which is the API for doing file
+ *   uploads/downloads.
+ *
+ *  @author Stoyan Paunov
+ */
+//=============================================================================
+
+
+#ifndef HTTP_Client_H
+#define HTTP_Client_H
+
+
+#include "ace/INET_Addr.h"
+#include "ace/Svc_Handler.h"
+#include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
+#include "ace/Message_Block.h"
+#include "HTTP_Handler.h"
+
+/**
+ * @class HTTP_Client
+ *
+ * @brief HTTP_Client is intended to provide application API to
+ * classes that wish to do network i/o at a very
+ * high level of abstraction.
+ *
+ * This class provides the ability to retrieve data from
+ * the network, of specified length and offset, and potentially
+ * use any protocol "under the hood" to do so. It currently
+ * uses HTTP. See HTTP_Handler also.
+ */
+class HTTP_Client
+{
+public:
+  HTTP_Client (void);
+  ~HTTP_Client (void);
+
+  /// Initializes the class with the given filename, hostname and port.
+  /// it should be called with the filename, before any read/write calls
+  int open (const ACE_TCHAR *filename,
+            const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST,
+            u_short port = 80);
+
+  /// Starts a connection, and reads a file from the server into
+  /// Message_Block mb
+  int read (ACE_Message_Block *mb);
+
+  /// Frees memory allocated for filename.
+  int close ();
+
+private:
+  /// Store the internet address of the server
+  ACE_INET_Addr inet_addr_;
+
+  /// The filename
+  ACE_TCHAR *filename_;
+
+  /// The connector endpoint to initiate the client connection
+  ACE_Connector<HTTP_Handler, ACE_SOCK_CONNECTOR> connector_;
+
+};
+
+#endif /* HTTP_Client_H */
diff --git a/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp b/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp
new file mode 100644
index 00000000000..ffd85ca1ebf
--- /dev/null
+++ b/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp
@@ -0,0 +1,203 @@
+// $Id$
+
+// HTTP_Handler.cpp, Stoyan
+
+#include "HTTP_Handler.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_strings.h"
+
+// Empty constructor for compliance with new Connector behavior.
+HTTP_Handler::HTTP_Handler (void)
+{
+}
+
+// Always use this constructor
+HTTP_Handler::HTTP_Handler (ACE_Message_Block * mb,
+                            ACE_TCHAR *filename) :
+  mb_ (mb),
+  filename_ (ACE_OS::strdup (filename)),
+  bytecount_ (0)
+{
+}
+
+HTTP_Handler::~HTTP_Handler (void)
+{
+  if (filename_)
+    {
+      ACE_OS::free (filename_);
+      filename_ = 0;
+    }
+}
+
+// Called by Connector after connection is established
+int
+HTTP_Handler::open (void *)
+{
+  if (this->send_request () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():send_request failed\n"), -1);
+
+  if (this->receive_reply () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():receive_reply failed\n"), -1);
+  return 0;
+
+}
+
+// No-op
+int
+HTTP_Handler::close (u_long)
+{
+  return 0;
+}
+
+// Always overridden by the derived classes
+int
+HTTP_Handler::send_request (void)
+{
+  return -1;
+}
+
+// Always overridden by the derived classes
+int
+HTTP_Handler::receive_reply (void)
+{
+  return -1;
+}
+
+// used to retrieve the number of bytes read/written by the
+// last operation on the Blob
+size_t
+HTTP_Handler::byte_count (void)
+{
+  return bytecount_;
+}
+
+// Reader **************************************************
+
+HTTP_Reader::HTTP_Reader (ACE_Message_Block * mb,
+                          ACE_TCHAR *filename,
+                          const char *request_prefix,
+                          const char *request_suffix) :
+  HTTP_Handler (mb, filename),
+  request_prefix_ (request_prefix),
+  request_suffix_ (request_suffix)
+{
+}
+
+// Send the HTTP request
+int
+HTTP_Reader::send_request (void)
+{
+  char mesg [MAX_HEADER_SIZE];
+
+  // Check to see if the request is too big
+  if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_)
+                         + ACE_OS::strlen (filename_)
+                         + ACE_OS::strlen (request_suffix_) + 4))
+    ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1);
+
+  // Create a message to send to the server requesting retrieval of the file
+  int len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_);
+
+  // Send the message to server
+  if (peer ().send_n (mesg, len) != len)
+    ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1);
+
+
+  return 0;
+}
+
+// Recieve the HTTP Reply
+int
+HTTP_Reader::receive_reply (void)
+{
+  size_t num_recvd = 0;
+  char buf [MTU+1];
+  char *buf_ptr = 0;
+  size_t bytes_read = 0;
+
+  // Receive the first MTU bytes and strip the header off.
+  // Note that we assume that the header will fit into MTU bytes.
+
+  if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0)
+    {
+      //Make sure that response type is 200 OK
+      if (ACE_OS::strstr (buf,"200 OK") == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                            "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1);
+
+      // Search for the header termination string "\r\n\r\n", or "\n\n". If
+      // found, move past it to get to the data portion.
+      if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0)
+        buf_ptr += 4;
+      else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0)     //for compatibility with JAWS
+        buf_ptr += 2;
+      else
+        buf_ptr = buf;
+
+      // Determine number of data bytes read. This is equal to the
+      // total bytes read minus number of header bytes.
+      bytes_read = num_recvd - (buf_ptr - buf);
+
+    }
+  else
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
+
+  // ***************************************************************
+  // At this point, we have stripped off the header and are ready to
+  // process data. buf_ptr points to the data
+
+  //set the size of the ACE_Message_Block to the current bytes read
+  //NOTE: this function reallocates if necessary
+  //this->mb_->size (bytes_read);
+
+  ACE_Message_Block* temp;   //pointer used temporarily
+                             //for memory allocations before
+                             //chaining to Message_Block
+
+  ACE_Message_Block* curr = this->mb_;
+
+  ACE_NEW_RETURN (temp, ACE_Message_Block (bytes_read), -1);
+  curr->cont (temp);
+
+  curr = curr->cont ();
+
+  // Copy over all the data bytes into our message buffer.
+  if (curr->copy (buf_ptr, bytes_read) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
+                          "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1);
+
+  //read the rest of the data into a number of ACE_Message_Blocks and
+  //chain them together in a link list fashion
+
+  num_recvd = 0;
+
+  do
+  {
+    if (curr->space () == 0)
+    {
+      ACE_NEW_RETURN (temp, ACE_Message_Block (MTU), -1);
+      curr->cont (temp);
+      curr = curr->cont ();
+    }
+
+  if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0)
+    {
+      //move the write pointer
+      curr->wr_ptr (num_recvd);
+
+      //increment bytes_read
+      bytes_read += num_recvd;
+
+    }
+  else
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
+
+  }while (num_recvd != 0);
+
+  // Set the byte count to number of bytes received
+  this->bytecount_ = bytes_read;
+
+  return 0;
+}
+
diff --git a/CIAO/DAnCE/RepositoryManager/HTTP_Handler.h b/CIAO/DAnCE/RepositoryManager/HTTP_Handler.h
new file mode 100644
index 00000000000..d1e9aae2894
--- /dev/null
+++ b/CIAO/DAnCE/RepositoryManager/HTTP_Handler.h
@@ -0,0 +1,86 @@
+
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    HTTP_Handler.h
+ *
+ *  $Id$
+ *
+ *   HTTP_Handler is a base class for HTTP_Reader and
+ *   HTTP_Writer which are created in response to calls to
+ *   read/write, as appropriate
+ *
+ *
+ *  @author Stoyan Paunov
+ */
+//=============================================================================
+
+
+#ifndef HTTP_HANDLER_H
+#define HTTP_HANDLER_H
+
+#include "ace/SOCK_Stream.h"
+#include "ace/Svc_Handler.h"
+#include "ace/Message_Block.h"
+
+/**
+ * @class HTTP_Handler
+ * class to retrieve data via HTTP
+ */
+class HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+{
+public:
+  /// Null constructor, insures that it works properly with Connector
+  HTTP_Handler (void);
+
+  /// Always use this constructor to make HTTP_Handlers
+  HTTP_Handler (ACE_Message_Block *mb,
+                ACE_TCHAR *filename);
+
+  /// returns the number of bytes read/written in the last operation.
+  size_t byte_count (void);
+
+  /// Activate this instance of the <HTTP_Handler>
+  virtual int open (void * = 0);
+
+  /// Close down the Blob
+  virtual int close (u_long flags = 0);
+
+  ~HTTP_Handler (void);
+
+protected:
+  virtual int send_request (void);
+  virtual int receive_reply (void);
+
+  ACE_Message_Block *mb_;
+  ACE_TCHAR *filename_;
+  size_t bytecount_;
+  enum
+  {
+    /// The handler assumes that the first 2048 bytes of a server response
+    /// contains the header
+    MAX_HEADER_SIZE = 2048,
+
+    /// set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS
+    MTU = BUFSIZ
+  };
+};
+
+class HTTP_Reader : public HTTP_Handler
+{
+public:
+  HTTP_Reader (ACE_Message_Block *mb,
+                   ACE_TCHAR *filename,
+                   const char *request_prefix = "GET",
+                   const char *request_suffix = "HTTP/1.0\r\n\r\n");
+
+private:
+  //NOTE: these functions return -1 on error
+  int send_request (void);
+  int receive_reply (void);
+  const char *request_prefix_;
+  const char *request_suffix_;
+};
+
+#endif /* HTTP_HANDLER_H */
diff --git a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
index d2ce75e8666..164a151cd6f 100644
--- a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -6,6 +6,10 @@
 #include "PC_Updater_T.h"
 #include "ace/Containers_T.h"        //for ACE_Double_Linked_List
 
+
+#include <iostream>
+using namespace std;
+
 namespace
 {
   const size_t TEMP_LEN = 1024;
@@ -167,9 +171,7 @@ void PC_Updater::clear_list ()
 
   void PC_Updater::update (::Deployment::ImplementationArtifactDescription &iad)
   {
-    const char* location = CORBA::string_dup (iad.location[0]);
-
-    //create an iterator
+    //create an interator
     ACE_Double_Linked_List_Iterator<ZIP_File_Info> iter (this->file_list_);
 
     //find the correct path and return
@@ -188,8 +190,8 @@ void PC_Updater::clear_list ()
         if (name)
         {
           ACE_CString loc (this->server_path_);
-          loc += "/implementations/";
-          loc += location;
+          loc += "/";
+          loc += full_path;
 
           iad.location[0] = CORBA::string_dup (loc.c_str ());
 
@@ -199,6 +201,7 @@ void PC_Updater::clear_list ()
       }
       iter++;
     }
+    const char* location = iad.location[0];
 
     ACE_ERROR ((LM_ERROR,
                "[PC_Updater::update] Unable to update: %s!\n",
diff --git a/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp b/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
index cd4b92669d0..2a1639a8d35 100644
--- a/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
@@ -1,6 +1,9 @@
 // $Id$
 
 #include "RM_Helper.h"
+#include "ciao/Packaging_DataC.h"    //for the PackageConfiguration declaration
+#include "tao/CDR.h"                 //for TAO CDR classes
+#include "ace/Message_Block.h"       //for ACE_Message_Block
 #include "ace/Auto_Ptr.h"            //for Auto_Ptr
 #include "ace/OS_NS_fcntl.h"         //for open
 #include "ace/OS_NS_unistd.h"        //for close
diff --git a/CIAO/DAnCE/RepositoryManager/RM_Helper.h b/CIAO/DAnCE/RepositoryManager/RM_Helper.h
index f76764e3b11..f52e7deaaf2 100644
--- a/CIAO/DAnCE/RepositoryManager/RM_Helper.h
+++ b/CIAO/DAnCE/RepositoryManager/RM_Helper.h
@@ -19,9 +19,9 @@
 #define RM_HELPER_H_
 
 
-#include "ciao/Deployment_Packaging_DataC.h"
-#include "tao/CDR.h"
-#include "ace/Message_Block.h"
+#include "ciao/Packaging_DataC.h"    //for the PackageConfiguration declaration
+#include "tao/CDR.h"                 //for TAO CDR classes
+#include "ace/Message_Block.h"      //for ACE_Message_Block
 
 
 class RM_Helper
diff --git a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
index 61803ce1347..03ebc62a370 100644
--- a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
@@ -1,3 +1,4 @@
+
 /* -*- C++ -*- */
 
 /***
@@ -17,10 +18,12 @@
 #include "ace/OS_NS_fcntl.h"      //for open
 #include "ace/OS_NS_unistd.h"        //for close
 #include "ace/OS_NS_sys_stat.h"        //for filesize and fstat and mkdir
-#include "ace/streams.h"
 
 #include "Config_Handlers/DnC_Dump.h"
 
+#include <iostream>
+using namespace std;
+
 #include "RM_Helper.h"          //to be able to externalize/internalize a PackageConfiguration
 #include "tao/CDR.h"          //for TAO CDR classes
 #include "ace/Message_Block.h"      //for ACE_Message_Block
@@ -100,9 +103,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
 
     if (options->shutdown_)
-      {
-        rm->shutdown ();
-      }
+    {
+      rm->shutdown ();
+    }
     else if (options->all_names_)
     {
       try
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
index fe8c009efa6..cb99ca7f3f1 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
@@ -34,10 +34,10 @@ namespace CIAO
     const char * RMior = "RepositoryManagerDaemon.ior";
 
     // Name of RepoMan
-    const char * repoman_name_ = "RepositoryManager";
+    char * repoman_name_ = "RepositoryManager";
 
     //Name service of the RM
-    const char * RMname_service = "RepositoryManager";
+    char * RMname_service = "RepositoryManager";
 
     /// Default number of worker threads to run in the multi-threaded RM
     static unsigned int nthreads = 3;
@@ -48,7 +48,7 @@ namespace CIAO
   }
 }
 
-// Forward declaration
+//forward declaration
 bool parse_args (int argc, char *argv[]);
 
 /**
@@ -143,18 +143,18 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     if (!parse_args (argc, argv))
        return -1;
 
-    // Get the root POA object
+    //Get the root POA object
     CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
-    // Downcast to POA type
+    //downcast to POA type
     PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ());
 
     //activate the POA manager
     PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
     mgr->activate ();
 
-    // Create a servant
-    CIAO_RepositoryManagerDaemon_i* repo = 0;
+    //create a servant
+    CIAO_RepositoryManagerDaemon_i* repo;
     ACE_NEW_RETURN (repo,
                     CIAO_RepositoryManagerDaemon_i (
                           orb.in (),
@@ -162,7 +162,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                           CIAO::RepositoryManager::repoman_name_),
                     1);
 
-    //transfer ownership to the POA
+    //trasfer ownership to the POA
     PortableServer::ServantBase_var owner_transfer(repo);
 
     //register and implicitly activate servant
@@ -202,10 +202,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-    // done
+    //done
     return 0;
 
-    // todo shutdown orb
+    //Start accepting requests
+    orb->run ();
+
+    //allow objects registered with the POA ot get cleaned-up
+    root_poa->destroy (1, 1);
+
+    //shutdown the orb
+    orb->shutdown (1);
+
+    return 0;
   }
   catch (CORBA::Exception &ex) {
     cerr << "CORBA Exception: " << ex << endl;
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
index b20b77e2d6c..a39395f3862 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -6,13 +6,13 @@
 
 project (RepositoryManager) : ciao_server_dnc, ciao_config_handlers, zlib {
 
-  includes += $(CIAO_ROOT)/tools/Config_Handlers $(ACE_ROOT)/contrib/minizip
+  includes += $(CIAO_ROOT)/tools/Config_Handlers $(ACE_ROOT)/contrib/minizip  
   //to circumvent an improper include resolution
   //in the Package_Handlers/PC_Intf.h
   exename = RepositoryManagerDaemon
   requires += zlib
   after += minizip
-  libs += Package_Config_Handlers minizip
+  libs += Package_Config_Handlers minizip  
 
   IDL_Files {
     RepositoryManagerDaemon.idl
@@ -26,6 +26,8 @@ project (RepositoryManager) : ciao_server_dnc, ciao_config_handlers, zlib {
     RepositoryManager_Impl.cpp
     RM_Helper.cpp
     URL_Parser.cpp
+    HTTP_Handler.cpp
+    HTTP_Client.cpp
     PC_Updater_T.cpp
     PC_Updater.cpp
   }
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl b/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
index 7f28e7d5683..3cd410d2575 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ciao/Deployment_RepositoryManager.idl"
+#include "ciao/RepositoryManager.idl"
 
 module CIAO
 {
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index e031c81854f..02e31b897b0 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -32,7 +32,7 @@
 
 //for the PackageConfiguration parsing
 #include "ciao/Deployment_DataC.h"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "ciao/Packaging_DataC.h"
 #include "Package_Handlers/PCD_Handler.h"
 
 #include "RM_Helper.h"            //to be able to externalize/internalize a PackageConfiguration
@@ -42,12 +42,15 @@
 #include "ace/OS_NS_stdlib.h"     //for itoa ()
 
 #include "URL_Parser.h"           //for parsing the URL
-#include "tao/HTTP_Client.h"      //the HTTP client class to downloading packages
+#include "HTTP_Client.h"          //the HTTP client class to downloading packages
 
 #include "PC_Updater.h"           //A visitor class to walk through the elements of the PC
 
 #include "ace/Configuration_Import_Export.h"
 
+#include <iostream>
+using namespace std;
+
 namespace
 {
   static const char* PC_EXTENSION = ".epc";
@@ -63,7 +66,7 @@ namespace
 //-----------------------------------------------------------------
 
 CIAO_RepositoryManagerDaemon_i::CIAO_RepositoryManagerDaemon_i
-  (CORBA::ORB_ptr the_orb, const char* server, const char* install_dir)
+  (CORBA::ORB_ptr the_orb, const char* server, char* install_dir)
   : the_orb_ (CORBA::ORB::_duplicate (the_orb)),
     install_root_ (""),
     HTTP_server_ ("http://"),
@@ -251,8 +254,8 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
     {
 
       //TODO: how can I incorporate a Auto_Ptr is explicit release is needed
-      ACE_Message_Block* mb = 0;
-      ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::NO_MEMORY ());
+      ACE_Message_Block* mb;
+      ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::INTERNAL ());
       ACE_CHECK_RETURN (0);
 
       //get the remote file
@@ -456,7 +459,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
   {
     //TODO: how can I incorporate a Auto_Ptr is explicit release is needed
     ACE_Message_Block* mb;
-    ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::NO_MEMORY ());
+    ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::INTERNAL ());
     ACE_CHECK_RETURN (0);
 
     //get the remote file
@@ -589,7 +592,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByName (const char * name)
   Deployment::PackageConfiguration_var pc;
   ACE_NEW_THROW_EX (pc,
                     Deployment::PackageConfiguration (),
-                    CORBA::NO_MEMORY ());
+                    CORBA::INTERNAL ());
 
   ACE_CHECK_RETURN (0);
 
@@ -630,7 +633,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
   Deployment::PackageConfiguration_var pc;
   ACE_NEW_THROW_EX (pc,
                     Deployment::PackageConfiguration (),
-                    CORBA::NO_MEMORY ());
+                    CORBA::INTERNAL ());
 
   ACE_CHECK_RETURN (0);
 
@@ -661,7 +664,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
   {
     //return an empty sequence
     CORBA::StringSeq_var seq;
-    ACE_NEW_THROW_EX (seq, CORBA::StringSeq (0), CORBA::NO_MEMORY ());
+    ACE_NEW_THROW_EX (seq, CORBA::StringSeq (0), CORBA::INTERNAL ());
     ACE_CHECK_RETURN (0);
 
     return seq._retn ();
@@ -676,7 +679,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
     CORBA::StringSeq_var seq;
     ACE_NEW_THROW_EX (seq,
                       CORBA::StringSeq (len),
-                      CORBA::NO_MEMORY ());
+                      CORBA::INTERNAL ());
     seq->length (len);
 
     //store the elements in the string sequence
@@ -719,7 +722,7 @@ CIAO_RepositoryManagerDaemon_i::getAllNames ()
      ++num_entries;
 
   CORBA::StringSeq_var seq;
-  ACE_NEW_THROW_EX (seq, CORBA::StringSeq (num_entries), CORBA::NO_MEMORY ());
+  ACE_NEW_THROW_EX (seq, CORBA::StringSeq (num_entries), CORBA::INTERNAL ());
 
   ACE_CHECK_RETURN (0);
 
@@ -767,7 +770,7 @@ CIAO_RepositoryManagerDaemon_i::getAllNames ()
   CORBA::StringSeq_var seq;
   ACE_NEW_THROW_EX (seq,
                     CORBA::StringSeq (num_entries),
-                    CORBA::NO_MEMORY ());
+                    CORBA::INTERNAL ());
 
   ACE_CHECK_RETURN (0);
 
@@ -832,7 +835,7 @@ void CIAO_RepositoryManagerDaemon_i::deletePackage (
   Deployment::PackageConfiguration_var pc;
   ACE_NEW_THROW_EX (pc,
                     Deployment::PackageConfiguration (),
-                    CORBA::NO_MEMORY ());
+                    CORBA::INTERNAL ());
 
   ACE_CHECK_RETURN (0);
 
@@ -947,7 +950,7 @@ int CIAO_RepositoryManagerDaemon_i::HTTP_Get (const char* URL, ACE_Message_Block
     return 0;
 
     // Create a client
-    TAO_HTTP_Client client;
+    HTTP_Client client;
 
     // Open the client
     if (client.open (parser->filename_,
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
index 0c371d7c758..b35dd6a94f6 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
@@ -55,7 +55,7 @@ public:
   /// Constructor
   CIAO_RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb,
                   const char* server = "localhost:5432",
-                  const char* install_dir = "RepositoryManager");
+                  char* install_dir = "RepositoryManager");
 
   /// Destructor
   virtual ~CIAO_RepositoryManagerDaemon_i (void);
@@ -163,6 +163,7 @@ protected:
   /// stores the file in the passed preallocated ACE_Message_Block
   /// @retval 1 success
   /// @retval 0 error
+
   int HTTP_Get (const char* URL, ACE_Message_Block &mb);
 
   /// Function to extract all necessary files for parsing the
@@ -171,42 +172,47 @@ protected:
   /// @retval 0 error
   ///
   /// @note ACE_CString& pcd_name is an out parameter
+
   int extract_descriptor_files (char* package,
     ACE_CString& pcd_name);
 
 
-  /// Function to remove the files extracted for parsing the PackageConfiguration
-  /// descriptor and populating the idl struct. It reads the names of the files
-  /// from the package. They correspond to the names on disk.
-  /// @retval 1 on success
-  /// @retval 0 on error
+  ///function to remove the files extracted for parsing the PackageConfiguration
+  ///descriptor and populating the idl struct. It reads the names of the files
+  ///from the package. They correspond to the names on disk.
+  ///return 1 on success
+  ///       0 on error
+
   int remove_descriptor_files (char* package);
 
 
-  /// Function to remove the files extracted from the package upon istallation
-  /// It reads the names of the files from the package. They correspond to the
-  /// names on disk. It deletes each file, then it deletes the directories that
-  /// contain them.
-  /// @note extraction location is path/*archive_name*/
-  /// @retval 1 on success
-  /// @retval 0 on error
+  ///function to remove the files extracted from the package upon istallation
+  ///It reads the names of the files from the package. They correspond to the
+  ///names on disk. It deletes each file, then it deletes the directories that
+  ///contain them.
+  ///NOTE: extraction location is path/*archive_name*/
+  ///returns 1 on success
+  ///        0 on error
+
   int remove_extracted_package (const char* package_path, const char* extraction_location);
 
-  /// Function to extract the type of the component from
-  /// the PackageConfiguration and update the interface map
-  /// @retval 1 on success
-  /// @retval 0 on error
+  ///function to extract the type of the component from
+  ///the PackageConfiguration and update the interface map
+  ///returns 1 on success
+  ///        0 on error
+
   int add_type (::Deployment::PackageConfiguration& pc,
                 const char* name);
 
-  /// Function to remove the interface type of the component
-  /// being removed from the interface map
-  /// @retval 1 on success
-  /// @retval 0 on error
+  ///function to remove the interface type of the component
+  ///being removed from the interface map
+  ///returns 1 on success
+  ///        0 on error
+
   int remove_type (::Deployment::PackageConfiguration& pc,
                    const char* name);
 
-  /// Function to dump the state of the RepositoryManager
+  ///function to dump the state of the RepositoryManager
   void dump (void);
 
 private:
@@ -249,32 +255,25 @@ private:
   typedef CIEntry::VALUE_SET CISet;
   typedef CIEntry::VALUE_SET_ITERATOR CISet_Iterator;
 
-  /// A hash map that associates the names of
-  /// PackageConfigurations with their location
+  //a hash map that associates the names of
+  //PackageConfigurations with their location
   PCMap names_;
 
   /// a hash map that associates the UUIDs of
   /// PackageConfigurations with their location
   PCMap uuids_;
 
-  /// a hash map which associates Component Interface
-  /// UUIDs with their implementations
+  //a hash map which associates Component Interface
+  //UUIDs with their implementations
   CIMap types_;
 
-  /// The ORB
+  //the ORB
   CORBA::ORB_var the_orb_;
 
-  /// Will hold the current working directory
-  char cwd_ [TEMP_LEN];
-
-  /// Full path for the install directory
-  ACE_CString install_root_;
-
-  /// Location of the server
-  ACE_CString HTTP_server_;
-
-  /// Directory where the packages will be stored locally
-  ACE_CString install_path;
+  char cwd_ [TEMP_LEN];      //will hold the current working directory
+  ACE_CString install_root_;    //full path for the install directory
+  ACE_CString HTTP_server_;    //location of the server
+  ACE_CString install_path; //directory where the packages will be stored locally
 };
 
 #endif /* REPOSITORYMANAGER_H_  */
diff --git a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
index 37187ebff61..aa346504a20 100644
--- a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
+++ b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
@@ -4,7 +4,6 @@
 #include "ace/ARGV.h"
 #include "URL_Parser.h"
 
-#include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 
 bool
@@ -21,24 +20,21 @@ URL_Parser::parse_args (int argc, ACE_TCHAR *argv[])
       case 'd':
         this->debug_ = true;
         break;
-      case 'u':
-        success = parseURL (get_opt.opt_arg ());
-        break;
+    case 'u':
+      success = parseURL (get_opt.opt_arg ());
+      break;
         // Usage fallthrough.
       default:
         success = false;
       }
-
   if (this->hostname_ == 0 || this->filename_ == 0)
-    {
-      success = false;
-    }
+  success = false;
 
   return success;
 }
 
 URL_Parser::URL_Parser (void)
-  : hostname_ (ACE::strnew ("127.0.0.1")),
+  : hostname_ ("127.0.0.1"),
     port_ (ACE_DEFAULT_HTTP_SERVER_PORT),
     filename_ (0),
     debug_ (false)
@@ -47,55 +43,61 @@ URL_Parser::URL_Parser (void)
 
 bool URL_Parser::parseURL (char* url)
 {
-  char* ptr = 0;
+  char* ptr;
   bool success = true;
   ptr = ACE_OS::strstr (url, "http://");
   if (ptr)
     url += ACE_OS::strlen ("http://");
 
   if (url[0] == '/')
-    {
-      this->filename_ = ACE_OS::strdup (url);
-    }
+  {
+    this->filename_ = ACE_OS::strdup (url);
+  }
   else
+  { ptr = ACE_OS::strstr (url, ":");
+    if (ptr)
+      this->port_ = ACE_OS::atoi (ptr + 1);
+    else
+      ptr = ACE_OS::strstr (url, "/");
+
+    if(!ptr)
+      success = false;
+    else
     {
-      ptr = ACE_OS::strstr (url, ":");
+      size_t host_len = ptr - url;
+      ACE_NEW_RETURN (this->hostname_, char [host_len + 1], false);
+      ACE_OS::strncpy (this->hostname_, url, host_len);
+      this->hostname_ [host_len] = '\0';
+      ptr = ACE_OS::strstr (ptr, "/");
       if (ptr)
-        this->port_ = ACE_OS::atoi (ptr + 1);
+      {
+        this->filename_ = ACE_OS::strdup(ptr);
+      }
       else
-        ptr = ACE_OS::strstr (url, "/");
-
-      if(!ptr)
         success = false;
-      else
-        {
-          size_t host_len = ptr - url;
-          ACE::strdelete (this->hostname_);
-          ACE_NEW_RETURN (this->hostname_, char [host_len + 1], false);
-          ACE_OS::strncpy (this->hostname_, url, host_len);
-          this->hostname_ [host_len] = '\0';
-          ptr = ACE_OS::strstr (ptr, "/");
-          if (ptr)
-            {
-              this->filename_ = ACE_OS::strdup(ptr);
-            }
-          else
-            {
-              success = false;
-            }
-        }
     }
-    return success;
+  }
+  return success;
 }
 
 
 void URL_Parser::Error (void)
 {
   ACE_DEBUG ((LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n"));
-}
 
-URL_Parser::~URL_Parser()
-{
-  delete [] this->hostname_;
-  ACE_OS::free (this->filename_);
 }
+
+
+  URL_Parser::~URL_Parser()
+  {
+    if(this->hostname_)
+    {
+      delete [] this->hostname_;
+      this->hostname_ =0;
+    }
+    if (this->filename_)
+    {
+      ACE_OS::free (this->filename_);
+      this->filename_ = 0;
+    }
+  }
diff --git a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
index b318af0ad13..d5148bd178a 100644
--- a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
+++ b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
@@ -8,7 +8,7 @@
  *  Purpose: implementing the ZIP_Wrapper class
  *
  *  @author   Stoyan Paunov, Vipul Singh
- *
+ * 
  */
 //===============================================================================
 
@@ -23,6 +23,7 @@
 #include "ace/OS_Memory.h"         //for ACE_NEW* macros
 
 #include <string>
+#include <memory>                  //for auto_ptr
 #include "unzip.h"
 #define MAXFILENAME (256)
 #define CASESENSITIVITY (0)
@@ -47,15 +48,15 @@ ZIP_File_Info::ZIP_File_Info ()
     prev_ (0)
 {
 }
-
+                                                                                
 
 /// Gets a list of the files in the archive.
 int ZIP_Wrapper::file_list_info (char* zip_name,
                                  ACE_Double_Linked_List<ZIP_File_Info> &list)
 {
-  unzFile uf=0;
+  unzFile uf=NULL;
   char filename_try[MAXFILENAME+16] = "";
-  if (zip_name!=0)
+  if (zip_name!=NULL)
     {
       strncpy(filename_try, zip_name, MAXFILENAME-1);
       /* strncpy doesnt append the trailing NULL, if the string is too long. */
@@ -63,14 +64,14 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
       /* open the zip file */
       uf = unzOpen(zip_name);
       /* if zipfile could not be opened, try appending .zip to name */
-      if (uf==0)
-        {
-          ACE_OS::strcat(filename_try, ".zip");
-          uf = unzOpen(filename_try);
-        }
+      if (uf==NULL)
+	{
+	  strcat(filename_try, ".zip");
+	  uf = unzOpen(filename_try);
+	}
     }
-  /* If zipfile could not be opened still, return */
-  if (uf==0)
+  /* If zipfile could not be opened still, return */  
+  if (uf==NULL)
     {
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("There is some problem in opening"
                  " %s or %s.zip using unzOpen \n"), zip_name, zip_name));
@@ -90,19 +91,19 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
       unz_file_info file_info;
       /* get information about the current file in zip file */
       err = unzGetCurrentFileInfo(uf, &file_info, filename_inzip,
-                                  sizeof(filename_inzip), 0, 0, 0, 0);
+                                  sizeof(filename_inzip), NULL, 0, NULL, 0);
       if (err!=UNZ_OK)
-        {
-          ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed"
-                                               " while trying to get information"
-                                               " about current file\n"), err));
-          break;
-        }
-      ZIP_File_Info* next = 0;
-      ACE_NEW_RETURN (next, ZIP_File_Info (filename_inzip,
+	{
+	  ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed"
+                                         " while trying to get information"
+                                         " about current file\n"), err));
+	  break;
+	}
+      ZIP_File_Info* next;
+      ACE_NEW_RETURN (next, ZIP_File_Info (filename_inzip, 
                       sizeof(filename_inzip)), -1);
       /* add information about current file to the list */
-      list.insert_tail (next);
+      list.insert_tail (next);      
       if ((i+1)<gi.number_entry)
 	{
 	  err = unzGoToNextFile(uf);
@@ -124,66 +125,66 @@ bool ZIP_Wrapper::get_file (char* archive_path, char* filename,
                             ACE_Message_Block &file)
 {
   bool return_code = true;
-  unzFile uf=0;
+  unzFile uf=NULL;
   uf = unzOpen(archive_path);
   /* locate the desired file in the zip file and set it as current file*/
   int j=unzLocateFile(uf, filename, 0);
-  if (j==UNZ_END_OF_LIST_OF_FILE)
+  if (j==UNZ_END_OF_LIST_OF_FILE)	
     {
-      ACE_DEBUG((LM_DEBUG, ACE_TEXT("File not found in zip archive")));
+      ACE_DEBUG((LM_DEBUG, ACE_TEXT("File not found in zip archive"))); 
       return false;
     }
   else if (j==UNZ_OK)
     {
       int k=unzOpenCurrentFile(uf);
       if (k!=UNZ_OK)
-        {
-          ACE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current"
-                                              " file using unzOpenCurrentFile")));
-          return false;
-        }
+	{
+	  ACE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current"
+                                        " file using unzOpenCurrentFile")));
+	  return false;
+	}
       else
-        {
-          int num_read = 0;
-          ACE_Message_Block* head = &file;
+	{  
+	  int num_read = 0;
+	  ACE_Message_Block* head = &file;
 
-          //read the file into the ACE_Message_Block
-          do
-            {
-              if (head->space () == 0)
-                {
-                  ACE_Message_Block* next = 0;
-                  ACE_NEW_RETURN (next, ACE_Message_Block (BUFSIZ), false);
-                  head->cont ();
-                  head = head->cont ();
-                }
-              num_read = unzReadCurrentFile(archive_path, head->wr_ptr(),
-                                                  head->space());
-              if (num_read > 0)
-                head->wr_ptr (num_read);
-            } while (num_read > 0);
-          if (num_read < 0)
-            return_code = false;
-          unzCloseCurrentFile(uf);
-          unzClose(uf);
-          return return_code;
-        }
+	  //read the file into the ACE_Message_Block
+	  do
+	    {
+	      if (head->space () == 0)
+		{
+		  ACE_Message_Block* next;
+		  ACE_NEW_RETURN (next, ACE_Message_Block (BUFSIZ), false);
+		  head->cont ();
+		  head = head->cont ();
+		}
+	      num_read = unzReadCurrentFile(archive_path, head->wr_ptr(),
+                                            head->space());					
+	      if (num_read > 0)
+		head->wr_ptr (num_read);
+	    } while (num_read > 0);
+	  if (num_read < 0)
+	    return_code = false;
+	  unzCloseCurrentFile(uf);
+	  unzClose(uf);
+	  return return_code;
+	}
     }
   return return_code;
 }
 
 
 /// uncompress the zip file
-/// The zip file will be uncompressed into a directory
+/// The zip file will be uncompressed into a directory 
 /// with the name of zip archive.
 /// the path is assumed to be an existing directory
 
 bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
 {
   //open the zip archive
-  unzFile uf=0;
+  unzFile uf=NULL;
   uf = unzOpen(zip_archive);
-  if (uf==0)
+  if (uf==NULL)
     {
       ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpen failed to open the"
                  " zipfile\n")));
@@ -195,7 +196,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
   //get only the name of the archive; remove path info
   char* n = ACE_OS::strstr (zip_archive, "/");
   char* zip_name = 0;
-  while (n != 0)
+  while (n != NULL)
     {
       zip_name = ++n;
       n = ACE_OS::strstr (n, "/");
@@ -204,7 +205,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
   //NOTE: Assumes .zip or cpk extension
   arch_dir = arch_dir.substring (0, arch_dir.length () - 4);
   //create directory with the name of zip archive
-  ACE_OS::mkdir(arch_dir.c_str());
+  ACE_OS::mkdir(arch_dir.c_str());      
   //if dir exists -1 is returned and ignored
   unz_global_info gi;
   int err = unzGetGlobalInfo(uf, &gi);
@@ -216,7 +217,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
     }
   err =unzGoToFirstFile(uf);
   if (err!=UNZ_OK)
-    {
+    {	
       ACE_DEBUG((LM_DEBUG,ACE_TEXT("error %d with zipfile in"
                  " unzGoToFirstFile \n"), err));
       return false;
@@ -225,43 +226,43 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
      a non existing directory whereas if it is a file, write the file
      at the proper path in the directory structure */
   for (uLong i=0;i<gi.number_entry;i++)
-    {
+    {	
       char filename_inzip[256];
       unz_file_info file_info;
       err = unzGetCurrentFileInfo(uf, &file_info, filename_inzip,
-                                  sizeof(filename_inzip), 0, 0, 0, 0);
+                                  sizeof(filename_inzip), NULL, 0, NULL, 0);
       if (err!=UNZ_OK)
-        {
-          ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed"
-                                               " while trying to get information"
-                                               " about currentfile\n"), err));
-          break;
-        }
-      int direc = checkdir(filename_inzip);
+	{
+	  ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed"              
+                                         " while trying to get information"
+                                         " about currentfile\n"), err));
+	  break;
+	}
+      int direc=checkdir(filename_inzip);
       /* If it is a directory, we create directory structure */
       if (direc==1)
-        {
-          makethedir(filename_inzip, arch_dir);
-        }
-      /* If it is a file, we read its data and write the uncompressed
+	{         
+	  makethedir(filename_inzip, arch_dir);		
+	}	
+      /* If it is a file, we read its data and write the uncompressed 
 	 data to the file with proper path.*/
       else if (direc==0)
-        {
-          handlethefile(filename_inzip, uf, file_info, verbose, arch_dir);
-        }
+	{      
+	  handlethefile(filename_inzip, uf, file_info, verbose, arch_dir);
+	}
       if ((i+1)<gi.number_entry)
-        {
-          err = unzGoToNextFile(uf);
-          if (err!=UNZ_OK)
-            {
-              ACE_ERROR((LM_ERROR,ACE_TEXT("unzGoToNextFile failed"
-                                                  " while trying to go to"
-                                                  " nextfile\n"), err));
-              break;
-            }
-        }
+	{
+	  err = unzGoToNextFile(uf);
+	  if (err!=UNZ_OK)
+	    {
+	      ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzGoToNextFile failed"
+                                            " while trying to go to"
+                                            " nextfile\n"), err));
+	      break;
+	    }
+	}
     }
-  unzClose(uf);
+  unzClose(uf);  
   return true;
 }
 
@@ -270,21 +271,21 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
 ///try to find if it is a directory OR file
 int ZIP_Wrapper::checkdir (char* filename_inzip)
 {
-  int direc = 0;
+  int direc=0;
   char* dircheck = ACE_OS::strstr (filename_inzip, "/");
-  /* We assume that a directory will have its entry terminating in a /
+  /* We assume that a directory will have its entry terminating in a / 
      We also assume that the directory entries in the zip file use
      forward slash for both unix and windows */
-  while (dircheck != 0)
-    {
-      int i = ACE_OS::strcmp(dircheck, "/");
-      if (i == 0)
-        {
-          direc = 1;
-          break;
-        }
-      ++dircheck;
-      dircheck = ACE_OS::strstr (dircheck, "/");
+  while (dircheck != NULL)
+    {   
+      int i=ACE_OS::strcmp(dircheck, "/");
+      if (i==0)
+	{
+	  direc=1;
+	  break;
+	}	
+      dircheck++;
+      dircheck = ACE_OS::strstr (dircheck, "/");				
     }
   return direc;
 }
@@ -295,18 +296,18 @@ int ZIP_Wrapper::makethedir (char* filename_inzip, ACE_CString arch_dir)
 //let's try to create the directory structure for the package
   char dir_name [2048];
   char* next = ACE_OS::strstr (filename_inzip, "/");
-  while (next != 0)
+  while (next != NULL)
     {
       ACE_CString location (arch_dir);
       ACE_OS::strncpy (dir_name, filename_inzip, next - filename_inzip
                        + 1);
-
+      
       dir_name[next - filename_inzip + 1] = '\0';
       location += "/";
       location += dir_name;
       ACE_stat stat;
       if (ACE_OS::stat (location.c_str (), &stat) == -1)
-        ACE_OS::mkdir (location.c_str ());
+	ACE_OS::mkdir (location.c_str ());
       next++;
       next = ACE_OS::strstr (next, "/");
     }
@@ -319,57 +320,56 @@ int ZIP_Wrapper::handlethefile (char* filename_inzip, unzFile uf,
                                 unz_file_info file_info, bool verbose,
                                 ACE_CString arch_dir)
 {
-  int k = unzOpenCurrentFile(uf);
+  int k =unzOpenCurrentFile(uf);
   if (k!=UNZ_OK)
     {
-      ACE_ERROR((LM_ERROR,ACE_TEXT("unzOpenCurrentFile failed in"
+      ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpenCurrentFile failed in"
                                     " opening the current file")));
       return false;
     }
   else
-    {
-      size_t const file_size = file_info.uncompressed_size;
+    {  
+      size_t file_size = file_info.uncompressed_size;
       char* temp = 0;
       ACE_NEW_RETURN (temp, char [file_size], false);
-      ACE_Auto_Basic_Array_Ptr<char> buffer (temp);
+      ACE_Auto_Basic_Array_Ptr<char> buffer (temp);	
       //read in the data
       unzReadCurrentFile(uf, &(*buffer), file_size);
       //close the zip handle
-      unzCloseCurrentFile(uf);
+      unzCloseCurrentFile(uf);	
       //create file name + path to open
-      std::string file_path (arch_dir.c_str ());
+      std::string file_path (arch_dir.c_str ());   
      //NOTE: need the c-style char to stop at '\0'
       file_path += "/";
       file_path += filename_inzip;
       //print out the file to be uncompressed
       if (verbose)
-        {
-          ACE_OS::write(ACE_STDOUT, file_path.c_str (),
-                              file_path.length () );
-          ACE_OS::write(ACE_STDOUT, "\n", 1);
-        }
+	{
+	  ACE_OS::write(ACE_STDOUT, file_path.c_str (),
+                        file_path.length () );
+	  ACE_OS::write(ACE_STDOUT, "\n", 1);
+	}
       // Open a file handle to the local filesystem
       ACE_HANDLE handle = ACE_OS::open (file_path.c_str (),
                                         O_CREAT | O_TRUNC | O_WRONLY);
       if (handle == ACE_INVALID_HANDLE)
-        {
-          unzClose(uf);
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("%p\n"),
+	{
+	  unzClose(uf);
+	  ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
                              ACE_TEXT ("[uncompress] file creation error")),
                              0);
-        }
-      //write the uncompressed data to the file
+	}
+      //write the uncompressed data to the file	
       if (ACE_OS::write (handle, &(*buffer), file_size) == -1)
-        {
-          unzClose(uf);
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("%p\n"),
-                             ACE_TEXT ("[uncompress] file write error")),
-                             0);
-        }
+	{
+	  unzClose(uf);
+	  ACE_ERROR_RETURN ((LM_ERROR,
+			     ACE_TEXT ("%p\n"),
+			     ACE_TEXT ("[uncompress] file write error")),
+			    0);
+	}
       // Close the file handle
-      ACE_OS::close (handle);
+      ACE_OS::close (handle);	
     }
   return 0;
 }
diff --git a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h
index 918a60f6352..d95f1b7f575 100644
--- a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h
+++ b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h
@@ -12,8 +12,8 @@
  *            class that allows a program to become ZIP-aware
  *
  *  @author   Stoyan Paunov, Vipul Singh
- *
- *
+ * 
+ *  
  */
 //=======================================================================
 
@@ -28,6 +28,7 @@
 #include "ace/OS_NS_fcntl.h"      //for open
 #include "ace/OS_NS_sys_stat.h"   //for filesize and mkdir
 
+#include <string>
 #include "unzip.h"
 
 
@@ -58,30 +59,30 @@ public:
 class ZIP_Wrapper
 {
 public:
-
+  
   /// Get file and store it into an ACE_Message_Block. The function
-  /// averts subdirectory traversal problems.
+  /// averts subdirectory traversal problems. 
   /// NOTE: Be sure to release the message block even if the function returns
-  /// false becuase the return value might be due to unsuccessful allocation
-
+  /// false becuase the return value might be due to unsuccessful allocation 
+  
   ///archive_path is the zip archive with the path
   ///filename is the name of the file to be looked for in the zip archive.
   ///the file is stored in ACE message block.
-  static bool get_file (char* archive_path, char* filename,
-                        ACE_Message_Block &file);
+  static bool get_file (char* archive_path, char* filename, 
+                        ACE_Message_Block &file); 
 
   /// uncompress the zip file
-  /// The zip file will be uncompressed into a directory with the
+  /// The zip file will be uncompressed into a directory with the 
   ///name of zip archive.
   /// The path is assumed to be an existing directory
-
+  
   ///zip_archive is the arcive to be uncompressed with full path.
   ///path is used for creating a directory with the name of zip archive.
   static bool uncompress (char* zip_archive, char* path = "",
                           bool verbose = true);
 
   /// Get a list of the files in the archive
-
+  
   ///zip_name is the name of zipfile with fullpath.
   ///list stores information about each entry in zip file.
   static int file_list_info (char* zip_name,
@@ -90,25 +91,25 @@ public:
   ///Check if an entry of a zip file is a file or directory
   ///We assume a directoryname terminates with a forward slash
   ///Returns 1 for directory while 0 for file.
-
+  
   ///filename_inzip is an entry in a zipfile
-  static int checkdir (char* filename_inzip);
+  static int checkdir (char* filename_inzip); 
 
   ///Create directory structure if entry in zipfile is a directory
-
+  
   ///filename_inzip is an entry in a zipfile
   ///arch_dir stores the name of the directory to be created
   static int makethedir (char* filename_inzip, ACE_CString arch_dir);
 
   ///If entry in zipfile is a file, then read the file and write
   /// the uncompressed data at the proper filepath.
-
+  
  ///filename_inzip is an entry in a zipfile
  ///uf refers to the zip archive
  ///file_info is used to get information about current file
  ///verbose decides if the details are to be printed or not
- ///arch_dir is the name of file with full path where it is to be
- ///uncompressed
+ ///arch_dir is the name of file with full path where it is to be 
+ ///uncompressed 
   static int handlethefile (char* filename_inzip, unzFile uf,
                             unz_file_info file_info,
                             bool verbose, ACE_CString arch_dir);
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
index b2499812711..a74f5ee377e 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
@@ -16,7 +16,7 @@
  */
 //=============================================================================
 
-#include "DAnCE/NodeApplicationManager/ImplementationInfo.h"
+#include "NodeApplicationManager/ImplementationInfo.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/streams.h"
 #include "ace/Get_Opt.h"
@@ -24,6 +24,8 @@
 #include "tao/CDR.h"
 #include "Config_Handlers/XML_File_Intf.h"
 
+using namespace CIAO;
+
 static void
 usage (const ACE_TCHAR* program)
 {
@@ -75,11 +77,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ::Deployment::ComponentPlans dummy;
   dummy.length (0);
 
-  CIAO::NodeImplementationInfoHandler handler (plan, dummy);
+  NodeImplementationInfoHandler handler (plan, dummy);
 
-  Deployment::NodeImplementationInfo_var node_impl_info (handler.node_impl_info ());
+  Deployment::NodeImplementationInfo * node_impl_info =
+    handler.node_impl_info ();
 
-  if (node_impl_info.ptr() == 0)
+  if (!node_impl_info)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                   "DAnCE (%P|%t) StaticParser -"
@@ -87,7 +90,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     }
 
-  Deployment::ContainerImplementationInfos& impl_infos = node_impl_info->impl_infos;
+  Deployment::ContainerImplementationInfos& impl_infos = node_impl_info[0].impl_infos;
 
   FILE* fp = ACE_OS::fopen ("plan.h", "w");
 
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
index 1234b0a03bb..6ff77c3e1fa 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
@@ -1,8 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, ciao_server_dnc, ciao_nodeapplicationmanager {
+project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions, ciao_server_dnc {
   exename   = StaticDAnCEParser
+  includes += ..
+  libs     += NodeApplicationManager
+  after    += NodeApplicationManager NodeManager
 
   Source_Files {
     StaticDAnCEParser.cpp
diff --git a/CIAO/DAnCE/TargetManager/CmpClient.cpp b/CIAO/DAnCE/TargetManager/CmpClient.cpp
index 12deaa5ac80..130eba88be1 100644
--- a/CIAO/DAnCE/TargetManager/CmpClient.cpp
+++ b/CIAO/DAnCE/TargetManager/CmpClient.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// CmpClient.cpp,v 1.3 2006/01/25 00:10:27 dengg Exp
 /**
  * @file CmpClient.cpp
  *
@@ -9,8 +9,8 @@
  * TM to getAllResources and getAvailable resources
  */
 
-#include "ciao/Deployment_DataC.h"
-#include "DAnCE/TargetManager/TargetManagerImplC.h"
+#include "Deployment_DataC.h"
+#include "TargetManagerC.h"
 #include "ace/streams.h"
 #include "Config_Handlers/DnC_Dump.h"
 
@@ -105,7 +105,7 @@ int main (int argc, char* argv[])
 
     plan.instance[1] = instance_;
 
-    bool resource_available = true;
+    bool resource_available = 1;
 
     try
     {
@@ -141,11 +141,11 @@ int main (int argc, char* argv[])
     // Make a call to release resources , if resource < 0
     try
     {
-      if (!resource_available)
-        {
-          targetI->releaseResources(plan);
-          ACE_DEBUG ((LM_DEBUG , "\n\nreleaseResources Returned \n"));
-        }
+      if (resource_available == 0)
+      {
+        targetI->releaseResources(plan);
+        ACE_DEBUG ((LM_DEBUG , "\n\nreleaseResources Returned \n"));
+      }
     }
     catch(CORBA::NO_IMPLEMENT &)
     {
@@ -171,7 +171,7 @@ int main (int argc, char* argv[])
     ::CORBA::StringSeq elements;
     elements.length (0);
 
-    bool Add = true;
+    bool Add = 1;
     Add = ACE_OS::atoi (argv[3]);
 
     if (Add)
@@ -212,7 +212,7 @@ int main (int argc, char* argv[])
       Deployment::Domain_var domainV = targetI->getAvailableResources();
 
       // here write things to file ...
-      write_to_file (domainV.in());
+      write_to_file (domainV);
 
       ACE_DEBUG ((LM_DEBUG , "\n\nGetAvailableResources Returned \n"));
       ::Deployment::DnC_Dump::dump (domainV);
diff --git a/CIAO/DAnCE/TargetManager/Deployment_Configuration.cpp b/CIAO/DAnCE/TargetManager/Deployment_Configuration.cpp
new file mode 100644
index 00000000000..6b5325e840c
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/Deployment_Configuration.cpp
@@ -0,0 +1,152 @@
+// $Id$
+
+#include "Deployment_Configuration.h"
+
+#include "ace/OS_NS_stdio.h"
+
+const int NAME_BUFSIZE = 1024;
+
+CIAO::Deployment_Configuration::Deployment_Configuration (CORBA::ORB_ptr o)
+  : orb_ (CORBA::ORB::_duplicate (o))
+{
+}
+
+CIAO::Deployment_Configuration::~Deployment_Configuration (void)
+{
+  this->deployment_info_.unbind_all ();
+}
+
+int
+CIAO::Deployment_Configuration::init (const char *filename)
+{
+  // @@ We should change to use ACE_Configuration here.
+
+  if (filename == 0)
+    {
+      ACE_ERROR ((LM_ERROR, "CIAO (%P|%t) Deployment_Configuration.cpp"
+                            ": Unable to identify the file name \n"));
+      return -1;
+    }
+
+  FILE *inf = ACE_OS::fopen (filename, "r");
+
+  if (inf == NULL)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "DAnCE (%P|%t) Deployment_Configuration.cpp:"
+                         "Fail to open node manager map data file: %s : \n",
+                         filename),
+                         -1);
+    }
+
+  char destination[NAME_BUFSIZE], ior[NAME_BUFSIZE];
+  int first = 1;
+
+  while (fscanf (inf, "%s %s", destination, ior ) != EOF)
+    {
+      // This should not fail!!
+      //
+      if (this->deployment_info_.bind (destination, ior) != 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "DAnCE (%P|%t) Deployment_Configuration.cpp:"
+                             "Failed to bind destination [%s] : \n",
+                             destination),
+                             -1);
+        }
+
+      if (first)
+        {
+          this->default_node_manager_.IOR_ = ior;
+          first = 0;
+        }
+    }
+  return 0;
+}
+
+const char *
+CIAO::Deployment_Configuration::get_node_manager_ior (const char *name)
+{
+  if (name == 0)
+    return get_default_node_manager_ior ();
+
+  ACE_Hash_Map_Entry
+    <ACE_CString,
+    CIAO::Deployment_Configuration::Node_Manager_Info> *entry = 0;
+
+  if (this->deployment_info_.find (ACE_CString (name),
+                                   entry) != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "DAnCE (%P|%t) Deployment_Configuration.cpp:"
+                  "Failed to find IOR for destination [%s] : \n",
+                  name));
+      return 0;
+    }
+
+  return entry->int_id_.IOR_.c_str ();
+}
+
+const char *
+CIAO::Deployment_Configuration::get_default_node_manager_ior (void)
+{
+  if (this->default_node_manager_.IOR_.length () == 0)
+    return 0;
+  return this->default_node_manager_.IOR_.c_str ();
+}
+
+::Deployment::NodeManager_ptr
+CIAO::Deployment_Configuration::get_node_manager (const char *name
+                                                  ACE_ENV_ARG_DECL)
+{
+  if (name == 0)
+    return get_default_node_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  ACE_Hash_Map_Entry
+    <ACE_CString,
+    CIAO::Deployment_Configuration::Node_Manager_Info> *entry = 0;
+
+  if (this->deployment_info_.find (ACE_CString (name),
+                                   entry) != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "DAnCE (%P|%t) Deployment_Configuration.cpp:"
+                  "Failed to find IOR for destination [%s] : \n",
+                  name));
+      return 0;
+    }
+
+  if (CORBA::is_nil (entry->int_id_.node_manager_.in ()))
+    {
+      CORBA::Object_var temp = this->orb_->string_to_object
+        (entry->int_id_.IOR_.c_str ()
+         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      entry->int_id_.node_manager_ =
+        ::Deployment::NodeManager::_narrow (temp.in ()
+                                            ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+    }
+  return ::Deployment::NodeManager::_duplicate
+    (entry->int_id_.node_manager_.in ());
+}
+
+::Deployment::NodeManager_ptr
+CIAO::Deployment_Configuration::get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (CORBA::is_nil (this->default_node_manager_.node_manager_.in ()))
+    {
+      CORBA::Object_var temp = this->orb_->string_to_object
+        (this->default_node_manager_.IOR_.c_str ()
+         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      this->default_node_manager_.node_manager_ =
+        ::Deployment::NodeManager::_narrow (temp.in ()
+                                            ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+    }
+  return ::Deployment::NodeManager::_duplicate
+    (this->default_node_manager_.node_manager_.in ());
+}
diff --git a/CIAO/DAnCE/TargetManager/Deployment_Configuration.h b/CIAO/DAnCE/TargetManager/Deployment_Configuration.h
new file mode 100644
index 00000000000..effca979a4c
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/Deployment_Configuration.h
@@ -0,0 +1,129 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Deployment_Configuration.h
+ *
+ *  $Id$
+ *
+ *  The Deployment_Configuration provides abstraction for the
+ *  deployment mechanisms.
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ *  @author Gan Deng <gan.deng@vanderbilt.edu>
+ */
+//=============================================================================
+#ifndef CIAO_DEPLOYMENT_CONFIGURATION_H
+#define CIAO_DEPLOYMENT_CONFIGURATION_H
+#include /**/ "ace/pre.h"
+
+#include "ace/Hash_Map_Manager_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ciao/NodeManagerC.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
+#include "ace/SString.h"
+
+#include "DomainApplicationManager/DomainApplicationManager_Export.h"
+
+namespace CIAO
+{
+  /**
+   * @class Deployment_Configuration
+   *
+   * @brief A class that provides strategies on deployment topology.
+   *
+   * This class provides strategies on how the DomainApplicationManager
+   * should deploy an deployment plan at domain-level.  This is achieved
+   * by providing mappings from deployment destination names to actually
+   * NodeManager daemon IORs, and the strategy for which default NodeManager
+   * daemons a deployment mechanism should use.
+   *
+   * This is a trivial implementation of the deployment configuration
+   * strategy.  We can enhance this class later on to provide
+   * different deployment location strategies, such as naming service.
+   */
+  class DomainApplicationManager_Export Deployment_Configuration
+  {
+  public:
+    typedef struct _node_manager_info
+    {
+      _node_manager_info (const char *ior = 0)
+      {
+        IOR_ = ior;
+      }
+
+      ACE_CString IOR_;
+      ::Deployment::NodeManager_var node_manager_;
+    } Node_Manager_Info;
+
+    Deployment_Configuration (CORBA::ORB_ptr o);
+
+    /// Destructor
+    virtual ~Deployment_Configuration (void);
+
+    /**
+     * Init method takes the filename to a configuration file which
+     * has a simple line format of name, ior string delimited by a
+     * space in each line.
+     *
+     *     name IOR-string
+     *
+     * @retval 0 on success.
+     * @retval -1 otherwise.
+     */
+    int init (const char *filename);
+
+    /**
+     * @retval 0 if no valid name were found.  When @c name = 0, then
+     * this function behave exactly as get_default_activator_ior.
+     */
+    virtual const char *get_node_manager_ior (const char *name);
+
+    /**
+     * Return the default NodeManager the DomainApplicationManager
+     * should use to deploy a component.  In this implementation, the
+     * first entry in the deployment configuration data file is always
+     * the entry for default activator.
+     *
+     * @retval 0 if no valid daemon is configured.
+     */
+    virtual const char *get_default_node_manager_ior ();
+
+    /**
+     * @retval nil if no valid name were found.
+     */
+    virtual ::Deployment::NodeManager_ptr
+    get_node_manager (const char *name
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    /**
+     * Return the reference to the default NodeManager the
+     * DomainApplicationManager should use to deploy a node-level
+     * deployment plan..
+     *
+     * @retval nil if no valid daemon is configured.
+     */
+    virtual ::Deployment::NodeManager_ptr
+    get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
+  protected:
+    CORBA::ORB_var orb_;
+
+    ACE_Hash_Map_Manager_Ex<ACE_CString,
+                            Node_Manager_Info,
+                            ACE_Hash<ACE_CString>,
+                            ACE_Equal_To<ACE_CString>,
+                            ACE_Null_Mutex> deployment_info_;
+
+    Node_Manager_Info default_node_manager_;
+  };
+
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_DEPLOYMENT_CONFIGURATION_H */
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
index 4d3f01dde1f..708996663d7 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
@@ -33,15 +33,13 @@ CIAO::DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb,
 }
 
 
-CIAO::DomainDataManager*
-CIAO::DomainDataManager::get_data_manager ()
+CIAO::DomainDataManager* CIAO::DomainDataManager::get_data_manager ()
 {
   return global_data_manager_;
 }
 
 
-void
-CIAO::DomainDataManager::delete_data_manger ()
+void CIAO::DomainDataManager::delete_data_manger ()
 {
   if (global_data_manager_)
     delete global_data_manager_;
@@ -167,17 +165,18 @@ int CIAO::DomainDataManager::call_all_node_managers ()
       return 0;
     }
 
-  CORBA::ULong const length = initial_domain_.node.length ();
+  int length = initial_domain_.node.length ();
   if (CIAO::debug_level () > 9)
     {
       ACE_DEBUG ((LM_DEBUG, "Number of nodes in domain.cdd is : %d\n", length));
     }
 
-  for (CORBA::ULong i=0;i < length;i++)
+  for (int i=0;i < length;i++)
     {
 
       ::Deployment::NodeManager_var node_manager;
 
+
       try
         {
           node_manager =
@@ -303,7 +302,7 @@ CORBA::Long CIAO::DomainDataManager::get_pid (ACE_CString cmp)
       for (unsigned int j = 0;j < current_domain_.node[i].resource.length ();j++)
         {
           // The resource
-          if (!ACE_OS::strcmp(
+          if (!strcmp(
                       current_domain_.node[i].resource[j].name,
                       "Component") &&
               ACE_CString (current_domain_.node[i].resource[j].property[0].name) ==
@@ -382,14 +381,12 @@ releaseResources (
     {
       for (unsigned int j = 0;j < provisioned_data_.node.length ();j++)
         {
-          if (!ACE_OS::strcmp (plan.instance[i].node.in () ,
-                               provisioned_data_.node[j].name.in ()))
+          if (!strcmp (plan.instance[i].node.in () ,
+                       provisioned_data_.node[j].name.in ()))
           {
             if (CIAO::debug_level () > 9)
-              {
-                ACE_DEBUG ((LM_DEBUG ,
-                    "TM::commitResource::Host name matched\n"));
-              }
+              ACE_DEBUG ((LM_DEBUG ,
+                  "TM::commitResource::Host name matched\n"));
 
             match_requirement_resource (
                                         plan.instance[i].deployedResource,
@@ -410,11 +407,11 @@ match_requirement_resource (
 {
   // here match the deployed to the available
 
-  for (CORBA::ULong i = 0;i < deployed.length ();i++)
+  for (unsigned int i = 0;i < deployed.length ();i++)
     {
       // for each deployed resource ....search the corresponding
       // available resource
-      for (CORBA::ULong j = 0;j < available.length ();j++)
+      for (unsigned int j = 0;j < available.length ();j++)
         {
           if (!strcmp (deployed[i].requirementName, available[j].name))
             {
@@ -422,7 +419,7 @@ match_requirement_resource (
                 ACE_DEBUG ((LM_DEBUG ,
                     "TM::commitResource::Requirement name matched\n"));
               // search for the resourcename in the resourceType
-              for (CORBA::ULong k = 0;k < available[j].resourceType.length ();k++)
+              for (unsigned int k = 0;k < available[j].resourceType.length ();k++)
                 {
                   if (!strcmp (deployed[i].resourceName,
                                available[j].resourceType[k]))
@@ -457,10 +454,10 @@ match_properties (
       ::Deployment::Properties deployed,
       ::Deployment::SatisfierProperties & available)
 {
-  for (CORBA::ULong i = 0;i < deployed.length ();i++)
+  for (unsigned int i = 0;i < deployed.length ();i++)
     {
-      for (CORBA::ULong j = 0;j < available.length ();j++)
-        if (!ACE_OS::strcmp (deployed[i].name , available[j].name))
+      for (unsigned int j = 0;j < available.length ();j++)
+        if (!strcmp (deployed[i].name , available[j].name))
           {
             // check kind here ....and then subtract ....
             // accordingly , ..this is complex ... better to write
@@ -519,7 +516,6 @@ void CIAO::DomainDataManager::commit_release_resource (
   else
     {
       //must be release
-      // @todo check return value of >>=
       CORBA::Long required_d;
       deployed.value >>= required_d;
       CORBA::Long available_d;
@@ -527,6 +523,7 @@ void CIAO::DomainDataManager::commit_release_resource (
 
       available_d = available_d + required_d;
 
+
       // Should we check for bin > 100 ??????
 
       if (CIAO::debug_level () > 9)
@@ -540,16 +537,18 @@ void CIAO::DomainDataManager::commit_release_resource (
 void CIAO::DomainDataManager::stop_monitors ()
 {
 
-  CORBA::ULong length = initial_domain_.node.length ();
+  int length = initial_domain_.node.length ();
   if (CIAO::debug_level () > 9)
     {
       ACE_DEBUG ((LM_DEBUG, "Number of nodes in domain.cdd is : %d\n", length));
     }
 
-  for (CORBA::ULong i=0;i < length;i++)
+  for (int i=0;i < length;i++)
     {
+
       ::Deployment::NodeManager_var node_manager;
 
+
       try
         {
           node_manager =
@@ -637,7 +636,7 @@ find_in_initial_domain (const char* node_name,
       i < this->initial_domain_.node.length ();
       i++)
   {
-    if (ACE_OS::strcmp (node_name, this->initial_domain_.node[i].name.in ()) == 0)
+    if (strcmp (node_name, this->initial_domain_.node[i].name.in ()) == 0)
     {
       node = this->initial_domain_.node[i];
       return true;
@@ -657,7 +656,7 @@ find_in_provisioned_domain (const char* node_name,
       i < this->provisioned_data_.node.length ();
       i++)
   {
-    if (ACE_OS::strcmp (node_name, this->provisioned_data_.node[i].name.in ()) == 0)
+    if (strcmp (node_name, this->provisioned_data_.node[i].name.in ()) == 0)
     {
       node = this->provisioned_data_.node[i];
       return true;
@@ -684,20 +683,21 @@ int CIAO::DomainDataManager::delete_from_domain (
   // if not found add it to the updated nodes list
 
   ::Deployment::Nodes updated_nodes;
-  bool found = false;
+  bool found = 0;
+
 
   for (CORBA::ULong j = 0;
        j < this->provisioned_data_.node.length ();
        j++)
     {
-      found = false;
+      found = 0;
 
       for (CORBA::ULong i = 0;i < domain.node.length ();i++)
         {
           if (strcmp (domain.node[i].name.in (),
                       this->provisioned_data_.node[j].name.in ()) == 0)
             {
-              found = true;
+              found = 1;
               break; // found the node
             }
         }
@@ -726,7 +726,7 @@ int CIAO::DomainDataManager::intimate_planner (
 {
  // use the connection with the planner and get a reference to the planner
  // make a call top the planner
-  Deployment::Domain d = domain;
+  Deployment::Domain d = domain; 
   return 0;
 
 }
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.h b/CIAO/DAnCE/TargetManager/DomainDataManager.h
index d75e314606d..43f0870c1e5 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -5,7 +5,7 @@
  *
  * @brief Maintains the Domain Information
  *
- * It contains the entire Domain information. Both the
+ * It contains the entire Domain information.Both the
  * initial domain as well as the current available domain.
  *
  * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
@@ -14,8 +14,8 @@
 #ifndef DOMAIN_DATA_MGRH
 #define DOMAIN_DATA_MGRH
 
-#include "TargetManagerImplC.h"
-#include "DAnCE/DomainApplicationManager/Deployment_Configuration.h"
+#include "TargetManagerC.h"
+#include "Deployment_Configuration.h"
 
 /**
  * @namespace CIAO
@@ -38,6 +38,7 @@ namespace CIAO
 
       public :
         /**
+         * @operation updateDomain
          * @brief     This function is called by the other classes to update
          *            current domain data.
          * @param     elements The string sequence of elements
@@ -51,6 +52,7 @@ namespace CIAO
                            ::Deployment::DomainUpdateKind updateKind
                            );
       /**
+       * @operation    getInitialDomain
        * @brief        This function is called the Executor code
        *               to get the Original Domain data.
        * @return       Domain* The Initial Domain
@@ -59,6 +61,7 @@ namespace CIAO
       ::Deployment::Domain* get_initial_domain ();
 
       /**
+       * @operation   getCurrentDomain
        * @brief       This function is called the Executor code
        *              to get the Current Domain data.
        * @return      Domain* The Current Domain
@@ -67,18 +70,20 @@ namespace CIAO
 
 
       /**
-       * This function calls the constructor of the
-       * class Domain Data Manager
-       * @brief This function is called to create the Datamanager
+       * @operation create
+       * @brief     This function is called to create the Datamanager
        * @param orb The orb pointer
        * @param target The Target Manager Object Reference
        *
+       * @description This function calls the constructor of the
+       *              class Domain Data Manager
        */
       static DomainDataManager * create (CORBA::ORB_ptr orb,
                                   ::Deployment::TargetManager_ptr target
                                   );
 
       /**
+       * @operation get_data_manager
        * @brief Returns the static pointer to the
        *        data manager.
        * @return DomainDataManager*
@@ -88,18 +93,23 @@ namespace CIAO
       static DomainDataManager* get_data_manager ();
 
       /**
+       * @operation delete_data_manager
        * @brief deletes the data manager
        */
+
       static void delete_data_manger ();
 
       /**
+       * @operation get_node_managers
        * @brief returns the sequence of node managers
        * object reference
        */
+
       CIAO::Host_NodeManager_seq *
         get_node_managers ();
 
       /**
+       * @operation get_cpu_info
        * @brief returns the node specific cpu utilization
        *
        * @return CIAO::Host_Infos*
@@ -108,6 +118,7 @@ namespace CIAO
        CIAO::Host_Infos* get_cpu_info ();
 
        /**
+        * @operation get_pid
         * @brief returns the pid of the component id submitted
         * @param cmp The component id
         *
@@ -116,6 +127,7 @@ namespace CIAO
        CORBA::Long get_pid (ACE_CString cmp);
 
        /**
+        * @operation commitResources
         * @brief commits the resources that are specified
         * in the plan.
         * @param plan ::Deployment::DeploymentPlan
@@ -130,39 +142,49 @@ namespace CIAO
        const ::Deployment::DeploymentPlan & plan);
 
        /**
+        * @operation releaseResources
         * @brief The function releases the resources held by a plan
-        * @param plan ::Deployment::DeploymentPlan the plan whose
+        *
+        * @param argname ::Deployment::DeploymentPlan the plan whose
         *                resources are to be released
         */
        void releaseResources (
        const ::Deployment::DeploymentPlan& plan);
 
        /**
-        * The node manager in turn stops the monitor
+        * @operation stop_monitors
         * @brief The function makes a call on the leaveDomain on the
         *        NodeManager
+        *
+        * @description The node manager in turn stops the monitor
+        *
         */
+
        void stop_monitors ();
 
     protected:
 
+
       /**
-       * The constructor made protected so that no one can create
-       * it.
+       * @operation   Constructor
        * @param orb The orb pointer
        * @param target The Target Manager Object Reference
+       * @description The constructor made proteccted so that no one can create
+       *              it.
        */
       DomainDataManager (CORBA::ORB_ptr orb,
                          ::Deployment::TargetManager_ptr target
                          );
 
       /**
+       * @operation readinDomainData
        * @brief   It will read the initial Domain data from
        *          XML files.
        */
       int readin_domain_data ();
 
       /**
+       * @operation match_requirement_resource
        * @brief Match the deployed resources to the
        * available resource
        */
@@ -172,20 +194,23 @@ namespace CIAO
          );
 
       /**
+       * @operation match_properties
        * @brief Match the properties of a Requirement to the
        * properties of available resource
        * @param deployed The deployed Properties
        * @param available The available Properties
        */
+
       void match_properties (
                         ::Deployment::Properties deployed,
                         ::Deployment::SatisfierProperties& available);
 
 
-      /// The different actiona that can take place
-      enum  Action {commit , release};
+        /// The different actiona that can take place
+        enum  Action {commit , release};
 
       /**
+       * @operation commit_release_resource
        * @brief Either commits or releases the given resource
        * based on the current Action set.
        * @param deployed ::Deployment::Property is the resource
@@ -196,16 +221,19 @@ namespace CIAO
        *             when the deployed resources exceeds
        *             the available resource.
        */
-      void commit_release_resource (  ::Deployment::Property & deployed,
+
+        void commit_release_resource (  ::Deployment::Property & deployed,
                           ::Deployment::SatisfierProperty & available);
 
       /**
+       * @operation call_all_node_managers
        * @brief This function calls all NM and gives them
        * the sub-domain
        */
       int call_all_node_managers ();
 
       /**
+       * @operation add_to_domain
        * @brief This function add new elements to the
        * already existing domain
        *
@@ -215,6 +243,7 @@ namespace CIAO
       int add_to_domain (const ::Deployment::Domain& domain);
 
       /**
+       *  @operation delete_from_domain
        *  @brief This function deletes elements from the domain
        *
        *  @param domain ::Deployment::Domain contains the new elements
@@ -223,6 +252,7 @@ namespace CIAO
       int delete_from_domain (const ::Deployment::Domain& domain);
 
       /**
+       *  @operation intimate_planner
        *  @brief This function intimates the planner about a domain
        *  change
        *
@@ -232,6 +262,7 @@ namespace CIAO
       int intimate_planner (const ::Deployment::Domain& domain);
 
       /**
+       *  @operation find_in_initial_domain
        *  @brief This function finds a new node in the initial_domain
        *
        *  @param node The name of the node which is to be searched
@@ -240,16 +271,20 @@ namespace CIAO
       bool find_in_initial_domain (const char* node_name,
                               ::Deployment::Node& node);
       /**
+       *  @operation find_in_provisioned_domain
        *  @brief This function finds a new node in the proviosiond_domain
        *
        *  @param node The name of the node which is to be searched
        */
+
       bool find_in_provisioned_domain (const char* node_name,
                                   ::Deployment::Node& node);
 
       /**
+       *  @operation update_node_status
        *  @brief updates the node status by reading it from a file
        */
+
       bool update_node_status ();
 
       /// The ORB pointer
@@ -281,7 +316,7 @@ namespace CIAO
        */
       ::Deployment::Domain provisioned_data_;
 
-      /// The current action
+      ///The current action
       Action current_action_;
     };
 
diff --git a/CIAO/DAnCE/TargetManager/DomainEvents.idl b/CIAO/DAnCE/TargetManager/DomainEvents.idl
index 4fe089a86a6..88fba054dbb 100644
--- a/CIAO/DAnCE/TargetManager/DomainEvents.idl
+++ b/CIAO/DAnCE/TargetManager/DomainEvents.idl
@@ -3,15 +3,12 @@
  * @brief Contains Events in the Domain
  *
  * @author Nilabja R <nilabjar@dre.vanderbilt.edu>
- *
- * $Id$
  */
 
 #ifndef DOMAIN_CHANGE_IDL
 #define DOMAIN_CHANGE_IDL
 
-#include "ciao/Deployment_TargetManager.idl"
-#include "ciao/CCM_Events.idl"
+#include "ciao/Target_Data.idl"
 
 module CIAO
 {
diff --git a/CIAO/DAnCE/TargetManager/TM_Client.mpc b/CIAO/DAnCE/TargetManager/TM_Client.mpc
index 0a203ab1476..e332b49bb27 100644
--- a/CIAO/DAnCE/TargetManager/TM_Client.mpc
+++ b/CIAO/DAnCE/TargetManager/TM_Client.mpc
@@ -2,7 +2,14 @@
 
 // Client.mpc,v 1.6 2005/02/18 09:07:06 jwillemsen Exp
 
-project(TMClient): ciao_client_dnc,ciao_deployment_stub, ciao_config_handlers, ciao_events_dnc, ciao_targetmanager_stub {
+
+project(TMClient): ciao_client_dnc,ciao_deployment_stub, ciao_config_handlers, ciao_events_dnc {
+  after += CIAO_TargetManager_stub
+  includes += $(CIAO_ROOT)/DAnCE $(TAO_ROOT)/orbsvcs
+  includes += $(CIAO_ROOT)/DAnCE/TargetManager
+  libs += TargetManager_stub NodeManager_stub
+
+
   IDL_Files {
   }
 
diff --git a/CIAO/DAnCE/TargetManager/TargetManager.cidl b/CIAO/DAnCE/TargetManager/TargetManager.cidl
index 6e880c069e9..39fda73366e 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager.cidl
+++ b/CIAO/DAnCE/TargetManager/TargetManager.cidl
@@ -9,7 +9,8 @@
 #ifndef TARGETMANAGER_CIDL
 #define TARGETMANAGER_CIDL
 
-#include "TargetManagerImpl.idl"
+
+#include "TargetManager.idl"
 
 /*
  * @composition TargetManager_i
diff --git a/CIAO/DAnCE/TargetManager/TargetManager.idl b/CIAO/DAnCE/TargetManager/TargetManager.idl
new file mode 100644
index 00000000000..2f3ff9c9446
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/TargetManager.idl
@@ -0,0 +1,43 @@
+// $Id$
+
+/**
+ * @file TargetManager.idl
+ * @brief TargetManager interface defintion
+ *
+ * @author Nilabja R <nilabjar@dre.vanderbilt.edu>
+ */
+
+#ifndef TARGETMGR_IDL
+#define TARGETMGR_IDL
+
+
+
+#include "ciao/Components.idl"
+#include "ciao/Target_Data.idl"
+#include "TargetManagerExt.idl"
+
+#include "DomainEvents.idl"
+
+
+/**
+ * @module CIAO
+ *
+ * @brief TargetManagenr interface defintion
+ *
+ */
+module CIAO
+{
+  component TargetManagerImpl
+  {
+    provides ::Deployment::TargetManager targetMgr;
+    provides CIAO::TargetManagerExt target_manager_ext;
+
+    publishes Domain_Changed_Event changes;
+  };
+
+  home TargetManagerHome manages TargetManagerImpl
+  {
+  };
+};
+
+#endif
diff --git a/CIAO/DAnCE/TargetManager/TargetManager.mpc b/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 11d1bd518b9..a6591816a5c 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
-project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub, ciao_nodemanager_stub {
+project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub {
+  after += NodeManager_stub
   sharedname = TargetManager_stub
   idlflags += -Wb,stub_export_macro=TARGETMANAGER_STUB_Export \
               -Wb,stub_export_include=TargetManager_stub_export.h \
@@ -8,25 +9,28 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub, ciao_no
               -Wb,skel_export_include=TargetManager_svnt_export.h
   dynamicflags   = TARGETMANAGER_STUB_BUILD_DLL
 
+  libs +=  NodeManager_stub
+
   IDL_Files {
-    TargetManagerImpl.idl
+    TargetManager.idl
     TargetManagerExt.idl
     DomainEvents.idl
   }
 
   Source_Files {
-    TargetManagerImplC.cpp
+    TargetManagerC.cpp
     TargetManagerExtC.cpp
     DomainEventsC.cpp
   }
 }
 
-project(CIAO_TargetManager_svnt) : ciao_servant_dnc, ciao_targetmanager_stub {
+project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
+  after += CIAO_TargetManager_stub
   sharedname  = TargetManager_svnt
+  libs    += TargetManager_stub NodeManager_stub
 
   idlflags  +=  -Wb,export_macro=TARGETMANAGER_SVNT_Export \
                 -Wb,export_include=TargetManager_svnt_export.h
-
   dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -39,7 +43,7 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc, ciao_targetmanager_stub {
 
   Source_Files {
     TargetManagerEC.cpp
-    TargetManagerImplS.cpp
+    TargetManagerS.cpp
     TargetManagerExtS.cpp
     TargetManager_svnt.cpp
     DomainEventsS.cpp
@@ -47,9 +51,13 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc, ciao_targetmanager_stub {
 }
 
 
-project(CIAO_TargetManager_exec) : ciao_component_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc, ciao_targetmanager_svnt {
+project(CIAO_TargetManager_exec) : ciao_component_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc {
+  after   += CIAO_TargetManager_svnt
   sharedname = TargetManager_exec
+  libs      += TargetManager_stub TargetManager_svnt NodeManager_stub
 
+  idlflags  +=  -Wb,export_macro=TARGETMANAGER_EXEC_Export \
+                -Wb,export_include=TargetManager_exec_export.h
   dynamicflags   = TARGETMANAGER_EXEC_BUILD_DLL
 
   Source_Files {
diff --git a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
index 025d8188e39..3336f3ffe5c 100644
--- a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
+++ b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
@@ -18,6 +18,7 @@
  * @brief The CIAO module
  */
 
+//#include <ciao/Deployment.idl>
 #include "DAnCE/Interfaces/NodeManagerDaemon.idl"
 
 module CIAO
diff --git a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl b/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
deleted file mode 100644
index 705a3146a75..00000000000
--- a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-/**
- * @file TargetManagerImpl.idl
- * @brief TargetManager interface defintion
- *
- * @author Nilabja R <nilabjar@dre.vanderbilt.edu>
- */
-
-#ifndef TARGETMGR_IDL
-#define TARGETMGR_IDL
-
-#include "ciao/Components.idl"
-#include "ciao/Deployment_Target_Data.idl"
-#include "TargetManagerExt.idl"
-#include "DomainEvents.idl"
-
-/**
- * @module CIAO
- *
- * @brief TargetManagenr interface defintion
- *
- */
-module CIAO
-{
-  component TargetManagerImpl
-  {
-    provides ::Deployment::TargetManager targetMgr;
-    provides CIAO::TargetManagerExt target_manager_ext;
-
-    publishes Domain_Changed_Event changes;
-  };
-
-  home TargetManagerHome manages TargetManagerImpl
-  {
-  };
-};
-
-#endif
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
index f947e1944d7..2c22d608ecb 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
@@ -16,6 +16,8 @@
 
 #include "DomainEventsC.h"
 
+using namespace std;
+
 namespace CIDL_TargetManager_i
 {
   //==================================================================
@@ -28,7 +30,7 @@ namespace CIDL_TargetManager_i
                         TargetManagerImpl_Context *context
                        )
     : _exec (exec),
-      orb_ (CORBA::ORB::_duplicate (orb)),
+      orb_ (orb),
       context_ (context)
   {
     // The DomainDataManager created here ...
@@ -60,7 +62,7 @@ namespace CIDL_TargetManager_i
   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return CIAO::DomainDataManager::
+    return  CIAO::DomainDataManager::
       get_data_manager ()->get_initial_domain ();
   }
 
@@ -106,10 +108,9 @@ namespace CIDL_TargetManager_i
   {
     // Your code here.
     if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , ".. Update Domain called ...\n"));
-      }
-
+    {
+      ACE_DEBUG ((LM_DEBUG , ".. Update Domain called ...\n"));
+    }
     CIAO::DomainDataManager::
       get_data_manager ()->update_domain (
                     elements,
@@ -125,10 +126,7 @@ namespace CIDL_TargetManager_i
     if (updateKind == ::Deployment::Delete ||
         updateKind == ::Deployment::Add)
       {
-        if (CIAO::debug_level () > 9)
-          {
-            ACE_DEBUG ((LM_DEBUG , "TM::Creating the changed event\n"));
-          }
+        ACE_DEBUG ((LM_DEBUG , "TM::Creating the changed event\n"));
 
         CIAO::Domain_Changed_Event_var changed_event =
           new OBV_CIAO::Domain_Changed_Event ();
@@ -136,25 +134,13 @@ namespace CIDL_TargetManager_i
         ::Deployment::Domain_var temp_domain =
           new ::Deployment::Domain (domainSubset);
 
-        if (CIAO::debug_level () > 9)
-          {
-            ACE_DEBUG ((LM_DEBUG , "TM::After getting the current domain\n"));
-          }
-
+        ACE_DEBUG ((LM_DEBUG , "TM::After getting the current domain\n"));
         changed_event->changes (temp_domain);
         changed_event->change_kind (updateKind);
 
-        if (CIAO::debug_level () > 9)
-          {
-            ACE_DEBUG ((LM_DEBUG , "TM::Sending the event to the Planner_Manager\n"));
-          }
-
+        ACE_DEBUG ((LM_DEBUG , "TM::Sending the event to the Planner_Manager\n"));
         context_->push_changes (changed_event);
-
-        if (CIAO::debug_level () > 9)
-          {
-            ACE_DEBUG ((LM_DEBUG , "TM::After   Sending the event to the Planner_Manager\n"));
-          }
+        ACE_DEBUG ((LM_DEBUG , "TM::After   Sending the event to the Planner_Manager\n"));
       }
 
   }
@@ -204,9 +190,6 @@ namespace CIDL_TargetManager_i
   {
     // Your code here.
     ACE_DEBUG ((LM_DEBUG, "Get component cpu :: Skeleton Impl"));
-
-    // todo
-
     return 0;
   }
 
@@ -249,15 +232,14 @@ namespace CIDL_TargetManager_i
       ACE_DEBUG ((LM_DEBUG , "Calling TM constructor"));
     }
 
-    if (CORBA::is_nil (this->exec_ext_object_.in ()))
-      {
-        this->exec_object_ = new TargetManager_exec_i(this,
-                      context_->_ciao_the_Container()->the_ORB(),
-                      context_
-                      );
-      }
-
-    return ::Deployment::CCM_TargetManager::_duplicate (this->exec_object_.in ());
+    if (this->exec_object_.in () == 0)
+    {
+      this->exec_object_ = new TargetManager_exec_i(this,
+                    context_->_ciao_the_Container()->the_ORB(),
+                    context_
+                    );
+    }
+    return this->exec_object_.in ();
   }
 
   ::CIAO::CCM_TargetManagerExt_ptr TargetManagerImpl_exec_i
@@ -265,12 +247,11 @@ namespace CIDL_TargetManager_i
                             ACE_ENV_SINGLE_ARG_DECL_NOT_USED
                             ) ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    if (CORBA::is_nil (this->exec_ext_object_.in ()))
-      {
-        this->exec_ext_object_ = new TargetManagerExt_exec_i();
-      }
-
-    return ::CIAO::CCM_TargetManagerExt::_duplicate (this->exec_ext_object_.in ());
+    if (this->exec_ext_object_.in () == 0)
+    {
+      this->exec_ext_object_ = new TargetManagerExt_exec_i();
+    }
+    return this->exec_ext_object_.in ();
   }
 
   // Operations from Components::SessionComponent
@@ -328,7 +309,7 @@ namespace CIDL_TargetManager_i
     {
       ACE_DEBUG ((LM_DEBUG , "Inside CCM_ACTIVATE\n"));
     }
-    this->get_targetMgr ();
+    get_targetMgr ();
   }
 
   void
@@ -388,7 +369,7 @@ namespace CIDL_TargetManager_i
   ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
+    ::Components::EnterpriseComponent::_nil ();
 
     ACE_NEW_THROW_EX (
     retval,
@@ -403,7 +384,7 @@ namespace CIDL_TargetManager_i
   create_CIAO_TargetManagerHome_Impl (void)
   {
     ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
+    ::Components::HomeExecutorBase::_nil ();
 
     ACE_NEW_RETURN (
     retval,
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
index 7c23c047992..1b3b7b0e470 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_exec.h
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
@@ -190,7 +190,7 @@ namespace CIDL_TargetManager_i
     TargetManagerImpl_exec_i * _exec;
 
     ///The pointer to the Domain Manager
-    auto_ptr<CIAO::DomainDataManager> dataManager_;
+    std::auto_ptr<CIAO::DomainDataManager> dataManager_;
 
     /// The CORBA ORB ...
     CORBA::ORB_var orb_;
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index a6038303961..e8032ba7f57 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
@@ -3,7 +3,7 @@
 // This test tries to install a set of components in 2 different containers, which
 // is hosted in the same NodeApplication.
 
-#include "Deployment_NodeApplicationC.h"
+#include "Deployment_CoreC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
@@ -239,7 +239,7 @@ main (int argc, char *argv[])
               ACE_DEBUG ((LM_DEBUG,
                           "Return values did not match: on Component: %d \n",
                           i));
-              ACE_OS::exit (1);
+              exit (1);
             }
         }
 
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
index 11a53732939..33f74f55976 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Deployment_NodeApplicationC.h"
+#include "Deployment_CoreC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
       else
       {
         ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n"));
-        ACE_OS::exit (1);
+        exit (1);
       }
 
       // Install another set of components
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
index 31e8ee8eb6d..d984de8860b 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ciao/Deployment_NodeApplicationC.h"
+#include "ciao/Deployment_CoreC.h"
 #include "ciao/Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
@@ -159,7 +159,7 @@ main (int argc, char *argv[])
           else
             {
               ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n"));
-              ACE_OS::exit (1);
+              exit (1);
             }
         }
 
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
index 7c6f2bd8792..8b6d23887fb 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Deployment_NodeApplicationC.h"
+#include "Deployment_CoreC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
@@ -128,7 +128,7 @@ main (int argc, char *argv[])
       else
       {
         ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n"));
-        ACE_OS::exit (1);
+        exit (1);
       }
 
       ACE_DEBUG ((LM_DEBUG, "Try removing test component and its home\n"));
diff --git a/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl b/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
index 59d86f5c9f1..d5521d0554f 100755
--- a/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
+++ b/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "$ENV{ACE_ROOT}/bin";
+use lib "../../../../../../bin";
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/CIAO/MPC/config/ciao_client_dnc.mpb b/CIAO/MPC/config/ciao_client_dnc.mpb
deleted file mode 100644
index 8e12607cf37..00000000000
--- a/CIAO/MPC/config/ciao_client_dnc.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ifr_client, valuetype, pi, codecfactory {
-  after    += CIAO_DnC_Client
-  includes   += $(CIAO_ROOT) $(CIAO_ROOT)/ciao
-  idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao
-  libs     += CIAO_DnC_Client
-}
diff --git a/CIAO/MPC/config/ciao_config_handlers_base.mpb b/CIAO/MPC/config/ciao_config_handlers_base.mpb
deleted file mode 100644
index 4b5e001febb..00000000000
--- a/CIAO/MPC/config/ciao_config_handlers_base.mpb
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-project : ciao_xml_utils, dynamicany, typecodefactory, exceptions, ciao_events_dnc {
-  after += XSC_XML_Handlers
-  libs  += XSC_XML_Handlers
-  macros   += XML_USE_PTHREADS
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
-
-  verbatim(gnuace, macros) {
-   override no_hidden_visibility = 1
-  }
-
-}
diff --git a/CIAO/MPC/config/ciao_container_dnc.mpb b/CIAO/MPC/config/ciao_container_dnc.mpb
deleted file mode 100644
index 43365e736e3..00000000000
--- a/CIAO/MPC/config/ciao_container_dnc.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : portableserver, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro {
-  after    += CIAO_DnC_Container
-  libs     += CIAO_DnC_Container
-}
diff --git a/CIAO/MPC/config/ciao_deployment_svnt.mpb b/CIAO/MPC/config/ciao_deployment_svnt.mpb
deleted file mode 100644
index 644feb7f2b6..00000000000
--- a/CIAO/MPC/config/ciao_deployment_svnt.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_deployment_stub, portableserver, ciao_events_dnc {
-  after += Deployment_svnt
-  libs  += CIAO_Deployment_svnt
-  idlflags += -I$(CIAO_ROOT)/DAnCE
-}
diff --git a/CIAO/MPC/config/ciao_events_dnc.mpb b/CIAO/MPC/config/ciao_events_dnc.mpb
deleted file mode 100644
index 50ec7aad402..00000000000
--- a/CIAO/MPC/config/ciao_events_dnc.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ifr_client, valuetype, pi, codecfactory, ciao_container_dnc, ciao_client_dnc, ciao_rtevent_dnc, naming {
-  includes   += $(CIAO_ROOT)/ciaosvcs/Events
-  idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events
-  libs     += CIAO_DnC_Events
-  after    += CIAO_DnC_Events
-}
diff --git a/CIAO/MPC/config/ciao_nodeapplication.mpb b/CIAO/MPC/config/ciao_nodeapplication.mpb
deleted file mode 100644
index 7c47eb723c6..00000000000
--- a/CIAO/MPC/config/ciao_nodeapplication.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_deployment_stub, ciao_noop_configurator {
-  libs  += CIAO_NodeApplication
-  after += NodeApplicationLib
-}
diff --git a/CIAO/MPC/config/ciao_nodeapplicationmanager.mpb b/CIAO/MPC/config/ciao_nodeapplicationmanager.mpb
deleted file mode 100644
index e7d313f0617..00000000000
--- a/CIAO/MPC/config/ciao_nodeapplicationmanager.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_targetmanager_stub, ciao_nodeapplication {
-  includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager
-  libs  += NodeApplicationManager
-  after += NodeApplicationManager
-}
diff --git a/CIAO/MPC/config/ciao_nodemanager_stub.mpb b/CIAO/MPC/config/ciao_nodemanager_stub.mpb
deleted file mode 100644
index f69e5881091..00000000000
--- a/CIAO/MPC/config/ciao_nodemanager_stub.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_deployment_stub {
-  includes += $(CIAO_ROOT)/DAnCE/Interfaces
-  includes += $(CIAO_ROOT)/DAnCE/NodeManager
-  libs     += NodeManager_stub
-  after    += NodeManager_stub
-}
diff --git a/CIAO/MPC/config/ciao_nodemanager_svnt.mpb b/CIAO/MPC/config/ciao_nodemanager_svnt.mpb
deleted file mode 100644
index b3740720386..00000000000
--- a/CIAO/MPC/config/ciao_nodemanager_svnt.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_nodemanager_stub {
-  libs  += NodeManager CIAO_NoOp_Configurator
-  after += NodeManager_svnt
-}
diff --git a/CIAO/MPC/config/ciao_noop_configurator.mpb b/CIAO/MPC/config/ciao_noop_configurator.mpb
deleted file mode 100644
index 67b3508ee38..00000000000
--- a/CIAO/MPC/config/ciao_noop_configurator.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_deployment_stub {
-  libs  += CIAO_NoOp_Configurator
-  after += NoOp_Configurator
-}
diff --git a/CIAO/MPC/config/ciao_race_default.mpb b/CIAO/MPC/config/ciao_race_default.mpb
deleted file mode 100644
index 93b11d6f426..00000000000
--- a/CIAO/MPC/config/ciao_race_default.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciaocidldefaults {
-  includes += $(CIAO_ROOT)/RACE
-  idlflags += -I$(CIAO_ROOT)/RACE
-}
diff --git a/CIAO/MPC/config/ciao_race_monitor.mpb b/CIAO/MPC/config/ciao_race_monitor.mpb
deleted file mode 100644
index d59196c131d..00000000000
--- a/CIAO/MPC/config/ciao_race_monitor.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_race_default {
-  after += Local_Monitor
-  libs += Local_Monitor
-}
diff --git a/CIAO/MPC/config/ciao_rtevent_dnc.mpb b/CIAO/MPC/config/ciao_rtevent_dnc.mpb
deleted file mode 100644
index 78fa520bb5d..00000000000
--- a/CIAO/MPC/config/ciao_rtevent_dnc.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : rtevent_serv, ciao_events_base_dnc, naming {
-  includes   += $(CIAO_ROOT)/ciaosvcs/Events
-  idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events
-  libs     += CIAO_RTEvent
-  after    += CIAO_RTEvent
-}
diff --git a/CIAO/MPC/config/ciao_server_dnc.mpb b/CIAO/MPC/config/ciao_server_dnc.mpb
deleted file mode 100644
index c35042c2c4a..00000000000
--- a/CIAO/MPC/config/ciao_server_dnc.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += CIAO_DnC_Server
-  libs  += CIAO_DnC_Server
-}
diff --git a/CIAO/MPC/config/ciao_targetmanager_stub.mpb b/CIAO/MPC/config/ciao_targetmanager_stub.mpb
deleted file mode 100644
index 59d2a646212..00000000000
--- a/CIAO/MPC/config/ciao_targetmanager_stub.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_nodemanager_stub {
-  includes += $(CIAO_ROOT)/DAnCE/TargetManager
-  libs     += TargetManager_stub
-  after    += CIAO_TargetManager_stub
-}
diff --git a/CIAO/MPC/config/ciao_targetmanager_svnt.mpb b/CIAO/MPC/config/ciao_targetmanager_svnt.mpb
deleted file mode 100644
index 6b6ea42cd7e..00000000000
--- a/CIAO/MPC/config/ciao_targetmanager_svnt.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ciao_targetmanager_stub {
-  libs     += TargetManager_svnt
-  after    += CIAO_TargetManager_svnt
-}
diff --git a/CIAO/NEWS b/CIAO/NEWS
index d2e228eecad..d6e5deacf7e 100644
--- a/CIAO/NEWS
+++ b/CIAO/NEWS
@@ -26,7 +26,7 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 . Enhance DAnCE to support OpenCCM components.
 
 . Update DAnCE IDL data structures and interfaces to comply with the
-  06-04-01 version of the DnC specification, and perform
+  06-02-01 version of the DnC specification, and perform
   interoperability testing with other DnC implementations.  Note this
   work may change the functionality and semantics of some proprietary
   DAnCE extensions, notably ReDaC, Shared Compoents, and RTEC
@@ -46,6 +46,8 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 
 . Implement support for more complex type initialization with XML.
 
+. (Remedy) support for using CIAO with VxWorks as target
+
 . Decouple dependencies to NodeApplication from other DAnCE tools.
   These dependencies were added to support static configurator.  We
   need to have these tools in both conventional version and static
@@ -61,13 +63,8 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 . Implement a planner to query the TargetManager and RepositoryManager
   and generate deployment plans on the fly.
 
-USER VISIBLE CHANGES BETWEEN CIAO-0.5.4 and CIAO-0.5.5
-======================================================
-
-. All IDL has been refactored to get a smaller footprint
-
-USER VISIBLE CHANGES BETWEEN CIAO-0.5.3 and CIAO-0.5.4
-======================================================
+PLANNED MAJOR CHANGES FOR THE NEXT RELEASE
+==========================================
 
 . Adding support to manage multiple interconnected assemblies, which will
   involve the work through ExternalReferenceEndPoint idea.
@@ -75,30 +72,10 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.5.3 and CIAO-0.5.4
 . Seamless integration of swapping into the main line programming model,
   so that DAnCE can actually kickstart swapping.
 
-. Integrated real-time event service into CIAO and DAnCE.
-
-. Improved syntax error checking and reporting in the CIDL compiler.
-
-. Add Null Component to be able to measure footprint in detail
-
-. Added the naming service & the implementation of createPackage function
-  to RepoMan.
-
-. Added the code to save the state of the RepoMan at exit and load the
-  state of it at start.
-
-. Reimplemented the findNamesByType () and getAllTypes () operations of
-  RepoMan, which use the newly generated    ACE_Hash_MultiMap_Manager class
-  and its corresponding classes.
-
-. Added Plan_Generator project. This project is used to retrieve information
-  from Repoman and generate/modify DeploymentPlans based on different demands.
-
-. A succesfull static deployment of the Hello example has been tested on
-  VxWorks 6.3
+. Integrate various Pub/Sub services into CIAO and DAnCE.
 
 USER VISIBLE CHANGES BETWEEN CIAO-0.5.2 and CIAO-0.5.3
-======================================================
+====================================================
 
 . Improve documentation for CoSMiC Quoter tutorial to reflect the latest update
 
@@ -128,7 +105,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.5.2 and CIAO-0.5.3
   mechanisms.
 
 USER VISIBLE CHANGES BETWEEN CIAO-0.5.1 and CIAO-0.5.2
-======================================================
+====================================================
 
 . Changed CIDL compiler code generation for facet servant classes
   to enable reuse if the same interface is used as a facet more
@@ -179,7 +156,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.5.1 and CIAO-0.5.2
   library for stub projects.
 
 USER VISIBLE CHANGES BETWEEN CIAO-0.5.0 and CIAO-0.5.1
-======================================================
+====================================================
 
 . Added the support of integrating real-time event service into the
   CIAO core framework. Enhanced DAnCE to support declaratively configure
@@ -209,7 +186,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.5.0 and CIAO-0.5.1
   get_all_publishers(), and disconnect_consumer().
 
 USER VISIBLE CHANGES BETWEEN CIAO-0.4.10 and CIAO-0.5.0
-=======================================================
+====================================================
 
 . Changed MPC configuration of Config_Handlers to turn off hidden
   visibility if applicable when compiling Config_Handlers or projects
@@ -226,7 +203,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.4.10 and CIAO-0.5.0
   when removing it from the container.
 
 USER VISIBLE CHANGES BETWEEN CIAO-0.4.9 and CIAO-0.4.10
-=======================================================
+======================================================
 
 . Enhanced DAnCE ReDaC service to enforce the correct
   assembly redeployment and reconfiguration order.
diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM
index b58184e5d75..d60869eec09 100644
--- a/CIAO/PROBLEM-REPORT-FORM
+++ b/CIAO/PROBLEM-REPORT-FORM
@@ -43,9 +43,9 @@
 To: ciao-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 0.5.4
-    TAO VERSION : 1.5.4
-    ACE VERSION : 5.5.4
+    CIAO VERSION: 0.5.3
+    TAO VERSION : 1.5.3
+    ACE VERSION : 5.5.3
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
@@ -60,7 +60,7 @@ Subject: [area]: [synopsis]
     THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you
     use a link to a platform-specific file, simply state which one
     (unless this isn't used in this case, e.g., with Microsoft Visual
-    C++)]:
+    C++)]: 
 
     CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
     (used by MPC when you generate your own makefiles):
diff --git a/CIAO/RACE/Controller/Component/Controller.idl b/CIAO/RACE/Controller/Component/Controller.idl
index 3d2959995df..960f3ef3640 100644
--- a/CIAO/RACE/Controller/Component/Controller.idl
+++ b/CIAO/RACE/Controller/Component/Controller.idl
@@ -14,8 +14,8 @@
  */
 
 #include <Components.idl>
-#include "ciao/Deployment_Target_Data.idl"
-#include "DAnCE/TargetManager/TargetManagerExt.idl"
+#include "ciao/Target_Data.idl"
+#include "../../../DAnCE/TargetManager/TargetManagerExt.idl"
 
 /**
  * @module CIAO
diff --git a/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc b/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
index 8ef8d7bf6d8..6258cad826b 100644
--- a/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
+++ b/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
@@ -1,11 +1,12 @@
-// $Id$
+// $Id$ 
 // This file is generated with "generate_component_mpc.pl -n Input_Adapter"
 
 project(Input_Adapter_stub): ciao_deployment_stub {
 
   after += Plan_Analyzer_Interface_stub
   sharedname = Input_Adapter_stub
-  idlflags += -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \
               -Wb,stub_export_include=Input_Adapter_stub_export.h \
               -Wb,skel_export_macro=INPUT_ADAPTER_SVNT_Export \
               -Wb,skel_export_include=Input_Adapter_svnt_export.h
@@ -35,7 +36,8 @@ project(Input_Adapter_svnt) : ciao_servant_dnc {
   sharedname  = Input_Adapter_svnt
   libs    += Input_Adapter_stub Plan_Analyzer_Interface_stub
 
-  idlflags += -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \
               -Wb,stub_export_include=Input_Adapter_stub_export.h \
               -Wb,skel_export_macro=INPUT_ADAPTER_SVNT_Export \
               -Wb,skel_export_include=Input_Adapter_svnt_export.h
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
index 2df82ac4a2f..5870d40d6b4 100644
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
+++ b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
@@ -4,7 +4,8 @@
 project(Interactive_Input_Adapter_stub): ciao_deployment_stub {
   after += Input_Adapter_stub
   sharedname = Interactive_Input_Adapter_stub
-  idlflags += -Wb,stub_export_macro=INTERACTIVE_INPUT_ADAPTER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=INTERACTIVE_INPUT_ADAPTER_STUB_Export \
               -Wb,stub_export_include=Interactive_Input_Adapter_stub_export.h \
               -Wb,skel_export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \
               -Wb,skel_export_include=Interactive_Input_Adapter_svnt_export.h
@@ -38,7 +39,8 @@ project(Interactive_Input_Adapter_svnt) : ciao_servant_dnc {
              Input_Adapter_svnt \
              Plan_Analyzer_Interface_stub
 
-  idlflags  +=  -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \
+  idlflags  +=  -Sc \
+                -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \
                 -Wb,export_include=Interactive_Input_Adapter_svnt_export.h
 
   dynamicflags = INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL
@@ -80,13 +82,14 @@ project(Interactive_Input_Adapter_exec) : ciao_component_dnc, ciao_config_handle
              Input_Adapter_svnt \
              Plan_Analyzer_Interface_stub \
              XSC_Config_Handlers
-
-  idlflags  +=  -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_EXEC_Export \
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_EXEC_Export \
                 -Wb,export_include=Interactive_Input_Adapter_exec_export.h
   dynamicflags   = INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL
 
   IDL_Files {
-
+    
   }
 
   Source_Files {
diff --git a/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc b/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc
index 32368cb1845..66292e4f984 100644
--- a/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc
+++ b/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc
@@ -6,7 +6,8 @@ project(Output_Adapter_stub): ciao_deployment_stub {
 
   after += Output_Adapter_Interface_stub
   sharedname = Output_Adapter_stub
-  idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \
               -Wb,stub_export_include=Output_Adapter_stub_export.h \
               -Wb,skel_export_macro=OUTPUT_ADAPTER_SVNT_Export \
               -Wb,skel_export_include=Output_Adapter_svnt_export.h
@@ -36,7 +37,8 @@ project(Output_Adapter_svnt) : ciao_servant_dnc {
   sharedname  = Output_Adapter_svnt
   libs  +=  Output_Adapter_stub Output_Adapter_Interface_svnt Output_Adapter_Interface_stub
 
-  idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \
               -Wb,stub_export_include=Output_Adapter_stub_export.h \
               -Wb,skel_export_macro=OUTPUT_ADAPTER_SVNT_Export \
               -Wb,skel_export_include=Output_Adapter_svnt_export.h
diff --git a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc b/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
index 26d14b54196..b69b929200d 100644
--- a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
+++ b/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
@@ -5,7 +5,8 @@
 project(Output_Adapter_Interface_stub): ciao_deployment_stub {
 
   sharedname = Output_Adapter_Interface_stub
-  idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Output_Adapter_Interface_stub_export.h \
               -Wb,skel_export_macro=OUTPUT_ADAPTER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Output_Adapter_Interface_svnt_export.h
@@ -34,7 +35,8 @@ project(Output_Adapter_Interface_svnt) : ciao_servant_dnc {
   sharedname  = Output_Adapter_Interface_svnt
   libs    += Output_Adapter_Interface_stub
 
-  idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Output_Adapter_Interface_stub_export.h \
               -Wb,skel_export_macro=OUTPUT_ADAPTER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Output_Adapter_Interface_svnt_export.h
diff --git a/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl b/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
index 911c9966f06..cd42287f4d2 100644
--- a/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
+++ b/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
@@ -4,12 +4,12 @@
 
 #ifndef INCLUDED_DEPLOYMENT_DATA
 #define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_DeploymentPlan.idl"
+#include "Deployment_Data.idl"
 #endif
 
 module CIAO
 {
-
+  
   module RACE
   {
     interface PlanEgress
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
index ccf3d9dae17..3ea12c0608e 100644
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
+++ b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
@@ -7,7 +7,8 @@ project(Plan_Analyzer_stub): ciao_deployment_stub {
            RACE_common_stub \
            Planner_Manager_Interface_stub
   sharedname = Plan_Analyzer_stub
-  idlflags += -Wb,stub_export_macro=PLAN_ANALYZER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLAN_ANALYZER_STUB_Export \
               -Wb,stub_export_include=Plan_Analyzer_stub_export.h \
               -Wb,skel_export_macro=PLAN_ANALYZER_SVNT_Export \
               -Wb,skel_export_include=Plan_Analyzer_svnt_export.h
@@ -43,7 +44,8 @@ project(Plan_Analyzer_svnt) : ciao_servant_dnc {
              Plan_Analyzer_Interface_svnt \
              Planner_Manager_Interface_stub
 
-  idlflags  +=  -Wb,export_macro=PLAN_ANALYZER_SVNT_Export \
+  idlflags  +=  -Sc \
+                -Wb,export_macro=PLAN_ANALYZER_SVNT_Export \
                 -Wb,export_include=Plan_Analyzer_svnt_export.h
 
   dynamicflags = PLAN_ANALYZER_SVNT_BUILD_DLL
@@ -86,12 +88,13 @@ project(Plan_Analyzer_exec) : ciao_component_dnc {
              Plan_Analyzer_Interface_svnt \
              Planner_Manager_Interface_stub
 
-  idlflags  +=  -Wb,export_macro=PLAN_ANALYZER_EXEC_Export \
+  idlflags  +=  -Sc \
+                -Wb,export_macro=PLAN_ANALYZER_EXEC_Export \
                 -Wb,export_include=Plan_Analyzer_exec_export.h
   dynamicflags   = PLAN_ANALYZER_EXEC_BUILD_DLL
 
   IDL_Files {
-
+    
   }
 
   Source_Files {
diff --git a/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl b/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
index 1074b4f4da3..1127e42c167 100644
--- a/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
+++ b/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
@@ -4,7 +4,7 @@
 
 #ifndef INCLUDED_DEPLOYMENT_DATA
 #define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_DeploymentPlan.idl"
+#include "Deployment_Data.idl"
 #endif
 
 module CIAO
diff --git a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc b/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
index 0b7e6b2bfc9..b6caee3d39b 100644
--- a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
+++ b/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
@@ -5,7 +5,8 @@
 project(Plan_Analyzer_Interface_stub): ciao_deployment_stub {
 
   sharedname = Plan_Analyzer_Interface_stub
-  idlflags += -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Plan_Analyzer_Interface_stub_export.h \
               -Wb,skel_export_macro=PLAN_ANALYZER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Plan_Analyzer_Interface_svnt_export.h
@@ -34,7 +35,8 @@ project(Plan_Analyzer_Interface_svnt) : ciao_servant_dnc {
   sharedname  = Plan_Analyzer_Interface_svnt
   libs    += Plan_Analyzer_Interface_stub
 
-  idlflags += -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Plan_Analyzer_Interface_stub_export.h \
               -Wb,skel_export_macro=PLAN_ANALYZER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Plan_Analyzer_Interface_svnt_export.h
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc b/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
index 25f925c196a..673c8647431 100644
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
+++ b/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
@@ -7,7 +7,8 @@ project(Planner_Manager_stub): ciao_deployment_stub {
            Planner_Interface_stub \
            Output_Adapter_Interface_stub
   sharedname = Planner_Manager_stub
-  idlflags += -Wb,stub_export_macro=PLANNER_MANAGER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_MANAGER_STUB_Export \
               -Wb,stub_export_include=Planner_Manager_stub_export.h \
               -Wb,skel_export_macro=PLANNER_MANAGER_SVNT_Export \
               -Wb,skel_export_include=Planner_Manager_svnt_export.h
@@ -44,7 +45,8 @@ project(Planner_Manager_svnt) : ciao_servant_dnc {
              Planner_Manager_Interface_svnt \
              Planner_Interface_stub \
              Output_Adapter_Interface_stub
-  idlflags  +=  -Wb,export_macro=PLANNER_MANAGER_SVNT_Export \
+  idlflags  +=  -Sc \
+                -Wb,export_macro=PLANNER_MANAGER_SVNT_Export \
                 -Wb,export_include=Planner_Manager_svnt_export.h
 
   dynamicflags = PLANNER_MANAGER_SVNT_BUILD_DLL
@@ -88,13 +90,14 @@ project(Planner_Manager_exec) : ciao_component_dnc {
              Planner_Interface_stub \
              Planner_stub \
              Output_Adapter_Interface_stub
-
-  idlflags  +=  -Wb,export_macro=PLANNER_MANAGER_EXEC_Export \
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=PLANNER_MANAGER_EXEC_Export \
                 -Wb,export_include=Planner_Manager_exec_export.h
   dynamicflags   = PLANNER_MANAGER_EXEC_BUILD_DLL
 
   IDL_Files {
-
+    
   }
 
   Source_Files {
diff --git a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
index 7ad88444a52..560a2ad92b1 100644
--- a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
+++ b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
@@ -4,7 +4,7 @@
 
 #ifndef INCLUDED_DEPLOYMENT_DATA
 #define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_DeploymentPlan.idl"
+#include "Deployment_Data.idl"
 #endif
 
 #include "../../common/RACE_common.idl"
diff --git a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
index fb145b6fc6d..5cdc9bb8de3 100644
--- a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
+++ b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
@@ -6,7 +6,8 @@ project(Planner_Manager_Interface_stub): ciao_deployment_stub, anytypecode {
 
   sharedname = Planner_Manager_Interface_stub
   after += RACE_common_stub
-  idlflags += -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Planner_Manager_Interface_stub_export.h \
               -Wb,skel_export_macro=PLANNER_MANAGER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Planner_Manager_Interface_svnt_export.h
@@ -36,7 +37,8 @@ project(Planner_Manager_Interface_svnt) : ciao_servant_dnc {
   sharedname  = Planner_Manager_Interface_svnt
   libs    += Planner_Manager_Interface_stub RACE_common_stub
 
-  idlflags += -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Planner_Manager_Interface_stub_export.h \
               -Wb,skel_export_macro=PLANNER_MANAGER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Planner_Manager_Interface_svnt_export.h
diff --git a/CIAO/RACE/Planners/Base/Planner.mpc b/CIAO/RACE/Planners/Base/Planner.mpc
index 698cb689cb5..1f4dd54be45 100644
--- a/CIAO/RACE/Planners/Base/Planner.mpc
+++ b/CIAO/RACE/Planners/Base/Planner.mpc
@@ -6,7 +6,8 @@ project(Planner_stub): ciao_deployment_stub {
 
   after += Planner_Interface_stub RACE_common_stub
   sharedname = Planner_stub
-  idlflags += -Wb,stub_export_macro=PLANNER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_STUB_Export \
               -Wb,stub_export_include=Planner_stub_export.h \
               -Wb,skel_export_macro=PLANNER_SVNT_Export \
               -Wb,skel_export_include=Planner_svnt_export.h
@@ -36,7 +37,8 @@ project(Planner_svnt) : ciao_servant_dnc {
   sharedname  = Planner_svnt
   libs    += Planner_Interface_stub Planner_Interface_svnt Planner_stub RACE_common_stub
 
-  idlflags += -Wb,stub_export_macro=PLANNER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_STUB_Export \
               -Wb,stub_export_include=Planner_stub_export.h \
               -Wb,skel_export_macro=PLANNER_SVNT_Export \
               -Wb,skel_export_include=Planner_svnt_export.h
diff --git a/CIAO/RACE/Planners/Interface/Planner_I.idl b/CIAO/RACE/Planners/Interface/Planner_I.idl
index 954a61f5269..b947c132540 100644
--- a/CIAO/RACE/Planners/Interface/Planner_I.idl
+++ b/CIAO/RACE/Planners/Interface/Planner_I.idl
@@ -4,12 +4,12 @@
 
 #ifndef INCLUDED_DEPLOYMENT_DATA
 #define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_DeploymentPlan.idl"
+#include "Deployment_Data.idl"
 #endif
 
 module CIAO
 {
-
+  
   module RACE
   {
     interface Planner_I
diff --git a/CIAO/RACE/Planners/Interface/Planner_Interface.mpc b/CIAO/RACE/Planners/Interface/Planner_Interface.mpc
index 3549de0fa64..e9c9ae995bb 100644
--- a/CIAO/RACE/Planners/Interface/Planner_Interface.mpc
+++ b/CIAO/RACE/Planners/Interface/Planner_Interface.mpc
@@ -5,7 +5,8 @@
 project(Planner_Interface_stub): ciao_deployment_stub {
 
   sharedname = Planner_Interface_stub
-  idlflags += -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Planner_Interface_stub_export.h \
               -Wb,skel_export_macro=PLANNER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Planner_Interface_svnt_export.h
@@ -34,7 +35,8 @@ project(Planner_Interface_svnt) : ciao_servant_dnc {
   sharedname  = Planner_Interface_svnt
   libs    += Planner_Interface_stub
 
-  idlflags += -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Planner_Interface_stub_export.h \
               -Wb,skel_export_macro=PLANNER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Planner_Interface_svnt_export.h
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
index 149f735b073..76bcf38962f 100644
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
+++ b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
@@ -6,7 +6,8 @@ project(SimpleBinPacker_stub): ciao_deployment_stub {
   avoids += ace_for_tao
   after += Planner_Interface_stub Planner_stub
   sharedname = SimpleBinPacker_stub
-  idlflags += -Wb,stub_export_macro=SIMPLEBINPACKER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=SIMPLEBINPACKER_STUB_Export \
               -Wb,stub_export_include=SimpleBinPacker_stub_export.h \
               -Wb,skel_export_macro=SIMPLEBINPACKER_SVNT_Export \
               -Wb,skel_export_include=SimpleBinPacker_svnt_export.h
@@ -41,7 +42,8 @@ project(SimpleBinPacker_svnt) : ciao_servant_dnc {
              Planner_stub \
              Planner_svnt \
              RACE_common_stub
-  idlflags  +=  -Wb,export_macro=SIMPLEBINPACKER_SVNT_Export \
+  idlflags  +=  -Sc \
+                -Wb,export_macro=SIMPLEBINPACKER_SVNT_Export \
                 -Wb,export_include=SimpleBinPacker_svnt_export.h
 
   dynamicflags = SIMPLEBINPACKER_SVNT_BUILD_DLL
@@ -83,15 +85,16 @@ project(SimpleBinPacker_exec) : ciao_component_dnc {
                Planner_Interface_stub \
                Planner_Interface_svnt \
                Planner_stub \
-               Planner_svnt \
+               Planner_svnt \ 
                RACE_common_stub
-
-  idlflags  +=  -Wb,export_macro=SIMPLEBINPACKER_EXEC_Export \
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=SIMPLEBINPACKER_EXEC_Export \
                 -Wb,export_include=SimpleBinPacker_exec_export.h
   dynamicflags   = SIMPLEBINPACKER_EXEC_BUILD_DLL
 
   IDL_Files {
-
+    
   }
 
   Source_Files {
diff --git a/CIAO/RACE/common/RACE_common.mpc b/CIAO/RACE/common/RACE_common.mpc
index 38253d218d7..ccfc9264efb 100644
--- a/CIAO/RACE/common/RACE_common.mpc
+++ b/CIAO/RACE/common/RACE_common.mpc
@@ -34,7 +34,8 @@ project(RACE_common_stub): taolib_with_idl, anytypecode {
 //   sharedname  = RACE_common_svnt
 //   libs    += RACE_common_stub
 
-//   idlflags += -Wb,stub_export_macro=RACE_COMMON_STUB_Export \
+//   idlflags += -Sc \
+//               -Wb,stub_export_macro=RACE_COMMON_STUB_Export \
 //               -Wb,stub_export_include=RACE_common_stub_export.h \
 //               -Wb,skel_export_macro=RACE_COMMON_SVNT_Export \
 //               -Wb,skel_export_include=RACE_common_svnt_export.h
diff --git a/CIAO/VERSION b/CIAO/VERSION
index 96c4ca50560..0948a922e51 100644
--- a/CIAO/VERSION
+++ b/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 0.5.4, released Mon Nov 20 08:16:34 2006.
+This is CIAO version 0.5.3, released Thu Oct 05 00:35:37 2006.
 
 If you have any problems with or questions about CIAO, please send
 e-mail to the CIAO mailing list (ciao-users@cs.wustl.edu), using the
diff --git a/CIAO/bin/generate_component_mpc.pl b/CIAO/bin/generate_component_mpc.pl
index f4a6ec7246b..dc504157b51 100755
--- a/CIAO/bin/generate_component_mpc.pl
+++ b/CIAO/bin/generate_component_mpc.pl
@@ -12,15 +12,14 @@ use Getopt::Std;
 
 $flags = join (" ", @ARGV);
 
-if (!getopts ('decnip:l:u:h') || $opt_h) {
+if (!getopts ('dcnip:l:u:h') || $opt_h) {
     print "generate_component_mpc.pl [-d] [-h] component_name\n";
     print "\n";
     print "    -d         Turn on debug mode\n";
-    print "    -e         Eventtype declaration in IDL\n";
     print "    -p         Dependent component name\n";
     print "    -l         Dependent component path\n";
     print "    -i         Use an executor definition IDL file\n";
-    print "    -n         Suppress component make/project\n";
+    print "    -n         Supress component make/project\n";
     print "    -c         Create a client makefile\n";
     print "    -u         Unique project name prefix (if not defined, name for -p flag will be used. \n";
     print "\n";
@@ -48,19 +47,10 @@ $UCOM_NAME = uc $com_name;
 ##############################################################################
 # Prologue
 
-if (defined $opt_n) {
-    $svr_suffix = "_skel";
-}
-else {
-    $svr_suffix = "_svnt";
-}
-
-$USVR_SUFFIX = uc $svr_suffix;
-
 if (defined $opt_p) {
     $stub_depend = "after += $opt_p".'_stub';
-    $svnt_depend = "$opt_p".'_skel';
-    $lib_depend = "$opt_p".'_stub '."$opt_p".'_skel';
+    $svnt_depend = "$opt_p".'_svnt';
+    $lib_depend = "$opt_p".'_stub '."$opt_p".'_svnt';
     $client_depend = "$com_name".'_stub '."$opt_p"."_stub";
 }
 else {
@@ -76,6 +66,7 @@ elsif (defined $opt_p) {
     $unique_prefix = "$opt_p" . "_";
 }
 
+
 if (defined $opt_l) {
     $lib_paths = "libpaths += $opt_l";
 }
@@ -101,12 +92,6 @@ project ('."$unique_prefix"."$com_name".'_client) : ciao_client_dnc {
 if (defined $opt_i) {
     $exec_impl_idl = "$com_name".'EI.idl';
     $exec_impl_cpp = "$com_name".'EIC.cpp';
-    $exec_idlflags =
-'
-  idlflags += -SS -St \
-              -Wb,export_macro='."$UCOM_NAME".'_EXEC_Export \
-              -Wb,export_include='."$com_name".'_exec_export.h
-';
 }
 
 
@@ -114,10 +99,11 @@ if (! defined $opt_n) {
     $component_def =
 '
 project('."$unique_prefix"."$com_name".'_exec) : ciao_component_dnc {
-  after   += '."$unique_prefix"."$com_name"."$svr_suffix".'
+  after   += '."$unique_prefix"."$com_name".'_svnt
   sharedname = '."$com_name".'_exec
-  libs += '."$com_name".'_stub '."$com_name"."$svr_suffix $lib_depend
-  $lib_paths $exec_idlflags".'
+  libs      += '."$com_name".'_stub '."$com_name".'_svnt'." $lib_depend
+  $lib_paths".'
+  idlflags  +=  -Wb,export_macro='."$UCOM_NAME".'_EXEC_Export -Wb,export_include='."$com_name".'_exec_export.h
   dynamicflags   = '."$UCOM_NAME".'_EXEC_BUILD_DLL
 
   IDL_Files {'."
@@ -132,78 +118,13 @@ project('."$unique_prefix"."$com_name".'_exec) : ciao_component_dnc {
 ';
 }
 
-$no_skel = "-SS";
-$no_anys = "-St";
-$no_tie = "idlflags -= -GT";
-
-if (defined $opt_e) {
-    $no_anys = "";
-
-    if (defined $opt_n) {
-        $no_tie = "";
-    }
-}
-
-$cli_idlflags ='
-  '."$no_tie".'
-  idlflags += '."$no_anys".' \
-              -Wb,stub_export_macro='."$UCOM_NAME".'_STUB_Export \
-              -Wb,stub_export_include='."$com_name".'_stub_export.h \
-              -Wb,skel_export_macro='."$UCOM_NAME"."$USVR_SUFFIX".'_Export \
-              -Wb,skel_export_include='."$com_name"."$svr_suffix".'_export.h
-';
-
-$cli_base = "ciao_client_dnc";
-$svr_base = "ciao_servant_dnc";
-
-if (defined $opt_n) {
-    $svr_idlflags = $cli_idlflags;
-    $svr_idl = "$com_name".'.idl';
-
-    $svr_src =
-'
-    '."$com_name".'S.cpp
-';
-
-    if (! defined $opt_e) {
-        $cli_base = "taolib_with_idl";
-        $svr_base = "portableserver";
-    }
-}
-else {
-    $svr_idlflags ='
-  '."$no_tie".'
-  idlflags += '."$no_anys"." $no_skel".' \
-              -Wb,export_macro='."$UCOM_NAME"."$USVR_SUFFIX".'_Export \
-              -Wb,export_include='."$com_name"."$svr_suffix".'_export.h
-';
-
-    $cidl_block =
-'
-  CIDL_Files {
-    '."$com_name".'.cidl
-  }
-';
-
-    $svr_idl = "$com_name".'E.idl';
-
-    $svr_src =
-'
-    '."$com_name".'EC.cpp
-    '."$com_name".'S.cpp
-    '."$com_name".'_svnt.cpp
-';
-}
-
-
-
 $mpc_template = '// $Id$
 // This file is generated with "'."generate_component_mpc.pl $flags".'"
 
-project('."$unique_prefix"."$com_name".'_stub): '."$cli_base".' {'."
+project('."$unique_prefix"."$com_name".'_stub): ciao_client_dnc {'."
   $stub_depend".'
   sharedname = '."$com_name".'_stub
-  '."$cli_idlflags".'
+  idlflags += -Wb,stub_export_macro='."$UCOM_NAME".'_STUB_Export -Wb,stub_export_include='."$com_name".'_stub_export.h -Wb,skel_export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,skel_export_include='."$com_name".'_svnt_export.h
   dynamicflags   = '."$UCOM_NAME".'_STUB_BUILD_DLL
 
   IDL_Files {
@@ -215,20 +136,30 @@ project('."$unique_prefix"."$com_name".'_stub): '."$cli_base".' {'."
   }
 }
 
-project('."$unique_prefix"."$com_name"."$svr_suffix".') : '."$svr_base".' {
-  after      += '."$svnt_depend "."$unique_prefix"."$com_name".'_stub
-  sharedname  = '."$com_name"."$svr_suffix".'
-  libs       += '."$com_name".'_stub'." $lib_depend
-  $lib_paths $svr_idlflags".'
-  dynamicflags = '."$UCOM_NAME"."$USVR_SUFFIX".'_BUILD_DLL
-  '."$cidl_block".'
+project('."$unique_prefix"."$com_name".'_svnt) : ciao_servant_dnc {
+  after += '."$svnt_depend "."$unique_prefix"."$com_name".'_stub
+  sharedname  = '."$com_name".'_svnt
+  libs    += '."$com_name".'_stub'." $lib_depend
+  $lib_paths".'
+  idlflags  +=  -Wb,export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,export_include='."$com_name".'_svnt_export.h
+  dynamicflags = '."$UCOM_NAME".'_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    '."$com_name".'.cidl
+  }
+
   IDL_Files {
-    '."$svr_idl".'
+    '."$com_name".'E.idl
   }
 
-  Source_Files {'."$svr_src".'  }
+  Source_Files {
+    '."$com_name".'EC.cpp
+    '."$com_name".'S.cpp
+    '."$com_name".'_svnt.cpp
+  }
 }
-'."$component_def
+'."
+$component_def
 
 $client_def
 ";
@@ -252,7 +183,7 @@ $command = "generate_export_file.pl $UCOM_NAME".'_STUB > '."$com_name".'_stub_ex
 print "\t$command"."\n";
 system ("$ACE_ROOT".'/bin/'."$command");
 
-$command = "generate_export_file.pl $UCOM_NAME"."$USVR_SUFFIX".' > '."$com_name"."$svr_suffix".'_export.h';
+$command = "generate_export_file.pl $UCOM_NAME".'_SVNT > '."$com_name".'_svnt_export.h';
 print "\t$command"."\n";
 system ("$ACE_ROOT".'/bin/'."$command");
 
diff --git a/CIAO/ciao/CCM_Base.idl b/CIAO/ciao/CCM_Base.idl
index 40d6b308668..a37d55c099f 100644
--- a/CIAO/ciao/CCM_Base.idl
+++ b/CIAO/ciao/CCM_Base.idl
@@ -12,6 +12,14 @@
  *          CCM_Base.idl
  */
 
+//#define CIAO_HAS_IMPORT_KEYWORD
+
+#ifdef CIAO_HAS_IMPORT_KEYWORD
+// import ::CORBA;
+#else
+#include <orb.idl>
+#endif /* CIAO_HAS_IMPORT_KEYWORD */
+
 #if !defined (CCM_BASE_IDL)
 #define CCM_BASE_IDL
 
@@ -19,8 +27,114 @@ module Components
 {
   typeprefix Components "omg.org";
 
+  typedef string FeatureName;
+  typedef sequence<FeatureName> NameList;
+
+  valuetype Cookie
+  {
+    private CORBA::OctetSeq cookieValue;
+  };
+
+  valuetype PortDescription
+  {
+    public FeatureName name;
+    public CORBA::RepositoryId type_id;
+  };
+
+  valuetype FacetDescription : PortDescription
+  {
+    public Object facet_ref;
+  };
+
+  typedef sequence<FacetDescription> FacetDescriptions;
+
+  typedef unsigned long FailureReason;
+
+  exception InvalidName {};
   exception InvalidConnection {};
+  exception ExceededConnectionLimit {};
   exception AlreadyConnected {};
   exception NoConnection {};
+  exception CookieRequired {};
+  exception CreateFailure {
+    FailureReason reason;
+  };
+  exception FinderFailure
+  {
+    FailureReason reason;
+  };
+  exception RemoveFailure
+  {
+    FailureReason reason;
+  };
+  exception DuplicateKeyValue {};
+  exception InvalidKey {};
+  exception UnknownKeyValue {};
+  exception NoKeyAvailable {};
+  exception BadEventType
+  {
+    CORBA::RepositoryId expected_event_type;
+  };
+  exception HomeNotFound {};
+  exception WrongComponentType {};
+
+  typedef FailureReason InvalidConfigurationReason;
+  const InvalidConfigurationReason UnknownConfigValueName = 0;
+  const InvalidConfigurationReason InvalidConfigValueType = 1;
+  const InvalidConfigurationReason ConfigValueRequired = 2;
+  const InvalidConfigurationReason ConfigValueNotExpected = 3;
+  exception InvalidConfiguration
+  {
+    InvalidConfigurationReason reason;
+    FeatureName name;
+  };
+  exception IllegalState {};
+
+  interface Navigation
+  {
+    Object provide_facet (in FeatureName name)
+      raises (InvalidName);
+    FacetDescriptions get_all_facets();
+    FacetDescriptions get_named_facets (in NameList names)
+      raises (InvalidName);
+    boolean same_component (in Object object_ref);
+  };
+
+  valuetype ConnectionDescription
+  {
+    public Cookie ck;
+    public Object objref;
+  };
+  typedef sequence<ConnectionDescription> ConnectionDescriptions;
+
+  valuetype ReceptacleDescription : PortDescription
+  {
+    public boolean is_multiple;
+    public ConnectionDescriptions connections;
+  };
+  typedef sequence<ReceptacleDescription> ReceptacleDescriptions;
+
+  interface Receptacles
+  {
+    Cookie connect (in FeatureName name, in Object connection )
+      raises (InvalidName,
+              InvalidConnection,
+              AlreadyConnected,
+              ExceededConnectionLimit);
+
+    Object disconnect (in FeatureName name, in Cookie ck)
+      raises (InvalidName,
+              InvalidConnection,
+              CookieRequired,
+              NoConnection);
+
+    ConnectionDescriptions get_connections (in FeatureName name)
+      raises (InvalidName);
+
+    ReceptacleDescriptions get_all_receptacles ();
+
+    ReceptacleDescriptions get_named_receptacles (in NameList names)
+      raises (InvalidName);
+  };
 };
 #endif /* CCM_BASE_IDL */
diff --git a/CIAO/ciao/CCM_CCM2Context.idl b/CIAO/ciao/CCM_CCM2Context.idl
deleted file mode 100644
index 9b29d8b7d3b..00000000000
--- a/CIAO/ciao/CCM_CCM2Context.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container_Ex.idl
- */
-
-#if !defined (CCM_2CONTEXT_IDL)
-#define CCM_2CONTEXT_IDL
-
-#include "ciao/CCM_Container.idl"
-#include "ciao/CCM_HomeRegistration.idl"
-#include <CosPersistentState.idl>
-
-// *************** Extended Container Interfaces ***************
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  typedef CosPersistentState::CatalogBase CatalogBase;
-  typedef CosPersistentState::_TypeId _TypeId;
-
-  exception PolicyMismatch {};
-  exception PersistenceNotAvailable {};
-
-  local interface CCM2Context : CCMContext
-  {
-    HomeRegistration get_home_registration ();
-
-    void req_passivate ()
-      raises (PolicyMismatch);
-
-    CatalogBase get_persistence (in _TypeId catalog_type_id)
-      raises (PersistenceNotAvailable);
-  };
-
-};
-#endif /* CCM_2CONTEXT_IDL */
diff --git a/CIAO/ciao/CCM_CCMException.idl b/CIAO/ciao/CCM_CCMException.idl
deleted file mode 100644
index 445e09e1d1a..00000000000
--- a/CIAO/ciao/CCM_CCMException.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container.idl
- */
-
-#if !defined (CCM_CCMEXCEPTION_IDL)
-#define CCM_CCMEXCEPTION_IDL
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  enum CCMExceptionReason
-  {
-    SYSTEM_ERROR,
-    CREATE_ERROR,
-    REMOVE_ERROR,
-    DUPLICATE_KEY,
-    FIND_ERROR,
-    OBJECT_NOT_FOUND,
-    NO_SUCH_ENTITY
-  };
-
-  exception CCMException
-  {
-    CCMExceptionReason reason;
-  };
-};
-#endif /* CCM_CCMEXCEPTION_IDL */
diff --git a/CIAO/ciao/CCM_ClientContainerInterceptor.idl b/CIAO/ciao/CCM_ClientContainerInterceptor.idl
deleted file mode 100644
index 27a5fdc8929..00000000000
--- a/CIAO/ciao/CCM_ClientContainerInterceptor.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CLIENTCONTAINERINTERCEPTOR_IDL)
-#define CCM_CLIENTCONTAINERINTERCEPTOR_IDL
-
-#include "ciao/CCM_ContainerInterceptor.idl"
-#include "ciao/CCM_ContainerClientRequestInfo.idl"
-#include "tao/PI/PIForwardRequest.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ClientContainerInterceptor : ContainerInterceptor
-    {
-      void send_request (in ContainerClientRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void send_poll (in ContainerClientRequestInfo info);
-      void receive_reply (in ContainerClientRequestInfo info);
-      void receive_exception (in ContainerClientRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void receive_other (in ContainerClientRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-    };
-  };
-};
-#endif /* CCM_CLIENTCONTAINERINTERCEPTOR_IDL */
diff --git a/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl
deleted file mode 100644
index 031f06f1a0f..00000000000
--- a/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL)
-#define CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_InvalidRegistration.idl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ClientContainerInterceptor;
-
-    local interface ClientContainerInterceptorRegistration
-    {
-      Components::Cookie register_client_interceptor (in ClientContainerInterceptor ci);
-      ClientContainerInterceptor unregister_client_interceptor (in Components::Cookie cookie)
-        raises(InvalidRegistration);
-    };
-  };
-};
-
-#endif /* CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL */
diff --git a/CIAO/ciao/CCM_Component.idl b/CIAO/ciao/CCM_Component.idl
index 8a604edf085..32c0299acf0 100644
--- a/CIAO/ciao/CCM_Component.idl
+++ b/CIAO/ciao/CCM_Component.idl
@@ -14,9 +14,143 @@
 #if !defined (CCM_COMPONENT_IDL)
 #define CCM_COMPONENT_IDL
 
-#include "ciao/CCM_Events.idl"
-#include "ciao/CCM_Home.idl"
-#include "ciao/CCM_Object.idl"
-#include "ciao/CCM_Enumeration.idl"
+#include "CCM_Event.idl"
+#include "tao/IFR_Client/IFR_Base.pidl"
 
+module Components
+{
+  typeprefix Components "omg.org";
+
+  abstract valuetype PrimaryKeyBase {};
+
+  interface CCMObject; //forward reference
+
+  interface CCMHome
+  {
+    CORBA::IRObject get_component_def ();
+    CORBA::IRObject get_home_def ();
+    void remove_component ( in CCMObject comp)
+      raises (RemoveFailure);
+  };
+  typedef sequence<CCMHome> CCMHomes;
+
+  interface KeylessCCMHome
+  {
+    CCMObject create_component()
+      raises (CreateFailure);
+  };
+
+  interface HomeFinder
+  {
+    CCMHome find_home_by_component_type (in CORBA::RepositoryId comp_repid)
+      raises (HomeNotFound);
+
+    CCMHome find_home_by_home_type (in CORBA::RepositoryId home_repid)
+      raises (HomeNotFound);
+
+    CCMHome find_home_by_name (in string home_name)
+      raises (HomeNotFound);
+  };
+
+  interface Configurator
+  {
+    void configure (in CCMObject comp)
+      raises (WrongComponentType);
+  };
+
+  valuetype ConfigValue
+  {
+    public FeatureName name;
+    public any value;
+  };
+
+  typedef sequence<ConfigValue> ConfigValues;
+
+  interface StandardConfigurator : Configurator
+  {
+    void set_configuration (in ConfigValues descr);
+  };
+
+  interface HomeConfiguration : CCMHome
+  {
+    void set_configurator (in Configurator cfg);
+    void set_configuration_values (in ConfigValues config);
+    void complete_component_configuration (in boolean b);
+    void disable_home_configuration();
+  };
+
+  valuetype ComponentPortDescription
+  {
+    public FacetDescriptions facets;
+    public ReceptacleDescriptions receptacles;
+    public ConsumerDescriptions consumers;
+    public EmitterDescriptions emitters;
+    public PublisherDescriptions publishers;
+  };
+
+  interface CCMObject : Navigation, Receptacles, Events
+  {
+    CORBA::IRObject get_component_def ( );
+    CCMHome get_ccm_home( );
+    PrimaryKeyBase get_primary_key( )
+      raises (NoKeyAvailable);
+    void remove()
+      raises (RemoveFailure);
+    ComponentPortDescription get_all_ports ();
+
+    /// Factory method to return a StandardConfigurator interface. CIAO specific
+    StandardConfigurator get_standard_configurator ( );
+
+    /// CIAO specific operations to have some control on when and how
+    /// to activate  components.
+    /**
+     * This is all from our work on ARMS where we needed to know whether
+     * every component has been configured, say for example to use
+     * logging in the assembly which could in turn be provided by a
+     * component. To get around all this we are adding some methods on
+     * this till we think of some standard way to do this. The problem
+     * is that the deployer should be able to call this as opposed to
+     * the home calling it as soon as the component is created.
+     *
+     * All these operations are called in the order mentioned, ie. the
+     * deployer calls ciao_preactivate () on all components, then
+     * ciao_activate and then ciao_postactivate (). The speciality is
+     * that these operations would be invoked on every target object
+     * before the next call is made. It is similar to the way
+     * portable interceptors work, trying to get everything onto the
+     * flow stack, but differ in the intention.
+     */
+    void ciao_preactivate ()
+      raises (InvalidConfiguration);
+
+    void ciao_activate ()
+      raises (InvalidConfiguration);
+
+    void ciao_postactivate ()
+      raises (InvalidConfiguration);
+
+    void ciao_passivate ()
+      raises (InvalidConfiguration);
+
+    void configuration_complete ()
+      raises (InvalidConfiguration);
+  };
+
+  /// @@ Enumeration and DefaultEnumeration are only for EJB to CCM
+  /// mapping?  At any rate, we should be able to skip them for now.
+  /// @todo Move these then to a seperate file so that the linker can
+  /// optimize things out of the executable when building staticly
+  abstract valuetype Enumeration
+  {
+    boolean has_more_elements();
+    CCMObject next_element();
+  };
+
+  typedef sequence<CCMObject> CCMObjectSeq;
+
+  valuetype DefaultEnumeration : Enumeration
+  {
+    private CCMObjectSeq objects;
+  };
+};
 #endif /* CCM_COMPONENT_IDL */
diff --git a/CIAO/ciao/CCM_ComponentId.idl b/CIAO/ciao/CCM_ComponentId.idl
deleted file mode 100644
index 299515d0978..00000000000
--- a/CIAO/ciao/CCM_ComponentId.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container_Ex.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_COMPONENTID_IDL)
-#define CCM_COMPONENTID_IDL
-
-#include "ciao/CCM_StateIdFactory.idl"
-
-// *************** Extended Container Interfaces ***************
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface ComponentId
-  {
-    FacetId get_target_facet();
-
-    SegmentId get_target_segment();
-
-    StateIdValue get_target_state_id (in StateIdFactory sid_factory)
-      raises (InvalidStateIdData);
-
-    StateIdValue get_segment_state_id (in SegmentId seg,
-                                       in StateIdFactory sid_factory)
-      raises (InvalidStateIdData);
-
-    ComponentId create_with_new_target (in FacetId new_target_facet,
-                                        in SegmentId new_target_segment);
-
-    SegmentDescrSeq get_segment_descrs (in StateIdFactory sid_factory)
-      raises (InvalidStateIdData);
-  };
-};
-#endif /* CCM_COMPONENTID_IDL */
diff --git a/CIAO/ciao/CCM_Configurator.idl b/CIAO/ciao/CCM_Configurator.idl
deleted file mode 100644
index 0d48f8e65cb..00000000000
--- a/CIAO/ciao/CCM_Configurator.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Component.idl
- */
-
-#if !defined (CCM_CONFIGURATOR_IDL)
-#define CCM_CONFIGURATOR_IDL
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  exception WrongComponentType {};
-
-  interface CCMObject;
-
-  interface Configurator
-  {
-    void configure (in CCMObject comp)
-      raises (WrongComponentType);
-  };
-};
-#endif /* CCM_CONFIGURATOR_IDL */
diff --git a/CIAO/ciao/CCM_Container.idl b/CIAO/ciao/CCM_Container.idl
index d6555e16170..b8a6ab3286b 100644
--- a/CIAO/ciao/CCM_Container.idl
+++ b/CIAO/ciao/CCM_Container.idl
@@ -16,10 +16,142 @@
 #if !defined (CCM_CONTAINER_IDL)
 #define CCM_CONTAINER_IDL
 
-#include "ciao/CCM_Component.idl"
-#include "ciao/CCM_CCMException.idl"
-#include "ciao/CCM_HomeExecutorBase.idl"
-#include "ciao/CCM_SessionContext.idl"
-#include "ciao/CCM_SessionComponent.idl"
+#include "CCM_Component.idl"
+#include "orbsvcs/SecurityLevel2.idl"
+#include "CCM_Transaction.idl"
 
+// *************** Basic Container interfaces ***************
+
+module Components
+{
+  typeprefix Components "omg.org";
+
+  typedef SecurityLevel2::Credentials Principal;
+
+  local interface CCMContext
+  {
+    Principal get_caller_principal();
+
+    CCMHome get_CCM_home();
+
+    boolean get_rollback_only()
+      raises (IllegalState);
+
+    Transaction::UserTransaction get_user_transaction()
+      raises (IllegalState);
+
+    boolean is_caller_in_role (in string role);
+
+    void set_rollback_only()
+      raises (IllegalState);
+  };
+
+  enum CCMExceptionReason
+  {
+    SYSTEM_ERROR,
+    CREATE_ERROR,
+    REMOVE_ERROR,
+    DUPLICATE_KEY,
+    FIND_ERROR,
+    OBJECT_NOT_FOUND,
+    NO_SUCH_ENTITY
+  };
+
+  exception CCMException
+  {
+    CCMExceptionReason reason;
+  };
+
+  local interface EnterpriseComponent {};
+
+  local interface SessionContext : CCMContext
+  {
+    Object get_CCM_object()
+      raises (IllegalState);
+  };
+
+  local interface SessionComponent : EnterpriseComponent
+  {
+    void set_session_context ( in SessionContext ctx)
+      raises (CCMException);
+
+    void ccm_activate()
+      raises (CCMException);
+
+    void ccm_passivate()
+      raises (CCMException);
+
+
+    void ccm_remove ()
+      raises (CCMException);
+
+    /**
+     * This method is invoked before ccm_activate () is called. All
+     * components in the assembly get this callback before the
+     * ccm_activate () is called.
+     * @note CIAO specific
+     */
+    void ciao_preactivate ()
+      raises (CCMException);
+
+    /**
+     * This method is invoked after ccm_activate () is called. All
+     * components in the assembly get this callback after the
+     * ccm_activate () is called.
+     * @note CIAO specific
+     */
+    void ciao_postactivate ()
+      raises (CCMException);
+  };
+
+  local interface SessionSynchronization
+  {
+    void after_begin ()
+      raises (CCMException);
+
+    void before_completion ()
+      raises (CCMException);
+
+    void after_completion (in boolean committed)
+      raises (CCMException);
+  };
+
+  local interface EntityContext : CCMContext
+  {
+    Object get_CCM_object ()
+      raises (IllegalState);
+
+    PrimaryKeyBase get_primary_key ()
+      raises (IllegalState);
+  };
+
+  local interface EntityComponent : EnterpriseComponent
+  {
+    void set_entity_context (in EntityContext ctx)
+      raises (CCMException);
+
+    void unset_entity_context ()
+      raises (CCMException);
+
+    void ccm_activate ()
+      raises (CCMException);
+
+    void ccm_load ()
+      raises (CCMException);
+
+    void ccm_store ()
+      raises (CCMException);
+
+    void ccm_passivate ()
+      raises (CCMException);
+
+    void ccm_remove ()
+      raises (CCMException);
+  };
+
+
+  local interface HomeExecutorBase
+  {
+  };
+};
 #endif /* CCM_CONTAINER_IDL */
diff --git a/CIAO/ciao/CCM_ContainerClientRequestInfo.idl b/CIAO/ciao/CCM_ContainerClientRequestInfo.idl
deleted file mode 100644
index b44dac880b8..00000000000
--- a/CIAO/ciao/CCM_ContainerClientRequestInfo.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERCLIENTREQUESTINFO_IDL)
-#define CCM_CONTAINERCLIENTREQUESTINFO_IDL
-
-#include "ciao/CCM_ContainerRequestInfo.idl"
-#include "tao/PI/ClientRequestInfo.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerClientRequestInfo : ContainerRequestInfo
-    {
-      PortableInterceptor::ClientRequestInfo request_info();
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERCLIENTREQUESTINFO_IDL */
diff --git a/CIAO/ciao/CCM_ContainerInterceptor.idl b/CIAO/ciao/CCM_ContainerInterceptor.idl
deleted file mode 100644
index b5ccdf52fae..00000000000
--- a/CIAO/ciao/CCM_ContainerInterceptor.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERPORTABLEINTERCEPTOR_IDL)
-#define CCM_CONTAINERPORTABLEINTERCEPTOR_IDL
-
-#include "tao/PI_Forward.pidl"
-
-module Components {
-
-  module ContainerPortableInterceptor {
-
-    local interface ContainerInterceptor
-    {
-      readonly attribute string name;
-      void destroy ();
-      void set_slot_id(in PortableInterceptor::SlotId slot_id);
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERPORTABLEINTERCEPTOR_IDL */
diff --git a/CIAO/ciao/CCM_ContainerRequestInfo.idl b/CIAO/ciao/CCM_ContainerRequestInfo.idl
deleted file mode 100644
index 3fb590acc16..00000000000
--- a/CIAO/ciao/CCM_ContainerRequestInfo.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERREQUESTINFO_IDL)
-#define CCM_CONTAINERREQUESTINFO_IDL
-
-#include "ciao/CCM_Navigation.idl"
-#include "tao/OctetSeq.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerRequestInfo
-    {
-      readonly attribute CORBA::OctetSeq origin_id;
-      readonly attribute CORBA::OctetSeq target_id;
-      readonly attribute FeatureName name;
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERREQUESTINFO_IDL */
diff --git a/CIAO/ciao/CCM_ContainerServantRequestInfo.idl b/CIAO/ciao/CCM_ContainerServantRequestInfo.idl
deleted file mode 100644
index 0a3348b8f7e..00000000000
--- a/CIAO/ciao/CCM_ContainerServantRequestInfo.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERSERVANTREQUESTINFO_IDL)
-#define CCM_CONTAINERSERVANTREQUESTINFO_IDL
-
-#include "ciao/CCM_ContainerRequestInfo.idl"
-#include "ciao/CCM_EnterpriseComponent.idl"
-#include "tao/AnyTypeCode/Dynamic.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerServantRequestInfo : ContainerRequestInfo
-    {
-      attribute Dynamic::ParameterList arguments;
-      readonly attribute string operation;
-      attribute any result;
-      attribute Components::EnterpriseComponent target;
-      attribute any the_exception;
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERSERVANTREQUESTINFO_IDL */
diff --git a/CIAO/ciao/CCM_ContainerServerRequestInfo.idl b/CIAO/ciao/CCM_ContainerServerRequestInfo.idl
deleted file mode 100644
index 4868e6a2e8d..00000000000
--- a/CIAO/ciao/CCM_ContainerServerRequestInfo.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERSERVERREQUESTINFO_IDL)
-#define CCM_CONTAINERSERVERREQUESTINFO_IDL
-
-#include "ciao/CCM_ContainerRequestInfo.idl"
-#include "tao/PI_Server/ServerRequestInfo.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerServerRequestInfo : ContainerRequestInfo
-    {
-      PortableInterceptor::ServerRequestInfo request_info();
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERSERVERREQUESTINFO_IDL */
diff --git a/CIAO/ciao/CCM_ContainerStubRequestInfo.idl b/CIAO/ciao/CCM_ContainerStubRequestInfo.idl
deleted file mode 100644
index da14afa9e08..00000000000
--- a/CIAO/ciao/CCM_ContainerStubRequestInfo.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERSTUBREQUESTINFO_IDL)
-#define CCM_CONTAINERSTUBREQUESTINFO_IDL
-
-#include "ciao/CCM_ContainerRequestInfo.idl"
-#include "tao/AnyTypeCode/Dynamic.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerStubRequestInfo : ContainerRequestInfo
-    {
-      attribute Dynamic::ParameterList arguments;
-      readonly attribute string operation;
-      attribute any result;
-      attribute Object target;
-      attribute any the_exception;
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERSTUBREQUESTINFO_IDL */
diff --git a/CIAO/ciao/CCM_Container_Ex.idl b/CIAO/ciao/CCM_Container_Ex.idl
index c2161d56c94..0aeb481807d 100644
--- a/CIAO/ciao/CCM_Container_Ex.idl
+++ b/CIAO/ciao/CCM_Container_Ex.idl
@@ -16,8 +16,168 @@
 #if !defined (CCM_CONTAINER_EX_IDL)
 #define CCM_CONTAINER_EX_IDL
 
-#include "ciao/CCM_Container.idl"
-#include "ciao/CCM_Session2Context.idl"
-#include "ciao/CCM_EntityContext.idl"
+#include "CCM_Container.idl"
+#include <CosPersistentState.idl>
 
+// *************** Extended Container Interfaces ***************
+
+module Components
+{
+  typeprefix Components "omg.org";
+
+  enum BadComponentReferenceReason
+  {
+    NON_LOCAL_REFERENCE,
+    NON_COMPONENT_REFERENCE,
+    WRONG_CONTAINER
+  };
+
+  typedef CosPersistentState::CatalogBase CatalogBase;
+  typedef CosPersistentState::_TypeId _TypeId;
+
+  typedef short SegmentId;
+  const SegmentId COMPONENT_SEGMENT = 0;
+
+  typedef short FacetId;
+  const FacetId COMPONENT_FACET = 0;
+
+  typedef sequence<octet> IdData;
+  typedef CosPersistentState::Pid PersistentId;
+
+  typedef short StateIdType;
+  const StateIdType PERSISTENT_ID = 0;
+
+  exception BadComponentReference
+  {
+    BadComponentReferenceReason reason;
+  };
+  exception PolicyMismatch {};
+  exception PersistenceNotAvailable {};
+  exception UnknownActualHome {};
+  exception ProxyHomeNotSupported {};
+  exception InvalidStateIdData {};
+
+  local interface HomeRegistration
+  {
+    void register_home (in CCMHome home_ref,
+                        in string home_name);
+
+    void unregister_home (in CCMHome home_ref);
+  };
+
+  local interface CCM2Context : CCMContext
+  {
+    HomeRegistration get_home_registration ();
+
+    void req_passivate ()
+      raises (PolicyMismatch);
+
+    CatalogBase get_persistence (in _TypeId catalog_type_id)
+      raises (PersistenceNotAvailable);
+  };
+
+  local interface ProxyHomeRegistration : HomeRegistration
+  {
+    void register_proxy_home (in CCMHome rhome,
+                              in CCMHome ahome)
+      raises (UnknownActualHome,
+              ProxyHomeNotSupported);
+  };
+
+  local interface Session2Context : SessionContext, CCM2Context
+  {
+    Object create_ref (in CORBA::RepositoryId repid);
+
+    Object create_ref_from_oid (in CORBA::OctetSeq oid,
+                                in CORBA::RepositoryId repid);
+
+    CORBA::OctetSeq get_oid_from_ref (in Object objref)
+      raises (IllegalState,
+              BadComponentReference);
+  };
+
+  abstract valuetype StateIdValue
+  {
+    StateIdType get_sid_type();
+    IdData get_sid_data();
+  };
+
+  local interface StateIdFactory
+  {
+    StateIdValue create (in IdData data)
+      raises (InvalidStateIdData);
+  };
+
+  valuetype PersistentIdValue : StateIdValue
+  {
+    private PersistentId pid;
+
+    PersistentId get_pid();
+    factory init (in PersistentId pid);
+  };
+
+  valuetype SegmentDescr
+  {
+    private StateIdValue sid;
+    private SegmentId seg;
+
+    StateIdValue get_sid();
+    SegmentId get_seg_id();
+    factory init (in StateIdValue sid,
+                  in SegmentId seg);
+  };
+
+  typedef sequence<SegmentDescr> SegmentDescrSeq;
+
+  local interface ComponentId
+  {
+    FacetId get_target_facet();
+
+    SegmentId get_target_segment();
+
+    StateIdValue get_target_state_id (in StateIdFactory sid_factory)
+      raises (InvalidStateIdData);
+
+    StateIdValue get_segment_state_id (in SegmentId seg,
+                                       in StateIdFactory sid_factory)
+      raises (InvalidStateIdData);
+
+    ComponentId create_with_new_target (in FacetId new_target_facet,
+                                        in SegmentId new_target_segment);
+
+    SegmentDescrSeq get_segment_descrs (in StateIdFactory sid_factory)
+      raises (InvalidStateIdData);
+  };
+
+  local interface Entity2Context : EntityContext, CCM2Context
+  {
+    ComponentId get_component_id ()
+      raises (IllegalState);
+
+    ComponentId create_component_id (in FacetId target_facet,
+                                     in SegmentId target_segment,
+                                     in SegmentDescrSeq seq_descrs);
+
+    ComponentId create_monolithic_component_id (in FacetId target_facet,
+                                                in StateIdValue sid);
+
+    Object create_ref_from_cid (in CORBA::RepositoryId repid,
+                                in ComponentId cid);
+
+    ComponentId get_cid_from_ref (in Object objref)
+      raises (BadComponentReference);
+  };
+
+  local interface ExecutorLocator : EnterpriseComponent
+  {
+    Object obtain_executor (in string name)
+      raises (CCMException);
+
+    void release_executor (in Object exc)
+      raises (CCMException);
+
+    void configuration_complete()
+      raises (InvalidConfiguration);
+  };
+};
 #endif /* CCM_CONTAINER_EX_IDL */
diff --git a/CIAO/ciao/CCM_Context.idl b/CIAO/ciao/CCM_Context.idl
deleted file mode 100644
index 3250ca32264..00000000000
--- a/CIAO/ciao/CCM_Context.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTEXT_IDL)
-#define CCM_CONTEXT_IDL
-
-#include "ciao/Security.idl"
-#include "ciao/CCM_Transaction.idl"
-#include "ciao/CCM_Home.idl"
-
-// *************** Basic Container interfaces ***************
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  typedef SecurityLevel2::Credentials Principal;
-
-  exception IllegalState {};
-
-  local interface CCMContext
-  {
-    Principal get_caller_principal();
-
-    CCMHome get_CCM_home();
-
-    boolean get_rollback_only()
-      raises (IllegalState);
-
-    Transaction::UserTransaction get_user_transaction()
-      raises (IllegalState);
-
-    boolean is_caller_in_role (in string role);
-
-    void set_rollback_only()
-      raises (IllegalState);
-  };
-};
-#endif /* CCM_CONTEXT_IDL */
diff --git a/CIAO/ciao/CCM_Cookie.idl b/CIAO/ciao/CCM_Cookie.idl
deleted file mode 100644
index f815d9f1ef9..00000000000
--- a/CIAO/ciao/CCM_Cookie.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -I W:/ACE_wrappers/TAO Component_Base.idl
- *     tao_idl -I ../.. \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Base.idl
- */
-
-#if !defined (CCM_COOKIE_IDL)
-#define CCM_COOKIE_IDL
-
-#include "tao/OctetSeq.pidl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  valuetype Cookie
-  {
-    private CORBA::OctetSeq cookieValue;
-  };
-};
-#endif /* CCM_COOKIE_IDL */
diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc
index 5bd4fa487ba..339c4d2f387 100644
--- a/CIAO/ciao/CCM_Core.mpc
+++ b/CIAO/ciao/CCM_Core.mpc
@@ -8,70 +8,23 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   idlflags  += -Wb,skel_export_macro=CIAO_CONTAINER_Export
 
   // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
+  includes += $(CIAO_ROOT)/DAnCE
 
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
   IDL_Files {
-    idlflags += -SS -Sci
     CCM_Base.idl
+    CCM_Event.idl
     CCM_Component.idl
-  }
-
-  IDL_Files {
-    idlflags += -SS
-    CCM_Cookie.idl
-    CCM_Enumeration.idl
-  }
-
-  IDL_Files {
-    idlflags += -Ssi -Sci
-    Components.idl
-  }
-
-  IDL_Files {
-    CCM_HomeConfiguration.idl
-    CCM_StandardConfigurator.idl
-    CCM_Home.idl
-    CCM_Object.idl
-    CCM_PrimaryKeyBase.idl
-  }
-
-  IDL_Files {
-    idlflags += -Ssi
-    CCM_HomeFinder.idl
-    CCM_Configurator.idl
-    CCM_KeylessCCMHome.idl
-    CCM_Navigation.idl
-    CCM_Receptacle.idl
-  }
-
-  IDL_Files {
-    CCM_Events.idl
-    CCM_EventBase.idl
-    CCM_EventConsumerBase.idl
+    CIAO_Value.idl
   }
 
   Source_Files {
     CCM_BaseC.cpp
-    CCM_EventsC.cpp
-    CCM_EventBaseC.cpp
-    CCM_EventConsumerBaseC.cpp
+    CCM_EventC.cpp
     CCM_ComponentC.cpp
-    CCM_EnumerationC.cpp
-    CCM_HomeC.cpp
-    CCM_ConfiguratorC.cpp
-    CCM_HomeConfigurationC.cpp
-    CCM_KeylessCCMHomeC.cpp
-    CCM_StandardConfiguratorC.cpp
-    CCM_HomeFinderC.cpp
-    CCM_NavigationC.cpp
-    CCM_ReceptacleC.cpp
-    CCM_CookieC.cpp
-    CCM_ObjectC.cpp
-    CCM_PrimaryKeyBaseC.cpp
+    CIAO_ValueC.cpp
     Client_init.cpp
-    ComponentsC.cpp
   }
 
   Header_Files {
@@ -80,93 +33,35 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 }
 
-project (CIAO_DnC_Container) : orbsvcslib, portableserver, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro {
+project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc {
   sharedname  = CIAO_DnC_Container
   idlflags   += -Wb,export_include=CIAO_Container_Export.h
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
   // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
-
-  IDL_Files {
-    idlflags += -SS -Sci \
-                -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
-                -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
-    Security.idl
-  }
-
-  IDL_Files {
-    idlflags += -SS -Sci
-    CCM_Context.idl
-    CCM_CCMException.idl
-    CCM_EntityComponent.idl
-    CCM_EntityContext.idl
-    CIAO_SwapExec.idl
-    CIAO_UpgradeableContext.idl
-  }
+  includes += $(CIAO_ROOT)/DAnCE
 
   IDL_Files {
-    idlflags += -SS
-    CCM_CCM2Context.idl
-    CCM_ProxyHomeRegistration.idl
-    CCM_Session2Context.idl
     CCM_Transaction.idl
     CosPersistentState.idl
     CCM_Container.idl
-    CCM_SessionContext.idl
-    CCM_SessionComponent.idl
     CCM_Container_Ex.idl
-    CCM_StateIdFactory.idl
-    CCM_Entity2Context.idl
-    CCM_ComponentId.idl
-    CCM_ExecutorLocator.idl
-    CCM_EnterpriseComponent.idl
-    CCM_SessionSynchronization.idl
-    CCM_HomeRegistration.idl
-    CCM_HomeExecutorBase.idl
+    SwapExec.idl
+    UpgradeableContext.idl
   }
 
   Source_Files {
     CCM_TransactionC.cpp
     CosPersistentStateC.cpp
     CCM_ContainerC.cpp
-    CCM_SessionContextC.cpp
-    CCM_SessionComponentC.cpp
-    CCM_EnterpriseComponentC.cpp
-    CCM_SessionSynchronizationC.cpp
-    CCM_CCMExceptionC.cpp
-    CCM_ContextC.cpp
-    SecurityC.cpp
     CCM_Container_ExC.cpp
-    CCM_StateIdFactoryC.cpp
-    CCM_ComponentIdC.cpp
-    CCM_Entity2ContextC.cpp
-    CCM_ExecutorLocatorC.cpp
-    CCM_ProxyHomeRegistrationC.cpp
-    CCM_Session2ContextC.cpp
-    CCM_CCM2ContextC.cpp
-    CCM_HomeRegistrationC.cpp
-    CCM_HomeExecutorBaseC.cpp
-    CCM_EntityContextC.cpp
-    CCM_EntityComponentC.cpp
-    CCM_EventsS.cpp
-    CCM_EventConsumerBaseS.cpp
-    CCM_EventBaseS.cpp
-    CCM_ConfiguratorS.cpp
-    CCM_HomeConfigurationS.cpp
-    CCM_KeylessCCMHomeS.cpp
-    CCM_StandardConfiguratorS.cpp
-    CCM_HomeS.cpp
-    CCM_ObjectS.cpp
-    CCM_PrimaryKeyBaseS.cpp
-    CCM_HomeFinderS.cpp
-    CCM_NavigationS.cpp
-    CCM_ReceptacleS.cpp
-    CIAO_SwapExecC.cpp
-    CIAO_UpgradeableContextC.cpp
+    CCM_BaseS.cpp
+    CCM_EventS.cpp
+    CCM_ComponentS.cpp
+    SwapExecC.cpp
+    UpgradeableContextC.cpp
     Cookies.cpp
-    ComponentsS.cpp
   }
 
 }
@@ -177,7 +72,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
   sharedname   =  CIAO_Deployment_stub
 
   // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
+  includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT)
 
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
   idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
@@ -187,67 +82,43 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
   dynamicflags =  DEPLOYMENT_STUB_BUILD_DLL
 
   IDL_Files {
-    idlflags += -SS -Sci
-    Deployment_Packaging_Data.idl
-    Deployment_Target_Data.idl
-  }
-
-  IDL_Files {
-    idlflags += -SS
+    NodeApplication_CallBack.idl
+    Deployment_Core.idl
     Deployment_Base.idl
-    Deployment_Connection.idl
     Deployment_Data.idl
-    Deployment_DeploymentPlan.idl
-    Deployment_TargetData.idl
-    Deployment_Events.idl
-    CIAO_ServerResources.idl
-  }
-
-  IDL_Files {
-    Deployment_TargetManager.idl
-    CIAO_NodeApplication_CallBack.idl
-    Deployment_Core.idl
-    Deployment_NodeApplication.idl
-    Deployment_Application.idl
-    Deployment_Container.idl
+    Packaging_Data.idl
+    Target_Data.idl
     Deployment.idl
-    Deployment_NodeManager.idl
-    Deployment_ApplicationManager.idl
-    Deployment_NodeApplicationManager.idl
-    Deployment_DomainApplicationManager.idl
-    Deployment_ExecutionManager.idl
-    Deployment_RepositoryManager.idl
+    NodeManager.idl
+    NodeApplicationManager.idl
+    DomainApplicationManager.idl
+    ExecutionManager.idl
+    RepositoryManager.idl
+    ServerResources.idl
+    Deployment_Events.idl
   }
 
   Source_Files {
     Deployment_CoreC.cpp
     Deployment_BaseC.cpp
-    Deployment_ConnectionC.cpp
     Deployment_DataC.cpp
-    Deployment_DeploymentPlanC.cpp
-    Deployment_TargetDataC.cpp
-    Deployment_NodeApplicationC.cpp
-    Deployment_ApplicationC.cpp
-    Deployment_ContainerC.cpp
-    Deployment_Packaging_DataC.cpp
-    Deployment_Target_DataC.cpp
+    Packaging_DataC.cpp
+    Target_DataC.cpp
     DeploymentC.cpp
-    Deployment_TargetManagerC.cpp
-    Deployment_NodeManagerC.cpp
-    Deployment_NodeApplicationManagerC.cpp
-    Deployment_ApplicationManagerC.cpp
-    Deployment_DomainApplicationManagerC.cpp
-    Deployment_ExecutionManagerC.cpp
-    Deployment_RepositoryManagerC.cpp
-    CIAO_NodeApplication_CallBackC.cpp
-    CIAO_ServerResourcesC.cpp
+    NodeManagerC.cpp
+    NodeApplicationManagerC.cpp
+    DomainApplicationManagerC.cpp
+    ExecutionManagerC.cpp
+    RepositoryManagerC.cpp
+    NodeApplication_CallBackC.cpp
+    ServerResourcesC.cpp
     Deployment_EventsC.cpp
   }
 }
 
 // CIAO_DnC_Client library must be linked for this project.
 // Please don't remove.
-project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc, naming {
+project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc {
   sharedname   =  CIAO_Deployment_svnt
   dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
@@ -256,37 +127,40 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien
   idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
 
   // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
+  includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT)
 
   IDL_Files {
   }
 
   Source_Files {
     Deployment_CoreS.cpp
-    Deployment_ApplicationS.cpp
-    Deployment_NodeApplicationS.cpp
-    Deployment_ContainerS.cpp
+    Deployment_BaseS.cpp
+    Deployment_DataS.cpp
+    Packaging_DataS.cpp
+    Target_DataS.cpp
     DeploymentS.cpp
-    Deployment_RepositoryManagerS.cpp
-    Deployment_NodeManagerS.cpp
-    Deployment_NodeApplicationManagerS.cpp
-    Deployment_ApplicationManagerS.cpp
-    Deployment_DomainApplicationManagerS.cpp
-    Deployment_ExecutionManagerS.cpp
+    RepositoryManagerS.cpp
+    NodeManagerS.cpp
+    NodeApplicationManagerS.cpp
+    DomainApplicationManagerS.cpp
+    ExecutionManagerS.cpp
     NodeApp_CB_Impl.cpp
-    Deployment_TargetManagerS.cpp
-    CIAO_NodeApplication_CallBackS.cpp
+    NodeApplication_CallBackS.cpp
+    ServerResourcesS.cpp
+    Deployment_EventsS.cpp
   }
 
 }
 
-project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt {
+  includes     += $(CIAO_ROOT)/ciao
   includes     += $(CIAO_ROOT)
   sharedname   =  CIAO_DnC_Server
   idlflags     += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
   dynamicflags =  CIAO_SERVER_BUILD_DLL
 
   IDL_Files {
+
   }
 
   Source_Files {
diff --git a/CIAO/ciao/CCM_EnterpriseComponent.idl b/CIAO/ciao/CCM_EnterpriseComponent.idl
deleted file mode 100644
index b3f3d1b9432..00000000000
--- a/CIAO/ciao/CCM_EnterpriseComponent.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_ENTERPRISECOMPONENT_IDL)
-#define CCM_ENTERPRISECOMPONENT_IDL
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface EnterpriseComponent {};
-};
-#endif /* CCM_CONTAINER_IDL */
diff --git a/CIAO/ciao/CCM_Entity2Context.idl b/CIAO/ciao/CCM_Entity2Context.idl
deleted file mode 100644
index 4ed01244408..00000000000
--- a/CIAO/ciao/CCM_Entity2Context.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container_Ex.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_ENTITY2CONTEXT_IDL)
-#define CCM_ENTITY2CONTEXT_IDL
-
-#include "ciao/CCM_Session2Context.idl"
-#include "ciao/CCM_EntityContext.idl"
-#include "ciao/CCM_ComponentId.idl"
-
-// *************** Extended Container Interfaces ***************
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface Entity2Context : EntityContext, CCM2Context
-  {
-    ComponentId get_component_id ()
-      raises (IllegalState);
-
-    ComponentId create_component_id (in FacetId target_facet,
-                                     in SegmentId target_segment,
-                                     in SegmentDescrSeq seq_descrs);
-
-    ComponentId create_monolithic_component_id (in FacetId target_facet,
-                                                in StateIdValue sid);
-
-    Object create_ref_from_cid (in CORBA::RepositoryId repid,
-                                in ComponentId cid);
-
-    ComponentId get_cid_from_ref (in Object objref)
-      raises (BadComponentReference);
-  };
-};
-#endif /* CCM_ENTITY2CONTEXT_IDL */
diff --git a/CIAO/ciao/CCM_EntityComponent.idl b/CIAO/ciao/CCM_EntityComponent.idl
deleted file mode 100644
index 0b04ad7131a..00000000000
--- a/CIAO/ciao/CCM_EntityComponent.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_ENTITYCOMPONENT_IDL)
-#define CCM_ENTITYCOMPONENT_IDL
-
-#include "ciao/CCM_CCMException.idl"
-#include "ciao/CCM_EnterpriseComponent.idl"
-#include "ciao/CCM_EntityContext.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface EntityComponent : EnterpriseComponent
-  {
-    void set_entity_context (in EntityContext ctx)
-      raises (CCMException);
-
-    void unset_entity_context ()
-      raises (CCMException);
-
-    void ccm_activate ()
-      raises (CCMException);
-
-    void ccm_load ()
-      raises (CCMException);
-
-    void ccm_store ()
-      raises (CCMException);
-
-    void ccm_passivate ()
-      raises (CCMException);
-
-    void ccm_remove ()
-      raises (CCMException);
-  };
-};
-#endif /* CCM_ENTITYCOMPONENT_IDL */
diff --git a/CIAO/ciao/CCM_EntityContext.idl b/CIAO/ciao/CCM_EntityContext.idl
deleted file mode 100644
index ee02b728afb..00000000000
--- a/CIAO/ciao/CCM_EntityContext.idl
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_ENTITYCONTEXT_IDL)
-#define CCM_ENTITYCONTEXT_IDL
-
-#include "ciao/CCM_Context.idl"
-#include "ciao/CCM_Object.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface EntityContext : CCMContext
-  {
-    Object get_CCM_object ()
-      raises (IllegalState);
-
-    PrimaryKeyBase get_primary_key ()
-      raises (IllegalState);
-  };
-};
-#endif /* CCM_ENTITYCONTEXT_IDL */
diff --git a/CIAO/ciao/CCM_Enumeration.idl b/CIAO/ciao/CCM_Enumeration.idl
deleted file mode 100644
index 55d64b68e07..00000000000
--- a/CIAO/ciao/CCM_Enumeration.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Component.idl
- */
-
-#if !defined (CCM_ENUMERATION_IDL)
-#define CCM_ENUMERATION_IDL
-
-#include "ciao/CCM_Object.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  /// @@ Enumeration and DefaultEnumeration are only for EJB to CCM
-  /// mapping?  At any rate, we should be able to skip them for now.
-  abstract valuetype Enumeration
-  {
-    boolean has_more_elements();
-    CCMObject next_element();
-  };
-
-  typedef sequence<CCMObject> CCMObjectSeq;
-
-  valuetype DefaultEnumeration : Enumeration
-  {
-    private CCMObjectSeq objects;
-  };
-};
-#endif /* CCM_ENUMERATION_IDL */
diff --git a/CIAO/ciao/CCM_Event.idl b/CIAO/ciao/CCM_Event.idl
new file mode 100644
index 00000000000..f6a4755f8f1
--- /dev/null
+++ b/CIAO/ciao/CCM_Event.idl
@@ -0,0 +1,117 @@
+// $Id$
+
+/**
+ * @@ Compile this file with:
+ *
+ *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
+ *          -Wb,export_macro=CIAO_Export \
+ *          -Wb,export_include=CIAO_export.h \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          CCM_Event.idl
+ */
+
+//#define CIAO_HAS_IMPORT_KEYWORD
+
+#if !defined (CCM_EVENT_IDL)
+#define CCM_EVENT_IDL
+
+#include "CCM_Base.idl"
+
+module Components
+{
+  typeprefix Components "omg.org";
+
+  abstract valuetype EventBase {};
+
+  interface EventConsumerBase
+  {
+    void push_event (in EventBase evt) raises (BadEventType);
+
+    // CIAO-specific operation to treat event service as regular event 
+    // sink port. The source_id needs to be passed in to identify the
+    // source of the publisher port to support event filtering mechanism.
+    void ciao_push_event (in Components::EventBase evt, 
+                          in string source_id,
+                          in CORBA::TypeCode tc)
+      raises (BadEventType);
+
+    // CIAO-specific operation to help support the capability
+    // to subscribe to eventtypes more derived than the type
+    // consumed.
+    boolean ciao_is_substitutable (in string event_repo_id);
+  };
+
+  valuetype ConsumerDescription : PortDescription
+  {
+    public EventConsumerBase consumer;
+  };
+  typedef sequence<ConsumerDescription> ConsumerDescriptions;
+
+  valuetype EmitterDescription : PortDescription
+  {
+    public EventConsumerBase consumer;
+  };
+  typedef sequence<EmitterDescription> EmitterDescriptions;
+
+  valuetype SubscriberDescription
+  {
+    public Cookie ck;
+    public EventConsumerBase consumer;
+  };
+  typedef sequence<SubscriberDescription> SubscriberDescriptions;
+
+  valuetype PublisherDescription : PortDescription
+  {
+    public SubscriberDescriptions consumer;
+  };
+  typedef sequence<PublisherDescription> PublisherDescriptions;
+
+  interface Events
+  {
+    EventConsumerBase get_consumer (in FeatureName sink_name)
+      raises (InvalidName);
+
+    /**
+     * @todo Mismatch with 06-04-01, AlreadyConnected is not listed in the
+     * spec with this operation
+     */
+    Cookie subscribe (in FeatureName publisher_name,
+                      in EventConsumerBase subscriber)
+      raises (InvalidName,
+              AlreadyConnected,
+              InvalidConnection,
+              ExceededConnectionLimit);
+
+    EventConsumerBase unsubscribe (in FeatureName publisher_name,
+                                   in Cookie ck)
+      raises (InvalidName,
+              InvalidConnection);
+
+    void connect_consumer (in FeatureName emitter_name,
+                           in EventConsumerBase consumer)
+      raises (InvalidName,
+              AlreadyConnected,
+              InvalidConnection);
+
+    EventConsumerBase disconnect_consumer (in FeatureName source_name)
+      raises (InvalidName,
+              NoConnection);
+
+    ConsumerDescriptions get_all_consumers ();
+
+    ConsumerDescriptions get_named_consumers (in NameList names)
+      raises (InvalidName);
+
+    EmitterDescriptions get_all_emitters ();
+
+    EmitterDescriptions get_named_emitters (in NameList names)
+      raises (InvalidName);
+
+    PublisherDescriptions get_all_publishers ();
+
+    PublisherDescriptions get_named_publishers (in NameList names)
+      raises (InvalidName);
+  };
+};
+#endif /* CCM_EVENT_IDL */
diff --git a/CIAO/ciao/CCM_EventBase.idl b/CIAO/ciao/CCM_EventBase.idl
deleted file mode 100644
index e97a474802a..00000000000
--- a/CIAO/ciao/CCM_EventBase.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Event.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_EVENTBASE_IDL)
-#define CCM_EVENTBASE_IDL
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  abstract valuetype EventBase {};
-};
-#endif /* CCM_EVENTBASE_IDL */
diff --git a/CIAO/ciao/CCM_EventConsumerBase.idl b/CIAO/ciao/CCM_EventConsumerBase.idl
deleted file mode 100644
index 0e1facf5940..00000000000
--- a/CIAO/ciao/CCM_EventConsumerBase.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Event.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_EVENTCONSUMERBASE_IDL)
-#define CCM_EVENTCONSUMERBASE_IDL
-
-#include "ciao/CCM_EventBase.idl"
-#include "tao/Typecode_types.pidl"
-#include "tao/orb_types.pidl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  exception BadEventType
-  {
-    CORBA::RepositoryId expected_event_type;
-  };
-
-  interface EventConsumerBase
-  {
-    void push_event (in EventBase evt) raises (BadEventType);
-
-    // CIAO-specific operation to treat event service as regular event
-    // sink port. The source_id needs to be passed in to identify the
-    // source of the publisher port to support event filtering mechanism.
-    void ciao_push_event (in EventBase evt,
-                          in string source_id,
-                          in CORBA::TypeCode tc)
-      raises (BadEventType);
-
-    // CIAO-specific operation to help support the capability
-    // to subscribe to eventtypes more derived than the type
-    // consumed.
-    boolean ciao_is_substitutable (in string event_repo_id);
-  };
-};
-#endif /* CCM_EVENTCONSUMERBASE_IDL */
diff --git a/CIAO/ciao/CCM_Events.idl b/CIAO/ciao/CCM_Events.idl
deleted file mode 100644
index 4abc6ca4115..00000000000
--- a/CIAO/ciao/CCM_Events.idl
+++ /dev/null
@@ -1,102 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Event.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_EVENTS_IDL)
-#define CCM_EVENTS_IDL
-
-#include "ciao/CCM_Base.idl"
-#include "ciao/CCM_Navigation.idl"
-#include "ciao/CCM_Receptacle.idl"
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_EventBase.idl"
-#include "ciao/CCM_EventConsumerBase.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  valuetype ConsumerDescription : PortDescription
-  {
-    public EventConsumerBase consumer;
-  };
-  typedef sequence<ConsumerDescription> ConsumerDescriptions;
-
-  valuetype EmitterDescription : PortDescription
-  {
-    public EventConsumerBase consumer;
-  };
-  typedef sequence<EmitterDescription> EmitterDescriptions;
-
-  valuetype SubscriberDescription
-  {
-    public Cookie ck;
-    public EventConsumerBase consumer;
-  };
-  typedef sequence<SubscriberDescription> SubscriberDescriptions;
-
-  valuetype PublisherDescription : PortDescription
-  {
-    public SubscriberDescriptions consumer;
-  };
-  typedef sequence<PublisherDescription> PublisherDescriptions;
-
-  interface Events
-  {
-    EventConsumerBase get_consumer (in FeatureName sink_name)
-      raises (InvalidName);
-
-    /**
-     * @todo Mismatch with 06-04-01, AlreadyConnected is not listed in the
-     * spec with this operation.
-     */
-    Cookie subscribe (in FeatureName publisher_name,
-                      in EventConsumerBase subscriber)
-      raises (InvalidName,
-              AlreadyConnected,
-              InvalidConnection,
-              ExceededConnectionLimit);
-
-    EventConsumerBase unsubscribe (in FeatureName publisher_name,
-                                   in Cookie ck)
-      raises (InvalidName,
-              InvalidConnection);
-
-    void connect_consumer (in FeatureName emitter_name,
-                           in EventConsumerBase consumer)
-      raises (InvalidName,
-              AlreadyConnected,
-              InvalidConnection);
-
-    EventConsumerBase disconnect_consumer (in FeatureName source_name)
-      raises (InvalidName,
-              NoConnection);
-
-    ConsumerDescriptions get_all_consumers ();
-
-    ConsumerDescriptions get_named_consumers (in NameList names)
-      raises (InvalidName);
-
-    EmitterDescriptions get_all_emitters ();
-
-    EmitterDescriptions get_named_emitters (in NameList names)
-      raises (InvalidName);
-
-    PublisherDescriptions get_all_publishers ();
-
-    PublisherDescriptions get_named_publishers (in NameList names)
-      raises (InvalidName);
-  };
-};
-#endif /* CCM_EVENT_IDL */
diff --git a/CIAO/ciao/CCM_ExecutorLocator.idl b/CIAO/ciao/CCM_ExecutorLocator.idl
deleted file mode 100644
index a764225af7c..00000000000
--- a/CIAO/ciao/CCM_ExecutorLocator.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container_Ex.idl
- */
-
-#if !defined (CCM_EXECUTORLOCATOR_IDL)
-#define CCM_EXECUTORLOCATOR_IDL
-
-#include "ciao/CCM_EnterpriseComponent.idl"
-#include "ciao/CCM_CCMException.idl"
-#include "ciao/CCM_Object.idl"
-
-// *************** Extended Container Interfaces ***************
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface ExecutorLocator : EnterpriseComponent
-  {
-    Object obtain_executor (in string name)
-      raises (CCMException);
-
-    void release_executor (in Object exc)
-      raises (CCMException);
-
-    void configuration_complete()
-      raises (InvalidConfiguration);
-  };
-};
-#endif /* CCM_EXECUTORLOCATOR_IDL */
diff --git a/CIAO/ciao/CCM_ExtensionComponent.idl b/CIAO/ciao/CCM_ExtensionComponent.idl
deleted file mode 100644
index 585e5e85f64..00000000000
--- a/CIAO/ciao/CCM_ExtensionComponent.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#if !defined (CCM_EXTENSIONCOMPONENT_IDL)
-#define CCM_EXTENSIONCOMPONENT_IDL
-
-#include "ciao/CCM_EnterpriseComponent.idl"
-#include "ciao/CCM_ExtensionContext.idl"
-
-module Components
-{
-  local interface ExtensionComponent : EnterpriseComponent
-  {
-    void set_extension_context (in ExtensionContext ctx)
-      raises (CCMException);
-    void ccm_remove ()
-      raises (CCMException);
-  };
-};
-
-#endif /* CCM_EXTENSIONCOMPONENT_IDL */
diff --git a/CIAO/ciao/CCM_ExtensionContext.idl b/CIAO/ciao/CCM_ExtensionContext.idl
deleted file mode 100644
index 33fa969b436..00000000000
--- a/CIAO/ciao/CCM_ExtensionContext.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#if !defined (CCM_EXTENSIONCONTEXT_IDL)
-#define CCM_EXTENSIONCONTEXT_IDL
-
-#include "ciao/CCM_Context.idl"
-#include "ciao/CCM_ClientContainerInterceptorRegistration.idl"
-#include "ciao/CCM_ServerContainerInterceptorRegistration.idl"
-#include "ciao/CCM_StubContainerInterceptorRegistration.idl"
-#include "ciao/CCM_ServantContainerInterceptorRegistration.idl"
-#include "ciao/CCM_CCMException.idl"
-
-module Components
-{
-  local interface ExtensionContext : CCMContext
-  {
-    Components::ContainerPortableInterceptor::ClientContainerInterceptorRegistration
-      get_client_interceptor_registration ()
-        raises (CCMException);
-    Components::ContainerPortableInterceptor::ServerContainerInterceptorRegistration
-      get_server_interceptor_registration ()
-        raises (CCMException);
-    Components::ContainerPortableInterceptor::StubContainerInterceptorRegistration
-      get_stub_interceptor_registration()
-        raises (CCMException);
-    Components::ContainerPortableInterceptor::ServantContainerInterceptorRegistration
-      get_servant_interceptor_registration()
-        raises (CCMException);
-
-    Cookie install_service_reference(in string service_id, in Object objref)
-      raises (CCMException);
-    Object uninstall_service_reference(in Cookie ck)
-      raises (CCMException);
-  };
-};
-
-#endif /* CCM_EXTENSIONCONTEXT_IDL */
diff --git a/CIAO/ciao/CCM_Home.idl b/CIAO/ciao/CCM_Home.idl
deleted file mode 100644
index 192188dda3d..00000000000
--- a/CIAO/ciao/CCM_Home.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Component.idl
- */
-
-#if !defined (CCM_HOME_IDL)
-#define CCM_HOME_IDL
-
-#include "tao/IFR_Client/IFR_Base.pidl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  typedef unsigned long FailureReason;
-
-  exception CreateFailure {
-    FailureReason reason;
-  };
-  exception FinderFailure
-  {
-    FailureReason reason;
-  };
-  exception RemoveFailure
-  {
-    FailureReason reason;
-  };
-
-  exception DuplicateKeyValue {};
-  exception InvalidKey {};
-  exception UnknownKeyValue {};
-
-  interface CCMObject;
-
-  interface CCMHome
-  {
-    CORBA::IRObject get_component_def ();
-    CORBA::IRObject get_home_def ();
-    void remove_component ( in CCMObject comp)
-      raises (RemoveFailure);
-  };
-};
-
-#endif /* CCM_HOME_IDL */
diff --git a/CIAO/ciao/CCM_HomeConfiguration.idl b/CIAO/ciao/CCM_HomeConfiguration.idl
deleted file mode 100644
index d3d488ae11b..00000000000
--- a/CIAO/ciao/CCM_HomeConfiguration.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Component.idl
- */
-
-#if !defined (CCM_HOMECONFIGURATION_IDL)
-#define CCM_HOMECONFIGURATION_IDL
-
-#include "ciao/CCM_Configurator.idl"
-#include "ciao/CCM_StandardConfigurator.idl"
-#include "ciao/CCM_Home.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  interface HomeConfiguration : CCMHome
-  {
-    void set_configurator (in Configurator cfg);
-    void set_configuration_values (in ConfigValues config);
-    void complete_component_configuration (in boolean b);
-    void disable_home_configuration();
-  };
-};
-#endif /* CCM_HOMECONFIGURATOR_IDL */
diff --git a/CIAO/ciao/CCM_HomeExecutorBase.idl b/CIAO/ciao/CCM_HomeExecutorBase.idl
deleted file mode 100644
index e1db55b9afc..00000000000
--- a/CIAO/ciao/CCM_HomeExecutorBase.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_HOMEEXECUTORBASE_IDL)
-#define CCM_HOMEEXECUTORBASE_IDL
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface HomeExecutorBase
-  {
-  };
-};
-#endif /* CCM_HOMEEXECUTORBASE_IDL */
diff --git a/CIAO/ciao/CCM_HomeFinder.idl b/CIAO/ciao/CCM_HomeFinder.idl
deleted file mode 100644
index f5ffca44442..00000000000
--- a/CIAO/ciao/CCM_HomeFinder.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_HomeFinder.idl
- */
-
-#if !defined (CCM_HOMEFINDER_IDL)
-#define CCM_HOMEFINDER_IDL
-
-#include "tao/orb_types.pidl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  exception HomeNotFound {};
-
-  interface CCMHome;
-
-  interface HomeFinder
-  {
-    CCMHome find_home_by_component_type (in CORBA::RepositoryId comp_repid)
-      raises (HomeNotFound);
-
-    CCMHome find_home_by_home_type (in CORBA::RepositoryId home_repid)
-      raises (HomeNotFound);
-
-    CCMHome find_home_by_name (in string home_name)
-      raises (HomeNotFound);
-  };
-};
-#endif /* CCM_HOMEFINDER_IDL */
diff --git a/CIAO/ciao/CCM_HomeRegistration.idl b/CIAO/ciao/CCM_HomeRegistration.idl
deleted file mode 100644
index e7ee299e11c..00000000000
--- a/CIAO/ciao/CCM_HomeRegistration.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container_Ex.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_HOMEREGISTRATION_IDL)
-#define CCM_HOMEREGISTRATION_IDL
-
-#include "ciao/CCM_Home.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface HomeRegistration
-  {
-    void register_home (in CCMHome home_ref,
-                        in string home_name);
-
-    void unregister_home (in CCMHome home_ref);
-  };
-
-};
-#endif /* CCM_HOMEREGISTRATION_IDL */
diff --git a/CIAO/ciao/CCM_InvalidRegistration.idl b/CIAO/ciao/CCM_InvalidRegistration.idl
deleted file mode 100644
index a5dc36c640e..00000000000
--- a/CIAO/ciao/CCM_InvalidRegistration.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#if !defined (CCM_INVALIDREGISTRATION_IDL)
-#define CCM_INVALIDREGISTRATION_IDL
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    exception InvalidRegistration { };
-  };
-};
-
-#endif /* CCM_INVALIDREGISTRATION_IDL */
diff --git a/CIAO/ciao/CCM_KeylessCCMHome.idl b/CIAO/ciao/CCM_KeylessCCMHome.idl
deleted file mode 100644
index 747c45a5117..00000000000
--- a/CIAO/ciao/CCM_KeylessCCMHome.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Component.idl
- */
-
-#if !defined (CCM_KEYLESSCCMHOME_IDL)
-#define CCM_KEYLESSCCMHOME_IDL
-
-#include "ciao/CCM_Home.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  interface KeylessCCMHome
-  {
-    CCMObject create_component()
-      raises (CreateFailure);
-  };
-
-};
-#endif /* CCM_KEYLESSCCMHOME_IDL */
diff --git a/CIAO/ciao/CCM_Navigation.idl b/CIAO/ciao/CCM_Navigation.idl
deleted file mode 100644
index 53b74e2a10c..00000000000
--- a/CIAO/ciao/CCM_Navigation.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -I W:/ACE_wrappers/TAO Component_Base.idl
- *     tao_idl -I ../.. \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Navigation.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_NAVIGATION_IDL)
-#define CCM_NAVIGATION_IDL
-
-#include "tao/orb_types.pidl"
-#include "tao/StringSeq.pidl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  typedef string FeatureName;
-  typedef sequence<FeatureName> NameList;
-
-  valuetype PortDescription
-  {
-    public FeatureName name;
-    public CORBA::RepositoryId type_id;
-  };
-
-  valuetype FacetDescription : PortDescription
-  {
-    public Object facet_ref;
-  };
-
-  typedef sequence<FacetDescription> FacetDescriptions;
-
-  exception InvalidName {};
-  interface Navigation
-  {
-    Object provide_facet (in FeatureName name)
-      raises (InvalidName);
-    FacetDescriptions get_all_facets();
-    FacetDescriptions get_named_facets (in NameList names)
-      raises (InvalidName);
-    boolean same_component (in Object object_ref);
-  };
-};
-#endif /* CCM_NAVIGATION_IDL */
diff --git a/CIAO/ciao/CCM_Object.idl b/CIAO/ciao/CCM_Object.idl
deleted file mode 100644
index fc869afa97c..00000000000
--- a/CIAO/ciao/CCM_Object.idl
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Component.idl
- */
-
-#if !defined (CCM_OBJECT_IDL)
-#define CCM_OBJECT_IDL
-
-#include "ciao/CCM_Events.idl"
-#include "ciao/CCM_Navigation.idl"
-#include "ciao/CCM_Home.idl"
-#include "ciao/CCM_PrimaryKeyBase.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  /// This typedef and consts shouldn't be here but are here because of CIAO
-  /// specific additions
-  typedef FailureReason InvalidConfigurationReason;
-  const InvalidConfigurationReason UnknownConfigValueName = 0;
-  const InvalidConfigurationReason InvalidConfigValueType = 1;
-  const InvalidConfigurationReason ConfigValueRequired = 2;
-  const InvalidConfigurationReason ConfigValueNotExpected = 3;
-
-  /// Shouldn't be here but is now here because of CIAO additions
-  exception InvalidConfiguration
-  {
-    InvalidConfigurationReason reason;
-    FeatureName name;
-  };
-
-  valuetype ComponentPortDescription
-  {
-    public FacetDescriptions facets;
-    public ReceptacleDescriptions receptacles;
-    public ConsumerDescriptions consumers;
-    public EmitterDescriptions emitters;
-    public PublisherDescriptions publishers;
-  };
-
-  /// CIAO specific forward declaration, shouldn't be here
-  interface StandardConfigurator;
-
-  exception NoKeyAvailable {};
-
-  interface CCMObject : Navigation, Receptacles, Events
-  {
-    CORBA::IRObject get_component_def ( );
-    CCMHome get_ccm_home( );
-    PrimaryKeyBase get_primary_key( )
-      raises (NoKeyAvailable);
-    void configuration_complete ()
-      raises (InvalidConfiguration);
-    void remove()
-      raises (RemoveFailure);
-    ComponentPortDescription get_all_ports ();
-
-    /// Factory method to return a StandardConfigurator interface.
-    /// CIAO specific
-    StandardConfigurator get_standard_configurator ( );
-
-    /// CIAO specific operations to have some control on when and how
-    /// to activate  components.
-    /**
-     * This is all from our work on ARMS where we needed to know whether
-     * every component has been configured, say for example to use
-     * logging in the assembly which could in turn be provided by a
-     * component. To get around all this we are adding some methods on
-     * this till we think of some standard way to do this. The problem
-     * is that the deployer should be able to call this as opposed to
-     * the home calling it as soon as the component is created.
-     *
-     * All these operations are called in the order mentioned, ie. the
-     * deployer calls ciao_preactivate () on all components, then
-     * ciao_activate and then ciao_postactivate (). The speciality is
-     * that these operations would be invoked on every target object
-     * before the next call is made. It is similar to the way
-     * portable interceptors work, trying to get everything onto the
-     * flow stack, but differ in the intention.
-     */
-    void ciao_preactivate ()
-      raises (InvalidConfiguration);
-
-    /// CIAO specific
-    void ciao_activate ()
-      raises (InvalidConfiguration);
-
-    /// CIAO specific
-    void ciao_postactivate ()
-      raises (InvalidConfiguration);
-
-    /// CIAO specific
-    void ciao_passivate ()
-      raises (InvalidConfiguration);
-  };
-};
-#endif /* CCM_OBJECT_IDL */
diff --git a/CIAO/ciao/CCM_PrimaryKeyBase.idl b/CIAO/ciao/CCM_PrimaryKeyBase.idl
deleted file mode 100644
index 4730208b2f9..00000000000
--- a/CIAO/ciao/CCM_PrimaryKeyBase.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Component.idl
- */
-
-#if !defined (CCM_PRIMARYKEYBASE_IDL)
-#define CCM_PRIMARYKEYBASE_IDL
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  abstract valuetype PrimaryKeyBase {};
-
-};
-#endif /* CCM_PRIMARYKEYBASE_IDL */
diff --git a/CIAO/ciao/CCM_ProxyHomeRegistration.idl b/CIAO/ciao/CCM_ProxyHomeRegistration.idl
deleted file mode 100644
index 084b113a50d..00000000000
--- a/CIAO/ciao/CCM_ProxyHomeRegistration.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container_Ex.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_PROXYHOMEREGISTRATION_IDL)
-#define CCM_PROXYHOMEREGISTRATION_IDL
-
-#include "ciao/CCM_HomeRegistration.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  exception UnknownActualHome {};
-  exception ProxyHomeNotSupported {};
-
-  local interface ProxyHomeRegistration : HomeRegistration
-  {
-    void register_proxy_home (in CCMHome rhome,
-                              in CCMHome ahome)
-      raises (UnknownActualHome,
-              ProxyHomeNotSupported);
-  };
-};
-#endif /* CCM_PROXYHOMEREGISTRATION_IDL */
diff --git a/CIAO/ciao/CCM_QoS.idl b/CIAO/ciao/CCM_QoS.idl
deleted file mode 100644
index f78f98d3665..00000000000
--- a/CIAO/ciao/CCM_QoS.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#if !defined (CCM_QOS_IDL)
-#define CCM_QOS_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_CCMException.idl"
-
-module Components
-{
-  module QoS {
-    struct QoSInstance {
-      string dimension;
-      any value;
-    };
-    typedef sequence<QoSInstance> QoSInstances;
-    struct QoSConstraint {
-      string characteristic;
-      QoSInstances instances;
-    };
-    typedef sequence<QoSConstraint> QoSConstraints;
-    interface Negotiation
-    {
-      Components::Cookie require_qos(in QoSConstraint requirements, in string client_id)
-        raises (CCMException);
-      void release_qos (in Components::Cookie ck);
-    };
-  };
-};
-
-#endif /* CCM_QOS_IDL */
diff --git a/CIAO/ciao/CCM_Receptacle.idl b/CIAO/ciao/CCM_Receptacle.idl
deleted file mode 100644
index 2ed7863b349..00000000000
--- a/CIAO/ciao/CCM_Receptacle.idl
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -I W:/ACE_wrappers/TAO Component_Base.idl
- *     tao_idl -I ../.. \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Base.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_RECEPTACLE_IDL)
-#define CCM_RECEPTACLE_IDL
-
-#include "ciao/CCM_Base.idl"
-#include "ciao/CCM_Navigation.idl"
-#include "ciao/CCM_Cookie.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  valuetype ConnectionDescription
-  {
-    public Cookie ck;
-    public Object objref;
-  };
-  typedef sequence<ConnectionDescription> ConnectionDescriptions;
-
-  valuetype ReceptacleDescription : PortDescription
-  {
-    public boolean is_multiple;
-    public ConnectionDescriptions connections;
-  };
-  typedef sequence<ReceptacleDescription> ReceptacleDescriptions;
-
-  exception ExceededConnectionLimit {};
-  exception CookieRequired {};
-
-  interface Receptacles
-  {
-    Cookie connect (in FeatureName name, in Object connection )
-      raises (InvalidName,
-              InvalidConnection,
-              AlreadyConnected,
-              ExceededConnectionLimit);
-
-    Object disconnect (in FeatureName name, in Cookie ck)
-      raises (InvalidName,
-              InvalidConnection,
-              CookieRequired,
-              NoConnection);
-
-    ConnectionDescriptions get_connections (in FeatureName name)
-      raises (InvalidName);
-
-    ReceptacleDescriptions get_all_receptacles ();
-
-    ReceptacleDescriptions get_named_receptacles (in NameList names)
-      raises (InvalidName);
-  };
-};
-#endif /* CCM_RECEPTACLE_IDL */
diff --git a/CIAO/ciao/CCM_ServantContainerInterceptor.idl b/CIAO/ciao/CCM_ServantContainerInterceptor.idl
deleted file mode 100644
index 884a1af2599..00000000000
--- a/CIAO/ciao/CCM_ServantContainerInterceptor.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-#if !defined (CCM_SERVANTCONTAINERINTERCEPTOR_IDL)
-#define CCM_SERVANTCONTAINERINTERCEPTOR_IDL
-
-#include "ciao/CCM_ContainerInterceptor.idl"
-#include "ciao/CCM_ContainerServantRequestInfo.idl"
-#include "tao/PI/PIForwardRequest.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ServantContainerInterceptor : ContainerInterceptor
-    {
-      void servant_receive_request (in ContainerServantRequestInfo info, out boolean proceed_call)
-        raises (PortableInterceptor::ForwardRequest);
-      void servant_send_reply (in ContainerServantRequestInfo info, out boolean proceed_call);
-      void servant_send_exception (in ContainerServantRequestInfo info, out boolean proceed_call)
-        raises (PortableInterceptor::ForwardRequest);
-      void servant_send_other (in ContainerServantRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-    };
-  };
-};
-#endif /* CCM_SERVANTCONTAINERINTERCEPTOR_IDL */
diff --git a/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl
deleted file mode 100644
index 39448de9a58..00000000000
--- a/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL)
-#define CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_InvalidRegistration.idl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ServantContainerInterceptor;
-
-    local interface ServantContainerInterceptorRegistration
-    {
-      Components::Cookie register_servant_interceptor (in ServantContainerInterceptor ci);
-      ServantContainerInterceptor unregister_servant_interceptor (in Components::Cookie cookie)
-        raises(InvalidRegistration);
-    };
-  };
-};
-
-#endif /* CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL */
diff --git a/CIAO/ciao/CCM_ServerContainerInterceptor.idl b/CIAO/ciao/CCM_ServerContainerInterceptor.idl
deleted file mode 100644
index 58ce5cc69a7..00000000000
--- a/CIAO/ciao/CCM_ServerContainerInterceptor.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-#if !defined (CCM_SERVERCONTAINERINTERCEPTOR_IDL)
-#define CCM_SERVERCONTAINERINTERCEPTOR_IDL
-
-#include "ciao/CCM_ContainerInterceptor.idl"
-#include "ciao/CCM_ContainerServerRequestInfo.idl"
-#include "tao/PI/PIForwardRequest.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ServerContainerInterceptor : ContainerInterceptor
-    {
-      void receive_request_service_contexts (in ContainerServerRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void receive_request (in ContainerServerRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void send_reply (in ContainerServerRequestInfo info);
-      void send_exception (in ContainerServerRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void send_other (in ContainerServerRequestInfo info)
-       raises (PortableInterceptor::ForwardRequest);
-    };
-  };
-};
-#endif /* CCM_SERVERCONTAINERINTERCEPTOR_IDL */
diff --git a/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl
deleted file mode 100644
index b4a3dafac26..00000000000
--- a/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL)
-#define CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_InvalidRegistration.idl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ServerContainerInterceptor;
-
-    local interface ServerContainerInterceptorRegistration
-    {
-      Components::Cookie register_server_interceptor (in ServerContainerInterceptor ci);
-      ServerContainerInterceptor unregister_client_interceptor (in Components::Cookie cookie)
-        raises(InvalidRegistration);
-    };
-  };
-};
-
-#endif /* CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL */
diff --git a/CIAO/ciao/CCM_Session2Context.idl b/CIAO/ciao/CCM_Session2Context.idl
deleted file mode 100644
index 8fec0e9441c..00000000000
--- a/CIAO/ciao/CCM_Session2Context.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container_Ex.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_SESSION2CONTEXT_IDL)
-#define CCM_SESSION2CONTEXT_IDL
-
-#include "ciao/CCM_CCM2Context.idl"
-
-// *************** Extended Container Interfaces ***************
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  enum BadComponentReferenceReason
-  {
-    NON_LOCAL_REFERENCE,
-    NON_COMPONENT_REFERENCE,
-    WRONG_CONTAINER
-  };
-  exception BadComponentReference
-  {
-    BadComponentReferenceReason reason;
-  };
-
-  local interface Session2Context : SessionContext, CCM2Context
-  {
-    Object create_ref (in CORBA::RepositoryId repid);
-
-    Object create_ref_from_oid (in CORBA::OctetSeq oid,
-                                in CORBA::RepositoryId repid);
-
-    CORBA::OctetSeq get_oid_from_ref (in Object objref)
-      raises (IllegalState,
-              BadComponentReference);
-  };
-};
-#endif /* CCM_SESSION2CONTEXT_IDL */
diff --git a/CIAO/ciao/CCM_SessionComponent.idl b/CIAO/ciao/CCM_SessionComponent.idl
deleted file mode 100644
index c4d72fffa05..00000000000
--- a/CIAO/ciao/CCM_SessionComponent.idl
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_SESSIONCOMPONENT_IDL)
-#define CCM_SESSIONCOMPONENT_IDL
-
-#include "ciao/CCM_SessionContext.idl"
-#include "ciao/CCM_CCMException.idl"
-#include "ciao/CCM_EnterpriseComponent.idl"
-
-// *************** Basic Container interfaces ***************
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface SessionComponent : EnterpriseComponent
-  {
-    void set_session_context ( in SessionContext ctx)
-      raises (CCMException);
-
-    void ccm_activate()
-      raises (CCMException);
-
-    void ccm_passivate()
-      raises (CCMException);
-
-    void ccm_remove ()
-      raises (CCMException);
-
-    /**
-     * This method is invoked before ccm_activate () is called. All
-     * components in the assembly get this callback before the
-     * ccm_activate () is called.
-     * @note CIAO specific
-     */
-    void ciao_preactivate ()
-      raises (CCMException);
-
-    /**
-     * This method is invoked after ccm_activate () is called. All
-     * components in the assembly get this callback after the
-     * ccm_activate () is called.
-     * @note CIAO specific
-     */
-    void ciao_postactivate ()
-      raises (CCMException);
-  };
-};
-#endif /* CCM_SESSIONCOMPONENT_IDL */
diff --git a/CIAO/ciao/CCM_SessionContext.idl b/CIAO/ciao/CCM_SessionContext.idl
deleted file mode 100644
index 24820fb5cce..00000000000
--- a/CIAO/ciao/CCM_SessionContext.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_SESSIONCONTEXT_IDL)
-#define CCM_SESSIONCONTEXT_IDL
-
-#include "ciao/CCM_Context.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface SessionContext : CCMContext
-  {
-    Object get_CCM_object()
-      raises (IllegalState);
-  };
-};
-#endif /* CCM_SESSIONCONTEXT_IDL */
diff --git a/CIAO/ciao/CCM_SessionSynchronization.idl b/CIAO/ciao/CCM_SessionSynchronization.idl
deleted file mode 100644
index 27614d3e14e..00000000000
--- a/CIAO/ciao/CCM_SessionSynchronization.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_SESSIONSYNCHRONIZATION_IDL)
-#define CCM_SESSIONSYNCHRONIZATION_IDL
-
-#include "ciao/CCM_CCMException.idl"
-
-// *************** Basic Container interfaces ***************
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  local interface SessionSynchronization
-  {
-    void after_begin ()
-      raises (CCMException);
-
-    void before_completion ()
-      raises (CCMException);
-
-    void after_completion (in boolean committed)
-      raises (CCMException);
-  };
-};
-#endif /* CCM_SESSIONSYNCHRONIZATION_IDL */
diff --git a/CIAO/ciao/CCM_StandardConfigurator.idl b/CIAO/ciao/CCM_StandardConfigurator.idl
deleted file mode 100644
index e883c72ad64..00000000000
--- a/CIAO/ciao/CCM_StandardConfigurator.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Component.idl
- */
-
-#if !defined (CCM_STANDARDCONFIGURATOR_IDL)
-#define CCM_STANDARDCONFIGURATOR_IDL
-
-#include "ciao/CCM_Configurator.idl"
-#include "ciao/CCM_Navigation.idl"
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  valuetype ConfigValue
-  {
-    public FeatureName name;
-    public any value;
-  };
-
-  typedef sequence<ConfigValue> ConfigValues;
-
-  interface StandardConfigurator : Configurator
-  {
-    void set_configuration (in ConfigValues descr);
-  };
-
-};
-#endif /* CCM_STANDARDCONFIGURATOR_IDL */
diff --git a/CIAO/ciao/CCM_StateIdFactory.idl b/CIAO/ciao/CCM_StateIdFactory.idl
deleted file mode 100644
index de6b3b51b13..00000000000
--- a/CIAO/ciao/CCM_StateIdFactory.idl
+++ /dev/null
@@ -1,72 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
- *          -Wb,export_macro=CIAO_Export \
- *          -Wb,export_include=CIAO_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          CCM_Container_Ex.idl
- */
-
-//#define CIAO_HAS_IMPORT_KEYWORD
-
-#if !defined (CCM_STATEIDFACTORY)
-#define CCM_STATEIDFACTORY
-
-#include <CosPersistentState.idl>
-
-module Components
-{
-  typeprefix Components "omg.org";
-
-  typedef short SegmentId;
-  const SegmentId COMPONENT_SEGMENT = 0;
-
-  typedef short FacetId;
-  const FacetId COMPONENT_FACET = 0;
-
-  typedef sequence<octet> IdData;
-  typedef CosPersistentState::Pid PersistentId;
-
-  exception InvalidStateIdData {};
-
-  typedef short StateIdType;
-  const StateIdType PERSISTENT_ID = 0;
-
-  abstract valuetype StateIdValue
-  {
-    StateIdType get_sid_type();
-    IdData get_sid_data();
-  };
-
-  local interface StateIdFactory
-  {
-    StateIdValue create (in IdData data)
-      raises (InvalidStateIdData);
-  };
-
-  valuetype PersistentIdValue : StateIdValue
-  {
-    private PersistentId pid;
-    PersistentId get_pid();
-    factory init (in PersistentId pid);
-  };
-
-  valuetype SegmentDescr
-  {
-    private StateIdValue sid;
-    private SegmentId seg;
-
-    StateIdValue get_sid();
-    SegmentId get_seg_id();
-    factory init (in StateIdValue sid,
-                  in SegmentId seg);
-  };
-
-  typedef sequence<SegmentDescr> SegmentDescrSeq;
-
-};
-#endif /* CCM_STATEIDFACTORY */
diff --git a/CIAO/ciao/CCM_StubContainerInterceptor.idl b/CIAO/ciao/CCM_StubContainerInterceptor.idl
deleted file mode 100644
index c183801af86..00000000000
--- a/CIAO/ciao/CCM_StubContainerInterceptor.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-#if !defined (CCM_STUBCONTAINERINTERCEPTOR_IDL)
-#define CCM_STUBCONTAINERINTERCEPTOR_IDL
-
-#include "ciao/CCM_ContainerInterceptor.idl"
-#include "ciao/CCM_ContainerStubRequestInfo.idl"
-#include "tao/PI/PIForwardRequest.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface StubContainerInterceptor : ContainerInterceptor
-    {
-      void stub_send_request (in ContainerStubRequestInfo info, out boolean con)
-        raises (PortableInterceptor::ForwardRequest);
-      void stub_receive_reply (in ContainerStubRequestInfo info, out boolean con);
-      void stub_receive_exception (in ContainerStubRequestInfo info, out boolean con)
-        raises(PortableInterceptor::ForwardRequest);
-      void stub_receive_other (in ContainerStubRequestInfo info)
-        raises(PortableInterceptor::ForwardRequest);
-    };
-  };
-};
-#endif /* CCM_STUBCONTAINERINTERCEPTOR_IDL */
diff --git a/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl
deleted file mode 100644
index 61ae62f51fa..00000000000
--- a/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL)
-#define CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_InvalidRegistration.idl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface StubContainerInterceptor;
-
-    local interface StubContainerInterceptorRegistration
-    {
-      Components::Cookie register_stub_interceptor (in StubContainerInterceptor ci);
-      StubContainerInterceptor unregister_stub_interceptor (in Components::Cookie cookie)
-        raises(InvalidRegistration);
-    };
-  };
-};
-
-#endif /* CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL */
diff --git a/CIAO/ciao/CIAO_NodeApplication_CallBack.idl b/CIAO/ciao/CIAO_NodeApplication_CallBack.idl
deleted file mode 100644
index 35cf8afabdd..00000000000
--- a/CIAO/ciao/CIAO_NodeApplication_CallBack.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-/**
- * This IDL file is used to combine the NodeApplication
- * interface with the NodeApplicationManager interface.
- *
- * NodeApplicationManager will be spawn NodeApplication.
- * The call back object will be used to get the objectref of
- * NodeApplication.
- */
-
-#include "ciao/Deployment_NodeApplication.idl"
-#include "ciao/Deployment_NodeApplicationManager.idl"
-
-module CIAO
-{
-  interface NodeApplication_Callback
-  {
-    Deployment::NodeApplicationManager
-      register_node_application (in Deployment::NodeApplication na,
-				 out Deployment::Properties properties);
-  };
-};
diff --git a/CIAO/ciao/CIAO_ServerResources.idl b/CIAO/ciao/CIAO_ServerResources.idl
deleted file mode 100644
index de14402f835..00000000000
--- a/CIAO/ciao/CIAO_ServerResources.idl
+++ /dev/null
@@ -1,237 +0,0 @@
-// $Id$
-
-/**
- * @file CIAO_ServerResources.idl
- *
- * @brief A collection of IDL data types for
- *
- * @author Nanbor Wang
- */
-
-#if !defined (CIAO_SERVERRESOURCES_IDL)
-#define CIAO_SERVERRESOURCES_IDL
-
-#include <orb.idl>
-
-module CIAO
-{
-  module DAnCE
-  {
-    /**
-     * @brief A single command line argument corresponds to a string as
-     * in the case of "argv".
-     */
-    typedef string CommandlineArg;
-    /**
-     * @brief A list of command line arguments which a
-     * NodeApplicationManager will use to start up the NodeApplication
-     * this list is associated to.  The command line arguments will be
-     * appended to the command line in order.
-     */
-    typedef sequence<CommandlineArg> CommandlineArgs;
-
-    /**
-     * @brief A string containing the filename of the svc.conf file the
-     * NodeApplication uses.  The current approach of specifying
-     * svc.conf filename directly some harder problems such as
-     * distribution of svc.conf files and the relative/absolute path to
-     * the svc.conf file (the ServerResrouces xml document will have to
-     * assume the svc.conf file will be available at specific location.)
-     */
-    typedef string SvcconfURI;
-
-    /**
-     * @brief enumeration of ORB Resource Types (ORT) supported in RT
-     * extension.
-     */
-    enum ORBResourceType
-      {
-        ORT_THREADPOOL,
-        ORT_THREADPOOLWITHLANES,
-        ORT_CONNECTIONBANDS
-      };
-
-    typedef short Priority;
-
-    /**
-     * @brief Define a threadpool resource that an ORB must provide
-     */
-    struct ORS_Threadpool
-    {
-      string Id;
-      unsigned long stacksize;
-      unsigned long static_threads;
-      unsigned long dynamic_threads;
-      Priority default_priority;
-      boolean allow_request_buffering;
-      unsigned long max_buffered_requests;
-      unsigned long max_request_buffer_size;
-    };
-
-    typedef sequence<ORS_Threadpool> ORS_ThreadpoolSeq;
-
-    /**
-     * @brief Defines the configuration of a threadpool lane.  We need
-     * to redefine it here to avoid dependency to RTCORBA library.
-     */
-    struct ORS_ThreadpoolLane
-    {
-      Priority lane_priority;
-      unsigned long static_threads;
-      unsigned long dynamic_threads;
-    };
-
-    /**
-     * @brief Defines a set of threadpool lanes.  We need
-     * to redefine it here to avoid dependency to RTCORBA library.
-     */
-    typedef sequence<ORS_ThreadpoolLane> ORS_ThreadpoolLanes;
-
-    /**
-     * @brief Defines a Threadpool with Lanes resource that an ORB
-     * must provide.
-     */
-    struct ORS_ThreadpoolWithLanes
-    {
-      string Id;
-      unsigned long stacksize;
-      ORS_ThreadpoolLanes threadpool_lanes;
-      boolean allow_borrowing;
-      boolean allow_request_buffering;
-      unsigned long max_buffered_requests;
-      unsigned long max_request_buffer_size;
-    };
-
-    typedef sequence<ORS_ThreadpoolWithLanes> ORS_ThreadpoolWithLanesSeq;
-
-    /**
-     * @brief Define a priority band for BandedConnection policies.
-     */
-    struct ORS_PriorityBand
-    {
-      Priority low;
-      Priority high;
-    };
-    /**
-     * @brief Define a list of priority bands for BandedConnection
-     * policies.
-     */
-    typedef sequence<ORS_PriorityBand> ORS_PriorityBands;
-
-    /**
-     * @brief Define the information needed to create a
-     * BandedConnection policy.  This info can be referred to via its
-     * name (Id).
-     */
-    struct ORS_ConnectionBands
-    {
-      string Id;
-      ORS_PriorityBands bands;
-    };
-
-    typedef sequence<ORS_ConnectionBands> ORS_ConnectionBandsSeq;
-
-    /**
-     * @brief Collection of resources managed by the NodeApplication
-     * ORB.
-     */
-    struct ORBResource
-    {
-      ORS_ThreadpoolSeq threadpool_list;
-
-      ORS_ThreadpoolWithLanesSeq threadpool_with_lanes_list;
-
-      ORS_ConnectionBandsSeq connection_bands_list;
-    };
-
-    typedef sequence<ORBResource, 1> ORBResources;
-
-    // =================================================================
-
-    /**
-     * @brief PolicyType supported by DAnCE extension.  Again, we are
-     * redefining these value to avoid dependencies to various ORB
-     * modules such as RTCORBA.
-     */
-    const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40;
-    const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41;
-    const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45;
-
-    enum PriorityModel
-      {
-        CLIENT_PROPAGATED,
-        SERVER_DECLARED
-      };
-
-    /**
-     * @brief Defines data required for creating a PriorityModel Policy
-     */
-    struct PriorityModelPolicyDef
-    {
-      PriorityModel priority_model;
-      Priority server_priority;
-    };
-
-    /**
-     * @brief Define data required for creating a Threadpool policy
-     */
-    struct ThreadpoolPolicyDef
-    {
-      string Id;                // Threadpool name defined in
-                                // ORBResource
-    };
-
-    /**
-     * @brief Define data required for creating a PriorityBandedConnection
-     * policy
-     */
-    struct PriorityBandedConnectionPolicyDef
-    {
-      string Id;                // PriorityBands name defined in
-                                // ORBResource
-    };
-
-    union PolicyDef switch (CORBA::PolicyType)
-    {
-    case 40: PriorityModelPolicyDef PriorityModelDef;
-    case 41: ThreadpoolPolicyDef    ThreadpoolDef;
-    case 45: PriorityBandedConnectionPolicyDef PriorityBandedConnectionDef;
-    };
-
-    /**
-     * @brief Define a set of policy definitions.
-     */
-    typedef sequence<PolicyDef> PolicyDefs;
-
-    /**
-     * @brief A policy set is named.
-     */
-    struct PolicySet
-    {
-      string Id;                // Name of this policy set
-      PolicyDefs policies;
-    };
-
-    /**
-     * @brief A list of all policy sets.
-     */
-    typedef sequence<PolicySet> PolicySets;
-
-    struct ORBConfigs
-    {
-      ORBResources orb_resources;
-      PolicySets policy_set;
-    };
-
-    struct ServerResource
-    {
-      string Id;
-
-      CommandlineArgs args;
-      SvcconfURI svcconf;
-      ORBConfigs orb_config;
-    };
-  };
-};
-
-#endif /* CIAO_SERVERRESOURCES_IDL */
diff --git a/CIAO/ciao/CIAO_SwapExec.idl b/CIAO/ciao/CIAO_SwapExec.idl
deleted file mode 100644
index 2349988f46d..00000000000
--- a/CIAO/ciao/CIAO_SwapExec.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#include "ciao/CCM_EnterpriseComponent.idl"
-
-module CIAO
-{
-  local interface Swap_Exec : ::Components::EnterpriseComponent
-  {
-    Components::EnterpriseComponent incarnate ();
-    Components::EnterpriseComponent etherealize ();
-  };
-};
diff --git a/CIAO/ciao/CIAO_UpgradeableContext.idl b/CIAO/ciao/CIAO_UpgradeableContext.idl
deleted file mode 100644
index 6d4b315ae85..00000000000
--- a/CIAO/ciao/CIAO_UpgradeableContext.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-#include "ciao/CCM_Container.idl"
-#include "tao/PortableServer/PortableServer_include.pidl"
-
-module CIAO
-{
-  local interface UpgradeableContext : ::Components::SessionContext
-  {
-    ::Components::ConsumerDescriptions get_registered_consumers
-        (in ::Components::FeatureName publisher_name)
-      raises (::Components::InvalidName, ::Components::InvalidConnection);
-    void deactivate_facet (in PortableServer::ObjectId oid);
-    void update_port_activator (in PortableServer::ObjectId oid);
-    void remove_facet (in Object reference);
-  };
-};
diff --git a/CIAO/ciao/CIAO_Value.idl b/CIAO/ciao/CIAO_Value.idl
new file mode 100644
index 00000000000..52efed12f75
--- /dev/null
+++ b/CIAO/ciao/CIAO_Value.idl
@@ -0,0 +1,21 @@
+// $Id$
+
+/**
+ * @file CIAO_Value.idl
+ *
+ * @brief Some CIAO valuetype extension for internal use.
+ */
+
+#include "CCM_Base.idl"
+
+/**
+ * @ Note: This needs deprecation.
+ *
+ */
+module CIAO
+{
+  valuetype Cookie : Components::Cookie
+  {
+    CORBA::OctetSeq get_cookie ();
+  };
+};
diff --git a/CIAO/ciao/Client_init.cpp b/CIAO/ciao/Client_init.cpp
index 15325cf7a4e..7dd0b874b54 100644
--- a/CIAO/ciao/Client_init.cpp
+++ b/CIAO/ciao/Client_init.cpp
@@ -3,7 +3,7 @@
 #include "Client_init.h"
 #include "CIAO_common.h"
 #include "CCM_ComponentC.h"
-#include "CCM_StandardConfiguratorC.h"
+#include "CIAO_ValueC.h"
 #include "ace/Env_Value_T.h"
 
 int
@@ -11,6 +11,8 @@ CIAO::Client_init (CORBA::ORB_ptr o)
 {
   CIAO_REGISTER_VALUE_FACTORY (o, Components::Cookie_init,
                                Components::Cookie);
+  CIAO_REGISTER_VALUE_FACTORY (o, Components::Cookie_init,
+                               CIAO::Cookie);
   CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init,
                                Components::PortDescription);
   CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init,
diff --git a/CIAO/ciao/Components.idl b/CIAO/ciao/Components.idl
index f58740eae6a..ad85c28e448 100644
--- a/CIAO/ciao/Components.idl
+++ b/CIAO/ciao/Components.idl
@@ -9,10 +9,7 @@
 #if !defined (CIAO_COMPONENTS_IDL)
 #define CIAO_COMPONENTS_IDL
 
-#include "ciao/CCM_Component.idl"
-#include "ciao/CCM_KeylessCCMHome.idl"
-#include "ciao/CCM_Home.idl"
-#include "ciao/CCM_Object.idl"
+#include "CCM_Component.idl"
 
 #endif /* CIAO_COMPONENTS_IDL */
 
diff --git a/CIAO/ciao/ComponentsC.h b/CIAO/ciao/ComponentsC.h
new file mode 100644
index 00000000000..f097a6ead82
--- /dev/null
+++ b/CIAO/ciao/ComponentsC.h
@@ -0,0 +1,101 @@
+// -*- 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:150
+
+#ifndef _TAO_IDL_COMPONENTSC_H_
+#define _TAO_IDL_COMPONENTSC_H_
+
+#include "tao/ORB.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/CDR.h"
+#include "tao/Environment.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/Versioned_Namespace.h"
+
+#include "CCM_ComponentC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO
+
+#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
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be/be_visitor_traits.cpp:50
+
+// Traits specializations.
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+namespace TAO
+{
+}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
+// be/be_visitor_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// be/be_visitor_root/cdr_op.cpp:64
+
+#endif /* __ACE_INLINE__ */
+
+// TAO_IDL - Generated from
+// be/be_codegen.cpp:911
+
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#endif /* ifndef */
diff --git a/CIAO/ciao/ComponentsS.h b/CIAO/ciao/ComponentsS.h
new file mode 100644
index 00000000000..9a025aac8d7
--- /dev/null
+++ b/CIAO/ciao/ComponentsS.h
@@ -0,0 +1,63 @@
+// -*- 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:390
+
+#ifndef _TAO_IDL_COMPONENTSS_H_
+#define _TAO_IDL_COMPONENTSS_H_
+
+
+#include "CCM_ComponentS.h"
+#include "ComponentsC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Collocation_Proxy_Broker.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#endif /* ifndef */
diff --git a/CIAO/ciao/Container_Base.pidl b/CIAO/ciao/Container_Base.pidl
new file mode 100644
index 00000000000..e698ea66b45
--- /dev/null
+++ b/CIAO/ciao/Container_Base.pidl
@@ -0,0 +1,33 @@
+// $Id$
+
+/**
+ * CIAO's internal container interface definitions.
+ */
+
+//#define CIAO_HAS_IMPORT_KEYWORD
+
+#if !defined (CONTAINER_BASE_PIDL)
+#define CONTAINER_BASE_PIDL
+
+#include "CIAO_Component.pidl"
+#include <SecurityLevel2.idl>
+#include "CIAO_Transaction.pidl"
+
+// *************** Basic Container interfaces ***************
+
+module CIAO
+{
+  typeprefix Components "wustl.edu";
+
+  local interface Container
+    {
+      // Return the POA
+      PortableServer::POA the_POA ();
+    };
+
+  local interface SessionContainer
+    {
+
+    };
+};
+#endif /* CONTAINER_BASE_PIDL */
diff --git a/CIAO/ciao/Cookies.h b/CIAO/ciao/Cookies.h
index 995629378d2..dd4f11407a8 100644
--- a/CIAO/ciao/Cookies.h
+++ b/CIAO/ciao/Cookies.h
@@ -12,13 +12,15 @@
 #define CIAO_COOKIES_H
 #include /**/ "ace/pre.h"
 
-#include "CCM_CookieC.h"
+#include "CCM_BaseC.h"
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "CIAO_Container_Export.h"
+#include "CIAO_ValueC.h"
 #include "ace/Active_Map_Manager.h"
 
 namespace CIAO
diff --git a/CIAO/ciao/CosPersistentState.idl b/CIAO/ciao/CosPersistentState.idl
index a5211d071aa..64f127539e2 100644
--- a/CIAO/ciao/CosPersistentState.idl
+++ b/CIAO/ciao/CosPersistentState.idl
@@ -13,12 +13,11 @@
 #define CIAO_COSPERSISTENTSTATE_PIDL
 
 module CosPersistentState {
+        local interface CatalogBase
+          {
+          };
 
-  local interface CatalogBase
-  {
-  };
-
-  typedef sequence<octet> _TypeId;
-  typedef string Pid;
+        typedef sequence<octet> _TypeId;
+        typedef string Pid;
 };
 #endif /* CIAO_COSPERSISTENTSTATE_PIDL */
diff --git a/CIAO/ciao/Deployment.idl b/CIAO/ciao/Deployment.idl
index 793c44fc853..cf3b49ff457 100644
--- a/CIAO/ciao/Deployment.idl
+++ b/CIAO/ciao/Deployment.idl
@@ -3,8 +3,10 @@
 #ifndef DEPLOYMENT_IDL
 #define DEPLOYMENT_IDL
 
-#include "ciao/Deployment_Packaging_Data.idl"
-#include "ciao/Deployment_Target_Data.idl"
+#include "Deployment_Data.idl"
+#include "Packaging_Data.idl"
+#include "Target_Data.idl"
+#include "ServerResources.idl"
 
 module Deployment {
 
@@ -16,6 +18,9 @@ module Deployment {
   exception NoSuchName {
   };
 
+  exception LastConfiguration {
+  };
+
   exception InvalidReference {
   };
 
@@ -30,7 +35,27 @@ module Deployment {
     string name;
     string plan_uuid;
   };
+
+  /**
+   * @struct Sched_Params
+   * @brief Carries Scheduling Params
+   * @description  CIAO specific structure to carry the scheduling params
+   *  to set the process, required by RACE
+   */
+  struct Sched_Params
+  {
+    long policy_;
+    long priority_;
+    long scope_;
+    long msec_;
+  };
+
   typedef sequence < ComponentPlan > ComponentPlans;
+
+  typedef sequence < Application > Applications;
+
+  interface Logger {
+  };
 };
 
 #endif /* DEPLOYMENT_IDL */
diff --git a/CIAO/ciao/Deployment_Application.idl b/CIAO/ciao/Deployment_Application.idl
deleted file mode 100644
index df03887cf7d..00000000000
--- a/CIAO/ciao/Deployment_Application.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-
-#if !defined (DEPLOYMENT_APPLICATION_IDL)
-#define DEPLOYMENT_APPLICATION_IDL
-
-#include "ciao/Deployment_Connection.idl"
-
-module Deployment
-{
-  exception StartError
-  {
-    string name;
-    string reason;
-  };
-
-  exception InvalidConnection
-  {
-    string name;
-    string reason;
-  };
-
-  interface Application
-  {
-    void finishLaunch (in Connections providedReference,
-                       in boolean start,
-                       in boolean is_ReDAC)
-      raises (StartError, InvalidConnection);
-    void start ()
-      raises (StartError);
-  };
-  typedef sequence < Application > Applications;
-};
-
-#endif /* DEPLOYMENT_APPLICATION_IDL */
diff --git a/CIAO/ciao/Deployment_ApplicationManager.idl b/CIAO/ciao/Deployment_ApplicationManager.idl
deleted file mode 100644
index 98fe247f2f9..00000000000
--- a/CIAO/ciao/Deployment_ApplicationManager.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-#ifndef DEPLOYMENT_APPLICATIONMANAGER_IDL
-#define DEPLOYMENT_APPLICATIONMANAGER_IDL
-
-#include "ciao/Deployment_Core.idl"
-#include "ciao/Deployment.idl"
-
-module Deployment {
-  exception ResourceNotAvailable {
-    string name;
-    string resourceType;
-    string propertyName;
-    string elementName;
-    string resourceName;
-  };
-
-  interface ApplicationManager {
-    /// @todo Spec mentions another few exceptions in the raises cluase
-    Application startLaunch (in Properties configProperty,
-                             out Connections providedReference,
-                             in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty);
-    void destroyApplication (in Application app)
-      raises (StopError);
-  };
-};
-
-#endif /* DEPLOYMENT_APPLICATIONMANAGER_IDL */
diff --git a/CIAO/ciao/Deployment_Base.idl b/CIAO/ciao/Deployment_Base.idl
index cb98f5d05b6..caadccf2fee 100644
--- a/CIAO/ciao/Deployment_Base.idl
+++ b/CIAO/ciao/Deployment_Base.idl
@@ -3,21 +3,10 @@
 #ifndef DEPLOYMENT_BASE_IDL
 #define DEPLOYMENT_BASE_IDL
 
-module Deployment {
-
-  struct Property
-  {
-    string name;
-    any value;
-  };
-  typedef sequence < Property > Properties;
+#include <orb.idl>
+#include "Deployment_Core.idl"
 
-  struct Requirement {
-    string resourceType;
-    string name;
-    Properties property;
-  };
-  typedef sequence < Requirement > Requirements;
+module Deployment {
 
   enum SatisfierPropertyKind {
     Quantity,
@@ -34,7 +23,65 @@ module Deployment {
     boolean dynamic;
     any value;
   };
+
   typedef sequence < SatisfierProperty > SatisfierProperties;
+
+  struct SharedResource {
+    string name;
+    ::CORBA::StringSeq resourceType;
+    ::CORBA::ULongSeq nodeRef;
+    SatisfierProperties property;
+  };
+
+  typedef sequence < SharedResource > SharedResources;
+
+  struct Resource {
+    string name;
+    ::CORBA::StringSeq resourceType;
+    SatisfierProperties property;
+  };
+
+  typedef sequence < Resource > Resources;
+
+  struct Node {
+    string name;
+    string label;
+    ::CORBA::ULongSeq sharedResourceRef;
+    ::CORBA::ULongSeq connectionRef;
+    Resources resource;
+  };
+
+  typedef sequence < Node > Nodes;
+
+  struct Interconnect {
+    string name;
+    string label;
+    ::CORBA::ULongSeq connectionRef;
+    ::CORBA::ULongSeq connectRef;
+    Resources resource;
+  };
+
+  typedef sequence < Interconnect > Interconnects;
+
+  struct Bridge {
+    string name;
+    string label;
+    ::CORBA::ULongSeq connectRef;
+    Resources resource;
+  };
+
+  typedef sequence < Bridge > Bridges;
+
+  struct Domain {
+    string UUID;
+    string label;
+    SharedResources sharedResource;
+    Nodes node;
+    Interconnects interconnect;
+    Bridges bridge;
+    Properties infoProperty;
+  };
+
 };
 
 #endif /* DEPLOYMENT_BASE_IDL */
diff --git a/CIAO/ciao/Deployment_Connection.idl b/CIAO/ciao/Deployment_Connection.idl
deleted file mode 100644
index 769c331a748..00000000000
--- a/CIAO/ciao/Deployment_Connection.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-#if !defined (DEPLOYMENT_CONNECTION_IDL)
-#define DEPLOYMENT_CONNECTION_IDL
-
-#include "ciao/Deployment_DeploymentPlan.idl"
-#include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
-
-// *************** Packaging and Deployment ***************
-module Deployment
-{
-  typedef sequence < Object > Endpoints;
-  //typedef Object Endpoint;
-
-  // CIAO's specific <Connection> type defition.
-  // To avoid the connection info in the plan being passed to the
-  // local node and to make the implementation not very cumbersome
-  // I changed the connection struct to include some extra informations.
-  struct Connection
-  {
-    string instanceName;
-    string portName;
-    CCMComponentPortKind kind;
-
-    string endpointInstanceName; // CIAO specific extension
-    string endpointPortName;     // CIAO specific extension
-
-    // the endpoints member is change to endpoint.
-    // Since we will not have more than 1 objref in there.
-    Object endpoint;
-
-    // A wrapper facade interface to provision different event
-    // communication mechanisms, including RTEC, etc.
-    CIAO::CIAO_Event_Service event_service;
-
-    // The properties of this connection, particularly useful
-    // to speicfy QoS properties of pub/sub service connections.
-    Properties config;
-  };
-
-  typedef sequence < Connection > Connections;
-};
-#endif /* DEPLOYMENT_CONNECTION_IDL */
diff --git a/CIAO/ciao/Deployment_Container.idl b/CIAO/ciao/Deployment_Container.idl
deleted file mode 100644
index 55ac0c7dfdd..00000000000
--- a/CIAO/ciao/Deployment_Container.idl
+++ /dev/null
@@ -1,93 +0,0 @@
-// $Id$
-
-#if !defined (DEPLOYMENT_CONTAINER_IDL)
-#define DEPLOYMENT_CONTAINER_IDL
-
-#include "ciao/Deployment_Application.idl"
-#include "ciao/Deployment_Core.idl"
-
-// *************** Packaging and Deployment ***************
-module Deployment
-{
-  interface NodeApplication; // Forward decl.
-
-  /// CIAO specific
-  struct Component_Info
-  {
-    string component_instance_name;
-    Components::CCMObject component_ref;
-  };
-
-  /// CIAO specific
-  typedef sequence < Component_Info > ComponentInfos;
-
-  /// CIAO specific
-  struct ComponentImplementationInfo
-  {
-    string component_instance_name;
-    string executor_dll;
-    string executor_entrypt;
-    string servant_dll;
-    string servant_entrypt;
-    Properties component_config;
-    //  Properties home_config;      //ignored for now.
-  };
-
-  /// CIAO specific
-  typedef sequence <ComponentImplementationInfo> ComponentImplementationInfos;
-
-  // ContainerImplementationInfo contains a list of components to be installed and
-  // policy configuration for the container which hosts these components
-  /// CIAO specific
-  struct ContainerImplementationInfo
-  {
-    ComponentImplementationInfos impl_infos;
-    Properties container_config;
-  };
-
-  /// CIAO specific
-  typedef sequence <ContainerImplementationInfo> ContainerImplementationInfos;
-
-  /// CIAO specific interface, which could deal with installing multiple
-  /// containers into a single NodeApplication.
-  interface Container
-  {
-    readonly attribute ::Deployment::Properties properties;
-
-    /// Get the NodeApplication which created us
-    NodeApplication get_node_application ();
-
-    /// Initialize the container with policies
-    // long init (in ::CORBA::PolicyList policies);
-
-    // NW: The following should be component specific info because the
-    // container has already been created and initialized at this
-    // time.  So there's not much container configuration to be done
-    // at this stage.
-    //@@ The container_impl_info will contain
-    //1 component instance name as the key.
-    //2 dll/so name of the exec
-    //3 entry point of the exec
-    //4 dll/so name of the svnt
-    //5 entry point of the svnt
-    //6 Poosible other configuration for container/home/component
-
-    /// Install all homes and components
-    Deployment::ComponentInfos install (in ContainerImplementationInfo container_impl_info)
-        raises (UnknownImplId,
-                ImplEntryPointNotFound,
-                InstallationFailure,
-                ::Components::InvalidConfiguration);
-
-    /// Remove all homes and components
-    void remove ()
-      raises (::Components::RemoveFailure);
-
-    /// Remove a component instance
-    void remove_component (in string inst_name)
-      raises (::Components::RemoveFailure);
-  };
-
-  typedef sequence<Container> Containers;
-};
-#endif /* DEPLOYMENT_CONTAINER_IDL */
diff --git a/CIAO/ciao/Deployment_Core.idl b/CIAO/ciao/Deployment_Core.idl
index fbaa5ea18c6..b61836faf7d 100644
--- a/CIAO/ciao/Deployment_Core.idl
+++ b/CIAO/ciao/Deployment_Core.idl
@@ -3,10 +3,8 @@
 #if !defined (DEPLOYMENT_CORE_IDL)
 #define DEPLOYMENT_CORE_IDL
 
-#include "ciao/CCM_Component.idl"
-#include "ciao/Deployment_TargetData.idl"
-#include "ciao/Deployment_Data.idl"
-#include "ciao/Deployment_Application.idl"
+#include "CCM_Component.idl"
+#include "Deployment_Events.idl"
 
 // *************** Packaging and Deployment ***************
 module Deployment
@@ -14,36 +12,297 @@ module Deployment
   // Typeprefix Components "omg.org";
   // OMG threw these things away, didn't it.
 
-  /// CIAO specific
   exception UnknownImplId
   {
     string name;
     string reason;
   };
 
-  /// CIAO specific
+  exception InvalidLocation {};
   exception InstallationFailure
   {
     string name;
     string reason;
   };
-
-  /// CIAO specific
   exception ImplEntryPointNotFound
   {
     string name;
     string reason;
   };
 
-  /**
-   * The StopError exception is raised if a problem occurred while terminating
-   * an application, either during the terminate operation of the
-   * ApplicationManager or during the destroyManager operation of the
-   * ExecutionManager.
-   */
+  //Below are from the OMG Deployment.idl
+
+  exception StartError
+  {
+    string name;
+    string reason;
+  };
+
   exception StopError {
     string name;
     string reason;
   };
+
+  exception InvalidConnection
+  {
+    string name;
+    string reason;
+  };
+
+  //==============property==================
+  struct Property
+  {
+    string name;
+    any value;
+  };
+
+  typedef sequence < Property > Properties;
+
+  //============connection==================
+
+  typedef sequence < Object > Endpoints;
+  //typedef Object Endpoint;
+
+  enum CCMComponentPortKind
+  {
+    Facet,
+    SimplexReceptacle,
+    MultiplexReceptacle,
+    EventEmitter,
+    EventPublisher,
+    EventConsumer
+  };
+
+  // CIAO's specific <Connection> type defition.
+  // To avoid the connection info in the plan being passed to the
+  // local node and to make the implementation not very cumbersome
+  // I changed the connection struct to include some extra informations.
+  struct Connection
+  {
+    string instanceName;
+    string portName;
+    CCMComponentPortKind kind;
+
+    string endpointInstanceName; // CIAO specific extension
+    string endpointPortName;     // CIAO specific extension
+
+    // the endpoints member is change to endpoint.
+    // Since we will not have more than 1 objref in there.
+    Object endpoint;
+
+    // A wrapper facade interface to provision different event
+    // communication mechanisms, including RTEC, etc.
+    CIAO::CIAO_Event_Service event_service;
+
+    // The properties of this connection, particularly useful
+    // to speicfy QoS properties of pub/sub service connections.
+    Properties config;
+  };
+
+  typedef sequence < Connection > Connections;
+
+  //=======================================
+  struct ComponentImplementationInfo
+  {
+    string component_instance_name;
+    string executor_dll;
+    string executor_entrypt;
+    string servant_dll;
+    string servant_entrypt;
+    Properties component_config;
+    //  Properties home_config;      //ignored for now.
+  };
+
+  typedef sequence <ComponentImplementationInfo> ComponentImplementationInfos;
+
+  // ContainerImplementationInfo contains a list of components to be installed and
+  // policy configuration for the container which hosts these components
+  struct ContainerImplementationInfo
+  {
+    ComponentImplementationInfos impl_infos;
+    Properties container_config;
+  };
+
+  typedef sequence <ContainerImplementationInfo> ContainerImplementationInfos;
+
+  struct NodeImplementationInfo
+  {
+    ContainerImplementationInfos impl_infos;
+    Properties nodeapp_config;
+  };
+
+  //==================================
+  interface Application
+  {
+    void finishLaunch (in Connections providedReference,
+                       in boolean start,
+                       in boolean is_ReDAC)
+      raises (StartError, InvalidConnection);
+    void start ()
+      raises (StartError);
+  };
+
+  struct Component_Info
+  {
+    string component_instance_name;
+    Components::CCMObject component_ref;
+  };
+
+  typedef sequence < Component_Info > ComponentInfos;
+
+  // @@ (OO) You're altering an OMG defined interface below.  In
+  //         order to avoid confusion, it is probably better to create
+  //         another NodeApplication interface in the CIAO namespace
+  //         that inherits from Deployment::NodeApplication.  You'd
+  //         then use the CIAO::NodeApplication in your
+  //         implementation.
+  //
+  //         Alternatively, you should at least place a CIAO-specific
+  //         typeprefix within your altered NodeApplication interface
+  //         to prevent interoperability issues.
+
+  interface NodeApplication; // Forward decl.
+  typedef sequence<NodeApplication> NodeApplications;
+
+  /// CIAO specific interface, which could deal with installing multiple
+  /// containers into a single NodeApplication.
+  interface Container
+  {
+    readonly attribute ::Deployment::Properties properties;
+
+    /// Get the NodeApplication which created us
+    NodeApplication get_node_application ();
+
+    /// Initialize the container with policies
+    // long init (in ::CORBA::PolicyList policies);
+
+    // NW: The following should be component specific info because the
+    // container has already been created and initialized at this
+    // time.  So there's not much container configuration to be done
+    // at this stage.
+    //@@ The container_impl_info will contain
+    //1 component instance name as the key.
+    //2 dll/so name of the exec
+    //3 entry point of the exec
+    //4 dll/so name of the svnt
+    //5 entry point of the svnt
+    //6 Poosible other configuration for container/home/component
+
+    /// Install all homes and components
+    Deployment::ComponentInfos install (in ContainerImplementationInfo container_impl_info)
+        raises (UnknownImplId,
+                ImplEntryPointNotFound,
+                InstallationFailure,
+                ::Components::InvalidConfiguration);
+
+    /// Remove all homes and components
+    void remove ()
+      raises (::Components::RemoveFailure);
+
+    /// Remove a component instance
+    void remove_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+  };
+
+  typedef sequence<Container> Containers;
+  typedef sequence<CIAO::CIAO_Event_Service> CIAO_Event_Services;
+
+  /*
+  /// CIAO specific extension
+  /// This struct captures the installation information of a particular
+  /// CIAO_Event_Service, as defined in <ciaosvcs/Events/CIAO_Events.idl>
+  struct ESInstallationInfo
+  {
+    string id;
+    CIAO::EventServiceType type;
+    string svcconf;
+    //Properties es_config;
+  };
+
+  /// CIAO specific extension
+  typedef sequence<ESInstallationInfo> ESInstallationInfos;
+  */
+
+  interface NodeApplication : Application
+  {
+    readonly attribute ::Deployment::Properties properties;
+
+    /// CIAO specific operation to handle dynamic system redeployment
+    /// and reconfiguration
+    /// @@ Initialize the nodeapplication, so it will know what
+    ///    components it will create and home many of them are
+    ///    there. However the real create action will take place when
+    ///    start launch is called on NodeApplicationManager.
+    long init ();
+
+    /// @@ This operation will be called by NodeApplicationManager
+    ///    client to really start to create homes and components.
+    ComponentInfos install (in NodeImplementationInfo node_impl_info)
+      raises (UnknownImplId,
+              ImplEntryPointNotFound,
+              InstallationFailure,
+              ::Components::InvalidConfiguration,
+              ::Components::RemoveFailure);
+
+    /// CIAO specific extension
+    /// This operation will create one CIAO_Event_Service object
+    /// within the NodeApplication, which will be used to mediate the
+    /// communication of CCM events
+    CIAO::CIAO_Event_Service install_es (
+        in CIAO::DAnCE::EventServiceDeploymentDescription es_info)
+      raises (InstallationFailure);
+
+    /// CIAO specific extensions
+    ///@@ We know that Deployment::NodeApplicationManager will be returned,
+    ///   however to avoid the size of the shared object of CIAO_Server.
+    ///   we return an Object.
+    Object get_node_application_manager ();
+
+    /// CIAO specific extension
+    Container create_container (in ::Deployment::Properties properties)
+      raises (::Components::CreateFailure,
+              ::Components::InvalidConfiguration);
+
+    /// CIAO specific extension
+    void remove_container (in Container cref)
+      raises (::Components::RemoveFailure);
+
+    /// CIAO specific extension
+    Containers get_containers ();
+
+    /// CIAO specific extension
+    /// Remove a component instance from the NodeApplication
+    void remove_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+
+    /// CIAO specific extensions
+    /// Activate a component instance from the NodeApplication
+    void activate_component (in string inst_name)
+      raises (::Deployment::StartError);
+
+    /// CIAO specific extensions
+    /// Passivate a component instance from the NodeApplication
+    void passivate_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+
+    /// Remove all containers, components and component homes.
+    /// Shuts down the ORB of the NodeApplication to terminate the process.
+    oneway void remove ();
+
+    /// CIAO specific extension. This will enforce the component to
+    /// be activated (preactivate, activate, postactivated) before the assembly
+    /// is established
+    void ciao_preactivate ()
+      raises (StartError);
+
+    /// CIAO specific extension
+    void ciao_postactivate ()
+      raises (StartError);
+
+    /// CIAO specific extension
+    void ciao_passivate ()
+      raises (StopError);
+  };
+
 };
 #endif /* DEPLOYMENT_CORE_IDL */
diff --git a/CIAO/ciao/Deployment_Data.idl b/CIAO/ciao/Deployment_Data.idl
index 0c296a815ba..7b475947add 100644
--- a/CIAO/ciao/Deployment_Data.idl
+++ b/CIAO/ciao/Deployment_Data.idl
@@ -2,11 +2,193 @@
 
 #ifndef DEPLOYMENT_DATA_IDL
 #define DEPLOYMENT_DATA_IDL
-
-#include "ciao/Deployment_DeploymentPlan.idl"
+#include "Deployment_Base.idl"
 
 module Deployment {
 
+  struct ComponentPortDescription {
+    string name;
+    string specificType;
+    ::CORBA::StringSeq supportedType;
+    boolean provider;
+    boolean exclusiveProvider;
+    boolean exclusiveUser;
+    boolean optional;
+    CCMComponentPortKind kind;
+  };
+
+  typedef sequence < ComponentPortDescription > ComponentPortDescriptions;
+
+  struct ComponentPropertyDescription {
+    string name;
+    CORBA::TypeCode type;
+  };
+
+  typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions;
+
+  struct ComponentInterfaceDescription {
+    string label;
+    string UUID;
+    string specificType;
+    ::CORBA::StringSeq supportedType;
+    ::CORBA::StringSeq idlFile;
+    Properties configProperty;
+    ComponentPortDescriptions port;
+    ComponentPropertyDescriptions property;
+    Properties infoProperty;
+  };
+
+  struct Requirement {
+    string resourceType;
+    string name;
+    Properties property;
+  };
+
+  typedef sequence < Requirement > Requirements;
+
+  struct MonolithicDeploymentDescription {
+    string name;
+    ::CORBA::StringSeq source;
+    ::CORBA::ULongSeq artifactRef;
+    Properties execParameter;
+    Requirements deployRequirement;
+  };
+
+  typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions;
+
+  enum ResourceUsageKind {
+    None,
+    InstanceUsesResource,
+    ResourceUsesInstance,
+    PortUsesResource,
+    ResourceUsesPort
+  };
+
+  struct InstanceResourceDeploymentDescription {
+    ResourceUsageKind resourceUsage;
+    string requirementName;
+    string resourceName;
+    Properties property;
+  };
+
+  typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions;
+
+  struct InstanceDeploymentDescription {
+    string name;
+    string node;
+    ::CORBA::StringSeq source;
+    unsigned long implementationRef;
+    Properties configProperty;
+    InstanceResourceDeploymentDescriptions deployedResource;
+    InstanceResourceDeploymentDescriptions deployedSharedResource;
+  };
+
+  typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions;
+
+  struct ComponentExternalPortEndpoint {
+    string portName;
+  };
+
+  typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints;
+
+  struct PlanSubcomponentPortEndpoint {
+    string portName;
+    boolean provider;
+    CCMComponentPortKind kind;
+    unsigned long instanceRef;
+  };
+
+  typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints;
+
+  struct ExternalReferenceEndpoint {
+    string location;
+  };
+
+  typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints;
+
+  struct ConnectionResourceDeploymentDescription {
+    string targetName;
+    string requirementName;
+    string resourceName;
+    Properties property;
+  };
+
+  typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions;
+
+  struct PlanConnectionDescription {
+    string name;
+    ::CORBA::StringSeq source;
+    Requirements deployRequirement;
+    ComponentExternalPortEndpoints externalEndpoint;
+    PlanSubcomponentPortEndpoints internalEndpoint;
+    ExternalReferenceEndpoints externalReference;
+    ConnectionResourceDeploymentDescriptions deployedResource;
+  };
+
+  typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions;
+
+  struct PlanSubcomponentPropertyReference {
+    string propertyName;
+    unsigned long instanceRef;
+  };
+
+  typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences;
+
+  struct PlanPropertyMapping {
+    string name;
+    ::CORBA::StringSeq source;
+    string externalName;
+    PlanSubcomponentPropertyReferences delegatesTo;
+  };
+
+  typedef sequence < PlanPropertyMapping > PlanPropertyMappings;
+
+  struct ImplementationDependency {
+    string requiredType;
+  };
+
+  typedef sequence < ImplementationDependency > ImplementationDependencies;
+
+  struct ResourceDeploymentDescription {
+    string requirementName;
+    string resourceName;
+    Properties property;
+  };
+
+  typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions;
+
+  struct ArtifactDeploymentDescription {
+    string name;
+    ::CORBA::StringSeq location;
+    string node;
+    ::CORBA::StringSeq source;
+    Properties execParameter;
+    Requirements deployRequirement;
+    ResourceDeploymentDescriptions deployedResource;
+  };
+
+  typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions;
+
+  struct DeploymentPlan {
+    string label;
+    string UUID;
+    ComponentInterfaceDescription realizes;
+    MonolithicDeploymentDescriptions implementation;
+    InstanceDeploymentDescriptions instance;
+    PlanConnectionDescriptions connection;
+            PlanPropertyMappings externalProperty;
+    ImplementationDependencies dependsOn;
+    ArtifactDeploymentDescriptions artifact;
+    Properties infoProperty;
+  };
+
+  enum DomainUpdateKind {
+    Add,
+    Delete,
+    UpdateAll,
+    UpdateAvailable
+  };
+
   struct ComponentPackageReference {
     string requiredUUID;
     string requiredName;
@@ -35,6 +217,12 @@ module Deployment {
   };
 
   typedef sequence < Capability > Capabilities;
+
+  struct RequirementSatisfier {
+    string name;
+    ::CORBA::StringSeq resourceType;
+    SatisfierProperties property;
+  };
 };
 
 #endif /* DEPLOYMENT_DATA_IDL */
diff --git a/CIAO/ciao/Deployment_DeploymentPlan.idl b/CIAO/ciao/Deployment_DeploymentPlan.idl
deleted file mode 100644
index e8dbde8ae2b..00000000000
--- a/CIAO/ciao/Deployment_DeploymentPlan.idl
+++ /dev/null
@@ -1,192 +0,0 @@
-// $Id$
-
-#ifndef DEPLOYMENT_DEPLOYMENTPLAN_IDL
-#define DEPLOYMENT_DEPLOYMENTPLAN_IDL
-
-#include "ciao/Deployment_Base.idl"
-#include "tao/StringSeq.pidl"
-#include "tao/ULongSeq.pidl"
-#include "tao/Typecode_types.pidl"
-
-module Deployment {
-
-  enum CCMComponentPortKind
-  {
-    Facet,
-    SimplexReceptacle,
-    MultiplexReceptacle,
-    EventEmitter,
-    EventPublisher,
-    EventConsumer
-  };
-
-  struct ComponentPortDescription {
-    string name;
-    string specificType;
-    ::CORBA::StringSeq supportedType;
-    boolean provider;
-    boolean exclusiveProvider;
-    boolean exclusiveUser;
-    boolean optional;
-    CCMComponentPortKind kind;
-  };
-
-  typedef sequence < ComponentPortDescription > ComponentPortDescriptions;
-
-  struct ComponentPropertyDescription {
-    string name;
-    CORBA::TypeCode type;
-  };
-
-  typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions;
-
-  struct ComponentInterfaceDescription {
-    string label;
-    string UUID;
-    string specificType;
-    ::CORBA::StringSeq supportedType;
-    ::CORBA::StringSeq idlFile;
-    Properties configProperty;
-    ComponentPortDescriptions port;
-    ComponentPropertyDescriptions property;
-    Properties infoProperty;
-  };
-
-  struct MonolithicDeploymentDescription {
-    string name;
-    ::CORBA::StringSeq source;
-    ::CORBA::ULongSeq artifactRef;
-    Properties execParameter;
-    Requirements deployRequirement;
-  };
-
-  typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions;
-
-  enum ResourceUsageKind {
-    None,
-    InstanceUsesResource,
-    ResourceUsesInstance,
-    PortUsesResource,
-    ResourceUsesPort
-  };
-
-  struct InstanceResourceDeploymentDescription {
-    ResourceUsageKind resourceUsage;
-    string requirementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions;
-
-  struct InstanceDeploymentDescription {
-    string name;
-    string node;
-    ::CORBA::StringSeq source;
-    unsigned long implementationRef;
-    Properties configProperty;
-    InstanceResourceDeploymentDescriptions deployedResource;
-    InstanceResourceDeploymentDescriptions deployedSharedResource;
-  };
-
-  typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions;
-
-  struct ComponentExternalPortEndpoint {
-    string portName;
-  };
-
-  typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints;
-
-  struct PlanSubcomponentPortEndpoint {
-    string portName;
-    boolean provider;
-    CCMComponentPortKind kind;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints;
-
-  struct ExternalReferenceEndpoint {
-    string location;
-  };
-
-  typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints;
-
-  struct ConnectionResourceDeploymentDescription {
-    string targetName;
-    string requirementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions;
-
-  struct PlanConnectionDescription {
-    string name;
-    ::CORBA::StringSeq source;
-    Requirements deployRequirement;
-    ComponentExternalPortEndpoints externalEndpoint;
-    PlanSubcomponentPortEndpoints internalEndpoint;
-    ExternalReferenceEndpoints externalReference;
-    ConnectionResourceDeploymentDescriptions deployedResource;
-  };
-
-  typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions;
-
-  struct PlanSubcomponentPropertyReference {
-    string propertyName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences;
-
-  struct PlanPropertyMapping {
-    string name;
-    ::CORBA::StringSeq source;
-    string externalName;
-    PlanSubcomponentPropertyReferences delegatesTo;
-  };
-
-  typedef sequence < PlanPropertyMapping > PlanPropertyMappings;
-
-  struct ImplementationDependency {
-    string requiredType;
-  };
-
-  typedef sequence < ImplementationDependency > ImplementationDependencies;
-
-  struct ResourceDeploymentDescription {
-    string requirementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions;
-
-  struct ArtifactDeploymentDescription {
-    string name;
-    ::CORBA::StringSeq location;
-    string node;
-    ::CORBA::StringSeq source;
-    Properties execParameter;
-    Requirements deployRequirement;
-    ResourceDeploymentDescriptions deployedResource;
-  };
-
-  typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions;
-
-  struct DeploymentPlan {
-    string label;
-    string UUID;
-    ComponentInterfaceDescription realizes;
-    MonolithicDeploymentDescriptions implementation;
-    InstanceDeploymentDescriptions instance;
-    PlanConnectionDescriptions connection;
-            PlanPropertyMappings externalProperty;
-    ImplementationDependencies dependsOn;
-    ArtifactDeploymentDescriptions artifact;
-    Properties infoProperty;
-  };
-};
-
-#endif /* DEPLOYMENT_DATA_IDL */
diff --git a/CIAO/ciao/Deployment_DomainApplicationManager.idl b/CIAO/ciao/Deployment_DomainApplicationManager.idl
deleted file mode 100644
index 65b7523959e..00000000000
--- a/CIAO/ciao/Deployment_DomainApplicationManager.idl
+++ /dev/null
@@ -1,65 +0,0 @@
-// $Id$
-#ifndef DOMAINAPPLICATIONMANAGER_IDL
-#define DOMAINAPPLICATIONMANAGER_IDL
-
-#include "ciao/Deployment.idl"
-#include "ciao/Deployment_NodeApplication.idl"
-#include "ciao/Deployment_ApplicationManager.idl"
-
-module Deployment {
-  /// CIAO 's DomainApplicationManager interface differs spec-defined interface
-  /// in the same that it also integrates the spec-defined interface for
-  /// DomainApplication into itself
-  /// This should be derived from ApplicationManager
-  interface DomainApplicationManager
-  {
-    DeploymentPlan getPlan ();
-
-    /// This method is missing from CIAO but in the spec
-    /// Applications getApplications ();
-
-    /// CIAO specific version of startLaunch implementation, this one
-    /// differs with spec-defined operation in the sense that it doesn't
-    /// return DomainApplication object reference.
-    void startLaunch (in Properties configProperty, in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty);
-
-    /// This method has CIAO specific arguments and is not spec compliant
-    void finishLaunch (in boolean start,
-                       in boolean is_ReDAC)
-      raises (StartError, InvalidConnection);
-
-    /// CIAO specific extension
-    void start ()
-      raises (StartError);
-
-    /// CIAO specific extention
-    /// Fetch NodeApplication based on the given node name
-    NodeApplication get_node_app (in string node_name)
-      raises (NoSuchName);
-
-    /// CIAO specific extension, it differs with the spec defined one
-    /// for no input parameter.
-    void destroyApplication ()
-      raises (StopError);
-
-    /// CIAO specific extension to destroy NodeApplicationManager
-    void destroyManager ()
-      raises (StopError);
-
-    /// CIAO specific extension
-    /// Perform the actual redeployment and reconfiguration on the dommain level.
-    void perform_redeployment (in DeploymentPlan new_plan)
-      raises (PlanError,
-              InstallationFailure,
-              UnknownImplId,
-              ImplEntryPointNotFound,
-              InvalidConnection,
-              InvalidProperty,
-              ::Components::RemoveFailure);
-  };
-
-  typedef sequence < DomainApplicationManager > DomainApplicationManagers;
-};
-
-#endif /* DOMAINAPPLICATIONMANAGER_IDL */
diff --git a/CIAO/ciao/Deployment_Events.idl b/CIAO/ciao/Deployment_Events.idl
index b0559dfe164..95774dba3f7 100644
--- a/CIAO/ciao/Deployment_Events.idl
+++ b/CIAO/ciao/Deployment_Events.idl
@@ -11,7 +11,7 @@
 #if !defined (CIAO_DEPLOYMENT_EVENT_SERVICES_IDL)
 #define CIAO_DEPLOYMENT_EVENT_SERVICES_IDL
 
-#include "tao/StringSeq.pidl"
+#include <orb.idl>
 
 // EventServiceType definition
 #include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
diff --git a/CIAO/ciao/Deployment_ExecutionManager.idl b/CIAO/ciao/Deployment_ExecutionManager.idl
deleted file mode 100644
index 39c2ba6053b..00000000000
--- a/CIAO/ciao/Deployment_ExecutionManager.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-#ifndef EXECUTIONMANAGER_IDL
-#define EXECUTIONMANAGER_IDL
-
-#include "ciao/Deployment.idl"
-#include "ciao/Deployment_DomainApplicationManager.idl"
-
-module Deployment {
-  interface ExecutionManager {
-    /// @todo ResourceCommitmentManger is missing
-    DomainApplicationManager preparePlan (in DeploymentPlan plan,
-                                          in boolean commitResources)
-      raises (ResourceNotAvailable, PlanError, StartError);
-
-    DomainApplicationManagers getManagers ();
-
-    void destroyManager (in DomainApplicationManager manager)
-      raises (StopError);
-
-    /// CIAO Specific extension
-    DomainApplicationManager getManager (in string plan_uuid)
-      raises (PlanNotExist);
-
-    /// CIAO specific extention
-    /// Destroy ApplicationManagers by plan_uuid, the unique semantics of this
-    /// operation lies in the fact that if some components are
-    /// still up and running, then the ApplicationManagers won't be destroyed.
-    void destroyManagerByPlan (in string plan_uuid)
-      raises (StopError);
-
-    /// CIAO specific extention
-    /// "Get" operation, return the DeploymentPlan
-    DeploymentPlan getPlan (in string plan_uuid);
-
-    /// CIAO specific operation to handle dynamic system redeployment
-    /// and reconfiguration
-    /// This operation could handle dynamic redeployment, and this
-    /// is the operation exposed to clients directly. Other
-    /// "perform_redeployment" operation defined on DAM and NA
-    /// are implementaion details within DAnCE.
-    void perform_redeployment (in DeploymentPlan new_plan)
-      raises (PlanError,
-              InstallationFailure,
-              UnknownImplId,
-              ImplEntryPointNotFound,
-              InvalidConnection,
-              InvalidProperty,
-              ::Components::RemoveFailure);
-  };
-};
-
-#endif /* EXECUTIONMANAGER_IDL */
diff --git a/CIAO/ciao/Deployment_NodeApplication.idl b/CIAO/ciao/Deployment_NodeApplication.idl
deleted file mode 100644
index 7c0a0db93b7..00000000000
--- a/CIAO/ciao/Deployment_NodeApplication.idl
+++ /dev/null
@@ -1,122 +0,0 @@
-// $Id$
-
-#if !defined (DEPLOYMENT_NODEAPPLICATION_IDL)
-#define DEPLOYMENT_NODEAPPLICATION_IDL
-
-#include "Deployment_Application.idl"
-#include "Deployment_Core.idl"
-#include "Deployment_Container.idl"
-#include "Deployment_Events.idl"
-
-// *************** Packaging and Deployment ***************
-module Deployment
-{
-  /// CIAO specific extension
-  /// This struct captures the installation information of a particular
-  /// CIAO_Event_Service, as defined in <ciaosvcs/Events/CIAO_Events.idl>
-  struct ESInstallationInfo
-  {
-    string id;
-    CIAO::EventServiceType type;
-    string svcconf;
-    //Properties es_config;
-  };
-
-  /// CIAO specific
-  struct NodeImplementationInfo
-  {
-    ContainerImplementationInfos impl_infos;
-    Properties nodeapp_config;
-  };
-
-  /// CIAO specific
-  typedef sequence<CIAO::CIAO_Event_Service> CIAO_Event_Services;
-
-  /// CIAO specific extension
-  typedef sequence<ESInstallationInfo> ESInstallationInfos;
-
-  interface NodeApplication : Application
-  {
-    /// CIAO specific extensions
-    readonly attribute ::Deployment::Properties properties;
-
-    /// CIAO specific operation to handle dynamic system redeployment
-    /// and reconfiguration
-    /// @@ Initialize the nodeapplication, so it will know what
-    ///    components it will create and home many of them are
-    ///    there. However the real create action will take place when
-    ///    start launch is called on NodeApplicationManager.
-    long init ();
-
-    /// @@ This operation will be called by NodeApplicationManager
-    ///    client to really start to create homes and components.
-    /// CIAO specific extensions
-    ComponentInfos install (in NodeImplementationInfo node_impl_info)
-      raises (UnknownImplId,
-              ImplEntryPointNotFound,
-              InstallationFailure,
-              ::Components::InvalidConfiguration,
-              ::Components::RemoveFailure);
-
-    /// CIAO specific extension
-    /// This operation will create one or more CIAO_Event_Service objects
-    /// within the NodeApplication, which will be used to mediate the
-    /// communication of CCM events
-    CIAO::CIAO_Event_Service install_es (
-      in CIAO::DAnCE::EventServiceDeploymentDescription es_info)
-      raises (InstallationFailure);
-
-    /// CIAO specific extensions
-    ///@@ We know that Deployment::NodeApplicationManager will be returned,
-    ///   however to avoid the size of the shared object of CIAO_Server.
-    ///   we return an Object.
-    Object get_node_application_manager ();
-
-    /// CIAO specific extension
-    Container create_container (in ::Deployment::Properties properties)
-      raises (::Components::CreateFailure,
-              ::Components::InvalidConfiguration);
-
-    /// CIAO specific extension
-    void remove_container (in Container cref)
-      raises (::Components::RemoveFailure);
-
-    /// CIAO specific extension
-    Containers get_containers ();
-
-    /// CIAO specific extension
-    /// Remove a component instance from the NodeApplication
-    void remove_component (in string inst_name)
-      raises (::Components::RemoveFailure);
-
-    /// CIAO specific extensions
-    /// Activate a component instance from the NodeApplication
-    void activate_component (in string inst_name)
-      raises (::Deployment::StartError);
-
-    /// CIAO specific extensions
-    /// Passivate a component instance from the NodeApplication
-    void passivate_component (in string inst_name)
-      raises (::Components::RemoveFailure);
-
-    /// Remove all containers, components and component homes.
-    /// Shuts down the ORB of the NodeApplication to terminate the process.
-    oneway void remove ();
-
-    /// CIAO specific extension. This will enforce the component to
-    /// be activated (preactivate, activate, postactivated) before the assembly
-    /// is established
-    void ciao_preactivate ()
-      raises (StartError);
-
-    /// CIAO specific extension
-    void ciao_postactivate ()
-      raises (StartError);
-
-    /// CIAO specific extension
-    void ciao_passivate ()
-      raises (StopError);
-  };
-
-};
-#endif /* DEPLOYMENT_CORE_IDL */
diff --git a/CIAO/ciao/Deployment_NodeApplicationManager.idl b/CIAO/ciao/Deployment_NodeApplicationManager.idl
deleted file mode 100644
index 32f3f0d21f9..00000000000
--- a/CIAO/ciao/Deployment_NodeApplicationManager.idl
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-#ifndef NODEAPPLICATIONMANAGER_IDL
-#define NODEAPPLICATIONMANAGER_IDL
-
-#include "Deployment_Core.idl"
-#include "Deployment_ApplicationManager.idl"
-#include "Deployment.idl"
-
-module Deployment {
-  /**
-   * CIAO specific structure to carry the scheduling params
-   * to set the process, required by RACE
-   * @struct Sched_Params
-   * @brief Carries Scheduling Params
-   */
-  struct Sched_Params
-  {
-    long policy_;
-    long priority_;
-    long scope_;
-    long msec_;
-  };
-
-
-  interface NodeApplicationManager :
-    ApplicationManager
-  {
-    /// CIAO specific operation to handle dynamic system redeployment
-    /// and reconfiguration
-    /// This operation could handle dynamic redeployment for
-    /// a node-level deployment plan within a node
-    /// @param add_or_remove If true, we add new components only, vice vesa.
-    Application perform_redeployment (in Properties configProperty,
-                                      out Connections providedReference,
-                                      in boolean add_or_remove,
-                                      in boolean start)
-      raises (PlanError,
-              InstallationFailure,
-              UnknownImplId,
-              ImplEntryPointNotFound,
-              InvalidConnection,
-              InvalidProperty,
-              ::Components::RemoveFailure);
-
-    /// CIAO specific operation to reset deployment plan
-    void reset_plan (in DeploymentPlan plan);
-
-    /// CIAO specific operation to set the information of
-    /// "shared components" (through NodeManager)
-    void set_shared_components (in ComponentPlans components);
-
-    /// CIAO specific function to set priority
-    /// of component, required by RACE
-    long set_priority (in string cid , in Sched_Params params);
-  };
-};
-
-#endif /* NODEAPPLICATIONMANAGER_IDL */
diff --git a/CIAO/ciao/Deployment_NodeManager.idl b/CIAO/ciao/Deployment_NodeManager.idl
deleted file mode 100644
index e6672764115..00000000000
--- a/CIAO/ciao/Deployment_NodeManager.idl
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-#ifndef NODEMANAGER_IDL
-#define NODEMANAGER_IDL
-
-#include "ciao/Deployment.idl"
-#include "ciao/Deployment_Core.idl"
-#include "ciao/Deployment_TargetManager.idl"
-
-module Deployment {
-
-  interface Logger {
-  };
-
-  interface NodeApplicationManager;
-
-  interface NodeManager {
-    /*
-     * @todo 06-02-01 mentions a 4th argument:in long updateInterval
-     */
-    void joinDomain (in Domain ciao_domain,
-                     in TargetManager manager,
-                     in Logger log);
-
-    void leaveDomain ();
-
-    /*
-     * @todo According to 06-02-01 there should also be a ResourceCommitmentManager
-     * as second argument
-     */
-    NodeApplicationManager preparePlan (in DeploymentPlan plan)
-      raises (StartError, PlanError);
-
-    /*
-     * @todo According to 06-02-01 InvalidReference shouldn't be here
-     */
-    void destroyManager (in NodeApplicationManager appManager)
-      raises (StopError, InvalidReference);
-
-    /// CIAO specific extension
-    /// Destroy the NAM and all the associated NAs with this child_plan
-    /// We can guarantee that the input DeploymentPlan is valid, since it
-    /// is fetched from the cached DeploymentPlan of DAM, which has been
-    /// validated before.
-    void destroyPlan (in DeploymentPlan plan)
-      raises (StopError);
-
-    /// CIAO specific extension
-    /// Get all the shared components installed in this node
-    ComponentPlans get_shared_components ();
-
-    /*
-     * @todo According to 06-02-01 missing is:
-     * Resources getDynamicResources ();
-     */
-  };
-};
-
-#endif /* NODEMANAGER_IDL */
diff --git a/CIAO/ciao/Deployment_Packaging_Data.idl b/CIAO/ciao/Deployment_Packaging_Data.idl
deleted file mode 100644
index ed3d0feecb2..00000000000
--- a/CIAO/ciao/Deployment_Packaging_Data.idl
+++ /dev/null
@@ -1,160 +0,0 @@
-// $Id$
-
-#ifndef PACKAGING_DATA_IDL
-#define PACKAGING_DATA_IDL
-
-#include "ciao/Deployment_Data.idl"
-
-module Deployment
-{
-  struct ComponentPackageImport {
-    ::CORBA::StringSeq location;
-  };
-
-  typedef sequence < ComponentPackageImport > ComponentPackageImports;
-
-  struct SubcomponentPropertyReference {
-    string propertyName;
-    unsigned long instanceRef;
-  };
-
-  struct SubcomponentPortEndpoint {
-    string portName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints;
-
-  typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences;
-
-  struct AssemblyPropertyMapping {
-    string name;
-    string externalName;
-    SubcomponentPropertyReferences delegatesTo;
-  };
-
-  typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
-
-#ifndef AVOID_IFR_CRASH
-  struct NamedImplementationArtifact;
-
-  typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts;
-#endif /* AVOID_IFR_CRASH */
-
-  struct ImplementationArtifactDescription {
-    string label;
-    string UUID;
-    ::CORBA::StringSeq location;
-    Properties execParameter;
-    Requirements deployRequirement;
-#ifndef AVOID_IFR_CRASH
-    NamedImplementationArtifacts dependsOn;
-#endif /* AVOID_IFR_CRASH */
-    Properties infoProperty;
-  };
-
-  struct NamedImplementationArtifact {
-    string name;
-    ImplementationArtifactDescription referencedArtifact;
-  };
-
-  struct MonolithicImplementationDescription {
-    Properties nodeExecParameter;
-    Properties componentExecParameter;
-#ifndef AVOID_IFR_CRASH
-    NamedImplementationArtifacts primaryArtifact;
-#endif /* AVOID_IFR_CRASH */
-    ImplementationRequirements deployRequirement;
-  };
-
-  typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
-
-#ifndef AVOID_IFR_CRASH
-  struct PackageConfiguration;
-
-  typedef sequence < PackageConfiguration > PackageConfigurations;
-
-  struct ComponentPackageDescription;
-
-  typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions;
-#endif /* AVOID_IFR_CRASH */
-
-  struct SubcomponentInstantiationDescription {
-    string name;
-#ifndef AVOID_IFR_CRASH
-    ComponentPackageDescriptions basePackage;
-    PackageConfigurations specializedConfig;
-#endif /* AVOID_IFR_CRASH */
-    Requirements selectRequirement;
-    Properties configProperty;
-    ComponentPackageReferences referencedPackage;
-    ComponentPackageImports importedPackage;
-  };
-
-  typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions;
-
-  struct AssemblyConnectionDescription {
-    string name;
-    Requirements deployRequirement;
-    ComponentExternalPortEndpoints externalEndpoint;
-    SubcomponentPortEndpoints internalEndpoint;
-    ExternalReferenceEndpoints externalReference;
-  };
-
-  typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
-
-  struct ComponentAssemblyDescription {
-    SubcomponentInstantiationDescriptions instance;
-    AssemblyConnectionDescriptions connection;
-    AssemblyPropertyMappings externalProperty;
-  };
-
-  typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions;
-
-  struct ComponentImplementationDescription {
-    string label;
-    string UUID;
-    ComponentInterfaceDescription implements;
-    ComponentAssemblyDescriptions assemblyImpl;
-    MonolithicImplementationDescriptions monolithicImpl;
-    Properties configProperty;
-    Capabilities capability;
-    ImplementationDependencies dependsOn;
-    Properties infoProperty;
-  };
-
-
-  struct PackagedComponentImplementation {
-    string name;
-    ComponentImplementationDescription referencedImplementation;
-  };
-
-
-  typedef sequence < PackagedComponentImplementation > PackagedComponentImplementations;
-
-  struct ComponentPackageDescription {
-    string label;
-    string UUID;
-    ComponentInterfaceDescription realizes;
-    Properties configProperty;
-    PackagedComponentImplementations implementation;
-    Properties infoProperty;
-  };
-
-
-  struct PackageConfiguration {
-    string label;
-    string UUID;
-#ifndef AVOID_IFR_CRASH
-    PackageConfigurations specializedConfig;
-    ComponentPackageDescriptions basePackage;
-#endif /* AVOID_IFR_CRASH */
-    ComponentPackageReferences reference;
-    Requirements selectRequirement;
-    Properties configProperty;
-  };
-
-
-};
-
-#endif /* PACKAGING_DATA_IDL */
diff --git a/CIAO/ciao/Deployment_RepositoryManager.idl b/CIAO/ciao/Deployment_RepositoryManager.idl
deleted file mode 100644
index 539d2954416..00000000000
--- a/CIAO/ciao/Deployment_RepositoryManager.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-#ifndef REPOSITORY_MANAGER_IDL
-#define REPOSITORY_MANAGER_IDL
-
-#include "ciao/Deployment_Packaging_Data.idl"
-#include "ciao/Deployment.idl"
-
-module Deployment {
-
-  exception NameExists {
-  };
-
-  exception PackageError {
-    string source;
-    string reason;
-  };
-
-  interface RepositoryManager {
-    void installPackage (in string installationName,
-                         in string location,
-                         in boolean replace)
-      raises (NameExists, PackageError);
-    void createPackage (in string installationName,
-                        in PackageConfiguration package,
-                        in string baseLocation,
-                        in boolean replace)
-      raises (NameExists, PackageError);
-    PackageConfiguration findPackageByName (in string name)
-      raises (NoSuchName);
-    PackageConfiguration findPackageByUUID (in string UUID)
-      raises (NoSuchName);
-    ::CORBA::StringSeq findNamesByType (in string type);
-    ::CORBA::StringSeq getAllNames ();
-    ::CORBA::StringSeq getAllTypes ();
-    void deletePackage (in string installationName)
-      raises (NoSuchName);
-  };
-};
-
-#endif /* REPOSITOR_MANAGER_IDL */
diff --git a/CIAO/ciao/Deployment_TargetData.idl b/CIAO/ciao/Deployment_TargetData.idl
deleted file mode 100644
index 82cff14ca83..00000000000
--- a/CIAO/ciao/Deployment_TargetData.idl
+++ /dev/null
@@ -1,64 +0,0 @@
-//$Id$
-
-#ifndef DEPLOYMENT_TARGETDATA_IDL
-#define DEPLOYMENT_TARGETDATA_IDL
-
-#include "ciao/Deployment_Base.idl"
-#include "tao/StringSeq.pidl"
-#include "tao/ULongSeq.pidl"
-
-module Deployment {
-
-  struct Resource {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    SatisfierProperties property;
-  };
-  typedef sequence < Resource > Resources;
-
-  struct SharedResource {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    ::CORBA::ULongSeq nodeRef;
-    SatisfierProperties property;
-  };
-  typedef sequence < SharedResource > SharedResources;
-
-  struct Node {
-    string name;
-    string label;
-    ::CORBA::ULongSeq sharedResourceRef;
-    ::CORBA::ULongSeq connectionRef;
-    Resources resource;
-  };
-  typedef sequence < Node > Nodes;
-
-  struct Interconnect {
-    string name;
-    string label;
-    ::CORBA::ULongSeq connectionRef;
-    ::CORBA::ULongSeq connectRef;
-    Resources resource;
-  };
-  typedef sequence < Interconnect > Interconnects;
-
-  struct Bridge {
-    string name;
-    string label;
-    ::CORBA::ULongSeq connectRef;
-    Resources resource;
-  };
-  typedef sequence < Bridge > Bridges;
-
-  struct Domain {
-    string UUID;
-    string label;
-    SharedResources sharedResource;
-    Nodes node;
-    Interconnects interconnect;
-    Bridges bridge;
-    Properties infoProperty;
-  };
-};
-
-#endif /* DEPLOYMENT_TARGETDATA_IDL */
diff --git a/CIAO/ciao/Deployment_TargetManager.idl b/CIAO/ciao/Deployment_TargetManager.idl
deleted file mode 100644
index 78723ab3b3d..00000000000
--- a/CIAO/ciao/Deployment_TargetManager.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-#ifndef TARGETMANAGER_IDL
-#define TARGETMANAGER_IDL
-
-#include "ciao/Deployment_Target_Data.idl"
-#include "ciao/Deployment_TargetData.idl"
-#include "ciao/Deployment_DeploymentPlan.idl"
-// Only needed for ResourceNotAvailable but that should go, so this include also
-#include "ciao/Deployment_ApplicationManager.idl"
-
-module Deployment {
-
-  /// @todo, UpdateAvailable is not in the spec, must be UpdateDynamic
-  enum DomainUpdateKind {
-    Add,
-    Delete,
-    UpdateAll,
-    UpdateAvailable
-  };
-
-  /**
-   * @todo The ResourceCommitmentManager is part of 06-04-01 and this is not
-   * part of the Target Manager yet
-   */
-  interface TargetManager {
-    Domain getAllResources ();
-    Domain getAvailableResources ();
-    /// @todo 06-04-01 specifies this differently
-    void commitResources (in DeploymentPlan plan)
-      raises (ResourceNotAvailable, PlanError);
-    /// @todo This is not part of 06-04-01
-    void releaseResources (in DeploymentPlan argname);
-    void updateDomain (in ::CORBA::StringSeq elements,
-                       in Domain domainSubset,
-                       in DomainUpdateKind updateKind);
-  };
-};
-
-#endif /* TARGETMANAGER_IDL */
diff --git a/CIAO/ciao/Deployment_Target_Data.idl b/CIAO/ciao/Deployment_Target_Data.idl
deleted file mode 100644
index 0e08248972a..00000000000
--- a/CIAO/ciao/Deployment_Target_Data.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#ifndef TARGET_DATA_IDL
-#define TARGET_DATA_IDL
-
-module Deployment {
-
-  exception PlanError {
-    string name;
-    string reason;
-  };
-};
-
-#endif /* TARGET_DATA_IDL */
diff --git a/CIAO/ciao/DomainApplicationManager.idl b/CIAO/ciao/DomainApplicationManager.idl
new file mode 100644
index 00000000000..c0030465638
--- /dev/null
+++ b/CIAO/ciao/DomainApplicationManager.idl
@@ -0,0 +1,57 @@
+// $Id$
+#ifndef DOMAINAPPLICATIONMANAGER_IDL
+#define DOMAINAPPLICATIONMANAGER_IDL
+
+#include "Deployment.idl"
+
+module Deployment {
+  /// CIAO 's DomainApplicationManager interface differs spec-defined interface
+  /// in the same that it also integrates the spec-defined interface for
+  /// DomainApplication into itself
+  interface DomainApplicationManager
+  {
+    DeploymentPlan getPlan ();
+
+    /// CIAO specific version of startLaunch implementation, this one
+    /// differs with spec-defined operation in the sense that it doesn't
+    /// return DomainApplication object reference.
+    void startLaunch (in Properties configProperty, in boolean start)
+      raises (ResourceNotAvailable, StartError, InvalidProperty);
+
+    void finishLaunch (in boolean start,
+                       in boolean is_ReDAC)
+      raises (StartError, InvalidConnection);
+
+    void start ()
+      raises (StartError);
+
+    /// CIAO specific extention
+    /// Fetch NodeApplication based on the given node name
+    NodeApplication get_node_app (in string node_name)
+      raises (NoSuchName);
+
+    /// CIAO specific extension, it differs with the spec defined one
+    /// for no input parameter.
+    void destroyApplication ()
+      raises (StopError);
+
+    /// CIAO specific extension to destroy NodeApplicationManager
+    void destroyManager ()
+      raises (StopError);
+
+    /// CIAO specific extension
+    /// Perform the actual redeployment and reconfiguration on the dommain level.
+    void perform_redeployment (in DeploymentPlan new_plan)
+      raises (PlanError,
+              InstallationFailure,
+              UnknownImplId,
+              ImplEntryPointNotFound,
+              InvalidConnection,
+              InvalidProperty,
+              ::Components::RemoveFailure);
+  };
+
+  typedef sequence < DomainApplicationManager > DomainApplicationManagers;
+};
+
+#endif /* DOMAINAPPLICATIONMANAGER_IDL */
diff --git a/CIAO/ciao/Dynamic_Component_Activator.cpp b/CIAO/ciao/Dynamic_Component_Activator.cpp
index 1400766070d..11883fc6056 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.cpp
+++ b/CIAO/ciao/Dynamic_Component_Activator.cpp
@@ -1,6 +1,5 @@
-#include "ciao/Dynamic_Component_Activator.h"
-#include "ciao/Dynamic_Component_Servant_Base.h"
-#include "ciao/CIAO_common.h"
+#include "Dynamic_Component_Activator.h"
+#include "CIAO_common.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
@@ -63,6 +62,9 @@ namespace CIAO
     if (this->servant_map_.unbind (oid, servant) != 0)
       {
         ACE_DEBUG ((LM_DEBUG, "Invalid object reference\n"));
+        return;
       }
+
+    return;
   }
 }
diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h
index 504d8887ed9..a8d0b26549a 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/CIAO/ciao/Dynamic_Component_Activator.h
@@ -11,8 +11,8 @@
  */
 //=============================================================================
 
-#ifndef CIAO_DYNAMIC_COMPONENT_ACTIVATOR_H
-#define CIAO_DYNAMIC_COMPONENT_ACTIVATOR_H
+#ifndef CIAO_DYNAMIC_SWAPPING_ACTIVATOR_H
+#define CIAO_DYNAMIC_SWAPPING_ACTIVATOR_H
 #include /**/ "ace/pre.h"
 
 #include "ciao/CIAO_Server_Export.h"
@@ -23,6 +23,7 @@
 
 #include "ciao/CCM_ContainerC.h"
 #include "ciao/Deployment_CoreC.h"
+#include "ciao/Dynamic_Component_Servant_Base.h"
 
 #include "tao/PortableServer/Key_Adapters.h"
 #include "tao/PortableServer/PortableServer.h"
@@ -93,6 +94,7 @@ namespace CIAO
                             ACE_Equal_To<PortableServer::ObjectId>,
                             ACE_SYNCH_MUTEX>
       servant_map_;
+
   };
 }
 
@@ -101,4 +103,4 @@ namespace CIAO
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
-#endif /* CIAO_DYNAMIC_COMPONENT_ACTIVATOR_H */
+#endif /*CIAO_DYNAMIC_SWAPPING_ACTIVATOR_H*/
diff --git a/CIAO/ciao/Dynamic_Component_Servant_Base.cpp b/CIAO/ciao/Dynamic_Component_Servant_Base.cpp
index 773004e6741..16a9f40ea3a 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_Base.cpp
+++ b/CIAO/ciao/Dynamic_Component_Servant_Base.cpp
@@ -1,5 +1,5 @@
-#include "ciao/CIAO_common.h"
-#include "ciao/Dynamic_Component_Servant_Base.h"
+#include "Dynamic_Component_Servant_Base.h"
+#include "CIAO_common.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/CIAO/ciao/Dynamic_Component_Servant_Base.h b/CIAO/ciao/Dynamic_Component_Servant_Base.h
index 0e826cf40ab..15aab6cace3 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_Base.h
+++ b/CIAO/ciao/Dynamic_Component_Servant_Base.h
@@ -10,18 +10,20 @@
 //=============================================================================
 
 
-#ifndef CIAO_DYNAMIC_COMPONENT_SERVANT_BASE__H
-#define CIAO_DYNAMIC_COMPONENT_SERVANT_BASE__H
+#ifndef CIAO_DYNAMIC_COMPONENT_SERVANT_BASE_H
+#define CIAO_DYNAMIC_COMPONENT_SERVANT_BASE_H
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_Server_Export.h"
+// @@ Jai, why is this includion necessary. Looks heavy weight to me.
+#include "CCM_ComponentS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/PortableServer.h"
+#include "CIAO_Server_Export.h"
 
 namespace CIAO
 {
@@ -52,4 +54,4 @@ namespace CIAO
 
 #include /**/ "ace/post.h"
 
-#endif /* CIAO_DYNAMIC_COMPONENT_SERVANT_BASE__H */
+#endif /* CIAO_DYNAMIC_COMPONENT_SERVANT_BASE_H */
diff --git a/CIAO/ciao/Dynamic_Component_Servant_T.h b/CIAO/ciao/Dynamic_Component_Servant_T.h
index 5ca9fab815e..29f9f801707 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_T.h
+++ b/CIAO/ciao/Dynamic_Component_Servant_T.h
@@ -19,7 +19,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Dynamic_Component_Servant_Base.h"
-#include "CIAO_SwapExecC.h"
+#include "SwapExecC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/ciao/ExecutionManager.idl b/CIAO/ciao/ExecutionManager.idl
new file mode 100644
index 00000000000..a5108b77281
--- /dev/null
+++ b/CIAO/ciao/ExecutionManager.idl
@@ -0,0 +1,50 @@
+// $Id$
+#ifndef EXECUTIONMANAGER_IDL
+#define EXECUTIONMANAGER_IDL
+
+#include "Deployment.idl"
+#include "DomainApplicationManager.idl"
+
+module Deployment {
+  interface ExecutionManager {
+    DomainApplicationManager preparePlan (in DeploymentPlan plan,
+                                          in boolean commitResources)
+      raises (ResourceNotAvailable, PlanError, StartError);
+
+    DomainApplicationManagers getManagers ();
+
+    DomainApplicationManager getManager (in string plan_uuid)
+      raises (PlanNotExist);
+
+    void destroyManager (in DomainApplicationManager manager)
+      raises (StopError);
+
+    /// CIAO specific extention
+    /// Destroy ApplicationManagers by plan_uuid, the unique semantics of this
+    /// operation lies in the fact that if some components are
+    /// still up and running, then the ApplicationManagers won't be destroyed.
+    void destroyManagerByPlan (in string plan_uuid)
+      raises (StopError);
+
+    /// CIAO specific extention
+    /// "Get" operation, return the DeploymentPlan
+    DeploymentPlan getPlan (in string plan_uuid);
+
+    /// CIAO specific operation to handle dynamic system redeployment
+    /// and reconfiguration
+    /// This operation could handle dynamic redeployment, and this
+    /// is the operation exposed to clients directly. Other
+    /// "perform_redeployment" operation defined on DAM and NA
+    /// are implementaion details within DAnCE.
+    void perform_redeployment (in DeploymentPlan new_plan)
+      raises (PlanError,
+              InstallationFailure,
+              UnknownImplId,
+              ImplEntryPointNotFound,
+              InvalidConnection,
+              InvalidProperty,
+              ::Components::RemoveFailure);
+  };
+};
+
+#endif /* EXECUTIONMANAGER_IDL */
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.h b/CIAO/ciao/Home_Servant_Impl_Base.h
index 848259f72d5..a8752b95218 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.h
+++ b/CIAO/ciao/Home_Servant_Impl_Base.h
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CCM_HomeS.h"
+#include "CCM_ComponentS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/ciao/Home_Servant_Impl_T.cpp b/CIAO/ciao/Home_Servant_Impl_T.cpp
index ec85dc8be6a..12ce1132f10 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_T.cpp
@@ -72,7 +72,7 @@ namespace CIAO
         return;
       }
 
-    typedef typename COMP_SVNT::_stub_type stub_type;
+	typedef typename COMP_SVNT::_stub_type stub_type;
     typename COMP_SVNT::_stub_var_type _ciao_comp =
       stub_type::_narrow (ccm_obj_var.in ()
                           ACE_ENV_ARG_PARAMETER);
@@ -149,10 +149,10 @@ namespace CIAO
     CIAO_TRACE ("Home_Servant_Impl<>::create");
 
     if (this->executor_.in () == 0)
-      {
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          COMP_SVNT::_stub_type::_nil ());
-      }
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),
+                        COMP_SVNT::_stub_type::_nil ());
+    }
 
     ::Components::EnterpriseComponent_var _ciao_ec =
       this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/CIAO/ciao/NodeApp_CB_Impl.h b/CIAO/ciao/NodeApp_CB_Impl.h
index 95cc3de30e5..824f3605d8f 100644
--- a/CIAO/ciao/NodeApp_CB_Impl.h
+++ b/CIAO/ciao/NodeApp_CB_Impl.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CIAO_NodeApplication_CallBackS.h"
+#include "NodeApplication_CallBackS.h"
 
 namespace CIAO
 {
diff --git a/CIAO/ciao/NodeApplicationManager.idl b/CIAO/ciao/NodeApplicationManager.idl
new file mode 100644
index 00000000000..1c3e33ad05b
--- /dev/null
+++ b/CIAO/ciao/NodeApplicationManager.idl
@@ -0,0 +1,50 @@
+// $Id$
+#ifndef NODEAPPLICATIONMANAGER_IDL
+#define NODEAPPLICATIONMANAGER_IDL
+
+#include "Deployment.idl"
+
+module Deployment {
+  interface ApplicationManager {
+    Application startLaunch (in Properties configProperty,
+                             out Connections providedReference,
+                             in boolean start)
+      raises (ResourceNotAvailable, StartError, InvalidProperty);
+    void destroyApplication (in Application app)
+      raises (StopError);
+  };
+
+  interface NodeApplicationManager :
+    ApplicationManager
+  {
+    /// CIAO specific operation to handle dynamic system redeployment
+    /// and reconfiguration
+    /// This operation could handle dynamic redeployment for
+    /// a node-level deployment plan within a node
+    /// @para add_or_remove If true, we add new components only, vice vesa.
+    Application perform_redeployment (in Properties configProperty,
+                                      out Connections providedReference,
+                                      in boolean add_or_remove,
+                                      in boolean start)
+      raises (PlanError,
+              InstallationFailure,
+              UnknownImplId,
+              ImplEntryPointNotFound,
+              InvalidConnection,
+              InvalidProperty,
+              ::Components::RemoveFailure);
+
+    /// CIAO specific operation to reset deployment plan
+    void reset_plan (in DeploymentPlan plan);
+
+    /// CIAO speicfic operation to set the information of
+    /// "shared components" (through NodeManager)
+    void set_shared_components (in ComponentPlans components);
+    
+    /// CIAO specific function to set priority
+    /// o component , required by RACE
+    long set_priority (in string cid , in Sched_Params params);
+  };
+};
+
+#endif /* NODEAPPLICATIONMANAGER_IDL */
diff --git a/CIAO/ciao/NodeApplication_CallBack.idl b/CIAO/ciao/NodeApplication_CallBack.idl
new file mode 100644
index 00000000000..d0f8daeb42e
--- /dev/null
+++ b/CIAO/ciao/NodeApplication_CallBack.idl
@@ -0,0 +1,23 @@
+// $Id$
+
+/**
+ * This IDL file is used to combine the NodeApplication
+ * interface with the NodeApplicationManager interface.
+ *
+ * NodeApplicationManager will be spawn NodeApplication.
+ * The call back object will be used to get the objectref of
+ * NodeApplication.
+ */
+
+#include "Deployment.idl"
+#include "NodeApplicationManager.idl"
+
+module CIAO
+{
+  interface NodeApplication_Callback
+  {
+    Deployment::NodeApplicationManager
+      register_node_application (in Deployment::NodeApplication na,
+				 out Deployment::Properties properties);
+  };
+};
diff --git a/CIAO/ciao/NodeManager.idl b/CIAO/ciao/NodeManager.idl
new file mode 100644
index 00000000000..47651ac52bb
--- /dev/null
+++ b/CIAO/ciao/NodeManager.idl
@@ -0,0 +1,38 @@
+// $Id$
+#ifndef NODEMANAGER_IDL
+#define NODEMANAGER_IDL
+
+#include "Deployment.idl"
+
+module Deployment {
+
+  interface NodeApplicationManager;
+
+  interface NodeManager {
+    void joinDomain (in Domain ciao_domain,
+                     in TargetManager manager,
+                     in Logger log);
+
+    void leaveDomain ();
+
+    NodeApplicationManager preparePlan (in DeploymentPlan plan)
+      raises (StartError, PlanError);
+
+    void destroyManager (in NodeApplicationManager appManager)
+      raises (StopError, InvalidReference);
+
+    /// CIAO specific extension
+    /// Destroy the NAM and all the associated NAs with this child_plan
+    /// We can guarantee that the input DeploymentPlan is valid, since it
+    /// is fetched from the cached DeploymentPlan of DAM, which has been
+    /// validated before.
+    void destroyPlan (in DeploymentPlan plan)
+      raises (StopError);
+
+    /// CIAO specific extension
+    /// Get all the shared components installed in this node
+    ComponentPlans get_shared_components ();
+  };
+};
+
+#endif /* NODEMANAGER_IDL */
diff --git a/CIAO/ciao/Packaging_Data.idl b/CIAO/ciao/Packaging_Data.idl
new file mode 100644
index 00000000000..533116196eb
--- /dev/null
+++ b/CIAO/ciao/Packaging_Data.idl
@@ -0,0 +1,160 @@
+// $Id$
+
+#ifndef PACKAGING_DATA_IDL
+#define PACKAGING_DATA_IDL
+
+#include "Deployment_Data.idl"
+
+module Deployment
+{
+  struct ComponentPackageImport {
+    ::CORBA::StringSeq location;
+  };
+
+  typedef sequence < ComponentPackageImport > ComponentPackageImports;
+
+  struct SubcomponentPropertyReference {
+    string propertyName;
+    unsigned long instanceRef;
+  };
+
+  struct SubcomponentPortEndpoint {
+    string portName;
+    unsigned long instanceRef;
+  };
+
+  typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints;
+
+  typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences;
+
+  struct AssemblyPropertyMapping {
+    string name;
+    string externalName;
+    SubcomponentPropertyReferences delegatesTo;
+  };
+
+  typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
+
+#ifndef AVOID_IFR_CRASH
+  struct NamedImplementationArtifact;
+
+  typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts;
+#endif /* AVOID_IFR_CRASH */
+
+  struct ImplementationArtifactDescription {
+    string label;
+    string UUID;
+    ::CORBA::StringSeq location;
+    Properties execParameter;
+    Requirements deployRequirement;
+#ifndef AVOID_IFR_CRASH
+    NamedImplementationArtifacts dependsOn;
+#endif /* AVOID_IFR_CRASH */
+    Properties infoProperty;
+  };
+
+  struct NamedImplementationArtifact {
+    string name;
+    ImplementationArtifactDescription referencedArtifact;
+  };
+
+  struct MonolithicImplementationDescription {
+    Properties nodeExecParameter;
+    Properties componentExecParameter;
+#ifndef AVOID_IFR_CRASH
+    NamedImplementationArtifacts primaryArtifact;
+#endif /* AVOID_IFR_CRASH */
+    ImplementationRequirements deployRequirement;
+  };
+
+  typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
+
+#ifndef AVOID_IFR_CRASH
+  struct PackageConfiguration;
+
+  typedef sequence < PackageConfiguration > PackageConfigurations;
+
+  struct ComponentPackageDescription;
+
+  typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions;
+#endif /* AVOID_IFR_CRASH */
+
+  struct SubcomponentInstantiationDescription {
+    string name;
+#ifndef AVOID_IFR_CRASH
+    ComponentPackageDescriptions basePackage;
+    PackageConfigurations specializedConfig;
+#endif /* AVOID_IFR_CRASH */
+    Requirements selectRequirement;
+    Properties configProperty;
+    ComponentPackageReferences referencedPackage;
+    ComponentPackageImports importedPackage;
+  };
+
+  typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions;
+
+  struct AssemblyConnectionDescription {
+    string name;
+    Requirements deployRequirement;
+    ComponentExternalPortEndpoints externalEndpoint;
+    SubcomponentPortEndpoints internalEndpoint;
+    ExternalReferenceEndpoints externalReference;
+  };
+
+  typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
+
+  struct ComponentAssemblyDescription {
+    SubcomponentInstantiationDescriptions instance;
+    AssemblyConnectionDescriptions connection;
+    AssemblyPropertyMappings externalProperty;
+  };
+
+  typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions;
+
+  struct ComponentImplementationDescription {
+    string label;
+    string UUID;
+    ComponentInterfaceDescription implements;
+    ComponentAssemblyDescriptions assemblyImpl;
+    MonolithicImplementationDescriptions monolithicImpl;
+    Properties configProperty;
+    Capabilities capability;
+    ImplementationDependencies dependsOn;
+    Properties infoProperty;
+  };
+
+
+  struct PackagedComponentImplementation {
+    string name;
+    ComponentImplementationDescription referencedImplementation;
+  };
+
+
+  typedef sequence < PackagedComponentImplementation > PackagedComponentImplementations;
+
+  struct ComponentPackageDescription {
+    string label;
+    string UUID;
+    ComponentInterfaceDescription realizes;
+    Properties configProperty;
+    PackagedComponentImplementations implementation;
+    Properties infoProperty;
+  };
+
+
+  struct PackageConfiguration {
+    string label;
+    string UUID;
+#ifndef AVOID_IFR_CRASH
+    PackageConfigurations specializedConfig;
+    ComponentPackageDescriptions basePackage;
+#endif /* AVOID_IFR_CRASH */
+    ComponentPackageReferences reference;
+    Requirements selectRequirement;
+    Properties configProperty;
+  };
+
+
+};
+
+#endif /* PACKAGING_DATA_IDL */
diff --git a/CIAO/ciao/Port_Activator.cpp b/CIAO/ciao/Port_Activator.cpp
index 3a16c75b0d0..e428102a355 100644
--- a/CIAO/ciao/Port_Activator.cpp
+++ b/CIAO/ciao/Port_Activator.cpp
@@ -20,22 +20,15 @@ namespace CIAO
   }
 
   const char*
-  Port_Activator::oid (void) const
+  Port_Activator::name (void) const
   {
     // @@ TODO, need to be inlined.
     return this->oid_.in ();
   }
 
   void
-  Port_Activator::oid (const char* oid)
+  Port_Activator::set_name (const char* name)
   {
-    this->oid_ = oid;
-  }
-
-  const char*
-  Port_Activator::name (void) const
-  {
-    // @@ TODO, need to be inlined.
-    return this->name_.in ();
+    this->oid_ = name;
   }
 }
diff --git a/CIAO/ciao/Port_Activator.h b/CIAO/ciao/Port_Activator.h
index db047575405..5ab3adb2604 100644
--- a/CIAO/ciao/Port_Activator.h
+++ b/CIAO/ciao/Port_Activator.h
@@ -51,14 +51,11 @@ namespace CIAO
 
     virtual ~Port_Activator (void);
 
-    /// Return the oid of port that this activator encapulates.
-    const char* oid (void) const;
+    /// Return the name of port that this activator encapulates.
+    const char*  name (void) const;
 
-    /// Set the oid
-    void oid (const char* oid);
-
-    /// Return the oid of port that this activator encapulates.
-    const char* name (void) const;
+    /// Set the name
+    void set_name (const char* name);
 
     /// Activate the servant reponsible for this port.
     /**
@@ -83,7 +80,7 @@ namespace CIAO
     CORBA::String_var name_;
 
     /// What type of port is it, a consumer or facet.
-    Type const t_;
+    Type t_;
   };
 }
 
diff --git a/CIAO/ciao/RepositoryManager.idl b/CIAO/ciao/RepositoryManager.idl
new file mode 100644
index 00000000000..c5645bcab69
--- /dev/null
+++ b/CIAO/ciao/RepositoryManager.idl
@@ -0,0 +1,40 @@
+// $Id$
+#ifndef REPOSITORY_MANAGER_IDL
+#define REPOSITORY_MANAGER_IDL
+
+#include "Packaging_Data.idl"
+#include "Deployment.idl"
+
+module Deployment {
+
+  exception NameExists {
+  };
+
+  exception PackageError {
+    string source;
+    string reason;
+  };
+
+  interface RepositoryManager {
+    void installPackage (in string installationName, 
+                         in string location,
+                         in boolean replace)
+      raises (NameExists, PackageError);
+    void createPackage (in string installationName,
+                        in PackageConfiguration package,
+                        in string baseLocation,
+                        in boolean replace)
+      raises (NameExists, PackageError);
+    PackageConfiguration findPackageByName (in string name)
+      raises (NoSuchName);
+    PackageConfiguration findPackageByUUID (in string UUID)
+      raises (NoSuchName);
+    ::CORBA::StringSeq findNamesByType (in string type);
+    ::CORBA::StringSeq getAllNames ();
+    ::CORBA::StringSeq getAllTypes ();
+    void deletePackage (in string installationName)
+      raises (NoSuchName);
+  };
+};
+
+#endif /* REPOSITOR_MANAGER_IDL */
diff --git a/CIAO/ciao/Security.idl b/CIAO/ciao/Security.idl
deleted file mode 100644
index 199ae210c31..00000000000
--- a/CIAO/ciao/Security.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @@ This is just a temporary file. CIAO doesn't sue the security
- * service in its implementation but just using this local
- * interface below from the real security service pulls in
- * 250Kb of footprint
- *
- * $Id$
- */
-
-#if !defined (CIAO_SECURITY_IDL)
-#define CIAO_SECURITY_IDL
-
-#pragma prefix "omg.org"
-
-module SecurityLevel2 {
-
-# pragma version SecurityLevel2 1.8
-
-  local interface Credentials
-  {
-  };
-};
-#endif /* CIAO_SECURITY_IDL */
diff --git a/CIAO/ciao/Servant_Activator.cpp b/CIAO/ciao/Servant_Activator.cpp
index 2638133fa23..cf194524ec7 100644
--- a/CIAO/ciao/Servant_Activator.cpp
+++ b/CIAO/ciao/Servant_Activator.cpp
@@ -25,7 +25,7 @@ namespace CIAO
                  guard,
                  this->mutex_);
 
-      size_t const sz =  this->slot_index_;
+      const size_t sz =  this->slot_index_;
 
       for (size_t t = 0; t != sz; ++t)
         {
@@ -49,16 +49,16 @@ namespace CIAO
                         guard,
                         this->mutex_,
                         0);
-      size_t const sz = this->slot_index_;
+      const size_t sz = this->slot_index_;
       for (size_t t = 0; t != sz; ++t)
         {
           Port_Activator *&tmp = this->pa_[t];
-          if (ACE_OS::strcmp (tmp->oid (), str.in ()) == 0)
-            {
-              tmp->oid ("dummy");
-              //delete tmp;
-              //--this->slot_index_;
-            }
+          if (ACE_OS::strcmp (tmp->name (), str.in ()) == 0)
+          {
+            tmp->set_name ("dummy");
+            //delete tmp;
+            //--this->slot_index_;
+          }
         }
     }
     return true;
@@ -86,7 +86,7 @@ namespace CIAO
                         this->mutex_,
                         0);
 
-      size_t const sz = this->slot_index_;
+      const size_t sz = this->slot_index_;
 
       Port_Activator *tmp = 0;
 
@@ -104,7 +104,7 @@ namespace CIAO
                             " value from the array is null \n"));
               continue;
             }
-          if (ACE_OS::strcmp (tmp->oid (),
+          if (ACE_OS::strcmp (tmp->name (),
                               str.in ()) == 0)
             {
               // We should try avoiding making outbound calls with the
@@ -135,7 +135,7 @@ namespace CIAO
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
 
-    size_t const sz = this->slot_index_;
+    const size_t sz = this->slot_index_;
 
     Port_Activator *tmp = 0;
 
@@ -152,7 +152,7 @@ namespace CIAO
             ACE_DEBUG ((LM_DEBUG, "Port Activator is NULL\n"));
             continue;
           }
-        if (ACE_OS::strcmp (tmp->oid (),
+        if (ACE_OS::strcmp (tmp->name (),
                             str.in ()) == 0)
           {
             ACE_DEBUG ((LM_DEBUG, "Deactivating Port %s\n",
diff --git a/CIAO/ciao/Servant_Impl_Base.cpp b/CIAO/ciao/Servant_Impl_Base.cpp
index daa48f70014..dc50e0bd0f8 100644
--- a/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servant_Impl_Base.cpp
@@ -29,6 +29,8 @@ namespace CIAO
                      ::Components::NoKeyAvailable))
   {
     ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
+
+    return 0;
   }
 
   CORBA::IRObject_ptr
@@ -65,8 +67,9 @@ namespace CIAO
         this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ULong const facet_len = facets->length ();
-      for (CORBA::ULong i = 0; i < facet_len; ++i)
+      const CORBA::ULong facet_len = facets->length ();
+      CORBA::ULong i = 0;
+      for (i = 0; i < facet_len; ++i)
       {
         PortableServer::ObjectId_var facet_id =
           this->container_->the_facet_cons_POA ()->reference_to_id
@@ -91,8 +94,9 @@ namespace CIAO
         this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ULong const consumer_len = consumers->length ();
-      for (CORBA::ULong j = 0; j < consumer_len; ++j)
+      const CORBA::ULong consumer_len = consumers->length ();
+      CORBA::ULong j = 0;
+      for (j = 0; j < consumer_len; ++j)
       {
         PortableServer::ObjectId_var cons_id =
           this->container_->the_facet_cons_POA ()->reference_to_id
@@ -228,13 +232,13 @@ namespace CIAO
                     ::Components::FacetDescriptions,
                     0);
     Components::FacetDescriptions_var safe_retval = retval;
-    CORBA::ULong const len = names.length ();
+    CORBA::ULong len = names.length ();
     safe_retval->length (len);
+    ::Components::FacetDescription *tmp = 0;
 
     for (CORBA::ULong i = 0; i < len; ++i)
       {
-        ::Components::FacetDescription *tmp =
-          this->lookup_facet_description (names[i]);
+        tmp = this->lookup_facet_description (names[i]);
 
         if (0 == tmp)
           {
@@ -298,6 +302,7 @@ namespace CIAO
          iter != this->consumer_table_.end ();
          ++iter, ++i)
       {
+        // ACE_DEBUG ((LM_DEBUG, "EXECUTING \n"));
         ConsumerTable::const_reference entry = *iter;
         retval[i] = entry.second;
       }
@@ -345,13 +350,13 @@ namespace CIAO
                     ::Components::ConsumerDescriptions,
                     0);
     Components::ConsumerDescriptions_var safe_retval = retval;
-    CORBA::ULong const len = names.length ();
+    CORBA::ULong len = names.length ();
     safe_retval->length (len);
+    ::Components::ConsumerDescription *tmp = 0;
 
     for (CORBA::ULong i = 0; i < len; ++i)
       {
-        ::Components::ConsumerDescription *tmp =
-          this->lookup_consumer_description (names[i]);
+        tmp = this->lookup_consumer_description (names[i]);
 
         if (0 == tmp)
           {
@@ -434,6 +439,7 @@ namespace CIAO
   }
 
   /// Protected operations.
+
   void
   Servant_Impl_Base::add_facet (const char *port_name,
                                 ::CORBA::Object_ptr port_ref
@@ -448,21 +454,20 @@ namespace CIAO
 
     ::Components::FacetDescription *fd = 0;
     ACE_NEW (fd,
-             ::OBV_Components::FacetDescription (
-              port_name,
-              port_ref->_interface_repository_id (),
-              port_ref));
+             ::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);
+
     FacetTable::value_type entry;
     entry.first = port_name;
     entry.second = safe._retn ();
 
-    {
-      ACE_WRITE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
+    ACE_WRITE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
-      (void) this->facet_table_.insert (entry);
-    }
+    (void) this->facet_table_.insert (entry);
   }
 
   CORBA::Object_ptr
@@ -499,14 +504,15 @@ namespace CIAO
       }
 
     ::Components::FacetDescription_var fd;
+    FacetTable::const_iterator iter;
 
     {
       ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX,
                              mon,
                              this->lock_,
                              0);
-      FacetTable::const_iterator iter =
-        this->facet_table_.find (port_name);
+
+      iter = this->facet_table_.find (port_name);
 
       if (iter != this->facet_table_.end ())
         {
@@ -537,17 +543,19 @@ namespace CIAO
       safe = rd;
 
       rd->name (receptacle_name);
-      rd->type_id ();
+      rd->type_id (recept_ref->_interface_repository_id ());
       // The receptacle is a multiplex receptacle if and only if a
       // cookie was given.
       rd->is_multiple (cookie != 0);
 
       ::Components::ConnectionDescription *cd = 0;
       ACE_NEW (cd,
-               OBV_Components::ConnectionDescription (
-                cookie,
-                recept_ref));
+               OBV_Components::ConnectionDescription);
       ::Components::ConnectionDescription_var cd_safe = cd;
+
+      cd->ck (cookie);
+      cd->objref (recept_ref);
+
       ::Components::ConnectionDescriptions cds (1);
 
       cds.length (1);
@@ -561,10 +569,12 @@ namespace CIAO
 
       ::Components::ConnectionDescription *cd = 0;
       ACE_NEW (cd,
-               OBV_Components::ConnectionDescription (
-                cookie,
-                recept_ref));
+               OBV_Components::ConnectionDescription);
       ::Components::ConnectionDescription_var cd_safe = cd;
+
+      cd->ck (cookie);
+      cd->objref (recept_ref);
+
       ::Components::ConnectionDescriptions & cds = rd->connections ();
       CORBA::ULong old_length = cds.length ();
       ACE_DEBUG ((LM_DEBUG, "Old length was %d\n", old_length));
diff --git a/CIAO/ciao/Servant_Impl_Base.h b/CIAO/ciao/Servant_Impl_Base.h
index c96add04588..a68270392b2 100644
--- a/CIAO/ciao/Servant_Impl_Base.h
+++ b/CIAO/ciao/Servant_Impl_Base.h
@@ -28,11 +28,10 @@
 #include "ace/Active_Map_Manager_T.h"
 #include "ace/Thread_Mutex.h"
 
-#include "CCM_EventsC.h"
+#include "CCM_EventC.h"
 #include "CIAO_Server_Export.h"
-#include "CCM_ContainerC.h"
-#include "CCM_ObjectS.h"
-#include "CCM_StandardConfiguratorC.h"
+#include "CCM_ComponentS.h"
+#include "CCM_ContainerS.h"
 #include "Home_Servant_Impl_Base.h"
 #include "Servant_Activator.h"
 
@@ -138,7 +137,7 @@ namespace CIAO
                            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));
diff --git a/CIAO/ciao/Servant_Impl_T.cpp b/CIAO/ciao/Servant_Impl_T.cpp
index c1e7a6ce117..b9476f72333 100644
--- a/CIAO/ciao/Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servant_Impl_T.cpp
@@ -4,7 +4,6 @@
 #define CIAO_SERVANT_IMPL_T_C
 
 #include "Servant_Impl_T.h"
-#include "CCM_EntityContextC.h"
 
 namespace CIAO
 {
diff --git a/CIAO/ciao/ServerResources.idl b/CIAO/ciao/ServerResources.idl
new file mode 100644
index 00000000000..2269357ce38
--- /dev/null
+++ b/CIAO/ciao/ServerResources.idl
@@ -0,0 +1,237 @@
+// $Id$
+
+/**
+ * @file ServerResources.idl
+ *
+ * @brief A collection of IDL data types for
+ *
+ * @author Nanbor Wang
+ */
+
+#if !defined (CIAO_SERVERRESOURCES_IDL)
+#define CIAO_SERVERRESOURCES_IDL
+
+#include <orb.idl>
+
+module CIAO
+{
+  module DAnCE
+  {
+    /**
+     * @brief A single command line argument corresponds to a string as
+     * in the case of "argv".
+     */
+    typedef string CommandlineArg;
+    /**
+     * @brief A list of command line arguments which a
+     * NodeApplicationManager will use to start up the NodeApplication
+     * this list is associated to.  The command line arguments will be
+     * appended to the command line in order.
+     */
+    typedef sequence<CommandlineArg> CommandlineArgs;
+
+    /**
+     * @brief A string containing the filename of the svc.conf file the
+     * NodeApplication uses.  The current approach of specifying
+     * svc.conf filename directly some harder problems such as
+     * distribution of svc.conf files and the relative/absolute path to
+     * the svc.conf file (the ServerResrouces xml document will have to
+     * assume the svc.conf file will be available at specific location.)
+     */
+    typedef string SvcconfURI;
+
+    /**
+     * @breif enumeration of ORB Resource Types (ORT) supported in RT
+     * extension.
+     */
+    enum ORBResourceType
+      {
+        ORT_THREADPOOL,
+        ORT_THREADPOOLWITHLANES,
+        ORT_CONNECTIONBANDS
+      };
+
+    typedef short Priority;
+
+    /**
+     * @brief Define a threadpool resource that an ORB must provide
+     */
+    struct ORS_Threadpool
+    {
+      string Id;
+      unsigned long stacksize;
+      unsigned long static_threads;
+      unsigned long dynamic_threads;
+      Priority default_priority;
+      boolean allow_request_buffering;
+      unsigned long max_buffered_requests;
+      unsigned long max_request_buffer_size;
+    };
+
+    typedef sequence<ORS_Threadpool> ORS_ThreadpoolSeq;
+
+    /**
+     * @brief Defines the configuration of a threadpool lane.  We need
+     * to redefine it here to avoid dependency to RTCORBA library.
+     */
+    struct ORS_ThreadpoolLane
+    {
+      Priority lane_priority;
+      unsigned long static_threads;
+      unsigned long dynamic_threads;
+    };
+
+    /**
+     * @brief Defines a set of threadpool lanes.  We need
+     * to redefine it here to avoid dependency to RTCORBA library.
+     */
+    typedef sequence<ORS_ThreadpoolLane> ORS_ThreadpoolLanes;
+
+    /**
+     * @brief Defines a Threadpool with Lanes resource that an ORB
+     * must provide.
+     */
+    struct ORS_ThreadpoolWithLanes
+    {
+      string Id;
+      unsigned long stacksize;
+      ORS_ThreadpoolLanes threadpool_lanes;
+      boolean allow_borrowing;
+      boolean allow_request_buffering;
+      unsigned long max_buffered_requests;
+      unsigned long max_request_buffer_size;
+    };
+
+    typedef sequence<ORS_ThreadpoolWithLanes> ORS_ThreadpoolWithLanesSeq;
+
+    /**
+     * @brief Define a priority band for BandedConnection policies.
+     */
+    struct ORS_PriorityBand
+    {
+      Priority low;
+      Priority high;
+    };
+    /**
+     * @brief Define a list of priority bands for BandedConnection
+     * policies.
+     */
+    typedef sequence<ORS_PriorityBand> ORS_PriorityBands;
+
+    /**
+     * @brief Define the information needed to create a
+     * BandedConnection policy.  This info can be referred to via its
+     * name (Id).
+     */
+    struct ORS_ConnectionBands
+    {
+      string Id;
+      ORS_PriorityBands bands;
+    };
+
+    typedef sequence<ORS_ConnectionBands> ORS_ConnectionBandsSeq;
+
+    /**
+     * @brief Collection of resources managed by the NodeApplication
+     * ORB.
+     */
+    struct ORBResource
+    {
+      ORS_ThreadpoolSeq threadpool_list;
+
+      ORS_ThreadpoolWithLanesSeq threadpool_with_lanes_list;
+
+      ORS_ConnectionBandsSeq connection_bands_list;
+    };
+
+    typedef sequence<ORBResource, 1> ORBResources;
+
+    // =================================================================
+
+    /**
+     * @brief PolicyType supported by DAnCE extension.  Again, we are
+     * redefining these value to avoid dependencies to various ORB
+     * modules such as RTCORBA.
+     */
+    const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40;
+    const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41;
+    const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45;
+
+    enum PriorityModel
+      {
+        CLIENT_PROPAGATED,
+        SERVER_DECLARED
+      };
+
+    /**
+     * @brief Defines data required for creating a PriorityModel Policy
+     */
+    struct PriorityModelPolicyDef
+    {
+      PriorityModel priority_model;
+      Priority server_priority;
+    };
+
+    /**
+     * @brief Define data required for creating a Threadpool policy
+     */
+    struct ThreadpoolPolicyDef
+    {
+      string Id;                // Threadpool name defined in
+                                // ORBResource
+    };
+
+    /**
+     * @brief Define data required for creating a PriorityBandedConnection
+     * policy
+     */
+    struct PriorityBandedConnectionPolicyDef
+    {
+      string Id;                // PriorityBands name defined in
+                                // ORBResource
+    };
+
+    union PolicyDef switch (CORBA::PolicyType)
+    {
+    case 40: PriorityModelPolicyDef PriorityModelDef;
+    case 41: ThreadpoolPolicyDef    ThreadpoolDef;
+    case 45: PriorityBandedConnectionPolicyDef PriorityBandedConnectionDef;
+    };
+
+    /**
+     * @brief Define a set of policy definitions.
+     */
+    typedef sequence<PolicyDef> PolicyDefs;
+
+    /**
+     * @brief A policy set is named.
+     */
+    struct PolicySet
+    {
+      string Id;                // Name of this policy set
+      PolicyDefs policies;
+    };
+
+    /**
+     * @brief A list of all policy sets.
+     */
+    typedef sequence<PolicySet> PolicySets;
+
+    struct ORBConfigs
+    {
+      ORBResources orb_resources;
+      PolicySets policy_set;
+    };
+
+    struct ServerResource
+    {
+      string Id;
+
+      CommandlineArgs args;
+      SvcconfURI svcconf;
+      ORBConfigs orb_config;
+    };
+  };
+};
+
+#endif /* CIAO_SERVERRESOURCES_IDL */
diff --git a/CIAO/ciao/Server_init.cpp b/CIAO/ciao/Server_init.cpp
index 8e1428382d0..efb4e9144af 100644
--- a/CIAO/ciao/Server_init.cpp
+++ b/CIAO/ciao/Server_init.cpp
@@ -3,7 +3,6 @@
 #include "Server_init.h"
 #include "CIAO_common.h"
 #include "CCM_ComponentC.h"
-#include "CCM_StandardConfiguratorC.h"
 #include "Cookies.h"
 
 #include "ace/OS_NS_stdio.h"
@@ -14,6 +13,8 @@ namespace CIAO
   {
     CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
                                 Components::Cookie);
+    CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
+                                CIAO::Cookie);
     CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init,
                                 Components::PortDescription);
     CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init,
diff --git a/CIAO/ciao/StandardConfigurator_Impl.h b/CIAO/ciao/StandardConfigurator_Impl.h
index 558137b64d5..a743c4d231f 100644
--- a/CIAO/ciao/StandardConfigurator_Impl.h
+++ b/CIAO/ciao/StandardConfigurator_Impl.h
@@ -18,7 +18,7 @@
 #define CIAO_STANDARDCONFIGURATOR_IMPL_H
 # include /**/ "ace/pre.h"
 
-#include "CCM_StandardConfiguratorS.h"
+#include "CCM_ComponentS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/ciao/SwapExec.idl b/CIAO/ciao/SwapExec.idl
new file mode 100644
index 00000000000..1a6d00c3575
--- /dev/null
+++ b/CIAO/ciao/SwapExec.idl
@@ -0,0 +1,13 @@
+// $Id$
+
+#include "CCM_Container.idl"
+
+
+module CIAO
+{
+  local interface Swap_Exec : ::Components::EnterpriseComponent
+  {
+    Components::EnterpriseComponent incarnate ();
+    Components::EnterpriseComponent etherealize ();
+  };
+};
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
index 5e118476f18..66258261e7d 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CCM_HomeS.h"
+#include "CCM_ComponentS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/ciao/Target_Data.idl b/CIAO/ciao/Target_Data.idl
new file mode 100644
index 00000000000..ba1d895c784
--- /dev/null
+++ b/CIAO/ciao/Target_Data.idl
@@ -0,0 +1,42 @@
+// $Id$
+
+#ifndef TARGET_DATA_IDL
+#define TARGET_DATA_IDL
+
+#include "Deployment_Data.idl"
+
+module Deployment {
+
+  exception ResourceNotAvailable {
+    string name;
+    string resourceType;
+    string propertyName;
+    string elementName;
+    string resourceName;
+  };
+
+  exception PlanError {
+    string name;
+    string reason;
+  };
+
+
+  /**
+   * @todo The ResourceCommitmentManager is part of 06-04-01 and this is not
+   * part of the Target Manager yet
+   */
+  interface TargetManager {
+    Domain getAllResources ();
+    Domain getAvailableResources ();
+    /// @todo 06-04-01 specifies this differently
+    void commitResources (in DeploymentPlan plan)
+      raises (ResourceNotAvailable, PlanError);
+    /// @todo This is not part of 06-04-01
+    void releaseResources (in DeploymentPlan argname);
+    void updateDomain (in ::CORBA::StringSeq elements,
+                       in Domain domainSubset,
+                       in DomainUpdateKind updateKind);
+  };
+};
+
+#endif /* TARGET_DATA_IDL */
diff --git a/CIAO/ciao/UpgradeableContext.idl b/CIAO/ciao/UpgradeableContext.idl
new file mode 100644
index 00000000000..0fe4a332986
--- /dev/null
+++ b/CIAO/ciao/UpgradeableContext.idl
@@ -0,0 +1,20 @@
+// $Id$
+
+#include "CCM_Container.idl"
+#include "CCM_Base.idl"
+#include "CCM_Event.idl"
+#include "tao/PortableServer/PortableServer_include.pidl"
+#include <orb.idl>
+
+module CIAO
+{
+  local interface UpgradeableContext : ::Components::SessionContext
+  {
+    ::Components::ConsumerDescriptions get_registered_consumers
+        (in ::Components::FeatureName publisher_name)
+      raises (::Components::InvalidName, ::Components::InvalidConnection);
+    void deactivate_facet (in PortableServer::ObjectId oid);
+    void update_port_activator (in PortableServer::ObjectId oid);
+    void remove_facet (in Object reference);
+  };
+};
diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.h b/CIAO/ciao/Upgradeable_Context_Impl_T.h
index dc8d3269fcf..18e5272b205 100644
--- a/CIAO/ciao/Upgradeable_Context_Impl_T.h
+++ b/CIAO/ciao/Upgradeable_Context_Impl_T.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_UpgradeableContextC.h"
+#include "ciao/UpgradeableContextC.h"
 #include "ciao/Context_Impl_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h
index a5583673907..f3994eb086f 100644
--- a/CIAO/ciao/Version.h
+++ b/CIAO/ciao/Version.h
@@ -4,6 +4,6 @@
 // This is file was automatically generated by $ACE_ROOT/bin/make_release.
 
 #define CIAO_MAJOR_VERSION 0
-#define CIAO_MINOR_VERSION 5
-#define CIAO_BETA_VERSION 4
-#define CIAO_VERSION "0.5.4"
+#define CIAO_MINOR_VERSION 5 
+#define CIAO_BETA_VERSION 3 
+#define CIAO_VERSION "0.5.3"
diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
index ad5aba294bf..58e7ee9c9e3 100644
--- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
@@ -24,8 +24,7 @@ namespace CIAO
    void
      EventServiceBase::ciao_push_event (
       ::Components::EventBase * evt,
-      const char * source_id,
-      ::CORBA::TypeCode_ptr tc
+      const char * source_id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
       ::CORBA::SystemException,
@@ -33,6 +32,5 @@ namespace CIAO
    {
       ACE_UNUSED_ARG (evt);
       ACE_UNUSED_ARG (source_id);
-      ACE_UNUSED_ARG (tc);
    }
 }
diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
index cec5777ae6e..f20de7591b0 100644
--- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
+++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
@@ -114,8 +114,7 @@ namespace CIAO
      */
     virtual void ciao_push_event (
         ::Components::EventBase * evt,
-        const char * source_id,
-        ::CORBA::TypeCode_ptr tc
+        const char * source_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl
index 266f8b472e9..49393ede7a4 100644
--- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl
+++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl
@@ -9,11 +9,7 @@
  * @brief Interfaces for configuring CIAO's event mechanism.
  */
 
-#if !defined (CIAO_EVENTS_IDL)
-#define CIAO_EVENTS_IDL
-
-#include "ciao/CCM_EventConsumerBase.idl"
-#include "ciao/CCM_Base.idl"
+#include "ciao/CCM_Event.idl"
 
 module CIAO
 {
@@ -75,5 +71,3 @@ module CIAO
     //void push_event (in Components::EventBase ev);
   };
 };
-
-#endif /* CIAO_EVENTS_IDL */
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
index fa597a12a87..333fcc8f8f1 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
@@ -14,9 +14,9 @@
 #include "CIAO_RTEvent.h"
 #include "ciao/CIAO_common.h"
 #include "SimpleAddressServer.h"
-#include "tao/ORB_Core.h"
+#include <tao/ORB_Core.h>
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
-#include "orbsvcs/CosNamingC.h"
+#include <orbsvcs/CosNamingC.h>
 
 #include <sstream>
 
@@ -529,7 +529,7 @@ namespace CIAO
   RTEventService::tao_rt_event_channel (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((::CORBA::SystemException))
   {
-    return this->rt_event_channel_.in ();
+    return this->rt_event_channel_;
   }
 
   //////////////////////////////////////////////////////////////////////
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp
index d04a8528e9a..d5db60e5651 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+// SimpleAddressServer.cpp
 
 #include "SimpleAddressServer.h"
 #include <ace/INET_Addr.h>
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h
index 9e149226d53..04aabc6ea66 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h
@@ -1,20 +1,12 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file SimpleAddressServer.h
- *
- *  $Id$
- *
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
- */
-//=============================================================================
+// SimpleAddressServer.h
 
 #ifndef SIMPLEADDRESSSERVER_H
 #define SIMPLEADDRESSSERVER_H
 
 #include <orbsvcs/RtecUDPAdminS.h>
 
+class ACE_INET_Addr;
+
 class SimpleAddressServer : public POA_RtecUDPAdmin::AddrServer {
 public:
   SimpleAddressServer (const ACE_INET_Addr& address);
diff --git a/CIAO/docs/generate_component_mpc.html b/CIAO/docs/generate_component_mpc.html
deleted file mode 100644
index 3f109e57adc..00000000000
--- a/CIAO/docs/generate_component_mpc.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta name="GENERATOR" content="Mozilla/4.5 [en] (X11; I; SunOS 5.5.1 sun4u) [Netscape]">
-    <title>TAO IDL compiler User's Guide</title>
-    <!-- $Id$ -->
-  </head>
-  <body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#CC0000">
-    <hr>
-    <h3>Using The generate_component_mpc.pl Script</h3>
-    This document describes the options and usage of the Perl script <tt>generate_component_mpc.pl</tt>
-    in the <tt>$(CIAO_ROOT)/bin</tt> directory.
-    <HR>
-    <P>
-      <h4>Assumptions</h4>
-      This script is useful for generating MPC files for relatively simple component
-      applications. The string name passed to the script should be the name of the <em>single</em>
-    IDL file for that build (without the extension) and also the name of the single
-    CIDL file, if it is a component build. The names of export files, preprocessor
-    macros, and library names in the generated MPC file will all be constructed
-    from this string. It is also assumed that the IDL file for a component build
-    will contain a single component declaration.
-    <P>
-    Judicious use of the script options in the table below will generate a build
-    that keeps to a minimum both the code generated from IDL and the number of
-    linked libraries from the middleware.
-    <P>
-      <HR>
-      <h4><A NAME="options">Script Options</A></h4>
-
-      <table BORDER="2" CELLSPACING="2" CELLPADDING="0">
-        <tr>
-          <th>
-            Option</th>
-          <th>
-            Description</th>
-          <th>
-            Remark</th>
-        </tr>
-        <tr>
-          <a NAME="h">
-            <td><tt>-h</tt></td>
-            <td>The compiler prints out the options that are given below and exits clean
-            </td>
-            <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <a NAME="p">
-            <td><tt>-p</tt><i> string</i></td>
-            <td>Indicates another make/project that this one depends on</td>
-            <td>Used as a project name prefix unless overridden by <tt>-u</tt> option</td>
-        </tr>
-        <tr>
-          <a name="l">
-            <td><tt>-l</tt><i> string</i></td>
-            </td>
-            <td>Path to the dependent name value of <tt>-p</tt></td>
-            <td>Needed only if the dependent make/project isn't already in the search path</td>
-        </tr>
-        <tr>
-          <a name="n">
-            <td><tt>-n</tt></td>
-            <td>Non-component make/project</td>
-            <td>Generates a <tt>*_stub</tt> and <tt>*_skel</tt> pair of builds, instead
-                of the default <tt>*_stub</tt>, <tt>*_svnt</tt> and <tt>*_exec</tt>
-                builds. Also specializes the IDL compiler command line options and linked
-                lib list, depending on the <tt>-e</tt> option, if it exists</td>
-        </tr>
-        <tr>
-          <a name="e">
-            <td><tt>-e</tt></td>
-            <td><tt>eventtype</tt> declaration present in IDL</td>
-            <td>Has no effect unless the <tt>-n</tt> option is also present, in which
-                case the IDL compiler command line options and list of linked libs will
-                change to reflect the fact that IDL eventtypes require typecode support
-                and depend on libs in CIAO, which for a non-component build would
-                otherwise not be the case</td>
-        </tr>
-        <tr>
-          <a name="i">
-            <td><tt>-i</tt></td>
-            <td>Use an executor IDL file</td>
-            <td>Indicates the presence of an IDL file in the executor make/project,
-                from which the actual executor implementation will inherit. Assumes
-                the name of this IDL file is of the form <tt>[<i>component_name</i>]EI.idl</tt></td>
-        </tr>
-        <tr>
-          <a name="c">
-            <td><tt>-c</tt></td>
-            <td>Create a client make/project</td>
-            <td>Generates a build for a "driver" executable. Assumes there is a single
-                C++ source file named <tt>client.cpp</tt></td>
-        </tr>
-        <tr>
-          <a name="u">
-            <td><tt>-u</tt></tt><i> string</i></td>
-            <td>Unique project name prefix</td>
-            <td>Occasionally needed since MPC doesn't accept duplicate project names
-                anywhere in the tree over which it is proecessing. This option
-                overrides the value of the <tt>-p</tt> option, if present</td>
-        </tr>
-      </table>
-  </body>
-</html>
diff --git a/CIAO/docs/tutorials/CoSMIC/index.html b/CIAO/docs/tutorials/CoSMIC/index.html
index 74547224422..0deb8d7aa03 100644
--- a/CIAO/docs/tutorials/CoSMIC/index.html
+++ b/CIAO/docs/tutorials/CoSMIC/index.html
@@ -2,11 +2,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 
-
+  
   <meta name="generator" content="HTML Tidy for Mac OS X (vers 1st December 2004), see www.w3.org" />
 
 
-
+  
   <title>Building a Stock Quoter with TAO - A Tutorial</title>
 <!-- $Id$ -->
 </head>
@@ -15,13 +15,13 @@
 
 <body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);" link="#000fff" vlink="#ff0f0f">
 
-
+  
 <h3>Building a Stock Quoter with CoSMIC and DAnCE - A
   Tutorial<br />
 </h3>
 
 
-
+  
 <p>This tutorial provides a step-by-step lesson on developing
   component-based distributed applications using <a href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a> modeling
   toolkit and <a href="http://www.cs.wustl.edu/%7Eschmidt/CIAO.html">CIAO/DAnCE</a>
@@ -41,7 +41,7 @@
 </p>
 
 
-
+  
 <div style="text-align: center;">
     <img alt="" src="Images/fig1.jpg" style="width: 362px; height: 193px;" /><br />
 
@@ -52,7 +52,7 @@
   </div>
 
 
-
+  
 <p>This tutorial will show you how to use generic modeling
   techniques <a href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a> to assist the
   development process of CIAO applications. All the necessary steps
@@ -60,9 +60,9 @@
   documented here.</p>
 
 
-
+  
 <blockquote>
-
+    
   <hr />
     <strong>Note:</strong><br />
 
@@ -77,7 +77,7 @@
     CosMIC 0.5.2. It will be subject to change as version of GME
     and CoSMIC evolves.<br />
 
-
+    
   <hr />
   </blockquote>
 <strong><big>Prerequisites</big></strong><br />
@@ -86,13 +86,13 @@
 
   &nbsp;&nbsp;&nbsp;Before you start, you will need the following:
 
-
+  
 <ol>
 
     <li><strong>ACE+TAO+CIAO (Component Integraated ACE
     ORB).</strong> ACE + TAO + CIAO provide the CCM infrastructure
     necessary to enable the CCM-based distributed component
-    interaction. You can click <a href="http://download.dre.vanderbilt.edu">here</a> to download
+    interaction. You can click <a href="http://deuce.doc.wustl.edu/Download.html">here</a> to download
     the latest ACE + TAO + CIAO and click <a href="../../../../../ACE-Install.html">
     here</a> for information on how to build ACE+TAO+CIAO.</li>
 
@@ -107,18 +107,18 @@
     <li><strong>CoSMIC toolkit.</strong> Click <a href="http://www.dre.vanderbilt.edu/cosmic/">here</a> to download
     the latest CoSMIC release.</li>
 
-
+  
 </ol>
 
 
-
+  
 <blockquote>
-
+    
   <hr />
     <strong>Note:</strong><br />
 
 
-
+    
   <ol>
 
       <li>Please use only the version of GME that the CoSMIC
@@ -128,10 +128,10 @@
 
       <li>Make sure you install GME before you install CoSMIC.</li>
 
-
+    
   </ol>
 
-
+    
   <hr />
   </blockquote>
 <strong><a href="01.html">Getting
@@ -180,10 +180,10 @@
 
   <br />
 
-
+  
 <hr />
 
-
+  
 <address>
     <a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br />
 </a>
diff --git a/CIAO/docs/tutorials/Quoter/Simple/01.html b/CIAO/docs/tutorials/Quoter/Simple/01.html
deleted file mode 100644
index fb33ed38008..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/01.html
+++ /dev/null
@@ -1,838 +0,0 @@
-<!-- $Id$ -->
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:p="urn:schemas-microsoft-com:office:powerpoint"
-xmlns:oa="urn:schemas-microsoft-com:office:activation"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 11">
-<meta name=Originator content="Microsoft Word 11">
-<link rel=File-List href="01_files/filelist.xml">
-<link rel=Edit-Time-Data href="01_files/editdata.mso">
-<!--[if !mso]>
-<style>
-v\:* {behavior:url(#default#VML);}
-o\:* {behavior:url(#default#VML);}
-w\:* {behavior:url(#default#VML);}
-.shape {behavior:url(#default#VML);}
-</style>
-<![endif]-->
-<title>Getting Started</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Author>Abdullah Sowayan</o:Author>
-  <o:LastAuthor>Abdullah Sowayan</o:LastAuthor>
-  <o:Revision>22</o:Revision>
-  <o:TotalTime>244</o:TotalTime>
-  <o:Created>2006-10-09T18:21:00Z</o:Created>
-  <o:LastSaved>2006-12-01T17:30:00Z</o:LastSaved>
-  <o:Pages>1</o:Pages>
-  <o:Words>859</o:Words>
-  <o:Characters>4900</o:Characters>
-  <o:Company>Maritime Systems &amp; Sensors</o:Company>
-  <o:Lines>40</o:Lines>
-  <o:Paragraphs>11</o:Paragraphs>
-  <o:CharactersWithSpaces>5748</o:CharactersWithSpaces>
-  <o:Version>11.8107</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:SpellingState>Clean</w:SpellingState>
-  <w:GrammarState>Clean</w:GrammarState>
-  <w:ValidateAgainstSchemas/>
-  <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
-  <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
-  <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
-  <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- </w:WordDocument>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:LatentStyles DefLockedState="false" LatentStyleCount="156">
- </w:LatentStyles>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- @font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:1627421319 -2147483648 8 0 66047 0;}
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-h3
-	{mso-margin-top-alt:auto;
-	margin-right:0in;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	mso-outline-level:3;
-	font-size:13.5pt;
-	font-family:"Times New Roman";
-	font-weight:bold;}
-a:link, span.MsoHyperlink
-	{color:#000FFF;
-	text-decoration:underline;
-	text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
-	{color:#FF0F0F;
-	text-decoration:underline;
-	text-underline:single;}
-p
-	{mso-margin-top-alt:auto;
-	margin-right:0in;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-address
-	{margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	font-style:italic;}
-code
-	{font-family:"Courier New";
-	mso-ascii-font-family:"Courier New";
-	mso-fareast-font-family:"Times New Roman";
-	mso-hansi-font-family:"Courier New";
-	mso-bidi-font-family:"Courier New";}
-p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
-	{mso-style-noshow:yes;
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-span.SpellE
-	{mso-style-name:"";
-	mso-spl-e:yes;}
-span.GramE
-	{mso-style-name:"";
-	mso-gram-e:yes;}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
- /* List Definitions */
- @list l0
-	{mso-list-id:137387275;
-	mso-list-type:hybrid;
-	mso-list-template-ids:268987612 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l0:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.75in;
-	mso-level-number-position:left;
-	margin-left:.75in;
-	text-indent:-.25in;
-	font-family:Symbol;}
-@list l0:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1
-	{mso-list-id:425031842;
-	mso-list-type:hybrid;
-	mso-list-template-ids:158504358 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l1:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:1.75in;
-	mso-level-number-position:left;
-	margin-left:1.75in;
-	text-indent:-.25in;
-	font-family:Symbol;}
-@list l1:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2
-	{mso-list-id:632565866;
-	mso-list-type:hybrid;
-	mso-list-template-ids:542421050 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l2:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:1.25in;
-	mso-level-number-position:left;
-	margin-left:1.25in;
-	text-indent:-.25in;
-	font-family:Symbol;}
-@list l2:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3
-	{mso-list-id:974944555;
-	mso-list-type:hybrid;
-	mso-list-template-ids:1880366448 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l3:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:1.25in;
-	mso-level-number-position:left;
-	margin-left:1.25in;
-	text-indent:-.25in;
-	font-family:Symbol;}
-@list l3:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4
-	{mso-list-id:1876190917;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-767374784 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l4:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:1.75in;
-	mso-level-number-position:left;
-	margin-left:1.75in;
-	text-indent:-.25in;
-	font-family:Symbol;}
-@list l4:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-ol
-	{margin-bottom:0in;}
-ul
-	{margin-bottom:0in;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
-	{mso-style-name:"Table Normal";
-	mso-tstyle-rowband-size:0;
-	mso-tstyle-colband-size:0;
-	mso-style-noshow:yes;
-	mso-style-parent:"";
-	mso-padding-alt:0in 5.4pt 0in 5.4pt;
-	mso-para-margin:0in;
-	mso-para-margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	font-family:"Times New Roman";
-	mso-ansi-language:#0400;
-	mso-fareast-language:#0400;
-	mso-bidi-language:#0400;}
-</style>
-<![endif]--><!-- 01.html,v 1.3 2006/02/10 14:34:35 mxiong Exp --><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="8194"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
-  <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval:
-.5in'>
-
-<div class=Section1>
-
-<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center;
-line-height:150%'><span style='color:black'>Step 1: Define your interfaces and
-component types<o:p></o:p></span></h3>
-
-<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center;
-line-height:150%'><span style='color:black'><img width=447 height=350
-id="_x0000_i1025" src="images/Step1.JPG"><o:p></o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='color:black'><o:p>&nbsp;</o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'>Please make sure to read the following article to
-under the Stock <span class=SpellE>Quoter</span> system architecture before
-delving further into the tutorial:<o:p></o:p></span></h3>
-
-<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo2;
-tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol;
-mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span
-style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><a
-href="http://www.cuj.com/documents/s=9152/cujexp0404vinoski/">The CORBA
-Component Model, Part 2: Defining Components with the IDL 3.x Types</a></p>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'><o:p>&nbsp;</o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black'>Directory Structure:<o:p></o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'>The tutorial relies on the following directory
-structure. Create <span class=SpellE>Quoter</span> and all its subdirectories
-as shown below. We will describe the purpose of these directories later in the
-tutorial.<o:p></o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;text-indent:.5in;line-height:150%'><span
-class=SpellE><span style='font-size:12.0pt;line-height:150%;color:black;
-font-weight:normal;mso-bidi-font-weight:bold'>Quoter</span></span><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'><o:p></o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>|---- descriptors<o:p></o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>|---- <span class=SpellE>Stock_Base</span><o:p></o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span><span style='mso-spacerun:yes'>&nbsp;&nbsp;</span>|---- Distributor<o:p></o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>|---- Broker<o:p></o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'><o:p>&nbsp;</o:p></span></h3>
-
-<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='font-size:12.0pt;line-height:150%;color:black'>Preliminaries:<o:p></o:p></span></h3>
-
-<h3 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo2;
-tab-stops:list .75in'><![if !supportLists]><span style='font-size:12.0pt;
-line-height:150%;font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;font-weight:normal;mso-bidi-font-weight:bold'><span
-style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='font-size:12.0pt;line-height:150%;
-color:black;font-weight:normal;mso-bidi-font-weight:bold'>We use the Make
-Project Creator (MPC) throughout this tutorial. Understanding MPC will aid you
-in understanding this tutorial. For more information on MPC please look at the
-following:<o:p></o:p></span></h3>
-
-<h3 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:1.5in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level3 lfo2;
-tab-stops:list 1.5in'><![if !supportLists]><span style='font-size:12.0pt;
-line-height:150%;color:black;font-weight:normal;mso-bidi-font-weight:bold'><span
-style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span class=GramE><span style='font-size:12.0pt;
-line-height:150%;color:black;font-weight:normal;mso-bidi-font-weight:bold'>MPC <a
-href="http://downloads.ociweb.com/MPC/MakeProjectCreator.pdf">Chapter</a> in <span
-class=SpellE>TAO&#8217;s</span> Developer&#8217;s Guide 1.4a.</span></span><span
-style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal;
-mso-bidi-font-weight:bold'><o:p></o:p></span></h3>
-
-<h3 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:1.5in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level3 lfo2;
-tab-stops:list 1.5in'><![if !supportLists]><span style='font-size:12.0pt;
-line-height:150%;color:black;font-weight:normal;mso-bidi-font-weight:bold'><span
-style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='font-size:12.0pt;line-height:150%;
-color:black;font-weight:normal;mso-bidi-font-weight:bold'>$ACE_ROOT/MPC/README<o:p></o:p></span></h3>
-
-<p class=MsoNormal style='line-height:150%'><b><span style='color:black'>Interface
-Design:</span></b><span style='color:black'><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height:
-150%;mso-list:l0 level1 lfo2;tab-stops:list .75in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black'>In the <span
-class=SpellE><i style='mso-bidi-font-style:normal'>Quoter/<span
-style='mso-bidi-font-style:italic'>Stock_Base</span></i></span><i> </i><span
-style='mso-bidi-font-style:italic'>sub-</span>directory, place an <span
-class=SpellE>idl</span> file </span><span class=SpellE><code><i><span
-style='font-size:10.0pt;line-height:150%;color:black'>Stock_Base.idl</span></i></code></span><span
-style='color:black'> that you could copy from <a
-href="Stock_Base/Stock_Base.idl">here</a>. This file defines the interfaces and
-events that will be used by both Stock Distributor and Stock Broker. We put
-together the common interface definitions so the base library can be shared by
-both components, reducing the size of &quot;real&quot; components.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height:
-150%;mso-list:l0 level1 lfo2;tab-stops:list .75in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black'>Next, we need to
-create a Make Project Creator (MPC) file to generate the make files for us.
-From the <span class=SpellE><i style='mso-bidi-font-style:normal'>Quoter/<span
-style='mso-bidi-font-style:italic'>Stock_Base</span></i></span><span
-style='mso-bidi-font-style:italic'> subdirectory, type the following command:</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'>generate_component_mpc.pl
-&#8211;n -e <span class=SpellE>Stock_Base</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:.5in;line-height:150%'><span
-style='color:black;mso-bidi-font-style:italic'>Note that we pass the &#8211;e option
-to </span><span style='font-family:"Courier New";color:black;mso-bidi-font-style:
-italic'>generate_component_mpc.pl because our </span><span class=SpellE><code><i><span
-style='font-size:10.0pt;line-height:150%;color:black'>Stock_Base.idl</span></i></code></span><code><i><span
-style='font-size:10.0pt;line-height:150%;color:black'> </span></i></code><span
-style='color:black;mso-bidi-font-style:italic'>uses <span class=SpellE>eventtypes</span>.
-If our <span class=SpellE>idl</span> file did not use <span class=SpellE>eventtypes</span>,
-we would<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:.5in;line-height:150%'><span
-class=GramE><span style='color:black;mso-bidi-font-style:italic'>not</span></span><span
-style='color:black;mso-bidi-font-style:italic'> pass the &#8211;e command line
-option.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='text-indent:.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.75in;line-height:150%'><span
-style='color:black;mso-bidi-font-style:italic'>The command above will generate
-a <span class=SpellE><i>Stock_Base.mpc</i></span> file that contains two
-projects <span class=SpellE><i>Stock_Base_stub</i></span><i> </i>and <span
-class=SpellE><i>Stock_Base_skel</i></span><i> </i>for the Stub and Servant code
-respectively. In addition, the command above will generate export files that
-will portably handle platform specific issues of import/export declarations of
-dynamically linked libraries (DLLs). After executing the command above you
-should see the following output on your screen.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'>The
-following commands have been executed:<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>generate_export_file.pl STOCK_BASE_STUB &gt; <span class=SpellE>Stock_Base_stub_export.h</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>generate_export_file.pl
-STOCK_BASE_SKEL &gt; <span class=SpellE>Stock_Base_skel_export.h</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.75in;text-indent:-1.25in;line-height:
-150%;mso-list:l1 level1 lfo4;tab-stops:list .75in 1.75in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;mso-bidi-font-style:italic'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black;mso-bidi-font-style:
-italic'>The MPC file should look like <a href="Stock_Base/Stock_Base.mpc">this</a>.
-</span><span style='font-family:"Courier New";color:black;mso-bidi-font-style:
-italic'><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><b><span style='color:black'>Component
-Design:</span></b><span style='color:black'><o:p></o:p></span></p>
-
-<p class=MsoNormal style='text-indent:.5in;line-height:150%'><b
-style='mso-bidi-font-weight:normal'><span style='color:black'>Distributor:</span></b><span
-style='color:black'>&nbsp;&nbsp;&nbsp;<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height:
-150%;mso-list:l3 level1 lfo6;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black'>In the </span><span
-class=SpellE><code><i><span style='font-size:10.0pt;line-height:150%;
-color:black'>Quoter</span></i></code></span><code><i><span style='font-size:
-10.0pt;line-height:150%;color:black'>/Distributor </span></i></code><code><span
-style='mso-ansi-font-size:12.0pt;mso-bidi-font-size:12.0pt;line-height:150%;
-font-family:"Times New Roman";color:black;mso-bidi-font-style:italic'>sub-directory</span></code><span
-style='color:black'>, place an <span class=SpellE>idl</span> file </span><span
-class=SpellE><code><i><span style='font-size:10.0pt;line-height:150%;
-color:black'>Distributor.idl</span></i></code></span><span style='color:black'>
-that looks like <a href="Distributor/Distributor.idl">this</a>. This file
-defines the <span class=SpellE>StockDistributor</span> component interfaces.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height:
-150%;mso-list:l3 level1 lfo6;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black'>Next, we need to
-create a Make Project Creator (MPC) file to generate the make files for us.
-From the <span class=SpellE><i style='mso-bidi-font-style:normal'>Quoter</i></span><i
-style='mso-bidi-font-style:normal'>/<span style='mso-bidi-font-style:italic'>Distributor
-</span></i><span style='mso-bidi-font-style:italic'><span
-style='mso-spacerun:yes'>&nbsp;</span>sub-directory, type the following
-command:</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:1.25in;line-height:150%'><span
-style='font-family:"Courier New";color:black'>generate_component_mpc.pl -p <span
-class=SpellE>Stock_Base</span> Distributor<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:1.25in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;line-height:150%'><span
-style='color:black;mso-bidi-font-style:italic'>The command above will generate
-a <span class=SpellE><i>Distirubotor.mpc</i></span> file that contains three
-projects <span class=SpellE><i>Distributor_stub</i></span><i>, <span
-class=SpellE>Distributor_svnt</span>, and <span class=SpellE>Distributor_exec</span>
-</i>for the Stub, Servant, and Executor code respectively. In addition, the
-command above will generate export files that will portably handle platform
-specific issues of import/export declarations of dynamically linked libraries
-(DLLs). After executing the command above you should see the following output
-on your screen.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;text-indent:.75in;line-height:
-150%'><span style='font-family:"Courier New";color:black;mso-bidi-font-style:
-italic'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'>The
-following commands have been executed:<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>generate_export_file.pl DISTRIBUTOR_STUB &gt; <span class=SpellE>Distributor_stub_export.h</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>generate_export_file.pl DISTRIBUTOR_SVNT &gt; <span class=SpellE>Distributor_svnt_export.h</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>generate_export_file.pl DISTRIBUTOR_EXEC &gt; <span class=SpellE>Distributor_exec_export.h</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;line-height:150%'><span
-style='color:black'>We will modify the generated MPC file to add an additional
-project later in the tutorial.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height:
-150%;mso-list:l4 level1 lfo8;tab-stops:list 1.25in 1.75in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;mso-bidi-font-style:italic'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black;mso-bidi-font-style:
-italic'>The </span><span class=SpellE><i><span style='font-family:"Courier New";
-color:black'>Stock_Base_Distributor_stub</span></i></span><span
-style='color:black;mso-bidi-font-style:italic'>, </span><span class=SpellE><i><span
-style='font-family:"Courier New";color:black'>Stock_Base_Distributor_svnt</span></i></span><span
-style='color:black;mso-bidi-font-style:italic'>, and </span><span class=SpellE><i><span
-style='font-family:"Courier New";color:black'>Stock_Base_Distributor_exec</span></i></span><span
-style='color:black;mso-bidi-font-style:italic'> projects in the MPC file should
-look like <a href="Distributor/Distributor.mpc">this</a>. </span><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p></o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='text-indent:.5in;line-height:150%'><b
-style='mso-bidi-font-weight:normal'><span style='color:black'>Broker:<o:p></o:p></span></b></p>
-
-<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height:
-150%;mso-list:l2 level1 lfo10;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black'>In the </span><span
-class=SpellE><code><i><span style='font-size:10.0pt;line-height:150%;
-color:black'>Quoter</span></i></code></span><code><i><span style='font-size:
-10.0pt;line-height:150%;color:black'>/Broker</span></i></code><span
-style='color:black'> <code><span style='mso-ansi-font-size:12.0pt;mso-bidi-font-size:
-12.0pt;line-height:150%;font-family:"Times New Roman";mso-bidi-font-style:italic'>sub-directory,</span></code>
-place an <span class=SpellE>idl</span> file </span><span class=SpellE><code><i><span
-style='font-size:10.0pt;line-height:150%;color:black'>Broker.id</span></i></code><code><span
-style='font-size:10.0pt;line-height:150%;color:black'>l</span></code></span><span
-style='color:black'> that looks like <a href="Broker/Broker.idl">this</a>. This
-file defines the <span class=SpellE>StockBroker</span> component interface.<b
-style='mso-bidi-font-weight:normal'><o:p></o:p></b></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height:
-150%;mso-list:l2 level1 lfo10;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black'>Next, we need to
-create a Make Project Creator (MPC) file to generate the make files for us.
-From the <span class=SpellE><i style='mso-bidi-font-style:normal'>Quoter</i></span><i
-style='mso-bidi-font-style:normal'>/<span style='mso-bidi-font-style:italic'>Broker</span></i><span
-style='mso-bidi-font-style:italic'> sub-directory, type the following command:</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:1.25in;line-height:150%'><span
-style='font-family:"Courier New";color:black'>generate_component_mpc.pl -p <span
-class=SpellE>Stock_Base</span> Broker<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.5in;text-indent:1.25in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;line-height:150%'><span
-style='color:black;mso-bidi-font-style:italic'>The command above will generate
-a <span class=SpellE><i>Broker.mpc</i></span> file that contains three projects
-<span class=SpellE><i>Broker_stub</i></span><i>, <span class=SpellE>Broker_svnt</span>,
-and <span class=SpellE>Broker_exec</span> </i>for the Stub, Servant, and
-Executor code respectively. In addition, the command above will generate export
-files that will portably handle platform specific issues of import/export
-declarations of dynamically linked libraries (DLLs). After executing the
-command above you should see the following output on your screen.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;text-indent:.75in;line-height:
-150%'><span style='font-family:"Courier New";color:black;mso-bidi-font-style:
-italic'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'>The
-following commands have been executed:<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>generate_export_file.pl BROKER_STUB &gt; <span class=SpellE>Broker_stub_export.h</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>generate_export_file.pl BROKER_SVNT &gt; <span class=SpellE>Broker_svnt_export.h</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span
-style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span
-style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span>generate_export_file.pl BROKER_EXEC &gt; <span class=SpellE>Broker_exec_export.h</span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.25in;line-height:150%'><span
-style='color:black'>We will modify the generated MPC file to add an additional
-project later in the tutorial.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:1.75in;text-indent:-.75in;line-height:
-150%;mso-list:l4 level1 lfo8;tab-stops:list 1.25in 1.75in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;mso-bidi-font-style:italic'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black;mso-bidi-font-style:
-italic'>The </span><span class=SpellE><i><span style='font-family:"Courier New";
-color:black'>Stock_Base_Broker_stub</span></i></span><span style='color:black;
-mso-bidi-font-style:italic'>, </span><span class=SpellE><i><span
-style='font-family:"Courier New";color:black'>Stock_Base_Broker_svnt</span></i></span><span
-style='color:black;mso-bidi-font-style:italic'>, and </span><span class=SpellE><i><span
-style='font-family:"Courier New";color:black'>Stock_Base_Broker_exec</span></i></span><span
-style='color:black;mso-bidi-font-style:italic'> projects in the MPC file should
-look like <a href="Broker/Broker.mpc">this</a>. </span><span style='font-family:
-"Courier New";color:black;mso-bidi-font-style:italic'><o:p></o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'><br>
-<b style='mso-bidi-font-weight:normal'>Note:<o:p></o:p></b></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'>To understand
-the meaning of different parameters passed to </span><span style='font-family:
-"Courier New";color:black;mso-bidi-font-style:italic'>generate_export_file.pl </span><span
-style='color:black;mso-bidi-font-style:italic'>type the</span><span
-style='color:black'> following command:<o:p></o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='font-family:"Courier New";
-color:black;mso-bidi-font-style:italic'>generate_export_file.pl -h</span><span
-style='color:black'><br style='mso-special-character:line-break'>
-<![if !supportLineBreakNewLine]><br style='mso-special-character:line-break'>
-<![endif]><b style='mso-bidi-font-weight:normal'><o:p></o:p></b></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'>&nbsp;&nbsp;&nbsp;
-<o:p></o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center;line-height:150%'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<address style='line-height:150%'><span style='color:black'><a
-href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br>
-</a></span><a href="mailto:abdullah.sowayan@lmco.com">Abdullah Sowayan</a></address>
-
-<address style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></address>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->Last
-modified:<!-- hhmts end --> <o:p></o:p></span></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/CIAO/docs/tutorials/Quoter/Simple/02.html b/CIAO/docs/tutorials/Quoter/Simple/02.html
deleted file mode 100644
index 9892e9722c8..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/02.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!-- $Id$ -->
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:p="urn:schemas-microsoft-com:office:powerpoint"
-xmlns:oa="urn:schemas-microsoft-com:office:activation"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 11">
-<meta name=Originator content="Microsoft Word 11">
-<link rel=File-List href="02_files/filelist.xml">
-<link rel=Edit-Time-Data href="02_files/editdata.mso">
-<!--[if !mso]>
-<style>
-v\:* {behavior:url(#default#VML);}
-o\:* {behavior:url(#default#VML);}
-w\:* {behavior:url(#default#VML);}
-.shape {behavior:url(#default#VML);}
-</style>
-<![endif]-->
-<title>Getting Started</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Author>Abdullah Sowayan</o:Author>
-  <o:LastAuthor>Abdullah Sowayan</o:LastAuthor>
-  <o:Revision>7</o:Revision>
-  <o:TotalTime>88</o:TotalTime>
-  <o:Created>2006-10-09T19:28:00Z</o:Created>
-  <o:LastSaved>2006-10-09T21:48:00Z</o:LastSaved>
-  <o:Pages>1</o:Pages>
-  <o:Words>415</o:Words>
-  <o:Characters>2370</o:Characters>
-  <o:Company>Maritime Systems &amp; Sensors</o:Company>
-  <o:Lines>19</o:Lines>
-  <o:Paragraphs>5</o:Paragraphs>
-  <o:CharactersWithSpaces>2780</o:CharactersWithSpaces>
-  <o:Version>11.8036</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:ValidateAgainstSchemas/>
-  <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
-  <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
-  <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
-  <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- </w:WordDocument>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:LatentStyles DefLockedState="false" LatentStyleCount="156">
- </w:LatentStyles>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- @font-face
-	{font-family:Wingdings;
-	panose-1:5 0 0 0 0 0 0 0 0 0;
-	mso-font-charset:2;
-	mso-generic-font-family:auto;
-	mso-font-pitch:variable;
-	mso-font-signature:0 268435456 0 0 -2147483648 0;}
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-h3
-	{mso-margin-top-alt:auto;
-	margin-right:0in;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	mso-outline-level:3;
-	font-size:13.5pt;
-	font-family:"Times New Roman";}
-a:link, span.MsoHyperlink
-	{color:#000FFF;
-	text-decoration:underline;
-	text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
-	{color:#FF0F0F;
-	text-decoration:underline;
-	text-underline:single;}
-address
-	{margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";}
-code
-	{font-family:"Courier New";
-	mso-ascii-font-family:"Courier New";
-	mso-fareast-font-family:"Times New Roman";
-	mso-hansi-font-family:"Courier New";
-	mso-bidi-font-family:"Courier New";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
- /* List Definitions */
- @list l0
-	{mso-list-id:555236070;
-	mso-list-type:hybrid;
-	mso-list-template-ids:2061531284 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l0:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:1.25in;
-	mso-level-number-position:left;
-	margin-left:1.25in;
-	text-indent:-.25in;
-	font-family:Symbol;}
-ol
-	{margin-bottom:0in;}
-ul
-	{margin-bottom:0in;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
-	{mso-style-name:"Table Normal";
-	mso-tstyle-rowband-size:0;
-	mso-tstyle-colband-size:0;
-	mso-style-noshow:yes;
-	mso-style-parent:"";
-	mso-padding-alt:0in 5.4pt 0in 5.4pt;
-	mso-para-margin:0in;
-	mso-para-margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	font-family:"Times New Roman";
-	mso-ansi-language:#0400;
-	mso-fareast-language:#0400;
-	mso-bidi-language:#0400;}
-</style>
-<![endif]--><!-- 01.html,v 1.3 2006/02/10 14:34:35 mxiong Exp --><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="2050"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
-  <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval:
-.5in'>
-
-<div class=Section1>
-
-<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center;
-line-height:150%'><span style='color:black'>Step 2: Implement your components<o:p></o:p></span></h3>
-
-<h3 align=center style='text-align:center'><span style='color:black'><img
-width=634 height=376 id="_x0000_i1026" src="images/Step2.JPG"><o:p></o:p></span></h3>
-
-<p class=MsoNormal style='margin-bottom:12.0pt'><b><span style='color:black'>Writing
-CIDL files:<o:p></o:p></span></b></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:.5in'><b><span style='color:black'>Distributor:<o:p></o:p></span></b></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight:
-bold'>In <i style='mso-bidi-font-style:normal'>Quoter/Distributor </i>sub-directory,
-place a cidl file Distributor.cidl that looks like <a
-href="Distributor/Distributor.cidl">this</a>. <o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight:
-bold'>The MPC files we generated earlier automatically invoked the CIDLC
-compiler to generate the Servants, Executors, and Contexts for us. To reduce
-the amount of work and typing we need to do, we will next instruct the CIDLC
-compiler to generate an empty Distributor Executor implementation (Object
-implementation in the figure above). In the <i style='mso-bidi-font-style:normal'>Quoter/Distributor
-</i>sub-directory, type the following:<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.5in'><span style='font-family:"Courier New";color:black;
-mso-bidi-font-weight:bold'>cidlc -I$TAO_ROOT -I$TAO_ROOT/tao -I$CIAO_ROOT/ciao
---gen-exec-impl -- Distributor.cidl<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.25in'><span style='color:black'>The above command will generate a
-<i style='mso-bidi-font-style:normal'>Distributor_exec.h </i>and <i
-style='mso-bidi-font-style:normal'>Distributor_exec.cpp </i>files. These
-generated files greatly reduced the amount of work we do. We&#8217;ll edit
-those files later in the tutorial to insert our business logic in the
-Distributor component.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.25in'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:.5in'><b style='mso-bidi-font-weight:normal'><span
-style='color:black'>Broker:<o:p></o:p></span></b></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight:
-bold'>In <i style='mso-bidi-font-style:normal'>Quoter/Broker </i>sub-directory,
-place a cidl file Broker.cidl that looks like <a href="Broker/Broker.cidl">this</a>.
-<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight:
-bold'>The MPC files we generated earlier automatically invoked the CIDLC
-compiler to generate the Servants, Executors, and Contexts for us. To reduce
-the amount of work and typing we need to do, we will next instruct the CIDLC
-compiler to generate an empty Distributor Executor implementation (Object
-implementation in the figure above). In the <i style='mso-bidi-font-style:normal'>Quoter/Broker
-</i>sub-directory, type the following:<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.5in'><span style='font-family:"Courier New";color:black;
-mso-bidi-font-weight:bold'>cidlc -I$TAO_ROOT -I$TAO_ROOT/tao -I$CIAO_ROOT/ciao
---gen-exec-impl -- Broker.cidl<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.25in'><span style='color:black'>The above command will generate a
-<i style='mso-bidi-font-style:normal'>Broker_exec.h </i>and <i
-style='mso-bidi-font-style:normal'>Broker_exec.cpp </i>files. These generated
-files greatly reduced the amount of work we do. We&#8217;ll edit those files
-later in the tutorial to insert our business logic in the Broker component.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'><br>
-<b style='mso-bidi-font-weight:normal'>Note:<o:p></o:p></b></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'>To
-understand the meaning of different parameters passed to the CIDLC compiler <span
-style='mso-bidi-font-style:italic'>type the</span> following command:<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-bottom:12.0pt'><span style='font-family:"Courier New";
-color:black;mso-bidi-font-style:italic'>cidlc --h</span><span style='color:
-black'><br>
-<br style='mso-special-character:line-break'>
-<![if !supportLineBreakNewLine]><br style='mso-special-character:line-break'>
-<![endif]><o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-bottom:12.0pt'><b><span style='color:black'>Implement
-the Components:<o:p></o:p></span></b></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:.5in'><b><span style='color:black'>Distributor:<o:p></o:p></span></b></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight:
-bold'>The CIDLC compiler generated an empty </span><i style='mso-bidi-font-style:
-normal'><span style='color:black'>Distributor_exec.h </span></i><span
-style='color:black'>and <i style='mso-bidi-font-style:normal'>Distributor_exec.cpp
-</i>files for us. You should now add your business logic to the executors. Look
-into <i style='mso-bidi-font-style:normal'><a
-href="Distributor/Distributor_exec.h">Distributor_exec.h</a> </i>and <i
-style='mso-bidi-font-style:normal'><a href="Distributor/Distributor_exec.cpp">Distributor_exec.cpp</a>
-</i>to see how we implemented this.<span style='mso-bidi-font-weight:bold'><o:p></o:p></span></span></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:.5in'><b style='mso-bidi-font-weight:normal'><span
-style='color:black'>Broker:<o:p></o:p></span></b></p>
-
-<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt;
-margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight:
-bold'>The CIDLC compiler generated an empty </span><i style='mso-bidi-font-style:
-normal'><span style='color:black'>Distributor_exec.h </span></i><span
-style='color:black'>and <i style='mso-bidi-font-style:normal'>Distributor_exec.cpp
-</i>files for us. You should now add your business logic to the executors. Look
-into <i style='mso-bidi-font-style:normal'><a href="Broker/Broker_exec.h">Broker_exec.h</a>
-</i>and <i style='mso-bidi-font-style:normal'><a href="Broker/Broker_exec.cpp">Broker_exec.cpp</a>
-</i>to see how we implemented this.<span style='mso-bidi-font-weight:bold'><o:p></o:p></span></span></p>
-
-<p class=MsoNormal style='margin-bottom:12.0pt'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;&nbsp;&nbsp; <o:p></o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<address><span style='color:black'><a href="mailto:ming.xiong@vanderbilt.edu">Ming
-Xiong<br>
-</a><o:p></o:p></span></address>
-
-<p class=MsoNormal><span style='color:black'><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->Last
-modified:<!-- hhmts end --> <o:p></o:p></span></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/CIAO/docs/tutorials/Quoter/Simple/03.html b/CIAO/docs/tutorials/Quoter/Simple/03.html
deleted file mode 100644
index 5a60e6fa73b..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/03.html
+++ /dev/null
@@ -1,1387 +0,0 @@
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:p="urn:schemas-microsoft-com:office:powerpoint"
-xmlns:oa="urn:schemas-microsoft-com:office:activation"
-xmlns:st1="urn:schemas-microsoft-com:office:smarttags"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 11">
-<meta name=Originator content="Microsoft Word 11">
-<link rel=File-List href="03_files/filelist.xml">
-<link rel=Edit-Time-Data href="03_files/editdata.mso">
-<!--[if !mso]>
-<style>
-v\:* {behavior:url(#default#VML);}
-o\:* {behavior:url(#default#VML);}
-w\:* {behavior:url(#default#VML);}
-.shape {behavior:url(#default#VML);}
-</style>
-<![endif]-->
-<title>Getting Started</title>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="PlaceName"/>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="PlaceType"/>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="place"/>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Author>Abdullah Sowayan</o:Author>
-  <o:LastAuthor>Abdullah Sowayan</o:LastAuthor>
-  <o:Revision>11</o:Revision>
-  <o:TotalTime>51</o:TotalTime>
-  <o:Created>2006-10-09T22:26:00Z</o:Created>
-  <o:LastSaved>2006-11-06T21:25:00Z</o:LastSaved>
-  <o:Pages>1</o:Pages>
-  <o:Words>2514</o:Words>
-  <o:Characters>14330</o:Characters>
-  <o:Company>Maritime Systems &amp; Sensors</o:Company>
-  <o:Lines>119</o:Lines>
-  <o:Paragraphs>33</o:Paragraphs>
-  <o:CharactersWithSpaces>16811</o:CharactersWithSpaces>
-  <o:Version>11.8107</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:SpellingState>Clean</w:SpellingState>
-  <w:GrammarState>Clean</w:GrammarState>
-  <w:ValidateAgainstSchemas/>
-  <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
-  <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
-  <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
-  <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- </w:WordDocument>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:LatentStyles DefLockedState="false" LatentStyleCount="156">
- </w:LatentStyles>
-</xml><![endif]--><!--[if !mso]><object
- classid="clsid:38481807-CA0E-42D2-BF39-B33AF135CC4D" id=ieooui></object>
-<style>
-st1\:*{behavior:url(#ieooui) }
-</style>
-<![endif]-->
-<style>
-<!--
- /* Font Definitions */
- @font-face
-	{font-family:Wingdings;
-	panose-1:5 0 0 0 0 0 0 0 0 0;
-	mso-font-charset:2;
-	mso-generic-font-family:auto;
-	mso-font-pitch:variable;
-	mso-font-signature:0 268435456 0 0 -2147483648 0;}
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-h3
-	{mso-margin-top-alt:auto;
-	margin-right:0in;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	mso-outline-level:3;
-	font-size:13.5pt;
-	font-family:"Times New Roman";
-	font-weight:bold;}
-a:link, span.MsoHyperlink
-	{color:#000FFF;
-	text-decoration:underline;
-	text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
-	{color:#FF0F0F;
-	text-decoration:underline;
-	text-underline:single;}
-p
-	{mso-margin-top-alt:auto;
-	margin-right:0in;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-address
-	{margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	font-style:italic;}
-code
-	{font-family:"Courier New";
-	mso-ascii-font-family:"Courier New";
-	mso-fareast-font-family:"Times New Roman";
-	mso-hansi-font-family:"Courier New";
-	mso-bidi-font-family:"Courier New";}
-kbd
-	{font-family:"Courier New";
-	mso-ascii-font-family:"Courier New";
-	mso-fareast-font-family:"Times New Roman";
-	mso-hansi-font-family:"Courier New";
-	mso-bidi-font-family:"Courier New";}
-pre
-	{margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-	font-size:10.0pt;
-	font-family:"Courier New";
-	mso-fareast-font-family:"Times New Roman";}
-span.SpellE
-	{mso-style-name:"";
-	mso-spl-e:yes;}
-span.GramE
-	{mso-style-name:"";
-	mso-gram-e:yes;}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
- /* List Definitions */
- @list l0
-	{mso-list-id:154345203;
-	mso-list-template-ids:-289649766;}
-@list l0:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1
-	{mso-list-id:201526982;
-	mso-list-template-ids:-336678638;}
-@list l1:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level2
-	{mso-level-number-format:bullet;
-	mso-level-text:o;
-	mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:"Courier New";
-	mso-bidi-font-family:"Times New Roman";}
-@list l1:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2
-	{mso-list-id:521090106;
-	mso-list-template-ids:-1911898580;}
-@list l2:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Symbol;}
-@list l3
-	{mso-list-id:657850502;
-	mso-list-template-ids:1783002094;}
-@list l3:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Symbol;}
-@list l4
-	{mso-list-id:777020325;
-	mso-list-template-ids:-483995422;}
-@list l4:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Symbol;}
-@list l4:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5
-	{mso-list-id:907959882;
-	mso-list-template-ids:323885252;}
-@list l5:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l6
-	{mso-list-id:1065254837;
-	mso-list-template-ids:1089662206;}
-@list l6:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l6:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l6:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l6:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l6:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l6:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l6:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l6:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l6:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l7
-	{mso-list-id:1084494006;
-	mso-list-template-ids:-1504120978;}
-@list l7:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l7:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l7:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l7:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l7:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l7:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l7:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l7:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l7:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l8
-	{mso-list-id:1153565371;
-	mso-list-template-ids:-169696680;}
-@list l8:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l8:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l8:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l8:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l8:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l8:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l8:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l8:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l8:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l9
-	{mso-list-id:1784838673;
-	mso-list-template-ids:1110625472;}
-@list l9:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Symbol;}
-@list l10
-	{mso-list-id:1832599161;
-	mso-list-template-ids:-966728002;}
-@list l10:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l10:level2
-	{mso-level-number-format:bullet;
-	mso-level-text:o;
-	mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:"Courier New";
-	mso-bidi-font-family:"Times New Roman";}
-@list l10:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l10:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l10:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l10:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l10:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l10:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l10:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11
-	{mso-list-id:1956401533;
-	mso-list-template-ids:-909756440;}
-@list l11:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l12
-	{mso-list-id:2012949130;
-	mso-list-type:hybrid;
-	mso-list-template-ids:990837084 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l12:level1
-	{mso-level-tab-stop:39.0pt;
-	mso-level-number-position:left;
-	margin-left:39.0pt;
-	text-indent:-.25in;}
-@list l12:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l12:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l12:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l12:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l12:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l12:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l12:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l12:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l11:level1 lfo5
-	{mso-level-start-at:4;}
-@list l1:level2 lfo7
-	{mso-level-number-format:arabic;
-	mso-level-numbering:continue;
-	mso-level-text:"%2\.";
-	mso-level-tab-stop:none;
-	mso-level-number-position:left;
-	margin-left:0in;
-	text-indent:0in;
-	mso-ansi-font-size:10.0pt;
-	font-family:"Courier New";
-	mso-bidi-font-family:"Times New Roman";}
-ol
-	{margin-bottom:0in;}
-ul
-	{margin-bottom:0in;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
-	{mso-style-name:"Table Normal";
-	mso-tstyle-rowband-size:0;
-	mso-tstyle-colband-size:0;
-	mso-style-noshow:yes;
-	mso-style-parent:"";
-	mso-padding-alt:0in 5.4pt 0in 5.4pt;
-	mso-para-margin:0in;
-	mso-para-margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	font-family:"Times New Roman";
-	mso-ansi-language:#0400;
-	mso-fareast-language:#0400;
-	mso-bidi-language:#0400;}
-</style>
-<![endif]--><!-- $Id$ --><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="4098"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
-  <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval:
-.5in'>
-
-<div class=Section1>
-
-<h3 align=center style='text-align:center'><span style='color:black'>Step 3:
-Package your components<o:p></o:p></span></h3>
-
-<h3 align=center style='text-align:center'><span style='color:black'><img
-width=572 height=358 id="_x0000_i1025" src="images/Step3.JPG"><o:p></o:p></span></h3>
-
-<p class=MsoNormal><b><span style='color:red'><o:p>&nbsp;</o:p></span></b></p>
-
-<p class=MsoNormal><b>Brief Introduction to <span class=SpellE>CosMIC</span>:<o:p></o:p></b></p>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'>The
-Component Synthesis using Model Integrated Computing (<span class=SpellE>CoSMIC</span>)
-project is a MDA toolset being developed by the Institute for Software
-Integrated Systems (ISIS) at <st1:place w:st="on"><st1:PlaceName w:st="on">Vanderbilt</st1:PlaceName>
- <st1:PlaceType w:st="on">University</st1:PlaceType></st1:place> to:</p>
-
-<p class=MsoNormal style='margin-left:39.0pt;text-indent:-.25in;mso-list:l12 level1 lfo1;
-tab-stops:list 39.0pt;mso-layout-grid-align:none;text-autospace:none'><![if !supportLists]><span
-style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span><![endif]><i>Model and</i> <i>analyze </i>distributed real-time
-and embedded application functionality and <span class=SpellE>QoS</span>
-requirements.</p>
-
-<p class=MsoNormal style='margin-left:39.0pt;text-indent:-.25in;mso-list:l12 level1 lfo1;
-tab-stops:list 39.0pt;mso-layout-grid-align:none;text-autospace:none'><![if !supportLists]><span
-style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span><![endif]><i>Synthesize</i> CCM-specific deployment metadata
-required to deliver end-to-end <span class=SpellE>QoS</span> to DRE
-applications.</p>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><o:p>&nbsp;</o:p></p>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'>The <span
-class=SpellE>CoSMIC</span> <span class=SpellE>toolsuite</span> provides
-modeling of DRE systems, their <span class=SpellE>QoS</span> requirements, and <span
-class=SpellE>QoS</span> adaptation policies used for DRE application <span
-class=SpellE>QoS</span> management. The component behavior, their interactions,
-and <span class=SpellE>QoS</span> requirements are modeled using a domain
-specific modeling language that adheres to <span style='color:black'>the <a
-href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-08">OMG Deployment &amp;
-Configuration (D&amp;C) specification (ptc/2003-07-08)</a></span>. <span
-class=SpellE>CoSMIC</span> enables modeling the standards-based CCM components.
-</p>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><o:p>&nbsp;</o:p></p>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'>Hand-writing
-the required XML descriptors to configure our components is tedious and error
-prone. We therefore utilize <span class=SpellE>CosMIC</span> (we specifically
-use a subset of <span class=SpellE>CosMIC</span> called PICML, which stands for
-Platform-Independent Component Modeling Language) to generate the bulk of
-descriptors for us.</p>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><o:p>&nbsp;</o:p></p>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'>For
-more information on <span class=SpellE>CosMIC</span>, please refer to the
-following article:</p>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bidi-font-weight:bold'><a
-href="http://www.cs.wustl.edu/~schmidt/PDF/mamad2003.pdf"><span class=SpellE>CoSMIC</span>:
-An MDA Generative Tool for Distributed Real-time and Embedded Applications</a>.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bidi-font-weight:bold'><o:p>&nbsp;</o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bidi-font-weight:bold'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal><b><span style='color:black'>Importing IDL to PICML</span></b><span
-style='color:black'><br>
-<br>
-&nbsp;&nbsp; To quick start our Stock <span class=SpellE>Quoter</span> modeling
-process in GME, <span class=SpellE>CoSMIC</span> introduces <span class=SpellE><em>idl_to_<span
-class=GramE>picml</span></em></span><span class=GramE> ,</span> which is an
-executable program that imports the IDL files you just created into PICML.<o:p></o:p></span></p>
-
-<ol start=1 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l5 level1 lfo2;tab-stops:list .5in'>Make sure <code><span
-     style='font-size:10.0pt'>%COSMIC_ROOT%\bin</span></code> is included in
-     the PATH variable, e.g., c:\Program Files\ISIS\<span class=SpellE>CoSMIC</span>\bin.<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l5 level1 lfo2;tab-stops:list .5in'>Open a command prompt,
-     run VCVARS32.BAT from the MSVC .NET folder if you haven't done so. It will
-     set the environment for using Microsoft Visual Studio .NET tools so that <span
-     class=SpellE><i>idl_to_picml</i></span> works properly.<br>
-     in my machine, VCVARS32.bat is in C:\Program Files\Microsoft Visual Studio
-     .NET 2003\Vc7\bin<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l5 level1 lfo2;tab-stops:list .5in'>In the same command
-     prompt, change directory to <span class=SpellE><code><span
-     style='font-size:10.0pt'>MyQuoter</span></code></span><code><span
-     style='font-size:10.0pt'>\</span></code>, and type the following command:<br>
-     &nbsp;&nbsp; &gt; <span class=SpellE><kbd><span style='font-size:10.0pt'>idl_to_picml</span></kbd></span><kbd><span
-     style='font-size:10.0pt'> -x <span class=SpellE>MyQuoter</span> -r . -I .\<span
-     class=SpellE>Stock_Base</span></span></kbd><br>
-     &nbsp;&nbsp; (if the above command does not work, you may also try this<br>
-     &nbsp;&nbsp; &gt;<span class=SpellE><kbd><span style='font-size:10.0pt'>idl_to_picml</span></kbd></span><kbd><span
-     style='font-size:10.0pt'> -x <span class=SpellE>MyQuoter</span> -r
-     .&nbsp;-I .\<span class=SpellE>Stock_Base</span> -I %TAO_ROOT% -I
-     %TAO_ROOT%\<span class=SpellE>orbsvcs</span> -I %CIAO_ROOT%\ciao)</span></kbd><br>
-     &nbsp; <span class=SpellE><em>idl_to_picml</em></span> will parse your IDL
-     files and generated a <span class=SpellE><code><span style='font-size:
-     10.0pt'>MyQuoter.xme</span></code></span> file in the <span class=SpellE><code><span
-     style='font-size:10.0pt'>MyQuoter</span></code></span> directory. Note
-     that if -x option is not used, the default <span class=SpellE>xme</span>
-     file name will be <span class=SpellE><code><span style='font-size:10.0pt'>PICML_default_xme_file.xme</span></code></span><code><span
-     style='font-size:10.0pt'>.</span></code><br>
-     4. Start GME, select <strong>File-&gt;Import xml..</strong>, and choose
-     the <span class=SpellE>xme</span> file just generated. You should be able
-     to see an imported PICML model similar to the one shown in Figure 2.<o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='color:black'><img border=0 width=781 height=636 id="_x0000_i1026"
-src="Images/fig2.jpg"><br>
-<br>
-Figure 2<o:p></o:p></span></p>
-
-<p><span style='color:black'>&nbsp; In the Browser of the generated model, the <span
-class=SpellE><em>PredefinedTypes</em></span> folder contains a bunch of atomic <span
-class=SpellE>datatype</span> elements that will be referenced by other modeling
-parts later. You don't have to worry about them for now. The models in <span
-class=SpellE><em>InterfaceDefinitions</em></span> folder are the PICML
-representations <span class=SpellE>ofthe</span> IDL files you just imported.
-Double-click to open <em>Broker</em>, it will show you a white, document-like
-entity which represents a &lt;&lt;<span class=SpellE>FileRef</span>&gt;&gt;
-instance and a yellow box-shaped entity representing a &lt;&lt;Package&gt;&gt;
-instance. Their equivalent representations in IDL files are
-&quot;#include&quot; and &quot;module&quot; respectively. Figure 3 gives you a
-clear view of GME representation of all the 3 <span class=SpellE>idl</span>
-files created. We will cover the other folders in the next section.<o:p></o:p></span></p>
-
-<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span
-style='color:black'><img border=0 width=223 height=336 id="_x0000_i1027"
-src="Images/fig3.jpg"><br>
-<br>
-Figure 3<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-bottom:12.0pt'><span style='color:black'>Now
-we are ready to model the rest of the Stock <span class=SpellE>Quoter</span>
-systems.<br>
-<br style='mso-special-character:line-break'>
-<![if !supportLineBreakNewLine]><br style='mso-special-character:line-break'>
-<![endif]><o:p></o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<h3>Building Stock <span class=SpellE>Quoter</span> system in PICML<span
-style='color:black'><o:p></o:p></span></h3>
-
-<p><span style='color:black'>This section describes modeling the <span
-class=SpellE>Quoter</span> application using PICML. If you have trouble
-producing a functioning model from this tutorial, please see the, <a
-href="Model/Quoter.xme">pre-built <span class=SpellE>Quoter</span> model</a>
-which is provided for your reference. This model contains all elements created
-as part of this tutorial.<o:p></o:p></span></p>
-
-<div>
-
-<p class=MsoNormal><strong><span style='color:black'>Note:</span></strong><span
-style='color:black'> To import an XML file in GME, select <em>File-&gt;Import
-XML..</em> from GME and choose your XML model<o:p></o:p></span></p>
-
-</div>
-
-<p><span style='color:black'>The PICML paradigm is designed for the <a
-href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-08">OMG Deployment &amp;
-Configuration (D&amp;C) specification (ptc/2003-07-08)</a>, so the modeling
-process is straightforward if you are familiar with the specification. Please
-see the <a href="../../releasenotes/dance.html"><span class=SpellE>DAnCE</span>
-project</a> for more information.&nbsp;For those who hate specification
-(including me, :-)), an <a
-href="http://www.cs.wustl.edu/%7Eschmidt/PDF/DAnCE.pdf">overview of D&amp;C</a>
-and as well as a <a
-href="http://www.cs.wustl.edu/%7Eschmidt/OMG-CCM-Tutorial.ppt">tutorial of
-D&amp;C and CCM</a> can help to reduce the learning curve. (Thanks to Sowayan, <span
-class=SpellE>Abdulah</span> for pointing this out). In addition, it is also
-helpful to read through Chapter 32 of <span class=SpellE>TAO's</span>
-Developer's Guide 1.4a (CIAO and CCM) which thoroughly describes the various
-descriptors required for a component (*.<span class=SpellE>iad</span>, *.<span
-class=SpellE>ccd</span>, *.cid, etc). <o:p></o:p></span></p>
-
-<h3><span style='color:black'>Table of Contents<o:p></o:p></span></h3>
-
-<ul type=disc>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#1"><span
-     class=SpellE>ImplementationArtifacts</span></a><o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#2"><span
-     class=SpellE>ComponentImplementations</span></a><o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#3"><span
-     class=SpellE>ComponentPackages</span></a><o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#4"><span
-     class=SpellE>PackageConfiguration</span></a><o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#5"><span
-     class=SpellE>TopLevelPackage</span></a><o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#6">Targets</a><o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#7"><span
-     class=SpellE>DeploymentPlan</span></a><o:p></o:p></li>
-</ul>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<p><span style='color:black'>The complete PICML <span class=SpellE>Quoter</span>
-model consists of modeling elements distributed across various folders. If you
-used <span class=SpellE><em>idl_to_picml</em></span> to generate the initial
-model, you will see that it has created all these folders and some of the
-tedious boilerplate modeling for us. The rest of the section will explain the purpose
-of each folder as well as the modeling entities contained in these folders. We
-will also show how to model some of the folders that have to be done by hand.<o:p></o:p></span></p>
-
-<p><b><span style='font-variant:small-caps;color:red;background:silver;
-mso-highlight:silver'>Important:</span></b><span style='color:black;background:
-silver;mso-highlight:silver'> The interpreters that generate deployment
-artifacts expect very strict constraints in the model. When you finish your
-model, and any time you wish to generate anything, it is a good idea to check
-constraints by clicking on <em>File-&gt;Check-&gt;Check All</em> in GME. This
-will help you find many logic errors in your model.</span><span
-style='color:black'><o:p></o:p></span></p>
-
-<h3><span class=SpellE><span style='color:black'>ImplementationArtifacts</span></span><span
-style='color:black'><o:p></o:p></span></h3>
-
-<p><span style='color:black'>This folder contains implementation artifacts
-associated with components. <span class=SpellE><em>idl_to_picml</em></span> has
-created these artifacts for us, with their dependency relationships correctly
-captured. Figure 4 shows the Implementation Artifacts for <em>Broker</em>.<o:p></o:p></span></p>
-
-<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span
-style='color:black'><img border=0 width=891 height=552 id="_x0000_i1030"
-src="Images/fig4.jpg"><br>
-<span class=GramE>Figure 4.</span><o:p></o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><a name=1></a><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<h3><span class=SpellE><span style='color:black'>ComponentImplementation</span></span><a
-name=2></a><span style='color:black'><o:p></o:p></span></h3>
-
-<p><span style='color:black'>This folder contains models that describe the
-implementations of component interfaces. In the <span class=SpellE>Quoter</span>
-example, we will have two monolithic component implementations - named <span
-class=SpellE><em>StockDistributorImplementation</em></span> and <span
-class=SpellE><em>StockBrokerImplementation</em></span> - and an assembly
-component implementation named <span class=SpellE><em>StockQuoter</em></span>,
-which is an assembly of <span class=SpellE><em>StockDistributorImplementation</em></span>
-and <span class=SpellE><em>StockBrokerImplementaion</em></span>. <span
-class=SpellE><em>idl_to_picml</em></span> has created the monolithic component
-implementations for us, as shown in figure 5 for example, but we have to
-specify the connections between them in order to construct a <span
-class=SpellE>Quoter</span> system.<o:p></o:p></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='color:black'><img border=0 width=922 height=639 id="_x0000_i1032"
-src="Images/fig5.jpg"><br>
-Figure 5<o:p></o:p></span></p>
-
-<p><span style='color:black'>Assembly components provide a boundary for the
-composition of monolithic components and even other assemblies. Assembly
-components do not provide actual implementations for their interface, it is a
-virtual component that delegates its ports and attributes to one or more of the
-entities it contains. There are slight differences between modeling an assembly
-and modeling a monolithic component. Since the assembly is a virtual component,
-it is not necessary to model a </span><span class=SpellE><code><span
-style='font-size:10.0pt;color:black'>MonolithicImplementation</span></code></span><span
-style='color:black'>. Instead, <em>instances</em> of other components are
-placed within the assembly and connected. Let's try to assemble the <span
-class=SpellE><em>StockQuoter</em></span>.<o:p></o:p></span></p>
-
-<ol start=1 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l0 level1 lfo4;tab-stops:list .5in'>Right click the <span
-     class=SpellE><em>ComponentImplementations</em></span> folder, choose <strong>Insert
-     Model-&gt;<span class=SpellE>ComponentImplementationContainer</span></strong>,
-     rename it as &quot;<span class=SpellE>StockQuoterImplementation</span>&quot;
-     in the Attribute Panel. Double click to open it.<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l0 level1 lfo4;tab-stops:list .5in'>From the Part Browser,
-     drag a &lt;&lt;<span class=SpellE>ComponentAssembly</span>&gt;&gt; to the
-     modeling window, name it &quot;<span class=SpellE>StockQuoter</span>&quot;.
-     Double click to open it.<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l0 level1 lfo4;tab-stops:list .5in'>Now we will create two
-     instances for interfaces <span class=SpellE><em>StockBroker</em></span>
-     and <span class=SpellE><em>StockDistributor</em></span>. To do that,
-     expand the folder <span class=SpellE><em><span style='font-size:10.0pt;
-     font-family:"Courier New"'>InterfaceDefinitions</span></em></span>, then
-     expand the <span class=SpellE><em><span style='font-size:10.0pt;
-     font-family:"Courier New"'>InterfaceDefinitions</span></em></span><em><span
-     style='font-size:10.0pt;font-family:"Courier New"'>/</span></em> <em>Broker</em>,
-     then <span class=SpellE><em><span style='font-size:10.0pt;font-family:
-     "Courier New"'>InterfaceDefinitions</span></em></span><em><span
-     style='font-size:10.0pt;font-family:"Courier New"'>/</span></em> <em>Broker/
-     Stock</em> until the interface definition of <span class=SpellE><em>StockBroker</em></span>
-     shows. While expanding the tree, always keep the &quot;<span class=SpellE>StockQuoter</span>&quot;
-     &lt;&lt;<span class=SpellE>ComponentAssembly</span>&gt;&gt; window open.
-     Then drag <span class=SpellE><code><span style='font-size:10.0pt'>MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker</span></code></span>
-     in the browser to the &quot;<span class=SpellE>StockQuoter</span>&quot;
-     &lt;&lt;<span class=SpellE>ComponentAssembly</span>&gt;&gt; window while
-     pressing ALT key. Repeat the same steps for <code><span style='font-size:
-     10.0pt'>MyQuoter/InterfaceDefinitions/Distributor/Stock/StockDistributor</span></code>,
-     and you will see two instances of component interfaces have been created
-     as shown in Figure 6 (the black line in the figure only indicates
-     .mapping)<o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='color:black'><img border=0 width=972 height=714 id="_x0000_i1046"
-src="Images/fig6.jpg"><br>
-<br>
-Figure 6<o:p></o:p></span></p>
-
-<ol start=4 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l11 level1 lfo5;tab-stops:list .5in'>Create an &lt;&lt;<span
-     class=SpellE>PublishConnector</span>&gt;&gt;.<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l11 level1 lfo5;tab-stops:list .5in'>Now assemble the
-     components together according to <a href="Images/fig1.jpg">Figure 1</a>(make
-     sure you change to connect <span class=GramE>mode </span><img border=0
-     width=32 height=32 id="_x0000_i1047" src="Icons/AddConnMode.gif">) and the
-     resulting assembly model should look like Figure 7. Note that to create
-     connections between <span class=SpellE>StockDistributor.notify_out</span>
-     and <span class=SpellE>StockBroker.notify_in</span>, you will need the
-     intermediate connector &lt;&lt;<span class=SpellE>PublishConnector</span>&gt;&gt;.<o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='color:black'><img border=0 width=724 height=402 id="_x0000_i1048"
-src="Images/fig7.jpg"><!-- hhmts end -->&gt;<br>
-<br>
-Figure 7<o:p></o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<h3><a name=3></a><span class=SpellE><span style='color:black'>ComponentPackage</span></span><span
-style='color:black'><o:p></o:p></span></h3>
-
-<p class=MsoNormal><span style='color:black'>This folder contains deployable
-component packages. Every instance in an assembly should have a corresponding monolithic
-implementation and packaged in a <span class=SpellE>ComponentPackagebe</span>
-To create a package for <span class=SpellE><em>StockBroker</em>.instance</span><o:p></o:p></span></p>
-
-<ol start=1 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>Right click folder <span
-     class=SpellE><em>ComponentPackage</em>s</span> , insert a &lt;&lt;<span
-     class=SpellE>PackageContainer</span>&gt;&gt;, name it &quot;Broker&quot;;
-     Double click to open it.<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>From the <span
-     class=SpellE>PartBrowser</span>, add the following:<o:p></o:p></li>
- <ul type=circle>
-  <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>a &lt;&lt;<span
-      class=SpellE>ComponentPackage</span>&gt;&gt; named &quot;Broker&quot;;<o:p></o:p></li>
-  <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>a &lt;&lt;<span
-      class=SpellE>ComponentImplementationReference</span>&gt;&gt; named
-      &quot;Broker&quot;;<o:p></o:p></li>
-  <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>a &lt;&lt;<span
-      class=SpellE>ComponentRef</span>&gt;&gt; named &quot;Broker&quot;;<o:p></o:p></li>
- </ul>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>Refer the &lt;&lt;<span
-     class=SpellE>ComponentImplementationReference</span>&gt;&gt; <em>Broker</em>
-     to <code><span style='font-size:10.0pt'>MyQuoter/ComponentImplementations/StockBroker</span></code>Implementation/StockBrokerMonolithicImpl.
-     Refer the &lt;&lt;<span class=SpellE>ComponentRef</span>&gt;&gt; <em>Broker</em>
-     to <span class=SpellE><code><span style='font-size:10.0pt'>MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker</span></code></span>.
-     To create a reference in GME, simply drag the tree node in the Browser
-     &quot;into&quot; the reference model. For example, you should drag the
-     tree node <code><span style='font-size:10.0pt'>MyQuoter/ComponentImplementations/StockBroker</span></code>Implementation/StockBrokerMonolithicImpl
-     into &lt;&lt;<span class=SpellE>ComponentImplementationReference</span>&gt;&gt;
-     <em>Broker.</em> Check GME manual(tutorials) for more information.<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>Switch to Connect Mode
-     and create two connections according to the following relationship.<o:p></o:p></li>
- <ul type=circle>
-  <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>&lt;&lt;<span
-      class=SpellE>ComponentImplementationReference</span>&gt;&gt; <em>Broker</em>
-      implements &lt;&lt;<span class=SpellE>ComponentPackage</span>&gt;&gt; <em>Broker</em>;<o:p></o:p></li>
-  <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>&lt;&lt;<span
-      class=SpellE>ComponentPackage</span>&gt;&gt; <em>Broker</em> realizes
-      &lt;&lt;<span class=SpellE>ComponentRef</span>&gt;&gt; <em>Broker</em>.<o:p></o:p></li>
- </ul>
-</ol>
-
-<p class=MsoNormal style='mso-margin-top-alt:auto;margin-bottom:12.0pt;
-margin-left:.5in'><span style='color:black'><br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp; The model you built should resemble Figure 8.<o:p></o:p></span></p>
-
-<p class=MsoNormal align=center style='mso-margin-top-alt:auto;margin-bottom:
-12.0pt;margin-left:.5in;text-align:center'><span style='color:black'><img
-border=0 width=675 height=497 id="_x0000_i1034" src="Images/fig8.jpg"><!-- hhmts start -->&gt;<br>
-<br>
-Figure 8<o:p></o:p></span></p>
-
-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
-margin-left:.5in'><span style='color:black'>Now create a <span class=SpellE>ComponentPackage/StockDistributor</span>
-following the same steps. <o:p></o:p></span></p>
-
-<ol start=5 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l1 level1 lfo6;tab-stops:list .5in;list-style-position:outside'><br>
-     We will also need to create a package for the assembly component <span
-     class=SpellE>StockQuoter</span>. Remember assembly component is a virtual
-     component, it does not &quot;realize&quot; a certain interface, so
-     different from the Broker and Distributor packages, the <span
-     class=SpellE>StockQuoter</span> does not need a &lt;&lt;<span
-     class=SpellE>ComponentRef</span>&gt;&gt;. To create this model: <o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
-margin-left:.5in;text-indent:-.25in;mso-list:l1 level2 lfo7'><![if !supportLists]><span
-style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Courier New";
-mso-fareast-font-family:"Courier New";color:black'><span style='mso-list:Ignore'>1.<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><span
-style='color:black'>Insert a &lt;&lt;<span class=SpellE>ComponentPackage</span>&gt;&gt;
-named &quot;<span class=SpellE>StockQuoter</span>&quot;<o:p></o:p></span></p>
-
-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
-margin-left:1.0in;text-indent:-.25in;mso-list:l1 level2 lfo7'><![if !supportLists]><span
-style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Courier New";
-mso-fareast-font-family:"Courier New";color:black'><span style='mso-list:Ignore'>2.<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><span
-style='color:black'>Add a &lt;&lt;<span class=SpellE>ComponentImplementationReference</span>&gt;&gt;
-named &quot;<span class=SpellE>StockQuoter</span>&quot;, refer it to <span
-class=SpellE>MyQuoter<code><span style='font-size:10.0pt'>/ComponentImplementations/StockQuoter/StockQuoter</span></code></span><o:p></o:p></span></p>
-
-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
-margin-left:1.0in;text-indent:-.25in;mso-list:l1 level2 lfo7'><![if !supportLists]><span
-style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Courier New";
-mso-fareast-font-family:"Courier New";color:black'><span style='mso-list:Ignore'>3.<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><span
-style='color:black'>Switch to connect mode and connect &lt;&lt;<span
-class=SpellE>ComponentImplementationReference</span>&gt;&gt; <span
-class=SpellE>StockQuoter</span> with &lt;&lt;<span class=SpellE>ComponentPackage</span>&gt;&gt;
-<span class=SpellE>StockQuoter</span>, as in Figure 9.<o:p></o:p></span></p>
-
-<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span
-style='color:black'><img border=0 width=549 height=354 id="_x0000_i1035"
-src="Images/fig9.jpg"><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->&gt;<br>
-<br>
-Figure 9<o:p></o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<h3><a name=4></a><span class=SpellE><span style='color:black'>PackageConfiguration</span></span><span
-style='color:black'><o:p></o:p></span></h3>
-
-<p class=MsoNormal><span style='color:black'>This folder contains just one
-model capturing specific configuration of Component packages.<o:p></o:p></span></p>
-
-<ol start=1 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l8 level1 lfo8;tab-stops:list .5in'>In the folder <span
-     class=SpellE><em>PackageConfiguratio</em>n</span>, and create a &lt;&lt;<span
-     class=SpellE>PackageConfigurationContainer</span>&gt;&gt;, name it
-     &quot;Default&quot;, click to open it.<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l8 level1 lfo8;tab-stops:list .5in'>Add a &lt;&lt;<span
-     class=SpellE>PackageConfiguration</span>&gt;&gt; named &quot;default&quot;
-     and a &lt;&lt;<span class=SpellE>ComponentPackageReference</span>&gt;&gt;,
-     name it &quot;<span class=SpellE>StockQuoter</span>&quot;, connect
-     &quot;Default&quot; to &quot;<span class=SpellE>StockQuoter</span>&quot;<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l8 level1 lfo8;tab-stops:list .5in'>Refer &lt;&lt;<span
-     class=SpellE>ComponentPackageReference</span>&gt;&gt; <span class=SpellE>StockQuoter</span>
-     to &lt;&lt;<span class=SpellE>ComponentPackage</span>&gt;&gt; <span
-     class=SpellE><code><span style='font-size:10.0pt'>MyQuoter/ComponentPackage/StockQuoter/StockQuoter</span></code></span><span
-     style='font-size:10.0pt;font-family:"Courier New"'><br>
-     <code>(Not &lt;&lt;<span class=SpellE>ComponentImplementationReference</span>&gt;&gt;</code></span>
-     <span class=SpellE><code><span style='font-size:10.0pt'>MyQuoter/ComponentPackage/StockQuoter/StockQuoter</span></code></span><code><span
-     style='font-size:10.0pt'>!)&nbsp;</span></code><o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<h3><a name=5></a><span class=SpellE><span style='color:black'>ToplevelPackage</span></span><span
-style='color:black'><o:p></o:p></span></h3>
-
-<p class=MsoNormal><span style='color:black'>This folder contains one model
-capturing information about the top-level element that will be fed to the
-application.<o:p></o:p></span></p>
-
-<ol start=1 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l6 level1 lfo9;tab-stops:list .5in'>In the folder <span
-     class=SpellE><em>ToplevelPackage</em></span>, and create a &lt;&lt;<span
-     class=SpellE>ToplevelPackageContainer</span>&gt;&gt;, name it
-     &quot;Default&quot;, double click to open it.<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l6 level1 lfo9;tab-stops:list .5in'>Add a &lt;&lt;<span
-     class=SpellE>ToplevelPackage</span>&gt;&gt; named &quot;<span
-     class=SpellE>ToplevelPackage</span>&quot; and a &lt;&lt;<span
-     class=SpellE>PackageConfigurationReference</span>&gt;&gt;, name it
-     &quot;Default&quot;, connect &quot;<span class=SpellE>ToplevelPackage</span>&quot;
-     to &quot;Default&quot;<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l6 level1 lfo9;tab-stops:list .5in'>Refer
-     &quot;Default&quot; to <span class=SpellE>My<code><span style='font-size:
-     10.0pt'>Quoter/PackageConfiguration/Default/Default</span></code></span><o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<h3><a name=6></a><span style='color:black'>Targets<o:p></o:p></span></h3>
-
-<p class=MsoNormal><span style='color:black'>This folder contains
-domain-specific models capturing information about the target environment in
-which component-based application will be deployed. In this <span class=SpellE>Quoter</span>
-example, we can either deploy the two components into ONE host, or into TWO
-different host. We will deploy the <span class=SpellE>Quoter</span> into two
-different host.<o:p></o:p></span></p>
-
-<ol start=1 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l7 level1 lfo10;tab-stops:list .5in'>In the folder <i>Targets</i>,
-     insert a new &lt;&lt;Domain&gt;&gt; named &quot;Domain&quot;; double click
-     to open it.<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l7 level1 lfo10;tab-stops:list .5in'>From the Part Browser,
-     add two &lt;&lt;Node&gt;&gt; named &quot;Broker&quot; and
-     &quot;Distributor&quot; respectively.<o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal><span style='color:black'><br>
-Now we are ready to deploy our Components to the actual physical environment.<o:p></o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<h3><a name=7></a><span class=SpellE><span style='color:black'>DeploymentPlan</span></span><span
-style='color:black'><o:p></o:p></span></h3>
-
-<p class=MsoNormal><span style='color:black'>This folder contains a plan model that
-captures information about the assignment of component to nodes.<o:p></o:p></span></p>
-
-<ol start=1 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l10 level1 lfo11;tab-stops:list .5in'>In the folder <span
-     class=SpellE><em>DeploymentPlan</em></span>, insert a model &lt;&lt;<span
-     class=SpellE>DeploymentPlan</span>&gt;&gt;; name it &quot;Plan&quot;,
-     click to open it<o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l10 level1 lfo11;tab-stops:list .5in'>From the <span
-     class=SpellE>PartBrowser</span>, add the following:<o:p></o:p></li>
- <ul type=circle>
-  <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-      auto;mso-list:l10 level2 lfo11;tab-stops:list 1.0in'>Two &lt;&lt;<span
-      class=SpellE>CollocationGroup</span>&gt;&gt;<o:p></o:p></li>
-  <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-      auto;mso-list:l10 level2 lfo11;tab-stops:list 1.0in'>Two &lt;&lt;<span
-      class=SpellE>NodeReference</span>&gt;&gt; named &quot;<span class=SpellE>Node_Broker</span>&quot;
-      and &quot;<span class=SpellE>Node_Distributor</span>&quot; respectively, <span
-      class=SpellE>refering</span> to <span class=SpellE><code><span
-      style='font-size:10.0pt'>MyQuoter</span></code></span><code><span
-      style='font-size:10.0pt'>/Targets/Domain/Broker</span></code> and <span
-      class=SpellE><code><span style='font-size:10.0pt'>MyQuoter</span></code></span><code><span
-      style='font-size:10.0pt'>/Targets/Domain/Distributor</span></code>
-      respectively<o:p></o:p></li>
-  <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-      auto;mso-list:l10 level2 lfo11;tab-stops:list 1.0in'>Two &lt;&lt;<span
-      class=SpellE>ComponentRef</span>&gt;&gt; named &quot;<span class=SpellE>StockBroker</span>&quot;
-      and &quot;<span class=SpellE>StockDistributor</span>&quot; respectively, <span
-      class=SpellE>refering</span> to <code><span style='font-size:10.0pt'>MyQuoter/ComponentImplementations/StockQuoterImplementation/StockQuoter/StockBroker</span></code>
-      and <code><span style='font-size:10.0pt'>MyQuoter/ComponentImplementations/StockQuoterImplementation/StockQuoter/StockDistributor</span></code>
-      respectively. Note that the &lt;&lt;<span class=SpellE>ComponentRef</span>&gt;&gt;
-      in <span class=SpellE>DeploymentPlan</span> is not referring to the interface,
-      but rather the actual instance of the implementation.<o:p></o:p></li>
- </ul>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;margin-bottom:
-     12.0pt;mso-list:l10 level1 lfo11;tab-stops:list .5in'>Switch to Connect
-     Mode, connect one &lt;&lt;<span class=SpellE>CollocationGroup</span>&gt;&gt;
-     to &lt;&lt;<span class=SpellE>NodeReference</span>&gt;&gt; <span
-     class=SpellE><em>Node_Broker</em></span>, connect another &lt;&lt;<span
-     class=SpellE>CollocationGroup</span>&gt;&gt; to &lt;&lt;<span
-     class=SpellE>NodeReference</span>&gt;&gt; <span class=SpellE><em>Node_Distributor</em></span>.
-     Now the model looks like the following.<o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal align=center style='mso-margin-top-alt:auto;margin-bottom:
-12.0pt;margin-left:.5in;text-align:center'><span style='color:black'><img
-border=0 width=752 height=530 id="_x0000_i1040" src="Images/fig10.jpg"><br>
-<br>
-<span class=GramE>Figure 10.</span><o:p></o:p></span></p>
-
-<ol start=4 type=1>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;margin-bottom:
-     12.0pt;mso-list:l10 level1 lfo11;tab-stops:list .5in'>Now we need to
-     associate &lt;&lt;<span class=SpellE>ComponentRef</span>&gt;&gt; <span
-     class=SpellE>StockBroker</span> to the &lt;&lt;<span class=SpellE>CollocationGroup</span>&gt;&gt;
-     running on the &lt;&lt;<span class=SpellE>NodeReference</span>&gt;&gt;
-     Broker, and &lt;&lt;<span class=SpellE>ComponentRef</span>&gt;&gt; <span
-     class=SpellE>StockDistributor</span> to the &lt;&lt;<span class=SpellE>CollocationGroup</span>&gt;&gt;
-     running on the &lt;&lt;<span class=SpellE>NodeReference</span>&gt;&gt;
-     Distributor. To do that, switch the Edit Mode Bar to Set Mode (<img
-     border=0 width=32 height=32 id="_x0000_i1041" src="Icons/SetMode.gif">),
-     and move the cursor to the &lt;&lt;<span class=SpellE>CollocationGroup</span>&gt;&gt;
-     running on &lt;&lt;<span class=SpellE>NodeReference</span>&gt;&gt;
-     Distributor, right-click on it. You will find the cursor is changed to set
-     mode cursor, and only the &lt;&lt;<span class=SpellE>CollocationGroup</span>&gt;&gt;
-     you clicked in is highlighted, as shown in Figure 11.<o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span
-style='color:black'><img border=0 width=672 height=505 id="_x0000_i1042"
-src="Images/fig11.jpg"><!-- 01.html,v 1.3 2006/02/10 14:34:35 mxiong Exp -->&gt;<br>
-<br>
-Figure 11<o:p></o:p></span></p>
-
-<p><span style='color:black'>Now move your cursor to &lt;&lt;<span
-class=SpellE>ComponentRef</span>&gt;&gt;&nbsp; <span class=SpellE>StockDistributor</span>,
-and left-click it, so that it looks like Figure 12.<o:p></o:p></span></p>
-
-<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span
-style='color:black'><img border=0 width=672 height=505 id="_x0000_i1043"
-src="Images/fig12.jpg">
-
-<!doctype HTML>
-
-&gt;<br>
-<br>
-Figure 12<o:p></o:p></span></p>
-
-<p style='margin-bottom:12.0pt'><span style='color:black'>This operation
-associates <span class=SpellE><em>StockDistributor</em></span> component to the
-&lt;&lt;<span class=SpellE>CollocationGroup</span>&gt;&gt; running on <em>Distributor</em>
-node. To do the same with Broker, just right-click on another &lt;&lt;<span
-class=SpellE>CollocationGroup</span>&gt;&gt;, and left-click on <span
-class=SpellE>StockBroker</span> &lt;&lt;<span class=SpellE>CollocationGroup</span>&gt;&gt;
-which is highlighted.<o:p></o:p></span></p>
-
-<div class=MsoNormal align=center style='text-align:center'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<p><a name=8></a><span style='color:black'>Up to this point, we are basically
-done with the modeling part. Before we generate anything from this model
-though, please <b>DO</b> remember to check the constraints of the model as we
-mentioned earlier.<o:p></o:p></span></p>
-
-<p><span style='color:black'>After we are done with the modeling, the <span
-class=SpellE>flattened_deploymentplan</span> interpreter that comes along with
-PICML will help us to generate a <span class=SpellE>flattened_deploymentplan.cdp</span>
-file. Please make sure you generate this file to <span class=SpellE>MyQuoter</span>/descriptors.
-Note that to get the example <span class=SpellE>working<span style='font-family:
-"Courier New"'>,</span>a</span> Node Map file should be created to map <span
-class=SpellE>logicalnodes</span> to <span class=SpellE>NodeManager</span>
-object <span class=SpellE>references,e.g</span>:<o:p></o:p></span></p>
-
-<pre wrap=""><span class=SpellE><span style='color:black'>DistributorNode</span></span><span
-style='color:black'> corbaloc<span class=GramE>:iiop:localhost:30000</span>/NodeManager<o:p></o:p></span></pre><pre><span
-class=SpellE><span style='color:black'>BrokerNode</span></span><span
-style='color:black'><span style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>corbaloc<span
-class=GramE>:iiop:localhost:40000</span>/NodeManager<o:p></o:p></span></pre><pre><span
-style='color:black'><o:p>&nbsp;</o:p></span></pre><pre><span style='color:black'><o:p>&nbsp;</o:p></span></pre>
-
-<address style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span
-style='color:black'><a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br>
-</a></span><a href="mailto:abdullah.sowayan@lmco.com">Abdullah Sowayan</a></address>
-
-<address style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span
-style='color:black'><o:p>&nbsp;</o:p></span></address>
-
-<p class=MsoNormal style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span
-style='color:black'><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->Last
-modified:<!-- hhmts end --> <o:p></o:p></span></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/CIAO/docs/tutorials/Quoter/Simple/04.html b/CIAO/docs/tutorials/Quoter/Simple/04.html
deleted file mode 100644
index 4e259355ba1..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/04.html
+++ /dev/null
@@ -1,413 +0,0 @@
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:p="urn:schemas-microsoft-com:office:powerpoint"
-xmlns:oa="urn:schemas-microsoft-com:office:activation"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 11">
-<meta name=Originator content="Microsoft Word 11">
-<link rel=File-List href="04_files/filelist.xml">
-<link rel=Edit-Time-Data href="04_files/editdata.mso">
-<!--[if !mso]>
-<style>
-v\:* {behavior:url(#default#VML);}
-o\:* {behavior:url(#default#VML);}
-w\:* {behavior:url(#default#VML);}
-.shape {behavior:url(#default#VML);}
-</style>
-<![endif]-->
-<title>Building a Stock Quoter with TAO - A Tutorial</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Author>Abdullah Sowayan</o:Author>
-  <o:LastAuthor>Abdullah Sowayan</o:LastAuthor>
-  <o:Revision>3</o:Revision>
-  <o:TotalTime>1</o:TotalTime>
-  <o:Created>2006-11-06T21:26:00Z</o:Created>
-  <o:LastSaved>2006-11-06T21:34:00Z</o:LastSaved>
-  <o:Pages>1</o:Pages>
-  <o:Words>285</o:Words>
-  <o:Characters>1629</o:Characters>
-  <o:Company>Lockheed Martin</o:Company>
-  <o:Lines>13</o:Lines>
-  <o:Paragraphs>3</o:Paragraphs>
-  <o:CharactersWithSpaces>1911</o:CharactersWithSpaces>
-  <o:Version>11.8107</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:ValidateAgainstSchemas/>
-  <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
-  <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
-  <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
-  <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- </w:WordDocument>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:LatentStyles DefLockedState="false" LatentStyleCount="156">
- </w:LatentStyles>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- @font-face
-	{font-family:Wingdings;
-	panose-1:5 0 0 0 0 0 0 0 0 0;
-	mso-font-charset:2;
-	mso-generic-font-family:auto;
-	mso-font-pitch:variable;
-	mso-font-signature:0 268435456 0 0 -2147483648 0;}
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-h3
-	{mso-margin-top-alt:auto;
-	margin-right:0in;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	mso-outline-level:3;
-	font-size:13.5pt;
-	font-family:"Times New Roman";
-	font-weight:bold;}
-a:link, span.MsoHyperlink
-	{color:#000FFF;
-	text-decoration:underline;
-	text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
-	{color:#FF0F0F;
-	text-decoration:underline;
-	text-underline:single;}
-p
-	{mso-margin-top-alt:auto;
-	margin-right:0in;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-address
-	{margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	font-style:italic;}
-code
-	{font-family:"Courier New";
-	mso-ascii-font-family:"Courier New";
-	mso-fareast-font-family:"Times New Roman";
-	mso-hansi-font-family:"Courier New";
-	mso-bidi-font-family:"Courier New";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
- /* List Definitions */
- @list l0
-	{mso-list-id:20934335;
-	mso-list-template-ids:-306000872;}
-@list l0:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Symbol;}
-@list l1
-	{mso-list-id:67775701;
-	mso-list-template-ids:1355323582;}
-@list l1:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Symbol;}
-@list l1:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2
-	{mso-list-id:170876734;
-	mso-list-template-ids:1310460404;}
-@list l2:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Symbol;}
-@list l2:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3
-	{mso-list-id:232472744;
-	mso-list-template-ids:1463160066;}
-@list l3:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0A7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Wingdings;}
-@list l4
-	{mso-list-id:333609146;
-	mso-list-template-ids:-1273693138;}
-@list l4:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0A7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Wingdings;}
-@list l4:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l5
-	{mso-list-id:1166676480;
-	mso-list-template-ids:-2033257756;}
-@list l5:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-size:10.0pt;
-	font-family:Symbol;}
-ol
-	{margin-bottom:0in;}
-ul
-	{margin-bottom:0in;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
-	{mso-style-name:"Table Normal";
-	mso-tstyle-rowband-size:0;
-	mso-tstyle-colband-size:0;
-	mso-style-noshow:yes;
-	mso-style-parent:"";
-	mso-padding-alt:0in 5.4pt 0in 5.4pt;
-	mso-para-margin:0in;
-	mso-para-margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	font-family:"Times New Roman";
-	mso-ansi-language:#0400;
-	mso-fareast-language:#0400;
-	mso-bidi-language:#0400;}
-</style>
-<![endif]--><!-- $Id$ --><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="3074"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
-  <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval:
-.5in'>
-
-<div class=Section1>
-
-<h3 align=center style='text-align:center'><span style='color:black'>Step 6: System
-Deployment<o:p></o:p></span></h3>
-
-<h3 align=center style='text-align:center'><span style='color:black'><img
-width=432 height=223 id="_x0000_i1025" src="images/Step6.JPG"><o:p></o:p></span></h3>
-
-<p class=MsoNormal><span style='color:black'>Now that we have all the
-components and driver programs successfully built, along with the
-flattened_deploymentplan generated by PICML, we will be able to run our
-application<br>
-<br>
-From different command prompts in </span><code><span style='font-size:10.0pt;
-color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/descriptors/</span></code><span
-style='color:black'> directory: <o:p></o:p></span></p>
-
-<ul type=disc>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'>Start NodeManagers
-     (NodeDameon) by running <code><span style='font-size:10.0pt'>runNodeDaemon.pl</span></code><o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'>Start the execution
-     manager <code><span style='font-size:10.0pt'>%CIAO_ROOT%/DAnCE/ExecutionManager/Execution_Manager
-     -o ior -i Stock.dat</span></code>&nbsp;<o:p></o:p></li>
-</ul>
-
-<p><span style='color:black'>The </span><code><span style='font-size:10.0pt;
-color:black'>Stock.dat</span></code><span style='color:black'> file describes
-the deployment daemons CIAO's Execution_Manager will contact to instantiate
-ComponentServer's, home's, and component instances. Each line specify the name
-of a installation &quot;destination&quot; and the corresponding IOR for the
-CIAO_Daemon.<o:p></o:p></span></p>
-
-<ul type=square>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l4 level1 lfo6;tab-stops:list .5in'><em>NOTE</em>: As one
-     can see, we use the &quot;Stock.dat&quot; file to instruct the
-     Execution_Manager how to find the endpoint of each individual NodeManager
-     (i.e., Node Daemon) where component(s) will be deployed, so this is
-     non-standard. We plan to use Naming Service to do this in the future.<o:p></o:p></li>
-</ul>
-
-<ul type=disc>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l1 level1 lfo9;tab-stops:list .5in'>Start the plan_launcher
-     by running <code><span style='font-size:10.0pt'>%CIAO_ROOT%/DAnCE/Plan_Launcher/Plan_Launcher
-     -p flattened_deploymentplan.cdp -k file://ior</span></code><o:p></o:p></li>
- <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt:
-     auto;mso-list:l1 level1 lfo9;tab-stops:list .5in'>By now the components
-     should be successfully deployed. You may run the driver program to start
-     the application. e.g. you can try the following<o:p></o:p></li>
-</ul>
-
-<p class=MsoNormal style='margin-bottom:12.0pt'><span style='color:black'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span><code><span style='font-size:10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Distributor/Distributor.exe
--o</span></code><span style='color:black'><br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><code><span style='font-size:
-10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe
--s MSFT</span></code><span style='color:black'><br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><code><span style='font-size:
-10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe
--s IBM</span></code><span style='color:black'><br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><code><span style='font-size:
-10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe
--u MSFT</span></code><span style='color:black'><br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><code><span style='font-size:
-10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Distributor/Distributor.exe
-&#8211;f</span></code><code><span style='font-size:10.0pt'><o:p></o:p></span></code></p>
-
-<p class=MsoNormal style='margin-bottom:12.0pt'><code><span style='font-size:
-10.0pt;color:black'><o:p>&nbsp;</o:p></span></code></p>
-
-<address style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span
-style='color:black'><a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br>
-</a></span><a href="mailto:abdullah.sowayan@lmco.com">Abdullah Sowayan</a></address>
-
-<address style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span
-style='color:black'><o:p>&nbsp;</o:p></span></address>
-
-<p class=MsoNormal style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span
-style='color:black'><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->Last
-modified:<!-- hhmts end --> <o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-bottom:12.0pt'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
index 627feb516a9..70d9efbce53 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
@@ -5,12 +5,7 @@ project(Stock_Base_Broker_stub): ciao_client_dnc {
   avoids += ace_for_tao
   after += Stock_Base_stub
   sharedname = Broker_stub
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=BROKER_STUB_Export \
-              -Wb,stub_export_include=Broker_stub_export.h \
-              -Wb,skel_export_macro=BROKER_SVNT_Export \
-              -Wb,skel_export_include=Broker_svnt_export.h
+  idlflags += -Wb,stub_export_macro=BROKER_STUB_Export -Wb,stub_export_include=Broker_stub_export.h -Wb,skel_export_macro=BROKER_SVNT_Export -Wb,skel_export_include=Broker_svnt_export.h
   dynamicflags   = BROKER_STUB_BUILD_DLL
   libs += Stock_Base_stub
 
@@ -25,14 +20,11 @@ project(Stock_Base_Broker_stub): ciao_client_dnc {
 
 project(Stock_Base_Broker_svnt) : ciao_servant_dnc {
   avoids += ace_for_tao
-  after += Stock_Base_skel Stock_Base_Broker_stub
+  after += Stock_Base_svnt Stock_Base_Broker_stub
   sharedname  = Broker_svnt
-  libs    += Broker_stub Stock_Base_stub Stock_Base_skel
+  libs    += Broker_stub Stock_Base_stub Stock_Base_svnt
 
-  idlflags -= -GT
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=BROKER_SVNT_Export \
-                -Wb,export_include=Broker_svnt_export.h
+  idlflags  +=  -Wb,export_macro=BROKER_SVNT_Export -Wb,export_include=Broker_svnt_export.h
   dynamicflags = BROKER_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -55,14 +47,17 @@ project(Stock_Base_Broker_exec) : ciao_component_dnc {
   avoids += ace_for_tao
   after   += Stock_Base_Broker_svnt
   sharedname = Broker_exec
-  libs      += Broker_stub Broker_svnt Stock_Base_stub Stock_Base_skel
+  libs      += Broker_stub Broker_svnt Stock_Base_stub Stock_Base_svnt
 
+  idlflags  +=  -Wb,export_macro=BROKER_EXEC_Export -Wb,export_include=Broker_exec_export.h
   dynamicflags   = BROKER_EXEC_BUILD_DLL
 
   IDL_Files {
+
   }
 
   Source_Files {
+
     Broker_exec.cpp
   }
 }
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
index aad6ad54195..295c8d0004c 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
@@ -5,12 +5,7 @@ project(Stock_Base_Distributor_stub): ciao_client_dnc {
   avoids += ace_for_tao
   after += Stock_Base_stub
   sharedname = Distributor_stub
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export \
-              -Wb,stub_export_include=Distributor_stub_export.h \
-              -Wb,skel_export_macro=DISTRIBUTOR_SVNT_Export \
-              -Wb,skel_export_include=Distributor_svnt_export.h
+  idlflags += -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export -Wb,stub_export_include=Distributor_stub_export.h -Wb,skel_export_macro=DISTRIBUTOR_SVNT_Export -Wb,skel_export_include=Distributor_svnt_export.h
   dynamicflags   = DISTRIBUTOR_STUB_BUILD_DLL
 
   libs += Stock_Base_stub
@@ -26,14 +21,11 @@ project(Stock_Base_Distributor_stub): ciao_client_dnc {
 
 project(Stock_Base_Distributor_svnt) : ciao_servant_dnc {
   avoids += ace_for_tao
-  after += Stock_Base_skel Stock_Base_Distributor_stub
+  after += Stock_Base_svnt Stock_Base_Distributor_stub
   sharedname  = Distributor_svnt
-  libs    += Distributor_stub Stock_Base_stub Stock_Base_skel
+  libs    += Distributor_stub Stock_Base_stub Stock_Base_svnt
   
-  idlflags -= -GT
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=DISTRIBUTOR_SVNT_Export \
-                -Wb,export_include=Distributor_svnt_export.h
+  idlflags  +=  -Wb,export_macro=DISTRIBUTOR_SVNT_Export -Wb,export_include=Distributor_svnt_export.h
   dynamicflags = DISTRIBUTOR_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -56,17 +48,17 @@ project(Stock_Base_Distributor_exec) : ciao_component_dnc {
   avoids += ace_for_tao
   after   += Stock_Base_Distributor_svnt
   sharedname = Distributor_exec
-  libs      += Distributor_stub \
-               Distributor_svnt \
-               Stock_Base_stub \
-               Stock_Base_skel
+  libs      += Distributor_stub Distributor_svnt Stock_Base_stub Stock_Base_svnt
   
+  idlflags  +=  -Wb,export_macro=DISTRIBUTOR_EXEC_Export -Wb,export_include=Distributor_exec_export.h
   dynamicflags   = DISTRIBUTOR_EXEC_BUILD_DLL
 
-  IDL_Files {    
+  IDL_Files {
+    
   }
 
-  Source_Files {   
+  Source_Files {
+    
     Distributor_exec.cpp
   }
 }
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
index 6f3cde298ff..b294d5db74e 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+++ b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
@@ -4,11 +4,7 @@
 project(Stock_Base_stub): ciao_client_dnc {
 
   sharedname = Stock_Base_stub
-  idlflags -= -GT
-  idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export \
-              -Wb,stub_export_include=Stock_Base_stub_export.h \
-              -Wb,skel_export_macro=STOCK_BASE_SKEL_Export \
-              -Wb,skel_export_include=Stock_Base_skel_export.h
+  idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export -Wb,stub_export_include=Stock_Base_stub_export.h -Wb,skel_export_macro=STOCK_BASE_SVNT_Export -Wb,skel_export_include=Stock_Base_svnt_export.h
   dynamicflags   = STOCK_BASE_STUB_BUILD_DLL
 
   IDL_Files {
@@ -20,17 +16,13 @@ project(Stock_Base_stub): ciao_client_dnc {
   }
 }
 
-project(Stock_Base_skel) : ciao_servant_dnc {
+project(Stock_Base_svnt) : ciao_servant_dnc {
   after +=  Stock_Base_stub
-  sharedname  = Stock_Base_skel
+  sharedname  = Stock_Base_svnt
   libs    += Stock_Base_stub
 
-  idlflags -= -GT
-  idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export \
-              -Wb,stub_export_include=Stock_Base_stub_export.h \
-              -Wb,skel_export_macro=STOCK_BASE_SKEL_Export \
-              -Wb,skel_export_include=Stock_Base_skel_export.h
-  dynamicflags = STOCK_BASE_SKEL_BUILD_DLL
+  idlflags  +=  -Wb,export_macro=STOCK_BASE_SVNT_Export -Wb,export_include=Stock_Base_svnt_export.h
+  dynamicflags = STOCK_BASE_SVNT_BUILD_DLL
 
   IDL_Files {
     Stock_Base.idl
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h
deleted file mode 100644
index 262ab650fed..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl STOCK_BASE_SVNT
-// ------------------------------
-#ifndef STOCK_BASE_SKEL_EXPORT_H
-#define STOCK_BASE_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (STOCK_BASE_SKEL_HAS_DLL)
-#  define STOCK_BASE_SKEL_HAS_DLL 1
-#endif /* ! STOCK_BASE_SKEL_HAS_DLL */
-
-#if defined (STOCK_BASE_SKEL_HAS_DLL) && (STOCK_BASE_SKEL_HAS_DLL == 1)
-#  if defined (STOCK_BASE_SKEL_BUILD_DLL)
-#    define STOCK_BASE_SKEL_Export ACE_Proper_Export_Flag
-#    define STOCK_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define STOCK_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* STOCK_BASE_SKEL_BUILD_DLL */
-#    define STOCK_BASE_SKEL_Export ACE_Proper_Import_Flag
-#    define STOCK_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define STOCK_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* STOCK_BASE_SKEL_BUILD_DLL */
-#else /* STOCK_BASE_SKEL_HAS_DLL == 1 */
-#  define STOCK_BASE_SKEL_Export
-#  define STOCK_BASE_SKEL_SINGLETON_DECLARATION(T)
-#  define STOCK_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* STOCK_BASE_SKEL_HAS_DLL == 1 */
-
-// Set STOCK_BASE_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (STOCK_BASE_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define STOCK_BASE_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define STOCK_BASE_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !STOCK_BASE_SKEL_NTRACE */
-
-#if (STOCK_BASE_SKEL_NTRACE == 1)
-#  define STOCK_BASE_SKEL_TRACE(X)
-#else /* (STOCK_BASE_SKEL_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define STOCK_BASE_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (STOCK_BASE_SKEL_NTRACE == 1) */
-
-#endif /* STOCK_BASE_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h
new file mode 100644
index 00000000000..b3dfe948823
--- /dev/null
+++ b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl STOCK_BASE_SVNT
+// ------------------------------
+#ifndef STOCK_BASE_SVNT_EXPORT_H
+#define STOCK_BASE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (STOCK_BASE_SVNT_HAS_DLL)
+#  define STOCK_BASE_SVNT_HAS_DLL 1
+#endif /* ! STOCK_BASE_SVNT_HAS_DLL */
+
+#if defined (STOCK_BASE_SVNT_HAS_DLL) && (STOCK_BASE_SVNT_HAS_DLL == 1)
+#  if defined (STOCK_BASE_SVNT_BUILD_DLL)
+#    define STOCK_BASE_SVNT_Export ACE_Proper_Export_Flag
+#    define STOCK_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define STOCK_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* STOCK_BASE_SVNT_BUILD_DLL */
+#    define STOCK_BASE_SVNT_Export ACE_Proper_Import_Flag
+#    define STOCK_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define STOCK_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* STOCK_BASE_SVNT_BUILD_DLL */
+#else /* STOCK_BASE_SVNT_HAS_DLL == 1 */
+#  define STOCK_BASE_SVNT_Export
+#  define STOCK_BASE_SVNT_SINGLETON_DECLARATION(T)
+#  define STOCK_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* STOCK_BASE_SVNT_HAS_DLL == 1 */
+
+// Set STOCK_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (STOCK_BASE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define STOCK_BASE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define STOCK_BASE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !STOCK_BASE_SVNT_NTRACE */
+
+#if (STOCK_BASE_SVNT_NTRACE == 1)
+#  define STOCK_BASE_SVNT_TRACE(X)
+#else /* (STOCK_BASE_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define STOCK_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (STOCK_BASE_SVNT_NTRACE == 1) */
+
+#endif /* STOCK_BASE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl b/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
index 7437f0ed341..b00cced27eb 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
+++ b/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "$ENV{ACE_ROOT}/bin";
+use lib "../../../../../../bin";
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step1.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/Step1.JPG
deleted file mode 100644
index b0346ee841b..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Step1.JPG
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step2.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/Step2.JPG
deleted file mode 100644
index a4526901307..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Step2.JPG
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step3.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/Step3.JPG
deleted file mode 100644
index d7687394851..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Step3.JPG
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step6.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/Step6.JPG
deleted file mode 100644
index e1e3b28055d..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Step6.JPG
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Steps for Developing CCM Applications.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/Steps for Developing CCM Applications.jpg
deleted file mode 100644
index ddccdc2b373..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Steps for Developing CCM Applications.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig1.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig1.jpg
deleted file mode 100644
index a8550fe1176..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig1.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig10.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig10.jpg
deleted file mode 100644
index 3db5ac174e0..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig10.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig11.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig11.jpg
deleted file mode 100644
index c5eaf705384..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig11.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig12.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig12.jpg
deleted file mode 100644
index ea2a885af6b..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig12.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig2.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig2.jpg
deleted file mode 100644
index 49d6f90c3b0..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig2.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig3.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig3.jpg
deleted file mode 100644
index 0559dc7382b..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig3.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig4.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig4.jpg
deleted file mode 100644
index 8fb89eccb57..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig4.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig5.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig5.jpg
deleted file mode 100644
index e847b9290d6..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig5.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig6.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig6.jpg
deleted file mode 100644
index 0a214c84ea8..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig6.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig7.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig7.jpg
deleted file mode 100644
index 67d90b775b0..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig7.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig8.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig8.jpg
deleted file mode 100644
index a565c2ab989..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig8.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig9.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig9.jpg
deleted file mode 100644
index 996d90d800b..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/images/fig9.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/Quoter/Simple/index.html b/CIAO/docs/tutorials/Quoter/Simple/index.html
deleted file mode 100644
index f865a43cc6c..00000000000
--- a/CIAO/docs/tutorials/Quoter/Simple/index.html
+++ /dev/null
@@ -1,655 +0,0 @@
-<!-- $Id$ -->
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:p="urn:schemas-microsoft-com:office:powerpoint"
-xmlns:oa="urn:schemas-microsoft-com:office:activation"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 11">
-<meta name=Originator content="Microsoft Word 11">
-<link rel=File-List href="index_files/filelist.xml">
-<link rel=Edit-Time-Data href="index_files/editdata.mso">
-<!--[if !mso]>
-<style>
-v\:* {behavior:url(#default#VML);}
-o\:* {behavior:url(#default#VML);}
-w\:* {behavior:url(#default#VML);}
-.shape {behavior:url(#default#VML);}
-</style>
-<![endif]-->
-<title>Building a Stock Quoter with TAO - A Tutorial</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Author>Abdullah Sowayan</o:Author>
-  <o:LastAuthor>Abdullah Sowayan</o:LastAuthor>
-  <o:Revision>13</o:Revision>
-  <o:TotalTime>64</o:TotalTime>
-  <o:Created>2006-10-06T22:35:00Z</o:Created>
-  <o:LastSaved>2006-11-06T21:35:00Z</o:LastSaved>
-  <o:Pages>1</o:Pages>
-  <o:Words>851</o:Words>
-  <o:Characters>4851</o:Characters>
-  <o:Company>Maritime Systems &amp; Sensors</o:Company>
-  <o:Lines>40</o:Lines>
-  <o:Paragraphs>11</o:Paragraphs>
-  <o:CharactersWithSpaces>5691</o:CharactersWithSpaces>
-  <o:Version>11.8107</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:ValidateAgainstSchemas/>
-  <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
-  <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
-  <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
-  <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- </w:WordDocument>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:LatentStyles DefLockedState="false" LatentStyleCount="156">
- </w:LatentStyles>
-</xml><![endif]-->
-<style>
-<!--
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-h3
-	{mso-margin-top-alt:auto;
-	margin-right:0in;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	mso-outline-level:3;
-	font-size:13.5pt;
-	font-family:"Times New Roman";
-	font-weight:bold;}
-a:link, span.MsoHyperlink
-	{color:#000FFF;
-	text-decoration:underline;
-	text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
-	{color:#FF0F0F;
-	text-decoration:underline;
-	text-underline:single;}
-p
-	{mso-margin-top-alt:auto;
-	margin-right:0in;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-address
-	{margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	font-style:italic;}
-code
-	{font-family:"Courier New";
-	mso-ascii-font-family:"Courier New";
-	mso-fareast-font-family:"Times New Roman";
-	mso-hansi-font-family:"Courier New";
-	mso-bidi-font-family:"Courier New";}
-span.intbody
-	{mso-style-name:intbody;}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
- /* List Definitions */
- @list l0
-	{mso-list-id:137387275;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-1837205732 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l0:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.75in;
-	mso-level-number-position:left;
-	margin-left:.75in;
-	text-indent:-.25in;
-	font-family:Symbol;}
-@list l0:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l0:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1
-	{mso-list-id:271979655;
-	mso-list-template-ids:-2025148996;}
-@list l1:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.75in;
-	mso-level-number-position:left;
-	margin-left:.75in;
-	text-indent:-.25in;
-	font-family:Symbol;}
-@list l1:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l1:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2
-	{mso-list-id:398870737;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-1758177826 -1301365556 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l2:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-weight:bold;}
-@list l2:level2
-	{mso-level-number-format:alpha-lower;
-	mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l2:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3
-	{mso-list-id:1284144513;
-	mso-list-type:hybrid;
-	mso-list-template-ids:120510300 -1301365556 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l3:level1
-	{mso-level-tab-stop:.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;
-	mso-ansi-font-weight:bold;}
-@list l3:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l3:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4
-	{mso-list-id:1734621206;
-	mso-list-type:hybrid;
-	mso-list-template-ids:-1370594096 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l4:level1
-	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
-	mso-level-tab-stop:.75in;
-	mso-level-number-position:left;
-	margin-left:.75in;
-	text-indent:-.25in;
-	font-family:Symbol;}
-@list l4:level2
-	{mso-level-tab-stop:1.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level3
-	{mso-level-tab-stop:1.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level4
-	{mso-level-tab-stop:2.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level5
-	{mso-level-tab-stop:2.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level6
-	{mso-level-tab-stop:3.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level7
-	{mso-level-tab-stop:3.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level8
-	{mso-level-tab-stop:4.0in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-@list l4:level9
-	{mso-level-tab-stop:4.5in;
-	mso-level-number-position:left;
-	text-indent:-.25in;}
-ol
-	{margin-bottom:0in;}
-ul
-	{margin-bottom:0in;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
-	{mso-style-name:"Table Normal";
-	mso-tstyle-rowband-size:0;
-	mso-tstyle-colband-size:0;
-	mso-style-noshow:yes;
-	mso-style-parent:"";
-	mso-padding-alt:0in 5.4pt 0in 5.4pt;
-	mso-para-margin:0in;
-	mso-para-margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	font-family:"Times New Roman";
-	mso-ansi-language:#0400;
-	mso-fareast-language:#0400;
-	mso-bidi-language:#0400;}
-</style>
-<![endif]--><!-- index.html,v 1.3 2006/05/06 02:29:31 schmidt Exp --><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="7170"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
-  <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval:
-.5in'>
-
-<div class=Section1>
-
-<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center;
-line-height:150%'><span style='color:black'>Building a Stock Quoter with CIAO,
-CoSMIC, and DAnCE - A Tutorial<o:p></o:p></span></h3>
-
-<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center;
-line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></h3>
-
-<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='color:black'>This tutorial provides a step-by-step lesson on developing
-component-based distributed applications using <a
-href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a> modeling toolkit and the
-<a href="http://www.cs.wustl.edu/%7Eschmidt/CIAO.html">CIAO DAnCE</a>
-framework. The example application used in this tutorial is a Stock Quoter that
-consists of two components; the <i>StockDistributor</i> and the <i>StockBroker</i>.
-The <i>StockDistributor</i> notifies one or more stock brokers whenever a stock
-price changes. Upon receiving the notification, the <i>StockBroker</i> fetches
-information about a particular stock from the <i>StockDistributor</i>. The
-figure bellow shows the application diagram. This Stock Quoter application is
-based on a series of <a
-href="http://www.cs.wustl.edu/%7Eschmidt/report-doc.html">CORBA component model</a>
-columns written by <a href="http://www.cs.wustl.edu/%7Eschmidt/">Doug Schmidt</a>
-and <a href="http://www.iona.com/hyplan/vinoski/">Steve Vinoski</a> for <a
-href="http://www.cuj.com">C/C++ Users Journal</a> and has consistently been
-used as an example for <a href="http://www.cs.wustl.edu/%7Eschmidt/TAO.html">TAO</a>.<o:p></o:p></span></p>
-
-<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal align=center style='text-align:center;line-height:150%'><span
-style='color:black'><img border=0 width=434 height=232 id="_x0000_i1025"
-src="images/fig1.jpg"><br>
-Stock Quoter application Diagram <o:p></o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='color:black'>This is a step-by-step tutorial that will walk you through
-the development and deployment phases of a CCM application (Stock Quoter). This
-tutorial assumes that you have read and understood the following articles that
-describe the example:<o:p></o:p></span></p>
-
-<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo1;
-tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol;
-mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span
-style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><a
-href="http://www.cuj.com/documents/s=9039/cujexp0402vinoski/">The CORBA
-Component Model, Part 1: Evolving Towards Component Middleware</a></p>
-
-<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo1;
-tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol;
-mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span
-style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><a
-href="http://www.cuj.com/documents/s=9152/cujexp0404vinoski/">The CORBA
-Component Model, Part 2: Defining Components with the IDL 3.x Types</a></p>
-
-<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo1;
-tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol;
-mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span
-style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><a
-href="http://www.cuj.com/documents/s=9301/cujexp0409vinoski/">The CORBA
-Component Model, Part 3: The CCM Container Architecture and Component
-Implementation Framework</a></p>
-
-<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo1;
-tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol;
-mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span
-style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><a
-href="http://www.cuj.com/documents/s=9360/cujexp0410vinoski/">The CORBA
-Component Model Part 4: The CORBA Component Model Part 4: Implementing
-Components with CCM</a></p>
-
-<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='color:black'><span style='mso-spacerun:yes'>&nbsp;</span>In addition to
-the articles above, reading and understanding the resources below will greatly
-help you follow through this tutorial:<o:p></o:p></span></p>
-
-<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l4 level1 lfo2;
-tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol;
-mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol;color:black'><span
-style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><a
-href="http://www.cs.wustl.edu/~schmidt/PDF/DAnCE.pdf">DAnCE: A QoS-enabled
-Component Deployment and Conguration Engine</a><span style='color:black'><o:p></o:p></span></p>
-
-<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in;
-margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l4 level1 lfo2;
-tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol;
-mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span
-style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]>TAO&#8217;s Developer&#8217;s Guide Version
-1.4a. Chapter 32&nbsp;: CIAO and CCM.</p>
-
-<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span
-style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><b><span style='font-size:14.0pt;
-line-height:150%;color:black'>Prerequisites:</span></b><b><span
-style='font-size:13.5pt;line-height:150%;color:black'><br>
-</span></b><span style='color:black'>&nbsp;Before you start, you need the
-following: <o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height:
-150%;mso-list:l1 level1 lfo3;tab-stops:list .75in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><b><span style='color:black'>ACE+TAO+CIAO
-(Component Integraated ACE ORB).</span></b><span style='color:black'> ACE + TAO
-+ CIAO provide the CCM infrastructure necessary to enable the CCM-based distributed
-component interaction. You can click <a
-href="http://download.dre.vanderbilt.edu">here</a> to download the latest
-ACE + TAO + CIAO and click <a
-href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/CIAO/CIAO-INSTALL.html">here</a>
-for information on how to build ACE+TAO+CIAO.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height:
-150%;mso-list:l1 level1 lfo3;tab-stops:list .75in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><b><span style='color:black'>Generic Modeling
-Environment (GME).</span></b><span style='color:black'> GME is a configurable
-toolkit for creating domain-specific modeling and program synthesis
-environments. It provides the execution environment for CoSMIC toolkits. Click <a
-href="http://www.isis.vanderbilt.edu/Projects/gme/download.html">here</a> to
-download GME.<o:p></o:p></span></p>
-
-<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height:
-150%;mso-list:l1 level1 lfo3;tab-stops:list .75in'><![if !supportLists]><span
-style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family:
-Symbol;color:black'><span style='mso-list:Ignore'>&middot;<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><b><span style='color:black'>CoSMIC toolkit.</span></b><span
-style='color:black'> Click <a href="http://www.dre.vanderbilt.edu/cosmic/">here</a>
-to download the latest CoSMIC release.<o:p></o:p></span></p>
-
-<blockquote style='margin-top:5.0pt;margin-bottom:5.0pt'>
-
-<div style='margin-left:-.5in'>
-
-<div class=MsoNormal align=center style='text-align:center;line-height:150%'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-</div>
-
-<p class=MsoNormal style='margin-left:-.5in;line-height:150%'><strong><span
-style='color:black'>Note:</span></strong><strong><span style='font-weight:normal'><o:p></o:p></span></strong></p>
-
-<p class=MsoNormal style='margin-left:0in;text-indent:-.25in;line-height:150%;
-mso-list:l3 level1 lfo4;tab-stops:list 0in .5in'><![if !supportLists]><b
-style='mso-bidi-font-weight:normal'><span style='mso-list:Ignore'>1.<span
-style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></b><![endif]><span
-style='color:black'>Usually you should download the latest GME, but it is
-possible that CoSMIC hasn't been updated yet to support the very latest
-GME..The installation process of CoSMIC will tell you which version it is
-expecting.&nbsp; So <span class=intbody>please make sure the GME version you
-are using is the version required by CoSMIC. A different version of </span>GME
-may result in undefined errors. </span></p>
-
-<p class=MsoNormal style='margin-left:0in;text-indent:-.25in;line-height:150%;
-mso-list:l3 level1 lfo4;tab-stops:list 0in .5in'><![if !supportLists]><b
-style='mso-bidi-font-weight:normal'><span style='color:black'><span
-style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span></b><![endif]><span style='color:black'>Make sure you
-install GME first before you start with CoSMIC toolkits.<o:p></o:p></span></p>
-
-<div style='margin-left:-.5in'>
-
-<div class=MsoNormal align=center style='text-align:center;line-height:150%'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-</div>
-
-</blockquote>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><b style='mso-bidi-font-weight:
-normal'><span style='font-size:14.0pt;line-height:150%;color:black'>Steps for
-Developing the Stock Quoter Application:<o:p></o:p></span></b></p>
-
-<p class=MsoNormal style='line-height:150%'><b style='mso-bidi-font-weight:
-normal'><span style='font-size:14.0pt;line-height:150%;color:black'><o:p>&nbsp;</o:p></span></b></p>
-
-<p class=MsoNormal align=center style='text-align:center;line-height:150%'><b
-style='mso-bidi-font-weight:normal'><span style='font-size:14.0pt;line-height:
-150%;color:black'><img border=0 width=960 height=521 id="_x0000_i1028"
-src="images/Steps%20for%20Developing%20CCM%20Applications.jpg"><o:p></o:p></span></b></p>
-
-<p class=MsoNormal align=center style='text-align:center;line-height:150%'><span
-style='color:black'>Steps for Developing Stock Quoter Application<o:p></o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
-
-<p class=MsoNormal style='line-height:150%'><span style='color:black'>Listed
-below are the steps for developing the Stock Quoter application. Each link is a
-step-by-step tutorial of the specific step.</span><b style='mso-bidi-font-weight:
-normal'><span style='font-size:14.0pt;line-height:150%;color:black'><o:p></o:p></span></b></p>
-
-<ol style='margin-top:0in' start=1 type=1>
- <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5;
-     tab-stops:list .5in'><b><a href="01.html">Define your interfaces and
-     component types</a>:</b><o:p></o:p></li>
- <ol style='margin-top:0in' start=1 type=a>
-  <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level2 lfo5;
-      tab-stops:list 1.0in'><b>Define your interfaces using IDL 2.x features</b>,
-      e.g., use the familiar CORBA types (such as <span style='mso-bidi-font-weight:
-      bold'>struct</span>, <span style='mso-bidi-font-weight:bold'>sequence</span>,
-      <span style='mso-bidi-font-weight:bold'>long</span>, <span
-      style='mso-bidi-font-weight:bold'>Object</span>, <span style='mso-bidi-font-weight:
-      bold'>interface</span>, <span style='mso-bidi-font-weight:bold'>raises</span>,
-      etc.) to define your interfaces &amp; exceptions.<o:p></o:p></li>
-  <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level2 lfo5;
-      tab-stops:list 1.0in'><b>Define your component types using IDL 3.x
-      features</b>, e.g., use the new CCM keywords (such as <span
-      style='mso-bidi-font-weight:bold'>component</span>, <span
-      style='mso-bidi-font-weight:bold'>provides</span>, <span
-      style='mso-bidi-font-weight:bold'>uses</span>, <span style='mso-bidi-font-weight:
-      bold'>publishes</span>, <span style='mso-bidi-font-weight:bold'>emits</span>,
-      &amp; <span style='mso-bidi-font-weight:bold'>consumes</span>) to group
-      the IDL 2.x types together to form components.<b><o:p></o:p></b></li>
- </ol>
- <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5;
-     tab-stops:list .5in'><b><a href="02.html">Implement your components</a></b>,
-     e.g., using C++ or Java &amp; the Component Implementation Definition
-     Language (CIDL), which generates component servants, executor interfaces,
-     associated metadata, &amp; compositions.<b><o:p></o:p></b></li>
- <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5;
-     tab-stops:list .5in'><b style='mso-bidi-font-weight:normal'><a
-     href="03.html">Package your components</a></b>, <span style='color:red'>[Ming,
-     can you add a brief description here?]</span><b><o:p></o:p></b></li>
- <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5;
-     tab-stops:list .5in'><b><a href="03.html">Assemble your components</a></b>,
-     e.g., group related components together &amp; characterize their metadata
-     that describes the components present in the assembly.<span
-     style='mso-bidi-font-weight:bold'><o:p></o:p></span></li>
- <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5;
-     tab-stops:list .5in'><b style='mso-bidi-font-weight:normal'><a
-     href="03.html">Plan your deployment</a></b>, <span style='color:red'>[Ming,
-     can you add a brief description here?]</span><span style='mso-bidi-font-weight:
-     bold'><o:p></o:p></span></li>
- <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5;
-     tab-stops:list .5in'><b><a href="04.html">Deploy your components &amp; run
-     your application</a></b>, e.g., move the component assembly packages to
-     the appropriate nodes in the distributed system &amp; invoke operations on
-     components to perform the application logic.<b style='mso-bidi-font-weight:
-     normal'><o:p></o:p></b></li>
-</ol>
-
-<div class=MsoNormal align=center style='text-align:center;line-height:150%'><span
-style='color:black'>
-
-<hr size=2 width="100%" align=center>
-
-</span></div>
-
-<address style='line-height:150%'><a href="mailto:ming.xiong@vanderbilt.edu">Ming
-Xiong<br>
-</a><a href="mailto:abdullah.sowayan@lmco.com">Abdullah Sowayan</a></address>
-
-<address style='line-height:150%'>Last modified: Fri May 5 21:29:07 CDT 2006 <span
-style='color:black'><o:p></o:p></span></address>
-
-</div>
-
-</body>
-
-</html>
diff --git a/CIAO/examples/Display/Display_Base/Display_Base.mpc b/CIAO/examples/Display/Display_Base/Display_Base.mpc
index 0b834017746..f706edb968d 100644
--- a/CIAO/examples/Display/Display_Base/Display_Base.mpc
+++ b/CIAO/examples/Display/Display_Base/Display_Base.mpc
@@ -6,9 +6,9 @@ project(Display_Base_stub): ciao_client_dnc {
   sharedname = Display_Base_stub
   idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export \
               -Wb,stub_export_include=Display_Base_stub_export.h \
-              -Wb,skel_export_macro=DISPLAY_BASE_SKEL_Export \
-              -Wb,skel_export_include=Display_Base_skel_export.h
-  dynamicflags = DISPLAY_BASE_STUB_BUILD_DLL
+              -Wb,skel_export_macro=DISPLAY_BASE_SVNT_Export \
+              -Wb,skel_export_include=Display_Base_svnt_export.h
+  dynamicflags   = DISPLAY_BASE_STUB_BUILD_DLL
 
   IDL_Files {
     Display_Base.idl
@@ -17,22 +17,16 @@ project(Display_Base_stub): ciao_client_dnc {
   Source_Files {
     Display_BaseC.cpp
   }
-
-  Header_Files {
-    Display_Base_stub_export.h
-  }
 }
 
-project(Display_Base_skel) : ciao_servant_dnc {
+project(Display_Base_svnt) : ciao_servant_dnc {
   after +=  Display_Base_stub
-  sharedname  = Display_Base_skel
+  sharedname  = Display_Base_svnt
   libs    += Display_Base_stub
 
-  idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export \
-              -Wb,stub_export_include=Display_Base_stub_export.h \
-              -Wb,skel_export_macro=DISPLAY_BASE_SKEL_Export \
-              -Wb,skel_export_include=Display_Base_skel_export.h
-  dynamicflags = DISPLAY_BASE_SKEL_BUILD_DLL
+  idlflags  +=  -Wb,export_macro=DISPLAY_BASE_SVNT_Export \
+                -Wb,export_include=Display_Base_svnt_export.h
+  dynamicflags = DISPLAY_BASE_SVNT_BUILD_DLL
 
   IDL_Files {
     Display_Base.idl
@@ -41,10 +35,6 @@ project(Display_Base_skel) : ciao_servant_dnc {
   Source_Files {
     Display_BaseS.cpp
   }
-
-  Header_Files {
-    Display_Base_skel_export.h
-  }
 }
 
 
diff --git a/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h b/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h
deleted file mode 100644
index 2dc444fe8e0..00000000000
--- a/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DISPLAY_BASE_SVNT
-// ------------------------------
-#ifndef DISPLAY_BASE_SKEL_EXPORT_H
-#define DISPLAY_BASE_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DISPLAY_BASE_SKEL_HAS_DLL)
-#  define DISPLAY_BASE_SKEL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DISPLAY_BASE_SKEL_HAS_DLL */
-
-#if !defined (DISPLAY_BASE_SKEL_HAS_DLL)
-#  define DISPLAY_BASE_SKEL_HAS_DLL 1
-#endif /* ! DISPLAY_BASE_SKEL_HAS_DLL */
-
-#if defined (DISPLAY_BASE_SKEL_HAS_DLL) && (DISPLAY_BASE_SKEL_HAS_DLL == 1)
-#  if defined (DISPLAY_BASE_SKEL_BUILD_DLL)
-#    define DISPLAY_BASE_SKEL_Export ACE_Proper_Export_Flag
-#    define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DISPLAY_BASE_SKEL_BUILD_DLL */
-#    define DISPLAY_BASE_SKEL_Export ACE_Proper_Import_Flag
-#    define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DISPLAY_BASE_SKEL_BUILD_DLL */
-#else /* DISPLAY_BASE_SKEL_HAS_DLL == 1 */
-#  define DISPLAY_BASE_SKEL_Export
-#  define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T)
-#  define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DISPLAY_BASE_SKEL_HAS_DLL == 1 */
-
-// Set DISPLAY_BASE_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DISPLAY_BASE_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DISPLAY_BASE_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DISPLAY_BASE_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DISPLAY_BASE_SKEL_NTRACE */
-
-#if (DISPLAY_BASE_SKEL_NTRACE == 1)
-#  define DISPLAY_BASE_SKEL_TRACE(X)
-#else /* (DISPLAY_BASE_SKEL_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DISPLAY_BASE_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DISPLAY_BASE_SKEL_NTRACE == 1) */
-
-#endif /* DISPLAY_BASE_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h b/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h
new file mode 100644
index 00000000000..7e0460322a5
--- /dev/null
+++ b/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DISPLAY_BASE_SVNT
+// ------------------------------
+#ifndef DISPLAY_BASE_SVNT_EXPORT_H
+#define DISPLAY_BASE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DISPLAY_BASE_SVNT_HAS_DLL)
+#  define DISPLAY_BASE_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DISPLAY_BASE_SVNT_HAS_DLL */
+
+#if !defined (DISPLAY_BASE_SVNT_HAS_DLL)
+#  define DISPLAY_BASE_SVNT_HAS_DLL 1
+#endif /* ! DISPLAY_BASE_SVNT_HAS_DLL */
+
+#if defined (DISPLAY_BASE_SVNT_HAS_DLL) && (DISPLAY_BASE_SVNT_HAS_DLL == 1)
+#  if defined (DISPLAY_BASE_SVNT_BUILD_DLL)
+#    define DISPLAY_BASE_SVNT_Export ACE_Proper_Export_Flag
+#    define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DISPLAY_BASE_SVNT_BUILD_DLL */
+#    define DISPLAY_BASE_SVNT_Export ACE_Proper_Import_Flag
+#    define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DISPLAY_BASE_SVNT_BUILD_DLL */
+#else /* DISPLAY_BASE_SVNT_HAS_DLL == 1 */
+#  define DISPLAY_BASE_SVNT_Export
+#  define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T)
+#  define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DISPLAY_BASE_SVNT_HAS_DLL == 1 */
+
+// Set DISPLAY_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DISPLAY_BASE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DISPLAY_BASE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DISPLAY_BASE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DISPLAY_BASE_SVNT_NTRACE */
+
+#if (DISPLAY_BASE_SVNT_NTRACE == 1)
+#  define DISPLAY_BASE_SVNT_TRACE(X)
+#else /* (DISPLAY_BASE_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DISPLAY_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DISPLAY_BASE_SVNT_NTRACE == 1) */
+
+#endif /* DISPLAY_BASE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/examples/Display/GPS/GPS.mpc b/CIAO/examples/Display/GPS/GPS.mpc
index 1846215380e..8ac7f0d6fba 100644
--- a/CIAO/examples/Display/GPS/GPS.mpc
+++ b/CIAO/examples/Display/GPS/GPS.mpc
@@ -4,11 +4,7 @@
 project(Display_Base_GPS_stub): ciao_client_dnc {
   after += Display_Base_stub
   sharedname = GPS_stub
-  idlflags += -St \
-              -Wb,stub_export_macro=GPS_STUB_Export \
-              -Wb,stub_export_include=GPS_stub_export.h \
-              -Wb,skel_export_macro=GPS_SVNT_Export \
-              -Wb,skel_export_include=GPS_svnt_export.h
+  idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h
   dynamicflags   = GPS_STUB_BUILD_DLL
   libs += Display_Base_stub
 
@@ -19,20 +15,14 @@ project(Display_Base_GPS_stub): ciao_client_dnc {
   Source_Files {
     GPSC.cpp
   }
-
-  Header_Files {
-    GPS_stub_export.h
-  }
 }
 
 project(Display_Base_GPS_svnt) : ciao_servant_dnc {
-  after += Display_Base_skel Display_Base_GPS_stub
+  after += Display_Base_svnt Display_Base_GPS_stub
   sharedname  = GPS_svnt
-  libs    += GPS_stub Display_Base_stub Display_Base_skel
-
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=GPS_SVNT_Export \
-                -Wb,export_include=GPS_svnt_export.h
+  libs    += GPS_stub Display_Base_stub Display_Base_svnt
+  
+  idlflags  +=  -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h
   dynamicflags = GPS_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -48,35 +38,25 @@ project(Display_Base_GPS_svnt) : ciao_servant_dnc {
     GPSS.cpp
     GPS_svnt.cpp
   }
-
-  Header_Files {
-    GPS_svnt_export.h
-  }
 }
 
 
 project(Display_Base_GPS_exec) : ciao_component_dnc {
   after   += Display_Base_GPS_svnt
   sharedname = GPS_exec
-  libs      += GPS_stub GPS_svnt Display_Base_stub Display_Base_skel
-
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=GPS_EXEC_Export \
-                -Wb,export_include=GPS_exec_export.h
+  libs      += GPS_stub GPS_svnt Display_Base_stub Display_Base_svnt
+  
+  idlflags  +=  -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h
   dynamicflags   = GPS_EXEC_BUILD_DLL
 
   IDL_Files {
-    GPSEI.idl
+    GPSEI.idl    
   }
 
   Source_Files {
     GPSEIC.cpp
     GPS_exec.cpp
   }
-
-  Header_Files {
-    GPS_exec_export.h
-  }
 }
 
 
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index a3ee533d6f5..3a32fa49d3f 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -5,8 +5,7 @@ project(Display_Base_NavDisplay_stub): ciao_client_dnc {
   after += Display_Base_stub
   sharedname = NavDisplay_stub
   libs += Display_Base_stub
-  idlflags += -St \
-              -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \
+  idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \
               -Wb,stub_export_include=NavDisplay_stub_export.h \
               -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export \
               -Wb,skel_export_include=NavDisplay_svnt_export.h
@@ -19,21 +18,16 @@ project(Display_Base_NavDisplay_stub): ciao_client_dnc {
   Source_Files {
     NavDisplayC.cpp
   }
-
-  Header_Files {
-    NavDisplay_stub_export.h
-  }
 }
 
 project(Display_Base_NavDisplay_svnt) : ciao_servant_dnc {
-  after += Display_Base_skel Display_Base_NavDisplay_stub
+  after += Display_Base_svnt Display_Base_NavDisplay_stub
   sharedname  = NavDisplay_svnt
   libs    += NavDisplay_stub \
              Display_Base_stub \
-             Display_Base_skel
+             Display_Base_svnt
 
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=NAVDISPLAY_SVNT_Export \
+  idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export \
                 -Wb,export_include=NavDisplay_svnt_export.h
   dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
 
@@ -50,10 +44,6 @@ project(Display_Base_NavDisplay_svnt) : ciao_servant_dnc {
     NavDisplayS.cpp
     NavDisplay_svnt.cpp
   }
-
-  Header_Files {
-    NavDisplay_svnt_export.h
-  }
 }
 
 
@@ -63,19 +53,19 @@ project(Display_Base_NavDisplay_exec) : ciao_component_dnc {
   libs      += NavDisplay_stub \
                NavDisplay_svnt \
                Display_Base_stub \
-               Display_Base_skel
+               Display_Base_svnt
 
-  dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL
+  idlflags  +=  -Wb,export_macro=NAVDISPLAY_EXEC_Export \
+                -Wb,export_include=NavDisplay_exec_export.h
+  dynamicflags   = NAVDISPLAY_EXEC_BUILD_DLL
 
   IDL_Files {
+
   }
 
   Source_Files {
-    NavDisplay_exec.cpp
-  }
 
-  Header_Files {
-    NavDisplay_exec_export.h
+    NavDisplay_exec.cpp
   }
 }
 
diff --git a/CIAO/examples/Display/RateGen/RateGen.mpc b/CIAO/examples/Display/RateGen/RateGen.mpc
index 5ec6cfec169..2727c557efe 100644
--- a/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -4,11 +4,7 @@
 project(Display_Base_RateGen_stub): ciao_client_dnc {
   after += Display_Base_stub
   sharedname = RateGen_stub
-  idlflags += -St \
-              -Wb,stub_export_macro=RATEGEN_STUB_Export \
-              -Wb,stub_export_include=RateGen_stub_export.h \
-              -Wb,skel_export_macro=RATEGEN_SVNT_Export \
-              -Wb,skel_export_include=RateGen_svnt_export.h
+  idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h
   dynamicflags   = RATEGEN_STUB_BUILD_DLL
   libs += Display_Base_stub
 
@@ -19,20 +15,14 @@ project(Display_Base_RateGen_stub): ciao_client_dnc {
   Source_Files {
     RateGenC.cpp
   }
-
-  Header_Files {
-    RateGen_stub_export.h
-  }
 }
 
 project(Display_Base_RateGen_svnt) : ciao_servant_dnc {
-  after += Display_Base_skel Display_Base_RateGen_stub
+  after += Display_Base_svnt Display_Base_RateGen_stub
   sharedname  = RateGen_svnt
-  libs    += RateGen_stub Display_Base_stub Display_Base_skel
-
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=RATEGEN_SVNT_Export \
-                -Wb,export_include=RateGen_svnt_export.h
+  libs    += RateGen_stub Display_Base_stub Display_Base_svnt
+  
+  idlflags  +=  -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h
   dynamicflags = RATEGEN_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -48,33 +38,25 @@ project(Display_Base_RateGen_svnt) : ciao_servant_dnc {
     RateGenS.cpp
     RateGen_svnt.cpp
   }
-
-  Header_Files {
-    RateGen_svnt_export.h
-  }
 }
 
 
 project(Display_Base_RateGen_exec) : ciao_component_dnc {
   after   += Display_Base_RateGen_svnt
   sharedname = RateGen_exec
-  libs      += RateGen_stub \
-               RateGen_svnt \
-               Display_Base_stub \
-               Display_Base_skel
-
-  dynamicflags = RATEGEN_EXEC_BUILD_DLL
+  libs      += RateGen_stub RateGen_svnt Display_Base_stub Display_Base_svnt
+  
+  idlflags  +=  -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h
+  dynamicflags   = RATEGEN_EXEC_BUILD_DLL
 
   IDL_Files {
+    
   }
 
   Source_Files {
+    
     RateGen_exec.cpp
   }
-
-  Header_Files {
-    RateGen_exec_export.h
-  }
 }
 
 
diff --git a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
index 6bdb1c85e03..da93ff1c72d 100755
--- a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
+++ b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "$ENV{ACE_ROOT}/bin";
+use lib "../../../../../../bin";
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl
index 008c87f6e35..d03a0f47cc4 100755
--- a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl
+++ b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "$ENV{ACE_ROOT}/bin";
+use lib "../../../../../bin";
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
index 468afcc1b8b..4bfcf5bcd20 100644
--- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -4,7 +4,8 @@
 project(Hello_Base_DnC_stub): ciao_client_dnc {
 
   sharedname = Hello_Base_DnC_stub
-  idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
               -Wb,stub_export_include=Hello_Base_stub_export.h \
               -Wb,skel_export_macro=HELLO_BASE_SVNT_Export \
               -Wb,skel_export_include=Hello_Base_svnt_export.h
@@ -32,7 +33,8 @@ project(Hello_Base_DnC_svnt) : ciao_servant_dnc {
   sharedname  = Hello_Base_DnC_svnt
   libs    += Hello_Base_DnC_stub
 
-  idlflags  += -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
+  idlflags  += -Sc \
+               -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
                -Wb,stub_export_include=Hello_Base_stub_export.h \
                -Wb,skel_export_macro=HELLO_BASE_SVNT_Export \
                -Wb,skel_export_include=Hello_Base_svnt_export.h
diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc
index 2ccb0fd930c..df794278191 100644
--- a/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -5,7 +5,8 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
   avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Receiver_DnC_stub
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=RECEIVER_SVNT_Export \
               -Wb,skel_export_include=Receiver_svnt_export.h
@@ -19,11 +20,11 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
   Source_Files {
     ReceiverC.cpp
   }
-
+  
   Header_Files {
     ReceiverC.h
   }
-
+  
   Inline_Files {
     ReceiverC.inl
   }
@@ -37,8 +38,9 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
   libs    += Receiver_DnC_stub \
              Hello_Base_DnC_stub \
              Hello_Base_DnC_svnt
-
-  idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export \
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=RECEIVER_SVNT_Export \
                 -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
@@ -77,8 +79,9 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
                Receiver_DnC_svnt \
                Hello_Base_DnC_stub \
                Hello_Base_DnC_svnt
-
-  idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export \
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=RECEIVER_EXEC_Export \
                 -Wb,export_include=Receiver_exec_export.h
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
@@ -88,10 +91,10 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Receiver_exec.cpp
   }
-
+  
   Header_Files {
   }
-
+  
   Inline_Files {
   }
 }
diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc
index defe03b11a6..0b4473033c8 100644
--- a/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/CIAO/examples/Hello/Sender/Sender.mpc
@@ -5,7 +5,8 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
   avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Sender_DnC_stub
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
               -Wb,skel_export_macro=SENDER_SVNT_Export \
               -Wb,skel_export_include=Sender_svnt_export.h
@@ -19,11 +20,11 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
   Source_Files {
     SenderC.cpp
   }
-
+  
   Header_Files {
     SenderC.h
   }
-
+  
   Inline_Files {
     SenderC.inl
   }
@@ -38,7 +39,8 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
           Hello_Base_DnC_stub \
           Hello_Base_DnC_svnt
 
-  idlflags  +=  -Wb,export_macro=SENDER_SVNT_Export \
+  idlflags  +=  -Sc \
+                -Wb,export_macro=SENDER_SVNT_Export \
                 -Wb,export_include=Sender_svnt_export.h
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
@@ -55,13 +57,13 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
     SenderS.cpp
     Sender_svnt.cpp
   }
-
+  
   Header_Files {
     SenderEC.h
     SenderS.h
     Sender_svnt.h
   }
-
+  
   Inline_Files {
     SenderEC.inl
     SenderS.inl
@@ -77,7 +79,8 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
                Hello_Base_DnC_stub \
                Hello_Base_DnC_svnt
 
-  idlflags  +=  -Wb,export_macro=SENDER_EXEC_Export \
+  idlflags  +=  -Sc \
+                -Wb,export_macro=SENDER_EXEC_Export \
                 -Wb,export_include=Sender_exec_export.h
   dynamicflags   = SENDER_EXEC_BUILD_DLL
 
@@ -87,7 +90,7 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Sender_exec.cpp
   }
-
+  
   Header_Files {
     Sender_exec.h
   }
@@ -105,10 +108,10 @@ project (Hello_DnC_Starter) : ciao_client_dnc, valuetype {
   Source_Files {
     starter.cpp
   }
-
+  
   Header_Files {
   }
-
+  
   Inline_Files {
   }
 }
diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp
index 0edc7faf471..7c647ef01dd 100644
--- a/CIAO/examples/Hello/Sender/starter.cpp
+++ b/CIAO/examples/Hello/Sender/starter.cpp
@@ -3,16 +3,17 @@
 #include "SenderC.h"
 #include "ace/Get_Opt.h"
 
-// IOR file of the Sender
+//IOR file of the Sender
 const char * ior = 0;
 const char * message = 0;
 
+
 int
 parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "k:m:");
   int c = 0;
-
+  
   while ((c = get_opts ()) != -1)
     {
       switch (c)
@@ -41,7 +42,7 @@ parse_args (int argc, char *argv[])
     {
       ior = "file://Sender.ior";
     }
-
+    
   return 0;
 }
 
@@ -72,7 +73,7 @@ main (int argc, char *argv[])
 
       if (CORBA::is_nil (sender.in ()))
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACE_ERROR_RETURN ((LM_ERROR, 
                              "Unable to acquire Sender's objref\n"),
                             -1);
         }
diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
index a790fef1be0..a790fef1be0 100755..100644
--- a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
+++ b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp
new file mode 100644
index 00000000000..7b382ef4720
--- /dev/null
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp
@@ -0,0 +1,322 @@
+<Deployment:deploymentPlan
+ xmlns:Deployment="http://www.omg.org/Deployment"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+
+  <label>Hello-DeploymentPlan</label>
+  <UUID>Hello_Plan_UUID_0001</UUID>
+  <!-- Could be ZERO  -->
+  <realizes>
+    <label>BasicSP-realizes-cid</label>
+    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
+    <specificType><!-- @@ What does here? --></specificType>
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <port>
+      <name>read_message</name>
+      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
+      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
+      <provider>false</provider>
+      <exclusiveProvider>false</exclusiveProvider>
+      <exclusiveUser>true</exclusiveUser>
+      <optional>false</optional>
+      <kind>SimplexReceptacle</kind>
+    </port>
+  </realizes>
+  
+  <implementation id="Hello-Sender-mdd">
+    <name>Hello-Sender-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Sender_exec</artifact>
+    <artifact>Hello-Sender_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="Hello-Receiver-mdd">
+    <name>Hello-Receiver-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Receiver_exec</artifact>
+    <artifact>Hello-Receiver_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+
+  <instance id="Hello-Sender-idd">
+    <name>Hello-Sender-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a test message passed in through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+        
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <instance id="Hello-Sender-idd-02">
+    <name>Hello-Sender-idd-02</name>
+    <node>ReceiverNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender_02.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a another message through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>  
+
+  <instance id="Hello-Receiver-idd">
+    <name>Hello-Receiver-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Receiver-mdd</implementation>
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection_02</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd-02</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>  
+
+
+  <connection>
+    <name>hello_event_ec_consumer_connection</name>
+    
+    <!-- The position of the below "deployRequirement" element matters     -->
+    <deployRequirement>
+      <resourceType>EventFilter</resourceType>
+      <name>my_filter_02</name>
+      <property>
+        <name>EventFilter</name>
+        <value>
+	        <type>
+	          <kind>tk_string</kind>
+	        </type>
+	        <value>
+	          <string>my_filter_02</string>
+	        </value>
+        </value>	        
+      </property>              
+    </deployRequirement>
+    
+    <internalEndpoint>
+      <portName>click_in</portName>
+      <kind>EventConsumer</kind>
+      <instance>Hello-Receiver-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="Hello-Sender_exec">
+    <name>Sender_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Sender_svnt">
+    <name>Sender_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_exec">
+    <name>Receiver_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_svnt">
+    <name>Receiver_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <infoProperty>
+    <name>CIAOEvents</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>ciao-events-example-with-filters.ced</string>
+      </value>
+    </value>
+  </infoProperty>  
+</Deployment:deploymentPlan>  
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp
new file mode 100644
index 00000000000..beb8af87f0d
--- /dev/null
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp
@@ -0,0 +1,322 @@
+<Deployment:deploymentPlan
+ xmlns:Deployment="http://www.omg.org/Deployment"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+
+  <label>Hello-DeploymentPlan</label>
+  <UUID>Hello_Plan_UUID_0001</UUID>
+  <!-- Could be ZERO  -->
+  <realizes>
+    <label>BasicSP-realizes-cid</label>
+    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
+    <specificType><!-- @@ What does here? --></specificType>
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <port>
+      <name>read_message</name>
+      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
+      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
+      <provider>false</provider>
+      <exclusiveProvider>false</exclusiveProvider>
+      <exclusiveUser>true</exclusiveUser>
+      <optional>false</optional>
+      <kind>SimplexReceptacle</kind>
+    </port>
+  </realizes>
+  
+  <implementation id="Hello-Sender-mdd">
+    <name>Hello-Sender-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Sender_exec</artifact>
+    <artifact>Hello-Sender_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="Hello-Receiver-mdd">
+    <name>Hello-Receiver-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Receiver_exec</artifact>
+    <artifact>Hello-Receiver_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+
+  <instance id="Hello-Sender-idd">
+    <name>Hello-Sender-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a test message passed in through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+        
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <instance id="Hello-Sender-idd-02">
+    <name>Hello-Sender-idd-02</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender_02.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a another message through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>  
+
+  <instance id="Hello-Receiver-idd">
+    <name>Hello-Receiver-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Receiver-mdd</implementation>
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection_02</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd-02</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>  
+
+
+  <connection>
+    <name>hello_event_ec_consumer_connection</name>
+    
+    <!-- The position of the below "deployRequirement" element matters     -->
+    <deployRequirement>
+      <resourceType>EventFilter</resourceType>
+      <name>my_filter_03</name>
+      <property>
+        <name>EventFilter</name>
+        <value>
+	        <type>
+	          <kind>tk_string</kind>
+	        </type>
+	        <value>
+	          <string>my_filter_03</string>
+	        </value>
+        </value>	        
+      </property>              
+    </deployRequirement>
+    
+    <internalEndpoint>
+      <portName>click_in</portName>
+      <kind>EventConsumer</kind>
+      <instance>Hello-Receiver-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="Hello-Sender_exec">
+    <name>Sender_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Sender_svnt">
+    <name>Sender_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_exec">
+    <name>Receiver_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_svnt">
+    <name>Receiver_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <infoProperty>
+    <name>CIAOEvents</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>ciao-events-example-with-filters.ced</string>
+      </value>
+    </value>
+  </infoProperty>  
+</Deployment:deploymentPlan>  
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp
new file mode 100644
index 00000000000..f01b77dcaac
--- /dev/null
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp
@@ -0,0 +1,322 @@
+<Deployment:deploymentPlan
+ xmlns:Deployment="http://www.omg.org/Deployment"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+
+  <label>Hello-DeploymentPlan</label>
+  <UUID>Hello_Plan_UUID_0001</UUID>
+  <!-- Could be ZERO  -->
+  <realizes>
+    <label>BasicSP-realizes-cid</label>
+    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
+    <specificType><!-- @@ What does here? --></specificType>
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <port>
+      <name>read_message</name>
+      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
+      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
+      <provider>false</provider>
+      <exclusiveProvider>false</exclusiveProvider>
+      <exclusiveUser>true</exclusiveUser>
+      <optional>false</optional>
+      <kind>SimplexReceptacle</kind>
+    </port>
+  </realizes>
+  
+  <implementation id="Hello-Sender-mdd">
+    <name>Hello-Sender-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Sender_exec</artifact>
+    <artifact>Hello-Sender_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="Hello-Receiver-mdd">
+    <name>Hello-Receiver-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Receiver_exec</artifact>
+    <artifact>Hello-Receiver_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+
+  <instance id="Hello-Sender-idd">
+    <name>Hello-Sender-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a test message passed in through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+        
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <instance id="Hello-Sender-idd-02">
+    <name>Hello-Sender-idd-02</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender_02.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a another message through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>  
+
+  <instance id="Hello-Receiver-idd">
+    <name>Hello-Receiver-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Receiver-mdd</implementation>
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection_02</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd-02</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>  
+
+
+  <connection>
+    <name>hello_event_ec_consumer_connection</name>
+    
+    <!-- The position of the below "deployRequirement" element matters     -->
+    <deployRequirement>
+      <resourceType>EventFilter</resourceType>
+      <name>my_filter_04</name>
+      <property>
+        <name>EventFilter</name>
+        <value>
+	        <type>
+	          <kind>tk_string</kind>
+	        </type>
+	        <value>
+	          <string>my_filter_04</string>
+	        </value>
+        </value>	        
+      </property>              
+    </deployRequirement>
+    
+    <internalEndpoint>
+      <portName>click_in</portName>
+      <kind>EventConsumer</kind>
+      <instance>Hello-Receiver-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="Hello-Sender_exec">
+    <name>Sender_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Sender_svnt">
+    <name>Sender_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_exec">
+    <name>Receiver_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_svnt">
+    <name>Receiver_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <infoProperty>
+    <name>CIAOEvents</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>ciao-events-example-with-filters.ced</string>
+      </value>
+    </value>
+  </infoProperty>  
+</Deployment:deploymentPlan>  
diff --git a/CIAO/examples/Null_Component/Null_Component.idl b/CIAO/examples/Null_Component/Null_Component.idl
index 26df429a13b..086e3ac23d4 100644
--- a/CIAO/examples/Null_Component/Null_Component.idl
+++ b/CIAO/examples/Null_Component/Null_Component.idl
@@ -2,8 +2,6 @@
  * @file Null_Component.idl
  *
  * @author Abdul Sowayan <abdullah.sowayan@lmco.com>
- *
- * $Id$
  */
 
 #ifndef NULL_COMPONENT_IDL
diff --git a/CIAO/examples/Null_Component/Null_Component.mpc b/CIAO/examples/Null_Component/Null_Component.mpc
index b639ceb0828..087c7275063 100644
--- a/CIAO/examples/Null_Component/Null_Component.mpc
+++ b/CIAO/examples/Null_Component/Null_Component.mpc
@@ -5,10 +5,7 @@ project(Null_Interface_Null_Component_stub): ciao_client_dnc {
   after += Null_Interface_stub
   sharedname = Null_Component_stub
   libs += Null_Interface_stub
-  idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Null_Component_stub_export.h \
-              -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Null_Component_svnt_export.h
+  idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export -Wb,stub_export_include=Null_Component_stub_export.h -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export -Wb,skel_export_include=Null_Component_svnt_export.h
   dynamicflags   = NULL_COMPONENT_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,14 +18,11 @@ project(Null_Interface_Null_Component_stub): ciao_client_dnc {
 }
 
 project(Null_Interface_Null_Component_svnt) : ciao_servant_dnc {
-  after += Null_Interface_skel Null_Interface_Null_Component_stub
+  after += Null_Interface_svnt Null_Interface_Null_Component_stub
   sharedname  = Null_Component_svnt
-  libs    += Null_Component_stub \
-             Null_Interface_stub \
-             Null_Interface_skel
+  libs    += Null_Component_stub Null_Interface_stub Null_Interface_svnt
 
-  idlflags += -Wb,export_macro=NULL_COMPONENT_SVNT_Export \
-              -Wb,export_include=Null_Component_svnt_export.h
+  idlflags  +=  -Wb,export_macro=NULL_COMPONENT_SVNT_Export -Wb,export_include=Null_Component_svnt_export.h
   dynamicflags = NULL_COMPONENT_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -50,13 +44,9 @@ project(Null_Interface_Null_Component_svnt) : ciao_servant_dnc {
 project(Null_Interface_Null_Component_exec) : ciao_component_dnc {
   after   += Null_Interface_Null_Component_svnt
   sharedname = Null_Component_exec
-  libs      += Null_Component_stub \
-               Null_Component_svnt \
-               Null_Interface_stub \
-               Null_Interface_skel
+  libs      += Null_Component_stub Null_Component_svnt Null_Interface_stub Null_Interface_svnt
 
-  idlflags  +=  -Wb,export_macro=NULL_COMPONENT_EXEC_Export \
-                -Wb,export_include=Null_Component_exec_export.h
+  idlflags  +=  -Wb,export_macro=NULL_COMPONENT_EXEC_Export -Wb,export_include=Null_Component_exec_export.h
   dynamicflags   = NULL_COMPONENT_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/examples/Null_Component/Null_Interface.idl b/CIAO/examples/Null_Component/Null_Interface.idl
index ed841b2a921..98f539d6034 100644
--- a/CIAO/examples/Null_Component/Null_Interface.idl
+++ b/CIAO/examples/Null_Component/Null_Interface.idl
@@ -2,8 +2,6 @@
  * @file Null_Interface.idl
  *
  * @author Abdul Sowayan <abdullah.sowayan@lmco.com>
- *
- * $Id$
  */
 
 #ifndef NULL_INTERFACE_IDL
@@ -11,8 +9,8 @@
 
 /**
  * @interface Null_Interface
- *
- * @brief
+ * 
+ * @brief 
  */
 interface Null_Interface
 {
diff --git a/CIAO/examples/Null_Component/Null_Interface.mpc b/CIAO/examples/Null_Component/Null_Interface.mpc
index 9e66ae6ea65..e5eb5b31a1f 100644
--- a/CIAO/examples/Null_Component/Null_Interface.mpc
+++ b/CIAO/examples/Null_Component/Null_Interface.mpc
@@ -1,14 +1,10 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Null_Interface"
 
-project(Null_Interface_stub): taolib_with_idl {
-
+project(Null_Interface_stub): ciao_client_dnc {
+  
   sharedname = Null_Interface_stub
-  idlflags += -St \
-              -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \
-              -Wb,stub_export_include=Null_Interface_stub_export.h \
-              -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \
-              -Wb,skel_export_include=Null_Interface_skel_export.h
+  idlflags += -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export -Wb,stub_export_include=Null_Interface_stub_export.h -Wb,skel_export_macro=NULL_INTERFACE_SVNT_Export -Wb,skel_export_include=Null_Interface_svnt_export.h
   dynamicflags   = NULL_INTERFACE_STUB_BUILD_DLL
 
   IDL_Files {
@@ -20,17 +16,13 @@ project(Null_Interface_stub): taolib_with_idl {
   }
 }
 
-project(Null_Interface_skel) : portableserver {
+project(Null_Interface_svnt) : ciao_servant_dnc {
   after +=  Null_Interface_stub
-  sharedname  = Null_Interface_skel
-  libs    += Null_Interface_stub
-
-  idlflags += -St \
-              -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \
-              -Wb,stub_export_include=Null_Interface_stub_export.h \
-              -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \
-              -Wb,skel_export_include=Null_Interface_skel_export.h
-  dynamicflags = NULL_INTERFACE_SKEL_BUILD_DLL
+  sharedname  = Null_Interface_svnt
+  libs    += Null_Interface_stub 
+  
+  idlflags  +=  -Wb,export_macro=NULL_INTERFACE_SVNT_Export -Wb,export_include=Null_Interface_svnt_export.h
+  dynamicflags = NULL_INTERFACE_SVNT_BUILD_DLL
 
   IDL_Files {
     Null_Interface.idl
diff --git a/CIAO/examples/Null_Component/Null_Interface_skel_export.h b/CIAO/examples/Null_Component/Null_Interface_skel_export.h
deleted file mode 100644
index 239c5cf3f6a..00000000000
--- a/CIAO/examples/Null_Component/Null_Interface_skel_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl NULL_INTERFACE_SVNT
-// ------------------------------
-#ifndef NULL_INTERFACE_SKEL_EXPORT_H
-#define NULL_INTERFACE_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (NULL_INTERFACE_SKEL_HAS_DLL)
-#  define NULL_INTERFACE_SKEL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && NULL_INTERFACE_SKEL_HAS_DLL */
-
-#if !defined (NULL_INTERFACE_SKEL_HAS_DLL)
-#  define NULL_INTERFACE_SKEL_HAS_DLL 1
-#endif /* ! NULL_INTERFACE_SKEL_HAS_DLL */
-
-#if defined (NULL_INTERFACE_SKEL_HAS_DLL) && (NULL_INTERFACE_SKEL_HAS_DLL == 1)
-#  if defined (NULL_INTERFACE_SKEL_BUILD_DLL)
-#    define NULL_INTERFACE_SKEL_Export ACE_Proper_Export_Flag
-#    define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* NULL_INTERFACE_SKEL_BUILD_DLL */
-#    define NULL_INTERFACE_SKEL_Export ACE_Proper_Import_Flag
-#    define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* NULL_INTERFACE_SKEL_BUILD_DLL */
-#else /* NULL_INTERFACE_SKEL_HAS_DLL == 1 */
-#  define NULL_INTERFACE_SKEL_Export
-#  define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T)
-#  define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* NULL_INTERFACE_SKEL_HAS_DLL == 1 */
-
-// Set NULL_INTERFACE_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (NULL_INTERFACE_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define NULL_INTERFACE_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define NULL_INTERFACE_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !NULL_INTERFACE_SKEL_NTRACE */
-
-#if (NULL_INTERFACE_SKEL_NTRACE == 1)
-#  define NULL_INTERFACE_SKEL_TRACE(X)
-#else /* (NULL_INTERFACE_SKEL_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define NULL_INTERFACE_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (NULL_INTERFACE_SKEL_NTRACE == 1) */
-
-#endif /* NULL_INTERFACE_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/examples/Null_Component/Null_Interface_svnt_export.h b/CIAO/examples/Null_Component/Null_Interface_svnt_export.h
new file mode 100644
index 00000000000..9d4455adcec
--- /dev/null
+++ b/CIAO/examples/Null_Component/Null_Interface_svnt_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl NULL_INTERFACE_SVNT
+// ------------------------------
+#ifndef NULL_INTERFACE_SVNT_EXPORT_H
+#define NULL_INTERFACE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (NULL_INTERFACE_SVNT_HAS_DLL)
+#  define NULL_INTERFACE_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && NULL_INTERFACE_SVNT_HAS_DLL */
+
+#if !defined (NULL_INTERFACE_SVNT_HAS_DLL)
+#  define NULL_INTERFACE_SVNT_HAS_DLL 1
+#endif /* ! NULL_INTERFACE_SVNT_HAS_DLL */
+
+#if defined (NULL_INTERFACE_SVNT_HAS_DLL) && (NULL_INTERFACE_SVNT_HAS_DLL == 1)
+#  if defined (NULL_INTERFACE_SVNT_BUILD_DLL)
+#    define NULL_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
+#    define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* NULL_INTERFACE_SVNT_BUILD_DLL */
+#    define NULL_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
+#    define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* NULL_INTERFACE_SVNT_BUILD_DLL */
+#else /* NULL_INTERFACE_SVNT_HAS_DLL == 1 */
+#  define NULL_INTERFACE_SVNT_Export
+#  define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
+#  define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* NULL_INTERFACE_SVNT_HAS_DLL == 1 */
+
+// Set NULL_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (NULL_INTERFACE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define NULL_INTERFACE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define NULL_INTERFACE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !NULL_INTERFACE_SVNT_NTRACE */
+
+#if (NULL_INTERFACE_SVNT_NTRACE == 1)
+#  define NULL_INTERFACE_SVNT_TRACE(X)
+#else /* (NULL_INTERFACE_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define NULL_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (NULL_INTERFACE_SVNT_NTRACE == 1) */
+
+#endif /* NULL_INTERFACE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/examples/Null_Component/StaticDAnCEApp.mpc b/CIAO/examples/Null_Component/StaticDAnCEApp.mpc
index 90d141854e4..be737fa37de 100644
--- a/CIAO/examples/Null_Component/StaticDAnCEApp.mpc
+++ b/CIAO/examples/Null_Component/StaticDAnCEApp.mpc
@@ -6,7 +6,7 @@ project(StaticDAnCEApp *): ciao_static_dnc_app, iortable {
   exename   = StaticDAnCEApp
 
   libs     += Null_Interface_stub
-  libs     += Null_Interface_skel
+  libs     += Null_Interface_svnt
   libs     += Null_Component_stub
   libs     += Null_Component_svnt
   libs     += Null_Component_exec
diff --git a/CIAO/examples/Null_Component/descriptors/Deployment.xsd b/CIAO/examples/Null_Component/descriptors/Deployment.xsd
deleted file mode 100644
index fd4ffe5bc7d..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Deployment.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-            <xsd:include schemaLocation="Basic_Deployment_Data.xsd"/>
-            <xsd:include schemaLocation="cpd.xsd"/>
-            <xsd:include schemaLocation="ccd.xsd"/>
-            <xsd:include schemaLocation="cdd.xsd"/>
-            <xsd:include schemaLocation="cdp.xsd"/>
-            <xsd:include schemaLocation="cid.xsd"/>
-            <xsd:include schemaLocation="iad.xsd"/>
-            <xsd:include schemaLocation="pcd.xsd"/>
-            <xsd:include schemaLocation="toplevel.xsd"/>
-
-
-<!-- Top-level elements. -->
-
-  <xsd:element name="domain" type="Deployment:Domain"/>
-  <xsd:element name="deploymentPlan" type="Deployment:DeploymentPlan"/>
-  <xsd:element name="implementationArtifactDescription" type="Deployment:ImplementationArtifactDescription" />
-  <xsd:element name="componentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/>
-  <xsd:element name="componentImplementationDescription" type="Deployment:ComponentImplementationDescription"/>
-  <xsd:element name="componentPackageDescription" type="Deployment:ComponentPackageDescription"/>
-  <xsd:element name="packageConfiguration" type="Deployment:PackageConfiguration"/>
-  <xsd:element name="topLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/>
-
-</xsd:schema>
diff --git a/CIAO/examples/Null_Component/descriptors/Domain.cdd b/CIAO/examples/Null_Component/descriptors/Domain.cdd
deleted file mode 100644
index a7fd42463fe..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Domain.cdd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:Domain xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_Null_Component_Targets_Domain</UUID>
-
-  <node>
-    <name>NodeA</name>
-  </node>
-
-</Deployment:Domain>
diff --git a/CIAO/examples/Null_Component/descriptors/NodeMap.dat b/CIAO/examples/Null_Component/descriptors/NodeMap.dat
deleted file mode 100644
index 556433b464e..00000000000
--- a/CIAO/examples/Null_Component/descriptors/NodeMap.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-NodeA corbaloc:iiop:localhost:10000/NodeManager
-
-
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid b/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid
deleted file mode 100644
index 6d19c2a050c..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_84CDF595-E42C-43D5-B3FD-C6C6524E068C</UUID>
-
-  <assemblyImpl>
-    <instance xmi:id="_B4BF176E-0386-49EE-B84F-3F2781F3C7BE">
-      <name>Null_Component.ComponentImplementations.Null_Assembly_Container.Null_Assembly.Null_Component</name>
-      <package href="Null_Component_Package.cpd"/>
-    </instance>
-  </assemblyImpl>
-
-</Deployment:ComponentImplementationDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd b/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd
deleted file mode 100644
index 0e4b281531a..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_AAC92636-57DD-4503-A616-CF75AD417E99</UUID>
-
-  <implementation>
-    <name>Null_Assembly</name>
-    <referencedImplementation href="Null_Assembly.cid"/>
-  </implementation>
-
-</Deployment:ComponentPackageDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component.ccd b/CIAO/examples/Null_Component/descriptors/Null_Component.ccd
deleted file mode 100644
index 1553f012e70..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component.ccd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_FF1F1E30-2916-4A65-96C3-EF29124400A5</UUID>
-
-  <port>
-    <name>null_facet</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>true</provider>
-    <kind>Facet</kind>
-  </port>
-
-</Deployment:ComponentInterfaceDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid b/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid
deleted file mode 100644
index 93393fca1c7..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_7B0A12C6-0490-4449-A8B3-9BF3CCDF58FA</UUID>
-
-  <implements href="Null_Component.ccd"/>
-
-  <monolithicImpl>
-    <primaryArtifact>
-      <name>Null_Component_stub</name>
-      <referencedArtifact href="Null_Component_stub.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>Null_Component_svnt</name>
-      <referencedArtifact href="Null_Component_svnt.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>Null_Component_exec</name>
-      <referencedArtifact href="Null_Component_exec.iad"/>
-    </primaryArtifact>
-  </monolithicImpl>
-
-  <configProperty>
-    <name>ComponentIOR</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component.ior</string>
-      </value>
-    </value>
-  </configProperty>
-
-</Deployment:ComponentImplementationDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd b/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd
deleted file mode 100644
index d9f06a4367f..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_ABA51225-4A40-4B07-B4EB-467AEEA5BFEE</UUID>
-
-  <realizes href="Null_Component.ccd"/>
-
-  <implementation>
-    <name>Null_ComponentMonolithicImpl</name>
-    <referencedImplementation href="Null_ComponentMonolithicImpl.cid"/>
-  </implementation>
-
-</Deployment:ComponentPackageDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad
deleted file mode 100644
index 9a456b15b60..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_6BECFE2C-84AB-4B4A-B14C-DB8048563368</UUID>
-
-  <location>Null_Component_exec</location>
-
-  <dependsOn>
-    <name>Null_Component_svnt</name>
-    <referencedArtifact href="Null_Component_svnt.iad"/>
-  </dependsOn>
-
-  <dependsOn>
-    <name>Null_Component_stub</name>
-    <referencedArtifact href="Null_Component_stub.iad"/>
-  </dependsOn>
-
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_Component_Home_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad
deleted file mode 100644
index d74f84940fb..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_5249354B-25F0-459E-BC02-5EED8A0122A7</UUID>
-
-  <location>Null_Component_stub</location>
-
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad
deleted file mode 100644
index c6283a3a52c..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_EBFD46AF-1AF1-4646-891C-5FDE9657AD83</UUID>
-
-  <location>Null_Component_svnt</location>
-
-  <dependsOn>
-    <name>Null_Component_stub</name>
-    <referencedArtifact href="Null_Component_stub.iad"/>
-  </dependsOn>
-
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_Component_Home_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd b/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd
deleted file mode 100644
index 0b09dd0c51e..00000000000
--- a/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:PackageConfiguration xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <basePackage href="Null_Assembly_Package.cpd"/>
-
-</Deployment:PackageConfiguration>
diff --git a/CIAO/examples/Null_Component/descriptors/Plan.cdp b/CIAO/examples/Null_Component/descriptors/Plan.cdp
deleted file mode 100644
index 903fd30bc44..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Plan.cdp
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:deploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <implementation id="Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl">
-    <name>Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl</name>
-    <source/>
-    <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub</artifact>
-    <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt</artifact>
-    <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec</artifact>
-  </implementation>
-
-  <instance id="Null_Component_ComponentImplementations_Null_Assembly_Container_Null_Assembly_Null_Component">
-    <name>Null_Component_ComponentImplementations_Null_Assembly_Container_Null_Assembly_Null_Component</name>
-    <node>NodeA</node>
-    <source/>
-    <implementation>Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Null_Component.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub">
-    <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub</name>
-    <source/>
-    <node/>
-    <location>Null_Component_stub</location>
-  </artifact>
-
-  <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt">
-    <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Null_Component_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_Component_Home_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec">
-    <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec</name>
-    <source/>
-    <node/>
-    <location>Null_Component_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_Component_Home_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-</Deployment:deploymentPlan>
diff --git a/CIAO/examples/Null_Component/descriptors/XMI.xsd b/CIAO/examples/Null_Component/descriptors/XMI.xsd
deleted file mode 100644
index f4adac91934..00000000000
--- a/CIAO/examples/Null_Component/descriptors/XMI.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?>
-<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'>
-	<xsd:attribute name="id" type="xsd:ID" />
-	<xsd:attributeGroup name="IdentityAttribs">
-		<xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" />
-		<xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" />
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="LinkAttribs">
-		<xsd:attribute name="href" type="xsd:string" use="optional" />
-		<xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" />
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="ObjectAttribs">
-		<xsd:attributeGroup ref="xmi:IdentityAttribs" />
-		<xsd:attributeGroup ref="xmi:LinkAttribs" />
-		<xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" />
-		<xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" />
-	</xsd:attributeGroup>
-	<xsd:complexType name="Extension">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:any processContents="lax" />
-		</xsd:choice>
-		<xsd:attribute ref="xmi:id" />
-		<xsd:attributeGroup ref="xmi:ObjectAttribs" />
-		<xsd:attribute name="extender" type="xsd:string" use="optional" />
-		<xsd:attribute name="extenderID" type="xsd:string" use="optional" />
-	</xsd:complexType>
-	<xsd:element name="Extension" type="xmi:Extension" />
-	<xsd:complexType name="Any">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:any processContents="skip" />
-		</xsd:choice>
-		<xsd:anyAttribute processContents="skip" />
-	</xsd:complexType>
-</xsd:schema>
diff --git a/CIAO/examples/Null_Component/descriptors/package.tpd b/CIAO/examples/Null_Component/descriptors/package.tpd
deleted file mode 100644
index b57255f3618..00000000000
--- a/CIAO/examples/Null_Component/descriptors/package.tpd
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:TopLevelPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <package href="PackageConfiguration.pcd"/>
-
-</Deployment:TopLevelPackageDescription>
diff --git a/CIAO/examples/Null_Component/model/Null_Component.mga b/CIAO/examples/Null_Component/model/Null_Component.mga
deleted file mode 100644
index 6fde9b4175a..00000000000
--- a/CIAO/examples/Null_Component/model/Null_Component.mga
+++ /dev/null
diff --git a/CIAO/examples/Null_Component/model/Null_Component.xme b/CIAO/examples/Null_Component/model/Null_Component.xme
deleted file mode 100644
index 3893827cb76..00000000000
--- a/CIAO/examples/Null_Component/model/Null_Component.xme
+++ /dev/null
@@ -1,843 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project SYSTEM "mga.dtd">
-
-<project guid="{CAA6F237-1527-4481-ADB7-764DB01170E8}" cdate="Tue Oct 10 12:57:50 2006" mdate="Tue Oct 10 12:57:50 2006" version="" metaguid="{1B0D2E44-51AC-4A14-BF57-FADB2F5F9C86}" metaversion="" metaname="PICML">
-	<name>Null_Component</name>
-	<comment></comment>
-	<author></author>
-	<folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x2" kind="RootFolder">
-		<name>Null_Component</name>
-		<folder id="id-006a-00000002" relid="0x2" childrelidcntr="0x2" kind="InterfaceDefinitions">
-			<name>InterfaceDefinitions</name>
-			<model id="id-0065-00000001" kind="File" relid="0x1" childrelidcntr="0x1">
-				<name>Null_Interface</name>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000002" kind="Object" role="Object" relid="0x1" childrelidcntr="0x1">
-					<name>Null_Interface</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>518,318</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="abstract" status="meta">
-						<value>false</value>
-					</attribute>
-					<attribute kind="local" status="meta">
-						<value>false</value>
-					</attribute>
-					<model id="id-0065-00000003" kind="TwowayOperation" role="TwowayOperation" relid="0x1" childrelidcntr="0x0">
-						<name>null_operation</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-					</model>
-				</model>
-			</model>
-			<model id="id-0065-00000004" kind="File" relid="0x2" childrelidcntr="0x4">
-				<name>Null_Component</name>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000005" kind="Component" role="Component" relid="0x2" childrelidcntr="0x1">
-					<name>Null_Component</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>518,318</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<reference id="id-0067-00000002" kind="ProvidedRequestPort" role="ProvidedRequestPort" relid="0x1" referred="id-0065-00000002">
-						<name>null_facet</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="exclusiveProvider" status="meta">
-							<value>false</value>
-						</attribute>
-						<attribute kind="exclusiveUser" status="meta">
-							<value>false</value>
-						</attribute>
-						<attribute kind="optional" status="meta">
-							<value>false</value>
-						</attribute>
-					</reference>
-				</model>
-				<model id="id-0065-00000006" kind="ComponentFactory" role="ComponentFactory" relid="0x3" childrelidcntr="0x0">
-					<name>Null_Component_Home</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>793,493</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-				<reference id="id-0067-00000001" kind="FileRef" role="FileRef" relid="0x1" referred="id-0065-00000001">
-					<name>FileRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>243,143</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000001" kind="ManagesComponent" role="ManagesComponent" relid="0x4">
-					<name>ManagesComponent</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ws</value>
-					</regnode>
-					<connpoint role="dst" target="id-0065-00000005"/>
-					<connpoint role="src" target="id-0065-00000006"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000003" relid="0x1" childrelidcntr="0xb" kind="PredefinedTypes">
-			<name>PredefinedTypes</name>
-			<atom id="id-0066-00000001" kind="TypeKind" relid="0xb">
-				<name>TypeKind</name>
-			</atom>
-			<atom id="id-0066-00000002" kind="TypeEncoding" relid="0xa">
-				<name>TypeEncoding</name>
-			</atom>
-			<atom id="id-0066-00000003" kind="String" relid="0x9">
-				<name>String</name>
-			</atom>
-			<atom id="id-0066-00000004" kind="Boolean" relid="0x8">
-				<name>Boolean</name>
-			</atom>
-			<atom id="id-0066-00000005" kind="ShortInteger" relid="0x7">
-				<name>ShortInteger</name>
-			</atom>
-			<atom id="id-0066-00000006" kind="RealNumber" relid="0x6">
-				<name>RealNumber</name>
-			</atom>
-			<atom id="id-0066-00000007" kind="LongInteger" relid="0x5">
-				<name>LongInteger</name>
-			</atom>
-			<atom id="id-0066-00000008" kind="GenericValueObject" relid="0x4">
-				<name>GenericValueObject</name>
-			</atom>
-			<atom id="id-0066-00000009" kind="GenericValue" relid="0x3">
-				<name>GenericValue</name>
-			</atom>
-			<atom id="id-0066-0000000a" kind="GenericObject" relid="0x2">
-				<name>GenericObject</name>
-			</atom>
-			<atom id="id-0066-0000000b" kind="Byte" relid="0x1">
-				<name>Byte</name>
-			</atom>
-		</folder>
-		<folder id="id-006a-00000004" relid="0x3" childrelidcntr="0x3" kind="ComponentImplementations">
-			<name>ComponentImplementations</name>
-			<model id="id-0065-00000007" kind="ComponentImplementationContainer" relid="0x1" childrelidcntr="0xb">
-				<name>Null_ComponentImplementation</name>
-				<model id="id-0065-00000008" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2">
-					<name>ComponentIOR</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>282,168</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>Null_Component.ior</value>
-					</attribute>
-					<reference id="id-0067-00000003" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<atom id="id-0066-0000000c" kind="MonolithicImplementation" role="MonolithicImplementation" relid="0x1">
-					<name>Null_ComponentMonolithicImpl</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>125,68</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000004" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-00000005">
-					<name>Null_ComponentRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>910,568</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000008" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x3" referred="id-0066-0000000d">
-					<name>Null_Component_stubRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>439,268</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000009" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x4" referred="id-0066-0000000e">
-					<name>Null_Component_svntRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>596,368</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000000a" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x5" referred="id-0066-0000000f">
-					<name>Null_Component_execRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>753,468</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000002" kind="ConfigProperty" role="ConfigProperty" relid="0xa">
-					<name>ConfigProperty</name>
-					<connpoint role="dst" target="id-0065-00000008"/>
-					<connpoint role="src" target="id-0066-0000000c"/>
-				</connection>
-				<connection id="id-0068-00000003" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x6">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-00000008"/>
-				</connection>
-				<connection id="id-0068-00000004" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x7">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-00000009"/>
-				</connection>
-				<connection id="id-0068-00000005" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x8">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-0000000a"/>
-				</connection>
-				<connection id="id-0068-00000006" kind="Implements" role="Implements" relid="0xb">
-					<name>Implements</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-00000004"/>
-				</connection>
-			</model>
-			<model id="id-0065-00000015" kind="ComponentImplementationContainer" relid="0x3" childrelidcntr="0x3">
-				<name>Null_Assembly_Container</name>
-				<model id="id-0065-00000018" kind="ComponentAssembly" role="ComponentAssembly" relid="0x3" childrelidcntr="0x1">
-					<name>Null_Assembly</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>212,114</value>
-							</regnode>
-						</regnode>
-						<regnode name="QoSModelAspect" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>212,114</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000019" kind="Component" role="Component" derivedfrom="id-0065-00000005" isinstance="yes" isprimary="yes" relid="0x1" childrelidcntr="0x0">
-						<name>Null_Component</name>
-						<regnode name="PartRegs">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>342,130</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-00000019" kind="ProvidedRequestPort" role="ProvidedRequestPort" derivedfrom="id-0067-00000002" isinstance="yes" isprimary="no" referred="id-0065-00000002" isbound="yes">
-							<name>null_facet</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-						</reference>
-					</model>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-00000005" relid="0x4" childrelidcntr="0x0" kind="ImplementationArtifacts">
-			<name>ImplementationArtifacts</name>
-			<model id="id-0065-00000009" kind="ArtifactContainer" relid="0x1" childrelidcntr="0xa">
-				<name>Null_ComponentArtifacts</name>
-				<model id="id-0065-0000000a" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2">
-					<name>entryPoint</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>334,200</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>createNull_ComponentHome_Servant</value>
-					</attribute>
-					<reference id="id-0067-00000005" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<model id="id-0065-0000000b" kind="Property" role="Property" relid="0x4" childrelidcntr="0x2">
-					<name>entryPoint</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>700,432</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>createNull_ComponentHome_Impl</value>
-					</attribute>
-					<reference id="id-0067-00000006" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<atom id="id-0066-0000000d" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x1">
-					<name>Null_Component_stub</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>151,84</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Null_Component_stub</value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-0000000e" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x3">
-					<name>Null_Component_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>517,316</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Null_Component_svnt</value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-0000000f" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x5">
-					<name>Null_Component_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>883,548</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Null_Component_exec</value>
-					</attribute>
-				</atom>
-				<connection id="id-0068-00000007" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x7">
-					<name>ArtifactExecParameter</name>
-					<connpoint role="dst" target="id-0065-0000000a"/>
-					<connpoint role="src" target="id-0066-0000000e"/>
-				</connection>
-				<connection id="id-0068-00000008" kind="ArtifactDependency" role="ArtifactDependency" relid="0x8">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-0000000d"/>
-					<connpoint role="src" target="id-0066-0000000e"/>
-				</connection>
-				<connection id="id-0068-00000009" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x8">
-					<name>ArtifactExecParameter</name>
-					<connpoint role="dst" target="id-0065-0000000b"/>
-					<connpoint role="src" target="id-0066-0000000f"/>
-				</connection>
-				<connection id="id-0068-0000000a" kind="ArtifactDependency" role="ArtifactDependency" relid="0x9">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-0000000e"/>
-					<connpoint role="src" target="id-0066-0000000f"/>
-				</connection>
-				<connection id="id-0068-0000000b" kind="ArtifactDependency" role="ArtifactDependency" relid="0xa">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-0000000d"/>
-					<connpoint role="src" target="id-0066-0000000f"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000006" relid="0x5" childrelidcntr="0x0" kind="ComponentTypes">
-			<name>ComponentTypes</name>
-			<model id="id-0065-0000000c" kind="ComponentContainer" relid="0x1" childrelidcntr="0x1">
-				<name>Null_ComponentContainer</name>
-				<reference id="id-0067-00000007" kind="ComponentRef" role="ComponentRef" relid="0x1" referred="id-0065-00000005">
-					<name>Null_ComponentRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>518,318</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-			</model>
-		</folder>
-		<folder id="id-006a-00000007" relid="0x6" childrelidcntr="0x1" kind="PackageConfigurations">
-			<name>PackageConfigurations</name>
-			<model id="id-0065-00000010" kind="PackageConfigurationContainer" relid="0x1" childrelidcntr="0x6">
-				<name>Default</name>
-				<atom id="id-0066-00000012" kind="PackageConfiguration" role="PackageConfiguration" relid="0x2">
-					<name>PackageConfiguration</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>373,149</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-0000001c" kind="ComponentPackageReference" role="ComponentPackageReference" relid="0x5" referred="id-0066-00000014">
-					<name>Null_Assembly_Package</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>573,146</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="requiredName" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="requiredType" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="requiredUUID" status="meta">
-						<value></value>
-					</attribute>
-				</reference>
-				<connection id="id-0068-00000016" kind="PackageConfReference" role="PackageConfReference" relid="0x6">
-					<name>PackageConfReference</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000012"/>
-					<connpoint role="dst" target="id-0067-0000001c"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000008" relid="0x7" childrelidcntr="0x2" kind="ComponentPackages">
-			<name>ComponentPackages</name>
-			<model id="id-0065-0000000d" kind="PackageContainer" relid="0x1" childrelidcntr="0xa">
-				<name>Null_Component_Package</name>
-				<atom id="id-0066-00000010" kind="ComponentPackage" role="ComponentPackage" relid="0x1">
-					<name>Null_Component_Package</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>366,163</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000010" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x5" referred="id-0066-0000000c">
-					<name>Null_ComponentMonolithicImpl</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>130,158</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000001a" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-00000019">
-					<name>Null_Component</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>545,137</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-0000000e" kind="Implementation" role="Implementation" relid="0x6">
-					<name>Implementation</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>We</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000010"/>
-					<connpoint role="dst" target="id-0067-00000010"/>
-				</connection>
-				<connection id="id-0068-00000014" kind="PackageInterface" role="PackageInterface" relid="0xa">
-					<name>PackageInterface</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000010"/>
-					<connpoint role="dst" target="id-0067-0000001a"/>
-				</connection>
-			</model>
-			<model id="id-0065-0000001a" kind="PackageContainer" relid="0x2" childrelidcntr="0x3">
-				<name>Null_Assembly_Package</name>
-				<atom id="id-0066-00000014" kind="ComponentPackage" role="ComponentPackage" relid="0x1">
-					<name>Null_Assembly_Package</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>282,135</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-0000001b" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x2" referred="id-0065-00000018">
-					<name>Null_Assembly</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>502,110</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000015" kind="Implementation" role="Implementation" relid="0x3">
-					<name>Implementation</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000014"/>
-					<connpoint role="dst" target="id-0067-0000001b"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000009" relid="0x8" childrelidcntr="0x1" kind="DeploymentPlans">
-			<name>DeploymentPlans</name>
-			<model id="id-0065-00000014" kind="DeploymentPlan" relid="0x1" childrelidcntr="0x7">
-				<name>Plan</name>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<reference id="id-0067-00000013" kind="NodeReference" role="NodeReference" relid="0x2" referred="id-0065-00000013">
-					<name>NodeA</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>305,123</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000001d" kind="ComponentRef" role="ComponentRef" relid="0x7" referred="id-0065-00000019">
-					<name>Null_Component</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>475,102</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000013" kind="InstanceMapping" role="InstanceMapping" relid="0x4">
-					<name>InstanceMapping</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>w</value>
-					</regnode>
-					<connpoint role="dst" target="id-0067-00000013"/>
-					<connpoint role="src" target="id-0069-00000001"/>
-				</connection>
-				<set id="id-0069-00000001" kind="CollocationGroup" role="CollocationGroup" relid="0x1" members="id-0067-0000001d">
-					<name>CollocationGroup</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>114,128</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</set>
-			</model>
-		</folder>
-		<folder id="id-006a-0000000a" relid="0x9" childrelidcntr="0x1" kind="Targets">
-			<name>Targets</name>
-			<model id="id-0065-00000012" kind="Domain" relid="0x1" childrelidcntr="0x1">
-				<name>Domain</name>
-				<attribute kind="UUID" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000013" kind="Node" role="Node" relid="0x1" childrelidcntr="0x0">
-					<name>NodeA</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Target" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>198,170</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-0000000b" relid="0xa" childrelidcntr="0x1" kind="TopLevelPackages">
-			<name>TopLevelPackages</name>
-			<model id="id-0065-00000011" kind="TopLevelPackageContainer" relid="0x1" childrelidcntr="0x3">
-				<name>Default</name>
-				<atom id="id-0066-00000013" kind="TopLevelPackage" role="TopLevelPackage" relid="0x1">
-					<name>TopLevelPackage</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>240,184</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</atom>
-				<reference id="id-0067-00000012" kind="PackageConfigurationReference" role="PackageConfigurationReference" relid="0x2" referred="id-0066-00000012">
-					<name>PackageConfiguration</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>517,181</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000012" kind="package" role="package" relid="0x3">
-					<name>package</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>w</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000013"/>
-					<connpoint role="dst" target="id-0067-00000012"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-0000000c" relid="0xb" childrelidcntr="0x0" kind="ComponentBuild">
-			<name>ComponentBuild</name>
-		</folder>
-	</folder>
-</project>
diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/CIAO/examples/Swapping/Receiver/Receiver_exec.h
index df6a6eee581..e05ff6a138f 100644
--- a/CIAO/examples/Swapping/Receiver/Receiver_exec.h
+++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.h
@@ -10,7 +10,7 @@
 #ifndef RECEIVER_EXEC_H
 #define RECEIVER_EXEC_H
 
-#include "ciao/CIAO_SwapExecC.h"
+#include "SwapExecC.h"
 #include "ReceiverEC.h"
 #include "Receiver_exec_export.h"
 #include "tao/LocalObject.h"
@@ -117,7 +117,7 @@ namespace CIDL_Receiver_Impl
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
-
+  
   extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
   createReceiverHome_Impl (void);
 }
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.h b/CIAO/examples/Swapping/Sender/Sender_exec.h
index 75530bd25fc..f1cfaeba5e9 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec.h
+++ b/CIAO/examples/Swapping/Sender/Sender_exec.h
@@ -10,12 +10,12 @@
 #ifndef SENDER_EXEC_H
 #define SENDER_EXEC_H
 
-#include "ciao/CIAO_SwapExecC.h"
+#include "SwapExecC.h"
 #include "SenderEC.h"
 #include "Sender_exec_export.h"
 #include "tao/LocalObject.h"
 #include "ace/DLL.h"
-#include "ciao/CCM_EventsC.h"
+#include "ciao/CCM_EventC.h"
 
 namespace CIDL_Sender_Impl
 {
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.h b/CIAO/examples/Swapping/Sender/Sender_exec_1.h
index 00b6db2e4b0..1d85384db1a 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_1.h
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.h
@@ -10,7 +10,7 @@
 #ifndef SENDER_EXEC_1_H
 #define SENDER_EXEC_1_H
 
-#include "ciao/CIAO_SwapExecC.h"
+#include "SwapExecC.h"
 #include "SenderEC.h"
 #include "Sender_exec_1_export.h"
 #include "tao/LocalObject.h"
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.h b/CIAO/examples/Swapping/Sender/Sender_exec_2.h
index d12bd4594ee..97f49c9a96f 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_2.h
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.h
@@ -10,7 +10,7 @@
 #ifndef SENDER_EXEC_2_H
 #define SENDER_EXEC_2_H
 
-#include "ciao/CIAO_SwapExecC.h"
+#include "SwapExecC.h"
 #include "SenderEC.h"
 #include "Sender_exec_2_export.h"
 #include "tao/LocalObject.h"
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc b/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
index 40927889016..f090b1e8cf6 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
@@ -1,12 +1,11 @@
 // $Id$
 
-project (Multi_Threaded_client) : ciao_client_dnc, valuetype , strategies {
+project (Multi_Threaded_client) : ciao_client_dnc, valuetype , strategies{
   exename = client
   after += RoundTripClient_stub
   libs += RoundTripClient_stub Benchmark_stub
   libpaths += ..
   includes += ../RoundTripClient
-  avoids += ace_for_tao
 
   IDL_Files {
   }
diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.mpc b/CIAO/performance-tests/Protocols/Controller/Controller.mpc
index b857bb7481b..ce70851188d 100644
--- a/CIAO/performance-tests/Protocols/Controller/Controller.mpc
+++ b/CIAO/performance-tests/Protocols/Controller/Controller.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (perf*) : ciao_client_dnc, rtcorba {
+project (perf*) : ciao_client_dnc, rtcorba, exceptions {
   avoids += ace_for_tao
   after += Protocols_Sender_stub Protocols_Receiver_stub
   includes += ../Sender
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.idl b/CIAO/performance-tests/Protocols/Receiver/Receiver.idl
index ca2ed444513..b00e844cbe2 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.idl
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.idl
@@ -1,6 +1,5 @@
 // $Id$
 
-#include <Components.idl>
 #include "../common/Protocols.idl"
 
 module Protocols
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index a87f99d602f..1cbf85b801a 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -1,17 +1,12 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Receiver"
 
-project(Protocols_Receiver_stub): ciao_client_dnc {
+project(Protocols_Receiver_stub): ciao_client_dnc, exceptions {
   avoids += ace_for_tao
   libs += Protocols_stub
   after += Protocols_stub
   sharedname = Protocols_Receiver_stub
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h
+  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export -Wb,stub_export_include=Receiver_stub_export.h -Wb,skel_export_macro=RECEIVER_SVNT_Export -Wb,skel_export_include=Receiver_svnt_export.h
   dynamicflags   = RECEIVER_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,21 +16,14 @@ project(Protocols_Receiver_stub): ciao_client_dnc {
   Source_Files {
     ReceiverC.cpp
   }
-
-  Header_Files {
-    Receiver_stub_export.h
-  }
 }
 
-project(Protocols_Receiver_svnt) : ciao_servant_dnc {
+project(Protocols_Receiver_svnt) : ciao_servant_dnc, exceptions {
   avoids += ace_for_tao
-  after += Protocols_skel Protocols_Receiver_stub
+  after += Protocols_svnt Protocols_Receiver_stub
   sharedname  = Protocols_Receiver_svnt
-  libs    += Protocols_Receiver_stub Protocols_stub Protocols_skel
-  idlflags -= -GT
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=RECEIVER_SVNT_Export \
-                -Wb,export_include=Receiver_svnt_export.h
+  libs    += Protocols_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
 
   CIDL_Files {
@@ -51,18 +39,15 @@ project(Protocols_Receiver_svnt) : ciao_servant_dnc {
     ReceiverS.cpp
     Receiver_svnt.cpp
   }
-
-  Header_Files {
-    Receiver_svnt_export.h
-  }
 }
 
 
-project(Protocols_Receiver_exec) : ciao_component_dnc {
+project(Protocols_Receiver_exec) : ciao_component_dnc, exceptions {
   avoids += ace_for_tao
   after   += Protocols_Receiver_svnt
   sharedname = Protocols_Receiver_exec
-  libs      += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_skel
+  libs      += Protocols_Receiver_stub Protocols_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
 
   IDL_Files {
@@ -71,10 +56,6 @@ project(Protocols_Receiver_exec) : ciao_component_dnc {
   Source_Files {
     Receiver_exec.cpp
   }
-
-  Header_Files {
-    Receiver_exec_export.h
-  }
 }
 
 
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.idl b/CIAO/performance-tests/Protocols/Sender/Sender.idl
index 200eaa0350a..e76f0922215 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.idl
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.idl
@@ -1,6 +1,5 @@
 // $Id$
 
-#include <Components.idl>
 #include "../common/Protocols.idl"
 
 module Protocols
@@ -13,8 +12,8 @@ module Protocols
         THROUGHPUT,
         LATENCY
       };
-
-    void start (in unsigned long iterations,
+    
+    void start (in unsigned long iterations, 
                 in unsigned long invocation_rate,
                 in boolean count_missed_end_deadlines,
                 in boolean do_dump_history,
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 2f65f552b5b..9382dd63289 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -1,17 +1,12 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Sender"
 
-project(Protocols_Sender_stub): ciao_client_dnc {
+project(Protocols_Sender_stub): ciao_client_dnc, exceptions {
   avoids += ace_for_tao
   libs += Protocols_stub
   after += Protocols_stub
   sharedname = Protocols_Sender_stub
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h
+  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export -Wb,stub_export_include=Sender_stub_export.h -Wb,skel_export_macro=SENDER_SVNT_Export -Wb,skel_export_include=Sender_svnt_export.h
   dynamicflags   = SENDER_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,21 +16,14 @@ project(Protocols_Sender_stub): ciao_client_dnc {
   Source_Files {
     SenderC.cpp
   }
-
-  Header_Files {
-    Sender_stub_export.h
-  }
 }
 
-project(Protocols_Sender_svnt) : ciao_servant_dnc {
+project(Protocols_Sender_svnt) : ciao_servant_dnc, exceptions {
   avoids += ace_for_tao
-  after += Protocols_skel Protocols_Sender_stub
+  after += Protocols_svnt Protocols_Sender_stub
   sharedname  = Protocols_Sender_svnt
-  libs    += Protocols_Sender_stub Protocols_stub Protocols_skel
-  idlflags -= -GT
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=SENDER_SVNT_Export \
-                -Wb,export_include=Sender_svnt_export.h
+  libs    += Protocols_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
 
   CIDL_Files {
@@ -51,19 +39,16 @@ project(Protocols_Sender_svnt) : ciao_servant_dnc {
     SenderS.cpp
     Sender_svnt.cpp
   }
-
-  Header_Files {
-    Sender_svnt_export.h
-  }
 }
 
 
-project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba {
+project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba, exceptions {
   avoids += ace_for_tao
   after   += Protocols_Sender_svnt
   sharedname = Protocols_Sender_exec
-  libs      += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_skel
-  includes += $(TAO_ROOT)/tests/RTCORBA/Diffserv
+  libs      += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_svnt
+  includes += ../../../../tests/RTCORBA/Diffserv
+  idlflags  +=  -Wb,export_macro=SENDER_EXEC_Export -Wb,export_include=Sender_exec_export.h
   dynamicflags   = SENDER_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -72,10 +57,6 @@ project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba {
   Source_Files {
     Sender_exec.cpp
   }
-
-  Header_Files {
-    Sender_exec_export.h
-  }
 }
 
 
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.idl b/CIAO/performance-tests/Protocols/common/Protocols.idl
index f7f584e9fff..580167f57b3 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.idl
+++ b/CIAO/performance-tests/Protocols/common/Protocols.idl
@@ -1,5 +1,7 @@
 // $Id$
 
+#include <Components.idl>
+
 module Protocols
 {
   interface test
@@ -15,15 +17,15 @@ module Protocols
     oneway void oneway_sync ();
 
     void twoway_sync ();
-
+  
     typedef sequence<octet> octets;
 
     oneway void oneway_method (in long session_id,
                                in unsigned long iteration,
                                in octets payload);
-
+  
     void twoway_method (inout long session_id,
                         inout unsigned long iteration,
-                        inout octets payload);
+                        inout octets payload);  
   };
 };
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.mpc b/CIAO/performance-tests/Protocols/common/Protocols.mpc
index e7dc5609bc2..1b3b8957da1 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -1,14 +1,10 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Protocols"
 
-project(Protocols_stub): taolib_with_idl {
+project(Protocols_stub): ciao_client_dnc {
 
   sharedname = Protocols_stub
-  idlflags += -St \
-              -Wb,stub_export_macro=PROTOCOLS_STUB_Export \
-              -Wb,stub_export_include=Protocols_stub_export.h \
-              -Wb,skel_export_macro=PROTOCOLS_SKEL_Export \
-              -Wb,skel_export_include=Protocols_skel_export.h
+  idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export -Wb,stub_export_include=Protocols_stub_export.h -Wb,skel_export_macro=PROTOCOLS_SVNT_Export -Wb,skel_export_include=Protocols_svnt_export.h
   dynamicflags   = PROTOCOLS_STUB_BUILD_DLL
 
   IDL_Files {
@@ -18,23 +14,15 @@ project(Protocols_stub): taolib_with_idl {
   Source_Files {
     ProtocolsC.cpp
   }
-
-  Header_Files {
-    Protocols_stub_export.h
-  }
 }
 
-project(Protocols_skel) : portableserver {
+project(Protocols_svnt) : ciao_servant_dnc {
   after +=  Protocols_stub
-  sharedname  = Protocols_skel
+  sharedname  = Protocols_svnt
   libs    += Protocols_stub
 
-  idlflags += -St \
-              -Wb,stub_export_macro=PROTOCOLS_STUB_Export \
-              -Wb,stub_export_include=Protocols_stub_export.h \
-              -Wb,skel_export_macro=PROTOCOLS_SKEL_Export \
-              -Wb,skel_export_include=Protocols_skel_export.h
-  dynamicflags = PROTOCOLS_SKEL_BUILD_DLL
+  idlflags  +=  -Wb,export_macro=PROTOCOLS_SVNT_Export -Wb,export_include=Protocols_svnt_export.h
+  dynamicflags = PROTOCOLS_SVNT_BUILD_DLL
 
   IDL_Files {
     Protocols.idl
@@ -43,10 +31,6 @@ project(Protocols_skel) : portableserver {
   Source_Files {
     ProtocolsS.cpp
   }
-
-  Header_Files {
-    Protocols_skel_export.h
-  }
 }
 
 
diff --git a/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h b/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h
deleted file mode 100644
index 38692d63f09..00000000000
--- a/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl PROTOCOLS_SVNT
-// ------------------------------
-#ifndef PROTOCOLS_SKEL_EXPORT_H
-#define PROTOCOLS_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PROTOCOLS_SKEL_HAS_DLL)
-#  define PROTOCOLS_SKEL_HAS_DLL 1
-#endif /* ! PROTOCOLS_SKEL_HAS_DLL */
-
-#if defined (PROTOCOLS_SKEL_HAS_DLL) && (PROTOCOLS_SKEL_HAS_DLL == 1)
-#  if defined (PROTOCOLS_SKEL_BUILD_DLL)
-#    define PROTOCOLS_SKEL_Export ACE_Proper_Export_Flag
-#    define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PROTOCOLS_SKEL_BUILD_DLL */
-#    define PROTOCOLS_SKEL_Export ACE_Proper_Import_Flag
-#    define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PROTOCOLS_SKEL_BUILD_DLL */
-#else /* PROTOCOLS_SKEL_HAS_DLL == 1 */
-#  define PROTOCOLS_SKEL_Export
-#  define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T)
-#  define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PROTOCOLS_SKEL_HAS_DLL == 1 */
-
-// Set PROTOCOLS_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PROTOCOLS_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PROTOCOLS_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PROTOCOLS_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PROTOCOLS_SKEL_NTRACE */
-
-#if (PROTOCOLS_SKEL_NTRACE == 1)
-#  define PROTOCOLS_SKEL_TRACE(X)
-#else /* (PROTOCOLS_SKEL_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PROTOCOLS_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PROTOCOLS_SKEL_NTRACE == 1) */
-
-#endif /* PROTOCOLS_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/performance-tests/Protocols/common/Protocols_svnt_export.h b/CIAO/performance-tests/Protocols/common/Protocols_svnt_export.h
new file mode 100644
index 00000000000..4e64a47f821
--- /dev/null
+++ b/CIAO/performance-tests/Protocols/common/Protocols_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PROTOCOLS_SVNT
+// ------------------------------
+#ifndef PROTOCOLS_SVNT_EXPORT_H
+#define PROTOCOLS_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PROTOCOLS_SVNT_HAS_DLL)
+#  define PROTOCOLS_SVNT_HAS_DLL 1
+#endif /* ! PROTOCOLS_SVNT_HAS_DLL */
+
+#if defined (PROTOCOLS_SVNT_HAS_DLL) && (PROTOCOLS_SVNT_HAS_DLL == 1)
+#  if defined (PROTOCOLS_SVNT_BUILD_DLL)
+#    define PROTOCOLS_SVNT_Export ACE_Proper_Export_Flag
+#    define PROTOCOLS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PROTOCOLS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PROTOCOLS_SVNT_BUILD_DLL */
+#    define PROTOCOLS_SVNT_Export ACE_Proper_Import_Flag
+#    define PROTOCOLS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PROTOCOLS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PROTOCOLS_SVNT_BUILD_DLL */
+#else /* PROTOCOLS_SVNT_HAS_DLL == 1 */
+#  define PROTOCOLS_SVNT_Export
+#  define PROTOCOLS_SVNT_SINGLETON_DECLARATION(T)
+#  define PROTOCOLS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PROTOCOLS_SVNT_HAS_DLL == 1 */
+
+// Set PROTOCOLS_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PROTOCOLS_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PROTOCOLS_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PROTOCOLS_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PROTOCOLS_SVNT_NTRACE */
+
+#if (PROTOCOLS_SVNT_NTRACE == 1)
+#  define PROTOCOLS_SVNT_TRACE(X)
+#else /* (PROTOCOLS_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PROTOCOLS_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PROTOCOLS_SVNT_NTRACE == 1) */
+
+#endif /* PROTOCOLS_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index 1cd931b2d71..41501f86b1e 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -6,12 +6,7 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
   libpaths += ../interfaces
   libs     += ENW_stub
   sharedname = TSEC_CheckPoint_stub
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export \
-              -Wb,stub_export_include=TSEC_CheckPoint_stub_export.h \
-              -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export \
-              -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h
+  idlflags += -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export -Wb,stub_export_include=TSEC_CheckPoint_stub_export.h -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h
   dynamicflags   = TSEC_CHECKPOINT_STUB_BUILD_DLL
 
   IDL_Files {
@@ -26,16 +21,13 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
 project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
   avoids += ace_for_tao
   after +=  TSEC_CheckPoint_stub
-  after +=  ENW_skel ENW_stub
+  after +=  ENW_svnt ENW_stub
   sharedname  = TSEC_CheckPoint_svnt
   libpaths += ../interfaces
   libs     += TSEC_CheckPoint_stub
-  libs     += ENW_stub ENW_skel
+  libs     += ENW_stub ENW_svnt
 
-  idlflags -= -GT
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=TSEC_CHECKPOINT_SVNT_Export \
-                -Wb,export_include=TSEC_CheckPoint_svnt_export.h
+  idlflags  +=  -Wb,export_macro=TSEC_CHECKPOINT_SVNT_Export -Wb,export_include=TSEC_CheckPoint_svnt_export.h
   dynamicflags = TSEC_CHECKPOINT_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -57,19 +49,16 @@ project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
 project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
   avoids += ace_for_tao
   after   += TSEC_CheckPoint_svnt
-  after   += ENW_skel ENW_stub
+  after   += ENW_svnt ENW_stub
 
   includes   += ../interfaces 
 
   sharedname = TSEC_CheckPoint_exec
   libpaths  += ../interfaces 
   libs      += TSEC_CheckPoint_stub TSEC_CheckPoint_svnt
-  libs      += ENW_stub ENW_skel CIAO_DnC_Server TAO_CosNaming
+  libs      += ENW_stub ENW_svnt CIAO_DnC_Server TAO_CosNaming
 
-  idlflags  -= -GT
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=TSEC_CHECKPOINT_EXEC_Export \
-                -Wb,export_include=TSEC_CheckPoint_exec_export.h
+  idlflags  +=  -Wb,export_macro=TSEC_CHECKPOINT_EXEC_Export -Wb,export_include=TSEC_CheckPoint_exec_export.h
   dynamicflags   = TSEC_CHECKPOINT_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
index 22227109f39..606ec1a67c9 100644
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
@@ -3,11 +3,7 @@
 project(ENW_stub): ciao_client_dnc, event {
 
   sharedname = ENW_stub
-  idlflags -= -GT
-  idlflags += -Wb,stub_export_macro=ENW_STUB_Export \
-              -Wb,stub_export_include=ENW_stub_export.h \
-              -Wb,skel_export_macro=ENW_SKEL_Export \
-              -Wb,skel_export_include=ENW_skel_export.h
+  idlflags += -Wb,stub_export_macro=ENW_STUB_Export -Wb,stub_export_include=ENW_stub_export.h -Wb,skel_export_macro=ENW_SVNT_Export -Wb,skel_export_include=ENW_svnt_export.h
   dynamicflags   = ENW_STUB_BUILD_DLL
 
   IDL_Files {
@@ -19,21 +15,12 @@ project(ENW_stub): ciao_client_dnc, event {
   }
 }
 
-project(ENW_skel) : ciao_servant_dnc, event {
+project(ENW_svnt) : ciao_servant_dnc, event {
   after +=  ENW_stub
-  sharedname  = ENW_skel
+  sharedname  = ENW_svnt
   libs    += ENW_stub
-  idlflags -= -GT
-  idlflags += -Wb,stub_export_macro=ENW_STUB_Export \
-              -Wb,stub_export_include=ENW_stub_export.h \
-              -Wb,skel_export_macro=ENW_SKEL_Export \
-              -Wb,skel_export_include=ENW_skel_export.h
 
-  dynamicflags = ENW_SKEL_BUILD_DLL
-
-  IDL_Files {
-    ENW.idl
-  }
+  dynamicflags = ENW_SVNT_BUILD_DLL
 
   Source_Files {
     ENWS.cpp
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h
deleted file mode 100644
index 05e87fade4b..00000000000
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ENW_SVNT
-// ------------------------------
-#ifndef ENW_SKEL_EXPORT_H
-#define ENW_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (ENW_SKEL_HAS_DLL)
-#  define ENW_SKEL_HAS_DLL 1
-#endif /* ! ENW_SKEL_HAS_DLL */
-
-#if defined (ENW_SKEL_HAS_DLL) && (ENW_SKEL_HAS_DLL == 1)
-#  if defined (ENW_SKEL_BUILD_DLL)
-#    define ENW_SKEL_Export ACE_Proper_Export_Flag
-#    define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ENW_SKEL_BUILD_DLL */
-#    define ENW_SKEL_Export ACE_Proper_Import_Flag
-#    define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ENW_SKEL_BUILD_DLL */
-#else /* ENW_SKEL_HAS_DLL == 1 */
-#  define ENW_SKEL_Export
-#  define ENW_SKEL_SINGLETON_DECLARATION(T)
-#  define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ENW_SKEL_HAS_DLL == 1 */
-
-// Set ENW_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ENW_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ENW_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ENW_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ENW_SKEL_NTRACE */
-
-#if (ENW_SKEL_NTRACE == 1)
-#  define ENW_SKEL_TRACE(X)
-#else /* (ENW_SKEL_NTRACE == 1) */
-#  define ENW_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (ENW_SKEL_NTRACE == 1) */
-
-#endif /* ENW_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h
new file mode 100644
index 00000000000..2e4b7580702
--- /dev/null
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl ENW_SVNT
+// ------------------------------
+#ifndef ENW_SVNT_EXPORT_H
+#define ENW_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (ENW_SVNT_HAS_DLL)
+#  define ENW_SVNT_HAS_DLL 1
+#endif /* ! ENW_SVNT_HAS_DLL */
+
+#if defined (ENW_SVNT_HAS_DLL) && (ENW_SVNT_HAS_DLL == 1)
+#  if defined (ENW_SVNT_BUILD_DLL)
+#    define ENW_SVNT_Export ACE_Proper_Export_Flag
+#    define ENW_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ENW_SVNT_BUILD_DLL */
+#    define ENW_SVNT_Export ACE_Proper_Import_Flag
+#    define ENW_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ENW_SVNT_BUILD_DLL */
+#else /* ENW_SVNT_HAS_DLL == 1 */
+#  define ENW_SVNT_Export
+#  define ENW_SVNT_SINGLETON_DECLARATION(T)
+#  define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ENW_SVNT_HAS_DLL == 1 */
+
+// Set ENW_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (ENW_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define ENW_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define ENW_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !ENW_SVNT_NTRACE */
+
+#if (ENW_SVNT_NTRACE == 1)
+#  define ENW_SVNT_TRACE(X)
+#else /* (ENW_SVNT_NTRACE == 1) */
+#  define ENW_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (ENW_SVNT_NTRACE == 1) */
+
+#endif /* ENW_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/tests/IDL3/Events/Any/Any.mpc b/CIAO/tests/IDL3/Events/Any/Any.mpc
deleted file mode 100644
index d0b72182ca1..00000000000
--- a/CIAO/tests/IDL3/Events/Any/Any.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-project(EventAny_local): ciao_client_dnc {
-  exename = EventAny
-  idlflags += -SS
-
-  IDL_Files {
-    EventAny.idl
-  }
-  
-  Source_Files {
-    EventAnyC.cpp
-    main.cpp
-  }
-  
-  Header_Files {
-    EventAnyC.h
-  }
-  
-  Inline_Files {
-    EventAnyC.inl
-  }
-  
-  Template_Files {
-  }
-}
diff --git a/CIAO/tests/IDL3/Events/Any/EventAny.idl b/CIAO/tests/IDL3/Events/Any/EventAny.idl
deleted file mode 100644
index d53ddf55c08..00000000000
--- a/CIAO/tests/IDL3/Events/Any/EventAny.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-/**
- * @file EventAny.idl
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- *
- * Tests Any insertion/extraction of event types,
- * and (de)marshaling of such Anys.
- */
-
-#include <Components.idl>
-
-eventtype StringMsg
-{
-  public string str_msg;
-};
-
diff --git a/CIAO/tests/IDL3/Events/Any/README b/CIAO/tests/IDL3/Events/Any/README
deleted file mode 100644
index 7bf91be5776..00000000000
--- a/CIAO/tests/IDL3/Events/Any/README
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Event Any Test
-=======================
-
-This test defines, instantiates, and initializes an IDL
-eventtype with a public string member, inserts it into
-an Any, marshals the Any, demarshals the Any, extracts
-the eventtype, and compares the resulting member string
-with the original. The purpose of the test is to ensure
-that (1) the demarshaling of the Any and (2) the
-extraction of the eventtype, are successful, since both
-these actions are done interpretively by traversing the
-eventtype's type code. The motivation for the test was
-the failure of these actions due to missing cases in
-the interpretive demarshaling code corresponding to
-the kind of the eventtype's type code (CORBA::tk_event).
-
-There are several places the test can fail:
-
-- marshaling of the Any
-- demarshaling of the Any
-- extraction from the Any
-- string compare of the sent and received eventtype members
-
-Note that the test code registers a valuetype factory
-with the orb, a necessary step in extracting the
-eventtype from the Any. In a real-world use case (such
-as an event channel) such a factory would have to
-be registered with the orb anywhere the eventtype is
-to be demarshaled from a CDR stream or extracted from
-an Any that was itself demarshaled.
-
-Jeff Parsons
-
-
diff --git a/CIAO/tests/IDL3/Events/Any/main.cpp b/CIAO/tests/IDL3/Events/Any/main.cpp
deleted file mode 100644
index d59f9fec0d4..00000000000
--- a/CIAO/tests/IDL3/Events/Any/main.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-
-#include "EventAnyC.h"
-#include "ace/Get_Opt.h"
-
-void
-insert_into_any (CORBA::Any& any, Components::EventBase* vb)
-{
-  any <<= vb;
-}
-
-void
-debug_msg (const char *msg)
-{
-  ACE_ERROR ((LM_ERROR, "Error: %s\n", msg));
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
-      StringMsg_init *StringMsg_factory = new StringMsg_init;
-
-      orb->register_value_factory (StringMsg_factory->tao_repository_id (),
-                                   StringMsg_factory);
-      StringMsg_factory->_remove_ref (); // release ownership
-
-      const char *test_str = "a message";
-
-      StringMsg_var ev = new OBV_StringMsg;
-      ev->str_msg (test_str);
-
-      CORBA::Any in_any;
-      insert_into_any (in_any, ev.in ());
-
-      TAO_OutputCDR out;
-      CORBA::Boolean good = out << in_any;
-
-      if (!good)
-        {
-          debug_msg ("Any marshaling failed");
-          return -1;
-        }
-
-      TAO_InputCDR in (out);
-      CORBA::Any out_any;
-      good = in >> out_any;
-
-      if (!good)
-        {
-          debug_msg ("Any demarshaling failed");
-          return -1;
-        }
-
-      StringMsg *ev_out = 0;
-      good = out_any >>= ev_out;
-
-      if (!good)
-        {
-          debug_msg ("Any extraction failed");
-          return -1;
-        }
-
-      const char *result_str = ev_out->str_msg ();
-
-      if (result_str == 0 || ACE_OS::strcmp (result_str, test_str) != 0)
-        {
-          debug_msg ("Extracted member string null or incorrect");
-          return -1;
-        }
-
-      orb->destroy ();
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
diff --git a/CIAO/tests/IDL3/Events/Any/run_test.pl b/CIAO/tests/IDL3/Events/Any/run_test.pl
deleted file mode 100755
index f13f9726b5b..00000000000
--- a/CIAO/tests/IDL3/Events/Any/run_test.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-# The first three lines above let this script run without specifying the
-# full path to perl, as long as it is in the user's PATH.
-# Taken from perlrun man page.
-
-# Do not use environment variables here since not all platforms use ACE_ROOT
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-use English;
-
-$status = 0;
-$exflags = "";
-
-# Run the test
-
-$EX = new PerlACE::Process ("EventAny");
-$EX->Arguments ($exflags);
-$test = $EX->SpawnWaitKill (10);
-
-if ($test != 0) {
-    print STDERR "ERROR: test error status $test\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/CIAO/tests/IDL3/Events/Regular/Regular.mpc
index 1ff6519f0ca..b654e690bae 100644
--- a/CIAO/tests/IDL3/Events/Regular/Regular.mpc
+++ b/CIAO/tests/IDL3/Events/Regular/Regular.mpc
@@ -4,10 +4,7 @@
 project(Regular_stub): ciao_client_dnc {
 
   sharedname = Regular_stub
-  idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export \
-              -Wb,stub_export_include=Regular_stub_export.h \
-              -Wb,skel_export_macro=REGULAR_SVNT_Export \
-              -Wb,skel_export_include=Regular_svnt_export.h
+  idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export -Wb,stub_export_include=Regular_stub_export.h -Wb,skel_export_macro=REGULAR_SVNT_Export -Wb,skel_export_include=Regular_svnt_export.h
   dynamicflags   = REGULAR_STUB_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc b/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
index ca32b465573..e91274525a4 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
+++ b/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
@@ -2,20 +2,20 @@
 // $Id$
 
 project(ConvertIDL3) : taoidl3toidl2defaults, ciao_component_dnc {
-  idlflags += -Sm
-
+  idlflags += -Sc -Sm
+  
   IDL3TOIDL2_Files {
     convert.idl
     include.idl
     pass_through.idl
   }
-
+  
   IDL_Files {
     convert_IDL2.idl
     include_IDL2.idl
     pass_through_IDL2.idl << include_IDL2.idl
   }
-
+  
   Source_Files {
     convert_IDL2C.cpp
     convert_IDL2S.cpp
diff --git a/CIAO/tests/IDL3/Lookup/lookup_test.mpc b/CIAO/tests/IDL3/Lookup/lookup_test.mpc
index 1449c788ea1..9cec290e5a1 100644
--- a/CIAO/tests/IDL3/Lookup/lookup_test.mpc
+++ b/CIAO/tests/IDL3/Lookup/lookup_test.mpc
@@ -3,6 +3,7 @@
 project(LookupTest_stub): ciao_client_dnc {
 
   sharedname = LookupTest_stub
+  idlflags += -Sc
 
   IDL_Files {
     lookup_test.idl
diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc b/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
index 3862be24788..2262a8485bd 100644
--- a/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
+++ b/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
@@ -4,7 +4,8 @@
 project(Minimum_Base_DnC_stub): ciao_client_dnc {
 
   sharedname = Minimum_Base_DnC_stub
-  idlflags += -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
               -Wb,stub_export_include=Minimum_Base_stub_export.h \
               -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \
               -Wb,skel_export_include=Minimum_Base_svnt_export.h
@@ -32,7 +33,8 @@ project(Minimum_Base_DnC_svnt) : ciao_servant_dnc {
   sharedname  = Minimum_Base_DnC_svnt
   libs    += Minimum_Base_DnC_stub
 
-  idlflags  += -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
+  idlflags  += -Sc \
+               -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
                -Wb,stub_export_include=Minimum_Base_stub_export.h \
                -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \
                -Wb,skel_export_include=Minimum_Base_svnt_export.h
diff --git a/CIAO/tests/Minimum/Receiver/Receiver.mpc b/CIAO/tests/Minimum/Receiver/Receiver.mpc
index 268e8cca925..0fc995db8e8 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -5,7 +5,8 @@ project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc {
   avoids += ace_for_tao
   after += Minimum_Base_DnC_stub
   sharedname = Minimum_Receiver_DnC_stub
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=RECEIVER_SVNT_Export \
               -Wb,skel_export_include=Receiver_svnt_export.h
@@ -19,11 +20,11 @@ project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc {
   Source_Files {
     ReceiverC.cpp
   }
-
+  
   Header_Files {
     ReceiverC.h
   }
-
+  
   Inline_Files {
     ReceiverC.inl
   }
@@ -37,8 +38,9 @@ project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
   libs    += Minimum_Receiver_DnC_stub \
              Minimum_Base_DnC_stub \
              Minimum_Base_DnC_svnt
-
-  idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export \
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=RECEIVER_SVNT_Export \
                 -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
@@ -77,8 +79,9 @@ project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc {
                Minimum_Receiver_DnC_svnt \
                Minimum_Base_DnC_stub \
                Minimum_Base_DnC_svnt
-
-  idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export \
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=RECEIVER_EXEC_Export \
                 -Wb,export_include=Receiver_exec_export.h
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
@@ -88,10 +91,10 @@ project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Receiver_exec.cpp
   }
-
+  
   Header_Files {
   }
-
+  
   Inline_Files {
   }
 }
diff --git a/CIAO/tests/Minimum/Sender/Sender.mpc b/CIAO/tests/Minimum/Sender/Sender.mpc
index a0acee45fbc..583a980b793 100644
--- a/CIAO/tests/Minimum/Sender/Sender.mpc
+++ b/CIAO/tests/Minimum/Sender/Sender.mpc
@@ -5,7 +5,8 @@ project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc {
   avoids += ace_for_tao
   after += Minimum_Base_DnC_stub
   sharedname = Minimum_Sender_DnC_stub
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
+  idlflags += -Sc \
+              -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
               -Wb,skel_export_macro=SENDER_SVNT_Export \
               -Wb,skel_export_include=Sender_svnt_export.h
@@ -19,11 +20,11 @@ project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc {
   Source_Files {
     SenderC.cpp
   }
-
+  
   Header_Files {
     SenderC.h
   }
-
+  
   Inline_Files {
     SenderC.inl
   }
@@ -38,7 +39,8 @@ project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc {
           Minimum_Base_DnC_stub \
           Minimum_Base_DnC_svnt
 
-  idlflags  +=  -Wb,export_macro=SENDER_SVNT_Export \
+  idlflags  +=  -Sc \
+                -Wb,export_macro=SENDER_SVNT_Export \
                 -Wb,export_include=Sender_svnt_export.h
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
@@ -55,13 +57,13 @@ project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc {
     SenderS.cpp
     Sender_svnt.cpp
   }
-
+  
   Header_Files {
     SenderEC.h
     SenderS.h
     Sender_svnt.h
   }
-
+  
   Inline_Files {
     SenderEC.inl
     SenderS.inl
@@ -77,7 +79,8 @@ project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc {
                Minimum_Base_DnC_stub \
                Minimum_Base_DnC_svnt
 
-  idlflags  +=  -Wb,export_macro=SENDER_EXEC_Export \
+  idlflags  +=  -Sc \
+                -Wb,export_macro=SENDER_EXEC_Export \
                 -Wb,export_include=Sender_exec_export.h
   dynamicflags   = SENDER_EXEC_BUILD_DLL
 
@@ -87,7 +90,7 @@ project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Sender_exec.cpp
   }
-
+  
   Header_Files {
     Sender_exec.h
   }
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
index 692b6b940d0..590ec9e7420 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
@@ -57,7 +57,7 @@ namespace CIAO
 
       enum Value
       {
-        EC_l,RTEC_l,NOTIFY_l,RTNOTIFY_l
+        EC_l,RTEC_l,NOTIFY_l,RTNOTIFY_l,
       };
 
 
@@ -268,7 +268,7 @@ namespace CIAO
 
       enum Value
       {
-        CONJUNCTION_l,DISJUNCTION_l,LOGICAL_AND_l,NEGATE_l
+        CONJUNCTION_l,DISJUNCTION_l,LOGICAL_AND_l,NEGATE_l,
       };
 
 
diff --git a/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index be3a4f289aa..de34a519bf2 100644
--- a/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -1,6 +1,6 @@
 //$Id$
 
-project (XSC_XML_Handlers) : acelib, xerces {
+project (XSC_XML_Handlers) : acelib, xerces, exceptions {
   sharedname    += XSC_XML_Handlers
   dynamicflags  = XSC_XML_HANDLERS_BUILD_DLL
   macros       += XML_USE_PTHREADS
diff --git a/CIAO/tools/Config_Handlers/DD_Handler.cpp b/CIAO/tools/Config_Handlers/DD_Handler.cpp
index d6de22ee29e..e3e6b4e7626 100644
--- a/CIAO/tools/Config_Handlers/DD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DD_Handler.cpp
@@ -5,7 +5,7 @@
 #include "DD_Handler.h"
 #include "Any_Handler.h"
 #include "Deployment.hpp"
-#include "ciao/Deployment_TargetDataC.h"
+#include "ciao/Deployment_BaseC.h"
 #include "CIAO_common.h"
 
 using namespace std;
diff --git a/CIAO/tools/Config_Handlers/DD_Handler.h b/CIAO/tools/Config_Handlers/DD_Handler.h
index 7c77d0f6b54..89aef35182d 100644
--- a/CIAO/tools/Config_Handlers/DD_Handler.h
+++ b/CIAO/tools/Config_Handlers/DD_Handler.h
@@ -46,25 +46,35 @@ public:
 class NoDomain {};
 
 /**
-* @param file The file to be read
+* @operation constructor
+*
+* @param The file to be read
 */
 DD_Handler (const ACE_TCHAR *file);
 
 /**
+* @operation constructor
+*
 * @param dmn The Domain structure
 */
 DD_Handler(Domain *dmn);
 
 /**
+* @operation constructor
+*
 * @param dmn The Deployment::Domain structure
 */
 DD_Handler(::Deployment::Domain *dmn);
 
 /**
+* @operation destructor
+*
 */
 ~DD_Handler (void);
 
 /**
+* @operation domain_idl
+*
 * @brief Returns the const IDL domain
 * @return Domain* the IDL domain pointer
 */
@@ -72,6 +82,8 @@ DD_Handler(::Deployment::Domain *dmn);
 throw (NoDomain);
 
 /**
+* @operation domain_idl
+*
 * @brief Returns the IDL domain
 * @return Domain* the IDL domain pointer
 */
@@ -79,6 +91,8 @@ throw (NoDomain);
 throw (NoDomain);
 
 /**
+* @operation domain_xsc
+*
 * @brief Returns the const XSC domain
 * @return Domain* the XSC domain pointer
 */
@@ -86,6 +100,8 @@ Domain const *domain_xsc (void) const
 throw (NoDomain);
 
 /**
+* @operation domain_xsc
+*
 * @brief Returns the XSC domain
 * @return Domain* the XSC domain pointer
 */
@@ -94,11 +110,15 @@ throw (NoDomain);
 
 private:
 /**
+*  @operation build_domain
+*
 *  @brief builds the domain structure
 */
 bool build_domain ();
 
 /**
+*  @operation build_xsc
+*
 *  @brief builds the XSC data structure
 */
 bool build_xsc ();
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index 4b3476e15f6..050f0307344 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -736,6 +736,16 @@ namespace Deployment
     dump_sequence ("configProperty", pc.configProperty);
   }
 
+  // Requirement Satisfier
+  void DnC_Dump::dump (const Deployment::RequirementSatisfier& rs)
+  {
+    Dump_Obj dump_obj("RequirementSatisfier");
+
+    dump ("name", rs.name);
+    dump ("resourceType", rs.resourceType);
+    dump_sequence ("property", rs.property);
+  }
+
   // Property
   void DnC_Dump::dump (const Deployment::Property& property)
   {
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.h b/CIAO/tools/Config_Handlers/DnC_Dump.h
index ae8b587ff62..d80d4a4af15 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.h
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.h
@@ -13,7 +13,6 @@
 #include /**/ "ace/pre.h"
 
 #include "ciao/DeploymentC.h"
-#include "ciao/Deployment_TargetDataC.h"
 #include "Config_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -141,6 +140,8 @@ static void dump(const ResourceDeploymentDescription &rdd);
 
 static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
 
+static void dump (const Deployment::RequirementSatisfier& rs);
+
 private:
 static void dump (const ::CORBA::Any &any);
 // Helper function to print an Any
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
index 7cc9a0de2b5..60095581130 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
@@ -1,18 +1,19 @@
 // $Id$
 
-project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, ciao_client_dnc {
-  after += XSC_XML_Handlers
-  libs += XSC_XML_Handlers
-  dynamicflags += DYNANY_HANDLER_BUILD_DLL
-  macros += XML_USE_PTHREADS
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
+project (XSC_DynAny_Handler) : taolib, xerces, dynamicany, anytypecode, typecodefactory, ciao_client_dnc {
+after += XSC_XML_Handlers
+libs += XSC_XML_Handlers
+dynamicflags += DYNANY_HANDLER_BUILD_DLL
+macros += XML_USE_PTHREADS
+requires += exceptions
+includes += $(CIAO_ROOT)/tools/Config_Handlers
 
-  Source_Files {
-    DynAny_Handler/DynAny_Handler.cpp
-    DynAny_Handler/DynEnum_Handler.cpp
-  }
+Source_Files {
+DynAny_Handler/DynAny_Handler.cpp
+DynAny_Handler/DynEnum_Handler.cpp
+}
 
-  Header_Files {
-    DynAny_Handler_Export.h
-  }
+Header_Files {
+DynAny_Handler_Export.h
+}
 }
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index a45c92e8465..dbc0f212348 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
@@ -4,7 +4,7 @@
 #include "Package_Handlers/CID_Handler.h"
 #include "Package_Handlers/Comp_Intf_Descr_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "ciao/Packaging_DataC.h"
 #include "Deployment.hpp"
 #include "Utils/Exceptions.h"
 #include "Property_Handler.h"
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
index 61c85827472..c0010429df6 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
@@ -2,6 +2,7 @@
 #include "Package_Handlers/IAD_Handler.h"
 #include "Package_Handlers/NIA_Handler.h"
 #include "Basic_Deployment_Data.hpp"
+#include "ciao/Packaging_DataC.h"
 #include "Property_Handler.h"
 #include "Req_Handler.h"
 #include "Utils/Functors.h"
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
index 2c4db4eddf2..edc5fe7fa6c 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
@@ -10,7 +10,7 @@
 #include /**/ "ace/pre.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 #include "Utils/Functors.h"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "ciao/Packaging_DataC.h"
 #include "iad.hpp"
 
 namespace Deployment
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
index 6f0faebd255..e0258b22140 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "ciao/CIAO_common.h"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "ciao/Packaging_DataC.h"
 #include "Utils/XML_Helper.h"
 #include "Utils/XercesString.h"
 #include "Utils/Exceptions.h"
@@ -41,10 +41,10 @@ namespace CIAO
 	    TopLevelPackageDescription tpd (foo);
 
             tpd = topLevelPackageDescription (dom);
-
+            
             PCD_Handler::package_config (tpd.package (),
                                          toconfig);
-
+	    
           }
         else if (root == XStr ("Deployment:packageConfiguration"))
           {
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
index 7f4b68c5247..05687340c45 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
@@ -19,7 +19,7 @@ project (Package_Config_Handlers) : acelib, ciao_deployment_stub, ciao_config_ha
               XSC_DynAny_Handler \
               XSC_XML_Handlers \
               CIAO_XML_Utils \
-              CIAO_Events_Handlers RT_CCM_Config_Handlers
+              CIAO_Events_Handlers
 
   Source_files {
     CAD_Handler.cpp
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
index 7ab76020dd9..cf8f9ae7aaa 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
@@ -4,7 +4,7 @@
 
 #include "Deployment.hpp"
 #include "PCD_Handler.h"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "ciao/Packaging_DataC.h"
 #include "SID_Handler.h"
 #include "ace/Get_Opt.h"
 #include "Utils/XML_Helper.h"
@@ -57,7 +57,7 @@ int main (int argc, char *argv[])
       // Initialize an ORB so Any will work
       CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
       ACE_UNUSED_ARG (orb);
-
+      
 
       if (xercesc::DOMDocument *doc = XML_HELPER->create_dom (input_file))
         {
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
index 85a06851d78..16d6697c509 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "CB_Handler.h"
+#include "ciao/ServerResourcesC.h"
 #include "CIAOServerResources.hpp"
 #include "ace/Basic_Types.h"
 
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
index 7272b830fb7..e72bbe18ee8 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
@@ -13,7 +13,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 #include "IDREF_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
index d5053a6dea6..8edf1ef9980 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
@@ -2,6 +2,7 @@
 
 #include "CLA_Handler.h"
 #include "CIAOServerResources.hpp"
+#include "ServerResourcesC.h"
 
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
index 1c3469e617e..ae917f885e5 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
@@ -14,7 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp
index 41c45ee7c96..5a8fc9114f2 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp
@@ -3,6 +3,7 @@
 #include "OC_Handler.h"
 #include "OR_Handler.h"
 #include "PS_Handler.h"
+#include "ciao/ServerResourcesC.h"
 #include "CIAOServerResources.hpp"
 
 namespace CIAO
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
index 8aa7db84e77..8360825226e 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
@@ -15,7 +15,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp
index c4719fd5621..5fd8a1b32ff 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp
@@ -5,6 +5,7 @@
 #include "TPL_Handler.h"
 #include "CB_Handler.h"
 #include "CIAOServerResources.hpp"
+#include "ciao/ServerResourcesC.h"
 
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
index 2790e149320..707547adf61 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 #include "RT_CCM_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
index 6c35612536c..aa0705fcac2 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
@@ -12,7 +12,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
index 5bd9b9237c2..5f8673d94ef 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
@@ -12,7 +12,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
index a280f95f60b..9bff5006b60 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
@@ -1,10 +1,13 @@
 //$Id$
 
-project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, ciao_xml_utils {
+project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, xerces {
   sharedname = RT_CCM_Config_Handlers
   dynamicflags   = RT_CCM_HANDLERS_BUILD_DLL
   macros   += XML_USE_PTHREADS
+  requires += exceptions
   includes += $(CIAO_ROOT)/tools/Config_Handlers
+  after    += CIAO_XML_Utils
+  libs     += CIAO_XML_Utils
   includes += $(CIAO_ROOT)/ciao
 
   Source_Files {
@@ -24,12 +27,14 @@ project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, ciao_xml_utils
   }
 }
 
+
 //project (RT-CCM_Config_Handlers_Tests) : ciao_component_dnc, xerces {
 //  requires += dummy_label
 //  exename = rt-ccm-test
 //  after    += RT-CCM-Handlers
 //  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
 //  macros   += XML_USE_PTHREADS
+//  requires += exceptions
 //  includes += $(CIAO_ROOT)/tools/Config_Handlers
 //  libs     += CIAO_DnC_Server TAO_IFR_Client RT_CCM_Config_Handlers CIAO_XML_Utils
 
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
index 000768090f5..fc7e4b88a56 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
@@ -4,6 +4,7 @@
 #include "CIAOServerResources.hpp"
 #include "CLA_Handler.h"
 #include "OC_Handler.h"
+#include "ciao/ServerResourcesC.h"
 
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
index 3a5ad3128ed..c97d951ec90 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
@@ -14,8 +14,9 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 #include "ace/Auto_Ptr.h"
+// #include "Utils/XML_Helper.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
index 9a129302c05..e11fbc28dc2 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 
 #include "RT_CCM_Handlers_Export.h"
 
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
index 9d29bec5c40..7a9bc607b32 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
@@ -1,6 +1,7 @@
 // $Id$Exp lseibert
 
 #include "TP_Handler.h"
+#include "ciao/ServerResourcesC.h"
 #include "CIAOServerResources.hpp"
 
 namespace CIAO
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
index f0e27e2cef5..b0403ab0342 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
@@ -14,7 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/Utils/Utils.mpc b/CIAO/tools/Config_Handlers/Utils/Utils.mpc
index 704c856d752..6fc4f4697a1 100644
--- a/CIAO/tools/Config_Handlers/Utils/Utils.mpc
+++ b/CIAO/tools/Config_Handlers/Utils/Utils.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (CIAO_XML_Utils) : acelib, xerces {
+project (CIAO_XML_Utils) : acelib, xerces, exceptions {
   includes += $(CIAO_ROOT)/tools/Config_Handlers
   sharedname   += CIAO_XML_Utils
   dynamicflags  = CIAO_XML_UTILS_BUILD_DLL
diff --git a/CIAO/tools/Config_Handlers/test.cpp b/CIAO/tools/Config_Handlers/test.cpp
index 549700fb79d..8c968d1c63f 100644
--- a/CIAO/tools/Config_Handlers/test.cpp
+++ b/CIAO/tools/Config_Handlers/test.cpp
@@ -5,7 +5,7 @@
 #include "Deployment.hpp"
 #include "DP_Handler.h"
 #include "ciao/Deployment_DataC.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "ciao/ServerResourcesC.h"
 #include "ace/Get_Opt.h"
 #include "Utils/XML_Helper.h"
 #include "DnC_Dump.h"
@@ -54,7 +54,7 @@ int main (int argc, char *argv[])
   // Initialize an ORB so Any will work
   CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
   ACE_UNUSED_ARG (orb);
-
+  
   //Create an XML_Helper for all the file work
   XML_Helper the_helper;
 
diff --git a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
index b2cd31ba41e..59eed9acea6 100644
--- a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
+++ b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(TAO_IDL3_TO_IDL2_BE) : acelib, install, tao_output, crosscompile {
+project(TAO_IDL3_TO_IDL2_BE) : acelib, core, tao_output, crosscompile {
   after       += TAO_IDL_FE
   sharedname   = TAO_IDL3_TO_IDL2_BE
   libs        += TAO_IDL_FE
@@ -31,7 +31,7 @@ project(TAO_IDL3_TO_IDL2_BE) : acelib, install, tao_output, crosscompile {
 }
 
 
-project(TAO_IDL3_TO_IDL2_EXE) : aceexe, install, tao_output, crosscompile {
+project(TAO_IDL3_TO_IDL2_EXE) : aceexe, core, tao_output, crosscompile {
   after          += TAO_IDL3_TO_IDL2_BE TAO_IDL_FE
   exename         = tao_idl3_to_idl2
   libs           += TAO_IDL3_TO_IDL2_BE TAO_IDL_FE
diff --git a/CIAO/tools/tools.mwc b/CIAO/tools/tools.mwc
index ae28cfcba54..b841dc37dd0 100644
--- a/CIAO/tools/tools.mwc
+++ b/CIAO/tools/tools.mwc
@@ -3,5 +3,4 @@
 
 workspace {
         Config_Handlers
-        IDL3_to_IDL2
 }
\ No newline at end of file
diff --git a/TAO/COPYING b/TAO/COPYING
index 2a8822bc2a8..1645f46c517 100644
--- a/TAO/COPYING
+++ b/TAO/COPYING
@@ -8,7 +8,7 @@
    referred to as "DOC software") are copyrighted by [5]Douglas C.
    Schmidt and his [6]research group at [7]Washington University,
    [8]University of California, Irvine, and [9]Vanderbilt University,
-   Copyright (c) 1993-2007, all rights reserved. Since DOC software is
+   Copyright (c) 1993-2006, all rights reserved. Since DOC software is
    open-source, freely available software, you are free to use, modify,
    copy, and distribute--perpetually and irrevocably--the DOC software
    source code and object code produced from the source, as well as copy
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 24acf7dba13..a5ee5577d5d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,1498 +1,6390 @@
-Mon Jan  8 16:02:13 UTC 2007  Ciju John  <johnc@ociweb.com>
+Thu Oct 26 14:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * docs/ORBEndpoint.html:
-          Update documentation for ORBEndpoint reuse_addr option.
+	* orbsvcs/tests/Event/UDP/receiver.cpp:
+	  Register the value factory
 
-Mon Jan  8 13:55:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+	* orbsvcs/tests/Event/UDP/run_test.pl:
+	  Also run the test with a valuetype in the event.
 
-        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp:
+Thu Oct 26 13:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Add some debug output to trace code flow for remote systems.
+	* orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
+	  Reverted the change below. Thew new UDP RTEC test showed
+	  that the consumer was receiving duplicate events without being
+	  able to detect that. So a single send resulted in two events
+	  being received. The original problem needs to be resolved in
+	  a different way because this breaks any assumptions about events
 
-Mon Jan  8 13:50:31 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+          Mon Aug 21 15:37:23 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+          * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i:
+          * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp: Made the
+            simplest fix to the problem where if a UDP RTEC supplier
+            restarts while the consumer is still running, it gets duplicate
+            fragment errors.  The cost of this fix is that duplicate
+            completed requests are no longer detected.  Thanks to Keith
+            Nicewarner for these fixes.
 
-        * tests/OBV/Truncatable/client.cpp:
+Thu Oct 26 12:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+	* orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp:
+	* orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
+	  Const improvements
+
+Thu Oct 26 10:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Undefine VERIFY if it's defined to avoid warnings from vc71.
+	* orbsvcs/tests/Event/UDP/*:
+	  New regression test for the RTEC using UDP federations. By default
+	  we just send the string ACE/TAO/CIAO in the Any and this works, but
+	  when -v is passed to the run_test.pl we send a valuetype which
+	  contains the string. With the current svn head version of today
+	  this fails because on the receiver side we can't extract the valuetype
+	  out of the Any
 
-Mon Jan  8 13:36:37 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+Wed Oct 25 15:33:27 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/IIOP/Makefile.am:
+        * tao/PortableServer/Root_POA.cpp:
 
-          Modified the MPC file to work with automake and updated the
-          Makefile.am accordingly.
+          My change from Mon Oct 23 12:24:57 UTC 2006 uncovered yet another
+          reference counting problem.  The TAO_Root_POA was not manipulating
+          the reference count of the TAO_POA_Manager that it held.
 
-Mon Jan  8 10:52:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Oct 23 12:24:57 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * tao/Invocation_Base.cpp (exception):
-          Set the forwarded_to_ member to nil again, it can be that
-          we had a forward request which was converted to a regular
-          exeption in a PI call and then we have to make sure we don't
-          keep the old data
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Object_Adapter.cpp:
 
-        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp (receive_other):
-          When an exception occurs make sure we implement the following
-          behaviour from the OMG spec section 21.3.6.5:
-          This interception point may raise a system exception. If it does, no other
-          Interceptors’ receive_other operations are called. The remaining
-          Interceptors in the Flow Stack are popped and have their receive_exception
-          interception point called.
+          Added a helper method to correctly release the
+          TAO_POAManager_Factory which is used in both the destructor and
+          the close method.
 
-          This fixes the failing of bug 2287 regression on svn head. Thanks to
-          Simon McQueen for explaining the meaning of this test and reviewing
-          the changes above
+        * tao/PortableServer/POAManagerFactory.h:
+        * tao/PortableServer/POAManagerFactory.cpp:
 
-Mon Jan  8 00:18:21 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          When CORBA::release() is called on the POAManagerFactory, the
+          reference count does not necessarily go to zero because it has a
+          set of objects that are still holding on to a reference to the
+          factory.
 
-        * tests/TransportCurrent/Framework/run_test.pl:
-        * tests/TransportCurrent/IIOP/run_test.pl:
+          I added a method to the POAManagerFactory to remove all the
+          registered poa managers.  This is called by the helper method in
+          the TAO_Object_Adapter class.
 
-Sun Jan  7 18:48:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Thanks to Artur DeEsperanto <DrEsperanto at gmx dot net> for
+          reporting this.  This fixes bugid 2686.
 
-        * tests/Oneway_Timeouts/client.cpp:
-          Removed create_poa method, it is not used at all
+Fri Oct 20 16:54:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-Sun Jan  7 12:06:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/ORB_Core.cpp:
 
-        * tao/PortableServer/Acceptor_Filter_Factory.h:
-          Fixed problem with CORBA/e
+          Fixed a memory leak where the TAO_Adapter would be leaked in the
+          event that an exception occurred before the adapter was added to
+          the adapter registry.  Thanks to Artur DeEsperanto <DrEsperanto
+          at gmx dot net> for reporting this.
 
         * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/Root_POA.cpp:
-          Fixed compile problems when building CORBA/e compact with Borland C++
-
-Sat Jan  6 19:16:55 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * TAO_IDL:
-        * examples/AMI/FL_Callback:
-        * orbsvcs/Concurrency_Service:
-        * orbsvcs/CosEvent_Service:
-        * orbsvcs/Dump_Schedule:
-        * orbsvcs/Event_Service:
-        * orbsvcs/FTRT_Event_Service/Event_Service:
-        * orbsvcs/FTRT_Event_Service/Factory_Service:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service:
-        * orbsvcs/FT_ReplicationManager:
-        * orbsvcs/Fault_Detector:
-        * orbsvcs/Fault_Notifier:
-        * orbsvcs/IFR_Service:
-        * orbsvcs/ImplRepo_Service:
-        * orbsvcs/LifeCycle_Service:
-        * orbsvcs/LoadBalancer:
-        * orbsvcs/Logging_Service/Basic_Logging_Service:
-        * orbsvcs/Logging_Service/Event_Logging_Service:
-        * orbsvcs/Logging_Service/Notify_Logging_Service:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service:
-        * orbsvcs/Naming_Service:
-        * orbsvcs/Notify_Service:
-        * orbsvcs/Scheduling_Service:
-        * orbsvcs/TAO_Service:
-        * orbsvcs/Time_Service:
-        * orbsvcs/Trading_Service:
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage:
-        * orbsvcs/tests/AVStreams/Bidirectional_Flows:
-        * orbsvcs/tests/AVStreams/Component_Switching:
-        * orbsvcs/tests/AVStreams/Full_Profile:
-        * orbsvcs/tests/AVStreams/Latency:
-        * orbsvcs/tests/AVStreams/Modify_QoS:
-        * orbsvcs/tests/AVStreams/Multicast:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile:
-        * orbsvcs/tests/AVStreams/Multiple_Flows:
-        * orbsvcs/tests/AVStreams/Pluggable:
-        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol:
-        * orbsvcs/tests/AVStreams/Simple_Three_Stage:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS:
-        * orbsvcs/tests/BiDir_CORBALOC:
-        * orbsvcs/tests/Bug_1334_Regression:
-        * orbsvcs/tests/Bug_1393_Regression:
-        * orbsvcs/tests/Bug_1395_Regression:
-        * orbsvcs/tests/Bug_1630_Regression:
-        * orbsvcs/tests/Bug_2074_Regression:
-        * orbsvcs/tests/Bug_2137_Regression:
-        * orbsvcs/tests/Bug_2247_Regression:
-        * orbsvcs/tests/Bug_2248_Regression:
-        * orbsvcs/tests/Bug_2285_Regression:
-        * orbsvcs/tests/Bug_2287_Regression:
-        * orbsvcs/tests/Bug_2316_Regression:
-        * orbsvcs/tests/Bug_2377_Regression:
-        * orbsvcs/tests/Bug_2615_Regression:
-        * orbsvcs/tests/Bug_2709_Regression:
-        * orbsvcs/tests/Concurrency:
-        * orbsvcs/tests/CosEvent/Timeout:
-        * orbsvcs/tests/EC_Custom_Marshal:
-        * orbsvcs/tests/EC_MT_Mcast:
-        * orbsvcs/tests/EC_Mcast:
-        * orbsvcs/tests/EC_Multiple:
-        * orbsvcs/tests/EC_Throughput:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated:
-        * orbsvcs/tests/Event/ThreadFlags:
-        * orbsvcs/tests/Event/UDP:
-        * orbsvcs/tests/FT_App:
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation:
-        * orbsvcs/tests/FaultTolerance/IOGR:
-        * orbsvcs/tests/FaultTolerance/IOGRManipulation:
-        * orbsvcs/tests/FtRtEvent:
-        * orbsvcs/tests/HTIOP/AMI:
-        * orbsvcs/tests/HTIOP/BiDirectional:
-        * orbsvcs/tests/HTIOP/Hello:
-        * orbsvcs/tests/IOR_MCast:
-        * orbsvcs/tests/ImplRepo:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression:
-        * orbsvcs/tests/ImplRepo/NameService:
-        * orbsvcs/tests/ImplRepo/scale:
-        * orbsvcs/tests/InterfaceRepo/Application_Test:
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test:
-        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test:
-        * orbsvcs/tests/InterfaceRepo/IFR_Test:
-        * orbsvcs/tests/InterfaceRepo/Latency_Test:
-        * orbsvcs/tests/InterfaceRepo/Persistence_Test:
-        * orbsvcs/tests/Interoperable_Naming:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group:
-        * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU:
-        * orbsvcs/tests/Log/Basic_Log_Test:
-        * orbsvcs/tests/Miop/McastHello:
-        * orbsvcs/tests/Notify/PluggableTopology:
-        * orbsvcs/tests/Notify/XML_Persistence:
-        * orbsvcs/tests/Property:
-        * orbsvcs/tests/Redundant_Naming:
-        * orbsvcs/tests/Sched:
-        * orbsvcs/tests/Sched_Conf:
-        * orbsvcs/tests/Security/BiDirectional:
-        * orbsvcs/tests/Security/MT_IIOP_SSL:
-        * orbsvcs/tests/Security/Secure_Invocation:
-        * orbsvcs/tests/Security/ssliop_corbaloc:
-        * orbsvcs/tests/Simple_Naming:
-        * orbsvcs/tests/Time:
-        * orbsvcs/tests/ior_corbaname:
-        * orbsvcs/tests/tests_svc_loader:
-        * orbsvcs/tests/unit/Trading/Interpreter:
-        * tests/AMH_Exceptions:
-        * tests/AMH_Oneway:
-        * tests/AMI:
-        * tests/AMI_Buffering:
-        * tests/AMI_Timeouts:
-        * tests/Abstract_Interface:
-        * tests/Any/Recursive:
-        * tests/BiDirectional:
-        * tests/BiDirectional_DelayedUpcall:
-        * tests/BiDirectional_MultipleORB:
-        * tests/BiDirectional_NestedUpcall:
-        * tests/Big_AMI:
-        * tests/Big_Oneways:
-        * tests/Big_Reply:
-        * tests/Big_Request_Muxing:
-        * tests/Big_Twoways:
-        * tests/Blocking_Sync_None:
-        * tests/Bug_1020_Basic_Regression:
-        * tests/Bug_1020_Regression:
-        * tests/Bug_1254_Regression:
-        * tests/Bug_1269_Regression:
-        * tests/Bug_1270_Regression:
-        * tests/Bug_1330_Regression:
-        * tests/Bug_1361_Regression:
-        * tests/Bug_1476_Regression:
-        * tests/Bug_1476_Test:
-        * tests/Bug_1482_Regression:
-        * tests/Bug_1495_Regression:
-        * tests/Bug_1535_Regression:
-        * tests/Bug_1551_Regression:
-        * tests/Bug_1568_Regression:
-        * tests/Bug_1627_Regression:
-        * tests/Bug_1635_Regression:
-        * tests/Bug_1636_Regression:
-        * tests/Bug_1639_Regression:
-        * tests/Bug_1670_Regression:
-        * tests/Bug_1676_Regression:
-        * tests/Bug_1693_Test:
-        * tests/Bug_1812_Regression:
-        * tests/Bug_1813_Regression:
-        * tests/Bug_1869_Regression:
-        * tests/Bug_1904_Regression:
-        * tests/Bug_2084_Regression:
-        * tests/Bug_2122_Regression:
-        * tests/Bug_2124_Regression:
-        * tests/Bug_2126_Regression:
-        * tests/Bug_2134_Regression:
-        * tests/Bug_2144_Regression:
-        * tests/Bug_2174_Regression:
-        * tests/Bug_2183_Regression:
-        * tests/Bug_2186_Regression:
-        * tests/Bug_2188_Regression:
-        * tests/Bug_2201_Regression:
-        * tests/Bug_2222_Regression:
-        * tests/Bug_2234_Regression:
-        * tests/Bug_2289_Regression:
-        * tests/Bug_2319_Regression:
-        * tests/Bug_2328_Regression:
-        * tests/Bug_2345_Regression:
-        * tests/Bug_2349_Regression:
-        * tests/Bug_2375_Regression:
-        * tests/Bug_2399_Regression:
-        * tests/Bug_2417_Regression:
-        * tests/Bug_2419_Regression:
-        * tests/Bug_2424_Regression:
-        * tests/Bug_2429_Regression:
-        * tests/Bug_2494_Regression:
-        * tests/Bug_2503_Regression:
-        * tests/Bug_2542_Regression:
-        * tests/Bug_2543_Regression:
-        * tests/Bug_2549_Regression:
-        * tests/Bug_2560_Regression:
-        * tests/Bug_2593_Regression:
-        * tests/Bug_2595_Regression:
-        * tests/Bug_2654_Regression:
-        * tests/Bug_2669_Regression:
-        * tests/Bug_2683_Regression:
-        * tests/Bug_2702_Regression:
-        * tests/CDR:
-        * tests/COIOP:
-        * tests/CSD_Strategy_Tests/Broken:
-        * tests/CSD_Strategy_Tests/TP_Test_1:
-        * tests/CSD_Strategy_Tests/TP_Test_2:
-        * tests/CSD_Strategy_Tests/TP_Test_3:
-        * tests/CSD_Strategy_Tests/TP_Test_4:
-        * tests/CSD_Strategy_Tests/TP_Test_Dynamic:
-        * tests/CSD_Strategy_Tests/TP_Test_Static:
-        * tests/Cache_Growth_Test:
-        * tests/CallbackTest:
-        * tests/Client_Leaks:
-        * tests/CodeSets/simple:
-        * tests/Codec:
-        * tests/Collocation:
-        * tests/CollocationLockup:
-        * tests/Collocation_Exception_Test:
-        * tests/Collocation_Oneway_Tests:
-        * tests/Collocation_Opportunities:
-        * tests/Collocation_Tests:
-        * tests/Connect_Strategy_Test:
-        * tests/Connection_Failure:
-        * tests/Connection_Purging:
-        * tests/Connection_Timeout:
-        * tests/Crash_On_Write:
-        * tests/Crashed_Callback:
-        * tests/DII_Collocation_Tests/oneway:
-        * tests/DII_Collocation_Tests/twoway:
-        * tests/DLL_ORB:
-        * tests/DSI_Gateway:
-        * tests/DynAny_Test:
-        * tests/Explicit_Event_Loop:
-        * tests/Exposed_Policies:
-        * tests/FL_Cube:
-        * tests/Faults:
-        * tests/File_IO:
-        * tests/Forwarding:
-        * tests/GIOP_Fragments/PMB_With_Fragments:
-        * tests/Hang_Shutdown:
-        * tests/Hello:
-        * tests/ICMG_Any_Bug:
-        * tests/IDL_Test:
-        * tests/IORManipulation:
-        * tests/IOR_Endpoint_Hostnames:
-        * tests/IPV6:
-        * tests/InterOp-Naming:
-        * tests/Leader_Followers:
-        * tests/LongUpcalls:
-        * tests/MProfile:
-        * tests/MProfile_Connection_Timeout:
-        * tests/MProfile_Forwarding:
-        * tests/MT_BiDir:
-        * tests/MT_Client:
-        * tests/MT_Server:
-        * tests/MT_Timeout:
-        * tests/Multiple:
-        * tests/Multiple_Inheritance:
-        * tests/Muxed_GIOP_Versions:
-        * tests/Muxing:
-        * tests/Native_Exceptions:
-        * tests/NestedUpcall/MT_Client_Test:
-        * tests/NestedUpcall/Simple:
-        * tests/NestedUpcall/Triangle_Test:
-        * tests/Nested_Event_Loop:
-        * tests/Nested_Upcall_Crash:
-        * tests/No_Server_MT_Connect_Test:
-        * tests/OBV/Any:
-        * tests/OBV/Collocated/Forward:
-        * tests/OBV/Factory:
-        * tests/OBV/Forward:
-        * tests/OBV/Simple:
-        * tests/OBV/TC_Alignment:
-        * tests/OBV/Truncatable:
-        * tests/OBV/ValueBox:
-        * tests/ORB_Local_Config/Bug_1459:
-        * tests/ORB_Local_Config/Bug_2612:
-        * tests/ORB_Local_Config/Bunch:
-        * tests/ORB_Local_Config/Separation:
-        * tests/ORB_Local_Config/Service_Dependency:
-        * tests/ORB_Local_Config/Shared:
-        * tests/ORB_Local_Config/Simple:
-        * tests/ORB_Local_Config/Two_DLL_ORB:
-        * tests/ORB_destroy:
-        * tests/ORB_init:
-        * tests/ORB_init/Portspan:
-        * tests/ORB_shutdown:
-        * tests/ORT:
-        * tests/Object_Loader:
-        * tests/Objref_Sequence_Test:
-        * tests/OctetSeq:
-        * tests/Ondemand_Write:
-        * tests/Oneway_Buffering:
-        * tests/Oneway_Timeouts:
-        * tests/Oneways_Invoking_Twoways:
-        * tests/Optimized_Connection:
-        * tests/POA/Bug_2511_Regression:
-        * tests/POA/Current:
-        * tests/POA/Deactivate_Object:
-        * tests/POA/Default_Servant:
-        * tests/POA/EndpointPolicy:
-        * tests/POA/Etherealization:
-        * tests/POA/Excessive_Object_Deactivations:
-        * tests/POA/Identity:
-        * tests/POA/MT_Servant_Locator:
-        * tests/POA/Nested_Non_Servant_Upcalls:
-        * tests/POA/Non_Servant_Upcalls:
-        * tests/POA/Object_Reactivation:
-        * tests/POA/POAManagerFactory:
-        * tests/POA/POA_Destruction:
-        * tests/POA/Persistent_ID:
-        * tests/POA/Policies:
-        * tests/POA/Reference_Counting:
-        * tests/POA/Single_Threaded_POA:
-        * tests/POA/wait_for_completion:
-        * tests/Parallel_Connect_Strategy:
-        * tests/Param_Test:
-        * tests/Permanent_Forward:
-        * tests/Policies:
-        * tests/Portable_Interceptors/AMI:
-        * tests/Portable_Interceptors/AdvSlot:
-        * tests/Portable_Interceptors/AdvSlotDblCpy:
-        * tests/Portable_Interceptors/AdvSlotExt:
-        * tests/Portable_Interceptors/Benchmark:
-        * tests/Portable_Interceptors/Bug_1559:
-        * tests/Portable_Interceptors/Bug_2088:
-        * tests/Portable_Interceptors/Bug_2510_Regression:
-        * tests/Portable_Interceptors/Collocated/Dynamic:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation:
-        * tests/Portable_Interceptors/Dynamic:
-        * tests/Portable_Interceptors/ForwardRequest:
-        * tests/Portable_Interceptors/IORInterceptor:
-        * tests/Portable_Interceptors/ORB_Shutdown:
-        * tests/Portable_Interceptors/PICurrent:
-        * tests/Portable_Interceptors/PolicyFactory:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote:
-        * tests/Portable_Interceptors/Recursive_ORBInitializer:
-        * tests/Portable_Interceptors/Register_Initial_References:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow:
-        * tests/Portable_Interceptors/Service_Context_Manipulation:
-        * tests/Portable_Interceptors/Slot:
-        * tests/QtTests:
-        * tests/Queued_Message_Test:
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs:
-        * tests/RTCORBA/Banded_Connections:
-        * tests/RTCORBA/Client_Propagated:
-        * tests/RTCORBA/Client_Protocol:
-        * tests/RTCORBA/Collocation:
-        * tests/RTCORBA/Destroy_Thread_Pool:
-        * tests/RTCORBA/Diffserv:
-        * tests/RTCORBA/Dynamic_Thread_Pool:
-        * tests/RTCORBA/Explicit_Binding:
-        * tests/RTCORBA/Linear_Priority:
-        * tests/RTCORBA/MT_Client_Protocol_Priority:
-        * tests/RTCORBA/ORB_init:
-        * tests/RTCORBA/Persistent_IOR:
-        * tests/RTCORBA/Policies:
-        * tests/RTCORBA/Policy_Combinations:
-        * tests/RTCORBA/Priority_Inversion_With_Bands:
-        * tests/RTCORBA/Private_Connection:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection:
-        * tests/RTCORBA/RTMutex:
-        * tests/RTCORBA/Server_Declared:
-        * tests/RTCORBA/Server_Protocol:
-        * tests/RTCORBA/Thread_Pool:
-        * tests/RTScheduling/Current:
-        * tests/RTScheduling/DT_Spawn:
-        * tests/RTScheduling/Scheduling_Interceptor:
-        * tests/RTScheduling/Thread_Cancel:
-        * tests/RTScheduling/VoidData:
-        * tests/Reliable_Oneways:
-        * tests/Sequence_Unit_Tests:
-        * tests/Servant_To_Reference_Test:
-        * tests/Server_Connection_Purging:
-        * tests/Server_Leaks:
-        * tests/Server_Port_Zero:
-        * tests/Single_Read:
-        * tests/Smart_Proxies:
-        * tests/Smart_Proxies/Benchmark:
-        * tests/Smart_Proxies/Collocation:
-        * tests/Smart_Proxies/On_Demand:
-        * tests/Smart_Proxies/Policy:
-        * tests/Smart_Proxies/dtor:
-        * tests/Stack_Recursion:
-        * tests/Strategies:
-        * tests/Timed_Buffered_Oneways:
-        * tests/Timeout:
-        * tests/TransportCurrent/Framework:
-        * tests/TransportCurrent/IIOP:
-        * tests/Two_Objects:
-        * tests/Typedef_String_Array:
-        * tests/UNKNOWN_Exception:
-        * tests/Xt_Stopwatch:
-        * utils/catior:
-        * utils/nslist:
-
-          Added subversion svn:ignore properties on all these directories
-          comparable to the values previously in the vertigial .cvsignore
-          files, as well as updated them commensurate with the new svnignore
-          gnuace make target.
-
-        * TAO_IDL/.cvsignore:
-        * examples/AMI/FL_Callback/.cvsignore:
-        * orbsvcs/Concurrency_Service/.cvsignore:
-        * orbsvcs/CosEvent_Service/.cvsignore:
-        * orbsvcs/Dump_Schedule/.cvsignore:
-        * orbsvcs/Event_Service/.cvsignore:
-        * orbsvcs/FTRT_Event_Service/Event_Service/.cvsignore:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/.cvsignore:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/.cvsignore:
-        * orbsvcs/FT_ReplicationManager/.cvsignore:
-        * orbsvcs/Fault_Detector/.cvsignore:
-        * orbsvcs/Fault_Notifier/.cvsignore:
-        * orbsvcs/IFR_Service/.cvsignore:
-        * orbsvcs/ImplRepo_Service/.cvsignore:
-        * orbsvcs/LifeCycle_Service/.cvsignore:
-        * orbsvcs/LoadBalancer/.cvsignore:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/.cvsignore:
-        * orbsvcs/Logging_Service/Event_Logging_Service/.cvsignore:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/.cvsignore:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/.cvsignore:
-        * orbsvcs/Naming_Service/.cvsignore:
-        * orbsvcs/Notify_Service/.cvsignore:
-        * orbsvcs/Scheduling_Service/.cvsignore:
-        * orbsvcs/TAO_Service/.cvsignore:
-        * orbsvcs/Time_Service/.cvsignore:
-        * orbsvcs/Trading_Service/.cvsignore:
-        * tests/AMH_Exceptions/.cvsignore:
-        * tests/AMH_Oneway/.cvsignore:
-        * tests/AMI/.cvsignore:
-        * tests/AMI_Buffering/.cvsignore:
-        * tests/AMI_Timeouts/.cvsignore:
-        * tests/Abstract_Interface/.cvsignore:
-        * tests/BiDirectional/.cvsignore:
-        * tests/BiDirectional_MultipleORB/.cvsignore:
-        * tests/BiDirectional_NestedUpcall/.cvsignore:
-        * tests/Big_Oneways/.cvsignore:
-        * tests/Big_Reply/.cvsignore:
-        * tests/Big_Request_Muxing/.cvsignore:
-        * tests/Big_Twoways/.cvsignore:
-        * tests/Blocking_Sync_None/.cvsignore:
-        * tests/Bug_1020_Basic_Regression/.cvsignore:
-        * tests/Bug_1020_Regression/.cvsignore:
-        * tests/Bug_1269_Regression/.cvsignore:
-        * tests/Bug_1270_Regression/.cvsignore:
-        * tests/Bug_1330_Regression/.cvsignore:
-        * tests/Bug_1361_Regression/.cvsignore:
-        * tests/Bug_1476_Regression/.cvsignore:
-        * tests/Bug_1482_Regression/.cvsignore:
-        * tests/Bug_1495_Regression/.cvsignore:
-        * tests/Bug_1535_Regression/.cvsignore:
-        * tests/Bug_1551_Regression/.cvsignore:
-        * tests/Bug_1568_Regression/.cvsignore:
-        * tests/Bug_1627_Regression/.cvsignore:
-        * tests/Bug_1635_Regression/.cvsignore:
-        * tests/Bug_1636_Regression/.cvsignore:
-        * tests/Bug_1639_Regression/.cvsignore:
-        * tests/Bug_1670_Regression/.cvsignore:
-        * tests/Bug_1693_Test/.cvsignore:
-        * tests/Bug_1904_Regression/.cvsignore:
-        * tests/CDR/.cvsignore:
-        * tests/Cache_Growth_Test/.cvsignore:
-        * tests/Client_Leaks/.cvsignore:
-        * tests/CodeSets/simple/.cvsignore:
-        * tests/Codec/.cvsignore:
-        * tests/Collocation/.cvsignore:
-        * tests/Collocation_Opportunities/.cvsignore:
-        * tests/Collocation_Tests/.cvsignore:
-        * tests/Connect_Strategy_Test/.cvsignore:
-        * tests/Connection_Failure/.cvsignore:
-        * tests/Connection_Purging/.cvsignore:
-        * tests/Connection_Timeout/.cvsignore:
-        * tests/Crash_On_Write/.cvsignore:
-        * tests/Crashed_Callback/.cvsignore:
-        * tests/DLL_ORB/.cvsignore:
-        * tests/DSI_Gateway/.cvsignore:
-        * tests/DynAny_Test/.cvsignore:
-        * tests/Explicit_Event_Loop/.cvsignore:
-        * tests/Exposed_Policies/.cvsignore:
-        * tests/FL_Cube/.cvsignore:
-        * tests/Faults/.cvsignore:
-        * tests/File_IO/.cvsignore:
-        * tests/Forwarding/.cvsignore:
-        * tests/GIOP_Fragments/PMB_With_Fragments/.cvsignore:
-        * tests/Hello/.cvsignore:
-        * tests/ICMG_Any_Bug/.cvsignore:
-        * tests/IDL_Test/.cvsignore:
-        * tests/IORManipulation/.cvsignore:
-        * tests/InterOp-Naming/.cvsignore:
-        * tests/Leader_Followers/.cvsignore:
-        * tests/LongUpcalls/.cvsignore:
-        * tests/MProfile/.cvsignore:
-        * tests/MProfile_Connection_Timeout/.cvsignore:
-        * tests/MProfile_Forwarding/.cvsignore:
-        * tests/MT_BiDir/.cvsignore:
-        * tests/MT_Client/.cvsignore:
-        * tests/MT_Server/.cvsignore:
-        * tests/MT_Timeout/.cvsignore:
-        * tests/Multiple/.cvsignore:
-        * tests/Multiple_Inheritance/.cvsignore:
-        * tests/Muxed_GIOP_Versions/.cvsignore:
-        * tests/Muxing/.cvsignore:
-        * tests/Native_Exceptions/.cvsignore:
-        * tests/NestedUpcall/MT_Client_Test/.cvsignore:
-        * tests/NestedUpcall/Simple/.cvsignore:
-        * tests/NestedUpcall/Triangle_Test/.cvsignore:
-        * tests/Nested_Event_Loop/.cvsignore:
-        * tests/Nested_Upcall_Crash/.cvsignore:
-        * tests/No_Server_MT_Connect_Test/.cvsignore:
-        * tests/OBV/Any/.cvsignore:
-        * tests/OBV/Collocated/Forward/.cvsignore:
-        * tests/OBV/Factory/.cvsignore:
-        * tests/OBV/Forward/.cvsignore:
-        * tests/OBV/TC_Alignment/.cvsignore:
-        * tests/ORB_destroy/.cvsignore:
-        * tests/ORB_init/.cvsignore:
-        * tests/ORB_init/Portspan/.cvsignore:
-        * tests/ORB_shutdown/.cvsignore:
-        * tests/ORT/.cvsignore:
-        * tests/Object_Loader/.cvsignore:
-        * tests/Objref_Sequence_Test/.cvsignore:
-        * tests/OctetSeq/.cvsignore:
-        * tests/Oneway_Buffering/.cvsignore:
-        * tests/Oneways_Invoking_Twoways/.cvsignore:
-        * tests/POA/Current/.cvsignore:
-        * tests/POA/Default_Servant/.cvsignore:
-        * tests/POA/Etherealization/.cvsignore:
-        * tests/POA/Excessive_Object_Deactivations/.cvsignore:
-        * tests/POA/Identity/.cvsignore:
-        * tests/POA/MT_Servant_Locator/.cvsignore:
-        * tests/POA/Nested_Non_Servant_Upcalls/.cvsignore:
-        * tests/POA/Non_Servant_Upcalls/.cvsignore:
-        * tests/POA/Object_Reactivation/.cvsignore:
-        * tests/POA/POA_Destruction/.cvsignore:
-        * tests/POA/Persistent_ID/.cvsignore:
-        * tests/POA/Policies/.cvsignore:
-        * tests/POA/Single_Threaded_POA/.cvsignore:
-        * tests/POA/wait_for_completion/.cvsignore:
-        * tests/Param_Test/.cvsignore:
-        * tests/Policies/.cvsignore:
-        * tests/Portable_Interceptors/AMI/.cvsignore:
-        * tests/Portable_Interceptors/Benchmark/.cvsignore:
-        * tests/Portable_Interceptors/Bug_1559/.cvsignore:
-        * tests/Portable_Interceptors/Collocated/Dynamic/.cvsignore:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.cvsignore:
-        * tests/Portable_Interceptors/Dynamic/.cvsignore:
-        * tests/Portable_Interceptors/ForwardRequest/.cvsignore:
-        * tests/Portable_Interceptors/IORInterceptor/.cvsignore:
-        * tests/Portable_Interceptors/ORB_Shutdown/.cvsignore:
-        * tests/Portable_Interceptors/PICurrent/.cvsignore:
-        * tests/Portable_Interceptors/PolicyFactory/.cvsignore:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/.cvsignore:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/.cvsignore:
-        * tests/QtTests/.cvsignore:
-        * tests/Queued_Message_Test/.cvsignore:
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs/.cvsignore:
-        * tests/RTCORBA/Banded_Connections/.cvsignore:
-        * tests/RTCORBA/Client_Propagated/.cvsignore:
-        * tests/RTCORBA/Client_Protocol/.cvsignore:
-        * tests/RTCORBA/Collocation/.cvsignore:
-        * tests/RTCORBA/Destroy_Thread_Pool/.cvsignore:
-        * tests/RTCORBA/Diffserv/.cvsignore:
-        * tests/RTCORBA/Explicit_Binding/.cvsignore:
-        * tests/RTCORBA/Linear_Priority/.cvsignore:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/.cvsignore:
-        * tests/RTCORBA/ORB_init/.cvsignore:
-        * tests/RTCORBA/Persistent_IOR/.cvsignore:
-        * tests/RTCORBA/Policies/.cvsignore:
-        * tests/RTCORBA/Policy_Combinations/.cvsignore:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/.cvsignore:
-        * tests/RTCORBA/Private_Connection/.cvsignore:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/.cvsignore:
-        * tests/RTCORBA/RTMutex/.cvsignore:
-        * tests/RTCORBA/Server_Declared/.cvsignore:
-        * tests/RTCORBA/Server_Protocol/.cvsignore:
-        * tests/RTCORBA/Thread_Pool/.cvsignore:
-        * tests/RTScheduling/Current/.cvsignore:
-        * tests/RTScheduling/DT_Spawn/.cvsignore:
-        * tests/RTScheduling/Scheduling_Interceptor/.cvsignore:
-        * tests/RTScheduling/Thread_Cancel/.cvsignore:
-        * tests/RTScheduling/VoidData/.cvsignore:
-        * tests/Reliable_Oneways/.cvsignore:
-        * tests/Servant_To_Reference_Test/.cvsignore:
-        * tests/Server_Connection_Purging/.cvsignore:
-        * tests/Server_Leaks/.cvsignore:
-        * tests/Server_Port_Zero/.cvsignore:
-        * tests/Single_Read/.cvsignore:
-        * tests/Smart_Proxies/.cvsignore:
-        * tests/Smart_Proxies/Benchmark/.cvsignore:
-        * tests/Smart_Proxies/Collocation/.cvsignore:
-        * tests/Smart_Proxies/On_Demand/.cvsignore:
-        * tests/Smart_Proxies/Policy/.cvsignore:
-        * tests/Smart_Proxies/dtor/.cvsignore:
-        * tests/Stack_Recursion/.cvsignore:
-        * tests/Strategies/.cvsignore:
-        * tests/Timed_Buffered_Oneways/.cvsignore:
-        * tests/Timeout/.cvsignore:
-        * tests/Two_Objects/.cvsignore:
-        * tests/Typedef_String_Array/.cvsignore:
-        * tests/UNKNOWN_Exception/.cvsignore:
-        * tests/Xt_Stopwatch/.cvsignore:
-        * utils/catior/.cvsignore:
-        * utils/nslist/.cvsignore:
-
-          Removed these files in favor of svn:ignore properties on the
-          parent directory.
-
-Sat Jan  6 07:07:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/fe/fe_lookup.cpp (lookup):
-          Make sure the signature is exactly the same as in the header
-          file, this should resolve the ld errors with HPUX IA64
-
-Sat Jan  6 00:06:52 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * TAO_IDL/driver/drv_preproc.cpp: Removed the ACE_HAS_WINNT4 block -
-          everything runs on NT4 or up now, even when running TAO IDL for
-          building on Pharlap or CE.
-
-Fri Jan  5 22:51:37 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * TAO_IDL/include/ast_decl.h:
+          Clean up the TAO_Root_POA and TAO_POAManager_Factory pointers in
+          the destructor in the event that the close() method was never
+          called.
 
-          Small change to comment.
+Fri Oct 20 07:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/util/utl_global.cpp:
+        * tao/Transport_Connector.cpp:
+          Updated formatting of a debug message to match the others
+          in TAO
 
-          Changed logic of pushing/popping prefixes to/from
-          the IDL compiler's dedicated stack, to fix a
-          problem reported by Martin Corino <mcorino@remedy.nl>
-          related to #pragma prefix directives from included
-          IDL files and how they interact with the IDL
-          compiler's preprocessor.
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp:
+          Use LM_ERROR together with ACE_ERROR, const improvements
 
-        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
-        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+Tue Oct 17 22:04:33 UTC 2006  Ciju John  <johnc@ociweb.com>
 
-          Copied lines of code from the CCM preprocessing
-          visitor, which ensures that implied IDL nodes
-          will have the correct repository ids even if
-          the original node has its prefix modified later
-          in the IDL file. The same logic is now applied
-          to the AMI and AMH preprocessing visitors.
+        * tao/Strategies/advanced_resource.cpp:
+          Believe the default reactor for advanced resources and default
+          resources should be the same. No reason for the advanced
+          resources recator not to automatically restart upon signal
+          interruption.
 
-Fri Jan  5 18:26:43 UTC 2007  Ciju John  <johnc@ociweb.com>
+Tue Oct 17 18:02:25 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * docs/ORBEndpoint.html:
-          Update documentation for ORBEndpoint reuse_addr option.
+        * tao/IORTable/Table_Adapter.cpp:
+          Fix to improve compiling on borland.
 
-Fri Jan  5 17:09:35 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Tue Oct 17 15:41:50 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tests/Portable_Interceptors/Redirection/run_test.pl:
+        * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp:
 
-          The sudden death of the first server is expected and is part of
-          the test. Changing the script to interpret the event
-          accordingly.
+          Cosmetic changes.
 
-Fri Jan  5 15:37:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
 
-        * tao/AnyTypeCode/DynamicC.h:
-          Added typedef for _out_type to ParameterList, the IDL does
-          generate this but this file is handcrafted and not updated
-          when the IDL compiler was changed
+          Changed generated implementation of Any operators to
+          pass the alias typecode for typedefed sequences and
+          arrays. Formerly the raw sequence or array typecode
+          was used in all cases.
 
-Fri Jan  5 15:07:46 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Tue Oct 17 14:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/TransportCurrent/IIOP/client.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+          Fixed warning in VxWorks 5.5.2PPC build, some layout changes
+          and use prefix increment instead of postfix
 
-          Testing for minimum corba was wrong, causing invalid reference
-          to Object::_request member in minimum corba builds.
+Tue Oct 17 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Jan  5 13:35:47 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tests/Optimized_Connection/run_test.pl:
+          Removed commented out test code
 
-        * MPC/config/tc.mpb:
+Tue Oct 17 11:58:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Added interceptors and pi as bases to ensure the derived
-          projects are not built prior, or without their prerequisites.
+        * tao/IORTable/IOR_Table_Impl.h:
+        * tests/Bug_2683_Regression/server.cpp:
 
-        * tests/TransportCurrent/Framework/Framework.mpc:
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
+          Clean up scoreboard related problems.
 
-          Added tc (which derives from pi and interceptors) as base and
-          also simplified the base project lists. This ensures the tests
-          are skipped if TC is not built (for instance with
-          corba_e_compact).
+Mon Oct 16 21:16:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Fri Jan  5 13:07:32 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+        * tao/IORTable/Table_Adapter.cpp:
+        * tao/IORTable/Table_Adapter.h:
+        * tao/IORTable/IOR_Table_Impl.cpp:
+        * tao/IORTable/IOR_Table_Impl.h:
+          Added var type for the impl, to avoid casting.
 
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp (open_senders):
+Mon Oct 16 10:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Switched from using a macro for the buffer length used in
-          gathering the ingore address as a string to using a literal
-          constant. This is consistent with common usage of addr_to_string
-          throughout the ACE/TAO codebase, and avoids adding potentially
-          system-specific includes at the application level.
+        * tests/Nested_Upcall_Crash/run_test.pl:
+          Check whether we could spawn the server, if not, give an error
+          and exit directly.
 
-Fri Jan  5 13:04:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Oct 16 08:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/OBV/ValueBox/client.cpp:
-          Renamed VERIFY to OBV_VERIFY to resolve redefinition warnings
-          in the MFC builds
+        * TAO_IDL/be/be_codegen.cpp:
+          Const changes
 
-Fri Jan  5 11:00:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+Sun Oct 15 23:23:53 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IORTable/Table_Adapter.cpp:
+        * tao/IORTable/Table_Adapter.h:
+          Fix for bug 2683. The problem was that if ORB::shutdown() was
+          called by another thread, the Table_Adapter::root_ reference
+          could go to nil while it was needed for processing in the
+          find_object() method. The fix is to use the reference counting
+          already supplied for the root_ reference to ensure the pointer
+          can never go nil while it is needed. Further, a synchronized
+          flag is used to restrict access to find_object() to ensure it is
+          not called once ORB::shutdown() was invoked.
+
+        * tests/Bug_2683_Regression/*:
+          A new regression test for this bug. As this bug is the result of
+          a race condition, it is hard to detect anyway. The best way to
+          observe the bug is to revert the above change to Table_Adapter*
+          and add a small sleep to the find_object() method. This simply
+          forces the race condition. Adding a small sleep along with the
+          above fix demonstrates that the problem no longer occurs.
+
+          Thanks to Chris Reed, cr at progress dot com, for reporting this
+          bug.
 
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp:
+Fri Oct 13 10:28:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Error if the typecode info is not available to display.
+        * tests/COIOP/*:
+          Extended this test so that we check whether a call should
+          succeed or not. This test requires that COIOP is the only
+          pluggable protocol available.
 
-Fri Jan  5 10:10:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Oct 12 14:17:11 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * MPC/config/compression.mpb:
-          Removed pi as base, not needed. Thanks to JT for noticing this
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
 
-        * tao/Compression/Base_Compressor.h:
-          Make the members protected so that derived classes can access them
+          Split a debug message into two messages to work around a strange
+          bug in Visual Studio 2005.
 
-        * tao/Compression/zlib/ZlibCompressor.cpp:
-          Fixed type of local variable
+Thu Oct 12 14:13:44 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-Fri Jan  5 06:54:42 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl:
 
-        * configure.ac:
+          Use a random port number for the Naming_Service instead of a
+          hard-coded port number.
 
-          Configure Makefiles for new subdirectory.
+Tue Oct 10 12:11:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Portable_Interceptors/Makefile.am:
+        * orbsvcs/examples/ORT/README:
+          Layout improvement
 
-          Regenerate to descend into Redirection subdirectory.
+        * orbsvcs/orbsvcs/CosConcurrencyControl.idl:
+        * orbsvcs/orbsvcs/CosLoadBalancing.idl:
+        * orbsvcs/orbsvcs/CosNaming.idl:
+          Doxygen improvements
 
-        * tests/Portable_Interceptors/Redirection/Makefile.am:
+        * orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp:
+          Const/bool improvements
 
-          New Makefile.am.
+Tue Oct 10 09:24:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Jan  5 06:51:11 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+        * docs/ior_parsing.html:
+          Updated that match_prefix returns bool
 
-        * configure.ac:
+Tue Oct 10 09:19:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Configure Makefiles for new subdirectory.
+        * tao/Connection_Handler.cpp:
+          Layout change
 
-        * tests/Makefile.am:
+        * tao/CORBALoc_Parser.{h,cpp}:
+        * tao/CORBAName_Parser.{h,cpp}:
+        * tao/DLL_Parser.{h,cpp}:
+        * tao/FILE_Parser.{h,cpp}:
+        * tao/IOR_Parser.{h,cpp}:
+        * tao/MCAST_Parser.{h,cpp}:
+          Changed match_prefix to return a bool instead of an int.
 
-          Regenerate to descend into Bug_2702_Regression subdirectory.
+        * tao/CORBALoc_Parser.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+        * tao/Environment.cpp:
+        * tao/Exception.cpp:
+        * tao/IIOP_Connector.cpp:
+        * tao/IIOP_Profile.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/Strategies/SCIOP_Connector.cpp:
+        * tao/Strategies/UIOP_Connector.cpp:
+        * tao/SystemException.cpp:
+          When using LM_ERROR, use ACE_ERROR as macro
 
-        * tests/Bug_2702_Regression/Makefile.am:
+        * tao/IIOP_Connection_Handler.cpp:
+          Const improvment
 
-          New Makefile.am.
+        * tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
+          Cleanup of comment
 
-Fri Jan  5 06:42:17 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Strategies/DIOP_Profile.cpp:
+          Small code improvement assuming the fact that operator>> returns
+          bool
 
-        * tests/TransportCurrent/IIOP/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am
+Tue Oct 10 06:08:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Regenerate.
+        * tests/COIOP/*:
+          New test for COIOP
 
-        * configure.ac:
+Thu Oct 05 00:35:37 2006  William R. Otte  wotte@dre.vanderbilt.edu
+
+        * TAO version 1.5.3 released.
+
+Tue Oct  3 17:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/tutorials/Quoter/Simple/Client/index.html:
+          Corrected filenames generated by tao_idl
+
+Tue Oct  3 14:13:55 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * NEWS
+
+          Updated NEWS file.
+
+Mon Oct  2 12:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
+          Renamed VERIFY macro to fix warning in mfc build and use
+          ACE_ERROR instead of ACE_DEBUG
+
+Thu Sep 28 15:13:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+        * tao/Connection_Handler.h:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+
+          Fixing a regression on bug 2074 caused by CH::handle_timeout()
+          trying to update its instance, when the latter has already been
+          deallocated by CH::close(). This case only occurs when the
+          reference count on the Connection handler drops down to one. The
+          solution is to use a kind of auto pointer (TAO_Auto_Reference)
+          which magically increments the reference count in its
+          constructor and decrements it in its destructor.
+
+Thu Sep 28 14:55:06 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Bug_2188_Regression/broken_i.cpp:
+          Silence the Borland warning.
+
+Wed Sep 27 07:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Merged in the patch from bugzilla bug 2425, this fixes the crashing
+        of the notification service with vc8. This matches earlier investigations,
+        calling the set_qos seems to crash with vc8 because it is implemented
+        in a strange multiple inheritance setup.
+
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
+          Changed to call TAO_Notify_Object::set_qos()
+          directly within the init() method (within the scope
+          of a guard) to work around an apparent memory
+          corruption error that is seen only in Visual C++ 8
+          builds.  Thanks to zhamak dehghani <zhamakd at gmail
+          dot com> for initially reporting the problem and
+          providing a proposed fix, and to Charles Calkins
+          <calkinsc at ociweb dot com> for testing and
+          tweaking the proposed fix and further analyzing the
+          problem.  (Not yet found, however, is the actual
+          cause of the memory corruption that existed before
+          this work around.)
+
+Tue Sep 26 11:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/COIOP_*.*:
+          New pluggable protocol COIOP, this is Collocated Only IOP. It is
+          almost finished, some small improvements are pending which will
+          be added soon. This protocol only allows collocated invocations and
+          must be explicitly enabled by defined TAO_HAS_COIOP to 1. At the
+          moment all other protocols are disabled with their defines it is
+          then possible to run a collocated TAO application without using
+          any network API's which safes footprint for an application.
+
+        * tao/DynamicAny/DynCommon.h:
+          No need for a pragma push/pop
+
+        * tao/ORB_Constants.h:
+          Added COIOP profile constant
+
+        * tao/Strategies.mpc:
+          Extended for COIOP
+
+        * tao/Strategies/advanced_resource.cpp:
+          Added COIOP factory
+
+        * utils/catior/catior.cpp:
+          Added support for COIOP
+
+        * docs/releasenotes/index.html:
+          Added COIOP
+
+Tue Sep 26 06:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Timeout/run_test.pl:
+          Don't use a hardcoded timeout and when there is no executable, exit
+          directly
+
+Mon Sep 25 22:27:24 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+        * tao/Connection_Handler.cpp:
+        * tao/IIOP_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:
+
+          Removed the call to release_os_resources call from the base
+          Connection_Handler destructor, and added code to each of the
+          protocol-specific CHs to report an error if release_os_resources
+          returns -1.
+
+Mon Sep 25 17:09:58 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
+
+        * tests/Timeout/client.cpp:
+        * tests/Timeout/run_test.pl:
+        * tests/Timeout/test_i.cpp:
+        * tests/Timeout/README.expected_behavior:
+        * tests/Timeout/README:
+
+          Made relatively modest changes to track statistics on per type
+          of timeout.  Also added a file README.expected_behavior that
+          carefully describes the timeout behavior that we should observe
+          on a proper real-time platform.  Please address comments and
+          questions to Gautam Thaker <gthaker@atl.lmco.com>.
+
+Fri Sep 22 21:29:26 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/DynamicAny/DynAnyFactory.h:
+        * tao/DynamicAny/DynamicAny.pidl:
+        * tao/DynamicAny/DynCommon.cpp:
+        * tao/DynamicAny/DynCommon.h:
+        * tao/DynamicAny/DynAnyFactory.cpp:
+        * tao/DynamicAny.mpc:
+
+          Updated spec IDL to conform to CORBA
+          3.0.3 (formal/2004-03-01) and added
+          dummy implementations of new operations
+          in existing interfaces. Also modified
+          the MPC file to inherit from valuetype.mpb,
+          to accommodate the new DynValue and
+          DynValueBox interfaces.
+
+        * tao/DynamicAny/DynValue_i.cpp:
+        * tao/DynamicAny/DynValue_i.h:
+        * tao/DynamicAny/DynValueCommon_i.cpp:
+        * tao/DynamicAny/DynValueBox_i.cpp:
+        * tao/DynamicAny/DynValueBox_i.h:
+        * tao/DynamicAny/DynValueCommon_i.h:
+
+          New files containing implementation classes
+          for new DynAny types related to valuetypes.
+          All of the operations in these classes are
+          dummy impls at present.
+
+Fri Sep 22 15:31:54 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Acceptor.cpp:
+          Fix for remaining IPV6 test failures.
+
+        * tests/Bug_2188_Regression/broken.mpc:
+        * tests/Bug_2188_Regression/client.cpp:
+          Updated the mpc file to be consistent with current builds. Added
+          an explicit type case to the client to silence some build warnings.
+
+
+Thu Sep 21 14:59:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Bug_2188_Regression:
+        * tests/Bug_2188_Regression/broken.idl:
+        * tests/Bug_2188_Regression/broken.mpc:
+        * tests/Bug_2188_Regression/broken_i.h:
+        * tests/Bug_2188_Regression/broken_i.cpp:
+        * tests/Bug_2188_Regression/client.cpp:
+        * tests/Bug_2188_Regression/run_test.pl:
+        * tests/Bug_2188_Regression/server.cpp:
+
+          A new test for an old problem. The actual problem is now
+          resolved, but I never got around to adding this test when I
+          should have.
 
-          Configure Makefiles for new subdirectory.
+Wed Sep 20 21:37:58 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/TransportCurrent/Makefile.am:
+        * tao/IIOP_Acceptor.cpp:
+
+          Fix for non-IPV6 builds. This relates back to the test for an
+          explicitly supplied any addr.
+
+Wed Sep 20 21:02:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Acceptor.cpp:
 
-          Regenerate to descend into lib subdirectory.
+          Make sure the port_separator_loc value is used to compute the
+          string length only when it is not 0.
 
-        * tests/TransportCurrent/lib/Makefile.am:
+Wed Sep 20 01:10:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-          New Makefile.am for library of common code for TransportCurrent
-          tests.
+        * tao/default_resource.cpp:
 
-        * tests/TransportCurrent/Framework/Framework.mpc:
+          Fixing the extra semicolon, causing hickups on some
+          platforms. Thanks to Phil Mesnier for catching it.
 
-          Fix tpyo in after += specification.
+Tue Sep 19 19:31:15 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Fri Jan  5 04:09:08 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tao/IIOP_Acceptor.h:
+        * tao/IIOP_Acceptor.cpp:
 
-        * tests/TransportCurrent/lib/Client_ORBInitializer.h:
-        * tests/TransportCurrent/lib/Client_ORBInitializer.cpp:
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/lib/Current_Test_Impl.h:
-        * tests/TransportCurrent/lib/Server_ORBInitializer.h:
-        * tests/TransportCurrent/lib/Server_ORBInitializer.cpp:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
+          Fix the treatment of explicitly defaulted endpoints on
+          potentially dual-stack hosts. Prior to this fix, expressing
+          certain forms of defaulted endpoints are inappropriately encoded
+          in the IOR using the literal string provided, rather than using
+          the probed interface addresses. When an endpoint is specified as
+          iiop://[::]:, iiop://[]:, or iiop://0.0.0.0:, this patch now
+          treats the first two as indicating that all IPv6 interfaces
+          should be included, but no IPv4. The third indicates that only
+          IPv4 interface addresses should be listed in the IOR. Using
+          iiop://: means that both IPv4 and IPv6 interface addresses are
+          to be included.
 
-          Thanks to Johnny Willemsen and Chris Cleeland for reminding
-          me. This change eliminates the use of the now deprecated ACE
-          exceptions macros.
+Mon Sep 18 23:53:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-Fri Jan  5 03:35:00 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+        * tao/TAO_Internal.cpp:
 
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
+          Replacing the usage of the global ACE lock with a separate
+          mutex, because the DLL Manager is also using the global
+          lock. This can cause a race condition in applications, which
+          re-enter the Service Configurator to load another DLL as part of
+          their own initialization.
 
-          Refactor the status message output in the open_senders() method
-          to make use of updated ACE_INET_Addr::addr_to_string() when
-          reporting IPv6 sender addresses.
+Mon Sep 18 23:11:31 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-          Also, changed ECM_Federation::ECM_Federation() to force mapping
-          of supplier and consumer names to IPv4 format as the rest of the
-          code makes use of the now-obsolete assumption that an IP addr
-          fits into a long.
+          This change fixes bug#2651, related to the order of destruction
+          of Codeset Manager instances, owned by the Default Resource
+          Factory. It is a prerequisite for correctly fixing bug#2612 and
+          also fixes a design artifact left over from the splitting of the
+          codesets in their own library. See the bugzilla entry for more
+          details.
+
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.cpp:
 
-Fri Jan  5 00:53:34 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+          The Core is now responsible for managing the life-cycle of the
+          Codeset Manager instance, instead of the Resource Factory.
+
+        * tao/default_resource.h:
+        * tao/default_resource.cpp:
+
+          Introducing a TAO_Codeset_Parameters class, which encapsulates
+          codeset configuration information. Keeping the configuration
+          information instead of the configured instance, allows the
+          Resource Factory to give up ownership of objects it creates (as
+          it should). Removed the ACE_Dynamic_Service_Dependency instance
+          member, which was a crude attempt at solving the issue,
+          described in bug#2651.
+
+Mon Sep 18 19:54:49 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
+        * TAO_IDL/be/be_visitor_operation/rettype.cpp:
+        * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp:
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_predefined_type.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
+        * TAO_IDL/be/be_decl.cpp:
+
+          Fixed cases of code generation involving
+          CORBA::AbstractBase that were overlooked in
+
+          Fri Sep 15 19:02:58 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Mon Sep 18 16:44:10 UTC 2006  Ciju John  <johnc@ociweb.com>
 
         * tao/Transport_Connector.cpp:
-        * tao/Strategies/UIOP_Connector.cpp:
+          Removed an extra semi-colon.
 
-          Removed the warning generated if a trailing '/' was not present
-          if the default object key were desired. The '/' separator is
-          required only when an explicit object key is present. See
-          section 13.6.10.1 of CORBA 3.0.3 specification (formal/04-03-01)
-          to note that the slash is part of the object key portion of the
-          corbaloc string.
+Fri Sep 15 19:02:58 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Thu Jan  4 20:10:38 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/include/ast_predefined_type.h:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/ast/ast_predefined_type.cpp:
+        * TAO_IDL/fe/fe_init.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
 
-          This is in addition to the change from "Thu Jan 4 04:11:02 UTC
-         2007". The aim is to resolve the linking problems on some
-         builds. Basically, I had a templatized ORB initializer (for
-         client and server side) which used to be pretty simple
-         anyway. This change eliminates the template and replaces it with
-         two simple classes.
+          Added recognition of CORBA::AbstractBase as a pseudo
+          object, similarly to the existing support for Object,
+          ValueBase, and TypeCode. Also added automatic inclusion
+          of tao/Valuetype/AbstractBase.h in generated code
+          if AbstractBase is seen in IDL.
 
-         The problem was that the Borland compiler was not seeing the
-         template instantiations. When I tried to fix that, the Windows VC
-         broke complaining about duplicate instantiations. In the end,
-         instead of mucking about with such a simple template I just
-         zapped it.
+Wed Sep 13 14:58:24 UTC 2006  Ciju John  <johnc@ociweb.com>
 
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/server.cpp:
-        * tests/TransportCurrent/IIOP/client.cpp:
-        * tests/TransportCurrent/IIOP/server.cpp:
+        * tao/Transport_Connector.h:
+        * tao/Transport_Connector.inl:
+        * tao/Transport_Connector.cpp:
+          The TransportCleanupGuard class is for local usage, so am moving
+          it into an anonymous namespace.
 
-          Eliminated the trivial template usage for the ORB initializers,
-         where a simple class is sufficient.
+Fri Sep  8 20:03:26 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/TransportCurrent/lib/Client_ORBInitializer.h:
-        * tests/TransportCurrent/lib/Client_ORBInitializer.cpp:
-        * tests/TransportCurrent/lib/Server_ORBInitializer.cpp:
-        * tests/TransportCurrent/lib/Server_ORBInitializer.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+        * tao/Strategies/DIOP_Connection_Handler.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+        * NEWS:
+          Applied fix from Tue Aug 29 17:40:01 UTC 2006  Phil Mesnier
+          <mesnier_p@ociweb.com> to other protocols. This explicitly calls
+          release_os_resources from the derived destructor, as was
+          originally intended. This resolves bug 2649.
 
-         Added as a replacement of the template.
+Thu Sep  7 14:19:58 UTC 2006  Ciju John  <johnc@ociweb.com>
 
-        * tests/TransportCurrent/Framework/run_test.pl:
-        * tests/TransportCurrent/IIOP/run_test.pl:
+        * tao/Transport_Connector.inl:
+          Removed the extra semicolon. This was creating havoc on the
+          windows builds.
 
-          Modified so they now run on Windows, too. The problem was that
-         the ../lib was not part of the DLL search path on Windows and
-         there again, the path separator is ';'. The change ensures ../lib
-         is added to the PATH and introduces Config to pick the correct
-         separator.
+Tue Sep  5 20:39:15 UTC 2006  Ciju John  <johnc@ociweb.com>
 
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
+        * tao/PortableServer/Servant_var.h:
+        * tao/PortableServer/Servant_var.inl:
+          Commented out the member templates code. See:
+          Tue Aug 15 21:25:50 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+Tue Sep  5 13:56:58 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tests/Bug_1476_Test/run_test.pl:
+          Took out a debug print statement.
+
+Thu Aug 31 23:05:46 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tao/ORB_Core.cpp:
+          Access to the TAO_ORB_Core_Static_Resources was through the
+          static instance() API. This created a bug when the object which
+          earlier was a true singleton was converted to a service object
+          under the control of the service config. The service config
+          depending upon the access point can either return the global
+          object or the object local to the particular orb. In this case
+          (during an invocation) we need to access the local object and
+          the service config was returning the global object. This led to
+          incorrect synch-scope policies being set in invocations via a
+          non-default orb (named orb). Since at this point the ORB_Core
+          has a pointer to the local service config, its safe to query it
+          to request the local service object.
+
+        * tao/Transport_Connector.h:
+        * tao/Transport_Connector.inl:
+        * tao/Transport_Connector.cpp:
 
-          Removed the partial template instantiation and replaced with two
-         simple classes. See above.
+          In case of a asynch connection establishment failure or
+          registration failure we need to clean up teh transport, else we
+          have a file descriptor leak. The 'TransportCleanupGuard' takes
+          care of that.
 
-        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
+        * tests/Bug_1476_Test:
+        * tests/Bug_1476_Test/Bug_1476_Test.mpc:
+        * tests/Bug_1476_Test/Hello.idl:
+        * tests/Bug_1476_Test/README:
+        * tests/Bug_1476_Test/client.cpp:
+        * tests/Bug_1476_Test/run_test.pl:
+          Add new regression test for buzilla 1476
 
-          Updated to add pi to the list of base projects.
+Fri Sep  1 14:05:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * tests/TransportCurrent/lib/ORBInitializer_T.h:
-        * tests/TransportCurrent/lib/ORBInitializer_T.cpp:
+        * tests/Bug_2183_Regression/run_test.pl:
+          Fixed spawning of PERL process on OpenVMS.
 
-          Removed these files.
+        * tests/File_IO/run_test.pl:
+          Replaced literal timeout value ('10') with platformdependent
+          variable defined in PerlACE/Run_Test.pm for that purpose.
 
-Thu Jan  4 19:55:35 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+        * tests/Faults/test_i.cpp:
+        * tests/Crashed_Callback/Crashed_Callback.cpp:
+        * tests/Nested_Upcall_Crash/Client_Peer.cpp:
+          Fixed these tests for OpenVMS replacing ACE_OS::abort() as deliberate
+          crash trigger by ACE_OS::_exit() as using abort() causes these tests
+          to 'hang' instead of crash.
 
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp (init):
+Thu Aug 31 18:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServer.cpp:
+          With CORBA/e micro don't use single thread strategy and non
+          retain servant retention strategy
 
-          Fixed conversion warnings in RTEMS build...the old .in() for a
-          _var problem.
+Thu Aug 31 11:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Jan  4 16:32:38 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+        * tao/Messaging/Messaging_Loader.cpp:
+          Changed called_once to a real bool
 
-        * tests/Bug_2702_Regression/fakeserver2.pl:
+        * tao/Base_Transport_Property.{cpp,inl}:
+        * tao/Cache_Entries.inl:
+        * tao/Transport_Descriptor_Interface.{h,cpp}:
+          Use true/false instead of 1/0
 
-          Added "use" for Socket and IO::Socket packages.  The script
-          works just fine on many platforms without this for some reason,
-          but gave errors on the BCB build.
+        * tao/Transport_Cache_Manager.cpp:
+          Const improvements
+
+Thu Aug 31 03:35:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Asynch_Queued_Message.cpp:
+        * tao/Invocation_Adapter.cpp:
+          Fix for timed, asynch messages that happen to expire during
+          transport resolution. This fixes part of the Oneway_Timeout test.
+
+        * tests/Big_Oneways/run_test.pl:
+          This test still has an undefined intermittent deadlock, but I
+          lowered the timeout thresholds so it doesn't wait 15 minutes in
+          a deadlock condition. If any client fails, they all deadlock, so
+          there is no reason to wait 5 minutes before killing clients 2
+          and 3.
+
+        * tests/Oneway_Timeouts/client.cpp:
+        * tests/Oneway_Timeouts/run_test.pl:
+
+          Fixed a math error in run_test.pl that falsely triggered a
+          timeout failure every time. Rearranged the semantics of forced
+          connection establishment to ensure it always works without
+          regard to messaging timeouts.
+
+Wed Aug 30 13:20:38 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Connection_Handler.h:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/IIOP_Connector.cpp:
+
+          Revised the fix for bug 2417. That fix added a reference count
+          to IIOP Connection Handlers associated with pending asynch
+          connections to accomodate a reference held by an ACE component
+          that does not participate in reference counting. However,
+          blindly adding a reference caused the Connection_Handler to not
+          get cleaned up as part of ORB destruction. This then caused
+          trouble on windows platforms where any sockets that were open at
+          program termination were aborted with a RST and undelivered
+          stream content purged.
+
+          This fix gives control of this additional reference to the
+          connection handler itself, so that upon successful completion of
+          connection establishment, that reference is removed and no
+          resource is leaked.
+
+Wed Aug 30 13:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServer.cpp:
+          Don't do the process_directives for the policies that aren't supported
+          with CORBA/e micro, this will reduce the footprint for a static build
+
+Wed Aug 30 06:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2560_Regression/server.cpp:
+          No need to explicitly set the defaul thread policy, makes it possible
+          to use this test when minimum corb is enabled
+
+Wed Aug 30 04:20:00 UTC 2006  Frank Rehberger <frehberger@prismtech.com>
+
+        * NEWS: explains user-visible implications of patch #2301
+
+Tue Aug 29 21:55:05 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Profile_Transport_Resolver.cpp:
+          Fixing syntax to comply with ACE coding guidelines.
 
-Thu Jan  4 14:08:45 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Aug 29 20:02:01 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
+        * examples/POA/Forwarding/Servant_Activator.h:
 
-          Regenerate.
+        * examples/POA/Loader/Servant_Activator.h:
+        * examples/POA/Loader/Servant_Locator.h:
 
-Thu Jan  4 14:00:16 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+        * examples/POA/On_Demand_Activation/Servant_Activator.h:
+        * examples/POA/On_Demand_Activation/Servant_Locator.h:
+
+        * examples/POA/On_Demand_Loading/Servant_Activator.h:
+        * examples/POA/On_Demand_Loading/Servant_Locator.h:
+
+          These all use Servant Managers which are local objects, but need
+          to be reference counted so that they may be shutdown properly
+          and thereby release their reference to the ORB_Core so it can be
+          finalized and clean up resources it owns.
+
+Tue Aug 29 17:40:01 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Connection_Handler.cpp:
+          Explicitly call release_os_resources from the dtor.
+          Release_os_resources is a virtual method, but of course calling
+          that from the base class's destructor won't work. This fix
+          ensures that sockets are really closed when the connection
+          handler is destroyed.
+
+Tue Aug 29 17:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2560_Regression/Bug_2560_Regression.mpc:
+          Set needed idlflags and fixed build order, should fix the gcc4 linker
+          errors
+
+Tue Aug 29 13:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.cpp (schedule_output_i):
+          Check whether we have a reactor, if not, return -1, this fixes
+          bugzilla bug 2560. Thanks to Andy Salnikov <a_salnikov at yahoo dot com>
+          for reporting this bug and making a test program
+
+Tue Aug 29 12:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2560_Regression/*:
+          New regression for bug 2560. Thanks to Andy Salnikov
+          <a_salnikov at yahoo dot com> for creating this test.
+
+Tue Aug 29 11:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
+          Fixed small bug
+
+        * orbsvcs/orbsvcs/RTEvent.mpc:
+          Replaced .i with .inl
+
+Tue Aug 29 07:54:00 UTC 2006  Frank Rehberger   <frehberger@prismtech.com>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+
+          Handle location forward requests raised by colocal
+          ServerInterceptor. This fixes bug #2301.
+
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp:
+
+          Extend test to verify the forward request raised by colocal
+          ServerInterceptor is handled correctly
+
+Mon Aug 28 14:30:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * orbsvcs/tests/Security/BiDirectional/run_test.pl:
+
+          Updated the test to run in SSL mode by default.
+
+        * orbsvcs/tests/Security/BiDirectional/ssl/ca.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem:
+
+          Updated expired certificates.
+
+Mon Aug 28 12:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DII_Collocation_Tests/twoway/Hello.cpp:
+          Added needed include to fix test failures in static builds
+
+Mon Aug 28 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/Simple/run_test.pl:
+          Updated for VxWorks
+
+Mon Aug 28 09:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
         * tao/Makefile.am:
-        * tests/Compression/Makefile.am:
+          Regenerated
 
-          Tweak to use ACE_{ZLIB,ZZIP}_{CPPFLAGS,LDFLAGS,LIBS}
-          instead of -I${ZLIB_ROOT}/include, etc.  The former
-          are substituted by the configure script.
+Mon Aug 28 07:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * configure.ac:
+        * tao/Bounded_Sequence_CDR_T.h:
+        * tao/Unbounded_Sequence_CDR_T.h:
+          Only deliver the CORBA::WChar specialization when ACE_LACKS_NATIVE_WCHAR_T
+          is not defined. Thanks to Birgit Platt <bhe at newbase dot de> and
+          Jules Colding <colding at omesc dot com> for reporting this problem
+
+Sun Aug 27 11:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc:
+          New file to build this test
+
+        * tests/DII_Collocation_Tests/twoway/run_test.pl:
+          Also cleanup the simple test ior file
+
+        * tests/DII_Collocation_Tests/twoway/Server_Task.cpp:
+          Layout changes and initialiser pointer to 0
+
+Sat Aug 26 11:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2429_Regression/run_test.pl:
+          Updated work with vxworks
+
+Fri Aug 25 21:53:55 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/tao_idl.cpp:
+
+          Added an output message with the name of the IDL file
+          being processed.
+
+Fri Aug 25 15:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+          Use true/false for opt_for_collocation and use_global_collocation
+
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/GIOP_Message_Base.cpp:
+          Add include of ace/Min_Max.h to resolve compile errors with VxWorks
+          6.3 and the diab 5.4.0 compiler
+
+Thu Aug 24 13:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.{h,cpp}:
+          Removed minor_ and major_ members, where not used at all
+
+Thu Aug 24 10:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Security/BiDirectional/run_test.pl:
+        * orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl:
+          Check the result of spawn so that when there is no executable we
+          directly return an error
+
+Wed Aug 23 18:41:15 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl: Reverted changes
+          to the copy constructor so that it initializes the data members
+          properly.
+
+Wed Aug 23 17:43:29 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * tao\PortableServer\DII_Arguments_Converter.h:
+        * tao\PortableServer\DII_Arguments_Converter.cpp:
+        * tao\DynamicInterface\DII_Arguments_Converter_Impl.h:
+        * tao\DynamicInterface\DII_Arguments_Converter_Impl.cpp:
+
+          Reverted back the changes
+          "Tue Aug 22 20:28:26 UTC 2006  Yan Dai  <dai_y@ociweb.com>".
+          Added the virtual destructor to TAO_DII_Arguments_Converter
+          class to let the rtti work with gcc4 to resolve the oneway
+          test failure on gcc4 builds.
+
+Wed Aug 23 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Factory.{h,cpp}:
+        * tao/IIOP_Lite_Factory.{h,cpp}:
+        * tao/Strategies/DIOP_Factory.{h,cpp}:
+        * tao/Strategies/SCIOP_Factory.{h,cpp}:
+        * tao/Strategies/SCIOP_Lite_Factory.{h,cpp}:
+        * tao/Strategies/SHMIOP_Factory.{h,cpp}:
+        * tao/Strategies/UIOP_Factory.{h,cpp}:
+        * tao/Strategies/UIOP_Lite_Factory.{h,cpp}:
+          Removed the minor_ and major_ members, they where only initialized
+          to a value and then never used at all. Saves a few bytes of footprint
+
+Tue Aug 22 20:28:26 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * tao\PortableServer\DII_Arguments_Converter.cpp:
+        * tao\PortableServer\DII_Arguments_Converter.h:
+        * tao\DynamicInterface\DII_Arguments_Converter_Impl.h:
+        * tao\DynamicInterface\DII_Arguments_Converter_Impl.cpp:
+
+          Made the TAO_DII_Arguments_Converter service object registered
+          when PortableServer lib is loaded and the TAO_DII_Arguments_Converter_Impl
+          object will overwrite the registered "DII_Arguments_Converter" service
+          object. This would fix dynamic_cast failure when accessing the
+          "DII_Arguments_Converter" dynamic service object in Upcall_Wrapper::upcall()
+          on FC4 with gcc4.x builds. This should fix the
+          $TAO_ROOT/tests/DII_Collocation_Tests/oneway test failure on FC4 with
+          gcc4.x builds.
+
+Tue Aug 22 19:39:07 UTC 2006  Ciju John  <john@ociweb.com>
+
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+          For increased portability replaced iostream API with ACE IO
+          macros.
+
+        * tao/Wait_On_Read.cpp:
+          If reactor registration fails, the 'is_registered_' flag
+          shouldn't be set.
+
+        * tests/Oneway_Timeouts/client.cpp:
+          Std header <cmath> is contains the signature for std::abs ().
+
+Tue Aug 22 14:57:18 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Oneway_Timeouts/client.cpp:
+          Added a test case for transient exceptions. The TAO-specific
+          connection timout causes a connection attempt to give up, which
+          in turn causes the invocation endpoint selector to try
+          connecting to a new endpoint. If no more endpoints are available
+          for connecting, a transient exception is raised. Thus the ORB
+          code is working correctly, but the test was not handing the
+          transient exception as it should.
+
+Tue Aug 22 11:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
+          Initialise pointer with 0 to fix gcc4 warning
+
+Tue Aug 22 09:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport_Conector.cpp:
+          Made some debug statements consistent with the regular
+          way we format things in TAO
+
+Tue Aug 22 09:49:48 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tao/Client_Strategy_Factory.h:
+        * tao/Client_Strategy_Factory.cpp:
+        * tao/Fault_Tolerance_Service.h:
+        * tao/Fault_Tolerance_Service.inl:
+        * tao/Fault_Tolerance_Service.cpp:
+        * tao/ORB.h:
+        * tao/ORB.cpp:
+        * tao/default_client.h:
+        * tao/default_client.cpp:
+
+          Remove spurious FT methods. This fixes bug #2644.
+
+Tue Aug 22 09:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI_Server.mpc:
+          Removed invalid -Sc flag, thanks to Simon McQueen for reporting
+          this.
+
+Tue Aug 22 07:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl:
+          Added missing include
+
+Mon Aug 21 21:38:15 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-          Use ACE_PATH_ZLIB and ACE_PATH_ZZIP autoconf macros.
-          zlib and zzip can now be enabled at configure time
-          with --with-zlib and --with-zzip.
-
-Thu Jan  4 13:55:18 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
-
-          Subtracted the -St option from idlflags in the custom_only idl
-          projects.  Prior to the split, the -St option was subtracted off
-          by the anytypecode base project.
-
-Thu Jan  4 11:33:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Compression/server.cpp:
-          Extended this test to test whether the correct exception
-          is thrown when we request an invalid compressor factory
-
-Thu Jan  4 04:11:02 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/Framework.mpc:
-        * tests/TransportCurrent/Framework/run_test.pl:
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
-        * tests/TransportCurrent/IIOP/client.cpp:
-        * tests/TransportCurrent/IIOP/run_test.pl:
-        * tests/TransportCurrent/IIOP/server.cpp:
-        * tests/TransportCurrent/lib:
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/lib/Current_Test.idl:
-        * tests/TransportCurrent/lib/Current_Test_Export.h:
-        * tests/TransportCurrent/lib/Current_Test_Impl.h:
-        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
-        * tests/TransportCurrent/lib/ORBInitializer_T.h:
-        * tests/TransportCurrent/lib/ORBInitializer_T.cpp:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
-
-          Split off the IDL and the common stuff fro the two tests into a
-          lib directory and adjusted the references. This will hopefully
-          deal with the build dependency issues we have been seeing
-          recently and will eliminate the cases of duplicate compilation
-          of the IDL. Thanks to Johnny Willemsen and J.T. Conklin for the
-          ideas.
-
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Current_Test.idl:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.h:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
-
-          Moved these files to lib directory.
-
-Wed Jan  3 22:23:57 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
+
+          Removed a dependancy that the Stock_Database had on IDL.
+
+Mon Aug 21 18:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Seq_Var_T.{cpp,inl}:
+          Moved include of OS_Memory.h from cpp to inl file to resolve
+          compile problems when building static and TAO_NO_COPY_OCTET_SEQUENCES
+          is defined to 0. This file is included to get ACE_NEW which is
+          only used in the inl file
+
+Mon Aug 21 18:04:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h:
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp:
+
+          Changed a CORBA::Boolean class member to native boolean,
+          since it isn't used in a CORBA call.
+
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl:
+
+          Added a workaround IDL module called 'Components',
+          containing just enough for the IFR loader to look up
+          necessary stuff, eliminating the need to include
+          Components.idl and the corresponding dependency on CIAO.
+
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl:
+
+          Removed CIAO_ROOT/ciao from the list of include paths.
+
+Mon Aug 21 15:37:23 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp: Made the
+          simplest fix to the problem where if a UDP RTEC supplier
+          restarts while the consumer is still running, it gets duplicate
+          fragment errors.  The cost of this fix is that duplicate
+          completed requests are no longer detected.  Thanks to Keith
+          Nicewarner for these fixes.
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+          (set_state): Fixed a problem with type punning.  Thanks to
+          Thomas Girard <thomas.g.girard at free dot fr> for reporting
+          this.
+
+        * examples/Advanced/ch_8_and_10/server.cpp: Fixed a compile error
+          by adding a _duplicate() call.  Thanks to Christoph Schmalhofer
+          <christoph dot schmalhofer at gmx dot net> for contributing this
+          fix.  This fixes bugid 2611.
+
+Mon Aug 21 16:28:51 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
+        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
+        * docs/tutorials/Quoter/RTCORBA/Common.idl
+        * docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+
+          More updates to the Quoter tutorial, the most significant
+          being a redesign on the Stock_Database to make is more generic
+          and easily plugged into other Quoter examples.
+
+Mon Aug 21 10:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Bug_2510_Regression/*:
+          Integrated more advanced test, thanks to Martin Cornelius
+          <Martin dot Cornelius at smiths-heimann dot com> for creating
+          this version. This test doesn't crash anymore, probably due
+          to the recent PI refactoring
+
+Mon Aug 21 05:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Unbounded_Octet_Sequence_T.h:
+          When TAO_NO_COPY_OCTET_SEQUENCES is defined to 0 use the global
+          operator == and != to resolve compile errors with TAO. Some compilers
+          had problems with these operators so they where fully commented out
+          but this made it impossible to define TAO_NO_COPY_OCTET_SEQUENCES to
+          0 completely
+
+Sat Aug 19 22:03:03 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
+
+          Added the DII_Arguments_Converter_Impl.h include to force static builds
+          to load the DII_Arguments_Converter service.
+
+Fri Aug 18 17:00:15 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        Merged OCI changes that fix the problem that CORBA::Request::send_oneway()
+        crashes on get_in_arg() or gives incorrect arguments when the request is
+        collocated oneway request. These fixes are combination of
+        "Tue Dec 27 13:20:58 USMST 2005  Yan Dai  <dai_y@ociweb.com>" and
+        "Tue May  2 16:52:43 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>"
+        (See BugZilla #2545 for details).
+        Note this only fixed the oneway DII collocation requests, the twoway
+        collocation request was not tested yet.
+
+        * tao/Invocation_Adapter.cpp:
+        * tao/Invocation_Adapter.h:
+        * tao/Invocation_Adapter.inl:
+
+          Added is_dii_request_ data member.
+          Added an extra parameter is_dii_request(defaults to false - not a dii request)
+          to the invoke() function so it can be passed to the Operation_Details
+          to mark the request is a dii request.
+
+        * tao/operation_details.h:
+        * tao/operation_details.i:
+
+          Added is_dii_request_ data member and the accessor and added the is_dii_request
+          parameter to the constructor.
+
+        * tao/DynamicInterface/DII_Arguments.h:
+        * tao/DynamicInterface/DII_Arguments.inl:
+
+          Added accessor to the NVList.
+
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+
+          Updated upcall () to use the DII_Argument_Convert to expand the
+          DII request parameter from NVList to list of *SArgument.
+          This would make DII request parameters in NVList from the client
+          side to be changed to the list of arguments so the server side
+          can correctly retrieve the arguments.
+
+        * tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp:
+        * tao/DynamicInterface/DII_Arguments_Converter_Impl.h:
+        * tao/PortableServer/DII_Arguments_Converter.h:
+
+          An abstract class DII_Arguments_Converter is added for conversion
+          of the NVList to list of *SArgument.
+          These new files are added to resolve the library circuit dependency
+          problem. This makes the conversion of NVList to list of *SArgument
+          can be done in DynamicInterface instead of in PortableServer. The
+          expanded skel args are used in get_in_arg() to give the correct
+          "IN" arguments.
+
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+
+          Passed is_dii_request true to Invocation_Adapter constructor to
+          indicate it's a dii request invocation.
+
+        * tao/DynamicInterface/Request.cpp:
+
+          Passed is_dii_request true to construct Invocation_Adapter object to
+          indicate it's a dii request invocation.
+
+        * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
+
+          Removed the commented include.
+
+Fri Aug 18 16:18:35 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Timed_Buffered_Oneways/client.cpp:
+        * tests/Timed_Buffered_Oneways/test_i.cpp:
+
+          I am unable to reproduce the failure in this test locally. The
+          output in the scoreboard files is inconclusive, but the failure
+          seems to be consistent on the affected platforms. This is just
+          some additional output to help make sense of what might be
+          causing the failure.
+
+Fri Aug 18 13:34:43 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tao/Profile_Transport_Resolver.cpp:
+          Fix for connection timeout errors introduced by Adam's commit of
+          Justin's changes in Tue Aug 15 14:56:35 UTC 2006  Adam Mitz
+          <mitza@ociweb.com>
 
-          Corrected the return value for find_transport. The comment in
-          the method wasn't very clear and so when the new safe transport
-          pointer code was added, the return value for success and failure
-          were inadvertently altered, which broke the optimized connection
-          strategy's endpoint selector
+Fri Aug 18 13:27:02 UTC 2006  Adam Mitz  <mitza@ociweb.com>
 
-        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
+        * tests/Oneway_Timeouts/client.cpp:
+          Eliminated warnings due to using var's without ".in()".
 
-          Fixed the name used in the ACE_RCSID tag.
+Fri Aug 18 09:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Jan  3 19:53:43 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+        * tao/GIOP_Message_Generator_Parser*.*:
+          Changed all write_* methods to return a bool instead of int, the
+          return value was used as bool, so made this explicit. Also added
+          more const usage when possible.
 
-        * tao/tests/Bug_2702_Regression/server_on_localhost_1192.ior:
+        * tao/GIOP_Message_Base.cpp:
+          Use true for a bool
 
-          Added this file, which was somehow missed during the merge.
-          This should address test failures across all platforms.
+        * tao/GIOP_Mesage_Locate_Header.{h,inl}:
+          Const improvements
 
-Wed Jan  3 19:50:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/GIOP_Utils.h:
+          Removed stuff that was not used
+
+        * tao/GIOP_Utils.cpp:
+          Removed this file, not used at all
+
+        * tao/tao.mpc:
+          Removed GIOP_Utils.cpp
+
+Fri Aug 18 07:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/GIOP_Message_Base.cpp:
+          Fixed incorrect method name in debug macro. When the parsing of the
+          request header has failed, throw the marshal exception directly, don't
+          try to process the service context and assign translators, we just
+          don't know at this stage if that is safe to do, so don't do that.
+          Also in parse_request_id do the demarshaling of the service contexts
+          and the request id in two seperate steps, if the demarshaling of the
+          service context fails, then we can't demarshal the request id
+          safely.
+
+        * tao/GIOP_Message_Generator_Parser.cpp (parse_reply):
+          When the demarshaling of the request id failed then return with -1
+          instead of trying to demarshal anymore data. Also when we have
+          received an unknow reply status return -1 instead of returning 0
+
+        * tao/GIOP_Message_Generator_Parser_10.cpp :
+          In parse_request_header check whether the demarshaling of the
+          service contexts didn't fail. Also in parse_reply log an error when
+          demarshaling fails.
+
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/Transport_Cache_Manager.cpp:
+          Const improvement
 
-        * tests/Compression/run_test.pl:
-          Added perl script to run this test automatically.
+Thu Aug 17 20:46:29 UTC 2006  Adam Mitz  <mitza@ociweb.com>
 
-Wed Jan  3 19:04:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
+          Set the exename explicitly, the default wasn't behaving as expected.
+
+        * tests/Oneway_Timeouts/client.cpp:
+          Added a cast to int to eliminate Borland compiler error due to
+          ambiguous call to std::abs().
+
+        * tests/Timed_Buffered_Oneways/client.cpp:
+          Eliminated warnings due to using var's without ".in()".
+
+Thu Aug 17 12:54:58 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/lex.yy.cpp:
+
+          Touched this file, to eliminate warnings about it being possible
+          outdated, since minor changes were made in
+
+          Wed Aug 16 17:29:44 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          to idl.ll, which generates it.
+
+Wed Aug 16 21:48:22 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * docs/tutorials/Quoter/RTCORBA/docs/broker.html
+        * docs/tutorials/Quoter/RTCORBA/docs/database.html
+        * docs/tutorials/Quoter/RTCORBA/docs/distributor.html
+        * docs/tutorials/Quoter/RTCORBA/docs/idl.html
+        * docs/tutorials/Quoter/RTCORBA/docs/index.html
+        * docs/tutorials/Quoter/RTCORBA/docs/mpc.html
+        * docs/tutorials/Quoter/RTCORBA/docs/nameConsumer.html
+        * docs/tutorials/Quoter/RTCORBA/docs/prioritymapping.html
+        * docs/tutorials/Quoter/RTCORBA/docs/run.html
+          Update these files according to William R. Otte's modification to the
+          corresponding source code.
+
+Wed Aug 16 18:09:44 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
+
+          Improved valuetype memory management.
+
+Wed Aug 16 17:29:44 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/lex.yy.cpp:
+
+          Cosmetic changes.
+
+        * TAO_IDL/fe/idl.ll:
+
+          Replace overlooked instances of idl_bool with native bool,
+          and corresponding values I_TRUE and I_FALSE with the
+          native versions.
+
+        * TAO_IDL/util/utl_identifier.cpp:
+
+          In the constructor from char*, if the input arg begins
+          with '_cxx_', the logic is changed. If the tail of the
+          arg matches a C++ keyword, the arg is left unchanged.
+          Otherwise, the leading underscore is stripped as with
+          all other 'escaped' input args. This fix closes [BUGID:2634],
+          thanks to Boris Kolpackov <boris@dre.vanderbilt.edu> for
+          reporting it.
+
+Wed Aug 16 17:17:30 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/tutorials/Quoter/RTCORBA/Common_Export.h
+        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor.idl
+        * docs/tutorials/Quoter/RTCORBA/Common_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
+        * docs/tutorials/Quoter/RTCORBA/Common_i.h
+        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
+        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker.idl
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
+        * docs/tutorials/Quoter/RTCORBA/Common.idl
+        * docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+        * docs/tutorials/Quoter/RTCORBA/Admin.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+
+          This is a major overhaul of the RTCORBA tutorial to fix bugs,
+          correct a broken priority model, and add new features.
+
+          Thanks to Doug Schmidt for providing code, feedback, and suggestions.
+
+Wed Aug 16 15:35:29 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp: fixed warning (unused arg)
+        * tao/Asynch_Queued_Message.h: fixed error in VERSIONED_NAMESPACE build
+
+Tue Aug 15 21:25:50 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tao/PortableServer/Servant_var.h:
+        * tao/PortableServer/Servant_var.inl:
+
+          Removed the member templates as
+          - They dodn't seem to be serving any purpose. It appears that the
+          only reason these member templates were defined was so that the
+          hand-crafted constructor could be declared to be
+          explicit. However since the member template constructor is
+          implicit this just adds complexity without any benefits.
+          - They were causing build problems in SunStudio 11 builds and
+          VxWorks builds using gcc 2.96.
+
+          Made the Servant_var constructor implicit to comply with the c++
+          language mapping.
+
+Wed Aug 16 08:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl
+        * tao/PortableServer/PortableServer_include.pidl
+        * tao/RTCORBA/RTCORBA_include.pidl
+          Added empty pragma prefix to be able to compile these pidl files
+          correctly when the visual age preprocessor is used on AIX
+
+Wed Aug 16 04:47:24 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * tests/Timed_Buffered_Oneways/client.cpp:
+          Added #include for ACE_OS::gettimeofday().
+
+Tue Aug 15 19:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Policies/Policies.mpc:
+          Simplified this file
+
+Tue Aug 15 17:57:20 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/driver/drv_preproc.cpp (drv_post_init):
+
+          Added check for environment variable CIAO_ROOT when adding
+          default include paths for CIAO_ROOT and CIAO_ROOT/ciao. This
+          check is necessary if the middleware SubVersion modules have
+          been checked out in non-nested mode, since in that case,
+          CIAO_ROOT cannot be derived from TAO_ROOT or ACE_ROOT.
+
+Tue Aug 15 17:24:05 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/Strategies/SCIOP_Endpoint.cpp (preferred_interfaces):
+
+          Use new ACE_CString::size_type type to hold string
+          position/index value, instead of "int".  Addresses "comparison
+          between signed and unsigned" warnings.
+
+Tue Aug 15 14:56:35 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        Checking in on behalf of Justin Michel <michel_j at ociweb dot com>...
+
+        Fixed bugs related to OCI RT8769. There were several problems
+        identified in this ticket.
+
+        All of these changes are on the branch "OCI_Oneway_Buffering".
+
+        1. The SyncScopes SYNC_NONE, SYNC_DELAYED_BUFFERING, and
+           SYNC_EAGER_BUFFERING use non-blocking connects, but the
+           non-blocking connect mechanism allows the caller to
+           effectively block, because it enters the reactor.  (Even
+           though it used a timeout of zero, this still makes it
+           possible for the caller to be blocked.)  The solution is to
+           queue any messages until the connection is complete, and to
+           rely on the reactor to complete the connection. This was
+           already implemented, and the fix just involved NOT polling
+           the reactor. A side-effect of this change, is that
+           applications that make connections within oneway requests
+           with the above SyncScope policies must call orb->run() to
+           complete the connection. Alternatively an invocation that
+           doesn't use the above SyncScopes can be made to complete
+           the connection.
+
+        2. Connection and request timeouts did not work correctly for
+           every scenario. (e.g. For non-blocking connects, the
+           request timeout should not be used even if it's less than
+           the connect timeout, because the connect does not happen in
+           the context of the request.)  The fix required numerous
+           changes detailed below.
+
+        3. Queued messages would never be expired even if a roundtrip
+           request timeout policy was in place. The solution is to
+           calculate an absolute expiration time for queued
+           asynchronous messages that have timeouts. The messages are
+           then discarded in Transport::drain_queue_i() if expired.
+
+        4. Connection timeouts result in TRANSIENT instead of TIMEOUT.
+           The fix required numerous changes detailed below.
+
+        5. Queued messages were flushed at connection startup, which
+           effectively ignored the buffering constraint policies.
+           Removed the code that flushed the messages.
+
+        * NEWS: explains user-visible implications of these changes
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp:
+        * tao/Messaging/Messaging_Policy_i.cpp:
+
+          Enhanced display of millisecond timeouts in log
+          messages. Log messages now say "Connect timeout <50ms>" or
+          "Request timeout <100ms>" instead of "timeout <100>".
+
+        * examples/Buffered_Oneways/client.cpp:
+
+          Add a check to make sure that the test is run with a valid
+          buffering constraint policy.
+
+        * tao/Connection_Handler.h:
+        * tao/Connection_Handler.inl:
+
+          Added an is_timeout() method for Connection_Handler() so that
+          we can tell the difference between a timeout and a close.
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/IIOP_Connector.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/SCIOP_Connector.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connector.cpp:
+
+          Update log message during IIOP_Connection_Handler::open() to
+          show ip address and port instead of just ip address.
+
+          Update all connection handlers that closed a connection due
+          to timeout to set the state to TAO_LF_Event::LFS_TIMEOUT
+          instead of closed.
+
+          Changed xxx_Connector to NOT set synch_options.timeout() to
+          ACE_Time_Value::zero when the connect is
+          non-blocking. Setting it here is unnecessary and prevents
+          non-blocking timeouts from working.
+
+          Update the IIOP_Connector logged error message to show
+          errno in addition to the errno description.
+
+          Increment the reference count of the xxx_Connection_Handler
+          when the xxx_Connector is unable to complete the connection
+          synchronously. (Same as BugZilla 2417, but for all protocols
+          instead of just IIOP.)
 
         * tao/Invocation_Adapter.cpp:
-        * tao/Messaging/Asynch_Invocation.cpp:
-        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+
+          Move the max_wait_time variable to an inner scope in
+          Invocation_Adapter::invoke_i(), because it wasn't needed in
+          most code paths.
+
+        * tao/Profile_Transport_Resolver.cpp:
+
+          Fixed the logic in profile_transport_resolver::resolve() to
+          correctly detect TIMEOUT exceptions, and to ensure that the
+          connection timeout uses the minimum of the connection
+          timeout policy and request timeout for blocking
+          connects. Also ensure that request timeout is never used as
+          the connection timeout for non-blocking connects.
+
+        * tao/Asynch_Queued_Message.h:
+        * tao/Asynch_Queued_Message.cpp:
+        * tao/Queued_Message.h:
+        * tao/Queued_Message.cpp:
+        * tao/Synch_Queued_Message.cpp:
+
+          Add expiration time to Asynch_Queued_Messages. The
+          constructor now takes an ACE_Time_Value for the relative
+          timeout. If the timeout is nonzero and nonnull then it is
+          used to calculate an absolute expiration time using the high
+          res timer.
+
+          Update Queued_Message constructor to allow specifying an
+          absolute timeout, and a new is_expired() method to check
+          whether the queued message is expired.
+
+
         * tao/Synch_Invocation.cpp:
-          Const improvements
+        * tao/Transport.h:
+        * tao/Transport.cpp:
 
-        * tao/Invocation_Base.cpp (handle_any_exception):
-          Check whether we had a location forward, if so, return
-          LOCATION_FORWARD. This fixes bugzilla bug 2763. Thanks to
-          Jaiganesh Balasubramanian for reporting this and testing
-          the patch.
+          Update various places in Transport and Synch_Invocation to
+          create queued messages with the correct timeout value. This
+          includes ensuring that partially delivered messages can
+          never timeout.
 
-Wed Jan  3 18:47:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Update Transport to discard expired messages. This happens
+          in drain_queue_i().
 
-        * tests/Portable_Interceptors/Redirection/test.idl:
-          Added missing Id tag.
+          Add more descriptive logging output to
+          Transport::cleanup_queue_i.
 
-Wed Jan  3 16:05:58 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+          Update Transport post_open to NOT flush queued
+          messages. This effectively ignored the specified buffering
+          constraint policies.
 
-        * MPC/config/endpointpolicy.mpb:
-        * TAO_IDL/tao_idl.mpc:
-        * orbsvcs/Concurrency_Service/Concurrency_Service.mpc:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.mpc:
-        * orbsvcs/Dump_Schedule/Dump_Schedule.mpc:
-        * orbsvcs/Event_Service/Event_Service.mpc:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-        * orbsvcs/Fault_Detector/Fault_Detector.mpc:
-        * orbsvcs/Fault_Notifier/Fault_Notifier.mpc:
-        * orbsvcs/IFR_Service/IFR_Service.mpc:
-        * orbsvcs/LoadBalancer/LoadBalancer.mpc:
-        * 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:
-        * orbsvcs/Naming_Service/Naming_Service.mpc:
-        * orbsvcs/Notify_Service/Notify_Service.mpc:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.mpc:
-        * orbsvcs/TAO_Service/TAO_Service.mpc:
-        * orbsvcs/Time_Service/Time_Service.mpc:
-        * orbsvcs/Trading_Service/Trading_Service.mpc:
-        * 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/CosNaming_Serv.mpc:
-        * orbsvcs/orbsvcs/CosNaming_Skel.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:
+        * tao/Transport_Connector.cpp:
+
+          Update Transport_Connector to correctly detect timed out
+          connections. Also fixed the code that checked the return
+          value of
+          base_transport->wait_strategy()->register_handler(). This
+          was recently changed from "if != 0" to "if == 0", but the
+          correct check for failure should be "if == -1".
+
+          Updated Transport_Connector to not enter the wait strategy
+          for non-blocking connects. Instead we rely on the
+          application to eventually call orb->run() which will
+          complete the connection, and send any queued messages.
+
+        * tao/Transport_Queueing_Strategies.cpp:
+
+          Update Eager_Transport_Queuing_Strategy to not use a pointer
+          to something that looks like it could go out of scope. I
+          think the code was actually safe, but it was confusing.
+
+        * tao/Block_Flushing_Strategy.cpp:
+        * tao/Flushing_Strategy.h:
+
+          Change block_flushing strategy to NOT synchronously flush in
+          the schedule_output() method. Instead we added a new special
+          return value indicating that the caller should do the flush
+          immediately. This allows the calling code to hold a lock
+          during the call to schedule_output() that can be released
+          before calling flush_transport().
+
+        * tests/AMI_Buffering/client.cpp:
+        * tests/AMI_Buffering/run_buffer_size.pl:
+        * tests/AMI_Buffering/run_message_count.pl:
+        * tests/AMI_Buffering/run_test.pl:
+        * tests/AMI_Buffering/run_timeout.pl:
+        * tests/AMI_Buffering/run_timeout_reactive.pl:
+        * tests/Oneway_Buffering/client.cpp:
+        * tests/Oneway_Buffering/run_buffer_size.pl:
+        * tests/Oneway_Buffering/run_message_count.pl:
+        * tests/Oneway_Buffering/run_test.pl:
+        * tests/Oneway_Buffering/run_timeout.pl:
+        * tests/Oneway_Buffering/run_timeout_reactive.pl:
+        * tests/Queued_Message_Test/Queued_Message_Test.cpp:
+        * tests/Timed_Buffered_Oneways/client.cpp:
+        * tests/Timed_Buffered_Oneways/run_test.pl:
+        * tests/Timed_Buffered_Oneways/server.cpp:
+        * tests/Timed_Buffered_Oneways/test.idl:
+        * tests/Timed_Buffered_Oneways/test_i.h:
+        * tests/Timed_Buffered_Oneways/test_i.cpp:
+
+          Updated various tests to comply with the above changes.
+
+          Fixed tests that used sync_none or sync_delayed_buffering
+          without calling orb->run().
+
+        * tests/Oneway_Timeouts:
+        * tests/Oneway_Timeouts/Test.idl:
+        * tests/Oneway_Timeouts/client.cpp:
+        * tests/Oneway_Timeouts/run_test.pl:
+        * tests/Oneway_Timeouts/server.cpp:
+        * tests/Oneway_Timeouts/test.mpc:
+
+          Added new test for various combinations of timeouts with oneways:
+          connection timeouts and relative round-trip timeouts.
+
+Tue Aug 15 14:02:23 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+
+          Before cloning the arguments, check to make sure that we have at
+          least one argument/return value.
+
+Tue Aug 15 11:37:06 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/AnyTypeCode/TypeCode.h:
+
+          Changed the export on In_Object_Argument_Cloner_T from TAO_Export
+          to TAO_AnyTypeCode_Export.  Thanks to Johnny Willemsen for
+          pointing out the build warnings.
+
+Tue Aug 15 11:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_Reply/Client_Task.cpp:
+          Added some more debug output to better see why this test fails on
+          OpenVMS.
+
+Tue Aug 15 10:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/RTCORBA/Server_Protocol/run_test.pl:
+          OpenVMS doesn't have uiop
+
+Tue Aug 15 10:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2503_Regression/run_test.pl:
+          Extended wait time for server to let this test succeed on OpenVMS
+
+        * tests/RTCORBA/Client_Protocol/run_test.pl:
+          Small update for OpenVMS
+
+Tue Aug 15 08:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_1393_Regression/run_test.pl:
+        * tests/CollocationLockup/CollocationLockup.mpc:
+        * tests/Bug_2494_Regression/Bug_2494_Regression.mpc:
+        * tests/Abstract_Interface/Abstract_Interface.mpc:
+        * orbsvcs/tests/Trading/Trading.mpc:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
+        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
+        * orbsvcs/orbsvcs/SSLIOP.mpc:
         * orbsvcs/orbsvcs/HTIOP.mpc:
-        * orbsvcs/orbsvcs/IFRService.mpc:
-        * orbsvcs/orbsvcs/PortableGroup.mpc:
-        * orbsvcs/orbsvcs/RTCORBAEvent.mpc:
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
-        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
-        * orbsvcs/orbsvcs/RTKokyuEvent.mpc:
-        * orbsvcs/orbsvcs/RTSched.mpc:
-        * orbsvcs/orbsvcs/RTSchedEvent.mpc:
-        * orbsvcs/orbsvcs/RT_Notification.mpc:
+        * tao/ImR_Client.mpc:
+        * tao/PI.mpc:
+          Don't use -Sc as tao_idl option, this doesn't exist anymore
+
+Tue Aug 15 08:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+          Const improvement
+
+        * tao/RTPortableServer.mpc:
+        * tao/RTScheduler.mpc:
+          Fixed regeneration instructions
+
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+          Cleanup of old stuff
+
+Mon Aug 14 19:05:38 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Object_Adapter.cpp:
+
+          Made the TAO_Object_Adapter keep a reference to POAManager
+          object on minimum corba builds to fix leaking of POAManager object.
+
+Mon Aug 14 17:21:00 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+
+          Fixed a bug in open() on minimum corba builds. The problems is
+          the new poa_manager passed to create_Root_POA() was actually
+          destructed when exit from open() function. This would cause
+          access violation when application access the poa manager in
+          the Root_POA.
+
+Mon Aug 14 13:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/*.h:
+          Added /**/ to the include of the export and versioned
+          namespace files to get them out of the doxygen include
+          pictures
+
+Mon Aug 14 13:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer.mpc:
+          Enabed regeneration of PortableServer.pidl
+
+        * tao/PortableServer/PortableServer{A,C,S}.{h,cpp}:
+        * tao/PortableServer/diffs/PortableServer.diff:
+          Removed from the repo
+
+Mon Aug 14 12:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CodecFactory.mpc:
+        * tao/ObjRefTemplate.mpc:
+        * tao/PortableServer.mpc:
+        * tao/RTCORBA.mpc:
+        * tao/RTPortableServer.mpc:
+        * tao/RTScheduler.mpc:
+        * tao/PI_Server.mpc:
+          Enabed regeneration of *_include.pidl files, this will result
+          in an almost empty C.cpp file but that is needed to retrigger
+          the regeneration of the header files.
+
+        * tao/CodecFactory/IOP_Codec_include{A,C,S}.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_include{A,C,S}.h:
+        * tao/PI_Server/PI_Server_include{A,C,S}.h:
+        * tao/PortableServer/PortableServer_include{A,C,S}.h:
+        * tao/RTCORBA/RTCORBA_include{A,C,S}.h:
+        * tao/RTPortableServer/RTPortableServer_include{A,C,S}.h:
+        * tao/RTScheduling/RTScheduler_include{A,C,S}.h:
+        * tao/RTScheduling/diffs/RTScheduler.diff:
+        * tao/RTPortableServer/RTPortableServerA.h:
+          Removed from the archive
+
+Mon Aug 14 12:49:11 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO_IDL/be_include/be_global.h:
+
+          Added a new option (-b) which controls the use of clonable in
+          arguments on oneway calls.
+
+        * tao/AnyTypeCode/TypeCode.h:
+        * tao/AnyTypeCode/TypeCode.cpp:
+        * tao/Argument.h:
+        * tao/Argument.cpp:
+        * tao/BD_String_Argument_T.h:
+        * tao/BD_String_Argument_T.inl:
+        * tao/BD_String_Argument_T.cpp:
+        * tao/Basic_Argument_T.h:
+        * tao/Basic_Argument_T.inl:
+        * tao/Basic_Argument_T.cpp:
+        * tao/Basic_Arguments.h:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/Fixed_Array_Argument_T.h:
+        * tao/Fixed_Array_Argument_T.inl:
+        * tao/Fixed_Array_Argument_T.cpp:
+        * tao/Fixed_Size_Argument_T.h:
+        * tao/Fixed_Size_Argument_T.inl:
+        * tao/Fixed_Size_Argument_T.cpp:
+        * tao/Object.h:
+        * tao/Object.cpp:
+        * tao/Object_Argument_T.h:
+        * tao/Object_Argument_T.inl:
+        * tao/Object_Argument_T.cpp:
+        * tao/Special_Basic_Argument_T.h:
+        * tao/Special_Basic_Argument_T.inl:
+        * tao/Special_Basic_Argument_T.cpp:
+        * tao/UB_String_Argument_T.h:
+        * tao/UB_String_Argument_T.inl:
+        * tao/UB_String_Argument_T.cpp:
+        * tao/Var_Array_Argument_T.h:
+        * tao/Var_Array_Argument_T.inl:
+        * tao/Var_Array_Argument_T.cpp:
+        * tao/Var_Size_Argument_T.h:
+        * tao/Var_Size_Argument_T.inl:
+        * tao/Var_Size_Argument_T.cpp:
+
+          Created "clonable" template classes based on all In_*_Argument_T.
+          Through the use of traits, the clonable templates are not
+          instantiated unless the idl generated code uses them (through the
+          -b option).
+
+          Code in the CSD_FW_Server_Request is able to determine if the
+          arguments (for collocated oneway's) can be cloned or not.  If they
+          can be, they will be cloned during the copy of the server request.
+          If they can not be cloned, it will use the original method of
+          marshaling the pararameters to copy them. [RT 8372]
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc:
+
+          Use the -b option for the idl files in these projects.  I left
+          some CSD tests to not use the -b option to exercise both methods
+          of argument copying.
+
+Mon Aug 14 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode_Case_Enum_T.{h,cpp,inl}:
+          Fixed gcc warnings
+
+Mon Aug 14 10:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+          Part of fixes for bug 2605, when generating the include of
+          config-all.h, Versioned_Namespace.h and the export include
+          do generate /**/ between the include statement and the filename
+          so that doxygen doesn't add these standard includes to the
+          include picture to make them more readable.
+
+Mon Aug 14 09:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/compiler.html:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+          Added -Wb,unique_include as option, when this is specifified
+          instead of the normal includes only the specified include is
+          done. This is needed for regeneration the *_include.pidl files
+          in the archive as part of the regular build
+
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+          Generate false instead of 0
+
+Mon Aug 14 09:07:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * examples/Simulator/Event_Supplier/Logging_Sup.cpp:
+          Small OpenVMS compatibility changes.
+
+Mon Aug 14 08:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/Messaging.h:
+        * tao/Messaging/messaging_export.h:
+          Moved the undef of TRANSPART to the export file to fix
+          compile errors on solaris. This way we don't need to handcraft
+          generated files for the messaging lib
+
+Mon Aug 14 07:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode_Case_Enum_T.{h,cpp,inl}:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+          Fixed handling of union with enums. This fixes bugzilla bug
+          2446, thanks to Tommy Persson <tpe at ida dot liu dot se> for
+          reporting this bug. Also it fixes bugzilla bug 2539 which
+          has been reported by sdjiangwei@sina.com. The real fix has
+          been made by Dale Boan <boan at sedsystems dot ca>, many thanks
+          to him.
+
+Sun Aug 13 23:30:02 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+          These changes excluded the POAManagerFactory and EndpointPolicy
+          from minimum corba, minimum poa and CORBA/e builds.
+
+        * tao/PortableServer/POA.pidl:
+
+          Excluded the_POAManagerFactory attribute in POA.
+
+        * tao/PortableServer/POAManagerFactory.pidl:
+
+          Excluded POAManagerFactory interface.
+
+        * tao/PortableServer/POAManager.cpp:
+        * tao/PortableServer/POAManager.inl:
+        * tao/PortableServer/POAManager.h:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Acceptor_Filter_Factory.cpp:
+        * tao/PortableServer/Acceptor_Filter_Factory.h:
+        * tao/PortableServer/POAManagerFactory.cpp:
+        * tao/PortableServer/POAManagerFactory.h:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Root_POA.h:
+
+          Excluded the use of POAManagerFactory in the code.
+
+        * tao/EndpointPolicy.mpc:
+        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
+        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
+
+          Made these projects inherit from minimum_corba.
+
+Fri Aug 11 12:49:55 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tests/Optimized_Connection/Optimized_Connection.mpc:
+        * tests/Optimized_Connection/README:
+        * tests/Optimized_Connection/Test.idl:
+        * tests/Optimized_Connection/oc.ior:
+
+          This test was failing on OpenVMS due to the way the linker
+          handles template instantiations. Copied the Hello test IDL here,
+          so the test is now self-contained.
+
+Fri Aug 11 11:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTPortableServer/RT_POA.{h,cpp}:
+          CORBA/e changes
+
+        * tao/Utils/Auto_Function.h:
+          Marked this header as deprecated
+
+Fri Aug 11 09:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IFR_Client.mpc:
+          Added -GX to the generation of the pidl files to get empty
+          A.h files
+
+        * tao/IFR_Client/*A.h:
+          Removed from the repo, do get regenerated now automatically
+
+Fri Aug 11 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_produce.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * docs/compiler.html:
+          Added -Scc to suppress generation of client stub and -Ssc of
+          generation of server skeleton file. These options don't check
+          if something is generated in these files or not, they just
+          suppress the generation. Usefull for some pidl files in the
+          core libraries. This fixes bugzilla 2631
+
+Fri Aug 11 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+          Initialise pointer with 0 to address gcc 4.1 warning
+
+Fri Aug 11 07:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/Messaging_Types.pidl:
+          Moved all policy type constants to this new pidl file that is
+          included by the other pidl files. This way the catior utility
+          only needs to include the generated client file for this pidl
+          file.
+
+        * tao/Messaging/Messaging_No_Impl.pidl:
+        * tao/Messaging/Messaging_RT_Policy.pidl:
+        * tao/Messaging/Messaging_SyncScope_Policy.pidl:
+          Moved the policy constants out of these file and included the
+          new file above
+
+        * tao/Messaging.mpc:
+          Added new pidl file
+
+        * tao/utils/catior/catior.cpp:
+          Include Messaging_TypesC.h instead of all seperate messaging
+          files.
+
+Thu Aug 10 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging.mpc:
+          Enabled regeneration of Messaging_No_Impl.pidl. This had a diff
+          to undef TRANSPARENT if it was defined, we moved that to
+          Messaging.h
+
+        * tao/Messaging/diffs/*:
+          Removed, not needed anymore
+
+        * tao/Messaging/Messaging.h:
+          Undef TRANSPARENT when it is defined
+
+        * tao/Messaging/Messaging.pidl:
+          Documentation cleanup
+
+        * tao/Messaging/Messaging_No_Impl{A,C,S}.{h,cpp,inl}:
+          Removed, will get regenerated as part of the build
+
+Thu Aug 10 12:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          In the server header include the safe include when this is defined
+
+        * tao/Messaging.mpc:
+          Enabled regeneration of Messaging.pidl and added some -GX flags to
+          get the empty A.h files
+
+        * tao/Messaging/Messaging_No_ImplS.h:
+          Added empty file, needed because Messaging.pidl gets regenerated
+
+        * tao/Messaging/Messaging.pidl:
+          Removed include of OldExceptionHolder.pidl which got removed some
+          time ago.
+
+        * tao/Messaging/Messaging{A,C,S}.{h,cpp,inl}:
+          Removed because they get regenerated as part of the build
+
+Thu Aug 10 10:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be/be_codegen.cpp:
+        * docs/compiler.html
+          Added -GX option, generates an empty A.h file. This can be used
+          for the pidl files in the archive which can't be build with -GA
+          but we do need an A.h file to not get compile errors when end
+          users do include the pidl files directly.
+
+        * tao/CodecFactory.mpc:
+        * tao/ImR_Client.mpc:
+        * tao/ObjRefTemplate.mpc:
+        * tao/PI.mpc:
+        * tao/RTScheduler.mpc:
+        * tao/IORManipulation.mpc:
+          Use the new -GX option
+
+        * tao/CodecFactory/IOP_CodecA.h:
+        * tao/ImR_Client/ImplRepoA.h:
+        * tao/IORManipulation/IORA.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateA.h:
+        * tao/PI/ORBInitInfoA.h:
+        * tao/RTScheduling/RTSchedulerA.h:
+          Removed from the repo, do get generated now with -GX.
+
+Thu Aug 10 09:43:56 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CodecFactory/IOP_Codec.pidl:
+        * tao/CSD_Framework/CSD_Framework.pidl:
+          Documentation improvements
+
+        * tao/Connector_Registry.cpp:
+          Improved some debug statements to mention the class and method
+          where the debug message is coming from
+
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+          Initialize some pointers with 0
+
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/Invocation_Adapter.cpp:
+        * tao/LocateRequest_Invocation_Adapter.cpp:
+        * tao/operation_details.{h,inl}:
+          Removed the argument_flag as member, we just determine whether
+          we have arguments or not on the number of arguments. Changed the
+          accessor to just check it when requested. Introduced a flag
+          whether the stub arguments should be used or not, this can
+          then be changed is some part of the code knows the stub
+          arguments are not valid, for example with AMI.
+
+        * tao/operation_details.h:
+          Guarded the ft_* methods with TAO_HAS_INTERCEPTORS, the
+          implementation did use the macro, just not the declaration
+
+        * tao/extra_core.mpb:
+          Removed a generated file from the list of files
+
+        * tao/GIOP_Message_Generator_Parser_12.cpp:
+        * tao/Service_Context.{h,inl}:
+          is_service_id is now returning a real bool
+
+        * tao/Messaging/Async_Invocation_Adapter.{h,cpp}:
+          Overruled invoke_collocated_i to set the use_stub_args
+          flag in the operations details to false, when using
+          collocation we should use the skeleton arguments. This fixes
+          bugzilla bug 2503, thanks to Charles Frasch <cfrash at atdesk dot com>
+          for reporting this bug.
+
+        * tao/PortableServer/get_arg.h:
+          Use the operation_details stub_args method to determine
+          which args should be used
+
+        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+          Small optimization for AMI operations with just out arguments as
+          supplied by Ossama Othman as partly fix for bug 2503.
+
+        * tao/PortableServer/Root_POA.cpp:
+          Don't use POAManagerFactory with CORBA/e compact.
+
+Wed Aug  9 15:00:55 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp:
+          Added dependency on ImR_Client library so that static builds can make
+          use of ImR features without dynamic library loading.
+
+Tue Aug  8 22:39:56 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tao/CSD_ThreadPool.mpc:
+          Replaced the requires for threads with dependency upon
+          threads.mpb which does essentially the same thing. Only looks
+          cleaner.
+
+Wed Aug  9 13:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2503_Regression/run_test.pl:
+          No need to run the client with orb debug level 10
+
+Wed Aug  9 08:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/RT_Protocol_Hooks.cpp:
+          Use true instead of 1
+
+        * tao/RTCORBA/RTCORBA.pidl:
+          Doxygen changes
+
+Tue Aug  8 14:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BiDIR_GIOP/BiDir_PolicyFactory.cpp:
+          No need to extract the value twice out of the any
+
+Tue Aug  8 14:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tests/Codesets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h:
+        * tao/tests/Codesets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h:
+        * tao/tests/Codesets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.h:
+          Updated includes because of the removal of Codeset_Translator_Factory.h
+          from the core TAO directory
+
+Tue Aug  8 09:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+          Initailize some pointers explicitly with 0 to fix gcc41 warnings
+
+Tue Aug  8 09:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/ast/ast_type.cpp:
+          Initailize some pointers explicitly with 0 to fix gcc41 warnings
+
+Tue Aug  8 08:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Codeset_Translator_Factory.h:
+          Removed, it was deprecated for more then a year
+
+        * tao/tao.mpc:
+          Removed remark about Codeset_Translator_Factory.h
+
+Tue Aug  8 07:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Removed vc6 info, added VxWorks 6.3 as supported platform
+
+Tue Aug  8 07:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+          Fixed typo in comment
+
+Mon Aug  7 19:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/EndpointPolicy.mpc:
+          Enabed regeneration of EndpointPolicyType.pidl:
+
+        * tao/EndpointPolicy/EndpointPolicy{A,C}.{h,cpp}:
+          Removed, not needed anymore
+
+        * tao/EndpointPolicy/EndpointPolicyType.pidl:
+          Include Policy_Forward.pidl, Policy.pidl pulls in too
+          much.
+
+        * tao/BiDIR_GIOP/BiDIR_GIOP.{h,cpp}:
+          Changed is_activated to a bool
+
+        * tao/Profile.cpp (decode):
+          Only get encap_len when ACE_NLOGGING is not defined, if it is
+          defined then we don't use this variable, so no need to get it.
+
+Mon Aug  7 17:06:52 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/PortableServer/POAManagerFactory.cpp:
+
+          Removed hard coded policy checking in create_POAManager().
+          Instead, the TAO_Policy_Validator is used to validate the
+          policies.
+
+        * tao/orbconf.h:
+
+          Fixed a bug that the TAO_CACHED_POLICY_ENDPOINT was set
+          after TAO_CACHED_POLICY_MAX_CACHED. This would fix the
+          access beyond cached_policies_ array bound problem.
+
+        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
+
+          Fixed a bug in TAO_EndpointPolicy_Factory::create_policy()
+          that initializes the local variable "found_one" to true which
+          makes the supplied endpoints are never verified against
+          the ORB listening endpoints.
+
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.h:
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp:
+
+          Fixed a bug that does not count all endpoints if multiple
+          endpoint policies are supplied. Previously, it just counted
+          the endpoints in the first endpoint policy.
+
+        * tao/EndpointPolicy/EndpointPolicy_i.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_i.h:
+
+          Added virtual destructor and reset endpoint_list to length 0
+          when the policy is destroyed.
+
+        * tao/EndpointPolicy/IIOPEndpointValue_i.cpp:
+
+          Removed the duplicate of the const char* ("") since the
+          CORBA::String_var constructor duplicates the string internally.
+
+Mon Aug  7 11:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IORManipulation/IOR.pidl:
+          Converted documentation to doxygen style
+
+Fri Aug  4 09:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/default_resource.{h,cpp}:
+        * tao/IIOP_Transport.{h,cpp}:
+        * tao/MMAP_Allocator.{h,cpp}:
+        * tao/orbconf.h:
+        * tao/Transport.{h,cpp}:
+        * docs/Options.html:
+          Added TAO_HAS_SENDFILE, this is set to 1 when ACE_HAS_SENDFILE
+          is enabled, else it is set to 0. Users can explicitly define
+          this to 0 also to build TAO without sendfile support, this
+          reduces then the footprint for applications running on a
+          platform that supports sendfile but where the app doesn't
+          use it. This fixes bugzilla bug 2587.
+
+Wed Aug  2 22:47:53 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * NEWS:
+
+          Added a note about the valuetype fix.
+
+Wed Aug  2 21:51:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Valuetype/ValueBase.cpp:
+        * tao/Valuetype/ValueBase.h:
+
+          Restore the ability to properly interpret indirect repository
+          IDs for valuetypes to improve interoperability with other ORBs,
+          notably JacORB. Secondarily, I've renamed some internal
+          (private) methods to include the prefix _tao_ so as to avoid
+          potential namespace collisions with names generated by the IDL
+          compiler.
+
+          Thanks to Eric Danielou <eric dot danielou at eads dot com>
+          for identifying this flaw.
+
+Wed Aug  2 21:32:27 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/examples/ImR/Advanced/run_test.pl:
+        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
+        * orbsvcs/tests/ImplRepo/scale/run_test.pl:
+        * orbsvcs/tests/Notify/Reconnecting/run_test.pl:
+        * orbsvcs/tests/Notify/XML_Persistence/run_test.pl:
+
+          In each case, the Perl scripts were depending on the fact that
+          $TAO_ROOT and $ACE_ROOT/TAO were the same value.  These changes
+          make use of the new $PerlACE::TAO_ROOT variable so that the tests
+          will run when $TAO_ROOT is not $ACE_ROOT/TAO but still assume that
+          $TAO_ROOT is $ACE_ROOT/TAO if $TAO_ROOT is not set.
+
+Wed Aug  2 20:15:37 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+          Updated comment to reflect what's actually in the code.
+
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+
+          This is a fix for bugzilla bug #2604.  This only applies to
+          per_client activation mode.  The ImR may receive
+          "server_is_running()" invocations from servers that it did
+          not launch (they may have been launched by a prior instance
+          of the ImR or manually).  When this happens the ImR records
+          the info about the running server and places it on a queue.
+          Later, when a client request comes in a new server is
+          launched (as it should be), but the old queued server info is
+          used to ping it.  This can fail with various exceptions
+          depending on if the old process is still alive or if some
+          other process is now running on its port.  If it fails enough
+          times (greater than the retry count) the client invocation
+          will fail.  The fix is simply to keep track of whether or not
+          the ImR expects a new server (that it launched) to be coming
+          online.  If not, it can ignore the server_is_running().  This
+          mechanism is already in place for normal activation, but due
+          to differences in per_client it doesn't work there.
+
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/README:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl:
+
+          New regeression test for the bugfix described above.
+
+Wed Aug  2 15:11:08 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
+
+          Do not transmit a FT_REQUEST service context if the destination is
+          not an IOGR (i.e. does not contain a IOP::TAG_FT_GROUP component).
+
+        * orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc:
+        * orbsvcs/tests/Bug_2615_Regression/Hello.h:
+        * orbsvcs/tests/Bug_2615_Regression/Hello.cpp:
+        * orbsvcs/tests/Bug_2615_Regression/README:
+        * orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h:
+        * orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp:
+        * orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h:
+        * orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp:
+        * orbsvcs/tests/Bug_2615_Regression/Test.idl:
+        * orbsvcs/tests/Bug_2615_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2615_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_2615_Regression/server.cpp:
+
+          Regression test for the above.
+
+Wed Aug  2 13:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicInterface/DII_Invocation_Adapter.{h,cpp}:
+          Doxygen improvements
+
+Wed Aug  2 12:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
+          Don't run the UIOP test on OpenVMS
+
+Tue Aug  1 07:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Bug_2619_Regression.idl:
+        * tests/IDL_Test/IDL_Test.mpc:
+          New regression for bug 2619, confirms that this is fixed. Thanks
+          to Graeme Bell <graemeb at econz dot com> for reporting this.
+
+Fri Jul 28 18:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Bug_2616_Regression.idl:
+          Made the types unique within the IDL_Test project
+
+Fri Jul 28 15:38:11 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Makefile.am
+        * orbsvcs/tests/Event/lib/Makefile.am
+        * orbsvcs/tests/Security/Crash_Test/Makefile.am
+        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+        * orbsvcs/tests/EC_Mcast/Makefile.am
+        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
+        * orbsvcs/examples/Security/Send_File/Makefile.am
+        * tao/Makefile.am
+        * performance-tests/POA/Demux/Makefile.am
+        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
+        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
+
+          Fixed Makefile.ams to reflect changes from
+          Thu Jul 27 20:50:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+Fri Jul 28 14:29:53 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Most remaining run_test.pl and run_all.pl scripts
+
+          These scripts were missing from
+          Fri Jul 28 00:44:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>,
+          as they used " instead of ' in their use lib line.
+
+Fri Jul 28 14:08:35 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_lookup.cpp
+
+          Rolled this file back a version, accidentally got pulled in by
+          Thu Jul 27 20:50:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/fe/lex.yy.cpp
+
+          Re committing this file to update the timestamp.
+
+Fri Jul 28 12:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl:
+          Fixed file tag
+
+Fri Jul 28 10:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Bug_2616_Regression.idl:
+        * tests/IDL_Test/IDL_Test.mpc:
+          Added regression for bug 2616. Thanks to Keith Nicewarner
+          <Keith dot Nicewarner at SpaceDev dot com> for delivering this
+          test case, it failed with 1.5.2 but works on the head version,
+          just storing it to prevent the bug to appear in the future.
+
+Fri Jul 28 00:44:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Most run_test.pl scripts in the TAO repository
+
+          Updated to use the ACE_ROOT environment variable to find
+          PerlACE.  This is necessary for the flattened ACE/TAO/CIAO
+          Thanks to Adam Mitz for reporting the problem and
+          suggesting a solution.
+
+Thu Jul 27 20:50:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Scheduler_Factory.inl
+        * orbsvcs/orbsvcs/Event_Utilities.inl
+        * orbsvcs/orbsvcs/Scheduler_Utilities.h
+        * orbsvcs/orbsvcs/Scheduler_Utilities.i
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.i
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.inl
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.i
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.inl
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.i
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.inl
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.i
+        * orbsvcs/orbsvcs/Time_Utilities.h
+        * orbsvcs/orbsvcs/Time_Utilities.i
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp
+        * orbsvcs/orbsvcs/Sched/DynSched.inl
+        * orbsvcs/orbsvcs/Sched/DynSched.h
+        * orbsvcs/orbsvcs/Sched/DynSched.i
+        * orbsvcs/orbsvcs/Sched/SchedEntry.inl
+        * orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+        * orbsvcs/orbsvcs/Sched/SchedEntry.h
+        * orbsvcs/orbsvcs/Sched/SchedEntry.i
+        * orbsvcs/orbsvcs/Scheduler_Factory.h
+        * orbsvcs/orbsvcs/Scheduler_Factory.i
+        * orbsvcs/orbsvcs/Channel_Clients_T.cpp
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
+        * orbsvcs/orbsvcs/Event_Utilities.h
+        * orbsvcs/orbsvcs/Event_Utilities.i
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
+        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
+        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl
+        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i
+        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
+        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
+        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
+        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i
+        * orbsvcs/orbsvcs/Channel_Clients_T.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+        * orbsvcs/orbsvcs/Scheduler_Utilities.cpp
+        * orbsvcs/orbsvcs/AV/Policy.cpp
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+        * orbsvcs/orbsvcs/AV/MCast.cpp
+        * orbsvcs/orbsvcs/AV/QoS_UDP.inl
+        * orbsvcs/orbsvcs/AV/AVStreams_i.inl
+        * orbsvcs/orbsvcs/AV/UDP.cpp
+        * orbsvcs/orbsvcs/AV/Transport.h
+        * orbsvcs/orbsvcs/AV/Transport.i
+        * orbsvcs/orbsvcs/AV/AVStreams_i.h
+        * orbsvcs/orbsvcs/AV/AVStreams_i.i
+        * orbsvcs/orbsvcs/AV/Transport.inl
+        * orbsvcs/orbsvcs/AV/UDP.h
+        * orbsvcs/orbsvcs/AV/UDP.i
+        * orbsvcs/orbsvcs/AV/Policy.inl
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
+        * orbsvcs/orbsvcs/AV/MCast.inl
+        * orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+        * orbsvcs/orbsvcs/AV/UDP.inl
+        * orbsvcs/orbsvcs/AV/Policy.h
+        * orbsvcs/orbsvcs/AV/Policy.i
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
+        * orbsvcs/orbsvcs/AV/MCast.h
+        * orbsvcs/orbsvcs/AV/MCast.i
+        * orbsvcs/orbsvcs/AV/QoS_UDP.h
+        * orbsvcs/orbsvcs/AV/QoS_UDP.i
+        * orbsvcs/orbsvcs/AV/Transport.cpp
+        * orbsvcs/orbsvcs/Time_Utilities.cpp
+        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl
+        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl
+        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i
+        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
+        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.i
+        * orbsvcs/orbsvcs/Event/EC_Filter.h
+        * orbsvcs/orbsvcs/Event/EC_Filter.i
+        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.i
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i
+        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
+        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.i
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
+        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i
+        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl
+        * orbsvcs/orbsvcs/Event/EC_Filter.cpp
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
+        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl
+        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
+        * orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
+        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
+        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl
+        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i
+        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+        * orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+        * orbsvcs/orbsvcs/Event/EC_QOS_Info.i
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i
+        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
+        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.i
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
+        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
+        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
+        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+        * orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
+        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.i
+        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
+        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+        * orbsvcs/orbsvcs/Event/EC_Filter.inl
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp
+        * orbsvcs/orbsvcs/Event_Utilities.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
+        * orbsvcs/orbsvcs/Scheduler_Utilities.inl
+        * orbsvcs/orbsvcs/Channel_Clients_T.h
+        * orbsvcs/orbsvcs/Channel_Clients_T.i
+        * orbsvcs/orbsvcs/Time_Utilities.inl
+        * orbsvcs/tests/Event/lib/Driver.h
+        * orbsvcs/tests/Event/lib/Driver.i
+        * orbsvcs/tests/Event/lib/Driver.inl
+        * orbsvcs/tests/Event/lib/Driver.cpp
+        * orbsvcs/tests/Security/Crash_Test/test_i.inl
+        * orbsvcs/tests/Security/Crash_Test/test_i.cpp
+        * orbsvcs/tests/Security/Crash_Test/test_i.h
+        * orbsvcs/tests/Security/Crash_Test/test_i.i
+        * orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+        * orbsvcs/tests/Security/MT_SSLIOP/test_i.inl
+        * orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+        * orbsvcs/tests/Security/MT_SSLIOP/test_i.i
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.inl
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.h
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.i
+        * orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+        * orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
+        * orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+        * orbsvcs/tests/HTIOP/BiDirectional/test_i.i
+        * orbsvcs/examples/Security/Send_File/test_i.cpp
+        * orbsvcs/examples/Security/Send_File/test_i.inl
+        * orbsvcs/examples/Security/Send_File/test_i.h
+        * orbsvcs/examples/Security/Send_File/test_i.i
+        * tao/Tagged_Components.cpp
+        * tao/IIOP_Endpoint.h
+        * tao/operation_details.cpp
+        * tao/IIOP_Endpoint.i
+        * tao/CDR.cpp
+        * tao/Tagged_Profile.inl
+        * tao/Endpoint.cpp
+        * tao/ORB_Core.cpp
+        * tao/target_specification.h
+        * tao/target_specification.i
+        * tao/GIOP_Message_Locate_Header.h
+        * tao/Object.inl
+        * tao/GIOP_Message_Locate_Header.i
+        * tao/Fault_Tolerance_Service.h
+        * tao/Fault_Tolerance_Service.i
+        * tao/LocalObject.inl
+        * tao/Asynch_Reply_Dispatcher_Base.cpp
+        * tao/Policy_Set.cpp
+        * tao/PortableServer/Servant_Base.cpp
+        * tao/PortableServer/POA_Cached_Policies.inl
+        * tao/PortableServer/POA_Cached_Policies.h
+        * tao/PortableServer/POA_Cached_Policies.i
+        * tao/PortableServer/POA_Policy_Set.h
+        * tao/PortableServer/POA_Policy_Set.i
+        * tao/PortableServer/POAManager.cpp
+        * tao/PortableServer/POAManager.h
+        * tao/PortableServer/POAManager.i
+        * tao/PortableServer/Active_Object_Map.h
+        * tao/PortableServer/Active_Object_Map.i
+        * tao/PortableServer/Object_Adapter.h
+        * tao/PortableServer/Object_Adapter.i
+        * tao/PortableServer/POA_Cached_Policies.cpp
+        * tao/PortableServer/Active_Object_Map.inl
+        * tao/PortableServer/Object_Adapter.inl
+        * tao/PortableServer/POA_Policy_Set.inl
+        * tao/PortableServer/Servant_Base.inl
+        * tao/PortableServer/Active_Object_Map.cpp
+        * tao/PortableServer/Object_Adapter.cpp
+        * tao/PortableServer/Servant_Base.h
+        * tao/PortableServer/Servant_Base.i
+        * tao/PortableServer/POAManager.inl
+        * tao/PortableServer/POA_Policy_Set.cpp
+        * tao/CORBALOC_Parser.cpp
+        * tao/IIOP_Endpoint.inl
+        * tao/Tagged_Components.h
+        * tao/Tagged_Components.i
+        * tao/Tagged_Profile.h
+        * tao/IIOP_Acceptor.cpp
+        * tao/Tagged_Profile.i
+        * tao/MCAST_Parser.h
+        * tao/Parser_Registry.h
+        * tao/MCAST_Parser.i
+        * tao/Parser_Registry.i
+        * tao/Acceptor_Registry.h
+        * tao/Acceptor_Registry.i
+        * tao/Buffering_Constraint_Policy.h
+        * tao/Buffering_Constraint_Policy.i
+        * tao/Exception.h
+        * tao/Exception.i
+        * tao/Bind_Dispatcher_Guard.inl
+        * tao/Stub.cpp
+        * tao/MCAST_Parser.cpp
+        * tao/Endpoint.h
+        * tao/Endpoint.i
+        * tao/Exception.inl
+        * tao/MProfile.inl
+        * tao/params.h
+        * tao/params.i
+        * tao/Reply_Dispatcher.cpp
+        * tao/MProfile.h
+        * tao/MProfile.i
+        * tao/params.cpp
+        * tao/Parser_Registry.cpp
+        * tao/target_specification.cpp
+        * tao/Policy_Manager.inl
+        * tao/GIOP_Message_Locate_Header.inl
+        * tao/Asynch_Reply_Dispatcher_Base.h
+        * tao/Asynch_Reply_Dispatcher_Base.i
+        * tao/Tagged_Components.inl
+        * tao/CORBALOC_Parser.h
+        * tao/operation_details.inl
+        * tao/CORBALOC_Parser.i
+        * tao/CDR.inl
+        * tao/IIOP_Acceptor.h
+        * tao/IIOP_Acceptor.i
+        * tao/Reply_Dispatcher.h
+        * tao/Reply_Dispatcher.i
+        * tao/Leader_Follower.h
+        * tao/Leader_Follower.i
+        * tao/Endpoint.inl
+        * tao/Fault_Tolerance_Service.cpp
+        * tao/ORB_Core.inl
+        * tao/Profile.cpp
+        * tao/Asynch_Reply_Dispatcher_Base.inl
+        * tao/Environment.h
+        * tao/Policy_Set.inl
+        * tao/Environment.i
+        * tao/ORB.cpp
+        * tao/CORBALOC_Parser.inl
+        * tao/IIOP_Acceptor.inl
+        * tao/RTPortableServer/RT_POA.cpp
+        * tao/RTPortableServer/RT_POA.inl
+        * tao/RTPortableServer/RT_POA.h
+        * tao/RTPortableServer/RT_POA.i
+        * tao/ORB.h
+        * tao/ORB.i
+        * tao/Leader_Follower.cpp
+        * tao/Stub.inl
+        * tao/MCAST_Parser.inl
+        * tao/Acceptor_Registry.cpp
+        * tao/Environment.cpp
+        * tao/Profile.h
+        * tao/Profile.i
+        * tao/Object.h
+        * tao/Object.i
+        * tao/Stub.h
+        * tao/Stub.i
+        * tao/Messaging/Messaging_Policy_i.cpp
+        * tao/Messaging/Messaging_Policy_i.inl
+        * tao/Messaging/Messaging_Policy_i.h
+        * tao/Messaging/Messaging_Policy_i.i
+        * tao/Policy_Manager.h
+        * tao/Policy_Manager.i
+        * tao/Reply_Dispatcher.inl
+        * tao/Pluggable_Messaging_Utils.cpp
+        * tao/Principal.cpp
+        * tao/TAO_Server_Request.cpp
+        * tao/Connector_Registry.cpp
+        * tao/params.inl
+        * tao/Parser_Registry.inl
+        * tao/target_specification.inl
+        * tao/ORB_Core.h
+        * tao/ORB_Core.i
+        * tao/Connector_Registry.h
+        * tao/Connector_Registry.i
+        * tao/Strategies/SHMIOP_Endpoint.inl
+        * tao/Strategies/SCIOP_Endpoint.cpp
+        * tao/Strategies/DIOP_Acceptor.h
+        * tao/Strategies/UIOP_Endpoint.h
+        * tao/Strategies/DIOP_Acceptor.i
+        * tao/Strategies/UIOP_Endpoint.i
+        * tao/Strategies/DIOP_Endpoint.inl
+        * tao/Strategies/SCIOP_Acceptor.inl
+        * tao/Strategies/SHMIOP_Endpoint.h
+        * tao/Strategies/SHMIOP_Endpoint.i
+        * tao/Strategies/DIOP_Acceptor.cpp
+        * tao/Strategies/UIOP_Endpoint.inl
+        * tao/Strategies/SHMIOP_Endpoint.cpp
+        * tao/Strategies/DIOP_Endpoint.h
+        * tao/Strategies/DIOP_Endpoint.i
+        * tao/Strategies/SCIOP_Acceptor.h
+        * tao/Strategies/SCIOP_Acceptor.i
+        * tao/Strategies/SCIOP_Endpoint.inl
+        * tao/Strategies/DIOP_Endpoint.cpp
+        * tao/Strategies/SCIOP_Acceptor.cpp
+        * tao/Strategies/DIOP_Acceptor.inl
+        * tao/Strategies/UIOP_Endpoint.cpp
+        * tao/Strategies/SCIOP_Endpoint.h
+        * tao/Strategies/SCIOP_Endpoint.i
+        * tao/Buffering_Constraint_Policy.cpp
+        * tao/CDR.h
+        * tao/CDR.i
+        * tao/Policy_Set.h
+        * tao/Policy_Set.i
+        * tao/TAO_Server_Request.h
+        * tao/Principal.h
+        * tao/TAO_Server_Request.i
+        * tao/Principal.i
+        * tao/Fault_Tolerance_Service.inl
+        * tao/Profile.inl
+        * tao/Tagged_Profile.cpp
+        * tao/Object.cpp
+        * tao/RTScheduling/RTScheduler_Manager.inl
+        * tao/RTScheduling/RTScheduler_Manager.cpp
+        * tao/RTScheduling/RTScheduler_Manager.h
+        * tao/RTScheduling/RTScheduler_Manager.i
+        * tao/ORB.inl
+        * tao/Bind_Dispatcher_Guard.h
+        * tao/Bind_Dispatcher_Guard.i
+        * tao/LocalObject.cpp
+        * tao/Pluggable_Messaging_Utils.h
+        * tao/Pluggable_Messaging_Utils.i
+        * tao/Leader_Follower.inl
+        * tao/Acceptor_Registry.inl
+        * tao/IIOP_Endpoint.cpp
+        * tao/Environment.inl
+        * tao/operation_details.h
+        * tao/operation_details.i
+        * tao/Bind_Dispatcher_Guard.cpp
+        * tao/Pluggable_Messaging_Utils.inl
+        * tao/Principal.inl
+        * tao/TAO_Server_Request.inl
+        * tao/Connector_Registry.inl
+        * tao/LocalObject.h
+        * tao/LocalObject.i
+        * tao/Exception.cpp
+        * tao/MProfile.cpp
+        * tao/Policy_Manager.cpp
+        * tao/Buffering_Constraint_Policy.inl
+        * tao/GIOP_Message_Locate_Header.cpp
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.inl
+        * tao/RTCORBA/Priority_Mapping_Manager.h
+        * tao/RTCORBA/Priority_Mapping_Manager.i
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.h
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.i
+        * tao/RTCORBA/Priority_Mapping_Manager.inl
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
+        * tao/RTCORBA/Priority_Mapping_Manager.cpp
+        * performance-tests/POA/Demux/demux_test_client.cpp
+        * performance-tests/POA/Demux/demux_test_client.inl
+        * performance-tests/POA/Demux/demux_test_client.i
+        * performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+        * performance-tests/RTCorba/Oneways/Reliable/test_i.inl
+        * performance-tests/RTCorba/Oneways/Reliable/test_i.h
+        * performance-tests/RTCorba/Oneways/Reliable/test_i.i
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.i
+        * tests/Faults/ping_i.cpp
+        * tests/Faults/ping_i.inl
+        * tests/Faults/ping_i.h
+        * tests/Faults/ping_i.i
+        * tests/Faults/test_i.inl
+        * tests/Faults/test_i.cpp
+        * tests/Faults/test_i.h
+        * tests/Faults/test_i.i
+        * tests/Muxed_GIOP_Versions/test_i.cpp
+        * tests/Muxed_GIOP_Versions/test_i.inl
+        * tests/Muxed_GIOP_Versions/test_i.h
+        * tests/Muxed_GIOP_Versions/test_i.i
+        * tests/DSI_Gateway/test_dsi.cpp
+        * tests/DSI_Gateway/test_dsi.inl
+        * tests/DSI_Gateway/test_dsi.h
+        * tests/DSI_Gateway/test_dsi.i
+        * tests/DSI_Gateway/test_i.inl
+        * tests/DSI_Gateway/test_i.cpp
+        * tests/DSI_Gateway/test_i.h
+        * tests/DSI_Gateway/test_i.i
+        * tests/MT_Client/test_i.inl
+        * tests/MT_Client/test_i.cpp
+        * tests/MT_Client/test_i.h
+        * tests/MT_Client/test_i.i
+        * tests/OctetSeq/test_i.inl
+        * tests/OctetSeq/test_i.cpp
+        * tests/OctetSeq/test_i.h
+        * tests/OctetSeq/test_i.i
+        * tests/BiDirectional_DelayedUpcall/test_i.cpp
+        * tests/BiDirectional_DelayedUpcall/test_i.inl
+        * tests/BiDirectional_DelayedUpcall/test_i.h
+        * tests/BiDirectional_DelayedUpcall/test_i.i
+        * tests/MT_Server/test_i.cpp
+        * tests/MT_Server/test_i.inl
+        * tests/MT_Server/test_i.h
+        * tests/MT_Server/test_i.i
+        * tests/BiDirectional/test_i.cpp
+        * tests/BiDirectional/test_i.inl
+        * tests/BiDirectional/test_i.h
+        * tests/BiDirectional/test_i.i
+        * tests/Strategies/simple_test_i.cpp
+        * tests/Strategies/simple_test_i.inl
+        * tests/Strategies/simple_test_i.h
+        * tests/Strategies/simple_test_i.i
+        * tests/MProfile_Forwarding/test_i.cpp
+        * tests/MProfile_Forwarding/test_i.inl
+        * tests/MProfile_Forwarding/test_i.h
+        * tests/MProfile_Forwarding/test_i.i
+        * tests/Native_Exceptions/test_i.cpp
+        * tests/Native_Exceptions/test_i.inl
+        * tests/Native_Exceptions/test_i.h
+        * tests/Native_Exceptions/test_i.i
+        * tests/Forwarding/test_i.cpp
+        * tests/Forwarding/test_i.inl
+        * tests/Forwarding/test_i.h
+        * tests/Forwarding/test_i.i
+        * tests/BiDirectional_NestedUpcall/test_i.cpp
+        * tests/BiDirectional_NestedUpcall/test_i.inl
+        * tests/BiDirectional_NestedUpcall/test_i.h
+        * tests/BiDirectional_NestedUpcall/test_i.i
+        * TAO_IDL/fe/fe_lookup.cpp
+        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
+        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
+        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.i
+        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
+        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
+        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.i
+        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
+        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
+        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.i
+
+          Moved .i to .inl, and updated the associated header and source files.
+
+Thu Jul 27 19:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Updated to use subversion and updated minimum corba documentation
+
+Thu Jul 27 18:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/minimumTAO.html:
+          Fixed some incorrect hyperlinks
+
+Thu Jul 27 18:07:44 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_ACE.mwc
+
+          Replaced relative reference to ACE with an environment variable.
+          This is necessary to allow TAO to build in flattened repo layout.
+
+Wed Jul 26 07:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+        * tao/Transport.h:
+        * docs/releasenotes/ftcorba_services.html:
+        * docs/Security/SSLIOP-Usage.html:
+          Updated documentation to point to the new svn repository
+
+Mon Jul 24 21:54:22 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
+        * tao/RTScheduling/RTSchedulerC.cpp
+        * tao/RTScheduling/RTSchedulerC.h
+
+          Removed these, they were kept around erroneously.
+
+        * ./TAO/performance-tests/AMI_Latency
+        * ./TAO/performance-tests/Deferred_Latency
+        * ./TAO/performance-tests/DII_Latency
+        * ./TAO/performance-tests/DSI_Latency
+        * ./TAO/performance-tests/Single_Threaded_Latency
+        * ./TAO/performance-tests/Thread_Per_Connection_Latency
+        * ./TAO/performance-tests/Thread_Pool_Latency
+
+          Removed these directories, which had been previously merged into
+          performance-tests/Latency
+
+Mon Jul 24 19:02:33 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO/RTScheduling/RTSchedulerA.h
+
+          Should not have been removed.
+
+Mon Jul 24 18:52:33 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO/RTScheduling/RTSchedulerA.cpp
+
+          Removed, these were kept around erroneously by the conversion script.
+
+Mon Jul 24 17:39:38 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_lookup.cpp
+
+          Re committing this file, as the subversion script probably backdated
+          the timestamp on the file, which was causing it to be regenerated as
+          part of the build process.
+
+Mon Jul 24 15:45:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Subversion conversion completed at revision 73730
+
+Sun Jul 23 15:44:43 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Repository frozen for repository conversion
+
+Sat Jul 22 11:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/QtTests/client.cpp:
+          Updated include because of QtResource move
+
+Fri Jul 21 14:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Reliable_Oneways/server.cpp:
+          Initialise pointer with 0
+
+Fri Jul 21 14:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/RTScheduling/Current/Thread_Task.cpp:
+        * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
+          Simplified printing the elements of a string sequence
+
+Fri Jul 21 14:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/PICurrent/client.cpp:
+        * tests/Portable_Interceptors/PICurrent/test.idl:
+        * tests/Portable_Interceptors/PICurrent/test_i.{h,cpp}:
+          Extended this test
+
+Fri Jul 21 13:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Connection_Timeout/Connection_Timeout.mpc:
+          Simplified this file
+
+Fri Jul 21 13:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2503_Regression/client.cpp:
+        * tests/Bug_2503_Regression/server.cpp:
+        * tests/Bug_2503_Regression/Test.idl:
+        * tests/Bug_2503_Regression/test_i.{h,cpp}:
+          Extended this test in such a way that the client does a shutdown
+          invocation on the server when it is ready.
+
+Fri Jul 21 12:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1551_Regression/Reply_Handler.cpp:
+          At the moment there is a bug in the AMI code it could happen that
+          the exception holder pointer is nill, in that case print an error
+          message instead of trying to invoke a method on it. This shouldn't
+          normally happen, but makes it a lot easier to analyze the problem
+          because we now just get an error message instead of an access
+          violation.
+
+Fri Jul 21 11:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Notify/lib/Peer.cpp:
+          Removed include of Arg_Shifter.h, it is already done in the header
+          file
+
+Fri Jul 21 08:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * utils/catior/catior.cpp:
+          Added needed include to build catior when IIOP has been disabled
+          in the orb
+
+        * tao/Object_T.cpp:
+          Const improvements, use true/false for bool
+
+Fri Jul 21 07:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/UIOP_Profile.cpp:
+        * tao/Strategies/DIOP_Profile.cpp:
+        * tao/Strategies/SCIOP_Profile.cpp:
+          Use true/false instead of 1/0
+
+Fri Jul 21 07:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Load_Protocol_Factory_T.h:
+          Added missing return statement
+
+Thu Jul 20 20:38:08 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
+        * docs/tutorials/Quoter/RTCORBA/Common_i.h
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
+        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
+
+          Fixed some errors. Addressed the comments from Will.
+
+Thu Jul 20 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Profile.cpp (do_is_equivalent):
+          Use true/false
+
+Thu Jul 20 12:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/DIOP_Endpoint.{h,cpp}:
+          Made object_addr_set_ a bool instead of int
+
+Thu Jul 20 12:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/DIOP_Endpoint.h:
+          Removed commented out method
+
+Thu Jul 20 12:26:59 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Bug_2549_Regression/test.idl:
+
+          Replace <> with "" to fix fuxx error.
+
+Thu Jul 20 11:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Load_Protocol_Factory_T.h:
+          New template method that can be used to load a specific pluggable
+          protocol.
+
+        * tao/tao.mpc:
+          Added new file
+
+        * tao/default_resource.cpp:
+        * tao/Strategies/advanced_resource.cpp:
+          Use the new template method to load the pluggable protocols. This
+          way we can remove a lot of duplicated code that was copied just for
+          each specific protocol.
+
+Thu Jul 20 10:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/DIOP_Transport.h:
+          Removed commented out methods
+
+Thu Jul 20 10:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+        * tao/EndpointPolicy.mpc:
+          Add tao_no_iiop as base project, when we enable this feature these
+          projects are affected
+
+        * tao/IIOP.pidl:
+        * tao/EndpointPolicy/IIOPEndpointValue.pidl:
+          Guard this with !TAO_LACKS_IIOP, when tao_no_iiop is enabled as MPC
+          feature we don't generate code for these files.
+
+        * tao/Endpoint_Acceptor_Filter.cpp:
+          No need to include IIOP specific files, base classes are all we need
+          here.
+
+        * tao/EndpointPolicy/IIOPEndpointValue_i.{h,cpp}:
+          Don't compile these files when IIOP is disabled.
+
+Thu Jul 20 08:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1639_Regression/struct_client.cpp:
+        * tests/DynAny_Test/test_dynany.cpp:
+        * tests/DynAny_Test/analyzer.h:
+          Reordered includes to fix problems with gcc4
+
+Thu Jul 20 07:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+          Added regression for bug 2582 again
+
+Thu Jul 20 03:43:30 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
+
+          Added some comments for Shanshan.
+
+Wed Jul 19 22:44:16 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h:
+
+          Add version macros.
+
+Wed Jul 19 22:28:50 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
+
+          The open() initializes the underlying socket that is later
+          enabled to be non-blocking. Without open() the enable call will
+          fail as it should. This fixes the scoreboard failure introduced
+          in:
+
+          Mon Jul 17 14:26:08 UTC 2006  Ciju John  <john_c@ociweb.com>
+
+Wed Jul 19 19:20:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * docs/compiler.html:
+        * docs/releasenotes/index.html:
+
+          - Added IDL compiler command line option -oS, which sets an
+            output directory for all skeleton (*S*) files, similar to what
+            the -oA option does for *A.* files. Overrides the -o option
+            value, if any. Also updated IDL compiler and related docs.
+            This feature will make it easier to automate the generation
+            from IDL files for services like the Interface Repository,
+            where the stub and skeleton files go to different directories.
+            This fix closes [BUGID:2603].
+
+          - Changed all occurrences of 'base_name_only' parameters from
+          int to bool.
+
+Wed Jul 19 17:49:47 UTC 2006  Nanbor Wang  <nanbor (a) txcorp (d) com>
+
+        * orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp: Enhanced
+          the client to use more than 2 replicas.  The limitation of using
+          2 replicas was causing the client to exit when one of the server
+          crashes.  This is due to the way ACE_TMCase handling a single
+          server as a fault.  But allowing more than 2 replicas, the 2
+          remaining servers can continue to work and thus demonstrate how
+          FT work.
+
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h:
+          Minor fixup to throw spec.
+
+Wed Jul 19 17:07:12 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+
+          Fixed bug in the logic of the decisioin whether or not to generate
+          the arg traits template specialization for a typedef. This fix
+          addresses the reopening of [BUGID:2582], which will now be set
+          to FIXED unless and until another bug is found.
+
+Wed Jul 19 17:21:38 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+          (load_ep_addr):
+
+          Use new ACE_CString::size_type type to hold string
+          position/index value, instead of "int".  Addresses "comparison
+          between signed and unsigned" warnings.
+
+        * tao/Strategies/DIOP_Acceptor.cpp (parse_options):
+        * tao/Strategies/SCIOP_Acceptor.cpp (parse_options):
+        * tao/Strategies/SHMIOP_Acceptor.cpp (parse_options):
+        * tao/Strategies/UIOP_Acceptor.cpp (parse_options):
+
+          Applied Ciju's substring fix.  See "Tue Jul 18 21:38:55 UTC 2006
+          Ciju John  <johnc@ociweb.com>" below for details.
+
+Wed Jul 19 15:52:11 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/anonymous.idl:
+        * tests/IDL_Test/typedef.idl:
+        * tests/IDL_Test/valuetype.idl:
+
+          Entries to test sequence of valuetype as valuetype member
+          and typedefs of string with the same bound repeated in
+          different compilation units that are linked in the same
+          build.
+
+Wed Jul 19 15:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbscvs/orbsvcs/IFRService/*S.h:
+          Replace ace\pre.h with ace/pre.h, seems generation with MPC is
+          dependent on windows or linux
+
+Wed Jul 19 13:18:41 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/Codeset/Codeset_Descriptor.cpp:
+        * tao/Codeset/UTF16_BOM_Translator.cpp:
+
+          Added static casts to remove build warnings from some 64-bit
+          compilers where unsigned long and ACE_CDR::ULong were mixed.
+          It was necessary to use static_cast<> as the size of the data in
+          most cases needed to be size_t/unsigned long.
+
+Wed Jul 19 12:31:50 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/LocalObject.cpp:
+        * tao/ORB.h:
+        * tao/ORB.i:
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.i:
+        * tao/Principal.h:
+        * tao/Principal.i:
+        * tao/Profile.h:
+        * tao/Profile.cpp:
+
+          In my change from Mon Jul 17 14:40:43 UTC 2006, I modified these
+          files to use an ACE_Atomic_Op<> with an unsigned long.  They all
+          had instances where unsigned long and CORBA::ULong were being
+          mixed which causes warnings with some 64-bit compilers.  I have
+          modified these to all use unsigned long in places where
+          CORBA::ULong was previously used.
+
+Wed Jul 19 12:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbscvs/orbsvcs/IFRService/*.S*.*:
+          Regenerated these files
+
+        * tao/IFR_Client.mpc:
+          Only use the stub export tao_idl options
+
+Wed Jul 19 10:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTScheduler.mpc:
+          Enabled regeneration of the pidl file
+
+        * tao/RTScheduling/RTSchedulerA.cpp:
+        * tao/RTScheduling/RTSchedulerC.cpp:
+        * tao/RTScheduling/RTSchedulerC.h:
+        * tao/RTScheduling/RTSchedulerS.h:
+          Removed from the repo
+
+Wed Jul 19 10:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_module.cpp:
+        * TAO_IDL/be/be_visitor_module/module.cpp:
+        * TAO_IDL/be_include/be_visitor_module/module.h:
+          Support generating native within a module
+
+Wed Jul 19 08:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * utils/nslist/nslist.cpp:
+
+          Bug fix for over optimizing Borland compiler.
+
+Wed Jul 19 08:03:36 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tao/CodecFactory/IOP_CodecA.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateA.h:
+        * tao/PortableServer/PortableServerA.h:
+        * tao/RTCORBA/RTCORBAA.h:
+        * tao/RTCORBA/RTCORBAS.h:
+        * tao/RTPortableServer/RTPortableServerA.h:
+        * tao/RTPortableServer/RTPortableServer_includeA.h:
+        * tao/RTScheduling/RTSchedulerA.h:
+        * tao/RTScheduling/RTSchedulerS.h:
+
+          Added these 'empty' files. Works around problems with the IDL
+          preprocessing. This fixes bug #2549. See ticket for more.
+
+        * tests/Bug_2549_Regression/Bug_2549_Regression.mpc:
+        * tests/Bug_2549_Regression/README:
+        * tests/Bug_2549_Regression/test.cpp:
+        * tests/Bug_2549_Regression/test.idl:
+
+          Compile only regression test for the above fix.
+
+Wed Jul 19 08:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_native/native_ch.cpp:
+          Add generation for CORBA::VoidData which is a native that is used
+          in the RTScheduling library.
+
+Tue Jul 18 21:38:55 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tao/IIOP_Acceptor.cpp:
+
+          substring() 2nd parameter is supposed to be the relative
+          length, not the absolute position as before.
+
+Tue Jul 18 14:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/HTIOP.mpc:
+          Simplified this file
+
         * orbsvcs/orbsvcs/SSLIOP.mpc:
-        * orbsvcs/orbsvcs/Security.mpc:
-        * orbsvcs/orbsvcs/Svc_Utils.mpc:
+          Regenerate the pidl file
+
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.{h,cpp}:
+          Removed from the repo
+
+Tue Jul 18 13:51:09 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/CosEvent/Timeout/Timeout.mpc:
+          Added the "threads" base project to exclude this test from single-
+          threaded builds.
+
+Tue Jul 18 11:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/VarOut_T.inl:
+          Fixed bug 2595, when the _var is nil and the .out() is invoked
+          we have to allocate a new instance instead of deference a
+          nill pointer. This matches the latest CORBA C++ mapping, thanks
+          to Abdul Sowayan <abdullah dot sowayan at lmco dot com> for
+          reporting this bug
+
+Tue Jul 18 10:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2595_Regression/*
+          New regression for bug 2595, not fixed yet, makes it possible
+          to retest things on linux before we enable this test in
+          the regression suite
+
+Tue Jul 18 10:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1639_Regression/struct_client.cpp:
+        * tests/DynAny_Test/test_dynany.h:
+          Fixed compile errors with gcc4
+
+Tue Jul 18 10:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp:
+          Use true/false
+
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl:
+          Updated comments
+
+Tue Jul 18 09:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Acceptor.cpp:
+          Const improvement
+
+Tue Jul 18 09:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/HTIOP.mpc:
+          Enabled regeneration of the pidl file
+
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl:
+          Updated comments
+
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.{h,cpp}:
+          Removed from the repo
+
+Tue Jul 18 09:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/QtTests/server.cpp:
+        * tests/FL_Cube/client.cpp:
+          Fixed include paths because resource factories got moved
+
+Tue Jul 18 08:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/orbsvcs/Naming/Storable.h:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
+
+          Fix bugzilla 2600 - Naming Service Flat File Persistance with
+          Federated naming contexts.
+
+Mon Jul 17 18:35:32 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * docs/tutorials/Quoter/RTCORBA/Admin.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
+        * docs/tutorials/Quoter/RTCORBA/Common_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Common_i.h
+        * docs/tutorials/Quoter/RTCORBA/Distributor.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+
+        * docs/tutorials/Quoter/RTCORBA/docs/broker.html
+        * docs/tutorials/Quoter/RTCORBA/docs/common.html
+        * docs/tutorials/Quoter/RTCORBA/docs/database.html
+        * docs/tutorials/Quoter/RTCORBA/docs/distributor.html
+        * docs/tutorials/Quoter/RTCORBA/docs/idl.html
+        * docs/tutorials/Quoter/RTCORBA/docs/run.html
+
+          Make some minor changes.
+
+Mon Jul 17 17:49:41 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * examples/POA/On_Demand_Loading/Servant_Manager.cpp:
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * orbsvcs/orbsvcs/AV/AV_Core.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/ImplRepo_Service/utils.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp:
+        * tao/Strategies/DIOP_Acceptor.cpp:
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Strategies/UIOP_Acceptor.cpp:
+
+          Use new ACE_CString::size_type type to hold string
+          position/index value, instead of "int".  Addresses "comparison
+          between signed and unsigned" warnings.
+
+Mon Jul 17 14:46:26 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
+
+          Replaced deprecated call to ACE_SOCK_Dgram_Mcast::subscribe()
+          with ACE_SOCK_Dgram_Mcast::join(). Thanks to Johnny for pointing
+          this out.
+
+Mon Jul 17 14:40:43 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
+
+          The memset of the discriminator was redundant as it is assigned
+          directly after the memset of the union data.
+
+        * tao/CDR.h:
+        * tao/CDR.cpp:
+
+          Added a constructor that takes an ACE_Data_Block* which can be
+          used to avoid an allocation while constructing the
+          ACE_Message_Block held by the ACE_OutputCDR. [RT 8372]
+
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+
+          Use the new inline TAO_ServerRequest constructor.  This avoids
+          having to allocate a costly dummy input and output cdr.
+
+          Avoid using ACE_CString for the operation name which will avoid
+          memory allocations when it isn't necessary.  Most of the time, the
+          operation name can be shared from the operation_details_ object.
+
+          When the type of TAO_Tagged_Profile::type_id_ changed in the
+          previous commit, the cloning needed to take that into account.
+          [RT 8372]
+
+          When cloning the operation details, allocate an input cdr with a
+          "large" message block that will be shared by the output cdr as
+          the marshaling of the arguments is done.  This allows us to
+          avoid the copying of the data block, in most situations, from the
+          output cdr into the input cdr as was done in the previous version.
+          [RT 8372]
+
+        * tao/CSD_ThreadPool.mpc:
+
+          Added a requires for threads as this project shouldn't be built if
+          thread support is not going to be built into TAO.
+
+        * tao/Client_Strategy_Factory.h:
+        * tao/Client_Strategy_Factory.cpp:
+        * tao/Configurable_Refcount.h:
+        * tao/Configurable_Refcount.inl:
+        * tao/Configurable_Refcount.cpp:
+        * tao/Object.h:
+        * tao/Object.i:
+        * tao/Object.cpp:
+        * tao/Profile.h:
+        * tao/Profile.cpp:
+        * tao/Resource_Factory.h:
+        * tao/Resource_Factory.cpp:
+        * tao/default_client.h:
+        * tao/default_client.cpp:
+        * tao/default_resource.h:
+        * tao/tao.mpc:
+
+          The TAO_Configurable_Refcount can be used as an ACE_Atomic_Op with
+          either a null mutex or a thread mutex.  Those classes that use it
+          used to use either a null mutex or a thread mutex and an integer
+          based reference count.
+
+        * tao/GIOP_Message_Base.cpp:
+
+          When processing a request, a character buffer is allocated on the
+          stack.  Previously, it was passed as a parameter to the
+          TAO_OutputCDR and an ACE_Data_Block was heap allocated during the
+          construction of the ACE_Message_Block held by the ACE_OutputCDR.
+
+          Now, the ACE_Data_Block is constructed on the stack as well and
+          passed in during the construction of the ACE_Message_Block to
+          avoid heap allocations altogether. [RT 8372]
+
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/Incoming_Message_Queue.h:
+        * tao/Incoming_Message_Queue.cpp:
+
+          Factored various forms of creating a TAO_Queued_Data (with and
+          without an ACE_Message_Block) into a single method.  Doing this
+          allows us to avoid extra manipulations of the reference count in
+          the ACE_Data_Block involved.
+
+        * tao/Environment.i:
+        * tao/Leader_Follower.cpp:
+        * tao/TAO_Singleton_Manager.cpp:
+        * tao/Var_Size_Argument_T.cpp:
+        * tao/default_resource.cpp:
+        * tao/IORTable/Table_Adapter.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
+        * tao/RTCORBA/Thread_Pool.cpp:
+
+          Replace many instances of the use of a bare 'new' with the
+          equivalent ACE_NEW or ACE_NEW_RETURN macro. [RT 8372]
+
+        * tao/LocalObject.h:
+        * tao/Principal.h:
+        * tao/Stub.h:
+        * tao/Stub.cpp:
+        * tao/AnyTypeCode/Any_Impl.h:
+        * tao/AnyTypeCode/NVList.h:
+        * tao/Messaging/AMH_Response_Handler.cpp:
+        * tao/Valuetype/ValueBase.h:
+
+          Use unsigned long instead of CORBA::ULong to be able to take
+          advantage of the ACE_Atomic_Op<> template specialization.
+          CORBA::ULong doesn't necessarily equate to unsigned long.
+
+        * tao/ORB.h:
+        * tao/ORB.i:
+        * tao/ORB.cpp:
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.i:
+
+          Switch from using a thread mutex and CORBA::ULong to an
+          ACE_Atomic_Op<> with a thread mutex and unsigned long.  When the
+          assembler based specialization of ACE_Atomic_Op<> is used, there
+          is a performance benefit.
+
+        * tao/PortableServer/POA_Current_Impl.h:
+        * tao/PortableServer/POA_Current_Impl.inl:
+        * tao/PortableServer/POA_Current_Impl.cpp:
+        * tao/PortableServer/Servant_Upcall.h:
+        * tao/PortableServer/Servant_Upcall.cpp:
+
+          Use an octet sequence array of a specific size (512 bytes by
+          default) when constructing the ObjectId.  This allows us to avoid
+          allocations during an upcall in most situations. [RT 8372]
+
+        * tao/PortableServer/Root_POA.cpp:
+
+          Begin the starting_at index at the TAO_OBJECTKEY_PREFIX_SIZE
+          instead of starting it at zero and then adding the value directly
+          after that.  This is probably immeasurable performance-wise.
+
+        * tao/TAO_Server_Request.h:
+        * tao/TAO_Server_Request.i:
+        * tao/TAO_Server_Request.cpp:
+
+          Avoid using ACE_CString for the operation name which will avoid
+          memory allocations when it isn't necessary.  Most of the time, the
+          operation name can be shared from the operation_details_ object.
+
+        * tao/Tagged_Profile.h:
+        * tao/Tagged_Profile.i:
+        * tao/Tagged_Profile.cpp:
+
+          Avoid using ACE_CString as the type_id_.  The type_id_ was never
+          used for anything more than a holder of a char* that it didn't
+          own, but incurred allocation penalties during construction.
+
+Mon Jul 17 14:26:08 UTC 2006  Ciju John  <john_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
+
+          Addendum to
+          Fri Jul 14 18:34:41 UTC 2006  john_c  <johnc@ociweb.com>
+
+          Previously the code created a connection, then made the socket
+          non-blocking. This change first make the socket
+          non-blocking then initiates the connection. Previous code left a
+          small window, which I think was causing a hangup in certain
+          conditions.
+
+Mon Jul 17 13:15:58 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/examples/ORT/client.cpp:
+
+          Modified this code to correctly utilize the exception macros.  It
+          was using ACE_TRY_ENV as a parameter to CORBA::ORB_init().
+
+Mon Jul 17 12:55:48 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/Event/Mcast/Complex/consumer.cpp:
+
+          Modified this code to correctly utilize the exception macros.  It
+          was using ACE_TRY_ENV as a parameter to CORBA::ORB_init().
+
+Mon Jul 18 11:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies.mpc:
+          Enabled regeneration of the pidl files
+
+        * tao/Strategies/sciop_endpoints.pidl:
+        * tao/Strategies/uiop_endpoints.pidl:
+          Updated comments block to resolve warnings during recompilation
+
+        * tao/Strategies/uiop_endpointsC.{h,cpp}:
+        * tao/Strategies/sciop_endpointsC.{h,cpp}:
+          Removed from the repo
+
+Mon Jul 18 11:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype/ValueBase.{h,cpp}:
+          Removed typecode for ValueModifier, it is also in the AnyTypeCode
+          library but it seems that in the handcrafted code the export
+          of this typecode was gone, now we regenate things automatically
+          some linkers complain about the duplicate symbols
+
+Mon Jul 18 10:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny/*.cpp:
+          Reordered includes and added missing includes to fix compile
+          errors with gcc
+
+Mon Jul 17 09:50:45 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp:
+          Eliminate warning with String_var usage on GCC 2.96.
+
+Mon Jul 18 07:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IFR_Client.mpc:
+          Removed -Sorb, gives problems for users of this lib
+
+Sun Jul 17 06:49:21 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/PortableServer/Servant_var.inl (_retn):
+
+          Removed extraneous "this" pointer usage on local variable.
+
+Mon Jul 17 00:20:29 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * NEWS:
+          Added news entry re Bug 2593.
+
+Sun Jul 16 23:28:27 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
+
+          Change method signatures to pass ACE_Time_Value by const-reference.
+
+Sat Jul 15 22:08:58 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * docs/tutorials/Quoter/RTCORBA/Admin.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
+        * docs/tutorials/Quoter/RTCORBA/Common_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Common_i.h
+        * docs/tutorials/Quoter/RTCORBA/Distributor.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
+
+        * docs/tutorials/Quoter/RTCORBA/docs/broker.html
+        * docs/tutorials/Quoter/RTCORBA/docs/common.html
+        * docs/tutorials/Quoter/RTCORBA/docs/database.html
+        * docs/tutorials/Quoter/RTCORBA/docs/distributor.html
+        * docs/tutorials/Quoter/RTCORBA/docs/index.html
+        * docs/tutorials/Quoter/RTCORBA/docs/mpc.html
+
+          Modify these files based on the suggestions of William R. Otte.
+
+Sat Jul 15 12:25:11 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_1393_Regression/client.cpp:
+        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp:
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h:
+        * orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h:
+          Added needed include
+
+Sat Jul 15 05:07:11 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/tutorials/Quoter/index.html
+
+          Added a link to the RTCORBA tutorial.
+
+        * docs/tutorials/Quoter/RTCORBA/Broker.idl
+        * docs/tutorials/Quoter/RTCORBA/Common.idl
+        * docs/tutorials/Quoter/RTCORBA/Distributor.idl
+
+          Corrected IDL files which had been corrupted by overzealous
+          removal of DOS style line endings.
+
+Sat Jul 15 00:47:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+          Disabled the regression for bug 2582, I tested it weeks ago and
+          it worked, but now it fails when I added the test
+
+Sat Jul 15 00:42:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Fixed casing of include
+
+Fri Jul 14 23:44:45 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/Utils/Servant_Var.h:
+
+          Removed "#warning" preprocess directive.  It's not portable.
+          Thanks to Jeff for pointing this out.
+
+Fri Jul 14 23:42:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          When generating a pidl file change the guard we generate in the
+          header file. Fixes problems with TimeBase.pidl and TimeBase.idl
+          which both exist.
+
+Fri Jul 14 21:43:55 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Acceptor.cpp (parse_address):
+          Reverted change at Johnny's request. See bug 2599 for a
+          discussion of the reason why.
+
+Fri Jul 14 21:43:58 UTC 2006  john_c  <johnc@ociweb.com>
+
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc:
+        * tests/Optimized_Connection/oc_client.cpp:
+
+          Minor fixes to make Fuzz builds happy.
+
+Fri Jul 14 21:42:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/BooleanSeqA.*
+        * tao/AnyTypeCode/CharSeqA.*
+        * tao/AnyTypeCode/CONV_FRAMEA.*
+        * tao/AnyTypeCode/CurrentA.*
+        * tao/AnyTypeCode/DoubleSeqA.*
+        * tao/AnyTypeCode/FloatSeqA.*
+        * tao/AnyTypeCode/GIOPA.*
+        * tao/AnyTypeCode/IIOP_EndpointsA.*
+        * tao/AnyTypeCode/IIOPA.*
+        * tao/AnyTypeCode/IOP_IORA.*
+        * tao/AnyTypeCode/IOPA.*
+        * tao/AnyTypeCode/LongDoubleSeqA.*
+        * tao/AnyTypeCode/LongLongSeqA.*
+        * tao/AnyTypeCode/LongSeqA.*
+        * tao/AnyTypeCode/Messaging_PolicyValueA.*
+        * tao/AnyTypeCode/Messaging_SyncScopeA.*
+        * tao/AnyTypeCode/ObjectIdListA.*
+        * tao/AnyTypeCode/orb_typesA.*
+        * tao/AnyTypeCode/ParameterModeA.*
+        * tao/AnyTypeCode/PI_ForwardA.*
+        * tao/AnyTypeCode/Policy_ForwardA.*
+        * tao/AnyTypeCode/PortableInterceptorA.*
+        * tao/AnyTypeCode/ServicesA.*
+        * tao/AnyTypeCode/ShortSeqA.*
+        * tao/AnyTypeCode/TAOA.*
+        * tao/AnyTypeCode/TimeBaseA.*
+        * tao/AnyTypeCode/ULongLongSeqA.*
+        * tao/AnyTypeCode/ULongSeqA.*
+        * tao/AnyTypeCode/WCharSeqA.*
+        * tao/AnyTypeCode/WStringSeqA.*
+        * tao/BooleanSeqC.*
+        * tao/CharSeqC.*
+        * tao/CONV_FRAMEC.*
+        * tao/CurrentC.*
+        * tao/DoubleSeqC.*
+        * tao/FloatSeqC.*
+        * tao/GIOPC.*
+        * tao/IIOP_EndpointsC.*
+        * tao/IIOPC.*
+        * tao/IOP_IORC.*
+        * tao/IOPC.*
+        * tao/LongDoubleSeqC.*
+        * tao/LongLongSeqC.*
+        * tao/LongSeqC.*
+        * tao/Messaging_PolicyValueC.*
+        * tao/Messaging_SyncScopeC.*
+        * tao/ObjectIdListC.*
+        * tao/orb_typesC.*
+        * tao/ParameterModeC.*
+        * tao/PI_ForwardC.*
+        * tao/Policy_ForwardC.*
+        * tao/PortableInterceptorC.*
+        * tao/ServicesC.*
+        * tao/ShortSeqC.*
+        * tao/StringSeqC.*
+        * tao/TAOC.*
+        * tao/TimeBaseC.*
+        * tao/ULongLongSeqC.*
+        * tao/ULongSeqC.*
+        * tao/WCharSeqC.*
+        * tao/WStringSeqC.*
+          Removed from the repo, all regenerated as part of the build
+
+        * tao/tao.mpc:
+          Enabled regeneration for a lot of pidl files
+
+        * tao/DynamicAny/diffs/DynamicAny.diff:
+          Removed, not needed anymore
+
+Fri Jul 14 21:10:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny.mpc:
+          Enabled regeneration of the pidl files
+
+        * tao/DynamicAny/DynamicAnyC.{h,cpp}:
+          Removed from the repo, will get regenerated automatically
+
+        * tao/*Resource*.*:
+          Moved the different resources files (Qt,Fl,Tk, and Xt) to
+          subdirectories so that in TAO/tao we only have the tao lib
+          core
+
+Fri Jul 14 21:15:32 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * TAO_IDL/ast/ast_decl.cpp (version):
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
+        * tao/Acceptor_Registry.cpp:
+        * tao/CORBANAME_Parser.cpp:
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Profile.cpp:
+        * tao/Transport_Connector.cpp:
+        * tao/params.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+
+          ACE string class  operations now consistently return and accept an
+          unsigned index/position value instead of a mix of signed and
+          unsigned return index types.  Use the "size_type" typedef
+          instead of int or ssize_t, and the "npos" constant instead of
+          "-1".
+
+        * TAO_IDL/fe/fe_init.cpp:
+
+          Use ACE_CString::npos instead of ACE_String_Base_Const::npos.
+          The latter is not meant for use outside of ACE.
+
+        * orbsvcs/Trading_Service/Trading_Service.h:
+        * orbsvcs/orbsvcs/Shutdown_Utilities.h:
+
+          Include "ace/Sig_Handler.h" to pull in ACE_Sig_Handler class
+          declaration.
+
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h:
+
+          Moved TAO_Notify_ProxySupplier forward declaration within the
+          TAO versioned namespace.
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+          (accept_svc_handler):
+
+          Ensure that errno is preserved in case the svc_handler close()
+          method resets it.
+
+        * orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc:
+
+          Removed "naming" MPC base project from "CosEvent Test Lib"
+          project.  That test library does not depending on the Naming
+          Service.
+
+        * tao/GIOP_Message_Base.cpp:
+
+          Cosmetic changes.
+
+        * tao/ORB_Core.cpp:
+
+          Access ORB table lock using the new lock accessor rather than
+          directly using the lock member because of a (now removed) friend
+          declaration.  Folks, stop being lazy. :)
+
+        * tao/ORB_Table.h:
+        * tao/ORB_Table.inl:
+
+          The ORB table now has no friends, nor should it!  HP aCC 3.63
+          was confused by the global scope qualifier in the friend
+          declaration, due to broken namespace scoping support.
+
+          Added a public lock accessor method.
+
+        * tao/Policy_Manager.h (TAO_Policy_Manager, operator=):
+
+          Added private and unimplemented copy constructor and assignment
+          operator.  TAO_Policy_Manager should not be copied.
+
+        * tao/PortableServer.mpc (Template_Files):
+
+          Explicitly list template files since the Servant_var.* template
+          sources will otherwise not be considered template sources.
+
+        * tao/AnyTypeCode/Any_Array_Impl_T.cpp (marshal_value, value):
+        * tao/AnyTypeCode/Any_Array_Impl_T.inl:
+        * tao/AnyTypeCode/Any_Basic_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl_T.inl:
+        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Dual_Impl_T.inl:
+        * tao/AnyTypeCode/Any_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Impl_T.inl:
+        * tao/AnyTypeCode/Any_Special_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Special_Impl_T.inl:
+
+          Moved inline virtual methods out of line.  Virtual methods
+          generally should not be inlined.  Addresses potential RTTI
+          problems with g++ 4.x.
+
+        * tao/PortableServer/Object_Adapter.cpp
+          (wait_for_non_servant_upcalls_to_complete):
+
+          Removed explicit use of CORBA::Environment in native C++
+          exception builds.  It isn't needed.
+
+          (dispatch, get_collocated_servant):
+
+          Prevent potential buffer overread.  (From Andrew Schnable)
+
+        * tao/PortableServer/Object_Adapter.h
+          (wait_for_non_servant_upcalls_to_complete):
+
+          Removed explicit use of CORBA::Environment in native C++
+          exception builds.  It isn't needed.
+
+        * tao/PortableServer/PS_ForwardC.h:
+
+          PortableServer::ServantBase_var is now a specialization of the
+          new (standard) PortableServer::Servant_var<> class template.
+
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/PortableServer/Servant_Base.h:
+        * tao/PortableServer/Servant_Base.i:
+
+          Removed TAO_ServantBase_var class.  It's functionality is now
+          provided by the PortableServer::Servant_var<> class template.
+
+        * tao/PortableServer/Servant_Upcall.cpp (upcall_cleanup):
+
+          Renamed wait_for_non_servant_upcall_to_complete() method
+          call to the name (..._to_complete_no_throw()).
+
+        * tao/PortableServer/Servant_var.cpp:
+        * tao/PortableServer/Servant_var.h:
+        * tao/PortableServer/Servant_var.inl:
+
+          Implementation of the standard PortableServer::Servant_var<>
+          class template.
+
+        * tao/Utils/Servant_Var.h:
+
+          Marked TAO::Utils::Servant_var<> class template as deprecated.
+          Use standard PortableServer::Servant_var class template
+          instead.
+
+        * utils/catior/catior.cpp (catior):
+
+          Fixed crash due to buffer overrun.  The message block write
+          pointer should be set to the end of the message block, not twice
+          the length of message block.  Thanks to Sriram Chandramouli
+          <sriram_chandramouli at symantec dot com> for pointing out this
+          problem.
+
+Fri Jul 14 21:10:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny.mpc:
+          Enabled regeneration of the pidl files
+
+        * tao/DynamicAny/DynamicAnyC.{h,cpp}:
+          Removed from the repo, will get regenerated automatically
+
+        * tao/*Resource*.*:
+          Moved the different resources files (Qt,Fl,Tk, and Xt) to
+          subdirectories so that in TAO/tao we only have the tao lib
+          core
+
+Fri Jul 14 21:03:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+          This fix closes [BUGID:2582]. Thanks to Heesuk Shin
+          <heesuks@econz.com> for reporting the bug.
+          Also fixes bug 2583.
+
+Fri Jul 14 20:50:30 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_decl.cpp:
+        * TAO_IDL/ast/ast_typedef.cpp:
+        * TAO_IDL/include/ast_decl.h:
+        * TAO_IDL/include/ast_typedef.h:
+
+          Fixed bug in the recursive check for local type
+          containment that was causing CDR operators to
+          get generated for types that contain a local
+          interface at some level of nesting. This fix
+          closes [BUGID:2583].
+
+Fri Jul 14 20:38:07 UTC 2006  john_c  <johnc@ociweb.com>
+
+        * tests/AlternateIIOP/run_test.pl:
+
+          Split a long string.
+
+        * tests/Optimized_Connection/Optimized_Connection.mpc:
+        * tests/Optimized_Connection/README:
+        * tests/Optimized_Connection/oc.ior:
+        * tests/Optimized_Connection/oc_client.cpp:
+        * tests/Optimized_Connection/oc_svc.conf:
+        * tests/Optimized_Connection/run_test.pl:
+
+          Created new test to test the Optimized_Connection Selector.
+
+        * tests/AlternateIIOP/svc.conf:
+
+          Removed this file. This test shouldn't be testing the Optimized
+          Connection Selector.
+
+Fri Jul 14 19:20:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/tutorials/Quoter/RTCORBA/Admin.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker.idl
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
+        * docs/tutorials/Quoter/RTCORBA/Common.idl
+        * docs/tutorials/Quoter/RTCORBA/Common_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Common_i.h
+        * docs/tutorials/Quoter/RTCORBA/Distributor.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor.idl
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+        * docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
+        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
+        * docs/tutorials/Quoter/RTCORBA/docs/broker.html
+        * docs/tutorials/Quoter/RTCORBA/docs/common.html
+        * docs/tutorials/Quoter/RTCORBA/docs/database.html
+        * docs/tutorials/Quoter/RTCORBA/docs/distributor.html
+        * docs/tutorials/Quoter/RTCORBA/docs/idl.html
+        * docs/tutorials/Quoter/RTCORBA/docs/index.html
+        * docs/tutorials/Quoter/RTCORBA/docs/mpc.html
+        * docs/tutorials/Quoter/RTCORBA/docs/prioritymapping.html
+        * docs/tutorials/Quoter/RTCORBA/docs/run.html
+
+          A RTCORBA tutorial based on the Quoter by Shanshan Jiang.
+
+Fri Jul 14 18:34:41 UTC 2006  john_c  <johnc@ociweb.com>
+
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
+
+          Set handle options after a proper handle has been assigned. This
+          was causing a race condition at a client location. We couldn't
+          reproduce the problem, but the change is valid.
+
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf:
+
+          Adding a test to traverse the changed code path.
+
+Fri Jul 14 17:00:49 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp:
+
+          Fixed a bug in create_object() that uses an incorrect index
+          to access the policy in the policy list.
+
+Fri Jul 14 16:01:38 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * tests/Bug_2494_Regression/client.cpp:
+        * tests/Bug_2494_Regression/run_test.pl:
+
+        Eliminate false failures of this test due to the client process
+        printing the exception or exiting with a non-zero status.
+
+Fri Jul 14 15:11:11 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
+
+        Added two new options to the CEC_Default_Factory,
+        -CECConsumerOperationTimeout and -CECSupplierOperationTimeout.
+        These options apply relative roundtrip timeout policies for consumer
+        and supplier objects.  This allows users to minimize the ill effects of
+        unresponsive consumer and supplier operations (i.e. push() or pull()).
+        See bugzilla #2594 and docs/cec_options.html.
+        Also, exposed the "disconnect_callbacks" event channel attribute
+        as the "-b" option to the CosEvent_Service executable.
+
+        * NEWS
+        * docs/cec_options.html:
+
+        Documented the Timeout feature described above.
+
+        * orbsvcs/tests/CosEvent/Timeout/README:
+        * orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h:
+        * orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp:
+        * orbsvcs/tests/CosEvent/Timeout/Timeout.mpc:
+        * orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp:
+        * orbsvcs/tests/CosEvent/Timeout/cosevent.conf:
+        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
+
+        Functional test for the Timeout feature described above.
+
+Fri Jul 14 02:02:55 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Acceptor.cpp:
+          Fix for parsing IPv6 endpoints not using the enclosing []. An
+          address such as fe80::a0f2:2510:7549:12345 is a legitemate IPv6
+          address but would be misinterpreted.
+
+        * tao/Profile.cpp:
+        * tests/Bug_2593_Regression/Bug_2593_Regression.mpc:
+        * tests/Bug_2593_Regression/Hello.h:
+        * tests/Bug_2593_Regression/Hello.cpp:
+        * tests/Bug_2593_Regression/README:
+        * tests/Bug_2593_Regression/Test.idl:
+        * tests/Bug_2593_Regression/client.cpp:
+        * tests/Bug_2593_Regression/run_test.pl:
+        * tests/Bug_2593_Regression/server.conf:
+        * tests/Bug_2593_Regression/server.cpp:
+          A fix and a new regression test for bug 2593. Thanks to Jules
+          Colding, <colding at omesc dot com> for finding this.
+
+Thu Jul 13 10:26:42 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/EndpointPolicy/EndpointPolicyTypeA.h:
+        * tao/EndpointPolicy/Endpoint_Value_Impl.cpp:
+
+          Added missing versioned namespace macros.
+
+Thu Jul 12 18:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ObjRefTemplate.mpc:
+          Added versioning base project
+
+Wed Jul 12 18:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IORManipulation.mpc:
+          Enabled regeneration of pidl files
+
+        * tao/IORManipulation/IORA.h:
+          Temporarily new file to keep other A.h files happy
+
+        * tao/IORManipulation/IORC.{h,cpp}:
+        * tao/IORManipulation/IORA.cpp:
+          Removed from the repo
+
+Wed Jul 12 10:25:12 UTC 2006  Martin Corino <mcorino@remedy.nl>
+
+        * tests/CollocationLockup/CollocationLockup.cpp:
+        * tests/CollocationLockup/run_test.pl:
+          Added some customization to have this test run correctly on OpenVMS.
+
+        * tests/Object_Loader/Loader.cpp:
+        * tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp:
+          Removed deprecated OpenVMS specific include.
+
+Tue Jul 11 12:12:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BiDir_GIOP/diffs/BiDirPolicy.diff:
+        * tao/CodecFactory/diff/IOP_Codec.diff:
+        * tao/IORInterceptor/diff/IORInterceptor.diff:
+        * tao/IORTable/diff/IORTable.diff:
+        * tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff:
+        * tao/RTPortableServer/diffs/RTPortableServer.diff:
+          Removed, not needed anymore
+
+        * tao/RTPortableServer.mpc:
+          Enabed regeneration of the pidl files
+
+        * tao/RTPortableServer/RTPortableServerA.cpp:
+        * tao/RTPortableServer/RTPortableServerC.cpp:
+        * tao/RTPortableServer/RTPortableServerC.h:
+        * tao/RTPortableServer/RTPortableServerS.h:
+          Removed from the repo
+
+Tue Jul 11 12:07:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
         * tao/AnyTypeCode.mpc:
+          Enabled regeneration of the pidl files
+
+        * tao/AnyTypeCode/TypeCode.h:
+          Added include that was first pulled in indirectly
+
+        * tao/AnyTypeCode/AnySeqA.cpp
+        * tao/AnyTypeCode/AnySeqA.h
+        * tao/AnyTypeCode/AnySeqC.cpp
+        * tao/AnyTypeCode/AnySeqC.h
+        * tao/AnyTypeCode/AnySeqS.h
+        * tao/AnyTypeCode/BoundsA.cpp
+        * tao/AnyTypeCode/BoundsA.h
+        * tao/AnyTypeCode/BoundsC.cpp
+        * tao/AnyTypeCode/BoundsC.h
+        * tao/AnyTypeCode/Dynamic_ParameterA.cpp
+        * tao/AnyTypeCode/Dynamic_ParameterA.h
+        * tao/AnyTypeCode/Dynamic_ParameterC.cpp
+        * tao/AnyTypeCode/Dynamic_ParameterC.h
+        * tao/AnyTypeCode/ValueModifierA.cpp
+        * tao/AnyTypeCode/ValueModifierA.h
+        * tao/AnyTypeCode/ValueModifierC.cpp
+        * tao/AnyTypeCode/ValueModifierC.h
+        * tao/AnyTypeCode/ValueModifierS.h
+        * tao/AnyTypeCode/VisibilityA.cpp
+        * tao/AnyTypeCode/VisibilityA.h
+        * tao/AnyTypeCode/VisibilityC.cpp
+        * tao/AnyTypeCode/VisibilityC.h
+        * tao/AnyTypeCode/VisibilityS.h
+          Removed from the repository, regenerated now automatically
+
+Tue Jul 11 11:59:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          Fix for CORBA/e
+
+Tue Jul 11 11:08:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
         * tao/BiDir_GIOP.mpc:
-        * tao/CSD_Framework.mpc:
-        * tao/CSD_ThreadPool.mpc:
+          Fixed casing of include
+
+Tue Jul 11 08:30:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * utils/nslist/nslist.cpp:
+        * utils/nslist/run_test.pl:
+          Fix bugzilla 2592.
+
+Tue Jul 11 08:10:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
+          Fix bugzilla 2591.
+
+Tue Jul 11 01:43:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Bug_2582_Regression.idl:
+        * tests/IDL_Test/Bug_2583_Regression.idl:
+          New tests for TAO_IDL, mpc file will be committed when the latest
+          change from Jeff is in the archive
+
+Tue Jul 11 01:40:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/TAO_Singleton_Manager.cpp:
+          Initialise pointer with 0
+
+Tue Jul 11 01:20:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be/be_global.cpp:
+        * docs/compiler.html:
+        * TAO_IDL/be/be_codegen.cpp:
+          Added support for -Wb,include_guard= and -Wb,safe_include=.
+          The include guard is a define that is generated in the C.h file
+          that prevents the user from including this generated file, the
+          safe_include is the file that the user should include instead
+          of the C.h and which is also used in the generated A.cpp and
+          C.cpp. With these new options a lot of generated files can be
+          removed also from the repository
+
+        * tao/RTCORBA/RT_Transport_Descriptor.cpp:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+        * tao/Valuetype/ValueBase.cpp:
+          Bool and const changes
+
+        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
+        * tao/PI_Server/PortableServer_PolicyFactory.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+          Fixes for CORBA/e
+
         * tao/CodecFactory.mpc:
-        * tao/Codeset.mpc:
-        * tao/Compression.mpc:
-        * tao/Domain.mpc:
-        * tao/DynamicAny.mpc:
-        * tao/DynamicInterface.mpc:
-        * tao/EndpointPolicy.mpc:
-        * tao/FlResource.mpc:
-        * tao/IFR_Client.mpc:
+        * tao/BiDir_GIOP.mpc:
         * tao/IORInterceptor.mpc:
-        * tao/IORManipulation.mpc:
         * tao/IORTable.mpc:
+        * tao/ObjRefTemplate.mpc:
+          Enabled regeneration of the pidl files
+
+        * tao/CodecFactory/IOP_CodecC.{h,cpp}:
+        * tao/CodecFactory/IOP_CodecS.h:
+        * tao/BiDir_GIOP/BiDirPolicyC.{h,cpp}:
+        * tao/IORInterceptor/IORInfoC.{h,cpp}:
+        * tao/IORInterceptor/IORInterceptorC.{h,cpp}:
+        * tao/IORTable/IORTableC.{h,cpp}:
+        * tao/ObjRefTemplate/Default_ORTC.{h,cpp,inl}:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.{h,cpp,inl}:
+          Removed from the repo, will get regenerated as part of the
+          building of the core lib.
+
+        * tao/BiDir_GIOP/BiDirPolicy.pidl:
+        * tao/IIOP_Endpoints.pidl:
+          Updated comments to resolve warnings during recompilation
+
+Sun Jul 09 05:56:55 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 1.5.2 released.
+
+Tue Jul  3 07:51:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
+          Fixed missing 'const' in argument declaration.
+
+Mon Jul  3 15:05:55 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_typedef.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be_include/be_typedef.h:
+
+          Changed logic of how the seen_in_operation_ flag is handled
+          and how the arg traits visitor works for typedefs. There
+          was an interaction between a typedef valuetype member
+          and the use of the base type in an interface operation.
+          This fix closes [BUGID:2577]. Thanks to Heesuk Shin
+          <heesuks@econz.com> for reporting the bug.
+
+        * tests/IDL_Test/Bug_2577_Regression.idl:
+
+          Removed the preprocessor condition around the line that
+          reproduces the bug, and added a comment.
+
+Mon Jul  3 14:29:07 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/OBV/Any/client.cpp:
+          Guard against running the test using Any::to_value() with a
+          streamed any when compiled with optimized valuetype marshaling
+          as this test case still fails. See the verbose comment in the
+          source for details.
+
+Mon Jul  3 14:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/EndpointPolicy/EndpointPolicyTypeC.h:
+          Fixed versioning macros
+
+Mon Jul  3 14:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+          Fixed versioning macros
+
+Mon Jul  3 13:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/ast/ast_decl.cpp:
+          Const improvements
+
+        * TAO_IDL/fe/fe_init.cpp:
+        * TAO_IDL/util/utl_stack.cpp:
+          Initialise pointer with 0
+
+Mon Jul  3 11:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/ORBInitInfoA.h:
+          Added this file, needed because other files can include the
+          pidl file and this file isn't generated by the idl compiler
+          because we don't use -GA when regenerating the pidl file
+
+Mon Jul  3 11:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
+          Temporarily disabled the array sequence ut, the mock_array
+          isn't updated after all array refactoring and this needs
+          more time then we have for the upcoming beta
+
+Mon Jul  3 10:59:59 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/OBV/Any/OBV_Any.mpc:
+        * tests/OBV/Any/client.cpp:
+
+        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
+        * tests/OBV/Truncatable/TruncatableS_impl.cpp:
+        * tests/OBV/Truncatable/client.cpp:
+
+          Bug 2576 turned out to be invalid. There is already a mechanism
+          present to address the problem I raised. I've updated the tests
+          to work with the correct value extraction methods.
+
+Mon Jul  3 12:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Bug_2577_Regression.idl:
+        * tests/IDL_Test/IDL_Test.mpc:
+          Added regression for bug 2577, this is not fixed yet, but I had
+          this in my workspace, so commit the test for others. The
+          file should be changed to reproduce the bug. Thanks to
+          Heesuk Shin <heesuks at econz dot com> for delivering this test
+          case.
+
+Mon Jul  3 10:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/ORBInitializer.pidl:
+          Added workaround for bug 2569 to get the solaris/icc builds
+          running again.
+
+        * tests/IDL_Test/typeprefix.idl:
+          Comment part of this test case to get the builds running again
+
+Mon Jul  3 09:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+          Fixed versioning macros generation
+
+Mon Jul  3 00:54:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/AnyTypeCode/skip.cpp:
+        * tao/Valuetype/Valuetype_Adapter_Impl.h:
+        * tao/Valuetype/Valuetype_Adapter_Impl.cpp:
+        * tao/Valuetype_Adapter.h:
+          Reworked the new interfaces added to the valuetype adapter to be
+          a little more logical, and added one for detecting chunking.
+          Skipping the chunks turns out to be really easy, the chunk start
+          is the length in bytes to skip. Skip that length, then get the
+          chunk end tag, which is the negated length. If the chunk start
+          value is negative, that indicates the end of a nesting level, so
+          this process is repeated until a nesting level of -1 is reached,
+          indicating the end of the value.
+
+          This change enables truncatable values to be encapsulated in
+          anys.
+
+        * tao/Valuetype/ValueBase.cpp:
+          Reformatted a long comment
+
+        * tests/OBV/Any/Any.idl:
+        * tests/OBV/Any/AnyS_impl.h:
+        * tests/OBV/Any/AnyS_impl.cpp:
+        * tests/OBV/Any/OBV_Any.mpc:
+        * tests/OBV/Any/client.cpp:
+        * tests/OBV/Truncatable/Extra.idl:
+        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
+        * tests/OBV/Truncatable/Truncatable.idl:
+        * tests/OBV/Truncatable/TruncatableS_impl.h:
+        * tests/OBV/Truncatable/TruncatableS_impl.cpp:
+        * tests/OBV/Truncatable/client.cpp:
+
+          Adding the change for encapsulating truncatables gave rise to a
+          new bug, 2576. This bug illustrates that TAO does not properly
+          extract a valuetype to a base value pointer, even though the
+          base value type is carried as part of the Any's typeID
+          information. So as not to increase the number of failures on the
+          scoreboard at this time the test code illustrating this bug is
+          guarded by a #if defined (TAO_TEST_BUG_2576).
+
+Sat Jul  1 19:16:11 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * NEWS:
+          Documented the TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING switch.
+
+Sat Jul  1 15:32:43 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/AnyTypeCode/skip.cpp:
+        * tao/Valuetype/Valuetype_Adapter_Impl.h:
+        * tao/Valuetype/Valuetype_Adapter_Impl.cpp:
+        * tao/Valuetype_Adapter.h:
+
+          Added an exclusion for Valuetypes marshaled with implied types.
+          Implicitly typed values are those for which the actual valuetype
+          matches the formal valuetype. For values inserted into an Any
+          this is always true as the Any separately marshals the typecode
+          making it redundant to do this again by the value itself.
+
+          TAO only marshals values this way when compiled to use optimized
+          valuetype marshaling which is not the default case since it
+          breaks backwards compatibility.
+
+          This resolves bug 2575.
+
+        * tao/TAO_Server_Request.h:
+
+          Fixed a typo in a comment.
+
+Sat Jul  1 12:16:20 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Valuetype/ValueBase.cpp:
+          Fixed spelling of TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING
+
+Fri Jun 30 13:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Profile.cpp (is_equivalent):
+          Use true/false for bool
+
+Fri Jun 30 10:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_module/module_ch.cpp:
+          Removed some versioning macro calls
+
+Thu Jun 29 14:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.{h,cpp}:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp:
+          Moved destroy_ec out of the destructor to a seperate method
+
+Thu Jun 29 10:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/include/utl_string.h:
+        * TAO_IDL/util/utl_string.cpp:
+          Changed compare_quiet to return a real bool.
+
+        * TAO_IDL/util/utl_identifier.cpp:
+          Const improvement
+
+Thu Jun 29 09:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Bounded_Array_Sequence_T.h:
+        * tao/Bounded_Sequence_CDR_T.h:
+        * tao/Unbounded_Array_Sequence_T.h:
+        * tao/Unbounded_Sequence_CDR_T.h:
+          Moved (de)marshal_sequence methods from CDR file to the Array
+          file.
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+          Slightly reworked the way the any includes are generated. This
+          way the versioning macros are generated better in the A.cpp file.
+
+Thu Jun 29 08:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rules.tao.GNU:
+          Removed check for templates=explicit
+
+Thu Jun 29 01:45:29 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated.
+
+Wed Jun 28 15:23:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * docs/libraries.html:
+          Added text describing the new TAO_EndpointPolicy library.
+
+Wed Jun 28 13:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/typeprefix.idl:
+          New file with small example of IDL construct with typeprefix
+          that fails to compile when TAO_IDL is build with Intel C++
+          and Sun C++ at this moment. Changing the forward declared
+          interface B to a real interface makes it compiling, no idea
+          what happens and why this only fails with the mentioned
+          compilers
+
+        * tests/IDL_Test/IDL_Test.mpc:
+          Added new file
+
+Wed Jun 28 12:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * utils/nslist/nslist.cpp:
+          Fix overzellous VuWorks renaming of variables from last fix.
+
+Wed Jun 28 11:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/LoadBalancer/LoadManager.cpp:
+          When we can't register the signal handler, use ACE_ERROR_RETURN
+          so that it is visible from the test output why things fail.
+
+Wed Jun 28 09:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype/AbstractBase.cpp:
+          Use false instead of 0 for a bool
+
+Wed Jun 28 09:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Profile.h:
+          Removed commented out method
+
+        * tao/Profile.cpp:
+          Compilation fix for CORBA/e micro
+
+Wed Jun 28 09:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Added base projects for corba/e and minimum corba
+
+Wed Jun 28 08:00:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * utils/nslist/nsadd.cpp:
+        * utils/nslist/nslist.cpp:
+          Fix minor compiler warnings. Anoying cut and paste
+          ; subsitution for a , in nsadd.cpp.
+
+Wed Jun 28 06:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * utils/catior/catior.mpc:
+          Removed not needed libpaths and added messaging as base project
+          so that we are sure we build this exe after messaging
+
+Tue Jun 27 19:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POAManager.pidl:
+          Added missing checks for minimum poa
+
+Tue Jun 27 19:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.{h,cpp}:
+        * examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp:
+        * examples/Content_Server/SMI_Iterator/Web_Server.idl:
+        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.{h,cpp}:
+        * examples/Content_Server/AMI_Iterator/Web_Server.idl:
+          Made the filesize a CORBA::ULongLong so that we could handle files
+          bigger then 2Gb, this also resolves some warnings we have on
+          windows
+
+Tue Jun 27 19:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI_Server.mpc:
+        * tao/PI_Server/ServerRequestInterceptor{A,C,S}.{h,cpp}:
+          Readded these generated files and removed the regeneration of these
+          files from the core libs. The generated files had a diff that I
+          missed this morning, need to resolve that handcrafting first
+
+Tue Jun 27 19:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/WCharSeqA.cpp:
+          Removed some versioning macros that don't seem correct, if this
+          solves the errors in the versioning builds I have to change the
+          IDL compiler for this.
+
+Tue Jun 27 18:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/XtResource.mpc:
+          And the last mpc file to get an empty IDL_Files section. Thanks to
+          Chad Elliot for noticing this last missing file
+
+Tue Jun 27 18:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Domain/DomainS.cpp:
+          Fixed compile error
+
+Tue Jun 27 18:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/FlResource.mpc:
+        * tao/QtResource.mpc:
+        * tao/TkResource.mpc:
+          Added empty IDL_Files section to prevent orb.idl to appear in these
+          projects when building for corba/e or minimum corba. Thanks to Chad
+          Elliot for bringing these files to my attention.
+
+Tue Jun 27 17:35:02 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/CSD_Framework.mpc:
+        * tao/EndpointPolicy.mpc:
         * tao/ImR_Client.mpc:
         * tao/Messaging.mpc:
-        * tao/ObjRefTemplate.mpc:
         * tao/PI.mpc:
         * tao/PI_Server.mpc:
         * tao/PortableServer.mpc:
-        * tao/QtResource.mpc:
-        * tao/RTCORBA.mpc:
-        * tao/RTPortableServer.mpc:
-        * tao/RTScheduler.mpc:
-        * tao/SmartProxies.mpc:
-        * tao/Strategies.mpc:
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
-        * tao/TkResource.mpc:
+
+          Reverted the work-around for MPC where generated A.cpp files
+          needed to be added.  The bug in MPC has been fixed.
+
+Tue Jun 27 14:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Fixed_Array_SArgument_T.{h,cpp,inl}:
+          Fixed crashing of multdim array part of the param test
+
+Tue Jun 27 14:40:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * utils/nslist/nsadd.cpp:
+          Fix a resource leak.
+
+Tue Jun 27 12:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Updated supported platforms
+
+Tue Jun 27 12:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CSD_Framework.mpc:
+          Enabled recompilation for the pidl files of CSD_Framework
+
+        * tao/CSD_Framework/CSD_Framework.pidl:
+          Updated instructions, removed comments about the patch, not needed
+
+        * tao/CSD_Framework/CSD_Framework*.*:
+          Removed from the repo
+
+        * tao/CSD_Framework/diffs/CSD_Framework.diff:
+          Removed, not needed anymore
+
+Tue Jun 27 11:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI_Server.mpc:
+          Enabled recompilation for the pidl files of PI_Server
+
+        * tao/PI_Server/ServerRequestInterceptor*.*:
+        * tao/PI_Server/ServerRequestInfo*.*:
+          Removed from the repo
+
+Tue Jun 27 10:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI.mpc:
+          Enabled recompilation for the pidl files of PI
+
+        * tao/PI/ClientRequestInfo*.*:
+        * tao/PI/ClientRequestInterceptor*.*:
+        * tao/PI/Interceptor*.*:
+        * tao/PI/InvalidSlot*.*:
+        * tao/PI/ORBInitializer*.*:
+        * tao/PI/ORBInitInfo*.*:
+        * tao/PI/PICurrent*.*:
+        * tao/PI/PIForwardRequest*.*:
+        * tao/PI/ProcessingModePolicy*.*:
+        * tao/PI/RequestInfo*.*:
+          Removed from the repo
+
+Tue Jun 27 10:25:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * NEWS:
+        * utils/nslist/nsadd.cpp:
+        * utils/nslist/nsdel.cpp:
+        * utils/nslist/nslist.cpp:
+          Enhanced the nslist utilities.
+
+Tue Jun 27 10:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging.mpc:
+          Enabled recompilation for the pidl files of Messaging
+
+        * tao/Messaging/TAO_ExtC.*:
+        * tao/Messaging/TAO_ExtA.*:
+        * tao/Messaging/PollableC.*:
+        * tao/Messaging/PollableA.*:
+        * tao/Messaging/Messaging_SyncScope_PolicyC.*:
+        * tao/Messaging/Messaging_SyncScope_PolicyA.*:
+        * tao/Messaging/Messaging_RT_PolicyC.*:
+        * tao/Messaging/Messaging_RT_PolicyA.*:
+        * tao/Messaging/ExceptionHolderC.*:
+        * tao/Messaging/ExceptionHolderA.*:
+        * tao/Messaging/ExceptionHolderS.*:
+          Removed from the repo
+
+Tue Jun 27 09:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ImR_Client.mpc:
+          Enabled recompilation for the pidl files of ImR_Client
+
+        * tao/ImR_Client/ImplRepoS.*:
+        * tao/ImR_Client/ImplRepoA.cpp:
+        * tao/ImR_Client/ImplRepoC.*:
+        * tao/ImR_Client/ServerObjectA.*:
+        * tao/ImR_Client/ServerObjectC.*:
+        * tao/ImR_Client/ServerObjectS.*:
+          Removed from the repo, do get regenerated as part of the building
+          of the core libs
+
+        * tao/ImR_Client/ImplRepoA.h:
+          Dummy file that just includes ImplRepoC.h, using -GA for this file
+          doesn't work
+
+Tue Jun 27 09:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/BiDirectional/run_test.pl:
+          Use wait_interval_for_process_creation instead of hardcoded value
+
+        * tests/Hello/server.cpp:
+          Added newline after debug message
+
+        * tests/Stack_Recursion/server.cpp:
+          Initialise pointer with 0
+
+        * tests/Stack_Recursion/Sender.{h,cpp}:
+          Changed is_done to a real bool
+
+Tue Jun 27 08:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PolicyS.cpp:
+          Forgot to patch this file
+
+Tue Jun 27 06:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/*.mpc:
+          Removed tao_versioning_idl_defaults as explicit base, this is coming
+          from taolib. Added empty IDL_Files section to all files that didn't
+          had one to prevent the compilation of orb.idl in the corba/e builds
+
+        * tao/IFR_Client/IFR_BaseC.*
+        * tao/IFR_Client/IFR_BasicC.*
+        * tao/IFR_Client/IFR_ComponentsC.*
+        * tao/IFR_Client/IFR_ExtendedC.*
+          Removed these files from the repo
+
+        * tao/IFR_Client.mpc:
+          Regenerate the pidl files as part of the build
+
+        * tao/Basic_Arguments.h:
+        * tao/Basic_Argument_T.{h,cpp.inl}:
+        * tao/BD_String_Argument_T.{h,cpp,inl}:
+        * tao/Fixed_Array_Argument_T.{h,cpp,inl}:
+        * tao/Fixed_Size_Argument_T.{h,cpp,inl}:
+        * tao/Object_Argument_T.{h,cpp,inl}:
+        * tao/Object.h:
+        * tao/Special_Basic_Argument_T.{h,cpp,inl}:
+        * tao/Special_Basic_Arguments.h:
+        * tao/UB_String_Argument_T.{h,cpp,inl}:
+        * tao/UB_String_Argument.h:
+        * tao/Var_Array_Argument_T.{h,cpp,inl}:
+        * tao/Var_Size_Argument_T.{h,cpp,inl}:
+        * tao/AnyTypeCode/Any_Arg_Traits.h:
+        * tao/AnyTypeCode/TypeCode.h:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+        * tao/PortableServer/Any_SArg_Traits.h:
+        * tao/PortableServer/Basic_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Basic_SArguments.h:
+        * tao/PortableServer/BD_String_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Fixed_Array_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Fixed_Size_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Object_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Object_SArg_Traits.h:
+        * tao/PortableServer/Var_Size_SArgument_T.{h,cpp,inl}:
+        * tao/Valuetype/ValueBase.h:
+        * tao/Valuetype/AbstractBase.h:
+        * tao/PortableServer/Special_Basic_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Special_Basic_SArgument.h:
+        * tao/PortableServer/TypeCode_SArg_Traits.h:
+        * tao/PortableServer/Var_Array_SArgument_T.{h,cpp,inl}:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+          Removed the introduction of template template arguments for any
+          insertion strategy. The HP aCC3 compiler doesn't support this at
+          all so it broke that support fully.
+
+Mon Jun 26 13:27:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * NEWS:
+          Added PICurrent refactoring note.
+
+Sat Jun 24 22:13:38 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * docs/tutorials/Quoter/Simple/Impl-Repo/index.html: Enhanced this
+          file so it explains how to run the Implementation Repository.
+          Thanks to Ben Creech <bpcreech at alumni dot ncsu dot edu> for
+          contributing the improvement.
+
+Mon Jun 26 09:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tao/ServerRequestInterceptor_Adapter.h:
+        * tao/TAO_Server_Request.cpp:
+        * tao/TAO_Server_Request.h:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI/ClientRequestInfo.h:
+        * tao/PI/PICurrent.h:
+        * tao/PI/PICurrent_Copy_Callback.cpp: (Deleted)
+        * tao/PI/PICurrent_Copy_Callback.h:   (Deleted)
+        * tao/PI/PICurrent_Impl.cpp:
+        * tao/PI/PICurrent_Impl.h:
+        * tao/PI/PICurrent_Impl.inl:
+        * tao/PI_Server/PICurrent_Guard.cpp:
+        * tao/PI_Server/PICurrent_Guard.h:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.h:
+
+          This refactors the PICurrent implimentaion and fixes issue 2552
+          (TAO358).
+
+Mon Jun 26 08:17:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/RTScheduling/RTScheduler_includeA.h:
+        * tao/RTScheduling/RTScheduler_includeC.h:
+          Changed include for RTSheduler,h to make it compatible for OpenVMS.
+
+        * tests/Bug_1020_Regression/server.cpp:
+        * tests/Bug_1361_Regression/shutdown.cpp:
+        * tests/Nested_Upcall_Crash/scavenger.cpp:
+        * tests/Object_Loader/Loader.cpp:
+        * tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp:
+          Small OpenVMS compatibility changes.
+
+Fri Jun 23 19:03:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype.mpc:
+        * tao/EndpointPolicy.mpc:
+        * tao/PortableServer.mpc:
+          Explicitly list the generated A.cpp in the source section because
+          MPC doesn't add them at this moment
+
+Fri Jun 23 18:39:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype.mpc:
+        * tao/EndpointPolicy.mpc:
+          Don't substract -Sa from the idlflags, it can be used for the
+          pidl files
+
+        * tao/PortableServer.mpc:
+          Handle ForwardRequest.pidl differently because of special
+          idlflags
+
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+          Fixed error in this file
+
+Fri Jun 23 13:42:54 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+
+          Added $(TAO_ROOT) to the 'includes' line of the IFR loader
+          executable project, because of a change in the way
+          TAO/Version.h is included.
+
+Fri Jun 23 07:36:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Fixed_Array_SArgument_T.h:
+          Fixed compile problem
+
+Thu Jun 22 15:27:04 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/ORB_Local_Config/Bug_1459/a.conf:
+          Fix the test by making it use UIOP rather than SSLIOP as the
+          alternative protocol. The original problem results from first
+          using SSLIOP in the non-default ORB which loads the SSL library,
+          which in turn registers with the ACE Object Manager. At shutdown
+          time, the SSL library is unloaded in order, but then the ACE
+          Object Manager tries to clean it up, but can't, because it is
+          already gone.
+
+Thu Jun 22 16:13:29 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/PortableServer/Fixed_Array_SArgument_T.cpp:
+        * tao/PortableServer/Fixed_Array_SArgument_T.h:
+        * tao/PortableServer/Fixed_Array_SArgument_T.inl:
+
+          Changed the member type of all classes except the out arg
+          class from array type to forany type. Almost every operation
+          in these classes was first converting the member to forany
+          type first, and there is no forany constructor directly from
+          array type. This new design is similar to the stub argument
+          classes for fixed arrays in TAO.
+
+Thu Jun 22 15:01:21 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
+
+          Added missing SSLIOP namespace qualifier to typedef inside
+          the SSLIOP_Credentials class.
+
+Thu Jun 22 14:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/BD_String_SArgument_T.cpp:
+          Fixed compile problems in Debian Core build
+
+Thu Jun 22 07:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Var_Array_SArgument_T.cpp:
+          Fixed compile problem
+
+Thu Jun 22 06:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Any.{h,cpp,inl}:
+          Moved include of Object.h to the header file to resolve compile
+          problems with Borland in release mode when inlining is enabled
+
+Thu Jun 22 06:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BD_String_Argument_T.cpp:
+          Fixed bug in this file
+
+Wed Jun 21 20:46:09 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Array_VarOut_T.h:
+
+          Added a typedef of FORANY in the TAO_FixedArray_Var_T<> and
+          TAO_VarArray_Var_T<> classes that just refer to the existing
+          typedef for FORANY in the common base class. Some compilers,
+          when parsing template code, will not look into a base class
+          unless they are forced to, so the base class typedef was not
+          seen when referenced in a derived class. Thanks to Will Otte
+          <wotte@dre.vanderbilt.edu> for figuring this out.
+
+Wed Jun 21 14:10:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Array_VarOut_T.h:
+
+          Removed 'typename' qualifier in typedef of FORANY inside the
+          TAO_Array_Var_Base_T template class, since it was causing
+          problems on the FC4_CIAO_Core build.
+
+Wed Jun 21 13:50:57 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h:
+
+          Added typedefs _ptr_type, _var_type, and _out_type to
+          these "interface" classes, since the typedefs are now
+          required by the *_var and *_out template classes.
+
+Wed Jun 21 12:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
+        * tao/Array_Traits_T.h
+        * tao/Array_VarOut_T.cpp
+        * tao/Array_VarOut_T.h
+        * tao/Array_VarOut_T.inl
+        * tao/BD_String_Argument_T.cpp
+        * tao/Bounded_Array_Sequence_T.h
+        * tao/Bounded_Sequence_CDR_T.h
+        * tao/Fixed_Array_Argument_T.cpp
+        * tao/Unbounded_Array_Sequence_T.h
+        * tao/Unbounded_Sequence_CDR_T.h
+        * tao/Var_Array_Argument_T.cpp
+          Reworked array support, remove the traits struct I added and use the
+          forany class in most templates, this is how Jeff refactoring things
+          earlier this week, my approach just gave to much problems.
+
+Wed Jun 21 07:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BD_String_Argument_T.cpp:
+          Fixed compile problems by added a seperate typedef and use
+          this in the methods.
+
+Wed Jun 21 07:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/EndpointPolicy.mpc:
+        * tao/PortableServer.mpc:
         * tao/TypeCodeFactory.mpc:
-        * tao/Utils.mpc:
         * tao/Valuetype.mpc:
-        * tao/XtResource.mpc:
-        * tao/ZlibCompressor.mpc:
-        * tao/tao.mpc:
-        * utils/catior/catior.mpc:
-        * utils/nslist/nslist.mpc:
+          Removed the <%quote%>, it did break on several platforms, just
+          don't add the quotes in the mpc file, the IDL compiler will
+          add quotes around the include string
 
-          Use the install base project instead of the deprecated core base
-          project.
+Wed Jun 21 02:02:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Wed Jan  3 15:18:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * TAO_IDL/Makefile.am:
 
-        * tests/Portable_Interceptors/Redirection/*:
-          New regression created by Jaiganesh Balasubramanian
-          <jai at dre dot vanderbilt dot edu> that reproduces a bug
-          in the handling of the PortableInterceptor::ForwardRequest
-          exception. Fix will follow later, see also bugzilla 2763
+          Regenerated.
 
-Wed Jan  3 14:25:26 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+        * TAO_IDL/tao_idl.mpc:
+
+          Changed automake specific include "$(srcdir)/.." to $(TAO_ROOT).
+          This is enough to trigger the MPC heuristic that this is a TAO
+          rather than ACE project.  No more hand edits!
+
+Tue Jun 20 20:58:35 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/orbsvcs/Makefile.am:
         * tao/Makefile.am:
-        * tests/Bug_2429_Regression/Makefile.am:
 
-          Fix tabs that were changed to eight spaces in some previous
-          checkin.
+          Regenerated with updated MPC automake.mpd.
 
-Wed Jan  3 14:19:15 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Tue Jun 20 18:17:04 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * tests/Collocation/Collocation.mpc:
+        * TAO_IDL/tao_idl.cpp:
+        * TAO_IDL/tao_idl.mpc:
+          Changed include directive for "../tao/Version.h" to "tao/Version.h"
+          and added ".." and "$(srcdir)/.." to the list of include dirs in
+          tao_idl.mpc.
+          OpenVMS doesn't grok the "../tao/Version.h" when toa_idl.cpp is
+          compiled for the IFR project.
 
-          Fixing build dependencies.
+        * TAO_IDL/driver/drv_preproc.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+          Changes to circumvent OpenVMS differences regarding subprocesses,
+          redirection and file naming.
 
-Wed Jan  3 13:19:03 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+        * TAO_IDL/be/be_helper.cpp:
+          Disabled ACE_OS::fflush () calls for OpenVMS as these slow down
+          things dramatically.
 
-        * tests/Bug_2702_Regression/fakeserver2.pl: Added Id string to
-          fix fuzz build.
+Tue Jun 20 18:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Jan  3 05:58:08 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
+          Fixed compile errors
 
-          This entry documents the merge of several small bug fixes from
-          the OCI distribution.
+Tue Jun 20 17:21:42 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * orbsvcs/Notify_Service/README:
+        * tao/EndpointPolicy.mpc:
+        * tao/PortableServer.mpc:
+        * tao/TypeCodeFactory.mpc:
+        * tao/Valuetype.mpc:
 
-          Add documentation for the new "-UseSeparateDispatchingORB"
-          option.
+          Replaced double quotes in these files with <%quote%>. Thanks
+          to Chad Elliott <elliott_c@ociweb.com> for providing
+          the fix that allowed the generated *.vcproj files to
+          load on MSVC 7.1.
 
-        * orbsvcs/Notify_Service/Notify_Service.h:
-        * orbsvcs/Notify_Service/Notify_Service.cpp:
+Tue Jun 20 15:28:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Add new methods for creating the dispatching ORB and a flag for
-          indicating whether a separate dispatching ORB should be used.
+        * TAO_IDL/Makefile.am:
+        * tao/Makefile.am:
 
-        * orbsvcs/orbsvcs/Notify/Properties.h:
-        * orbsvcs/orbsvcs/Notify/Properties.inl:
-        * orbsvcs/orbsvcs/Notify/Properties.cpp:
+          Regenerated.
 
-          Added methods and data member related to managing the separate
-          dispatching ORB.
+        * tao/TypeCodeFactory.mpc:
 
-        * orbsvcs/orbsvcs/Notify/Properties.h (instance):
-        * orbsvcs/orbsvcs/Notify/Properties.cpp (instance):
-        * orbsvcs/orbsvcs/Notify/RT_Properties.h (instance):
-        * orbsvcs/orbsvcs/Notify/RT_Properties.cpp (instance):
+          Remove TypeCodeFactory subdirectory from PIDL_Files section,
+          as it's now listed in IDL_Files.
 
-          Merged in a change similar to "Thu May 19 00:29:35 2005  Ossama
-          Othman  <ossama@dre.vanderbilt.edu>" that avoids multiple
-          singleton instances of the Properties singleton.
+Tue Jun 20 13:43:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp (init):
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp (init):
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp (init):
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
 
-          Similar change in all three of these places substitutes
-          _unchecked_narrow() for _narrow() when using the "re-hosting"
-          technique for the a separate dispatching ORB.  For the reference
-          to the consumer itself, the _unchecked_narrow() is perfectly
-          fine because we had a reference to something of that type
-          already.  For the NotifyPublish narrowing, though, the
-          _unchecked_narrow() isn't completely sufficient.  However, we
-          want to avoid a normal _narrow() because the resulting _is_a()
-          invocation could end up deadlocking if the POA that's hosting
-          the object reference for the consumer has not yet been
-          activated.  Thus, we use pseudo-lazy evaluation for that,
-          described in the entry for Consumer.{h,cpp} below.
+          Remove setting of servant retention policy when creating the new
+          POA because this policy is not available with Minimum CORBA.  We
+          were just being pedantic and setting it to the default value
+          (RETAIN) anyway.
 
-        * orbsvcs/orbsvcs/Notify/Consumer.h:
+Tue Jun 20 13:35:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added a flag, have_not_yet_verified_publish_, that indicates
-          whether the type of this->publish_ has been verified to actually
-          be a reference to something implementing the NotifyPublish
-          interface.
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h:
+          Updated for all changes
 
-        * orbsvcs/orbsvcs/Notify/Consumer.cpp (CTOR, dispatch_updates_i):
+Tue Jun 20 12:41:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Modified CTOR to initialize the aforementioned flag.  In
-          dispatch_updates_i, we assume that the reference is unverified
-          until we've checked it once.  I don't think we need to worry
-          about thread safety here...at least I hope not.
+        * tao/PortableServer/BD_String_SArgument_T.cpp:
+          Fixed compilation problems with Borland
 
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.h (init_service2, init_i2):
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp (init_service2, init_i2):
+Tue Jun 20 12:29:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added code to parse the new option.
+        * docs/Options.html:
+          Document ORBOutputCDRAllocator and don't refer to cvs.doc.wustl.edu
+          for files, just get them locally
 
-        * orbsvcs/orbsvcs/Notify/POA_Helper.cpp (create_i, activate):
+        * docs/compiler.html:
+          Document -Sorb
 
-          Corrected some minor memory leaks when getting the name of a
-          POA.
+Tue Jun 20 10:21:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/tests/Notify/Basic/run_test.pl:
-        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h:
+          Fixed compile error
 
-          Added an outer loop that runs the basic tests with and without a
-          separate dispatching ORB.
+Tue Jun 20 08:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/ObjectKey_Table.h:
-        * tao/ObjectKey_Table.cpp:
-        * tao/Unbounded_Octet_Sequence_T.h:
+        * tao/Any_Insert_Policy_T.h:
+          Reworded the policies to just contain a static method so that we
+          don't need to create an instance
 
-          Added an optimization to servant activation.  This change
-          removes the overhead of calling TAO::ObjectKey::operator[] and
-          TAO::unbounded_value_sequence<CORBA::Octet>::operator[].  The
-          main benefit of not calling these methods is that check_bounds()
-          is not called.  check_bounds () is not required since the
-          length of the two arrays are taken into account.  This change
-          provides about 30% decrease in servant activation time for a
-          debug build (tested on Windows VC71 and Linux gcc using OCITAO
-          1.4a).  The implementation uses ACE_OS::memcmp which could
-          possibly be optimized similar to ACE_HAS_SLOW_MEMSET.  This
-          change originated from OCITAO 1.4a as part of RT 8571.
-
-        * tao/GIOP_Message_State.cpp (parse_message_header_i):
-
-          Fixed a problem where TAO mistakenly considered ALL messages
-          with zero-length payload to be errors and was thus not
-          properly parsing and handling the GIOP CloseConnection
-          message.
+        * tao/Argument.h:
+          When we don't have interceptors, just don't declare the In/Out/InOut
+          classes, just typedef them to Argument
 
-        * tao/GIOP_Utils.h:
+        * tao/Basic_Arguments.h:
+        * tao/Basic_Argument_T.{h,cpp.inl}:
+        * tao/BD_String_Argument_T.{h,cpp,inl}:
+        * tao/Fixed_Array_Argument_T.{h,cpp,inl}:
+        * tao/Fixed_Size_Argument_T.{h,cpp,inl}:
+        * tao/Object_Argument_T.{h,cpp,inl}:
+        * tao/Object.h:
+        * tao/Special_Basic_Argument_T.{h,cpp,inl}:
+        * tao/Special_Basic_Arguments.h:
+        * tao/UB_String_Argument_T.{h,cpp,inl}:
+        * tao/UB_String_Argument.h:
+        * tao/Var_Array_Argument_T.{h,cpp,inl}:
+        * tao/Var_Size_Argument_T.{h,cpp,inl}:
+        * tao/AnyTypeCode/Any_Arg_Traits.h:
+        * tao/AnyTypeCode/TypeCode.h:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+        * tao/PortableServer/Any_SArg_Traits.h:
+        * tao/PortableServer/Basic_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Basic_SArguments.h:
+        * tao/PortableServer/BD_String_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Fixed_Array_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Fixed_Size_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Object_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Object_SArg_Traits.h:
+        * tao/PortableServer/Var_Size_SArgument_T.{h,cpp,inl}:
+        * tao/Valuetype/ValueBase.h:
+        * tao/Valuetype/AbstractBase.h:
+        * tao/PortableServer/Special_Basic_SArgument_T.{h,cpp,inl}:
+        * tao/PortableServer/Special_Basic_SArgument.h:
+        * tao/PortableServer/TypeCode_SArg_Traits.h:
+        * tao/PortableServer/Var_Array_SArgument_T.{h,cpp,inl}:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+          The any insert policy has been changed to a template template
+          argument.
+
+        * tao/PortableServer/PolicyS.cpp:
+        * tao/WCharSeqS.h:
+        * tao/WCharSeqC.h:
+        * tao/CONV_FRAMEC.h:
+        * tao/DomainC.cpp:
+        * tao/IIOP_EndpointsC.h:
+        * tao/IIOPC.h:
+        * tao/Messaging_PolicyValueC.h:
+        * tao/IOP_IORC.h:
+        * tao/OctetSeqC.h:
+        * tao/WCharSeqC.cpp:
+        * tao/Policy_ForwardC.h:
+        * tao/PolicyC.cpp:
+        * tao/StringSeqC.h:
+        * tao/ServicesC.h:
+        * tao/GIOPC.h:
+        * tao/AnyTypeCode/Dynamic_ParameterC.h:
+        * tao/AnyTypeCode/WCharSeqA.{h,cpp}:
+        * tao/Domain/DomainS.cpp:
+        * tao/DynamicAny/DynamicAnyC.h:
+        * tao/IFR_Client/IFR_ExtendedC.{h,cpp}:
+        * tao/IFR_Client/IFR_ComponentsC.{h,cpp}:
+        * tao/IFR_Client/IFR_BasicC.{h,cpp}:
+        * tao/IFR_Client/IFR_BaseC.{h,cpp}:
+        * tao/ImR_Client/ImplRepoC.{h,cpp}:
+        * tao/ImR_Client/ImplRepoS.cpp:
+        * tao/ImR_Client/ServerObjectS.cpp:
+        * tao/IORInterceptor/IORInfoC.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
+        * tao/RTCORBA/RTCORBAC.h:
+        * tao/RTScheduling/RTSchedulerC.cpp:
+        * tao/Strategies/sciop_endpointsC.h:
+        * tao/Strategies/uiop_endpointsC.h:
+        * tao/PortableServer/PortableServerC.{h,cpp}:
+        * tao/PortableServer/PortableServerS.h:
+          Updated for all template changes
 
-          Corrected comment incorrectly indicating that
-          CloseConnection could not be send by both sides of a
-          connection.
+        * tao/Sequence_T.h:
+          Reordered includes
 
-        * tests/Bug_2702_Regression/CloseConnection.mpc:
-        * tests/Bug_2702_Regression/README:
-        * tests/Bug_2702_Regression/Test.idl:
-        * tests/Bug_2702_Regression/client.cpp:
-        * tests/Bug_2702_Regression/closeconnection.dat:
-        * tests/Bug_2702_Regression/fakeserver.pm:
-        * tests/Bug_2702_Regression/fakeserver2.pl:
-        * tests/Bug_2702_Regression/run_test.pl:
+        * tao/Blocked_Connect_Strategy.{h,cpp}:
+          Removed not needed virtual destructor
 
-          Added a test to simulate the receipt of a CloseConnection in a
-          client, similar to what the original reporter experienced.
-          See the accompanying README for details.
+        * tao/Connection_Handler.cpp:
+        * tao/Wait_On_Leader_Follower.cpp:
+        * tao/Wait_On_Reactor.cpp:
+        * tao/Wait_On_Read.cpp:
+        * tao/Wait_Strategy.{h,cpp,inl}:
+        * tao/Transport_Cache_Manager.cpp:
+          Changed is_registered flag of the wait stratetegy to a real bool
 
-        * orbsvcs/tests/Bug_1393_Regression/run_test.pl:
-        * orbsvcs/tests/Bug_1395_Regression/run_test.pl:
-        * orbsvcs/tests/Bug_1436_Regression/run_test.pl:
-        * orbsvcs/tests/Bug_1437_Regression/run_test.pl:
-        * orbsvcs/tests/Bug_2615_Regression/run_test.pl:
-        * orbsvcs/tests/Event/Performance/run_test.pl:
-        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
-        * orbsvcs/tests/ImplRepo/locked/run_test.pl:
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:
-        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl:
-        * orbsvcs/tests/RTCosScheduling/run_test.pl:
-        * orbsvcs/tests/Security/Big_Request/run_test.pl:
-        * orbsvcs/tests/Security/Callback/run_test.pl:
-        * orbsvcs/tests/Security/Secure_Invocation/run_test.pl:
-        * tests/COIOP/run_test.pl:
-        * tests/DLL_ORB/run_test.pl:
-        * tests/Portable_Interceptors/IORInterceptor/run_test.pl:
-        * tests/Portable_Interceptors/PICurrent/run_test.pl:
-        * tests/Portable_Interceptors/PolicyFactory/run_test.pl:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl:
-        * utils/nslist/run_test.pl:
+        * tao/Object_Reference_Sequence_Element_T.h:
+        * tao/String_Sequence_Element_T.h:
+          Added in accessor
 
-          Changed relative paths to $ACE_ROOT/bin in these scripts to
-          reference directly via the ACE_ROOT environment variable so
-          that the scripts would work properly when run in a workspace
-          that does not use the traditional everything-under-ACE_wrappers
-          directory hierarchy.
+        * tao/Object.cpp:
+        * tao/PortableServer/IdAssignmentPolicy.{h,cpp}:
+        * tao/PortableServer/IdUniquenessPolicy.{h,cpp}:
+        * tao/PortableServer/ImplicitActivationPolicy.{h,cpp}:
+        * tao/PortableServer/LifespanPolicy.{h,cpp}:
+        * tao/PortableServer/POA_Cached_Policies.cpp:
+        * tao/PortableServer/POA_Policy_Set.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/POAManager.{h,cpp}:
+        * tao/PortableServer/POAManagerFactory.{h,cpp}:
+        * tao/PortableServer/RequestProcessingPolicy.{h,cpp}:
+        * tao/ORB.{h,cpp}:
+        * tao/PortableServer/PortableServer.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategyServantManager.{h,cpp}:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/PortableServer/Root_POA.{h,cpp}:
+        * tao/PortableServer/ThreadPolicy.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategyRetain.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+        * tao/PortableServer/ServantRetentionPolicy.{h,cpp}:
+          Added support for CORBA/e
+
+        * tao/PortableServer/IdAssignmentPolicy.pidl:
+        * tao/PortableServer/PS_Current.pidl:
+        * tao/TypeCodeFactory/TypeCodeFactory.pidl:
+        * tao/Valuetype/StringValue.pidl:
+        * tao/PortableServer/RequestProcessingPolicy.pidl:
+        * tao/PortableServer/ServantActivator.pidl:
+        * tao/PortableServer/ServantLocator.pidl:
+        * tao/PortableServer/ServantManager.pidl:
+        * tao/PortableServer/ServantRetentionPolicy.pidl:
+        * tao/PortableServer/ThreadPolicy.pidl:
+          Updated regeneration instructions and support CORBA/e
 
-Wed Jan  3 00:51:49 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tao/OctetSeq.pidl:
+          Added -Sorb to the regeneration instructions
 
-        * tests/TransportCurrent/Framework/client.cpp:
+        * tao/Policy_Forward.pidl:
+          Updated regeneration instructions, handcrafting is not needed anymore
 
-          Clarified the conditional compilation for TAO_HAS_MINIMUM_CORBA.
+        * tao/diffs/Policy_Forward.diff:
+          Removed from the repo
 
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+        * tao/VarOut_T.{h,inl}:
+          Zapped one template argument
 
-          Qualified a constant with the Test:: workspace prefix.
+        * tao/IIOP_Transport.{h,cpp}:
+        * tao/default_resource.{h,cpp}:
+        * tao/Transport.{h,cpp}:
+          Added support for sendfile
 
-Tue Jan  2 16:32:36 UTC 2006  Simon Massey  <sma@prismtech.com>
+        * tao/orbconf.h:
+          Added TAO_USE_OUTPUT_CDR_MMAP_MEMORY_POOL with which sendfile
+          can be forced during compilation
 
-        * tao/PI/PICurrent.h:
-        * tao/PI/PICurrent.cpp:
-          extern "C" linkage CANNOT be added to a class member.
+        * tao/Transport_Cache_Manager.cpp:
+          Use ACE_TEXT with debug macros
 
-Tue Jan  2 14:07:36 UTC 2006  Simon Massey  <sma@prismtech.com>
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+        * tao/Valuetype/AbstractBase_T.cpp:
+          Const improvements
 
-        * tao/PI/PICurrent.h:
-          Add extern "C" linkage to the cleanup function.
+        * tao/PortableServer/get_arg.h:
+          Check if the details do have args before doing a cast, part of
+          bug 2503
 
-Tue Jan  2 14:07:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PortableServer/POA.pidl:
+        * tao/PortableServer/PortableServer.pidl:
+          Moved most contents to POA.pidl to make regeneration easier
 
-        * tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc:
-        * tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc:
-        * tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc:
-        * MPC/config/csd_tp_foo_a_lib.mpb:
-        * MPC/config/csd_tp_foo_b_lib.mpb:
-        * MPC/config/csd_tp_foo_c_lib.mpb:
-          Disabled with CORBA/e micro
+        * tao/Bounded_Sequence_CDR_T.h:
+          Moved array code to this file
 
-Tue Jan  2 12:45:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Array_VarOut_T.{h,cpp,inl}:
+        * tao/Array_Traits_T.h:
+        * tao/Bounded_Array_Sequence_T.h:
+        * tao/Unbounded_Array_Sequence_T.h:
+        * tao/Unbounded_Sequence_CDR_T.h:
+          Refactored array support, mix of the changes from Jeff from
+          yesterday and my work. Need to cleanup a little when things
+          compile again.
 
-        * TAO_IDL/be/be_visitor_operation/argument.cpp:
-          Fixed variable not used warning
+        * tao/TypeCodeFactory.mpc:
+        * tao/Valuetype.mpc:
+        * tao/PortableServer.mpc:
+        * tao/ImR_Client.mpc:
+        * tao/EndpointPolicy.mpc:
+          Enabled regeneration of pidl files as part of building the core
+          TAO libs. More pidl files will get regenerated as part of the
+          build, this is the first step.
 
-Tue Jan  2 11:50:57 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tao/tao.mpc:
+          Added new sendfile files
+
+        * tao/RTCORBA/RT_Transport_Descriptor.h:
+          Use false for a boolean
+
+        * tao/Strategies/FIFO_Connection_Purging_Strategy.{h,cpp}:
+        * tao/Strategies/LFU_Connection_Purging_Strategy.{h,cpp}:
+        * tao/Strategies/NULL_Connection_Purging_Strategy.{h,cpp}:
+          Removed not needed virtual destructors
+
+        * tao/PortableServer/diffs/AdapterActivator.diff
+        * tao/PortableServer/diffs/ForwardRequest.diff
+        * tao/PortableServer/diffs/ImplicitActivationPolicy.diff
+        * tao/PortableServer/diffs/POAManager.diff
+        * tao/PortableServer/diffs/RequestProcessingPolicy.diff
+        * tao/PortableServer/diffs/ServantActivator.diff
+        * tao/PortableServer/diffs/ServantLocator.diff
+        * tao/PortableServer/diffs/ServantManager.diff
+        * tao/PortableServer/diffs/ServantRetentionPolicy.diff
+        * tao/PortableServer/diffs/ThreadPolicy.diff
+          Removed, not needed anymore
 
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_decl.h:
+          Made generation of ORB.h optional, can be suppressed using -Sorb
+
+        * TAO_IDL/be/be_decl.cpp:
+        * TAO_IDL/be/be_interface_fwd.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_typedef.cpp:
+        * TAO_IDL/be_include/be_decl.h:
+        * TAO_IDL/be_include/be_interface_fwd.h:
+        * TAO_IDL/be_include/be_type.h:
+        * TAO_IDL/be_include/be_typedef.h:
+          Removed old code related to explicit template instantiations
 
-          Removing the trivial post_init() template implementation added
-          on Sun Dec 31 17:27:27 UTC 2006 because it confuses the Windows
-          builds.
+        * TAO_IDL/be/be_sequence.cpp:
+          Updated generation of array sequences
+
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp:
+          Updated generation for arrays
+
+        * TAO_IDL/be/be_visitor_interface.cpp:
+          Added support for native keyword, needed to generate typedefs  from
+          the pidl files
+
+        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+          Small layout improvements
+
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_module/module_ch.cpp:
+        * TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
+        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+          Added missing generation of versioning macros.
+
+        * TAO_IDL/be/be_visitor_interface/interface.cpp:
+        * TAO_IDL/be_include/be_visitor_interface/interface.h:
+          Handle native
+
+        * TAO_IDL/be/be_visitor_native/native_ch.cpp:
+        * TAO_IDL/be_include/be_visitor_native.h:
+        * TAO_IDL/be_include/be_visitor_native/native_ch.h:
+          New file for native generation
+
+        * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
+          Updated for array changes
+
+        * TAO_IDL/fe/fe_extern.cpp:
+          Const improvement
+
+Mon Jun 19 22:55:04 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Array_VarOut_T.h:
+
+          Added 'typename' to the typedef of FORANY in class
+          TAO_Array_Var_Base_T.
+
+Mon Jun 19 19:39:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/EndpointPolicy/EndpointPolicyA.*:
+        * tao/EndpointPolicy/EndpointPolicyC.*:
+        * tao/EndpointPolicy/EndpointPolicyTypeA.*:
+        * tao/EndpointPolicy/EndpointPolicyTypeC.*:
+        * tao/EndpointPolicy/IIOPEndpointValueA.*:
+        * tao/EndpointPolicy/IIOPEndpointValueC.*:
+        * tao/PortableServer/AdapterActivatorC.*:
+        * tao/PortableServer/AdapterActivatorA.*:
+        * tao/PortableServer/ForwardRequestC.*:
+        * tao/PortableServer/ForwardRequestA.*:
+        * tao/PortableServer/IdAssignmentPolicyC.*:
+        * tao/PortableServer/IdAssignmentPolicyA.*:
+        * tao/PortableServer/IdUniquenessPolicyC.*:
+        * tao/PortableServer/IdUniquenessPolicyA.*:
+        * tao/PortableServer/ThreadPolicyC.*:
+        * tao/PortableServer/ThreadPolicyA.*:
+        * tao/PortableServer/ServantRetentionPolicyC.*:
+        * tao/PortableServer/ServantRetentionPolicyA.*:
+        * tao/PortableServer/ServantManagerC.*:
+        * tao/PortableServer/ServantManagerA.*:
+        * tao/PortableServer/ServantLocatorC.*:
+        * tao/PortableServer/ServantLocatorA.*:
+        * tao/PortableServer/ServantActivatorC.*:
+        * tao/PortableServer/ServantActivatorA.*:
+        * tao/PortableServer/RequestProcessingPolicyC.*:
+        * tao/PortableServer/RequestProcessingPolicyA.*:
+        * tao/PortableServer/PS_CurrentC.*:
+        * tao/PortableServer/PortableServerA.cpp:
+        * tao/PortableServer/POAManagerFactoryC.*:
+        * tao/PortableServer/POAManagerC.*:
+        * tao/PortableServer/LifespanPolicyC.*:
+        * tao/PortableServer/LifespanPolicyA.*:
+        * tao/PortableServer/ImplicitActivationPolicyC.*:
+        * tao/PortableServer/ImplicitActivationPolicyA.*:
+        * tao/TypeCodeFactory/TypeCodeFactoryA.*:
+        * tao/TypeCodeFactory/TypeCodeFactoryC.*:
+        * tao/Valuetype/StringValueC.*:
+          Removed from the repo, will be generated with tao_idl during the build
+          of the core libs in the future.
+
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
+          Const improvement
+
+        * tao/EndpointPolicy/EndpointPolicy.pidl:
+        * tao/EndpointPolicy/EndpointPolicyType.pidl:
+        * tao/EndpointPolicy/IIOPEndpointValue.pidl:
+          Removed regeneration instructions, stored in mpc file in the future
+
+        * tao/PortableServer/AdapterActivator.pidl:
+        * tao/PortableServer/ForwardRequest.pidl:
+        * tao/PortableServer/IdUniquenessPolicy.pidl:
+        * tao/PortableServer/ImplicitActivationPolicy.pidl:
+        * tao/PortableServer/POAManagerFactory.pidl:
+        * tao/PortableServer/POAManager.pidl:
+        * tao/PortableServer/LifespanPolicy.pidl:
+          Removed regeneration instructions and updated for CORBA/e
+
+        * tao/PortableServer/Creation_Time.h:
+          Made single argument constructor explicit
+
+        * tao/Connector_Registry.{h,cpp,i}:
+        * tao/Incoming_Message_Queue.{h,inl}:
+          Const improvements
+
+        * tao/MMAP_Allocator.{h,cpp}:
+          New files part of the sendfile support
+
+        * tao/Stub.h:
+          Doxygen improvements
 
-Tue Jan  2 09:13:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
+        * tao/PortableServer/Default_Policy_Validator.cpp:
+        * tao/PortableServer/Adapter_Activator.{h,cpp}:
+          Added support for CORBA/e
 
-        Removed support from the IDL compiler for -Ge 0 and -Ge 1. We
-        now always generate without enviroment macros. -Ge 2 is still there
-        but probably gets removed also soon
+Mon Jun 19 14:49:25 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
+        * tao/Abstract_Servant_Base.h:
+        * tao/Adapter.h:
+        * tao/Adapter_Registry.h:
+        * tao/AnyTypeCode.mpc
+        * tao/Array_Traits_T.h:
+        * tao/Array_VarOut_T.cpp:
+        * tao/Array_VarOut_T.h:
+        * tao/Array_VarOut_T.inl:
+        * tao/BD_String_Argument_T.cpp:
+        * tao/BD_String_Argument_T.h:
+        * tao/BD_String_Argument_T.inl:
+        * tao/Basic_Argument_T.h:
+        * tao/Basic_Arguments.h:
+        * tao/BooleanSeqC.h:
+        * tao/Bounded_Array_Sequence_T.h:
+        * tao/CharSeqC.h:
+        * tao/Collocation_Proxy_Broker.h:
+        * tao/DoubleSeqC.h:
+        * tao/Environment.h:
+        * tao/Fixed_Array_Argument_T.cpp:
+        * tao/Fixed_Array_Argument_T.h:
+        * tao/Fixed_Array_Argument_T.inl:
+        * tao/Fixed_Size_Argument_T.cpp:
+        * tao/Fixed_Size_Argument_T.h:
+        * tao/Fixed_Size_Argument_T.inl:
+        * tao/FloatSeqC.h:
+        * tao/LocalObject.h:
+        * tao/LongDoubleSeqC.h:
+        * tao/LongLongSeqC.h:
+        * tao/LongSeqC.h:
+        * tao/ORB.h:
+        * tao/Object.h:
+        * tao/Object_Argument_T.h:
+        * tao/OctetSeqC.h:
+        * tao/PolicyC.h:
+        * tao/Policy_ForwardC.h:
+        * tao/Principal.h:
+        * tao/Pseudo_VarOut_T.h:
+        * tao/Pseudo_VarOut_T.inl:
+        * tao/Request_Dispatcher.h:
+        * tao/ShortSeqC.h:
+        * tao/StringSeqC.h:
+        * tao/String_Traits_Base_T.h:
+        * tao/TypeCodeFactory_Adapter.h:
+        * tao/UB_String_Argument_T.cpp:
+        * tao/UB_String_Argument_T.h:
+        * tao/UB_String_Argument_T.inl:
+        * tao/UB_String_Arguments.h:
+        * tao/ULongLongSeqC.h:
+        * tao/ULongSeqC.h:
+        * tao/UShortSeqC.h:
+        * tao/Unbounded_Array_Sequence_T.h:
+        * tao/Var_Array_Argument_T.cpp:
+        * tao/Var_Array_Argument_T.h:
+        * tao/Var_Array_Argument_T.inl:
+        * tao/Var_Size_Argument_T.cpp:
+        * tao/Var_Size_Argument_T.h:
+        * tao/Var_Size_Argument_T.inl:
+        * tao/WCharSeqC.h:
+        * tao/WStringSeqC.h:
+        * tao/AnyTypeCode/Any.h:
+        * tao/AnyTypeCode/AnySeqC.h:
+        * tao/AnyTypeCode/Any_Arg_Traits.h:
+        * tao/AnyTypeCode/NVList.h:
+        * tao/AnyTypeCode/TypeCode.h:
+        * tao/Domain/DomainS.cpp:
+        * tao/DynamicInterface/Context.h:
+        * tao/DynamicInterface/ExceptionList.h:
+        * tao/DynamicInterface/Request.h:
+        * tao/DynamicInterface/Server_Request.h:
+        * tao/IFR_Client/IFR_BaseC.cpp:
+        * tao/IFR_Client/IFR_BaseC.h:
+        * tao/IFR_Client/IFR_BaseC.inl:
+        * tao/IFR_Client/IFR_BasicC.cpp:
+        * tao/IFR_Client/IFR_BasicC.h:
+        * tao/IFR_Client/IFR_BasicC.inl:
+        * tao/IFR_Client/IFR_ComponentsC.cpp:
+        * tao/IFR_Client/IFR_ComponentsC.h:
+        * tao/IFR_Client/IFR_ComponentsC.inl:
+        * tao/IFR_Client/IFR_ExtendedC.cpp:
+        * tao/IFR_Client/IFR_ExtendedC.h:
+        * tao/IFR_Client/IFR_ExtendedC.inl:
+        * tao/ImR_Client/ImplRepoC.cpp:
+        * tao/ImR_Client/ImplRepoC.h:
+        * tao/ImR_Client/ImplRepoS.cpp:
+        * tao/ImR_Client/ServerObjectS.cpp:
+        * tao/Messaging/MessagingS.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
+        * tao/PortableServer/Any_SArg_Traits.h:
+        * tao/PortableServer/BD_String_SArgument_T.cpp:
+        * tao/PortableServer/BD_String_SArgument_T.h:
+        * tao/PortableServer/BD_String_SArgument_T.inl:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h:
+        * tao/PortableServer/Fixed_Array_SArgument_T.cpp:
+        * tao/PortableServer/Fixed_Array_SArgument_T.h:
+        * tao/PortableServer/Fixed_Array_SArgument_T.inl:
+        * tao/PortableServer/Fixed_Size_SArgument_T.h:
+        * tao/PortableServer/Object_SArg_Traits.h:
+        * tao/PortableServer/Object_SArgument_T.h:
+        * tao/PortableServer/PolicyS.cpp:
+        * tao/PortableServer/Servant_Upcall.h:
+        * tao/PortableServer/TypeCode_SArg_Traits.h:
+        * tao/PortableServer/Var_Array_SArgument_T.cpp:
+        * tao/PortableServer/Var_Array_SArgument_T.h:
+        * tao/PortableServer/Var_Array_SArgument_T.inl:
+        * tao/PortableServer/Var_Size_SArgument_T.cpp:
+        * tao/PortableServer/Var_Size_SArgument_T.h:
+        * tao/PortableServer/Var_Size_SArgument_T.inl:
+        * tao/PortableServer/get_arg.h:
+        * tao/RTScheduling/RTSchedulerC.cpp:
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/ValueBase.h:
+
+          Reduced the number of template parameters in _var,
+          _out, _forany and arg template classes.
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+
+          Changes to generated code corresponding with the
+          changes to middleware code described above.
+
+Mon Jun 19 12:11:09 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+          Fixed copy past error which resulted in a non working tao_idl
+          with BCB
+
+Sat Jun 17 20:47:09 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/tao_idl.cpp:
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          Changed the type of the DRV_arglist variable from char*[]
+          to const char*[], since Borland compilers are strict about
+          array types and won't implicitly qualify char*[] to be
+          passed as const char*[]. This change also required
+          casting away constness when the array elements are
+          deleted during cleanup. Thanks to Johnny Willemsen
+          <jwillemsen@rememdy.nl> for his expertise with Borland
+          compilers.
+
+Fri Jun 16 20:25:45 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp:
+
+          Added CORBA::string_dup() around the identifier string of
+          an argument, when it is inserted into the sequence of
+          parameter descriptions that is passed to the IFR to make
+          an entry for an operation or a factory. Since the
+          sequence in question manages its own memory, we were
+          getting double deletions of this identifier string before.
+          Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for
+          pointing out the Interface Repository tests failures
+          causes by this problem.
+
+Fri Jun 16 14:29:23 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_interface_header.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+
+          Removed unused variables and identifiers for unused args.
+
+Thu Jun 15 20:35:41 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+
+          Partially reverted this mornings fix. The
+          _tao_obv_static_repository_id function is not virtual and may
+          safely stay inlined.
+
+Thu Jun 15 15:05:43 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be_include/be_visitor_interface/remote_proxy_impl_cs.h:
+        * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp:
+
+                Removed these files from the repository, they are no
+                longer used.
+
+        * TAO_IDL/tao_idl.cpp:
+        * TAO_IDL/ast/ast_argument.cpp:
+        * TAO_IDL/ast/ast_array.cpp:
+        * TAO_IDL/ast/ast_attribute.cpp:
+        * TAO_IDL/ast/ast_check.cpp:
+        * TAO_IDL/ast/ast_concrete_type.cpp:
+        * TAO_IDL/ast/ast_constant.cpp:
+        * TAO_IDL/ast/ast_decl.cpp:
+        * TAO_IDL/ast/ast_enum.cpp:
+        * TAO_IDL/ast/ast_exception.cpp:
+        * TAO_IDL/ast/ast_expression.cpp:
+        * TAO_IDL/ast/ast_factory.cpp:
+        * TAO_IDL/ast/ast_field.cpp:
+        * TAO_IDL/ast/ast_generator.cpp:
+        * TAO_IDL/ast/ast_home.cpp:
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/ast/ast_interface_fwd.cpp:
+        * TAO_IDL/ast/ast_module.cpp:
+        * TAO_IDL/ast/ast_native.cpp:
+        * TAO_IDL/ast/ast_operation.cpp:
+        * TAO_IDL/ast/ast_predefined_type.cpp:
+        * TAO_IDL/ast/ast_root.cpp:
+        * TAO_IDL/ast/ast_sequence.cpp:
+        * TAO_IDL/ast/ast_string.cpp:
+        * TAO_IDL/ast/ast_structure.cpp:
+        * TAO_IDL/ast/ast_structure_fwd.cpp:
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/ast/ast_typedef.cpp:
+        * TAO_IDL/ast/ast_union_branch.cpp:
+        * TAO_IDL/ast/ast_union_label.cpp:
+        * TAO_IDL/ast/ast_valuebox.cpp:
+        * TAO_IDL/ast/ast_valuetype.cpp:
+        * TAO_IDL/be/be_argument.cpp:
+        * TAO_IDL/be/be_array.cpp:
+        * TAO_IDL/be/be_attribute.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_constant.cpp:
+        * TAO_IDL/be/be_decl.cpp:
+        * TAO_IDL/be/be_enum.cpp:
+        * TAO_IDL/be/be_exception.cpp:
+        * TAO_IDL/be/be_factory.cpp:
+        * TAO_IDL/be/be_field.cpp:
+        * TAO_IDL/be/be_generator.cpp:
         * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be/be_home.cpp:
+        * TAO_IDL/be/be_init.cpp:
         * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_interface_fwd.cpp:
+        * TAO_IDL/be/be_interface_strategy.cpp:
+        * TAO_IDL/be/be_module.cpp:
+        * TAO_IDL/be/be_native.cpp:
+        * TAO_IDL/be/be_operation.cpp:
+        * TAO_IDL/be/be_operation_strategy.cpp:
+        * TAO_IDL/be/be_predefined_type.cpp:
+        * TAO_IDL/be/be_produce.cpp:
+        * TAO_IDL/be/be_root.cpp:
+        * TAO_IDL/be/be_scope.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_string.cpp:
+        * TAO_IDL/be/be_structure.cpp:
+        * TAO_IDL/be/be_structure_fwd.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_union.cpp:
+        * TAO_IDL/be/be_union_branch.cpp:
+        * TAO_IDL/be/be_union_fwd.cpp:
+        * TAO_IDL/be/be_union_label.cpp:
         * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
-        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp:
+        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_attribute.cpp:
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_context.cpp:
+        * TAO_IDL/be/be_visitor_decl.cpp:
+        * TAO_IDL/be/be_visitor_interface.cpp:
+        * TAO_IDL/be/be_visitor_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_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_si.cpp:
         * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp:
         * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
         * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
         * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/argument.cpp:
-        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
-        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/arglist.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_ch.cpp:
+        * TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+        * TAO_IDL/be_include/be_argument.h:
+        * TAO_IDL/be_include/be_array.h:
+        * TAO_IDL/be_include/be_attribute.h:
+        * TAO_IDL/be_include/be_codegen.h:
+        * TAO_IDL/be_include/be_extern.h:
+        * TAO_IDL/be_include/be_field.h:
+        * TAO_IDL/be_include/be_generator.h:
         * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_helper.h:
-        * TAO_IDL/be_include/be_visitor_operation/operation.h:
-          Removed environment macro support
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_interface_strategy.h:
+        * TAO_IDL/be_include/be_native.h:
+        * TAO_IDL/be_include/be_operation_strategy.h:
+        * TAO_IDL/be_include/be_root.h:
+        * TAO_IDL/be_include/be_union_branch.h:
+        * TAO_IDL/be_include/be_union_label.h:
+        * TAO_IDL/be_include/be_valuebox.h:
+        * TAO_IDL/be_include/be_visitor.h:
+        * TAO_IDL/be_include/be_visitor_ami_pre_proc.h:
+        * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h:
+        * TAO_IDL/be_include/be_visitor_decl.h:
+        * TAO_IDL/driver/drv_args.cpp:
+        * TAO_IDL/driver/drv_preproc.cpp:
+        * TAO_IDL/fe/fe_declarator.cpp:
+        * TAO_IDL/fe/fe_extern.cpp:
+        * TAO_IDL/fe/fe_init.cpp:
+        * TAO_IDL/fe/fe_interface_header.cpp:
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/y.tab.cpp:.diff:
+        * TAO_IDL/fe/y.tab.h:
+        * TAO_IDL/include/ast_argument.h:
+        * TAO_IDL/include/ast_array.h:
+        * TAO_IDL/include/ast_attribute.h:
+        * TAO_IDL/include/ast_concrete_type.h:
+        * TAO_IDL/include/ast_decl.h:
+        * TAO_IDL/include/ast_exception.h:
+        * TAO_IDL/include/ast_expression.h:
+        * TAO_IDL/include/ast_field.h:
+        * TAO_IDL/include/ast_generator.h:
+        * TAO_IDL/include/ast_interface.h:
+        * TAO_IDL/include/ast_interface_fwd.h:
+        * TAO_IDL/include/ast_native.h:
+        * TAO_IDL/include/ast_sequence.h:
+        * TAO_IDL/include/ast_structure.h:
+        * TAO_IDL/include/ast_structure_fwd.h:
+        * TAO_IDL/include/ast_typedef.h:
+        * TAO_IDL/include/ast_union_branch.h:
+        * TAO_IDL/include/ast_union_label.h:
+        * TAO_IDL/include/ast_valuebox.h:
+        * TAO_IDL/include/drv_extern.h:
+        * TAO_IDL/include/fe_extern.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/include/utl_exceptlist.h:
+        * TAO_IDL/include/utl_exprlist.h:
+        * TAO_IDL/include/utl_labellist.h:
+        * TAO_IDL/include/utl_list.h:
+        * TAO_IDL/include/utl_namelist.h:
+        * TAO_IDL/include/utl_scope.h:
+        * TAO_IDL/util/utl_exceptlist.cpp:
+        * TAO_IDL/util/utl_exprlist.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/util/utl_idlist.cpp:
+        * TAO_IDL/util/utl_labellist.cpp:
+        * TAO_IDL/util/utl_list.cpp:
+        * TAO_IDL/util/utl_namelist.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+        * TAO_IDL/util/utl_string.cpp:
+
+                - Plugged all memory leaks occuring during successful
+                  execution, and most of the leaks occuring when there
+                  is some kind of error. For some syntax errors
+                  reported by the parser, it's not known how far
+                  the parser has looked ahead (and thus what memory
+                  it may have already allocated) when the error
+                  is detected. Creating the AST out of types that
+            manage their own memory, or creating the AST on
+                  the stack, would solve all memory leak problems,
+                  but would require substantial redesign of the IDL
+                  compiler front end.
+
+                - Added generation of sendc_* operations inherited
+                  by local interfaces, if AMI code is being generated.
+
+                - Fixed required check for parallel inheritance of
+                  valuetypes and their corresponding supported
+                  interfaces, if any.
+
+                - Added workarounds to skip problem code generation
+                  when IDL3 constructs and AMI code generation
+                  occur together. Integration of AMI with components
+                  is a future development item.
+
+                - Fixed the logic of the decision whether or not to
+                  generate inheritance of a reference counting
+                  parent class for valuetype OBV_* classes.
+
+                - Added default generation of Any insertion/extraction
+                  operators for local interfaces, and a command line
+                  option  - '-Sal' -  to suppress it.
+
+        * orbsvcs/IFR_Service/be_extern.h:
+        * orbsvcs/IFR_Service/be_init.cpp:
+        * orbsvcs/IFR_Service/be_produce.cpp:
+
+                Changes to the IFR loader backend corresponding to the
+                memory leak fixes above.
+
+        * docs/compiler.html:
+        * docs/releasenotes/index.html:
+
+          Documented new IDL compiler command line option
+                described above.
+
+Thu Jun 15 12:32:58 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+
+          Moved virtual methods from inline to out-of-line.
+
+Wed Jun 14 14:48:07 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * tests/ORB_Local_Config/ORB_Local_Config.mwc:
+
+          Removed the nonexistent Limits directory from
+          the workspace. This should correct the setup
+          error shown on Win2003_VC71_Debug hosted by OCI.
+
+Tue Jun 13 15:24:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
+
+          Removed orb, added LogMgr argument to constructor.
+
+          Changed constructor to create a new log-channel specific poa
+          for iterators.  Activate iterators in the new poa.
+
+          Changed destructor to destroy the new poa, which ensures any
+          interators that may exist will be destroyed at the same time
+          as the log channel.  This fixes bugzilla bug #2551.
+
+        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+        * orbsvcs/orbsvcs/Log/Hash_LogStore.h
+
+          Removed orb argument from constructor.
+          Changed to pass LogMgr to Hash_LogRecordStore constructor.
+
+        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp:
+
+          Changed to pass only LogMgr to Hash_LogStore constructor.
+
+        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h:
+        * orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h:
+
+          Removed orb argument from create_log_store().
+
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+        * orbsvcs/orbsvcs/Log/LogMgr_i.h
+
+          Added orb(), factory_poa(), and log_poa() methods.  We're
+          changing most objects to have a reference to the LogMgr, so we
+          don't have pass orbs and poas around, especially for the cases
+          where we're already passing the LogMgr.
+
+          Changed to pass only "this" to strategy's create_log_store()
+          method.
+
+Tue Jun 13 14:56:01 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+
+          Don't close the LogRecordStore in the TAO_Log_i destructor, if
+          the log channel was destroyed, it will be a dangling reference.
+          The LogStore should be responsible for opening and closing its
+          LogRecordStores.
+
+        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp (remove):
+
+          Obtain and delete LogRecordStore when unbinding from map.
+          Avoids leak.
+
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp (query_i):
+
+          Re-indent to match coding conventions.
+
+Tue Jun 13 13:51:11 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * tests/Bug_2494_Regression/client.cpp:
+
+          The scoreboard was marking this test as "failed" because it printed
+          "EXCEPTION" (from the client process).  This isn't a failure as long
+          as the server process still exits cleanly.  The test is now modified
+          so that it doesn't print "EXCEPTION".
+
+Sun Jun 11 16:46:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/EventLog_i.cpp:
+        * orbsvcs/orbsvcs/NotifyLog_i.cpp:
+        * orbsvcs/orbsvcs/RTEventLog_i.cpp:
+
+          Changed destructor to invoke destroy() on the event channel.
+          This notifies suppliers and consumers, and avoids a resource
+          leak.  Fixes bugzilla bug #2559.
+
+Sun Jun 11 00:54:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/BasicLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/BasicLog_i.h:
+        * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/EventLog_i.h:
+        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
+        * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
+
+          Remove member variable logmgr_i_, as it's also a protected
+          member in the base class.
+
+Sat Jun 10 21:54:00 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * NEWS:
+
+          Mention that NT_Naming_Service and NT_Notify_Service must
+          be enabled by new MPC feature variable "winnt".
+
+Sat Jun 10 18:30:42 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * performance-tests/Makefile.am:
+
+          Disable building CSD_Strategy tests.
+
+Sat Jun 10 10:40:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * examples/RTScheduling/Job_i.h:
+        * examples/RTScheduling/POA_Holder.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier.h:
+
+          More files where ace/Arg_Shifter.h needed to be directly
+          included.
+
+Sat Jun 10 05:03:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Add AM_CONDITIONAL for BUILD_WINNT and BUILD_WXWINDOWS.
+
+Sat Jun 10 04:34:32 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * docs/compiler.h:tml
         * docs/tutorials/Quoter/AMI/Makefile.am:
         * docs/tutorials/Quoter/Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/idl/Makefile.am:
         * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
         * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/RTCORBA/Makefile.am:
-        * examples/Advanced/ch_3/Makefile.am:
+        * docs/tutorials/Quoter/idl/Makefile.am:
         * examples/AMH/Sink_Server/Makefile.am:
         * examples/AMI/FL_Callback/Makefile.am:
+        * examples/Advanced/ch_3/Makefile.am:
         * examples/Buffered_AMI/Makefile.am:
         * examples/Buffered_Oneways/Makefile.am:
-        * examples/Callback_Quoter/Makefile.am:
-        * examples/Content_Server/AMI_Iterator/Makefile.am:
-        * examples/Content_Server/AMI_Observer/Makefile.am:
-        * examples/Content_Server/SMI_Iterator/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool/Makefile.am:
         * examples/CSD_Strategy/ThreadPool2/Makefile.am:
         * examples/CSD_Strategy/ThreadPool3/Makefile.am:
         * examples/CSD_Strategy/ThreadPool4/Makefile.am:
         * examples/CSD_Strategy/ThreadPool5/Makefile.am:
         * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool/Makefile.am:
+        * examples/Callback_Quoter/Makefile.am:
+        * examples/Content_Server/AMI_Iterator/Makefile.am:
+        * examples/Content_Server/AMI_Observer/Makefile.am:
+        * examples/Content_Server/SMI_Iterator/Makefile.am:
         * examples/Event_Comm/Makefile.am:
-        * examples/ior_corbaloc/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
         * examples/Kokyu_dsrt_schedulers/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
         * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
         * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
         * examples/Load_Balancing/Makefile.am:
         * examples/Load_Balancing_persistent/Makefile.am:
         * examples/Logging/Makefile.am:
-        * examples/mfc/Makefile.am:
         * examples/OBV/Typed_Events/Makefile.am:
-        * examples/Persistent_Grid/Makefile.am:
-        * examples/PluggableUDP/tests/Basic/Makefile.am:
-        * examples/PluggableUDP/tests/Performance/Makefile.am:
-        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
-        * examples/POA/Default_Servant/Makefile.am:
         * examples/POA/DSI/Makefile.am:
+        * examples/POA/Default_Servant/Makefile.am:
         * examples/POA/Forwarding/Makefile.am:
         * examples/POA/Generic_Servant/Makefile.am:
         * examples/POA/TIE/Makefile.am:
+        * examples/Persistent_Grid/Makefile.am:
+        * examples/PluggableUDP/tests/Basic/Makefile.am:
+        * examples/PluggableUDP/tests/Performance/Makefile.am:
+        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
         * examples/Quoter/Makefile.am:
         * examples/RTCORBA/Activity/Makefile.am:
         * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-        * examples/RTScheduling/Makefile.am:
         * examples/RTScheduling/MIF_Scheduler/Makefile.am:
         * examples/Simple/bank/Makefile.am:
         * examples/Simple/chat/Makefile.am:
         * examples/Simple/echo/Makefile.am:
         * examples/Simple/grid/Makefile.am:
-        * examples/Simple/time-date/Makefile.am:
         * examples/Simple/time/Makefile.am:
+        * examples/Simple/time-date/Makefile.am:
         * examples/Simulator/Event_Supplier/Makefile.am:
         * examples/TypeCode_Creation/Makefile.am:
+        * examples/ior_corbaloc/Makefile.am:
+        * examples/mfc/Makefile.am:
         * interop-tests/wchar/Makefile.am:
-        * MPC/config/taoidldefaults.mpb:
+        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/Naming_Service/Makefile.am:
+        * orbsvcs/Notify_Service/Makefile.am:
         * orbsvcs/examples/CosEC/Factory/Makefile.am:
         * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
         * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
@@ -1501,54 +6393,45 @@ Tue Jan  2 09:13:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
         * orbsvcs/examples/LoadBalancing/Makefile.am:
         * orbsvcs/examples/ORT/Makefile.am:
         * orbsvcs/examples/Security/Send_File/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * orbsvcs/orbsvcs/HTIOP.mpc:
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pid:
         * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
         * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
         * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
         * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
         * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
         * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
         * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
         * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
         * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
         * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
         * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2615_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2709_Regression/Makefile.am:
         * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/Event/UDP/Makefile.am:
+        * orbsvcs/tests/FT_App/Makefile.am:
         * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
         * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
-        * orbsvcs/tests/FT_App/Makefile.am:
+        * orbsvcs/tests/FtRtEvent/Makefile.am:
         * orbsvcs/tests/HTIOP/AMI/Makefile.am:
         * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
         * orbsvcs/tests/HTIOP/Hello/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am:
+        * orbsvcs/tests/IOR_MCast/Makefile.am:
         * orbsvcs/tests/ImplRepo/Makefile.am:
         * orbsvcs/tests/ImplRepo/scale/Makefile.am:
         * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
         * orbsvcs/tests/Interoperable_Naming/Makefile.am:
-        * orbsvcs/tests/ior_corbaname/Makefile.am:
-        * orbsvcs/tests/IOR_MCast/Makefile.am:
         * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
         * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
         * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
         * orbsvcs/tests/Miop/McastHello/Makefile.am:
         * orbsvcs/tests/Notify/Blocking/Makefile.am:
         * orbsvcs/tests/Notify/Discarding/Makefile.am:
-        * orbsvcs/tests/Notify/lib/Makefile.am:
         * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
         * orbsvcs/tests/Notify/Ordering/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
         * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
         * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
         * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
         * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/lib/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
         * orbsvcs/tests/Redundant_Naming/Makefile.am:
         * orbsvcs/tests/Security/BiDirectional/Makefile.am:
         * orbsvcs/tests/Security/Big_Request/Makefile.am:
@@ -1560,4416 +6443,4973 @@ Tue Jan  2 09:13:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
         * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
         * orbsvcs/tests/Simple_Naming/Makefile.am:
         * orbsvcs/tests/Trading/Makefile.am:
+        * orbsvcs/tests/ior_corbaname/Makefile.am:
+        * performance-tests/Makefile.am:
         * performance-tests/Anyop/Makefile.am:
-        * performance-tests/Callback/Makefile.am:
         * performance-tests/CSD_Strategy/TestInf/Makefile.am:
         * performance-tests/CSD_Strategy/TestServant/Makefile.am:
+        * performance-tests/Callback/Makefile.am:
         * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
         * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
         * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
         * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
         * performance-tests/Latency/AMI/Makefile.am:
         * performance-tests/Latency/Collocation/Makefile.am:
-        * performance-tests/Latency/Deferred/Makefile.am:
         * performance-tests/Latency/DII/Makefile.am:
         * performance-tests/Latency/DSI/Makefile.am:
+        * performance-tests/Latency/Deferred/Makefile.am:
         * performance-tests/Latency/Single_Threaded/Makefile.am:
         * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
         * performance-tests/Latency/Thread_Pool/Makefile.am:
         * performance-tests/Memory/IORsize/Makefile.am:
         * performance-tests/Memory/Single_Threaded/Makefile.am:
-        * performance-tests/Pluggable/Makefile.am:
         * performance-tests/POA/Demux/Makefile.am:
         * performance-tests/POA/Implicit_Activation/Makefile.am:
         * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
+        * performance-tests/Pluggable/Makefile.am:
         * performance-tests/Protocols/Makefile.am:
         * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
         * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
         * performance-tests/RTCorba/Thread_Pool/Makefile.am:
         * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
         * performance-tests/Sequence_Latency/AMI/Makefile.am:
-        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
         * performance-tests/Sequence_Latency/DII/Makefile.am:
         * performance-tests/Sequence_Latency/DSI/Makefile.am:
+        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
         * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
         * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
         * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
         * performance-tests/Throughput/Makefile.am:
-        * tao/AnyTypeCode.mpc:
-        * tao/AnyTypeCode/AnySeq.pid:
-        * tao/AnyTypeCode/Bounds.pid:
-        * tao/AnyTypeCode/Dynamic.pid:
-        * tao/AnyTypeCode/Dynamic_Parameter.pid:
-        * tao/AnyTypeCode/ValueModifier.pid:
-        * tao/AnyTypeCode/Visibility.pid:
-        * tao/BiDir_GIOP.mpc:
-        * tao/BiDir_GIOP/BiDirPolicy.pid:
-        * tao/BooleanSeq.pid:
-        * tao/CharSeq.pid:
-        * tao/CodecFactory.mpc:
-        * tao/CodecFactory/IOP_Codec.pid:
-        * tao/Compression.mpc:
-        * tao/Compression/TAO_Compression.pc.in
-        * tao/CONV_FRAME.pid:
-        * tao/CSD_Framework.mpc:
-        * tao/CSD_Framework/CSD_Framework.pid:
-        * tao/Current.pid:
-        * tao/Domain.pid:
-        * tao/DoubleSeq.pid:
-        * tao/DynamicAny.mpc:
-        * tao/EndpointPolicy.mpc:
-        * tao/EndpointPolicy/EndpointPolicyType.pid:
-        * tao/FloatSeq.pid:
-        * tao/GIOP.pid:
-        * tao/IFR_Client.mpc:
-        * tao/IFR_Client/IFR_Base.pid:
-        * tao/IFR_Client/IFR_Basic.pid:
-        * tao/IFR_Client/IFR_Components.pid:
-        * tao/IFR_Client/IFR_Extended.pid:
-        * tao/IIOP.pid:
-        * tao/IIOP_Endpoints.pid:
-        * tao/ImR_Client.mpc:
-        * tao/ImR_Client/ImplRepo.pid:
-        * tao/ImR_Client/ServerObject.pid:
-        * tao/InvalidName.pid:
-        * tao/IOP.pid:
-        * tao/IOP_IOR.pid:
-        * tao/IORInterceptor.mpc:
-        * tao/IORInterceptor/IORInfo.pid:
-        * tao/IORInterceptor/IORInterceptor.pid:
-        * tao/IORManipulation.mpc:
-        * tao/IORManipulation/IOR.pid:
-        * tao/IORTable.mpc:
-        * tao/IORTable/IORTable.pid:
-        * tao/LongDoubleSeq.pid:
-        * tao/LongLongSeq.pid:
-        * tao/LongSeq.pid:
         * tao/Makefile.am:
-        * tao/Messaging.mpc:
-        * tao/Messaging/ExceptionHolder.pid:
-        * tao/Messaging/Messaging.pid:
-        * tao/Messaging/Messaging_No_Impl.pid:
-        * tao/Messaging/Messaging_RT_Policy.pid:
-        * tao/Messaging/Messaging_SyncScope_Policy.pid:
-        * tao/Messaging/Messaging_Types.pid:
-        * tao/Messaging/Pollable.pid:
-        * tao/Messaging/TAO_Ext.pid:
-        * tao/Messaging_PolicyValue.pid:
-        * tao/Object_Key.pid:
-        * tao/ObjectIdList.pid:
-        * tao/ObjRefTemplate.mpc:
-        * tao/ObjRefTemplate/Default_ORT.pid:
-        * tao/OctetSeq.pid:
-        * tao/orb_types.pid:
-        * tao/ParameterMode.pid:
-        * tao/PI.mpc:
-        * tao/PI/ClientRequestInfo.pid:
-        * tao/PI/ClientRequestInterceptor.pid:
-        * tao/PI/Interceptor.pid:
-        * tao/PI/InvalidSlot.pid:
-        * tao/PI/ORBInitializer.pid:
-        * tao/PI/ORBInitInfo.pid:
-        * tao/PI/PICurrent.pid:
-        * tao/PI/PIForwardRequest.pid:
-        * tao/PI/PolicyFactory.pid:
-        * tao/PI/ProcessingModePolicy.pid:
-        * tao/PI/RequestInfo.pid:
-        * tao/PI_Forward.pid:
-        * tao/PI_Server.mpc:
-        * tao/PI_Server/ServerRequestInfo.pid:
-        * tao/PI_Server/ServerRequestInterceptor.pid:
-        * tao/Policy.pid:
-        * tao/Policy_Forward.pid:
-        * tao/PortableInterceptor.pid:
-        * tao/PortableServer.mpc:
-        * tao/PortableServer/POA.pid:
-        * tao/PortableServer/POAManagerFactory.pid:
-        * tao/PortableServer/PortableServer.pid:
-        * tao/PortableServer/PS_Forward.pid:
-        * tao/PortableServer/RequestProcessingPolicy.pid:
-        * tao/PortableServer/ServantActivator.pid:
-        * tao/PortableServer/ServantLocator.pid:
-        * tao/PortableServer/ServantManager.pid:
-        * tao/PortableServer/ServantRetentionPolicy.pid:
-        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
-        * tao/PortableServer/ThreadPolicy.pid:
-        * tao/RTCORBA.mpc:
-        * tao/RTCORBA/diffs/RTCORBA.diff
-        * tao/RTCORBA/RTCORBA.pid:
-        * tao/RTCORBA/RTCORBAC.cpp:
-        * tao/RTPortableServer.mpc:
-        * tao/RTPortableServer/RTPortableServer.pid:
-        * tao/RTScheduler.mpc:
-        * tao/RTScheduling/RTScheduler.pid:
-        * tao/Services.pid:
-        * tao/ShortSeq.pid:
-        * tao/Strategies.mpc:
-        * tao/Strategies/COIOP_Endpoints.pid:
-        * tao/Strategies/sciop_endpoints.pid:
-        * tao/Strategies/uiop_endpoints.pid:
-        * tao/StringSeq.pid:
-        * tao/tao.mpc:
-        * tao/TAO.pid:
-        * tao/TimeBase.pid:
-        * tao/TypeCodeFactory.mpc:
-        * tao/TypeCodeFactory_Adapter.cpp:
-        * tao/TypeCodeFactory_Adapter.h:
-        * tao/ULongLongSeq.pid:
-        * tao/ULongSeq.pid:
-        * tao/UShortSeq.pid:
-        * tao/Valuetype.mpc:
-        * tao/Wait_Strategy.cpp:
-        * tao/WCharSeq.pid:
-        * tao/WrongTransaction.pid:
-        * tao/WStringSeq.pid:
-        * tests/Abstract_Interface/Makefile.am:
-        * tests/AMH_Exceptions/Makefile.am:
-        * tests/AMH_Oneway/Makefile.am:
-        * tests/AMI/Makefile.am:
-        * tests/AMI_Buffering/Makefile.am:
-        * tests/AMI_Timeouts/Makefile.am:
-        * tests/Any/Recursive/Makefile.am:
-        * tests/BiDirectional/Makefile.am:
-        * tests/BiDirectional_DelayedUpcall/Makefile.am:
-        * tests/BiDirectional_NestedUpcall/Makefile.am:
-        * tests/Big_AMI/Makefile.am:
-        * tests/Big_Oneways/Makefile.am:
-        * tests/Big_Reply/Makefile.am:
-        * tests/Big_Request_Muxing/Makefile.am:
-        * tests/Big_Twoways/Makefile.am:
-        * tests/Blocking_Sync_None/Makefile.am:
-        * tests/Bug_1020_Basic_Regression/Makefile.am:
-        * tests/Bug_1020_Regression/Makefile.am:
-        * tests/Bug_1254_Regression/Makefile.am:
-        * tests/Bug_1269_Regression/Makefile.am:
-        * tests/Bug_1270_Regression/Makefile.am:
-        * tests/Bug_1330_Regression/Makefile.am:
-        * tests/Bug_1361_Regression/Makefile.am:
-        * tests/Bug_1476_Regression/Makefile.am:
-        * tests/Bug_1476_Test/Makefile.am:
-        * tests/Bug_1482_Regression/Makefile.am:
-        * tests/Bug_1495_Regression/Makefile.am:
-        * tests/Bug_1535_Regression/bug_1535_regression.cpp:
-        * tests/Bug_1535_Regression/Bug_1535_Regression.mpc:
-        * tests/Bug_1535_Regression/Makefile.am:
-        * tests/Bug_1535_Regression/Test.cpp:
-        * tests/Bug_1535_Regression/Test.h:
-        * tests/Bug_1551_Regression/Makefile.am:
-        * tests/Bug_1568_Regression/Makefile.am:
-        * tests/Bug_1627_Regression/Makefile.am:
-        * tests/Bug_1636_Regression/Makefile.am:
-        * tests/Bug_1639_Regression/Makefile.am:
-        * tests/Bug_1670_Regression/Makefile.am:
-        * tests/Bug_1676_Regression/Makefile.am:
-        * tests/Bug_1693_Test/Makefile.am:
-        * tests/Bug_1812_Regression/Makefile.am:
-        * tests/Bug_1813_Regression/Makefile.am:
-        * tests/Bug_1869_Regression/Makefile.am:
-        * tests/Bug_1904_Regression/Makefile.am:
-        * tests/Bug_2084_Regression/Makefile.am:
-        * tests/Bug_2119_Regression/Makefile.am:
-        * tests/Bug_2122_Regression/Makefile.am:
-        * tests/Bug_2124_Regression/Makefile.am:
-        * tests/Bug_2126_Regression/Makefile.am:
-        * tests/Bug_2134_Regression/Makefile.am:
-        * tests/Bug_2144_Regression/Makefile.am:
-        * tests/Bug_2174_Regression/Makefile.am:
-        * tests/Bug_2183_Regression/Makefile.am:
-        * tests/Bug_2186_Regression/Makefile.am:
-        * tests/Bug_2188_Regression/Makefile.am:
-        * tests/Bug_2201_Regression/Makefile.am:
-        * tests/Bug_2222_Regression/Makefile.am:
-        * tests/Bug_2234_Regression/Makefile.am:
-        * tests/Bug_2289_Regression/Makefile.am:
-        * tests/Bug_2319_Regression/Makefile.am:
-        * tests/Bug_2328_Regression/Makefile.am:
-        * tests/Bug_2349_Regression/Makefile.am:
-        * tests/Bug_2375_Regression/Makefile.am:
-        * tests/Bug_2399_Regression/Makefile.am:
-        * tests/Bug_2417_Regression/Makefile.am:
-        * tests/Bug_2419_Regression/Makefile.am:
-        * tests/Bug_2424_Regression/Makefile.am:
-        * tests/Bug_2429_Regression/Bug_2429_Regression.mpc:
-        * tests/Bug_2429_Regression/Makefile.am:
-        * tests/Bug_2494_Regression/Makefile.am:
-        * tests/Bug_2503_Regression/Makefile.am:
-        * tests/Bug_2542_Regression/Makefile.am:
-        * tests/Bug_2543_Regression/bug_2543_regression.cpp:
-        * tests/Bug_2543_Regression/Makefile.am:
-        * tests/Bug_2549_Regression/Makefile.am:
-        * tests/Bug_2560_Regression/Makefile.am:
-        * tests/Bug_2593_Regression/Makefile.am:
-        * tests/Bug_2595_Regression/Makefile.am:
-        * tests/Bug_2654_Regression/Makefile.am:
-        * tests/Bug_2669_Regression/Makefile.am:
-        * tests/Bug_2683_Regression/Makefile.am:
-        * tests/Cache_Growth_Test/Makefile.am:
-        * tests/CallbackTest/Makefile.am:
-        * tests/Client_Leaks/Makefile.am:
-        * tests/Codec/Makefile.am:
-        * tests/CodeSets/simple/Makefile.am:
-        * tests/COIOP/Makefile.am:
-        * tests/Collocation/Makefile.am:
-        * tests/Collocation_Exception_Test/Makefile.am:
-        * tests/Collocation_Oneway_tests/Makefile.am:
-        * tests/Collocation_Opportunities/Makefile.am:
-        * tests/Collocation_tests/Makefile.am:
-        * tests/CollocationLockup/Makefile.am:
-        * tests/Connect_Strategy_Test/Makefile.am:
-        * tests/Connection_Failure/Makefile.am:
-        * tests/Connection_Purging/Makefile.am:
-        * tests/Connection_Timeout/Makefile.am:
-        * tests/Crash_On_Write/Makefile.am:
-        * tests/Crashed_Callback/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Common/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Foo_A/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Foo_B/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Foo_C/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Test_Dynamic/Makefile.am:
-        * tests/DII_Collocation_tests/oneway/Makefile.am:
-        * tests/DII_Collocation_tests/twoway/Makefile.am:
-        * tests/DLL_ORB/Makefile.am:
-        * tests/DSI_Gateway/Makefile.am:
-        * tests/DynAny_Test/Makefile.am:
-        * tests/Explicit_Event_Loop/Makefile.am:
-        * tests/Exposed_Policies/Makefile.am:
-        * tests/Faults/Makefile.am:
-        * tests/File_IO/Makefile.am:
-        * tests/FL_Cube/Makefile.am:
-        * tests/Forwarding/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Request/Makefile.am:
-        * tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am:
-        * tests/Hang_Shutdown/Makefile.am:
-        * tests/Hello/Makefile.am:
-        * tests/ICMG_Any_Bug/Makefile.am:
-        * tests/IDL_Test/Makefile.am:
-        * tests/InterOp-Naming/Makefile.am:
-        * tests/IOR_Endpoint_Hostnames/Makefile.am:
-        * tests/IPV6/Makefile.am:
-        * tests/Leader_Followers/Makefile.am:
-        * tests/LongUpcalls/Makefile.am:
-        * tests/MProfile/Makefile.am:
-        * tests/MProfile_Connection_Timeout/Makefile.am:
-        * tests/MProfile_Forwarding/Makefile.am:
-        * tests/MT_BiDir/Makefile.am:
-        * tests/MT_Client/Makefile.am:
-        * tests/MT_Server/Makefile.am:
-        * tests/MT_Timeout/Makefile.am:
-        * tests/Multiple/Makefile.am:
-        * tests/Multiple_Inheritance/Makefile.am:
-        * tests/Muxed_GIOP_Versions/Makefile.am:
-        * tests/Muxing/Makefile.am:
-        * tests/Native_Exceptions/Makefile.am:
-        * tests/Nested_Event_Loop/Makefile.am:
-        * tests/Nested_Upcall_Crash/Makefile.am:
-        * tests/NestedUpcall/MT_Client_Test/Makefile.am:
-        * tests/NestedUpcall/Simple/Makefile.am:
-        * tests/NestedUpcall/Triangle_Test/Makefile.am:
-        * tests/No_Server_MT_Connect_Test/Makefile.am:
-        * tests/Object_Loader/Makefile.am:
-        * tests/Objref_Sequence_Test/Makefile.am:
-        * tests/OBV/Any/Makefile.am:
-        * tests/OBV/Collocated/Forward/Makefile.am:
-        * tests/OBV/Factory/Makefile.am:
-        * tests/OBV/Forward/Makefile.am:
-        * tests/OBV/Simple/Makefile.am:
-        * tests/OBV/TC_Alignment/Makefile.am:
-        * tests/OBV/Truncatable/Makefile.am:
-        * tests/OBV/ValueBox/Makefile.am:
-        * tests/OctetSeq/Makefile.am:
-        * tests/Ondemand_Write/Makefile.am:
-        * tests/Oneway_Buffering/Makefile.am:
-        * tests/Oneway_Timeouts/Makefile.am:
-        * tests/Oneways_Invoking_Twoways/Makefile.am:
-        * tests/Optimized_Connection/Makefile.am:
-        * tests/ORB_init/Portspan/Makefile.am:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am:
-        * tests/ORB_shutdown/Makefile.am:
-        * tests/ORT/Makefile.am:
-        * tests/Parallel_Connect_Strategy/Makefile.am:
-        * tests/Param_Test/Makefile.am:
-        * tests/POA/Bug_2511_Regression/Makefile.am:
-        * tests/POA/Deactivate_Object/Makefile.am:
-        * tests/POA/Default_Servant/Makefile.am:
-        * tests/POA/EndpointPolicy/Makefile.am:
-        * tests/POA/Etherealization/Makefile.am:
-        * tests/POA/Excessive_Object_Deactivations/Makefile.am:
-        * tests/POA/Identity/Makefile.am:
-        * tests/POA/MT_Servant_Locator/Makefile.am:
-        * tests/POA/Nested_Non_Servant_Upcalls/Makefile.am:
-        * tests/POA/Non_Servant_Upcalls/Makefile.am:
-        * tests/POA/Object_Reactivation/Makefile.am:
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/POA/POA_Destruction/Makefile.am:
-        * tests/POA/Reference_Counting/Makefile.am:
-        * tests/POA/Single_Threaded_POA/Makefile.am:
-        * tests/POA/wait_for_completion/Makefile.am:
-        * tests/Policies/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlot/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlotExt/Makefile.am:
-        * tests/Portable_Interceptors/AMI/Makefile.am:
-        * tests/Portable_Interceptors/Benchmark/Makefile.am:
-        * tests/Portable_Interceptors/Bug_1559/Makefile.am:
-        * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am:
-        * tests/Portable_Interceptors/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/ForwardRequest/Makefile.am:
-        * tests/Portable_Interceptors/IORInterceptor/Makefile.am:
-        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
-        * tests/Portable_Interceptors/PICurrent/Makefile.am:
-        * tests/Portable_Interceptors/PolicyFactory/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
-        * tests/Portable_Interceptors/Register_Initial_References/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
-        * tests/QtTests/Makefile.am:
-        * tests/Reliable_Oneways/Makefile.am:
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am:
-        * tests/RTCORBA/Banded_Connections/Makefile.am:
-        * tests/RTCORBA/Client_Propagated/Makefile.am:
-        * tests/RTCORBA/Client_Protocol/Makefile.am:
-        * tests/RTCORBA/Collocation/Makefile.am:
-        * tests/RTCORBA/Diffserv/Makefile.am:
-        * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am:
-        * tests/RTCORBA/Explicit_Binding/Makefile.am:
-        * tests/RTCORBA/Linear_Priority/Makefile.am:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am:
-        * tests/RTCORBA/Persistent_IOR/Makefile.am:
-        * tests/RTCORBA/Policy_Combinations/Makefile.am:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am:
-        * tests/RTCORBA/Private_Connection/Makefile.am:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am:
-        * tests/RTCORBA/Server_Declared/Makefile.am:
-        * tests/RTCORBA/Server_Protocol/Makefile.am:
-        * tests/RTCORBA/Thread_Pool/Makefile.am:
-        * tests/RTScheduling/Scheduling_Interceptor/Makefile.am:
-        * tests/RTScheduling/VoidData/Makefile.am:
-        * tests/Servant_To_Reference_Test/Makefile.am:
-        * tests/Server_Connection_Purging/Makefile.am:
-        * tests/Server_Leaks/Makefile.am:
-        * tests/Server_Port_Zero/Makefile.am:
-        * tests/Single_Read/Makefile.am:
-        * tests/Smart_Proxies/Benchmark/Makefile.am:
-        * tests/Smart_Proxies/Collocation/Makefile.am:
-        * tests/Smart_Proxies/dtor/Makefile.am:
-        * tests/Smart_Proxies/Makefile.am:
-        * tests/Smart_Proxies/On_Demand/Makefile.am:
-        * tests/Smart_Proxies/Policy/Makefile.am:
-        * tests/Stack_Recursion/Makefile.am:
-        * tests/Strategies/Makefile.am:
-        * tests/Timed_Buffered_Oneways/Makefile.am:
-        * tests/Timeout/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am:
-        * tests/TransportCurrent/IIOP/Makefile.am:
-        * tests/Two_Objects/Makefile.am:
-        * tests/Typedef_String_Array/Makefile.am:
-        * tests/UNKNOWN_Exception/Makefile.am:
-        * tests/Xt_Stopwatch/Makefile.am:
-          Removed any occurence of -Ge 1
-
-Sun Dec 31 23:12:36 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-
-          It seems BUILD_ZZIP depends on BUILD_ZLIB, so add BUILD_ZLIB
-          conditionals, etc. everywhere we added BUILD_ZZIP support in:
-
-          Fri Dec 29 08:09:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-Sun Dec 31 18:15:00 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * utils/Makefile.am:
 
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
+          Regenerated.
 
-          Updating the @file to fix a fuzz error.
+        * configure.ac:
 
-Sun Dec 31 18:08:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Configure utils/wxNamingViewer/Makefile.am.
 
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+        * utils/wxNamingViewer/Makefile.am:
 
-          Disambiguating Transport::CurrentTest::ContextTag to
-          Test::Transport::CurrentTest::ContextTag to aid Borland's compiler.
+          New file.
 
-Sun Dec 31 17:27:27 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Sat Jun 10 03:52:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
+        * orbsvcs/Naming_Service/Naming_Service.mpc:
 
-          Adding a trivial default implementation of post_init.
+          Changed NT_Naming_Service project to require new MPC feature
+          variable "winnt". Avoids building and installing this on non
+          Windows systems.  Fixes bugzilla bug #2412.
 
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/server.cpp:
+        * orbsvcs/Notify_Service/Notify_Service.mpc:
 
-          Moved an #include from the header to the cpp file, where it
-          belongs.
+          Changed NT_Notify_Service project to require new MPC feature
+          variable "winnt". Avoids building and installing this on non
+          Windows systems.  Fixes bugzilla bug #2411.
 
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
+Fri Jun  9 18:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-              Added a "Template_Files" section to explicitely make
-          ORBInitializer.cpp available.
+        * orbsvcs/performance-tests/RTEvent/lib/Client_Options.{h,cpp}:
+        * examples/RTCORBA/Activity/POA_Holder.{h,cpp}:
+        * examples/RTCORBA/Activity/Periodic_Task.{h,cpp}:
+        * examples/RTCORBA/Activity/Job_i.{h,cpp}:
+        * examples/RTCORBA/Activity/Builder.{h,cpp}:
+        * orbsvcs/tests/Notify/lib/Peer.h:
+          Just include ACE_Arg_Shifter in the header file instead of
+          using a forward declaration
 
-Fri Dec 29 22:31:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Fri Jun  9 14:49:06 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tao/TransportCurrent/Current_Loader.cpp:
+        * tests/Stack_Recursion/run_test.pl:
 
-          Cleanup.
+          Doubled the timeout to accomodate really slow machines. This was
+          necessitated by new sequence initialization code.
 
-        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+Fri Jun  9 14:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Replaced static_cast<>with a dynamic_cast<> in handler().
+        * orbsvcs/tests/Notify/lib/Options_Parser.{h,cpp}:
+          Moved the include of Arg_Shifter.h from cpp to header file
 
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Framework.mpc:
+Fri Jun  9 14:35:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Whitespace cleanup.
+        * tests/Big_Request_Muxing/Client_Task.h:
+        * tests/Big_Request_Muxing/Client_Task.cpp:
+        * tests/Big_Request_Muxing/Payload_Receiver.h:
+        * tests/Big_Request_Muxing/Payload_Receiver.cpp:
+        * tests/Big_Request_Muxing/Test.idl:
+        * tests/Big_Request_Muxing/client.cpp:
+        * tests/Big_Request_Muxing/run_test.pl:
+        * tests/Big_Request_Muxing/server.cpp:
 
-        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
+          This test frequently shows false errors due dropped SYNC_NONE
+          messages. These errors are false because dropping such messages
+          is not an error. The test now separately accounts for SYNC_NONE
+          invocations separately by using a different operation.
 
-          Cleaned up template declarations and moved themplate code to a
-          cpp file.
+          I also modified the timeout loop in an earlier attempt to
+          resolve the periodic dropped messages, thinking the timeout
+          occured due to heavy loads. Now the timeout less about the whole
+          event and more about the duration of individual requests.
 
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
+Thu Jun  8 02:16:30 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-          Updated includes and removed unnecessary code.
+        * orbsvcs/Event_Service/Event_Service.cpp (parse_args): Added a
+          missing break statement.  Thanks to Sunil Rottoo <sunil dot
+          rottoo at idilia dot com> for reporting this.
 
-        * tests/TransportCurrent/Framework/client.cpp:
+Wed Jun  7 14:24:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Added code to handle TAO_HAS_MINIMUM_CORBA by disabling DII.
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
 
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
+          Now with all with the cleanup, we can switch from using a
+          ACE_Hash_Map to a ACE_RB_Tree by changing one typedef.
 
-          Whitespace cleanup.
+          Now that LogRecords are ordered by RecordId, for all practical
+          purposes this resolves bugzilla bugs #1980 and #1981.  While it
+          doesn't handle the case where the RecordId's wrap, with 64 bits,
+          that's not worth losing too much sleep over.  Even if we logged
+          1,000,000 records per second, it would take nearly 600,000 years
+          to wrap.
 
-        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
+Wed Jun  7 09:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removing extra ';' from ACE_STATIC_SVC_REQUIRE.
+        * tao/Invocation_Adapter.cpp:
 
-Sat Dec 30 03:55:42 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Corrected the check whether a request has arguments or not. This
+          fixes interoperability issues with Orbix. Thanks to Phil
+          Billingham <phil_billingham at ml dot com> for reporting
+          this. This fixes bugzilla bug 2548
 
-        * tests/Makefile.am:
+Tue Jun  6 21:05:19 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Fix stray trailing whitespace after \ continuation.
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp:
+          There was a buffer overrun inside this test case.
 
-Fri Dec 29 17:50:16 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+Tue Jun  6 17:25:15 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff:
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
-        * orbsvcs/orbsvcs/Trader/constraint.l:
+        * TAO_IDL/tao_idl.mpc:
 
-          Added a rule to catch white space and ignore it.  Previously,
-          white space was not recognized and the lexer would print it out to
-          stdout.
+          Combined two automake specific sections into one.
 
-Fri Dec 29 14:49:24 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+        * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc:
+        * orbsvcs/tests/FtRtEvent/FtRtEvent.mpc:
 
-        * MPC/config/trading_serv.mpb:
+          Replaced a gnuace specific section to link in tje TAO_Strategies
+          library with the inheritance of the strategies base project.
 
-          Added the utils base project.  It is used by the CosTrading_Serv
-          project and should have been in this base project.
+Tue Jun  6 17:02:57 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
-Fri Dec 29 08:09:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/DII_Collocation_Tests/Client_Task.cpp:
+        * tests/DII_Collocation_Tests/Client_Task.h:
+        * tests/DII_Collocation_Tests/Collocated_Test.cpp:
+        * tests/DII_Collocation_Tests/Hello.cpp:
+        * tests/DII_Collocation_Tests/Hello.h:
+        * tests/DII_Collocation_Tests/README:
+        * tests/DII_Collocation_Tests/run_test.pl:
+        * tests/DII_Collocation_Tests/Server_Task.cpp:
+        * tests/DII_Collocation_Tests/Server_Task.h:
+        * tests/DII_Collocation_Tests/Test.idl:
 
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Request/Makefile.am:
-        * tests/GIOP_Fragments/Makefile.am:
-        * tests/Nested_Upcall_Crash/Makefile.am:
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am:
-        * tests/TransportCurrent/IIOP/Makefile.am:
+          Added incomplete twoway test. More test cases (OUT, INOUT and
+          RETURN) need be added.
 
-          Regenerate for misc *.mpc and *.mpb changes.
+Tue Jun  6 14:48:33 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/Makefile.am:
-
-          Regenerate for new Compression projects.
+        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp:
 
-        * configure.ac:
+          Use iter->item() instead of (*iter).int_id_ to dereference
+          iterators.
 
-          Configure Makefiles for new subdirectory.
+          Changed get() to set the length of the output sequence to the
+          maximum number of log records (this will be shrunk to the real
+          value once we find how many records match the constraint).  We
+          must have got lucky with the old sequence implementation...
 
-        * tests/Makefile.am:
+Tue Jun  6 13:56:49 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Regenerate to descend into Compression subdirectory.
+        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.h:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
 
-        * tests/Compression/Makefile.am:
+          Consistantly use the LOG_RECORD_STORE typedef instead of
+          LOG_RECORD_HASH_MAP.  The former is supposed to abstract the
+          latter.
 
-          New Makefile.am for Compression unit tests.
+Tue Jun  6 13:38:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
 
-          Hand-add automake conditionals for BUILD_ZZIP.  Unfortunately
-          MPC resolves options, files, etc. set by "features" at project
-          generation time, but we want them to be configure time options.
+          Rename rec_hash_ member variable to rec_map_, as we plan to
+          change the type.
 
-Fri Dec 29 07:45:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Jun  6 13:23:06 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * configure.ac:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
 
-          Added AM_CONDITIONALs for BUILD_ZLIB and BUILD_ZZIP, so we can
-          handle Makefile.am's with these options.  Default to false,
-          until we can write feature tests for these options.
+          Use iter->item() instead of (*iter).int_id_ to dereference
+          iterators.
 
-Fri Dec 29 07:37:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Jun  6 12:29:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * docs/libraries.html:
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
+          Explicitly duplicate the command-line arguments passed to the
+          client and server ORBs. On some platforms, it wasn't enough to
+          merely readjust the length by setting last argv to 0.
 
-          Fix typos.
+Mon Jun  5 03:19:58 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Thu Dec 28 23:10:52 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core.h:
 
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
+          There is a class for containing certain initialization values
+          used by the ORB Core that are set during Dynamic loading of
+          service configuration objects where there is no way to get a
+          pointer to an ORB Core instance. These values were stored in
+          a static instance of this class, TAO_ORB_Core_Static_Resources.
+          However, using a static instance of this class is incongruent
+          with the notion of per-ORB configuration, so this change
+          addresses the problem by making the resources container a
+          service object which is initialized in the local configuration
+          context for each ORB, as well as a copy in the global
+          configuration context.
 
-          Apparently, interceptors and pi are still needed for the
-          build. Reverting my change from Thu Dec 28 19:29:58 UTC 2006.
+          This fix specifically addresses the problem of having a later
+          ORB initialization, such as for a second ORB, affecting the
+          configuration of earlier ORBs. If this happens in separate
+          threads, a race can occur leading to unpredictable results.
 
-Thu Dec 28 20:30:14 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          However, it might be possible for some ORB-related configuration
+          to be supplied via service configuration after ORB_init is
+          called. If that is the case, then the appropriate configuration
+          context must be set with ACE_Service_Config_Guard during the
+          duration of the configuration. This will ensure the newly loaded
+          configuration object goes into the correct context.
 
-        * docs/libraries.html:
+        * tao/CSD_Framework/CSD_Framework_Loader.cpp:
 
-          Updated documentation for Transport::Current.
+          Reverted the temporary fix, it is no longer needed.
 
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
+Sun Jun  4 16:04:36 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Reversing the removal of *_Export.h include to match the
-          convention.
+        * tests/DII_Collocation_Tests/oneway/Server_Task.h:
 
-        * tests/TransportCurrent/Framework/run_test.pl:
+          Add versioned namespace wrappers for the forward declaration of
+          an ACE class.
 
-          Added code to support -static and -dynamic parameters, similar
-          to the IIOP test.
+Sun Jun  4 14:39:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Thu Dec 28 20:01:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+        * tao/CSD_Framework/CSD_Framework_Loader.cpp:
 
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
-        * tests/TransportCurrent/Framework/run_test.pl:
+          This is a temporary (duration unknown) resolution to a problem
+          highlighted by the intermitant failure in the Two_DLL_ORB test.
+          The problem is that the POA factory name and POA factory
+          directive are held in a static instance of the
+          TAO_ORB_Core_Static_Resoures. The problem is that with multiple
+          configuration contexts, the ORBs are supposed to be configured
+          separately, but this static resource violates that principle.
 
-Thu Dec 28 19:29:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Sat Jun  3 19:38:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
 
-          Removed interceptors and pi from the list of base projects. The
-          Transport::Current feature isnot itself dependent on these
-          features. The tests however are, and their *.mpc files have been
-          modifiedaccordingly to add interceptors explicitely.
+          Added new varient of remove_i() that takes an iterator instead
+          of a record id as its argument.  In almost all cases, we have a
+          current iterator when deleting removing a log record; if we use
+          it when unbinding from the map, we avoid an extraneous lookup.
+          Update callers.
 
-        * tao/TransportCurrent/Current_ORBInitializer.h:
+Sat Jun  3 19:03:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Removed commented code.
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
 
-        * tao/TransportCurrent/Current_ORBInitializer.cpp:
+          Remove TODO comments about storing the id on a list when a log
+          record is deleted, and reusing those ids when a new log record
+          is inserted.  If we did this, ids would be practically useless
+          for use by client applications.  It's much more useful to have
+          montonically increasing ids.
 
-          Added "#pragma once".
+Sat Jun  3 17:37:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
 
-          Removed unnecessary *_Export.h include since TCC.h already
-          includes it.
+          Changed last instance of use of old iterator API to the new
+          STL-like API.
 
-        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
+          Changed purge_old_records(), delete_records(), and
+          remove_old_records() to increment iterator before removing log
+          record.  Removing the record invalidates the current iterator,
+          and incrementing afterwards it resulted in undefined behavior.
 
-          Removed an extra ';' after ACE_STATIC_SVC_REQUIRE.
+Sat Jun  3 16:10:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/TransportCurrent/Transport_Current_Export.h:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
 
-          Regenerated this file to fix DLL export problems in static
-          builds.
+          Changed the match() and delete_records() methods to iterate
+          through the map by themselves instead of invoking match_i().
+          While match_i() factored out common code, it did so at the
+          expense of an extra conditional in the hot path.  Removed
+          match_i().
 
-        * tests/TransportCurrent/Framework/Framework.mpc:
+Sat Jun  3 15:46:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Added interceptors to the base projects list to ensure this test
-          builds only when interceptors are supported.
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
 
-        * tests/TransportCurrent/Framework/Tester.cpp:
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/server.cpp:
+          Remove private remove() method.  Update callers to invoke
+          remove_i().
 
-          Added code to handle single-threaded builds correctly.
+          Rename update() to update_i().
+          Rename retrieve() to retrieve_i().
 
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+Sat Jun  3 05:25:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Changed the modulename from "TAO" to "Test" in order to fixing
-          an ambiguous reference to "TAO" namespace in builds with
-          versioned namespaces enabled.
+        * orbsvcs/orbsvcs/Log/PersistStore.cpp:
+        * orbsvcs/orbsvcs/Log/PersistStore.h:
+        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp:
+        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.h:
 
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
+          Remove files.  This was an old attempt at log record persistence
+          that predated the plug-in strategy.
 
-          Added interceptors to the base projects list to ensure this test
-          builds only when interceptors are supported.
+Sat Jun  3 05:20:50 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Thu Dec 28 19:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
 
-        * tao/Compression/Compression.cpp:
-          Fixed argument not used warning
+          Declare LOG_RECORD_HASH_MAP_ENTRY and LOG_RECORD_HASH_MAP_ITER
+          in terms of LOG_RECORD_HASH_MAP::ENTRY, ...::ITERATOR, instead
+          of duplicating all the template stuff.  Will make it easier to
+          migrate to an ordered ma types, for bugzilla bugs #1980, #1981,
+          etc.
 
-Thu Dec 28 12:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sat Jun  3 05:19:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * examples/Simple/time-date/svc.conf.xml:
-          Updated this file to match the regular svc.conf file
+        * orbsvcs/examples/Log/Event/run_test.pl:
+        * orbsvcs/examples/Log/Notify/run_test.pl:
+        * orbsvcs/examples/Log/RTEvent/run_test.pl:
 
-Thu Dec 28 12:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Kill the Consumer process instead of considering the test to be
+          failed if it did not exit itself.  The Consumer connects to the
+          Log Factory's event channel, not the event/notification channel
+          for the log, so even though its disconnect_push_consumer method
+          invokes shutdown on the orb, the it doesn't matter since it's
+          not going to be called when the log is destroyed.
 
-        * performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc:
-        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
-        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
-          Disable part of the projects when CORBA/e micro is enabled
+Sat Jun  3 05:03:15 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Thu Dec 28 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/TAO_Internal.cpp:
+          Added ACE_MT guards around new synchronization code to make it
+          single-thread-build safe.
 
-        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc:
-        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
-        * tests/NestedUpcall/Triangle_Test/TT.mpc:
-          Disable part of the projects when CORBA/e micro is enabled
+Sat Jun  3 04:26:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-Thu Dec 28 12:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/ORB_Local_Config/Two_DLL_ORB/README:
 
-        * docs/libraries.html:
-          Documented the new compression libraries
+          Added a bit of a documentation on the test
 
-Thu Dec 28 11:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
 
-          This is the first commit for a new part for TAO which hopefully
-          gets standardized next year. The final goal is to implement
-          Zipped GIOP (ZIOP). At the moment an ORB supports ZIOP the application
-          programmer can specify using policies that compression can be
-          applied on the application data send over the wire. This first
-          commit is the Compression module that delivers the infrastructure
-          classes with which data can be compressed. This can be used
-          by regular applications but then also by the ORB in the future.
+          Modified to conditionaly excersise one of the two test
+          scenarios. Originally, the test used SSLIOP, however that
+          service is not built by default. So the change makes use of
+          another service, which is normally available in "default"
+          builds.
 
-          This effort is supported by multiple parties, IONA did the
-          initial effort for Orbix and triggered this step, Remedy IT
-          will do the implementation for TAO, Andre Spiegel will do
-          the implementation for JacORB, IONA then for Orbix and PrismTech
-          will assist when needed and will keep an eye on the OMG process.
+        * tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf:
 
-          This commit adds first initial support, it is not 100% ready
-          but it is usable. This way we can share the code with the other
-          parties more easily and attract more people to this effort. Be
-          aware that the IDL can change, this is work in progress, not
-          a final spec.
+          Added a simple names for the the configuration files.
 
-        * MPC/config/compression.mpb:
-          New base project for the compresion library
+        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test2.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test3.conf:
 
-        * MPC/config/zlibcompressor.mpb:
-          New base project for the zlib compressor
+          Removed these files.
 
-        * docs/Libraries.html:
-          Corrected link to MPC readme
+Fri Jun  2 21:02:46 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * docs/ORBEndpoint.html:
-          Small layout change
+        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
+          Fixed a typo from the earlier commit.
 
-        * tao/Compression/Base_Compressor.cpp:
-        * tao/Compression/Base_Compressor.h:
-        * tao/Compression/Compression.cpp:
-        * tao/Compression/Compression.h:
-        * tao/Compression/Compression.pidl:
-        * tao/Compression/compression_export.h:
-        * tao/Compression/Compression_Manager.cpp:
-        * tao/Compression/Compression_Manager.h:
-        * tao/Compression/Compressor_Factory.cpp:
-        * tao/Compression/Compressor_Factory.h:
-        * tao/Compression/TAO_Compression.pc.in:
-        * tao/Compression/TAO_Compression.rc:
-          New Compression library
-
-        * Compression/zlib/TAO_ZlibCompressor.pc.in:
-        * Compression/zlib/TAO_ZlibCompressor.rc:
-        * Compression/zlib/ZlibCompressor.cpp:
-        * Compression/zlib/ZlibCompressor.h:
-        * Compression/zlib/ZlibCompressor_export.h:
-        * Compression/zlib/ZlibCompressor_Factory.cpp:
-        * Compression/zlib/ZlibCompressor_Factory.h:
-          New Compressor that uses zlib to compress/uncompress data
-
-        * tao/File_Parser.cpp:
-          Use true for bool
-
-        * tao/objectid.h:
-          Added CompressionManager defines
+Fri Jun  2 19:52:19 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
-        * tao/ORB.cpp:
-          Added resolve_initial_references support for the CompressionManager
+        * tests/DII_Collocation_Tests/twoway/Client_Task.cpp:
+        * tests/DII_Collocation_Tests/twoway/Client_Task.h:
+        * tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp:
+        * tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc:
+        * tests/DII_Collocation_Tests/twoway/Hello.cpp:
+        * tests/DII_Collocation_Tests/twoway/Hello.h:
+        * tests/DII_Collocation_Tests/twoway/README:
+        * tests/DII_Collocation_Tests/twoway/run_test.pl:
+        * tests/DII_Collocation_Tests/twoway/Server_Task.cpp:
+        * tests/DII_Collocation_Tests/twoway/Server_Task.h:
+        * tests/DII_Collocation_Tests/twoway/Test.idl:
 
-        * tao/ORB_Core.{h,cpp,inl}:
-          Added support for CompressionManager
+          Removed twoway test.
 
-        * tao/PI/Interceptor_List_T.cpp:
-          Const change
+Fri Jun  2 12:05:13 USMST 2006  Yan Dai  <dai_y@ociweb.com>
 
-        * tao/ZlibCompressor.mpc:
-        * tao/Compression.mpc:
-          New base projects
+        * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
 
-        * tests/Compression/Compression_Test.mpc:
-        * tests/Compression/server.cpp:
-          First initial test of the Compression library
+          Fixed compilation errors due to reference to a new file.
 
-Wed Dec 27 22:48:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Fri Jun  2 13:33:19 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Current_Test.idl:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.h:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/server.cpp:
+        * tests/Big_Twoways/server.cpp:
+          Fixed a minor memory leak caused by not cleaning up servants.
 
-          Changed the modulename from "TAO" to "Test" in order to fixing
-          an ambiguous reference to "TAO" namespace in builds with
-          versioned namespaces enabled.
+        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
+          Addressed compiler warnings generated by some platforms with
+          2-byte wchars. This codeset translator should only be used on
+          hosts with 4-byte wchars, since UCS4 is a 32-bit codeset, but
+          not all of the test platforms meet that criterium.
 
-Wed Dec 27 20:42:48 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Fri Jun  2 12:36:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+        * tao/TAO_Internal.cpp:
 
-          Fixing test failures because of incorrect counting.
+           Adding synchronization, in the form of a condition variable to
+           fix a race condition occurring when a non-default ORB enters
+           open_services, before the default ORB has completed
+           initializing the global service objects. According to the spec,
+           the default ORB is the one that gets to call ORB_init
+           first. The ORB-specific configuration implementation designates
+           the default ORB to initialize globally available service
+           objects, like the Resource Factory. If a non-default ORB beats
+           it to the resource initialization, it would cause a SEGV.
+
+        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test.conf:
+
+           As a consequence of implementing the ORB-specific
+           configuration, we discovered many implicit assumptions about
+           the lifetime of objects. For example, process-global Singletons
+           are created by service objects, loaded by ORBs, which are
+           themselves initialized from a DLL-loaded code. If that DLL,
+           which also contains the code for tearing down the Singleton
+           gets unloaded (for instance, as a consequence of calling
+           orb->destroy()), its TEXT segment will no longer be mapped in
+           memory when the Object Manager tries to destroy the Singleton.
+
+           Ossama has a solution for a similar problem, involving the TAO
+           Singleton Manager, for DLL-loaded ORBs (see the DLL_ORB test),
+           however it doesn't cover the ACE Object Manager.
+
+           This configuration change is a workaround the fact that SSLIOP,
+           loaded as a private service object by a DLL-based ORB,
+           registers a process-global Singleton - ACE_SLL_Context, with
+           the Object Manager. In an use-case with multiple dynamically
+           loaded components containing ORBs, SSLIOP should be loaded
+           prior to loading any of the dynamic components using it. In
+           general, any SO that uses ACE Singletons must be treated
+           similarly, or rewritten.
+
+Fri Jun  2 04:44:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/EventLog_i.h:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
+
+          We must pass both the RootPOA and the Log POA to the log servant
+          ctor, destroy() needs to deactivate the servant on the Log POA.
+
+Thu Jun  1 23:13:58 UTC 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/DII_Collocation_Tests/Client_Task.cpp:
+        * tests/DII_Collocation_Tests/Client_Task.h:
+        * tests/DII_Collocation_Tests/Collocated_Test.cpp:
+        * tests/DII_Collocation_Tests/DII_Collocation_Tests.mpc:
+        * tests/DII_Collocation_Tests/Hello.cpp:
+        * tests/DII_Collocation_Tests/Hello.h:
+        * tests/DII_Collocation_Tests/README:
+        * tests/DII_Collocation_Tests/run_test.pl:
+        * tests/DII_Collocation_Tests/Server_Task.cpp:
+        * tests/DII_Collocation_Tests/Server_Task.h:
+        * tests/DII_Collocation_Tests/Test.idl:
+
+          These files are moved to the tests/DII_Collocation_Tests/oneway
+          directory since a new test for twoway collocated DII request
+          is added.
+
+        * tests/DII_Collocation_Tests/oneway/Client_Task.cpp:
+        * tests/DII_Collocation_Tests/oneway/Client_Task.h:
+        * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
+        * tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc:
+        * tests/DII_Collocation_Tests/oneway/Hello.cpp:
+        * tests/DII_Collocation_Tests/oneway/Hello.h:
+        * tests/DII_Collocation_Tests/oneway/README:
+        * tests/DII_Collocation_Tests/oneway/run_test.pl:
+        * tests/DII_Collocation_Tests/oneway/Server_Task.cpp:
+        * tests/DII_Collocation_Tests/oneway/Server_Task.h:
+        * tests/DII_Collocation_Tests/oneway/Test.idl:
+
+          These files are moved from tests/DII_Collocation_Tests directory.
+
+        * tests/DII_Collocation_Tests/twoway/Client_Task.cpp:
+        * tests/DII_Collocation_Tests/twoway/Client_Task.h:
+        * tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp:
+        * tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc:
+        * tests/DII_Collocation_Tests/twoway/Hello.cpp:
+        * tests/DII_Collocation_Tests/twoway/Hello.h:
+        * tests/DII_Collocation_Tests/twoway/README:
+        * tests/DII_Collocation_Tests/twoway/run_test.pl:
+        * tests/DII_Collocation_Tests/twoway/Server_Task.cpp:
+        * tests/DII_Collocation_Tests/twoway/Server_Task.h:
+        * tests/DII_Collocation_Tests/twoway/Test.idl:
+
+          Added a test for twoway collocation DII request via invoke ().
+          This test should fail now for the same reason as the
+          oneway collocation DII request. See bugzilla bug #2545
+          for details.
+
+Thu Jun  1 17:53:33 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+
+          Pass the RootPOA instead of the Log POA to the log servant ctor.
+          The log servant creates and attempts to activate a event channel
+          on the Log POA, which was failed because TAO's log event channel
+          implementation uses implicit activation (_this), and the Log POA
+          ImplicitActivationPolicy is NO_IMPLICIT_ACTIVATION.  In time, we
+          should consider whether we should create another POA just for
+          the event channels.
 
-Wed Dec 27 11:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/examples/Log/Event/run_test.pl:
+        * orbsvcs/examples/Log/Notify/run_test.pl:
+        * orbsvcs/examples/Log/RTEvent/run_test.pl:
 
-        * TAO-INSTALL.html:
-          Small improvements for cross compilation
+          New files.
 
-Wed Dec 27 10:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jun  1 16:54:56 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
-        * TAO-INSTALL.html:
-          Use more html keyword for layout and document how to use CORBA/e
+        * tests/DII_Collocation_Tests/Client_Task.cpp:
+        * tests/DII_Collocation_Tests/Client_Task.h:
+        * tests/DII_Collocation_Tests/Collocated_Test.cpp:
+        * tests/DII_Collocation_Tests/DII_Collocation_Tests.mpc:
+        * tests/DII_Collocation_Tests/Hello.cpp:
+        * tests/DII_Collocation_Tests/Hello.h:
+        * tests/DII_Collocation_Tests/README:
+        * tests/DII_Collocation_Tests/run_test.pl:
+        * tests/DII_Collocation_Tests/Server_Task.cpp:
+        * tests/DII_Collocation_Tests/Server_Task.h:
+        * tests/DII_Collocation_Tests/Test.idl:
 
-Wed Dec 27 05:35:06 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Added new DII_Collocation_Tests test to show bug #2545.
+          The test crashes on get_in_arg() or gives incorrect arguments
+          when the request is collocated oneway request and has "IN"
+          arguments. See bugzilla bug #2545.
 
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
+Thu Jun  1 14:16:06 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Fixing an ambiguous reference to TAO namespace in builds with
-          versioned namespaces enabled.
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
 
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+          Changed reset_capacity_alarm_thresholds() to do nothing if
+          LogFullActionType is wrap.
 
-          Clarifying some debugging statements.
+Thu Jun  1 14:06:20 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Mon Dec 25 16:19:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+        * orbsvcs/examples/Log/Basic/run_test.pl:
 
-        * Merry Christmas everyone!!!
+          New file.
 
-Sun Dec 24 23:22:41 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Thu Jun  1 14:02:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
 
-          Adding "after" keyword to makesure IDL is built first in
-          parallel builds.
+          Changed set_records_attribute() to validate the query language
+          grammar.
 
-Sun Dec 24 15:44:40 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Changed query_i() to set the length of the output sequence to
+          the maximum number of log records (this will be shrunk to the
+          real value once we find how many records match the constraint).
+          We must have got lucky with the old sequence implementation...
 
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+Thu Jun  1 11:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Getting the const-ness right.
+        * tao/Valuetype/ValueBase.cpp:
+          Const improvements
 
-Sun Dec 24 15:39:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Jun  1 10:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Parallel_Connect_Strategy/Makefile.am:
-        * tests/Reliable_Oneways/Makefile.am:
+        * tao/LocateRequest_Invocation_Adapter.cpp:
+          Use false instead of 0
 
-          Regenerated.
+        * tao/operation_details.h:
+          Improved documentation
 
-        * tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc:
-        * tests/Reliable_Oneways/Reliable_Oneways.mpc:
+Thu Jun  1 08:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Split out IDL compilation into separate MPC project.
+        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
+          Return false instead 0
 
-Sun Dec 24 15:38:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/AnyTypeCode/*.cpp:
+          Fixed rcsid tags
 
-        * tests/Smart_Proxies/Collocation/Makefile.am:
+Thu Jun  1 02:26:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Regenerated.
+        * tao/RTCORBA/RT_PolicyFactory.h:
+        * tests/AMH_Oneway/client.cpp:
+        * tests/AMH_Oneway/server.cpp:
+          Memory leak fixes.
 
-        * tests/Smart_Proxies/Collocation/SP_Collocation.mpc:
+Wed May 31 17:47:55 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Changed IDL project to inherit from smart_proxies.
+        * tao/AnyTypeCode/Marshal.cpp:
+          Fuzz fix.
 
-          Changed *Test project to depend on *idl for build order.
+Wed May 31 13:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sun Dec 24 00:04:19 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/AnyTypeCode/Marshal.cpp:
+          Handle a valuebox in the same way as a regular valuetype. Fixes
+          bugzilla bug 2542. Thanks to Jiang Wei
+          <jiangwei_1976 at yahoo dot com dot cn> for reporting this.
 
-        * tests/CollocationLockup/Makefile.am:
-        * tests/DSI_Gateway/Makefile.am:
-        * tests/Nested_Upcall_Crash/Makefile.am:
+Wed May 31 10:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Regenerated.
+        * tao/AnyTypeCode/skip.cpp:
+          Const improvements
 
-        * tests/CollocationLockup/CollocationLockup.mpc:
-        * tests/DSI_Gateway/DSI_Gateway.mpc:
-        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
+Wed May 31 03:54:20 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Split out IDL compilation into separate MPC project.
+        * tao/TAO_Internal.cpp:
 
-Sat Dec 23 16:53:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Revert Jeff's May 25 change, it prevented the calling of a
+          necessary function if the debuglevel wasn't set high
+          enough. Reworked the logic enough to ensure the value Jeff's
+          change was protecting didn't start causing problems again.
 
-        * tests/Collocation/Makefile.am:
-        * tests/Smart_Proxies/Collocation/Makefile.am:
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test2.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test3.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
 
-          Regenerated.
+          Update this test to resolve some runtime issues and to ensure
+          the proper loading of subsequent service configuration files.
 
-        * tests/Collocation/Collocation.mpc:
-        * tests/Smart_Proxies/Collocation/SP_Collocation.mpc:
+Tue May 30 19:17:28 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Split out IDL compilation into separate MPC project.
+        * orbsvcs/orbsvcs/Security/Security_PolicyFactory.h:
 
-Sat Dec 23 15:48:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Fix a memory leak resulting from the failure to use a reference
+          counted local object for the policy factory.
 
-        * tests/TransportCurrent/IIOP/Makefile.am:
+        * tao/ORBInitializer_Registry.cpp:
+        * tao/ORB_Core.cpp:
 
-          Regenerated.
+          Make use of changes in the ACE_Service_Gestalt and
+          ACE_Dynamic_Service<> classes to address separation of
+          configuration contexts.
 
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
 
-          Don't look for includes relative to $(srcdir), the ones we're
-          looking for are generated from *.idl and thus relative to the
-          build directory.
+          Fix for memory leaks induced through improper ORB destruction.
 
-Sat Dec 23 15:05:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue May 30 18:33:12 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * tests/Portable_Interceptors/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/Benchmark/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
+        * tao/DLL_Parser.h: Updated the documentation to explain the
+         lookup scheme when a filename is given.  Thanks to Phlip
+          <phlip2005 at gmail dot com> for motivating this.
 
-          Regenerated.
+Tue May 30 16:31:14 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc:
-        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc:
+        * tests/Bug_2543_Regression/bug_2542_regression.cpp:
 
-          Don't suppress any/typecode generation.
+          Added .in() to an OctetSeq_var passed as an argument.
 
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
+Tue May 30 16:25:24 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Don't include server skeleton in client.
+        * tests/Bug_2542_Regression/bug_2542_regression.cpp:
 
-Sat Dec 23 14:35:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Added .in() to an OctetSeq_var passed as an argument.
 
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/POA/Persistent_ID/Persistent_ID.mpc:
+Tue May 30 15:53:50 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Fix case-mismatch problem introduced in last change.
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp (set_records_attribute):
 
-Sat Dec 23 04:48:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Commented out unused argument.
 
-        * tao/TransportCurrent/Current_Loader.cpp:
+Tue May 30 14:34:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixing an pedantic complaint about an extra ';' at the end of
-          the line, after ACE_STATIC_SVC_REQUIRE.
+        * tests/IDL_Test/array.idl:
+          Added FourDArray as testcase
 
-Sat Dec 23 03:53:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Tue May 30 14:24:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/TransportCurrent/Current_ORBInitializer.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+          Generate false instead of 0
 
-          Fixing compilation warnings.
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+          Const improvement to generated code
 
-Sat Dec 23 02:01:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
+          Fixed 64bit conversion warning
 
-        * tests/POA/EndpointPolicy/Makefile.am:
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/Portable_Interceptors/AMI/Makefile.am:
-        * tests/Portable_Interceptors/Benchmark/Makefile.am:
-        * tests/Portable_Interceptors/Bug_1559/Makefile.am:
-        * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am:
-        * tests/Portable_Interceptors/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/ForwardRequest/Makefile.am:
-        * tests/Portable_Interceptors/IORInterceptor/Makefile.am:
-        * tests/Portable_Interceptors/PICurrent/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
-        * tests/RTCORBA/Banded_Connections/Makefile.am:
-        * tests/RTCORBA/Client_Protocol/Makefile.am:
-        * tests/RTCORBA/Diffserv/Makefile.am:
-        * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am:
-        * tests/RTCORBA/Explicit_Binding/Makefile.am:
-        * tests/RTCORBA/Linear_Priority/Makefile.am:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am:
-        * tests/RTCORBA/Persistent_IOR/Makefile.am:
-        * tests/RTCORBA/Policy_Combinations/Makefile.am:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am:
-        * tests/RTCORBA/Private_Connection/Makefile.am:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am:
-        * tests/RTCORBA/Server_Declared/Makefile.am:
-        * tests/RTCORBA/Server_Protocol/Makefile.am:
-        * tests/RTCORBA/Thread_Pool/Makefile.am:
-        * tests/RTScheduling/Scheduling_Interceptor/Makefile.am:
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+          Const improvement to generated code and use false instead of 0
 
-          Regenerated.
+Tue May 30 14:10:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
-        * tests/POA/Persistent_ID/Persistent_ID.mpc:
-        * tests/Portable_Interceptors/AMI/PI_AMI.mpc:
-        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc:
-        * tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc:
-        * tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc:
-        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc:
-        * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc:
-        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc:
-        * tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc:
-        * tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc:
-        * tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc:
-        * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc:
-        * tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.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/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_Declared/RTCORBA_Server_Declared.mpc:
-        * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc:
-        * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc:
-        * tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Sat Dec 23 00:23:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/BiDirectional/Makefile.am:
-        * tests/BiDirectional_DelayedUpcall/Makefile.am:
-        * tests/BiDirectional_NestedUpcall/Makefile.am:
-        * tests/Bug_2417_Regression/Makefile.am:
-        * tests/Bug_2560_Regression/Makefile.am:
-        * tests/MT_BiDir/Makefile.am:
-        * tests/NestedUpcall/Triangle_Test/Makefile.am:
-
-          Regenerate to account for misc recent *.mpc changes.
-
-        * tests/TransportCurrent/IIOP/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am:
+        * tao/AnyTypeCode/Marshal.cpp:
+        * tao/AnyTypeCode/Marshal.inl:
+        * tao/AnyTypeCode/skip.cpp:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+        * tao/AnyTypeCode/Any.cpp:
+        * tao/CodecFactory/CDR_Encaps_Codec.cpp:
+        * tao/PI/PI.cpp:
+          Use true/false and const improvements
 
-          Regenerated.
+Tue May 30 13:42:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/Framework/Framework.mpc:
+        * tao/GIOP_Message_Base.{h,cpp}:
+          Removed the buffer as member, let the cdr stream get the buffer
+          from the allocator. This allocation is just done once at the
+          creation so this shouldn't impact performance a lot. Also use
+          the size argument passed to the constructor, specific protocol
+          implementations to pass this down to its base to set a
+          specific initial buffer size.
 
-          Split out IDL compilation into separate MPC project.
+Tue May 30 10:04:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Dec 22 20:54:44 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tests/Bug_2543_Regression/bug_2543_regression.cpp:
+        * tests/Bug_2542_Regression/bug_2542_regression.cpp:
+          Fixed conversion warnings
 
-        * MPC/config/tc.mpb:
-        * MPC/config/tc_iiop.mpb:
+Tue May 30 01:59:07 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Split the tc.mpb in two projects (adding the tc_iiop). Updated
-          the dependencies in a bid to fix what seems to be a build order
-          issue on some scoreboard builds.
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
 
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
+          Changed set_records_attribute() to iterate through all the
+          records in the hash map instead of calling query() and (if there
+          are enough matching records) fiddling with iterators, etc.  This
+          is not only faster, it also avoids a deadlock that shows up when
+          the iterator takes the already held rwlock.
 
-          Updated to inherit from the new tc_iiop.
+Tue May 30 01:01:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Fri Dec 22 18:55:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * NEWS:
 
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+          Document changes.
 
-          Replaced obsolete ACE_reinterpret_cast macro.
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
+        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
 
-Thu Dec 21 21:29:47 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          When a log channel's LogFullActionType is wrap, the capacity
+          threshold alarms "are triggered as if coupled to a gauge that
+          counts from zero to the highest capacity threshold value and
+          then resets to zero".
 
-        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/simple.cpp:
+          The log service didn't implement such a gauge and compared the
+          log channel's current size with the maximum size (as if the
+          LogFullActionType was halt).  This could result in an alarm
+          being sent for each log record, as the log channel will almost
+          always be "full".
 
-          Fixed FUZZ problems.
+          Changed plug-in Strategy to maintain gauge.  Added get_gauge()
+          and reset_gauge().
 
-Thu Dec 21 17:49:24 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Changed log channel to compare the value of the gauge with the
+          maximum size when the LogFullActionType is wrap.
 
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+          Fixes bugzilla #2420.
 
-          Updated the include files' path to resolve a compilation problem
-          in an autoconf (FC4_autoconf) build.
+Mon May 29 14:28:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Thu Dec 21 16:03:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * NEWS:
 
-        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+          Document changes.
 
-          Added conditional compilation, based upon the presence of
-          TAO_HAS_IIOP.  The IIOP-specific current will compile and the
-          implementation shall throw CORBA::NO_IMPLEMENT at runtime.
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
+        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
 
-Thu Dec 21 15:32:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Changed plug-in Strategy interface.  Added get_record_attribute(),
+          set_record_attribute(), and set_records_attribute(); removed
+          retrieve(), update(), and remove().
 
-        * tao/TransportCurrent/Current_Impl.h:
-        * tao/TransportCurrent/Current_Impl.cpp:
-        * tao/TransportCurrent/Current_Loader.h:
-        * tao/TransportCurrent/Current_ORBInitializer.h:
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
-        * tao/TransportCurrent/IIOP_Current_Impl.h:
+          This will allow plug-in Strategies to handle these high-level
+          operations more efficiently.
 
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+Mon May 29 08:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed a ';' after the closing curly brace of a namespace
-          declaration which caused hiccups with gcc 4.0.2.
+        * tests/Bug_2542_Regression/*:
+          New regression for Bug_2542. Thanks to Jiang Wei
+          <jiangwei_1976 at yahoo dot com dot cn> for creating this regression.
 
-Thu Dec 21 14:46:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/Bug_2543_Regression/*:
+          New regression for Bug_2543. Thanks to Jiang Wei
+          <jiangwei_1976 at yahoo dot com dot cn> for creating this regression.
 
-        * tao/TransportCurrent/TC.idl:
-        * tao/TransportCurrent/TC_IIOP.idl:
+Sun May 28 23:15:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Change #include files to be relative to ${TAO_ROOT} like the
-          other *.idl / *.pidl files.
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
 
-Thu Dec 21 14:00:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Reworked checks for the log being full.  Just log the record,
+          the LogRecordStore will return an error if it is full.  This
+          avoids extra conditions in the write hot path.
 
-        * tao/Makefile.am:
+Sun May 28 23:10:03 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Regenerated.
+        * docs/releasenotes/index.html:
 
-Wed Dec 20 21:14:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Update for changes to the telecom logging service that have been
+          made over the last few months.
 
-        * tao/TransportCurrent/Current_Loader.h:
+Sun May 28 16:24:24 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Fixing an error in builds that use versioned namespaces due to
-          incorect placement of TAO_END_VERSIONED_NAMESPACE_DECL.
+        * tao/Valuetype/ValueBase.cpp:
+          Add explicit dereferences where the ValueFactory_var is used in
+          equality tests.
 
-Wed Dec 20 20:59:39 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Sun May 28 15:18:19 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          These are fixes correcting scoreboard issues pertaining to the
-          checkin from Tue Dec 19 22:09:34 UTC 2006.
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
 
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
+          Removed unused LogRecord variable in write_recordlist().  This
+          avoids its construction and destruction in the write hot path.
 
-          Updated the IDL compile options and include file path to reflect
-          the new position of these files (since Wed Dec 20 17:34:07)
+Sat May 27 22:00:08 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/TransportCurrent/Current_Loader.h:
-        * tao/TransportCurrent/Current_Loader.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
 
-          Eliminated unnecessary code.
+          Don't invoke reset_capacity_thresholds() if no log records were
+          actually removed.
 
-        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
+Fri May 26 22:09:09 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Removed unnecessary #include "ace/post.h"
+        * tao/Valuetype/ValueBase.cpp:
+          Fixed a memory leak introduced by the refactoring of
+          _tao_unmarshal_pre. The ValueFactory reference was moved into
+          the unmarshal_pre method directly, and in doing so inadvertently
+          got its _var status stripped.
 
-        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+Fri May 26 11:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added an explicit cast to silence Windows builds complaining
-          about implicit conversion between HANDLE and CORBA::Long.
+        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+          Applied workarounds for BCB2006 and BCB6 in release mode, the
+          code results in the original form in an internal backend
+          error, reported this to Borland as QC27961.
 
-Wed Dec 20 17:34:07 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu May 25 23:12:56 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * configure.ac:
+        * tao/TAO_Internal.cpp:
 
-          Configure Makefiles for new subdirectories.
+          Fixed logic in open_services() to eliminate an unused local
+          variable warning (which happened when the TAO debug level
+          was less than 3) and made many cosmetic changes to the
+          whole file to bring the code into line with the ACE
+          style guidelines.
 
-        * orbsvcs/tests/Makefile.am:
+Thu May 25 03:27:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Regenerate to descend into TransportCurrent subdirectory.
+        * tao/OctetSeqC.h:
+        * tao/OctetSeqC.cpp:
+        * tao/diffs/OctetSeq.diff:
+          Reverted change from Tue May 16 19:08:49 UTC 2006 Phil Mesnier
+          <mesnier_p@ociweb.com>
 
-        * tests/TransportCurrent/Makefile.am:
-        * tests/TransportCurrent/IIOP/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am:
+        * tao/Unbounded_Octet_Sequence_T.h:
+          Moved the equality operations into the octet sequence class,
+          making them member functions. This seems to resolve the
+          namespace related problems.
 
-          New Makefile.am's for TransportCurrent unit tests.
 
-        * tao/Makefile.am:
+Wed May 24 19:43:16 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Regenerated.
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp:
+          My fix for the servant reference counting used a ServantBase_var
+          as the owner of the pointer to the servant instance, but that
+          cannot be used as a target within ACE_NEW_RETURN macros on
+          windows because the MSVC compiler doesn't appropriately map the
+          post-assignment equality test. This minor change is to use a
+          servant type pointer for initialization with ACE_NEW, then
+          assign the result to a ServantBase_var for reference management.
 
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
+Wed May 24 18:27:13 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          ...to here, to match convention established by other core TAO
-          library projects.  This also makes the generated Makefile.am
-          for the autoconf build a little more sane.
+        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
 
-        * tao/TransportCurrent/TC.mpc:
-        * tao/TransportCurrent/TC_IIOP.mpc:
+          Along with the /FORCE:MULTIPLE link option that is added by
+          MPC specifically for em3, nmake, vc6, and vc71 builds, added
+          the /INCREMENTAL:NO link option since the above option is
+          incompatible with incremental linking, and produces warnings
+          on the platforms where it is in force.
 
-          Move TransportCurrent *.mpc projects from here...
+Wed May 24 16:00:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Wed Dec 20 16:22:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tao/TAO_Internal.cpp:
+          Refactored recent change to skip over global parameters after
+          the first initialization pass.
 
-          These are fixes correcting scoreboard issues pertaining to the
-          checkin from Tue Dec 19 22:09:34 UTC 2006.
+Wed May 24 12:40:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * MPC/config/tc.mpb:
+        * tao/EndpointPolicy/IIOPEndpointValue_i.h:
+          Fixed memory leak. Unlike servants, local objects are not
+          intrinsically reference counted. Therefore it is still necessary
+          to explicitly inherit from TAO_RefCount_LocalObject rather than
+          from CORBA::LocalObject.
 
-          Moved from $ACE_ROOT/bin/MakeProjectCreator/config according to
-          the new project configuration layout.
+Wed May 24 10:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/TransportCurrent/Current_Loader.h:
-        * tao/TransportCurrent/Current_Loader.cpp:
-        * tao/TransportCurrent/IIOP_Current_Loader.h:
-        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
+        * tao/String_Manager_T.h (out, _retn):
+          Just set ptr_ to 0 instead of initializing it with an default
+          string. Now we get the same behaviour as with the old string
+          manager, fixes runtime memory leaks when the string managers
+          are used
 
-        * tao/Transport_Selection_Guard.cpp:
+Wed May 24 09:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed errand semicolons after definitions which were breaking
-          some of the scoreboard builds.
+        * tao/Strategies/DIOP_Connector.cpp:
+          Const improvements
 
-        * tests/TransportCurrent/Framework/Current_Test.idl:
+Wed May 24 09:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed a FUZZ warning about mismatched @file.
+        * docs/performance.html:
+          Added ACE_NLOGGING=1 as one of the options that can be used to
+          reduce footprint. Adding this to the footprint build resulted in
+          a footprint drop of about 10% for the Hello client.
 
-        * tests/TransportCurrent/Framework/Framework.mpc:
+Wed May 24 08:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added the current directory to the include path.
+        * tao/Bounded_Sequence_CDR_T.h:
+        * tao/Unbounded_Sequence_CDR_T.h:
+          Fixed memory leak in the demarshaling of (w)string sequences.
+
+Wed May 24 03:01:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/PortableServer/POAManager.cpp:
+        * tao/PortableServer/POAManagerFactory.cpp:
+
+          Cleaned up redundant debug messages.
+
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp:
+
+          Add (%P|%t) to many debug lines to improve ability to track
+          thread behavior during collocated calls. Also switched the
+          servant to using the modern reference counting method of using a
+          ServantBase_var to manage the local reference to the servant
+          rather than using an explicit call to _remove_ref() from within
+          the shutdown operation. Finally, added a slight delay after
+          orb->run() and before orb->destroy() to avoid thread races. See
+          bugzilla bug #2538 for more information about this race.
+
+Tue May 23 16:09:05 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+        * tao/ORB_Constants.h:
+
+          See bugzilla #2500.  Around the time of TAO 1.4.7 the tags for UIPMC
+          (multicast) changed from TAO-assigned to OMG-assigned.  The
+          ComponentID and the ProfileID were added to tao/IOP_IORC.h but the
+          change to the new ProfileID was never completed, since code still
+          referred to the value in tao/ORB_Constants.h.  This change eliminates
+          the old ProfileID and changes all uses to the new one.  This causes a
+          break in multicast interoperability between applications using TAO
+          before this change and TAO after this change, but should enable
+          multicast interoperability between TAO and a different ORB.
+
+Tue May 23 13:05:43 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/ORB_Core.cpp:
+          Fixed a typo in a service name.
 
-        * tests/TransportCurrent/Framework/Tester.cpp:
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/server.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/IIOP/client_static.conf:
+        * tao/TAO_Internal.cpp:
 
-          Fixing a service initialization problem encountered in static
-          builds that prevented the tests from runnig. Also fixed include
-          file locations.
+          Added a function to address the situation where a second ORB is
+          initialized with arguments that are global and expected to be
+          removed from argv before ORB_Core::init starts parsing args.
 
-Wed Dec 20 15:28:24 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Since the first initialized ORB is the default ORB, it is also
+          the one that sets global options, such as debug level, and
+          daemonization. In situations where multiple ORBs are initialized
+          indeterminately, such as via dynamically loaded service objects,
+          an application wanting a concrete set of global options should
+          explicitly initialize a default ORB.
 
-        * MPC/config/tc.mpb:
+        * tao/IIOP_Acceptor.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tests/CollocationLockup/CollocationLockup.cpp:
+        * tests/InterOp-Naming/INS_test_client.cpp:
+        * tests/POA/EndpointPolicy/server.cpp:
+          Fixed memory leaks.
 
-        * tao/Transport_Selection_Guard.cpp:
 
-        * tests/TransportCurrent/Framework/Current_Test.idl:
+Thu May 18 17:16:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tests/TransportCurrent/Framework/Framework.mpc:
+        * orbsvcs/Logging_Service/
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
 
-        * tests/TransportCurrent/Framework/server.cpp:
+          Regenerated.
 
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+          NB: The reason the Makefile.am's for the Event and RTEvent
+          Logging Services were not changed is because currently the
+          automake config are generated with the typed event channel
+          support enabled, which also requires valuetype.
 
+        * 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:
 
-Wed Dec 20 09:36:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Changed to inherit from the valuetype base project.
 
-        * tests/BiDirectional/BiDirectional.mpc:
-        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
-        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
-        * tests/Bug_2417_Regression/Bug_2417_Regression.mpc:
-        * tests/Bug_2560_Regression/Bug_2560_Regression.mpc:
-        * tests/MT_BiDir/MT_BiDir.mpc:
-        * tests/NestedUpcall/Triangle_Test/TT.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled. Also removed some after usage because
-          there is now a seperate idl project
+          This is required in the case the event / log record embeds a
+          valuetype.  A event or log record contains one or more CORBA
+          anys.  The current implementation demarshals the any before
+          touching any app code.  Thus if the any were to contain a
+          valuetype, the valuetype library will be called upon to
+          demarshal the data.
 
-Wed Dec 20 09:31:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          The same change was made for the Notification Service in:
+                Mon Jul 18 13:12:15 2005  Ciju John  <john_c@ociweb.com>
 
-        * examples/Callback_Quoter/Callback_Quoter.mpc:
-        * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc:
-        * orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
-        * orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
-        * performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
+          This fixes bugzilla issue #2524.
 
-Tue Dec 19 22:51:09 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Thu May 18 15:10:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * NEWS:
+        * tests/ORB_Local_Config/run_tests_all.pl:
 
-          Updating the file with information about Transport::Current.
+          Updated to remove the Limits test from the list. The
+          functionality has been moved to the Service_Config_Test under
+          ACE.
 
-Tue Dec 19 22:09:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tests/ORB_Local_Config/Limits/Limits.mpc:
+        * tests/ORB_Local_Config/Limits/Test.cpp:
+        * tests/ORB_Local_Config/Limits/run_test.pl:
 
-          Introducing the Transport::Current - an optional feature with an
-          IDL interface, which enables users to obtain information about
-          the Transports used to send or receive a message.
+          Removed these files.
 
-          The implementation uses a TSS based stack of pointers to
-          Transport class instances, which an ORB selects on the critical
-          path.  The structure is used to update message and endpoint
-          related statistical information for the correct Transport. An
-          IDL interface available through ORB::resolve_initial_references,
-          provides access to the accumulated data inside servant up-calls
-          and interceptor invocations.
+Thu May 18 13:52:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * docs/transport_current:
+        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
 
-          A new directory for the Transport Current documentation to
-          inhabit.
+          Replaced servant activation using _this() with one explicitly
+          referencing the desired POA, using activate_object(). As usual,
+          using _this() outside the scope of an upcall yields surprising
+          results, because it is using the first ORB in the orb table, no
+          matter which one that is. Within a single process, it is
+          possible for the server's servant to get activated in the client
+          ORB's POA and then the client will fail to communicate with it,
+          because the client POA is not active.
 
-        * docs/transport_current/index.html:
-        * docs/transport_current/transport_current.css:
+Wed May 17 23:07:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Added reference and user-guide documentation for the Transport
-          Current.
+        * tao/OctetSeqC.h:
+        * tao/OctetSeqC.cpp:
+        * tao/diffs/OctetSeq.diff:
 
-        * tao/orbconf.h:
+          Fuzz removal.
 
-          Enabled the Transport::Current feature by default, by defining
-          TAO_HAS_TRANSPORT_CURRENT.  In recognition that this is very
-          likely an overkill for everybody but the few interested in the
-          feature, the plan is to reverse this default before the next
-          beta release.
+Wed May 17 19:35:09 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/ORB_Core.h:
-        * tao/Profile_Transport_Resolver.h:
-        * tao/Profile_Transport_Resolver.inl:
-        * tao/Profile_Transport_Resolver.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
 
-          Replaced the "naked" Transport pointer with a smart-pointer-like
-          TAO::Transport_Selection_Guard, which has ctor and dtor that
-          help keep a TSS-based stack of Transport instances when
-          TAO_HAS_TRANSPORT_CURRENT is defined as 1. If the latter is
-          disabled, the TSS access overhead goes away.
+          In the generated code for setting the member value,
+          removed the parentheses from the constructor call in
+          ACE_NEW, if the member type is a fixed-size IDL struct.
+          These parens were producing a warning on one of the
+          scoreboard's VC 7.1 builds, due to a behavior change
+          in the compiler. This behavior change is to initialize
+          PODs (for which an IDL fixed struct qualifies) to the
+          default value without requiring the parens denoting
+          a default constructor call.
 
-        * tao/TAO_Server_Request.h:
-        * tao/TAO_Server_Request.inl:
-        * tao/TAO_Server_Request.cpp:
+        * tests/Bug_2234_Regression/server.cpp:
+        * tests/OBV/ValueBox/client.cpp:
 
-          Similar to the client-side code in Profile_Transport_Resolver,
-          this is where the server-side pieces of Transport Current
-          functionality plugs in. A Server_Request encapsulates knowledge
-          about the specific Transport on which an invocation
-          arrived. Adding a Transport_Selection_Guard instance member
-          (transport_selection_guard_) to keep track of the current
-          Transport, using TSS. This overhead is only present when
-          TAO_HAS_TRANSPORT_CURRENT is defined as 1.
+          Made changes in hand-written client and server code in TAO/tests
+          similar to the changes in IDL compiler generated code above.
 
-        * tao/TSS_Resources.h:
-        * tao/TSS_Resources.cpp:
+Wed May 17 19:09:36 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
-          Adding a Transport_Selection_Guard member pointer tsg_, which
-          when Transport Current feature is enabled, always points to the
-          most-recently selected (incoming or outgoing) Transport in the
-          current thread. This overhead is only present when
-          TAO_HAS_TRANSPORT_CURRENT is defined as 1.
+        Merged OCI's changes
+          "Fri May 12 21:59:41 UTC 2006  Yan Dai  <dai_y@ociweb.com>"
 
-        * tao/Transport.h:
-        * tao/Transport.inl:
-        * tao/Transport.cpp (send_message_shared_i):
+        * TAO/tao/Intrusive_Ref_Count_Handle_T.inl:
 
-          Introduced a new class TAO::Transport::Stats and added a member
-          pointer of that base type to the declaration of Transport. It
-          can only be non-null when Transport Current is enabled, whereby
-          it points to a TAO::Transport::Stats.  The send_message_shared_i
-          has been modified to update the statistics.  Also added the
-          requisite mutators and successor's.
+          Fixed a potential memory leaks in operator==(T*) function.
+          The memory leak could happen when this assignment operator
+          is used to assign the same instance.
 
-        * tao/Transport_Selection_Guard.h:
-        * tao/Transport_Selection_Guard.cpp:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp:
 
-          The implementation of the TSS-pointed, stack-like chain of
-          Transport instances selected (potentially, in multiple nested up
-          calls). The TSS overhead is only present when
-          TAO_HAS_TRANSPORT_CURRENT is defined as 1, otherwise the methods
-          are trivial.
+          Made the TP_Dispatchable_Visitor object reset() called after
+          the request is dispatched. This would avoid the delay deletion
+          of the request and its referenced objects.
 
-        * tao/tao.mpc:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
 
-          Updated to include the new source files.
+          Made the transport object in TAO_ServerRequest be reference
+          counted by the CSD. Increment the reference counter when the
+          TAO_ServerRequest is cloned, and decrement the reference counter
+          when the server request is destroyed. This would avoid crash
+          when the transport object is destroyed but CSD has not finished
+          dispatching the request.
 
-        * tao/TransportCurrent:
+        Merged OCI's changes
+          "Thu Apr 20 13:29:44 2006  Ciju John  <john_c@ociweb.com>"
 
-          A new directory for the Transport Current implementation to
-          inhabit.  Currently, there are two implementations: a generic
-          one and an IIOP-specific one. The reason these two share this
-          location is that the generic Current is too generic to be useful
-          on its own, while providing almost all the required
-          infrastructure for the IIOP-specific one.
+          Made an SSLIOP endpoint value of 'iiop://:/ssl_port=xyz' listen
+          on all available network interfaces instead of listening on a
+          specific IP address. These changes make the 'iiop://:/ssl_port=xyz'
+          and 'iiop:///ssl_port=xyz' have same semantics.
 
-        * tao/TransportCurrent/Current_Impl.h:
-        * tao/TransportCurrent/Current_Impl.cpp:
+        * tao/IIOP_Acceptor.h :
+        * tao/IIOP_Acceptor.cpp :
 
-          The generic Current implementation.
+          Refactored the address parsing code into a new method
+          'parse_address'.
 
-        * tao/TransportCurrent/Current_Loader.h:
-        * tao/TransportCurrent/Current_Loader.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp (open):
 
-          A loader, to handle registration with the Service repository.
+          Use TAO_IIOP_Acceptor::parse_address() to initialize
+          ACE_INET_Addr.
 
-        * tao/TransportCurrent/Current_ORBInitializer.h:
-        * tao/TransportCurrent/Current_ORBInitializer.cpp:
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
-        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
+Wed May 17 18:47:22 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          An ORB initializer, to handle the registration of the name for
-          which resolve_initial_references() will return you a Current
-          pointer.
+        * tests/AMH_Oneway/server.cpp:
 
-        * tao/TransportCurrent/IIOP_Current_Impl.h:
-        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+          Fix for an error in the construction of the test. This error is
+          a result of using a stack based servant, as well as a stack
+          based helper ORB-running helper class. The main for this test
+          instantiated the helper on the stack first, then the servant. It
+          was done in this order so that the servant could obtain a
+          reference to the helper's ORB. However, stack based objects are
+          destroyed in reverse order, meaning that the servant instance
+          was destroyed before the helper's instance. Thus the POA in the
+          helper ended up with a stale pointer to a prematurely deleted
+          servant when it came time to do an orderly shutdown.
 
-          The IIOP-specific Current implementation, complete with its own
-          derivative of TAO::Transport::Stats.
+          There were several options for cleaning this up, the servant
+          could have been allocated on the stack and have all reference
+          but the POA's removed, the servant's destructor could have
+          deactivated itself from the POA, or an explicit cleanup method
+          could be added to the helper class so the main could force the
+          proper order of desctruction. I chose this last option since the
+          main was in charge of determining the order of creation.
 
-        * tao/TransportCurrent/IIOP_Current_Loader.h:
-        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
+Wed May 17 16:34:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          A loader, to handle registration with the Service repository.
+        * tests/AMI_Buffering/AMI_Buffering.h:
 
-        * tao/TransportCurrent/IIOP_Transport_Current.h:
+          Fix scoping for new nested class used to avoid spurious comm
+          fail exceptions. This fix resolves build fails that only affect
+          the BCB compiler.
 
-          A client-side interface for the IIOP-specific Transport Current.
+Wed May 17 14:11:35 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/TransportCurrent/TC.idl:
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+        * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h:
 
-          A client-side interface for the generic Transport Current.
+          Added generation of an anonymous namespace inside the
+          TAO::TypeCode namespaces already generated, for
+          typecodes ggenerated for anonymous types (sequences,
+          arrays, and bounded (w)stringts). This change prevents
+          a multiple definition link error with a typecode
+          generated for an identical type in another translation
+          unit. The exisiting generated ifdef guards prevent
+          the same error within the same translation unit.
+          Thanks to Ossmama Othman <ossama.othman@symantec.com>
+          for suggesting the fix. This fix closes [BUGID:2521].
 
-        * tao/TransportCurrent/TC.mpc:
+          Also removed many lines of commented out code from
+          this file.
 
-          We need this to actually build the generic TC into a
-          self-contained service object library (DLL).
+Wed May 17 12:10:58 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tao/TransportCurrent/TC_IIOP.idl:
+        * tao/Bounded_Sequence_CDR_T.h:
 
-          A client-side interface for the IIOP-specific Transport Current.
+          Reverting this change, it didn't work.
+          Mon May 15 22:25:23 UTC 2006  Phil Mesnier <mesnier_p@ociweb.com>
 
-        * tao/TransportCurrent/TC_IIOP.mpc:
+           * tao/Bounded_Sequence_CDR_T.h:
+             Added explicit include to satisfy the HP compiler.
 
-          We need this to actually build the IIOP-specific TC into a
-          self-contained service object library (DLL).
 
-        * tao/TransportCurrent/Transport_Current.h:
+Wed May 17 11:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Basic declarations.
+        * TAO_IDL/be/be_visitor_traits.cpp:
+          Added extra newline so that the zero method is on its own line
 
-        * tao/TransportCurrent/Transport_Current_Export.h:
+Wed May 17 09:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Library export helpers.
+        * tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc:
+          Simplified this mpc file
 
-        * tests/TransportCurrent:
+Tue May 16 19:08:49 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          A new directory for the Transport Current tests to inhabit.
+        * NEWS:
+          Add decription of new features/fixes.
+
+        * tao/BiDir_GIOP/BiDirGIOP.h:
+        * tao/CSD_Framework/CSD_Object_Adapter_Factory.h:
+        * tao/EndpointPolicy/EndpointPolicy.h:
+        * tao/EndpointPolicy/EndpointPolicy.cpp:
+        * tao/Messaging/Messaging_Loader.h:
+        * tao/PI_Server/PI_Server_Loader.h:
+        * tao/RTScheduling/RTScheduler_Loader.h:
+
+          Fix for certain static builds, notably VC71 on WinXP, for
+          libraries that depend on the Portable Interceptors library for
+          registering ORB Initializers.
+
+        * tests/Bug_2417_Regression/publisher_impl.cpp:
+
+          This test runs very long for what it is demonstrating. With the
+          underlying reference counting problem resolved, the server now
+          runs to completion. Since the test is using asynch connection
+          establishment and SYNCH_NONE oneways, there is no way for the
+          publisher to detect that the subscriber is gone until it makes a
+          synchronizing twoway call. The period between synch tests was so
+          long that on a slow machine the test would time out.
+
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+        * tao/OctetSeqC.cpp:
+        * tao/OctetSeqC.h:
+        * tao/diffs/OctetSeq.diff:
 
-        * tests/TransportCurrent/Framework:
+          Applying fixes to the problems still remaining in the versioned
+          namespace builds. Not all compilers found the problem in
+          Reconfig_Scheduler_T.cpp, but gcc 3.3.1 did. The OctetSeq change
+          might represent a candidate for a change to the IDL compiler,
+          but for now I think not, as octet sequences are treated as a
+          special case, having an explicit template instanciation provided
+          along with explicit equality operators.
 
-          A new directory for the test exercising the generic Transport Current.
+Tue May 16 14:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Current_Test.idl:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.h:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/Framework/Framework.mpc:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
-        * tests/TransportCurrent/Framework/README:
-        * tests/TransportCurrent/Framework/Server_Main.cpp:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Tester.cpp:
-        * tests/TransportCurrent/Framework/client-static.conf:
-        * tests/TransportCurrent/Framework/client.conf:
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/run_test.pl:
-        * tests/TransportCurrent/Framework/server-static.conf:
-        * tests/TransportCurrent/Framework/server.conf:
-        * tests/TransportCurrent/Framework/server.cpp:
-        * tests/TransportCurrent/Framework/simple.cpp:
+        * tests/Strategies/Strategies.mpc:
+        * tests/Bug_2134_Regression/Bug_2134_Regression.mpc:
+        * tests/Bug_2494_Regression/Bug_2494_Regression.mpc:
+          Simplified these mpc files
 
-        * tests/TransportCurrent/IIOP:
+Tue May 16 14:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          A new directory for the test exercising the IIOP-specific Transport Current.
+        * orbsvcs/orbsvcs/AV/TCP.cpp:
+          Const improvments and initialise some pointers with 0
 
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
-        * tests/TransportCurrent/IIOP/README:
-        * tests/TransportCurrent/IIOP/client_dynamic.conf:
-        * tests/TransportCurrent/IIOP/client_static.conf:
-        * tests/TransportCurrent/IIOP/run_test.pl:
-        * tests/TransportCurrent/IIOP/server_dynamic.conf:
-        * tests/TransportCurrent/IIOP/server_static.conf:
+        * orbsvcs/orbsvcs/AV/RTP.cpp:
+        * orbsvcs/orbsvcs/AV/sfp.cpp:
+          Use a CORBA::ULong to iterate through the TAO_AV_PolicyList
 
-Tue Dec 19 18:44:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue May 16 14:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * */Makefile.am:
+        * orbsvcs/orbsvcs/CosProperty.idl:
+          Corrected incorrect filename in the header of this file
 
-          Baseline regeneration to match recent MPC changes.
+Tue May 16 12:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Dec 19 15:29:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Asynch_Queued_Message.cpp:
+        * tao/Synch_Queued_Message.cpp:
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+        * tao/Object.cpp:
+        * tao/Profile.cpp:
+        * tao/IIOP_Profile.cpp:
+        * tao/Strategies/DIOP_Acceptor.cpp:
+        * tao/Strategies/DIOP_Endpoint.cpp:
+          Const improvements
 
-        * tests/Bug_2345_Regression/Bug_2345_Regression.mpc:
-        * tests/Collocation_Opportunities/Collocation_Opportunities.mpc:
-        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc:
-        * tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc:
-        * tests/InterOp-Naming/InterOp-Naming.mpc:
-        * tests/MT_BiDir/MT_BiDir.mpc:
-        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
-        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
-        * tests/NestedUpcall/Triangle_Test/TT.mpc:
-        * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc:
-        * tests/POA/Identity/Identity.mpc:
-        * tests/POA/Object_Reactivation/Object_Reactivation.mpc:
-        * tests/POA/Persistent_ID/Persistent_ID.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
+        * tao/GIOP_Message_State.cpp:
+          Improved error message when the GIOP header can't be parsed
 
-Tue Dec 19 12:32:41 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+        * tao/ORB.cpp:
+          Initialise pointer with 0.
+
+        * tao/PortableServer/PolicyS_T.h:
+          Use true instead of 1
+
+Tue May 16 05:22:15 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Connector.cpp:
+
+          This is a potential fix for the Bug 2417 flaw. The problem is
+          that when using nonblocking connects, in conjunction with asynch
+          invocations, it is possible for a transport to be returned by
+          the connector even though the network connection has not
+          completed. For asynchronous invocations using the SYNCH_NONE
+          policy, this is appropriate, as request messages may be queued
+          for delivery if/when the connection completes.
+
+          Bug 2417 describes a scenario where such a nonblocking
+          connection attempt fails, but the actual failure happens after
+          the transport has already been returned to the caller. This
+          causes a problem because the underlying ACE connector framework
+          relies on "borrowing" the reference to the connection handler
+          during the time it is waiting for connections to complete or
+          fail. For blocked connects this is fine because either the
+          transport will be returned to the caller associated with a
+          completely established connection, or a failure will occur.
+
+          The issue for nonblocking connects is that when a transport is
+          returned associated with a pending connection, the existing
+          transport connector and protocol-specific connector end up
+          associating to referrers to the same connection handler, without
+          incrementing the reference count. The two are the transport
+          being returned and the ACE_NonBlock_Connection_Handler that is
+          actually registered with the reactor waiting for success or
+          failure on the pending connection.
+
+          When a connection completes OK, the NBCH surrenders its
+          reference to the connection handler, thus restoring parity, as
+          the transport and/or cache entry will still hold the remaining
+          references, and the count is OK. But when the connection fails,
+          the base connector ends up calling close() on the connection
+          handler which in turn decrements the reference count. This then
+          sets the stage for a later crash from an apparent double delete.
+
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/Transport_Connector.cpp:
 
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
-
-          gcc gets confused when a static function is forward declared.  It
-          complains that the function is declared but never defined.  The
-          sed portion of the yacc regeneration rule just removes the forward
-          declaration (which was unnecessary anyway).
-
-Tue Dec 19 11:35:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/BiDirectional/BiDirectional.mpc:
-        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
-        * tests/BiDirectional_MultipleORB/destroy.mpc:
-        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
-
-Tue Dec 19 11:32:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc:
-        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
-        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
-        * performance-tests/Pluggable/Pluggable.mpc:
-        * performance-tests/POA/Create_Reference/Create_Reference.mpc:
-        * performance-tests/POA/Demux/Demux.mpc:
-        * performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
-
-Tue Dec 19 11:27:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/ImR/Advanced/Advanced.mpc:
-        * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc:
-        * orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc:
-        * orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc:
-        * orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
-        * orbsvcs/tests/ImplRepo/ImplRepo.mpc:
-        * orbsvcs/tests/ImplRepo/scale/scaletest.mpc:
-        * orbsvcs/tests/Property/Property.mpc:
-        * orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
-        * orbsvcs/Time_Service/Time_Service.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
-
-Tue Dec 19 11:19:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
-        * examples/Event_Comm/Event_Comm.mpc:
-        * examples/Logging/Logging.mpc:
-        * examples/Persistent_Grid/Persistent_Grid.mpc:
-        * examples/PluggableUDP/tests/Basic/Basic.mpc:
-        * examples/PluggableUDP/tests/Performance/Performance.mpc:
-        * examples/Quoter/Quoter.mpc:
-        * examples/Simple/bank/bank.mpc:
-        * examples/Simple/echo/echo.mpc:
-        * examples/Simple/grid/grid.mpc:
-        * examples/Simple/time/time.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
-
-Mon Dec 18 19:34:42 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
-
-          Added missing typecodes for supporting CORBA::ULongLong and
-          CORBA::LongLong.
-
-Mon Dec 18 12:50:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Utils/ORB_Manager.{cpp,h}:
-          Removed one init_child_poa method, using a default argument
-          we don't need two seperate ones. Fixed compile errors with
-          CORBA/e micro
-
-Mon Dec 18 10:30:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+          Added some comments and cleaned up some whitespace.
 
-        * tests/Portable_Interceptors/PICurrent/client.cpp:
-        * tests/Portable_Interceptors/PICurrent/server.cpp:
-        * tests/Portable_Interceptors/PICurrent/run_test.pl:
+Mon May 15 22:25:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Bugfix Bugzilla 2510 & 2547 - multi-threading issues for PICurrent.
-          Multi-Threaded servers take longer to shutdown. Increase the
-          length of kill time to wait for the server shutdown. Also
-          provide sleep(1) before orb->destroy() to allow comms to
-          proceed at shutdown (precausion only).
+        * tao/Bounded_Sequence_CDR_T.h:
+          Added explicit include to satisfy the HP compiler.
 
-Fri Dec 15 18:17:36 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+Mon May 15 18:17:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Updating the test to make it behave appropriately for
-          multi-threaded and for single-threaded (thread unsafe?)
-          configurations.
+        * tao/Codeset_Manager_Factory_Base.h:
+        * tao/Codeset_Manager_Factory_Base.cpp:
+        * tao/PortableServer/Acceptor_Filter_Factory.h:
+        * tao/PortableServer/Acceptor_Filter_Factory.cpp:
 
-        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
-        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
-        * tests/ORB_Local_Config/ORB_Local_Config.mwc:
+          Moved the static initializer from inside the .cpp to the header
+          file. This change was necesitated by the VC7.1 static build that
+          was apparently skipping over the static initializer if it wasn't
+          in the .h.
 
-Fri Dec 15 17:26:59 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+Mon May 15 13:28:01 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/IDL_Test/IDL_Test.mpc:
+        * tests/AMI_Buffering/AMI_Buffering.h:
+        * tests/AMI_Buffering/AMI_Buffering.cpp:
+        * tests/AMI_Buffering/client.cpp:
 
-          Fixed previous change to this file in
+          The tests still fail on a lot of machines with a series of
+          COMM_FAIL exceptions being reported. These are due to a nesting
+          problem within the server, since it is receiving requests from
+          the client and also making requests to the admin. What happens
+          is that with the asynchronous calls, a whole bunch of requests
+          are sent to the server, and before it gets a chance to receive
+          all the replies from the admin, the client sends a shutdown.
+          This immediately closes the server's client-side connection to
+          the admin, and if any replies were pending, those are lost,
+          causing the comm fails. I've also added a log message reporting
+          the maximum nesting level attained by the server.
 
-          Wed Dec 13 18:16:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          The client now delegates responsibility of shutting down the
+          admin to the server as another way of eliminating any races that
+          might cause spurious error reports.
 
-          that was excluding the *A.cpp file from the build.
+Mon May 15 12:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Dec 15 16:32:35 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Unbounded_Octet_Sequence_T.h:
+          Fixed compile problem when TAO_NO_COPY_OCTET_SEQUENCES is defined
+          to 0
 
-        * tests/ORT/Makefile.am:
-        * tests/Objref_Sequence_Test/Makefile.am:
-        * tests/Ondemand_Write/Makefile.am:
-        * tests/Oneway_Buffering/Makefile.am:
-        * tests/Oneways_Invoking_Twoways/Makefile.am:
+Mon May 15 09:59:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Regenerated.
+        * tao/Unbounded_Octet_Sequence_T.h:
 
-        * tests/ORT/ORT.mpc:
-        * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc:
-        * tests/Ondemand_Write/Ondemand_Write.mpc:
-        * tests/Oneway_Buffering/Oneway_Buffering.mpc:
-        * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc:
+          A potential solution to the namespace problem. This at least
+          works for the gcc/linux build.
 
-          Split out IDL compilation into separate MPC project.
+Mon May 15 02:50:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Thu Dec 14 16:58:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/AMI_Buffering/client.cpp:
+        * tests/Oneway_Buffering/client.cpp:
 
-        * tests/MProfile/Makefile.am:
+          Add the header for defining sleep for the platforms that don't
+          happen to get it indirectly.
 
-          Regenerated.
+Sun May 14 13:32:33 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/MProfile/MProfile.mpc:
+        * tests/AMI_Buffering/client.cpp:
+        * tests/Oneway_Buffering/client.cpp:
 
-          Changed IDL project to inherit from iormanip.
-          Changed Client project to not include testS.cpp.
+          Minor change to insert a pause after killing the server but
+          before killing the admin. This gives the server a moment to
+          flush out any messages it wants to send to the admin. Without
+          this pause, the test occasionally reports spurious comm failures
+          that cause the scoreboard to count the test as failed.
 
-Thu Dec 14 16:18:00 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/Connection_Timeout/client.cpp:
 
-        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
+          Added more information to failure output.
 
-          Fix typo in IDL project name that broke build dependencies.
+Sat May 13 22:07:04 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Thu Dec 14 16:10:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/LF_CH_Event.h:
+        * tao/LF_CH_Event.cpp:
+        * tao/Transport_Connector.cpp:
 
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+          This is a fix for intermittent timeout problems when using
+          asynch connections. Some tests, most notably the AMI_Buffering
+          timeout test, randomly fail in that the client seems to just
+          stop dead. I found that this failure occured when using
+          nonblocking connects with at least 2 threads, one of which is
+          invoking ORB::run while the other is trying to connect.
+
+          The problem is that an asynch connection might cause the
+          transport to cached in an unconnected state, relying on a
+          subsequent connection request to enter the connection wait
+          strategy and complete the connection. When using the leader
+          follower wait strategy, a non-blocking connect will "poll" by
+          setting the timeout value to be ACE_Time_Value::zero. A race
+          could occur when the other thread actually handles the
+          connection completion, but after the interested thread starts to
+          enter the leader-follower. In this case the timeout of zero
+          causes the LF to change the connection handler's state to
+          TIMEOUT, but this was not detected as an error condition. Thus
+          the LF_Event relating to the connection completion was never
+          successful or an error and the waiting thread became the leader
+          and was then stuck.
+
+          This fix works by first treating the TIMEOUT state as an error,
+          to break out of the LF loop, then the connector will reset the
+          timeout state if that is appropriate. Finally, a second error in
+          the connector is fixed where the transport's register_handler
+          method return value was incorrectly tested.
+
+        * tests/AMI_Buffering/client.cpp:
+
+          Adjusted the timeout values a bit. On a sufficiently fast
+          computer, it is possible for the sender to overflow the TCP
+          buffers thus taking too long to flush and spuriously reporting
+          errors.
+
+Sat May 13 14:34:23 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
+
+          Removing the use of ACE_OS::unlink() since it is causing
+          unresolved link errors on windoze. Using alternative IOR file
+          truncation method to get rid of "stale" IOR files from previous
+          executions.
+
+Fri May 12 14:00:17 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl:
+        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
+
+          Updated the test to account for the case where the server may
+          not have completed writing out its IOR, by the time the client
+          tries to use it to get an object reference. Added ACE_TEXT where
+          appropriate.
+
+Thu May 11 21:13:22 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.h:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+
+          Having a lock_ as a global static makes this code subject to the
+          whim of the specific compiler implementation and library
+          ordering. It is up to the compiler to decide the order in which
+          our instance is initialized and destroyed. Typically, this
+          becomes a problem when a code that depends on that instance
+          finds that the runtime has already destroyed it. The scenario
+          plays almost always in the process shutdown code, after main()
+          exits (which is a lot of fun to debug :).  The change replaces
+          the static class member with static-local variable, defined
+          within a static member function. C++ guarantees that the local
+          static variable will be initialized at the first method
+          invocation.
+
+        * tao/ORB_Core.cpp:
+
+          Reversing a changes, introduced by this:
+          Wed Apr 26 20:21:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          I had incorrectly assumed that the same pattern of dynamic
+          loading of factories applies to all factories. In fact many of
+          them are optional and their usage is predicated on having a svc
+          conf file, having their library statically linked. This change
+          removes the overly aggressive attempts to load such services and
+          the incorrect usage of TAO_AS_STATIC_LIBS macro..
+
+Thu May 11 19:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Reverted the change below, it breaks some gcc builds, have to figure
+        out another change.
+
+        Thu May 11 13:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Unbounded_Octet_Sequence_T.h:
+          Moved equal and not equal operators for the octet sequence to
+          the TAO namespace, this fixes the build error in the vc71
+          namespace build.
 
-          Regenerated.
+Thu May 11 09:22:10 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-Thu Dec 14 13:52:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+        * performance-tests/Throughput/Receiver.cpp (done),
+        * performance-tests/Throughput/client.cpp (main): Changed
+          division by 10000000 to division by 1000000.  Thanks to
+          Jason Zhao <jason.zhao at lmco dot com>.
 
-        * tao/PI/PICurrent.cpp:
-        * tao/PI/PICurrent.h:
-        * tests/Portable_Interceptors/PICurrent/run_test.pl:
+Thu May 11 13:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Bugfix Bugzilla 2510 & 2547 - multi-threading issues for PICurrent.
-          Bugzilla 2552 - PICurrent_Impl, needs to be checked for
-          multi-threaded lazy copying. (Still work to do.)
+        * tests/Bug_1254_Regression/BlobServer.h:
+        * tests/Bug_1254_Regression/client.cpp:
+          Fixed casing of includes
 
-Thu Dec 14 13:21:46 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+Thu May 11 13:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * tao/Unbounded_Octet_Sequence_T.h:
+          Moved equal and not equal operators for the octet sequence to
+          the TAO namespace, this fixes the build error in the vc71
+          namespace build.
 
-          Modified the rule to output the end version block at the end.
+        * tests/OBV/Truncatable/client.cpp:
+          Added missing string_dup calls, fixes crashing of this test
+          with Borland C++
 
-        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
-        * orbsvcs/orbsvcs/Trader/constraint.y:
+Thu May 11 10:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed the end version block in the .y file and regenerated.
+        * tao/Generic_Sequence_T.h:
+          Small layout change
 
-Thu Dec 14 08:47:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu May 11 07:19:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
 
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h:
+        * tests/Bug_1254_Regression/*
+          New regression for bug 1254
 
-          Align subtle differences (like using an explicit this-> (or not)
-          for invoking methods and accessing member variables.  This makes
-          diff betweens between the wrapper classes highlight the real and
-          substantial differences.  This too should make future maintenance
-          easier.
+        * tao/Unbounded_Octet_Sequence_T.h:
+          Fixed a bug in the octet sequence when used as inout argument and
+          when shrinking the lenght while a message block was being used
+          the full message block was send back, not the smaller length.
+          We now do a copy of the data to really make sure we don't
+          modify the mb incorrectly. Thanks to Peter van Merkerk
+          <Peter dot van dot Merkerk at meco dot nl> and
+          Marc Walrave <marc dot walrave at meco dot nl> for reporting this.
+          This fixes bugzilla bug 1254.
 
-          Removed #if 0'd out code that deactivated factory objects in the
-          shutdown() method.  This was originally #if'd out because the
-          factory objects aren't activated on the root POA (the factory
-          creates a POA with PERSISTENT lifespan policy for the factory
-          object activation, a POA that is not accessible from outside the
-          factory object).  While we could refactor things to gain access
-          to the factory POA, it really doesn't buy us much as the next
-          thing is done is the ORB is shutdown(), which will delete the
-          POAs, which will delete the objects, etc.
+Wed May 10 20:13:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.h:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/PI.cpp:
 
-          Overhaul the RTEvent_Logging_Service class to follow the idiom
-          used by the other three Logging Service implementations.  It had
-          lots of dead (commented out and/or #if 0'd) code for setting up
-          a scheduler; yet was missing support for supressing binding the
-          log factory to the naming service and spinning up a thread pool
-          for ORB threads.  Aligning this should make future maintenance
-          easier.
+          My change from last night (04:26:14 UTC) swung the pendulum too
+          far back in the other direction. I discovered that once again
+          some dynamic PI tests were breaking. I've rectified this by
+          putting Iliyan's code back in ORBInitialiser_Registry_Impl but
+          with a !TAO_AS_STATIC_LIBS guard around the code to avoid the
+          redundant processing that might occur with static libs.
 
-          Split out main() into new file RTEvent_Logging_Server.cpp.
+Wed May 10 17:21:26 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Thu Dec 14 08:27:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/EndpointPolicy/Endpoint_Value_Impl.h:
 
-        * tests/OBV/Any/Makefile.am:
-        * tests/OBV/Factory/Makefile.am:
-        * tests/OBV/Forward/Makefile.am:
-        * tests/OBV/TC_Alignment/Makefile.am:
-        * tests/OBV/Truncatable/Makefile.am:
-        * tests/OBV/ValueBox/Makefile.am:
+          I missed committing this with the other versioned namespace
+          changes.
 
-          Regenerated.
+Wed May 10 11:49:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/OBV/Any/OBV_Any.mpc:
-        * tests/OBV/Factory/OBV_Factory.mpc:
-        * tests/OBV/Forward/OBV_Forward.mpc:
-        * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
-        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
-        * tests/OBV/ValueBox/valuebox.mpc:
+        * tao/PortableServer/Acceptor_Filter_Factory.h:
+        * tao/PortableServer/POAManagerFactoryC.h:
+        * tao/PortableServer/POAManagerFactoryC.cpp:
 
-          Changed IDL projects to inherit from valuetype, to
-          avoid suppressing typecodes and anys.
+          Cleaning up Versioned namespace related issues.
 
-Thu Dec 14 07:01:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Wed May 10 04:26:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/MProfile/Makefile.am:
-        * tests/MProfile_Connection_Timeout/Makefile.am:
-        * tests/No_Server_MT_Connect_Test/Makefile.am:
-        * tests/OBV/Any/Makefile.am:
-        * tests/OBV/Factory/Makefile.am:
-        * tests/OBV/Forward/Makefile.am:
-        * tests/OBV/TC_Alignment/Makefile.am:
-        * tests/OBV/Truncatable/Makefile.am:
-        * tests/OBV/ValueBox/Makefile.am:
+        * tao/ORB_Core.cpp:
 
-          Regenerated.
+          Removed the agressive loading of the IORInterceptor adaptor
+          factory. It truely is optional, thus its failure to load is not
+          an error. At least not an error in the ORB core.
 
-        * tests/MProfile/MProfile.mpc:
-        * tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc:
-        * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc:
-        * tests/OBV/Any/OBV_Any.mpc:
-        * tests/OBV/Factory/OBV_Factory.mpc:
-        * tests/OBV/Forward/OBV_Forward.mpc:
-        * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
-        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
-        * tests/OBV/ValueBox/valuebox.mpc:
+        * tao/PI/ORBInitializer_Registry_Impl.h:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/PI.h:
+        * tao/PI/PI.cpp:
+        * tao/PI/PolicyFactory_Loader.h:
+        * tao/PI/PolicyFactory_Loader.cpp:
 
-          Split out IDL compilation into separate MPC project.
+          Reverted most of the changes used to resolve a circular
+          dependency problem with the PI initialization. The problem is
+          that the initial fix then broke the static builds. The solution
+          of using TAO_AS_STATIC_BUILDS is a reasonable compromise as it
+          allows dynamic builds to not get caught in a circular
+          initialization situation, but lets static builds get the
+          initialization they need.
 
-        * tests/IDL_Test/Makefile.am:
+Tue May  9 19:05:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Regenerated.
+        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+          Added -GT to the idlflags
 
-Wed Dec 13 18:16:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+Tue May  9 16:32:01 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * tests/IDL_Test/IDL_Test.mpc:
+        * tao/ORB_Core.cpp:
 
-          Added -GT to all IDL compiler command lines, since generation
-          of tie classes is no longer the default behavior, and we
-          want this test to cover it. Also added a block for
-          Template_Files, so the generated *S_T.cpp files will be
-          displayed in a separate folder in Visual Studio.
+          Added a clarifying comment.
 
-Wed Dec 13 16:49:05 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/TAO_Internal.cpp:
 
-        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/tie_sh.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
+          Fixing a problem in processing -ORBSvcConf command-line
+          options. Both the process-wide and the ORB-local service
+          gestalts were processing configuration files. This was causing
+          the loading of the default svc.conf file, even when another one
+          had been specified by -ORBSvcConf. The fix is to give the
+          process-wide gestalt a chance to load the svc conf file, if it
+          is being initialized for the first time.
 
-          Changed code generation for operation parameters in
-          tie class declarations to omit the parameter name. If
-          this name happened to be "T", some HP compilers would
-          have trouble disambiguating it from the tie class
-          template parameter typename. In the tie class operation
-          body, where the parameter name must be used, there is
-          already a code generation mechanism in place to avoid
-          the name clash. Thanks to Simon Massey <Simon.Massey@prismtech.com>
-          for reporting the problem.
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
 
-Wed Dec 13 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Minor updates.
 
-        * orbsvcs/tests/Bug_1630_Regression/test.mpc:
-          Don't build with CORBA/e
+        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
 
-Wed Dec 13 13:05:21 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+          Updated the tests to eliminate some possibilities for TRANSIENT
+          exceptions.
 
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+Tue May  9 11:37:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added ACE_NOTREACHED around to returns that coult not possibly be
-          reached.
+        * docs/tutorials/Quoter/idl/Quoter_idl.mpc:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * examples/POA/TIE/Makefile.am:
+        * docs/tutorials/Quoter/idl/Makefile.am:
+          Add -GT to the idlflags
 
-Wed Dec 13 12:43:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+Tue May  9 07:46:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * tao/String_Alloc.cpp:
+          Small const fix, simplified CORBA::string_dup a little bit
 
-          Added search and replacement to both Constraint_l and Contraint_y
-          rules to avoid build warnings about conversion from long to int.
+Tue May  9 07:36:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+        * TAO_IDL/be/be_global.cpp:
+          Don't generate the TIE files (_S.*) by default anymore. The
+          commandline option -Sc has been removed, this suppressed the
+          generation of these files. The new option -GT has been added,
+          if you need the TIE files, use the -GT option when compiling
+          your idl files. This safes disk space on all systems and on
+          slower machines the builds run then faster. Fixes bug 2525
 
-          Regenerated.
+        * docs/compiler.html:
+          Removed -Sc, added -GT
 
-        * orbsvcs/orbsvcs/Trader/Interpreter.cpp:
+        * NEWS:
+          Mention the TIE behaviour change
 
-          Added a static_cast to avoid build warnings about conversion from
-          long to int.
+        * examples/POA/TIE/POA_TIE.mpc:
+          Added -GT to the idlflags
 
-Wed Dec 13 07:19:26 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/*.pidl:
+          Removed the -Sc flag in the regeneration instructions
 
-        * tests/Server_Connection_Purging/Makefile.am:
-        * tests/Server_Leaks/Makefile.am:
-        * tests/Single_Read/Makefile.am:
-        * tests/Smart_Proxies/Benchmark/Makefile.am:
-        * tests/Smart_Proxies/Makefile.am:
-        * tests/Smart_Proxies/On_Demand/Makefile.am:
-        * tests/Smart_Proxies/Policy/Makefile.am:
-        * tests/Smart_Proxies/dtor/Makefile.am:
-        * tests/Stack_Recursion/Makefile.am:
+Mon May  8 15:52:31 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Regenerated.
+        * TAO_IDL/be_visitor_union_branch/cdr_op_cs.cpp (visit_enum):
 
-        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
-        * tests/Server_Leaks/Server_Leaks.mpc:
-        * tests/Single_Read/Single_Read.mpc:
-        * tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc:
-        * tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc:
-        * tests/Smart_Proxies/Policy/SP_Policy.mpc:
-        * tests/Smart_Proxies/Smart_Proxies.mpc:
-        * tests/Smart_Proxies/dtor/dtor.mpc:
-        * tests/Stack_Recursion/Stack_Recursion.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Wed Dec 13 06:53:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
-        * docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc:
-          Don't build with CORBA/e micro
-
-Wed Dec 13 06:53:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IFR_Client_Adapter.h:
-          Fixed compile problem with CORBA/e
-
-Tue Dec 12 21:56:03 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TAO_Internal.cpp (instance):
-
-          This change eliminates unnecessary caching of the
-          TAO_Ubergestalt_Ready_Condition, which used to cause problems
-          with accessing stale memory. My thanks goes to Johnny Willemsen
-          and Chad Elliott.
-
-Tue Dec 12 17:34:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Explicit_Event_Loop/Makefile.am:
-        * tests/Exposed_Policies/Makefile.am:
-        * tests/Faults/Makefile.am:
-        * tests/File_IO/Makefile.am:
-        * tests/Forwarding/Makefile.am:
-        * tests/Hello/Makefile.am:
-        * tests/IPV6/Makefile.am:
-        * tests/InterOp-Naming/Makefile.am:
-        * tests/Leader_Followers/Makefile.am:
-        * tests/LongUpcalls/Makefile.am:
-        * tests/MProfile_Forwarding/Makefile.am:
-        * tests/MT_BiDir/Makefile.am:
-        * tests/MT_Client/Makefile.am:
-        * tests/MT_Server/Makefile.am:
-        * tests/MT_Timeout/Makefile.am:
-        * tests/Multiple/Makefile.am:
-        * tests/Multiple_Inheritance/Makefile.am:
-        * tests/Muxed_GIOP_Versions/Makefile.am:
-        * tests/Muxing/Makefile.am:
-        * tests/Native_Exceptions/Makefile.am:
-        * tests/NestedUpcall/MT_Client_Test/Makefile.am:
-        * tests/NestedUpcall/Simple/Makefile.am:
-        * tests/NestedUpcall/Triangle_Test/Makefile.am:
-        * tests/Nested_Event_Loop/Makefile.am:
+          Added code generation to initialize an enum member of a
+          union when it is declared for demarshaling. This change
+          eliminates warnings in gcc 4.0.2 and possibly other
+          compilers.
 
-          Regenerated.
+Mon May  8 10:06:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
 
-        * tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc:
-        * tests/Exposed_Policies/Exposed_Policies.mpc:
-        * tests/Faults/Faults.mpc:
-        * tests/File_IO/File_IO.mpc:
-        * tests/Forwarding/Forwarding.mpc:
-        * tests/Hello/Hello.mpc:
-        * tests/IPV6/IPV6_Hello.mpc:
-        * tests/InterOp-Naming/InterOp-Naming.mpc:
-        * tests/Leader_Followers/Leader_Followers.mpc:
-        * tests/LongUpcalls/LongUpcalls.mpc:
-        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
-        * tests/MT_BiDir/MT_BiDir.mpc:
-        * tests/MT_Client/MT_Client.mpc:
-        * tests/MT_Server/MT_Server.mpc:
-        * tests/MT_Timeout/MT_Timeout.mpc:
-        * tests/Multiple/Multiple.mpc:
-        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
-        * tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc:
-        * tests/Muxing/Muxing.mpc:
-        * tests/Native_Exceptions/Native_Exceptions.mpc:
-        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
-        * tests/NestedUpcall/Simple/Simple.mpc:
-        * tests/NestedUpcall/Triangle_Test/TT.mpc:
-        * tests/Nested_Event_Loop/Nested_Event_Loop.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Tue Dec 12 17:28:14 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * docs/Options.html:
+        * docs/ORBEndpoint.html:
+        * docs/INS.html:
+          Added IPv6 specific info regarding endpoint and corbaloc
+          definitions.
+          Added some links for easier crossreferencing.
 
-        * configure.ac:
+Mon May  8 09:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Configure Makefiles for new subdirectories.
+        * tests/Hello/run_test.pl:
+          Added support for a -debug commandline arugment, if this is
+          passed when starting this script then -ORBDebugLevel 10 is
+          passed to client and server.
 
-        * orbsvcs/tests/Makefile.am:
+Sun May  7 21:39:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-          Regenerate to descend into unit test subdirectory.
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
 
-        * orbsvcs/tests/unit/Trading/Interpreter/Makefile.am:
-        * orbsvcs/tests/unit/Trading/Makefile.am:
-        * orbsvcs/tests/unit/Makefile.am:
+          Removed a misplaced semicolon.
 
-          New Makefile.am's for trading service unit tests.
+Sun May  7 14:56:20 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-Tue Dec 12 17:24:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
 
-        * orbsvcs/orbsvcs/Makefile.am:
+          Removed semicolons after if() - cleaning the residue from
+          replacing the ACE_ASSERTs.
 
-          Regenerated.
+Sun May  7 06:59:54 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+        * tao/ORB_Core.cpp:
 
-          Don't include concurrency_export.h and concurrency_skel_export.h
-          in server library's MPC project.
+          Replaced 'new' with ACE_NEW.
 
-Tue Dec 12 16:13:34 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/ORB_Local_Config/Shared/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl:
+        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h:
 
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+          Minor edits and cleanup.
 
-          Use .in() to squelch conversion warning.
+Fri Apr 28 10:47:26 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-Tue Dec 12 15:05:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+        * tao/Stub.cpp: Added a #include of "tao/CDR.h" to support SunC++.
+          Thanks to Vladimir Panov <gbr at voidland dot org> for reporting
+          this.
 
-        * NEWS:
+Fri Apr 14 17:47:18 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-          Provided an overview of the following changes.
+        * docs/releasenotes/index.html: Updated the documentation to
+          include more pluggable protocols.  Thanks to Willie Chen
+          <wchen12 at ucla dot edu> for motivating this.
 
-        * orbsvcs/orbsvcs/CosTrading.mpc:
+Fri May  5 18:48:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Added a verbatim section to automate the regeneration of the lex
-          file for the Trader Server library.  Which includes running the
-          lex output through sed and then patching at the end.
+        * tao/TAO_Internal.cpp:
+        * tao/default_resource.cpp:
+          In addtion to the reorganization Iliyan did, it was discovered
+          that the codeset library was not getting properly
+          initialized. When the codeset negotiation feature was made
+          optional for footprint considerations, the loading of the
+          codeset library was put into the default Resource
+          Factory. However now that we have the potential for multiple
+          service repositories, it was no longer sufficient do such late
+          initialization of the codeset library. Doing so put it codeset
+          manager and default translators in the configuration context of
+          the first ORB, not in the global configuration context. Moving
+          the bootstrap loading of the Codeset library to TAO internals
+          resolves that. The -ORBNegotiateCodeset flag is still evaluated
+          making codeset loading optional. It will be loaded to the global
+          configuration context by the first ORB that needs it.
+
+Fri May  5 18:05:04 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
+        * tests/ORB_Local_Config/Limits/Test.cpp:
+        * tests/ORB_Local_Config/Separation/Test.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/ORB_Local_Config/Shared/Test.cpp:
+        * tests/ORB_Local_Config/Simple/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
+
+          Eliminating the use of ACE_ASSERT and replacing with if's and
+          ACE_ERROR. The ACE_ASSERT may cause an abort(), which will cause
+          resources to not be cleaned correctly on embedded targets like
+          VxWorks. Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for
+          clarifying this.
+
+        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h:
+
+          A little cleanup.
+
+Fri May  5 16:12:17 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/ORB_Core.cpp:
+        * tao/TAO_Internal.cpp:
 
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
+          The initialization of the additional services, which runs right
+          after the global repository initialization (open()) was supposed
+          to execute in the context of that same global repository. This
+          is necessary in case the initialization causes additional
+          services to be registered. Fixes a problem with
+          $TAO_ROOT/tests/RTCORBA/ORB_init.
 
-          Switched from using CORBA::Long/CORBA::ULong to
-          CORBA::LongLong/CORBA::ULongLong to support 64-bit integers.  The
-          union contains various integral types and to support both Long and
-          LongLong would be redundant.
+Fri May  5 11:26:42 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+        * tao/Asynch_Queued_Message.{h,cpp}:
+        * tao/Synch_Queued_Message.{h,cpp}:
+          Changed is_heap_allocated to a real bool so that it matches
+          the base class.
 
-          Added support dynamic sequences of CORBA::LongLong/
-          CORBA::ULongLong.
+        * tao/Unbounded_Octet_Sequence_T.h:
+          Small const improvment
 
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff:
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
-        * orbsvcs/orbsvcs/Trader/constraint.l:
+        * tao/GIOP_Message_Base.cpp:
+          Fixed typo in comment
 
-          Updated the {float} regular expression to allow negative values
-          for floating point numbers.
+        * tao/DynamicInterface/Request.h:
+          Removed commented out method
 
-          Added support for CORBA::LongLong and CORBA::ULongLong.  Since all
-          integers are stored as 64-bit values instead of 32-bit values two
-          conversion functions (trader_stroll and trader_stroull) are used
-          to convert text into CORBA::LongLong and CORBA::ULongLong.  They
-          are good candidates for moving into ACE as emulation for platforms
-          that do not natively support strtoll and stroull.
+Thu May  4 16:22:42 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-          Also, fixed an issue where negative integers were being stored and
-          compared as unsigned integers.
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h:
 
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
-        * orbsvcs/orbsvcs/Trader/Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Tokens.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
-        * orbsvcs/orbsvcs/Trader/constraint.y:
+          Regenerated the file to fix a problem with building the test in
+          static builds.
 
-          Switched the order of the TAO_SIGNED and TAO_UNSIGNED tokens which
-          are used by the TAO_Literal_Constraint to determine the widest
-          integral type.
+Thu May  4 13:36:00 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * orbsvcs/tests/Trading/TT_Info.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
 
-          Added a query to use a negative floating point number and a query
-          to use a number that would exceed the size of a CORBA::Long.
+          Eliminated a "magic" constant, used for the number of expected
+          services, because it can vary dependent on the particular TAO
+          configuration, like mincorba, static, etc.
 
-        * orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp:
-        * orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc:
-        * orbsvcs/tests/unit/Trading/Interpreter/run_test.pl:
+Thu May  4 08:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          This unit test exercises the lexer for literal constraints as well
-          as the comparison of various mixed literal constraints.
+        * tao/PI/ClientRequestInfo.cpp:
+          Fixed bug 2510 in such a way that TAO doesn't crash but it seems
+          we then miss some functionalify. The reporter will extend the test
+          to detect the missing functionality. Thanks to Martin Cornelius
+          <Martin dot Cornelius at smiths-heimann dot com>
+          for reporting this bug and providing a regression test
 
-Tue Dec 12 14:21:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu May  4 07:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.h:
-          Fixed link problems with CORBA/e
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
+          Fixed warning in VxWorks 5.5.1 builds
 
-Tue Dec 12 12:31:45 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+Thu May  4 00:45:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/TAO_Server_Request.inl:
-        * tao/TAO_Server_Request.cpp:
+        * tao/Makefile.am:
 
-          Corrected a very bad merge on my part.  Thanks to Chris Reed <cr
-          at progress dot com> for reporting this and providing a patch.
-
-Tue Dec 12 10:08:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/taoidl3toidl2defaults.mpb:
-          Moved to CIAO
-
-Mon Dec 11 21:38:29 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2683_Regression/client.cpp:
-        * tests/Bug_2683_Regression/run_test.pl:
-
-          This test requires a host name to plug into the corbaloc string.
-          For VxWorks testing, only the server side runs on the target,
-          the client runs on the test-driver host. For this reason,
-          "localhost" is unacceptable for use as a hostname.
-
-Sun Dec 10 20:43:26 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Bug_2503_Regression/Makefile.am:
-        * tests/Bug_2560_Regression/Makefile.am:
-        * tests/Bug_2593_Regression/Makefile.am:
-        * tests/Bug_2595_Regression/Makefile.am:
-        * tests/Bug_2683_Regression/Makefile.am:
-        * tests/Cache_Growth_Test/Makefile.am:
-        * tests/CallbackTest/Makefile.am:
-        * tests/Client_Leaks/Makefile.am:
-        * tests/CodeSets/simple/Makefile.am:
-        * tests/Connect_Strategy_Test/Makefile.am:
-        * tests/Connection_Purging/Makefile.am:
-        * tests/Crash_On_Write/Makefile.am:
-        * tests/Crashed_Callback/Makefile.am:
-        * tests/Strategies/Makefile.am:
-        * tests/Timed_Buffered_Oneways/Makefile.am:
-        * tests/Two_Objects/Makefile.am:
-        * tests/Typedef_String_Array/Makefile.am:
-        * tests/UNKNOWN_Exception/Makefile.am:
+          Removed EndpointPolicy/EndpointPolicyC.inl.
 
-          Regenerated.
+Wed May  3 21:26:07 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/Bug_2503_Regression/Bug_2503_Regression.mpc:
-        * tests/Bug_2560_Regression/Bug_2560_Regression.mpc:
-        * tests/Bug_2593_Regression/Bug_2593_Regression.mpc:
-        * tests/Bug_2595_Regression/Bug_2595_Regression.mpc:
-        * tests/Bug_2683_Regression/IORTable.mpc:
-        * tests/Cache_Growth_Test/Cache_Growth_Test.mpc:
-        * tests/CallbackTest/CallbackTest.mpc:
-        * tests/Client_Leaks/Client_Leaks.mpc:
-        * tests/CodeSets/simple/CodeSets_simple.mpc:
-        * tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc:
-        * tests/Connection_Purging/Connection_Purging.mpc:
-        * tests/Crash_On_Write/Crash_On_Write.mpc:
-        * tests/Crashed_Callback/Crashed_Callback.mpc:
-        * tests/Strategies/Strategies.mpc:
-        * tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc:
-        * tests/Two_Objects/Two_Objects.mpc:
-        * tests/Typedef_String_Array/typedef_string_array.mpc:
-        * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-        * tests/Bug_2186_Regression/Makefile.am:
+        * tao/TAO_Internal.cpp:
+          The order of initialization of static services was modified as
+          multi-orb configuration feature implementation. Somehow during
+          that refactoring some services that are required to be initialized
+          ended up having that done before the svc.conf file is processed.
+          For instance RT_ORB_Loader. This change breaks up the loading of
+          and initializing of these services to ensure that svc.conf always
+          gets processed first before doing any default initialization.
+
+Wed May  3 19:14:12 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
+
+          Updated to resolve buld failures (vc71+Windows) - the two DLLs
+          produced, now contain identical code. It determines at runtime,
+          whether to act as a client or as a server - a decision
+          influenced by a command-line option, in the service
+          configuration file.
+
+Wed May  3 18:32:29 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/POA/EndpointPolicy/run_test.pl:
+          The test was failing on Windows because TAO apparently gets
+          built with -ORBDottedDecimalAddresses defaulted to 1. The
+          current version of the endpoint policy is very simple in that it
+          uses literal string comparisons for determining the suitability
+          of a given candidate profile endpoint. The test is specificly
+          trying to match "localhost" but fails when the server
+          substitutes "127.0.0.1" Perhaps an alternative solution would be
+          to test both literal strings.
+
+Wed May  3 16:54:41 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Regenerated.
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
 
-        * tests/Bug_2186_Regression/Bug_2186_Regression.mpc:
+          Fix an apparent typo introduced the previous commit.
 
-          Add empty IDL_Files sections to Client and Server projects.
+Wed May  3 16:06:56 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-Sun Dec 10 01:36:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc:
+        * tests/ORB_Local_Config/Bunch/Bunch.mpc:
+        * tests/ORB_Local_Config/Limits/Limits.mpc:
+        * tests/ORB_Local_Config/Separation/Separation.mpc:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
+        * tests/ORB_Local_Config/Shared/Shared.mpc:
+        * tests/ORB_Local_Config/Simple/Simple.mpc:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
 
-        * tests/Bug_2234_Regression/Makefile.am:
+          Removed the dependency on ACE test_output library to make it
+          possible to build the TAO tests without having to build ACE
+          tests. This is often the case on embedded platforms (VxWorks),
+          where part of the tests run outside the host platform. Thanks to
+          Johnny Willemsen for pointing that out.
 
-          Regenerated.
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
+        * tests/ORB_Local_Config/Limits/Test.cpp:
+        * tests/ORB_Local_Config/Separation/Test.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/ORB_Local_Config/Shared/Test.cpp:
+        * tests/ORB_Local_Config/Simple/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
 
-        * tests/Bug_2234_Regression/Bug_2234_Regression.mpc
+          Updated the code to use its own ACE_MAIN and fixed some typos.
 
-          Changed to inherit from anytypecode.
+Wed May  3 15:42:14 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
-Sun Dec 10 00:33:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
 
-        * tests/Bug_1670/Regression/Makefile.am:
+          Fixed the DDS compilation errors due to the recent
+          unbounded string sequence implementation changes.
 
-          Regenerated.
+Wed May  3 13:03:03 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tests/Bug_1670/Regression/Bug_1670_Regression.mpc:
-
-          Add generated source files to MPC Source_Files section.
-
-Sat Dec  9 23:18:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Bug_1495_Regression/Makefile.am:
-        * tests/Bug_1551_Regression/Makefile.am:
-        * tests/Bug_1568_Regression/Makefile.am:
-        * tests/Bug_1627_Regression/Makefile.am:
-        * tests/Bug_1670_Regression/Makefile.am:
-        * tests/Bug_1676_Regression/Makefile.am:
-        * tests/Bug_1869_Regression/Makefile.am:
-        * tests/Bug_2174_Regression/Makefile.am:
-        * tests/Bug_2183_Regression/Makefile.am:
-        * tests/Bug_2186_Regression/Makefile.am:
-        * tests/Bug_2188_Regression/Makefile.am:
-        * tests/Bug_2234_Regression/Makefile.am:
-        * tests/Bug_2289_Regression/Makefile.am:
-        * tests/Bug_2328_Regression/Makefile.am:
-        * tests/Bug_2349_Regression/Makefile.am:
-        * tests/Bug_2429_Regression/Makefile.am:
-        * tests/Bug_2494_Regression/Makefile.am:
+        * tao/Makefile.am:
 
           Regenerated.
 
-        * tests/Bug_1495_Regression/Bug_1495.mpc:
-        * tests/Bug_1551_Regression/Bug_1551_Regression.mpc:
-        * tests/Bug_1568_Regression/Bug_1568_Regression.mpc:
-        * tests/Bug_1627_Regression/Bug_1627_Regression.mpc:
-        * tests/Bug_1670_Regression/Bug_1670_Regression.mpc:
-        * tests/Bug_1676_Regression/Bug_1676_Regression.mpc:
-        * tests/Bug_1869_Regression/Bug_1869_Regression.mpc:
-        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc:
-        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc:
-        * tests/Bug_2186_Regression/Bug_2186_Regression.mpc:
-        * tests/Bug_2188_Regression/broken.mpc:
-        * tests/Bug_2234_Regression/Bug_2234_Regression.mpc:
-        * tests/Bug_2289_Regression/Bug_2289_Regression.mpc:
-        * tests/Bug_2328_Regression/Bug_2328_Regression.mpc:
-        * tests/Bug_2349_Regression/Bug_2349_Regression.mpc:
-        * tests/Bug_2429_Regression/Bug_2429_Regression.mpc:
-        * tests/Bug_2494_Regression/Bug_2494_Regression.mpc:
+        * tao/tao.mpc:
 
-          Split out IDL compilation into separate MPC project.
+          Fix yet another typo.
 
-Fri Dec  8 22:30:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+Wed May  3 09:56:10 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/IDL_Test/included.idl:
-        * tests/IDL_Test/valuetype.idl:
+        * tests/Portable_Interceptors/Bug_2510_Regression/client.cpp:
+          At the end of the test shutdown the server
 
-          Added IDL to the test to cover the bug fixed in
+Wed May  3 03:35:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Tue Dec  5 21:51:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/LF_Multi_Event.h:
+        * tao/LF_Multi_Event.cpp:
+        * tao/PortableServer/POAManagerFactory.h:
+        * tao/PortableServer/POAManagerFactory.cpp:
+        * tao/PortableServer/POAManagerFactoryC.h:
+          Adding in Versioned namespace macros.
 
-Fri Dec  8 05:21:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue May  2 22:01:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * configure.ac:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
+          Added the portableserver base project to both the client lib and
+          server lib projects, since both require client and server
+          behavior. This is required for windows builds where apparently
+          DLLs must have all symbols fully resolved at link time, unlike
+          .so's where they only need to be satisfied at runtime.
 
-          Changed code to extract version number from tao/Version.h to be
-          more resilient to leading whitespace like was added by a bug in
-          the release script in the last beta.  Thanks to Ray Lischner
-          <rlischner at proteus-technologies dot com> for this patch.
-          Also thanks to Paul Riley <paul at riley dot net> for reporting
-          this problem.
+Tue May  2 19:08:18 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-Fri Dec  8 04:45:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h:
 
-        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.h:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Iterator_i.cpp:
-        * orbsvcs/orbsvcs/Log/Iterator_i.h:
+        Changing auto_ptr to ACE_Auto_Ptr, because some platforms
+        (WinXP64_Intel90_64bit) provide an auto_ptr<> without the reset
+        method.
 
-          The Iterator's destroy() method was using _default_POA() to
-          obtain the POA to deactivate the object, but that didn't do
-          anything because it was activated on a the iterator POA.
-          Changed to pass the iterator POA so we can self-destruct
-          properly.
+Tue May  2 15:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp:
+          Added missing includes. Thanks to Carlos O'Ryan for
+          reporting this
 
-          Create the iterator POA with the POAManager obtained from the
-          log POA.  We were passing POAManager::_nil(), which created a
-          new POAManager.  This resulted in all operations on iterators to
-          fail, since the POAManager was never activated.
+Tue May  2 13:24:26 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Thu Dec  7 19:00:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/tao.mpc:
+          Reverted J.T.'s change from Mon May  1 20:03:59 UTC 2006
+          to flush out the cvs conflict markers and reapplied just his
+          typo fix.
 
-        * MPC/config/typecodefactory.mpb:
+Tue May  2 11:47:55 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-          Added avoids_minimum_corba, avoids_corba_e_compact, and
-          avoids_corba_e_micro to the base project list. Thanks to
-          Johnny Willemsen <jwillemsen@remedy.nl> for his input
-          that helped reach the decision that this is the right
-          thing to do.
+        * tests/ORB_Local_Config/Separation/Test.cpp:
+        * tests/ORB_Local_Config/Shared/Test.cpp:
+        * tests/ORB_Local_Config/Simple/Test.cpp:
 
-        * orbsvcs/orbsvcs/IFRService.mpc:
+          The test don't need more specialized type than the base
+          ACE_Service_Object, in order to demonstrate the intent.
 
-          - Removed base projects that are already pulled in by
-            others, including the 3 added to typecodefactory's
-            base project list, described above.
+Tue May  2 08:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          - Removed the 'IFRService' tag and tagcheck line, this
-            stuff was never used.
+        * TAO_IDL/driver/drv_preproc.cpp:
+          When we can't remove the input or output file use %p to print
+          the error so that the info from the OS why this couldn't be
+          done is also reported to the user.
 
-          - Revised Source_Files and Template_Files blocks, and
-            added Header_Files block, so that template files will
-            get displayed in the right place and all header files
-            will get displayed, in Visual Studio projects.
+Tue May  2 03:59:17 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tests/Any/Recursive/RecursiveHello.mpc:
-        * examples/TypeCode_Creation/TypeCode_Creation.mpc:
+        * tao/IIOP_Connector.h:
+        * tao/IIOP_Connector.cpp:
+        * tao/Transport_Descriptor_Interface.h:
+        * tao/Transport_Descriptor_Interface.cpp:
 
-          Removed avoids_minimum_corba, avoids_corba_e_compact, and
-          avoids_corba_e_micro base projects, since they are now
-          pulled in by typecodefactory.
+          This fix resolves a problem exposed by the
+          performance-tests/RTCorba/Oneway/Reliable test. That failure was
+          showing up as a pure virtual function call, but the root cause
+          was related to the changes to the IIOP_Connector in how it
+          cached new transports. I was creating a new transport descriptor
+          out of the successful endpoint, but using creating a new
+          Base_Transport_Descriptor rather than reusing the supplied
+          transport descriptor. This broke RT tests in that subsequent
+          invocations would fail to find the cached endpoint since the
+          type was different. I've resolved that by adding the new
+          reset_endpoint method on the Transport_Descriptor_Interface
+          which allows the transport connector to set a new endpoint to
+          the existing transport descriptor before caching the value.
 
-Thu Dec  7 18:55:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon May  1 21:54:05 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * tao/ORB.{h,cpp}:
-          Fixed minimum defines
-
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
-          Exclude certain functionality for CORBA/e
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
 
-Thu Dec  7 14:18:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Modified the test not to require the ability to fully
+          instantiate TAO_CORBANAME_Parser, etc. which is a class in
+          another library and it is not declared so that it is "visible"
+          outside of it. The test does not require that in order to be
+          functional - using the base class ACE_Service_Object.
 
-        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
-        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
-        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
-        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
-          Build the clients after the idl project, not after server
-          to resolve build order problems in the CORBA/e builds
+        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
 
-Thu Dec  7 10:49:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added some more logging.
 
-        * tao/ORB.{h,cpp}:
-          Disable more of the ORB when building for CORBA/e, thanks to
-          Jeff for pointing out that these methods wheren't disabled
-
-Thu Dec  7 09:56:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/rtscheduling.mpb:
-        * tao/RTScheduler.mpc:
-          Don't build with CORBA/e micro
-
-Thu Dec  7 09:54:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/avoids_corba_e_compact.mpb:
-        * MPC/config/avoids_corba_e_micro.mpb:
-        * MPC/config/avoids_minimum_corba.mpb:
-          Simplified these files, thanks to Jeff to pointing out that
-          they contained to much
-
-        * MPC/config/concurrency_serv.mpb:
-          Don't build with CORBA/e micro
-
-        * orbsvcs/orbsvcs/CosConcurrency.mpc:
-          Don't build serv with CORBA/e micro
-
-Thu Dec  7 08:02:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
-        * tao/PortableServer/ImplicitActivationStrategyImplicit.h:
-        * tao/PortableServer/RequestProcessingPolicy.cpp:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantManager.cpp:
-        * tao/PortableServer/ServantRetentionPolicy.cpp:
-        * tao/PortableServer/ThreadPolicy.cpp:
-        * tao/PortableServer/ThreadStrategySingle.cpp:
-        * tao/PortableServer/ThreadStrategySingle.h:
-        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
-        * tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
-          Disable more strategies with CORBA/e but also reordered some includes.
-          At the moment the strategy is fully disabled in a minimum build we
-          include orbconf.h outside the internal ifdef check and all includes
-          of classes are inside this ifdef. This way we don't pull in a static
-          initializers which seem to take 112 bytes of footprint per file
-          which is not needed.
-
-Thu Dec  7 07:38:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon May  1 20:03:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/PortableServer/PortableServer.cpp:
-          The wrong activation strategy was disabled when building for
-          CORBA/e
-
-Thu Dec  7 06:38:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ImR_Client/IMR_Client.cpp:
-        * tao/RTPortableServer/RT_POA.inl:
-          Some bool changes I missed in my previous commit
-
-Thu Dec  7 00:25:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Big_AMI/Makefile.am:
+        * tao/Makefile.am:
 
           Regenerated.
 
-Wed Dec  6 22:27:21 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/tao.mpc:
 
-        * tests/Big_AMI/Big_AMI.mpc:
+          Fix typo.
 
-          Changed IDL project to inherit from ami.
+Mon May  1 19:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Dec  6 21:11:47 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * tests/OBV/Simple/OBV_Simple.mpc:
+          This test isn't dependent on minimum_corba
 
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
-          Fixing a windows build warning about unused variable.
+Mon May  1 18:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-wed Dec  6 19:58:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/AnyTypeCode/TypeCode.{h,cpp}:
+          Made type TypeCode_ptr argument of operator << const so that
+          the signature is the same as declared in DynamicA.h
 
-        * tests/POA/Policies/Policies.mpc:
-          Don't build when CORBA/e micro has been enabled
+Mon May  1 15:33:00 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Wed Dec  6 19:33:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/OBV/Truncatable/client.cpp:
+          This is an improvement to what I committed earlier. Since the
+          valuetypes are passed by value, it is perfectly reasonable to
+          allocate them on the stack locally. That way I could get away
+          from the use of the var to store a reference to the local value
+          instance, and also avoid the awkward initialization code used to
+          avoid the ambiguity BCB6 was complaining about.
 
-        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
-        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
-        * examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc:
-        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
-          Don't build the server when CORBA/e micro has been enabled
+        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
+          Changed the name of an internal catch value. I'm not sure, but I
+          suspect this is what was causing the BCB compiler to complain at
+          the point of ACE_CATCHANY.
 
-Wed Dec  6 19:24:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon May  1 12:04:17 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * tao/PortableServer/Active_Object_Map.cpp:
-        * tao/PortableServer/Active_Object_Map.h:
-        * tao/PortableServer/Active_Object_Map.inl:
-        * tao/PortableServer/Active_Object_Map_Entry.cpp:
-        * tao/PortableServer/IdUniquenessStrategy.h:
-        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
-        * tao/PortableServer/IdUniquenessStrategyMultiple.h:
-        * tao/PortableServer/IdUniquenessStrategyUnique.cpp:
-        * tao/PortableServer/IdUniquenessStrategyUnique.h:
-        * tao/PortableServer/RequestProcessingStrategy.h:
-        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
-        * tao/PortableServer/RequestProcessingStrategyAOMOnly.h:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.h:
-        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantActivator.h:
-        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantLocator.h:
-        * tao/PortableServer/Root_POA.cpp:
-        * tao/PortableServer/Root_POA.h:
-        * tao/PortableServer/Servant_Upcall.cpp:
-        * tao/PortableServer/Servant_Upcall.h:
-        * tao/PortableServer/ServantRetentionStrategy.h:
-        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
-        * tao/PortableServer/ServantRetentionStrategyNonRetain.h:
-        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
-        * tao/PortableServer/ServantRetentionStrategyRetain.h:
-          Use bool instead of int for several flags, also then use true/false
-          instead of 0/1
+        * tests/OBV/Truncatable/client.cpp:
+        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
+          The Borland BCB6 compiler has trouble with var types and const
+          vs. non-const assignment or comparisons. These changes are an
+          attempt to address this trouble. I don't like the nature of
+          these changes as they are moving away from the built-in type
+          safety C++ is supposed to provide.
+
+Mon May  1 03:43:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Parallel_Connect_Strategy/run_test.pl:
+          The fix for this test was to ensure the CORBALOC parser put all
+          the listed endpoints into a single Profile.
+
+Sun Apr 30 22:53:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/ORB_Core.cpp:
+          Somehow when I applied my patch for the alternate connection
+          timeout hook, used allow either or both the AMI connection
+          timeout policy or the optimized connection endpoint selector to
+          set the connection timeout hook, I managed to apply my change to
+          the relative round trip timeout hook. This change addresses that
+          and fixes the AMI_Timeout test.
+
+Sun Apr 30 20:24:39 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc:
+        * tests/ORB_Local_Config/Bunch/Bunch.mpc:
+        * tests/ORB_Local_Config/Limits/Limits.mpc:
+        * tests/ORB_Local_Config/Separation/Separation.mpc:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/ORB_Local_Config/Shared/Shared.mpc:
+        * tests/ORB_Local_Config/Simple/Simple.mpc:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
+        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h:
+
+          Updated to simplify the tests and the build process
+
+        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.cpp:
+        * tests/ORB_Local_Config/lib/lib.mpc:
 
-Wed Dec  6 16:15:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Removed these files.
 
-        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
-        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
+Sun Apr 30 15:36:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Fixing fuzz (missing $id$) and compile errors on
-          TAO_HAS_MINIMUM_CORBA builds, which define the POAManager
-          inteface without the deactivate() method.
+        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
+          Fixed the assignment to the sequence to hand a buffer the
+          sequence can properly release.
 
-Wed Dec  6 16:10:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sun Apr 30 14:24:20 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h:
-          Fixed doxygen warnings
+        * TAO/tao/Profile_Transport_Resolver.cpp:
+          Removed invalid semicolons.
 
-Wed Dec  6 15:55:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
+          Fixed the dynamic flag for windows builds.
 
-        * tao/Abstract_Servant_Base.h:
-        * tao/AnyTypeCode/Fixed_TypeCode.h:
-        * tao/AnyTypeCode/TypeCode.h:
-        * tao/Codeset_Manager_Factory_Base.h:
-        * tao/Pluggable_Messaging.h:
-        * tao/Thread_Lane_Resources.h:
-          Fixed doxygen warnings
-
-Wed Dec  6 15:29:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Abstract_Interface/Makefile.am:
-        * tests/Any/Recursive/Makefile.am:
-        * tests/BiDirectional/Makefile.am:
-        * tests/BiDirectional_DelayedUpcall/Makefile.am:
-        * tests/BiDirectional_NestedUpcall/Makefile.am:
-        * tests/Big_AMI/Makefile.am:
-        * tests/Big_Oneways/Makefile.am:
-        * tests/Big_Reply/Makefile.am:
-        * tests/Big_Request_Muxing/Makefile.am:
-        * tests/Big_Twoways/Makefile.am:
-        * tests/Blocking_Sync_None/Makefile.am:
-        * tests/Bug_1020_Basic_Regression/Makefile.am:
-        * tests/Bug_1020_Regression/Makefile.am:
-        * tests/Bug_1254_Regression/Makefile.am:
-        * tests/Bug_1269_Regression/Makefile.am:
-        * tests/Bug_1270_Regression/Makefile.am:
-        * tests/Bug_1330_Regression/Makefile.am:
-        * tests/Bug_1361_Regression/Makefile.am:
-        * tests/Bug_1476_Regression/Makefile.am:
-        * tests/Bug_1482_Regression/Makefile.am:
+Sun Apr 30 04:54:25 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-          Regenerated.
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
 
-        * tests/Abstract_Interface/Abstract_Interface.mpc:
-        * tests/Any/Recursive/RecursiveHello.mpc:
-        * tests/BiDirectional/BiDirectional.mpc:
-        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
-        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
-        * tests/Big_AMI/Big_AMI.mpc:
-        * tests/Big_Oneways/Big_Oneways.mpc:
-        * tests/Big_Reply/Big_Reply.mpc:
-        * tests/Big_Request_Muxing/Big_Request_Muxing.mpc:
-        * tests/Big_Twoways/Big_Twoways.mpc:
-        * tests/Blocking_Sync_None/Blocking_Sync_None.mpc:
-        * tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc:
-        * tests/Bug_1020_Regression/Bug_1020_Regression.mpc:
-        * tests/Bug_1254_Regression/Bug_1254_Regression.mpc:
-        * tests/Bug_1269_Regression/Bug_1269_Regression.mpc:
-        * tests/Bug_1270_Regression/Bug_1270_Regression.mpc:
-        * tests/Bug_1330_Regression/Bug_1330_Regression.mpc:
-        * tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
-        * tests/Bug_1476_Regression/Bug_1476_Regression.mpc:
-        * tests/Bug_1482_Regression/Bug_1482_Regression.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Wed Dec  6 14:36:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Cleaned up the test a bit to clarify the intent.
 
-        * tao/PortableServer/PortableServer.cpp:
-          Reduced the number of process directives call for CORBA/e compact
-          and micro
+Sun Apr 30 00:47:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Wed Dec  6 14:28:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
+          Undoing the damage caused by my too-hasty previous checkin.
 
-        * tao/PortableServer/ServantRetentionStrategyNonRetain.{h,cpp}:
-        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.{h,cpp}:
-          Added checks for CORBA/e compact and micro, no need to compile these
-          when these profiles are enabled.
+        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
+          Addressing some more compiler warnings
 
-        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
-          Const improvement
+Sat Apr 29 15:34:15 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Wed Dec  6 14:15:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PortableServer/POAManagerFactory.cpp:
 
-        * MPC/config/rtportableserver.mpb:
-        * tao/RTPortableServer.mpc:
-          Don't build RTPortableServer when CORBA/e micro has been enabled
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
 
-Wed Dec  6 13:40:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
 
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-        * examples/Simple/time-date/Makefile.am:
-        * orbsvcs/examples/ORT/Makefile.am:
-        * orbsvcs/tests/Bug_2709_Regression/Makefile.am:
-        * tests/Bug_2654_Regression/Makefile.am:
-        * tests/OctetSeq/Makefile.am:
-        * tests/Oneway_Timeouts/Makefile.am:
-        * tests/Param_Test/Makefile.am:
-        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h:
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
 
-          Regenerate.
+        * tests/ORT/ORT_test_IORInterceptor.cpp:
 
-        * configure.ac:
-        * orbsvcs/tests/Makefile.am:
-        * tests/Makefile.am:
-
-          Changes for move of Bug_2709_Regression unit test.
-
-Wed Dec  6 08:30:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * *.mpc:
-          Added to all mpc files that have avoids_corba_e_compact also
-          avoids_corba_e_micro because they also can't be build with
-          CORBA/e micro
-
-Tue Dec  5 21:51:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_argument/arglist.cpp (visit_sequence):
-
-          Added code to create the sequence node's name, if a check
-          determines that the node is from an included IDL file, and
-          is an anonymous sequence (not created with a typedef declaration).
-          This is the case in this particular visitor if a valuetype
-          inherits an anonymous sequence member from a valuetype
-          declared in another IDL file, and this visitor is generating
-          the argument list for the OBV_* constructor with member
-          values. The node's name has not yet been set, since it
-          cannot be done in the node constructor - if the sequence
-          is declared with a typedef, the typedef node is created
-          after the sequence node, and it also sets the sequence
-          node's 'anonymous' flag to false (set to true by default
-          in the sequence node constructor). Thanks to Ossama
-          Othman <ossama.othman@symantec.com> for reporting the
-          bug.
+        * tests/POA/EndpointPolicy/server.cpp:
 
-Tue Dec  5 18:36:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Fixes for various build-specific errors/warnings.
 
-        * tests/DSI_Gateway/DSI_Gateway.mpc:
-          Don't build with corba_e_compact
+Sat Apr 29 14:17:32 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * orbsvcs/orbsvcs/Log/LogActivator.{h,cpp}:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.{h,cpp}:
-          Changes to resolve compile errors with CORBA/e compact
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
 
-Tue Dec  5 15:29:59 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
+          Removed references  to <iostream> and unreferenced variables.
 
-        * tests/Bug_2709_Regression/*:
-        * orbsvcs/tests/Bug_2709_Regression/*:
-          Regression test for bug#2709 was moved.
+Sat Apr 29 13:13:20 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Tue Dec  5 15:02:37 UTC 2006 Vadym Ridosh <vridosh@prismtech.com>
-        * tests/Bug_2709_Regression/Bug_2709_Regression.mpc:
-          Added dependency to avoid problem with build on some OSes.
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+          Fuzz cleanup.
 
-Tue Dec  5 11:35:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sat Apr 29 02:26:49 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * TAO_IDL/be/be_codegen.cpp:
-          Added a check that -SSi is not a valid commandline argument, so
-          then we give an error, it is -SS, no third character at all.
-          This fixes bugzilla bug 2723.
+        * tao/EndpointPolicy/EndpointPolicy_i.cpp:
+          Removed the apparently redundant ACE_NESTED_CLASS macros.
 
-Tue Dec  5 11:31:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Apr 28 22:25:57 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * MPC/config/valuetype.mpb:
-        * Valuetype.mpc:
-          Valuetype is not available with corba/e micro
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
+        * tests/ORB_Local_Config/Limits/Test.cpp:
+        * tests/ORB_Local_Config/Separation/Test.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/ORB_Local_Config/Shared/Test.cpp:
+        * tests/ORB_Local_Config/Simple/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
 
-        * Valuetype/ValueBase.cpp:
-          Use ACE_ERROR for an error message
+          Modified to eliminate warnings about unused variables on
+          ACE_NDEBUG builds.
 
-Tue Dec  5 11:25:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Apr 28 22:04:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
-        * orbsvcs/examples/ORT/ORT.mpc:
-          Don't build with corba/e compact
+        * tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc:
+        * tests/ORB_Local_Config/Bug_1459/README:
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
+        * tests/ORB_Local_Config/Bug_1459/a.conf:
+        * tests/ORB_Local_Config/Bug_1459/b.conf:
+        * tests/ORB_Local_Config/Bug_1459/m.conf:
+        * tests/ORB_Local_Config/Bug_1459/m1.conf:
+        * tests/ORB_Local_Config/Bug_1459/run_test.pl:
+        * tests/ORB_Local_Config/Bug_1459/server_cert.pem:
+        * tests/ORB_Local_Config/Bug_1459/server_key.pem:
 
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
-          Don't build the server with corba/e compact
+          Added a test I borrowed from bugzilla 1459. It tests the ability
+          to have two differently configured ORBs in the same process.
 
-        * orbsvcs/orbsvcs/PortableGroup.mpc:
-          Don't build with corba/e compact
+        * examples/Simple/time-date/Time_Date.cpp:
 
-        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
-          Part can't be build with corba/e compact
+          Provided an ID for the ORB, initialized in a code that was
+          loaded from the DLL. The ORB-specific Service Repo changes
+          eliminated the need to make TAO_Singleton_Manager not register
+          with the Object Manager, when initialized from a DLL.
 
-Tue Dec  5 11:19:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Apr 28 15:14:04 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
-          Don't build the manager with corba/e compact
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.UTF-16.conf:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.UTF-16.conf.xml:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.WCHAR_T.conf:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.WCHAR_T.conf.xml:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.conf:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.conf.xml:
 
-Tue Dec  5 11:17:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Moved these files to Service_Dependency, which also received the
+          code that uses these.
 
-        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
-          Don't build server with corba/e compact
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.UTF-16.conf:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.UTF-16.conf.xml:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.WCHAR_T.conf:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.WCHAR_T.conf.xml:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
 
-Tue Dec  5 08:28:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Moved here the config files from the Bunch test as it may be run
+          in single threaded builds and the code that uses these config
+          files requires multiple threads.
 
-        * tests/OctetSeq/OctetSeq.mpc:
-          Changed build order to resolve build order problems in the ace_for_tao
-          builds
+Fri Apr 28 14:51:20 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-Tue Dec  5 04:21:50 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefile for new unit test subdirectory.
-
-        * tests/ORB_Local_Config/Makefile.am:
-
-          Regenerate to descend into CSD_Strategy subdirectory.
-
-        * tests/ORB_Local_Config/Bug_2612/Makefile.am:
-
-          New file.
-
-Tue Dec  5 04:10:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/AMH_Exceptions/Makefile.am:
-        * tests/AMH_Oneway/Makefile.am:
-        * tests/AMI/Makefile.am:
-        * tests/AMI_Buffering/Makefile.am:
-        * tests/AMI_Timeouts/Makefile.am:
+        * tao/TAO_Internal.cpp:
 
-          Regenerated.
+          Fixed an error, that prevented the initialization of static
+          services during Service_Config::open, The override for the
+          default argument (ignore_static_svcs = 1) was missed during the
+          refactoring.
 
-        * tests/AMH_Exceptions/AMH_Exceptions.mpc:
-        * tests/AMH_Oneway/AMH_Oneway.mpc:
-        * tests/AMI/AMI.mpc:
-        * tests/AMI_Buffering/AMI_Buffering.mpc:
-        * tests/AMI_Timeouts/AMI_Timeouts.mpc:
+Fri Apr 28 13:46:43 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-          Split out IDL compilation into separate MPC project.
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
+        * tests/ORB_Local_Config/Limits/Test.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/ORB_Local_Config/Shared/Test.cpp:
+        * tests/ORB_Local_Config/Simple/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
 
-Mon Dec  4 18:01:55 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Updated to shut up unused variable warnings on builds where
+          ACE_NDEBUG has been defined.
 
-        * tests/ORB_Local_Config/Bug_2612:
-        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h:
-        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
-        * tests/ORB_Local_Config/Bug_2612/run_test.pl:
+Thu Apr 27 21:09:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Added new regression test for bug#2612. It should also cover the
-          issue described in bug#2677.
+        * tao/Profile.cpp:
+          Fix a problem that caused the endpoint selector to spin when
+          using shared profiles and none of the endpoints were valid.
 
-        * tests/ORB_Local_Config/run_tests_all.pl:
+Thu Apr 27 15:03:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-          Added the new test to the list of tests for manual execution.
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
+        * tests/ORB_Local_Config/Limits/Test.cpp:
+        * tests/ORB_Local_Config/Simple/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
 
-Mon Dec  4 17:30:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+          Fixed fuzz issues (unmatched ACE_TRACE)
 
-        * tao/Invocation_Adapter.cpp (invoke_i):
-        * tao/LocateRequest_Invocation_Adapter.cpp (invoke):
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
 
-          Added a service config guard to ensure the invocation is
-          processed, using the correct configuration repository.  The
-          change ensures that the ORB's repository is going to be
-          "current" for the duration of the invocation, which is needed if
-          timeouts and other policies are applied as expected.  Thanks to
-          Eider Oliveira <eider dot oliveira at gmail dot com> for
-          submitting the defect (bug# 2734)
+          Modified to change the DLL name to avoid name conflict with the
+          one in ACE_ROOT/tests.
 
-Mon Dec  4 16:17:07 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+Thu Apr 27 14:20:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * TAO_IDL/util/utl_err.cpp (syntax_error):
+        * tao/IIOP_Endpoint.cpp:
+          Fixed a recursion problem with the IPv6 endpoint selection.
 
-          Replaced increment of error count with immediate bailout
-          on any kind of syntax error. Keeping the state of the IDL
-          compiler consistent in the face of any syntax error would
-          require extensive hacking of bison-generated code, and we
-          still wouldn't get any code generation if there are any
-          errors going into the backend. This fix closes [BUGID:2688].
+        * tao/PortableServer/POAManagerFactory.cpp:
+          Cleaned up compiler warnings.
 
-Mon Dec  4 15:42:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Apr 27 06:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * MPC/config/*:
-          The MPC base projects for TAO
+        * tests/ORB_Local_Config/lib/lib.mpc:
+          Added base project, this would at least get our builds running again
 
-Mon Dec  4 13:23:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Apr 27 03:46:34 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
-        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
-          Added static casts to get rid of warnings with vc
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
 
-Mon Dec  4 12:36:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Found the trouble that was crashing the endpoint test. It was
+          nothing wierd with the new sequence code, it was merely an
+          incorrect index variable - i should have been j.
 
-        * tests/Oneway_Timeouts/*:
-          Added missing id tags
+Thu Apr 27 03:05:31 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * Release:
-          Added MPC
+        * tao/params.cpp:
 
-Mon Dec  4 12:24:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          One of my patches inadvertently flipped the sense of the
+          share_profiles default from 0 to 1. However, I think that 1
+          should be the default, since it generates more compact IORs. It
+          has been that way for years in the OCI version of TAO, but I am
+          keeping the default 0 here for tradition. This value is
+          overridden by using -ORBUseSharedProfile [0|1] ORB_init option.
 
-        * MPC
-        * MPC/config
-          New directory for the base projects specifically for TAO
+Thu Apr 27 02:58:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Mon Dec  4 12:17:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/EndpointPolicy/Endpoint_Value_Impl.cpp:
+        * tao/EndpointPolicy/Endpoint_Value_Impl.h:
 
-        * tests/Bug_2709_Regression/Client_Task.cpp:
-          Fixed conversion warning in vxworks builds
+          Added a virtual destructor to this otherwise abstract base
+          class.
 
-Mon Dec  4 11:21:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Apr 26 21:24:54 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
-        * tao/PI_Server/PortableServer_PolicyFactory.cpp:
-          Fixed compile errors with CORBA/e compact
-
-        * tao/Bounded_Value_Sequence_T.h:
-          Improved doxygen documentation
+        * NEWS:
 
-Mon Dec  4 08:03:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added an entry to the NEWS file.
 
-        * tests/Param_Test/Param_Test.mpc:
-          Build all projects after idl to get always the correct build
-          order
+Wed Apr 26 20:21:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
-Mon Dec  4 07:59:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          The motivation for these changes was to enable support for
+          ORB-local Service Objects. This for instance, makes it possible
+          for differently configured ORBs to coexist within the same
+          proces.
 
-        * tao/DynamicAny/DynCommon.{h,cpp}:
-          Removed not needed const qualifiers on the return type, fixes
-          icc warnings
+          In order to accomplish this, each orb (core) owns a "Gestalt",
+          i.e. a service object repository instance. There is also a
+          process-wide, or "global" gestalt, which is the default
+          repository where service objects are registered. The latter
+          retains the interface and behavioral compatibility with any
+          existing code. As a consequence of this design choice, any
+          un-named orb(s) will default to using the ubergestalt, which is
+          consistent with the prior behavior.
 
-        * tao/Unbounded_Basic_String_Sequence_T.h:
-          Improved doxygen documentation
+        * tao/DLL_Parser.cpp:
 
-        * tao/Policy_Set.cpp:
-          Const changes
+          Fixed the parse_string() method to use the correct ORB gestalt
+          when looking up a dynamic service object. That resolves a
+          failure in TAO/tests/Object_Loader test.
 
-Sun Dec  3 14:25:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/ORB.cpp:
 
-        * tests/ORB_Local_Config/Bug_1459/Makefile.am:
-        * tests/ORB_Local_Config/Bunch/Makefile.am:
-        * tests/ORB_Local_Config/Separation/Makefile.am:
-        * tests/ORB_Local_Config/Shared/Makefile.am:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am:
-        * tests/ORB_Local_Config/Simple/Makefile.am:
-        * tests/ORB_Local_Config/Service_Dependency/Makefile.am:
+          Relocated some aging comments about having first to instantiate
+          the singleton manager to the correct place (ORB_init). Added a
+          gestalt parameter to the call to open_services. Edited a few
+          lines to fit within the standard length requirement.
 
-          Add automake specific section so that includes is set relative
-          to $(srcdir).
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.i:
+        * tao/ORB_Core.cpp:
 
-Sun Dec  3 07:39:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added a member and an accessors for the private service gestalt,
+          owned by the core. Replaced the call to methods that use the
+          implicit ubergestalt with ones that specify the gestalt to use
+          for service objects.
 
-        * tao/AnyTypeCode/BasicTypeTraits.cpp:
-          Fixed compile problems with Borland C++
+          Added an ACE_Service_Config_Guard to make sure the ORB
+          initialization uses the correct repository.
 
-Sat Dec  2 23:11:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Updated more references to process_directive() and instance() to
+          use ACE_TCHAR.  Updated references to process_directive() to use
+          ACE_TCHAR for consistency.
 
-        * examples/Makefile.am:
+          Added #if !defined(TAO_AS_STATIC_LIBS)/#endif around code, which
+          is only meaningful when TAO is _not_ statically compiled;
+          Updated the service and DLL symbol names used to load the
+          CodecFactory_Loader, PolicyFactory_Loader and
+          TypeCodeFactory_Loader dynamic services, in the cases where
+          those services are not statically linked and TAO supports
+          dynamic linking. (Thanks Ossama, for pointing that out.)  Added
+          code to try and explicitly load an IORInterceptor adapter and
+          Concrete_IORInterceptor_Adapter_Factory, if TAO supports (is
+          built with) dynamic linking;
 
-          Skip RTScheduling subdirectory for now.
+          Updated the code that loads the IORTable adapter to be exception
+          safe; Edited a few lines to fit within the standard length
+          requirement.
 
-        * tests/Makefile.am:
+        * tao/Parser_Registry.cpp:
 
-          Skip Bug_2399_Regression and CSD_Strategy_Tests
-          subdirectories for now.
+          Updated to explicitly specify the correct gestalt for the ORB.
 
-Sat Dec  2 23:02:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/TAO_Internal.h:
+        * tao/TAO_Internal.cpp:
 
-        * Makefile.am:
+          Refactored the initialization code to separate process-wide
+          aspects of initialization from those having to do with the ORB
+          instance. It is necessary to deal with global initialization
+          because of the large number of use cases, where the first thing
+          a process does is to call ORB_init, and consequently -
+          open_services. There are also cases where a process calls
+          Service_Config::open, initializing the process-wide
+          configuration and only then proceeds to call ORB_init - for
+          example when using Service Configurator to load a DLL that uses
+          an ORB. The close_service is now only responsible for calling
+          close in the ORB's own gestalt, the ACE Object Manager is the
+          one that is clobering the process-wide Service Configuration.
+          Updated to explicitly specify the correct gestalt to be used.
+
+        * tao/default_resource.h:
+        * tao/default_resource.cpp:
 
-          Add tests subdirectory.
+          Added the ACE_Dynamic_Service_Dependency member to the default
+          resource factory to expressly maintain the factory's dependance
+          on TAO_Codeset library, because the order of destruction may be
+          reversed in some cases. The member help us keep our access to
+          TAO_Codeset_Manager instances by upping the ref count on
+          TAO_Codeset's DLL. This is far from elegant, but a complete
+          reference counting scheme for the ORB services is a more complex
+          undertaking than what the available resources currently permit.
 
-        * tests/ICMG_Any_Bug/Makefile.am:
-        * tests/OBV/Simple/Makefile.am:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
 
-          Regenerated.
+          Fixed an (unrelated) issue arising from a call to strcmp() with
+          two different character types - only visible when ACE_USES_WCHAR
+          is in effect.
 
-Fri Dec  1 20:18:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/Codeset/Codeset_Manager_i.h:
+        * tao/Codeset/Codeset_Manager_i.cpp:
 
-        * TAO_IDL/fe/fe_declarator.cpp (compose):
+          (minor) Added void as argument to the ctor and dtor.
 
-          Removed a prefix match check that was overlooked in the
-          #pragma prefix changes in
+        * tao/PI/ORBInitializer_Registry_Impl.h:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
 
-          Tue Nov 28 19:32:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Implemented an init() method, which registers all the static
+          services, usually taken for granted with the loading of
+          TAO_PI. Previously, static initializers were used, however the
+          dependent static services were being registered only globally,
+          which broke the ORBs that needed ORB-local services.
 
-          but was caught only on Solaris platforms, since on all
-          others, one of the compared strings always has an uninitialized
-          value of 0, which short-circuited the check.
+        * tao/PI/PI.h:
+        * tao/PI/PI.cpp:
+        * tao/PI/PolicyFactory_Loader.h:
+        * tao/PI/PolicyFactory_Loader.cpp:
 
-Fri Dec  1 15:39:03 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Removed the static initializers code and made it part of the
+          dynamic service's init method. See the comment above.
 
-        * tests/OBV/Simple/OBV_Simple.mpc:
+        * tao/PortableServer/Root_POA.cpp:
 
-          Removed -St from IDL compiler command line options, since
-          valuetypes now require typecode support.
+          Explicitly specified the gestalt to be used for registering
+          dynamic services.
+
+        * tests/DLL_ORB/Test_Client_Module.cpp:
+        * tests/DLL_ORB/Test_Server_Module.cpp:
+
+          Provided an ID for the client and server's ORB.  In the future,
+          an option may be devised so that the user can specify if they
+          want any ORB to use its own gestalt, even if it does not have an
+          ID. The reverse would be to force all ORBs to use the global SR,
+          even if they have an ID.  Fixed a a SEGV upon process
+          termination. The first thing a client process does in its main()
+          is to load a dynamic service - Test_Client_Module, using a call
+          to ACE_Service_Config::process_directive(). The service does
+          call ORB_init(), which causes the population of the SR with a
+          number of static and dynamic SOs. At process termination now
+          however, any services registered following the ORB_init () call
+          are destroyed first and will be unavailable when the
+          Test_Client_Module is finalized. Like the Resource Factory, for
+          example.
+
+          The solution is to provide and ORB id for any ORB, which will
+          loaded as part of a dynamic service.  Since the service gestalt
+          is tied to the ORB id, this will cause the new ORBs to create
+          and manage the lifetime of their own Service Repositories. The
+          ORB_init() will be invoked in the context of each distinct SR
+          and any SO an ORB needs will go there. At process termination,
+          the Test_Client_Module will be finalized, which will clobber the
+          ORB's SR and any SO registered there.
 
-Fri Dec  1 15:19:34 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tests/ORB_Local_Config/ORB_Local_Config.mwc:
+        * tests/ORB_Local_Config/README:
+        * tests/ORB_Local_Config/run_tests_all.pl:
 
-        * tests/ICMG_Any_Bug/Hello.mpc:
+          Added tests and examples of the functionality affected by the
+          introduction of the multiple private (per-ORB) service
+          configuration repositories.
+
+        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h:
+        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.cpp:
+        * tests/ORB_Local_Config/lib/lib.mpc:
+
+          Common test code.
+
+        * tests/ORB_Local_Config/Bunch/Bunch.mpc:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.UTF-16.conf:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.UTF-16.conf.xml:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.WCHAR_T.conf:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.WCHAR_T.conf.xml:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.conf:
+        * tests/ORB_Local_Config/Bunch/Service_Config_Test.conf.xml:
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
+        * tests/ORB_Local_Config/Bunch/run_test.pl:
+
+          A collection of miscellaneous tests for compatibility of the new
+          interfaces with the old; Processing of the command-line
+          directives; Loading dynamic services in a local repository;
+          Loading the ORBInitializer_Registry locally; Test the helper
+          components used to implement the temporary substitution of the
+          repository currently used as "global" for the sake of
+          registering static services, which are dependent on a dynamic
+          service;
+
+        * tests/ORB_Local_Config/Limits/Limits.mpc:
+        * tests/ORB_Local_Config/Limits/Test.cpp:
+        * tests/ORB_Local_Config/Limits/run_test.pl:
+
+          Testing the size limits of a gestalt.
+
+        * tests/ORB_Local_Config/Separation/Separation.mpc:
+        * tests/ORB_Local_Config/Separation/Test.cpp:
+        * tests/ORB_Local_Config/Separation/run_test.pl:
+
+          Services registered with separate repositories must remain
+          separate and inaccessible through anyone but the gestalt they
+          were registered with.
+
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/run_test.pl:
+
+          Tests the working of the ACE_Dynamic_Service_Dependency class
+
+        * tests/ORB_Local_Config/Shared/Shared.mpc:
+        * tests/ORB_Local_Config/Shared/Test.cpp:
+        * tests/ORB_Local_Config/Shared/run_test.pl:
+
+          Test that the default repository is available through any
+          Service Gestalt, created with its default ctor.
+
+        * tests/ORB_Local_Config/Simple/Simple.mpc:
+        * tests/ORB_Local_Config/Simple/Test.cpp:
+        * tests/ORB_Local_Config/Simple/run_test.pl:
+
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h:
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test2.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.idl:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
+        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl:
+        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
+
+          Testing the loading a dynamic service, which initializes its own
+          ORB. The test is a variant of the Hello test with the twist that
+          both the client and the server are service objects, loaded by
+          the Service Configuration mechanism.
+
+Wed Apr 26 20:09:33 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/EndpointPolicy/EndpointPolicyC.h:
+        * tao/EndpointPolicy/EndpointPolicyC.cpp:
+
+          Fixed fuzz errors.
+
+        * tao/EndpointPolicy/EndpointPolicyC.inl:
+
+          Removed this file.
+
+Wed Apr 26 19:44:36 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Removed -Sa and -St from the IDL compiler command line options
-          (pulled in from taoidldefaults.mpb), since the client code
-          uses DII.
+        * tao/Makefile.am:
 
-Fri Dec  1 14:59:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Regenerated.
 
-        * orbsvcs/tests/Event/UDP/Makefile.am:
-        * tests/Param_Test/Makefile.am:
+        * tao/EndpointPolicy.mpc:
 
-          Regenerated.
+          Added Pkgconfig_Files definition.
 
-Fri Dec  1 13:49:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/EndpointPolicy/TAO_EndpointPolicy.pc.in:
 
-        * tests/Param_Test/Param_Test.mpc:
-          Added explicit build order and removed -Sa and -St from the
-          idlflags
+          New file, pkg-config *.pc template for TAO_EndpointPolicy
+          library.
 
-Fri Dec  1 13:37:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Apr 26 19:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * docs/Security/Download.html:
-        * docs/tutorials/Quoter/index.html:
-          Updated download location of ACE/TAO/CIAO
+        * tests/OBV/Simple/Client_i.h:
+          Fixed casing of include
 
-Fri Dec  1 13:35:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Apr 26 19:13:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * TAO-INSTALL.html:
-          Updated download location of ACE/TAO/CIAO
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/params.h:
+        * tao/params.i:
+        * tao/params.cpp:
 
-Fri Dec  1 12:27:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          This change was of OCI by David.Gibbs@igindex.co.uk. He had
+          previously requested the addition of support for SO_KEEPALIVE
+          and as a result we found that the framework existed for
+          communicating a value of SO_DONTROUTE, so it was decided that we
+          go ahead and add the feature. I consider this change provisional
+          in that it isn't strictly required and so if someone strongly
+          objects to its existence it can be pulled. Otherwise it is
+          simply completing what someone else had started a while ago by
+          adding configuration values for socket options to IIOP protocol
+          properties definition.
 
-        * orbsvcs/tests/Event/UDP/RtEC_UDP.mpc:
-          Fixed invalid filenames in this test
+Wed Apr 26 18:47:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Thu Nov 30 18:01:43 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core.h:
 
-        * tao/AnyTypeCode/BasicTypeTraits.cpp:
-        * tao/AnyTypeCode/BasicTypeTraits.h:
+          Add an alternate connection timeout hook. This is necessary for
+          users of the Optimized Connect Endpoint Selector with its
+          timeout while also using CORBA messaging and the Connection
+          Timeout policy. Both of these connection timeouts are
+          dynamically loaded and one would override the other. This change
+          allows both to be loaded, and if both are initialized to nonzero
+          values, the lesser of the two timeouts is used. This results
+          from a bug originally reported to OCI by friedhelm.wolf@homag.de.
 
-          Added one-line convert() method to each specialization,
-          since returning the extraction type in
-          DynAnyBasicTypeUtils<>::get_value() is not correct for
-          chars, wchars, octets and booleans.
+        * tao/Strategies/OC_Endpoint_Selector_Loader.cpp:
+        * tao/Strategies/OC_Endpoint_Selector_Loader.h:
 
-        * tao/DynamicAny/DynAnyUtils_T.h:
+          Cleaned up the initializer to be more consistent with others.
 
-          Replaced an implicit temporary in
-          DynAnyBasicTypeUtils<>::get_value() with an explicit
-          constructor call, since the temporary was confused with a
-          cast by some compilers.
+        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
 
-        * tests/DynAny_Test/analyzer.cpp:
+          Fixed wihtespace in debug output.
+
+Wed Apr 26 16:42:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * docs/Options.html:
+
+          Adding text for the new commandline options used to control the
+          parallel connect feature.
+
+        * tao/Blocked_Connect_Strategy.h:
+        * tao/Blocked_Connect_Strategy.cpp:
+        * tao/CORBALOC_Parser.cpp:
+        * tao/Client_Strategy_Factory.h:
+        * tao/Client_Strategy_Factory.cpp:
+        * tao/Connect_Strategy.h:
+        * tao/Connect_Strategy.cpp:
+        * tao/Endpoint.h:
+        * tao/Endpoint.cpp:
+        * tao/IIOP_Connection_Handler.h:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/IIOP_Connector.h:
+        * tao/IIOP_Connector.cpp:
+        * tao/IIOP_Endpoint.h:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Profile.h:
+        * tao/IIOP_Profile.cpp:
+        * tao/Invocation_Endpoint_Selectors.h:
+        * tao/Invocation_Endpoint_Selectors.cpp:
+        * tao/LF_CH_Event.h:
+        * tao/LF_Connect_Strategy.h:
+        * tao/LF_Connect_Strategy.cpp:
+        * tao/LF_Event.h:
+        * tao/LF_Multi_Event.h:
+        * tao/LF_Multi_Event.cpp:
+        * tao/MProfile.h:
+        * tao/MProfile.i:
+        * tao/MProfile.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/Profile.h:
+        * tao/Profile.cpp:
+        * tao/Profile_Transport_Resolver.h:
+        * tao/Profile_Transport_Resolver.cpp:
+        * tao/Reactive_Connect_Strategy.h:
+        * tao/Reactive_Connect_Strategy.cpp:
+        * tao/Transport.cpp:
+        * tao/Transport_Connector.h:
+        * tao/Transport_Connector.cpp:
+        * tao/Transport_Descriptor_Interface.h:
+        * tao/Transport_Descriptor_Interface.inl:
+        * tao/Transport_Descriptor_Interface.cpp:
+        * tao/default_client.h:
+        * tao/default_client.cpp:
+        * tao/params.h:
+        * tao/params.i:
+        * tao/params.cpp:
+        * tao/tao.mpc:
 
-          Replace a call to length() on an aliased array typecode
-          (which returned a BADKIND exception) to a call on the
-          unaliased typecode.
+          These changes support a new technique for active connection
+          establishment when presented with a profile containing multiple
+          possible endpoints. This commit resolves bugzilla bug #2485.
+
+          The technique in question is "parallel connects" meaning
+          attempting to connect to many endpoints simultaniously. It was
+          conceived as a way to deal with timeouts when the Invocation
+          Endpoint Selector would first try to connect to one or more
+          unreachable endpoints. If those endpoints were defined as IP
+          addresses (not hostnames) or as resolvable hostnames that
+          pointed to unreachable IP addresses, the connection
+          establishment would take potentially several minutes to time out
+          and eventually encounter a reachable endpoint. In the case of
+          shared profiles (those using TAG_ALTERNATE_IIOP_ENDPOINT) this
+          delay impacts every single invocation.
+
+          This parallel connect feature (also referred to somewhat
+          inacurately as a strategy) avoids this by supplying all the
+          endpoints in a profile to the connector and letting it first
+          test to see if any are already cached and available, and if not,
+          to open connections to each and wait for a winner. When the
+          first connection completes, any pending connections are
+          terminated.
+
+          In order to minimize the use of pending connections, an iterator
+          traverses the list of endpoints creating new connections and
+          also checking any existing connections for completion. If the
+          first endpoint happens to be reachable and the server responds
+          quickly enough, the client may not open any more connections.
+
+          If the server does not respond immediately, a wait strategy is
+          entered. This wait strategy may be Reactive or Leader/Follower
+          based. In either case, a specal "multi event" type is used to
+          allow a single thread to wait on one of many connectors, and
+          then to clean up those that didn't finish in time. The parallel
+          connect feature is also available using blocking connects, but
+          the only advantage there is in checking the cache for all
+          endpoints in the profile, there is no performance gain during
+          actual connection establishment.
+
+          The parallel connect strategy differs from another endpoint
+          selection optimization, available in
+          tao/Strategies/Optimized_Connection_Endpoint_Selector.*. That
+          strategy works by examining all profiles simultaniously, this
+          feature still treats separate profiles separately. This profile
+          separation is necessary to support Load Balancing and Fault
+          Tolerence. Also, this feature requires additional support to be
+          built into protocol specific connectors (IIOP is currently the
+          only protocol supporting parallel connects) whereas the other
+          feature works regardless of the protocol.
+
+          As this is a new feature, it is disabled by default. Use the
+          -ORBUseParallelConnects option to enable its use. A second
+          option, -ORBParallelConnectDelay, is used to introduce a small
+          delay between the opening of new potential connections if the
+          server is particularly busy. This is useful to minimize the
+          impact on a busy server if more than one of the available
+          endpoints is reachable. Also, because this feature only focuses
+          on one profile at a time, the server must be run with
+          -ORBUseSharedProfiles enabled (it is disabled by default).
 
-Thu Nov 30 14:48:57 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
-        * tao/PortableServer/Var_Size_SArgument_T.cpp
-        * tao/Bounded_Sequence_CDR_T.h
-        * tao/Unbounded_Sequence_CDR_T.h
+        * tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc:
+        * tests/Parallel_Connect_Strategy/README:
+        * tests/Parallel_Connect_Strategy/Test.idl:
+        * tests/Parallel_Connect_Strategy/Test_i.h:
+        * tests/Parallel_Connect_Strategy/Test_i.cpp:
+        * tests/Parallel_Connect_Strategy/blocked.conf:
+        * tests/Parallel_Connect_Strategy/client.cpp:
+        * tests/Parallel_Connect_Strategy/reactive.conf:
+        * tests/Parallel_Connect_Strategy/run_test.pl:
+        * tests/Parallel_Connect_Strategy/server.cpp:
+
+          This is a new test for the parallel connect feature. It works by
+          having the server open two endpoints, one aliased to something
+          unreachable. The client then uses different wait strategies to
+          make invocations on the server and records the time for
+          each. These tests also include counter-examples in which
+          parallel connects are not used, and these take several minutes
+          to run. On my Linux machine the timeout period is about 3
+          minutes which causes the overall test to take about 9 minutes to
+          run.
+
+Wed Apr 26 16:30:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/PortableServer/POAManagerFactory.cpp:
+
+          Correct a bug found by the Borland compiler.
+
+Wed Apr 26 13:47:28 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Fix for bugzilla 1676 (uninitialized "out" param for sequence<string>
-          can cause server to core). Old attempt to fix this was also removed.
+        * tao/EndpointPolicy.mpc:
+        * tao/EndpointPolicy/EndpointPolicy.h:
+        * tao/EndpointPolicy/EndpointPolicy.pidl:
+        * tao/EndpointPolicy/EndpointPolicy.cpp:
+        * tao/EndpointPolicy/EndpointPolicyA.h:
+        * tao/EndpointPolicy/EndpointPolicyA.cpp:
+        * tao/EndpointPolicy/EndpointPolicyC.h:
+        * tao/EndpointPolicy/EndpointPolicyC.inl:
+        * tao/EndpointPolicy/EndpointPolicyC.cpp:
+        * tao/EndpointPolicy/EndpointPolicyType.pidl:
+        * tao/EndpointPolicy/EndpointPolicyTypeA.h:
+        * tao/EndpointPolicy/EndpointPolicyTypeA.cpp:
+        * tao/EndpointPolicy/EndpointPolicyTypeC.h:
+        * tao/EndpointPolicy/EndpointPolicyTypeC.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_Export.h:
+        * tao/EndpointPolicy/EndpointPolicy_Factory.h:
+        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h:
+        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_i.h:
+        * tao/EndpointPolicy/EndpointPolicy_i.cpp:
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.h:
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h:
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp:
+        * tao/EndpointPolicy/Endpoint_Value_Impl.h:
+        * tao/EndpointPolicy/IIOPEndpointValue.pidl:
+        * tao/EndpointPolicy/IIOPEndpointValueA.h:
+        * tao/EndpointPolicy/IIOPEndpointValueA.cpp:
+        * tao/EndpointPolicy/IIOPEndpointValueC.h:
+        * tao/EndpointPolicy/IIOPEndpointValueC.cpp:
+        * tao/EndpointPolicy/IIOPEndpointValue_i.h:
+        * tao/EndpointPolicy/IIOPEndpointValue_i.cpp:
+
+          The EndpointPolicy is a new, TAO-specific policy that is applied
+          to POAManagers via the POAManagerFactory. This commit resolves
+          Bugzilla bug #2484.
+
+          The Endpoint policy acts as a filter for constraining the final
+          endpoints or profiles listed in an IOR when it is created by a
+          POA associated with the POAManager containing the policy. The
+          EndpointPolicy value is a sequence, allow multiple endpoints to
+          be published.
+
+          The way this works is that the ORB is initialized with all the
+          -ORBEndpoint options it needs to provide access to all the
+          objects it will serve. Then POAManagers are created with
+          Endpoint policies that contain only the endpoints that are to be
+          used for its subset of objects. For instance, the ORB could
+          define one endpoint for insecure, internal-use-only objects, and
+          another for secure internet-facing objects. Using the Endpoint
+          Policy these different objects would only get one or the other
+          endpoint. Mechanically what happens is that first all Acceptors
+          are queried to construct an MProfile, then the resulting
+          profiles/endpoints are compared to entries in the policy, those
+          not matching are eliminated. It is possible that an endpoint
+          policy will exclude all the profiles, which would result in an
+          exception being raised at object reference construction time.
+
+          Endpoints are matched in their final form. This means that if an
+          IIOP Endpoint makes use of the hostname_in_ior attribute, that
+          is the name the policy will use to match.
+
+          Endpoint values are protocol specific. A value for IIOP is
+          provided, but new values must be defined to support other
+          protocols. The Endpoint value is a local object. New protocol
+          specific values do not have to be added to the
+          TAO_EndpointPolicy library, but they must specialize
+          EndpointPolicy::ValueBase and the implementation must derive
+          from TAO_Endpoint_Value_Impl.
+
+        * tao/IIOP_Endpoint.h:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Profile.h:
+        * tao/IIOP_Profile.cpp:
+        * tao/Profile.h:
+        * tao/Profile.cpp:
+
+          The profile contains the base endpoint as an attribute. This
+          caused a problem for the endpoint removal scheme mentioned
+          above. If a profile contains two or more endpoints, and the base
+          happens to be the one to be eliminated as a result of the
+          endpoint comparison, the only thing that could be done is to
+          copy the contents of the first alternate into the base, then
+          eliminate the duplicate.
 
-Thu Nov 30 14:17:22 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/orbconf.h:
 
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp (visit_union_pos):
+          Added a tag for the new policy.
 
-          Change to use the new DynAnyFactory method similar to the
-          change to Log_Constraint_Visitors.cpp in
+        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
+        * tests/POA/EndpointPolicy/Hello.h:
+        * tests/POA/EndpointPolicy/Hello.cpp:
+        * tests/POA/EndpointPolicy/README:
+        * tests/POA/EndpointPolicy/Test.idl:
+        * tests/POA/EndpointPolicy/client.cpp:
+        * tests/POA/EndpointPolicy/run_test.pl:
+        * tests/POA/EndpointPolicy/server.cpp:
+        * tests/POA/README:
+
+          A new test case for the endpoint policy. This test currently
+          fails due to an unresolved interaction with the sequence
+          code. The error appears to be related to memory corruption, but
+          the cause has not yet been determined. The error only manifests
+          when the multiple profiles portion of the test is being
+          run. This is where an unmodified IOR would contain two profiles,
+          each with one endpoint. The problem does not occur when a single
+          profile has two endpoints.
+
+Wed Apr 26 14:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Tue Nov 28 19:32:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tests/Smart_Proxies/client.cpp:
+        * tests/Smart_Proxies/Benchmark/client.cpp:
+        * tests/Smart_Proxies/dtor/client.cpp:
+        * tests/Smart_Proxies/Policy/client.cpp:
+          Removed remarks about the KAI compiler, more compilers do
+          give these warnings and support for the KAI compilers
+          has been removed
 
-Thu Nov 30 13:28:22 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+Wed Apr 26 13:29:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/lex.yy.cpp.diff:
+        * orbsvcs/examples/ORT/Server_IORInterceptor.h:
+        * orbsvcs/examples/ORT/Server_IORInterceptor.cpp:
 
-          Recreated the diff file (and reprocessed idl.ll).  patch had
-          problems applying the diff that was in the repository (at least on
-          Linux).
+        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp:
 
-Thu Nov 30 13:06:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/PortableGroup/GOA.h:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp:
 
-        * tao/DynamicAny/DynAny_i.cpp
-        * tao/DynamicAny/DynArray_i.cpp (init_common):
-        * tao/DynamicAny/DynEnum_i.cpp (init_common):
-        * tao/DynamicAny/DynSequence_i.cpp (init_common):
-        * tao/DynamicAny/DynStruct_i.cpp (init_common):
-        * tao/DynamicAny/DynUnion_i.cpp (init_common):
-          Use true/false for a bool
+        * tao/AnyTypeCode/PI_ForwardA.h:
 
-Thu Nov 30 12:52:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+        * tao/CSD_Framework/CSD_POA.h:
+        * tao/CSD_Framework/CSD_POA.cpp:
 
-        * tao/DynamicAny/DynCommon.cpp:
-          Fixed conversion warnings and const changes
+        * tao/IORInterceptor/IORInfo.h:
+        * tao/IORInterceptor/IORInfo.cpp:
+        * tao/IORInterceptor/IORInfoC.h:
+        * tao/IORInterceptor/IORInterceptorC.h:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
 
-        * tao/DynamicAny/DynAnyUtils_T.h:
-          Made the code compiling with BCB6 and VC8 but with GCC there
-          are some more issues to be resolved
+        * tao/IORInterceptor_Adapter.h:
+        * tao/PI_Forward.pidl:
+        * tao/PI_ForwardC.h:
 
-Thu Nov 30 09:58:02 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
+        * tao/RTPortableServer/RT_POA.h:
+        * tao/RTPortableServer/RT_POA.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.h:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
 
-        * tao/Stub.cpp
-        * tao/Stub.inl
-        * tao/Service_Callbacks.cpp
-        * tao/Service_Callbacks.h
-        * tao/ORB_Core.cpp
-        * tao/ORB_Core.inl
-        * tao/ORB_Core.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+        * tests/ORT/ORT_test_IORInterceptor.h:
+        * tests/ORT/ORT_test_IORInterceptor.cpp:
 
-          Fix for bugzilla 2709.
+        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
+        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp:
 
-Thu Nov 30 05:52:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          These are more changes related to the POAManagerFactory. They
+          are coupled with my 13:10:59 utc checkin.
 
-        * tests/Bug_2417_Regression/Makefile.am:
-        * tests/Bug_2654_Regression/Makefile.am:
-        * tests/Bug_2709_Regression/Makefile.am:
-        * tests/Hang_Shutdown/Makefile.am:
-        * tests/ICMG_Any_Bug/Makefile.am:
-        * tests/OctetSeq/Makefile.am:
-        * tests/Param_Test/Makefile.am:
-        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
-        * tests/RTCORBA/Client_Propagated/Makefile.am:
-        * tests/Timeout/Makefile.am:
+Wed Apr 26 13:10:59 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Regenerated.
+        * tao/PortableServer/Acceptor_Filter_Factory.h:
+        * tao/PortableServer/Acceptor_Filter_Factory.cpp:
+        * tao/PortableServer/Default_Acceptor_Filter.h:
+        * tao/PortableServer/Default_Servant_Dispatcher.h:
+        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/POAManager.h:
+        * tao/PortableServer/POAManager.i:
+        * tao/PortableServer/POAManager.pidl:
+        * tao/PortableServer/POAManager.cpp:
+        * tao/PortableServer/POAManagerC.h:
+        * tao/PortableServer/POAManagerFactory.h:
+        * tao/PortableServer/POAManagerFactory.cpp:
+        * tao/PortableServer/POAManagerFactory.pidl:
+        * tao/PortableServer/POAManagerFactoryC.h:
+        * tao/PortableServer/POAManagerFactoryC.cpp:
+        * tao/PortableServer/PortableServer.h:
+        * tao/PortableServer/PortableServer.pidl:
+        * tao/PortableServer/PortableServerC.h:
+        * tao/PortableServer/Regular_POA.h:
+        * tao/PortableServer/Regular_POA.cpp:
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Servant_Dispatcher.h:
+
+          These files are new/updated to support the POAManagerFactory,
+          which was added to the CORBA 3.0.2 specification. The PMF is
+          used to allow for the explicit creation of POA Managers which
+          can then be supplied to POAs during POA creation. POA Managers
+          may now also carry policies which will influence all POAs
+          associated with it. This work builds on the effort originally
+          started by Johnny Willemsen back in the pre-1.4.8 era. This
+          commit resolves Bugzilla bug #1785.
+
+        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
+        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
+        * tests/POA/POAManagerFactory/run_test.pl:
 
-        * tests/Bug_2417_Regression/Bug_2417_Regression.mpc:
-        * tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
-        * tests/Bug_2709_Regression/Bug_2709_Regression.mpc:
-        * tests/Hang_Shutdown/Hang.mpc:
-        * tests/ICMG_Any_Bug/Hello.mpc:
-        * tests/OctetSeq/OctetSeq.mpc:
-        * tests/Param_Test/Param_Test.mpc:
-        * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc:
-        * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc:
-        * tests/Timeout/Timeout.mpc:
+          This is a new test for the POAManagerFactory.
 
-          Split out IDL compilation into separate MPC project.
+Wed Apr 26 13:01:48 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Thu Nov 30 05:48:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Valuetype/AbstractBase.cpp:
+        * tao/Valuetype/AbstractBase.h:
+          The _tao_marshal_v method is supposed to be const.
 
-        * configure.ac:
+Wed Apr 26 13:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added AM_CONDITIONAL for BUILD_JAVA, so we can handle
-          Makefile.am's with these options.  Default to false, until we
-          can write feature tests for this option.
+        * tests/POA/Bug_2511_Regression/*:
+          Added new regression for bug 2511. Thanks to Martin Cornelius
+          <Martin at Cornelius at smiths-heimann dot com> for creating
+          this regression
 
-Thu Nov 30 05:44:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Wed Apr 26 12:20:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * examples/OBV/Typed_Events/Makefile.am:
+        * tests/AMI/ami_test.idl:
+        * tests/AMI/ami_test_i.cpp:
+        * tests/AMI/simple_client.cpp:
+          Reverting earlier test changes. They were causing problems on
+          some platforms and I don't have a clear enough memory of the
+          original motivation for the change.
 
-          Regenerated.
+Wed Apr 26 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Nov 29 17:43:45 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
+          Fixed a bug in these tests, in the test code for element 0 of
+          a string sequence was set and after that the length was set to 1.
+          The setting of 0 is possible because the OMG doesn't define
+          exceptions for this so it is allowed, then setting the length to
+          1 does reinitialize element 0 so that we don't get old values.
+          This was not done with the old sequences, then just the old
+          value was returned and things worked then.
 
-        * examples/OBV/Typed_Events/Typed_Events.mpc:
+Wed Apr 26 11:21:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Removed the IDL flag -St, which suppressed typecode generation,
-          so the _tao_type() method (which returns a typecode) can be
-          generated for the valuetypes in the IDL - necessary since
-          this method is pure virtual in ValueBase. This is a temporary
-          fix, some discussions are necessary to decide on an approach
-          to integrating _tao_type() with subsetted libraries, IDL
-          compiler command line options, and MPC settings.
+        * tao/Valuetype/ValueBase.cpp:
 
-Wed Nov 29 17:13:33 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Fix for errant removal of throw, this corrects the OBV/Factory
+          test.
 
-        * tao/DynamicAny/DynAnyUtils_T.h:
+Wed Apr 26 10:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Put back some of the 'typename' qualifiers removed in
+        * tao/Unbounded_Sequence_CDR_T.h:
+          Added missing include of SystemException
 
-          Wed Nov 29 000:11:49 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+Wed Apr 26 10:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          since the lack is definitely causing problems with FC4
-          on the scoreboard. I had removed them because I thought
-          they were the cause of problems reported by Phil
-          Mesnier <mesnier_p@ociweb.com>, but perhaps those errors
-          stemmed from something else.
+        * tests/OBV/Simple/*:
+          Added very simple OBV test
 
-Wed Nov 29 16:31:26 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+Wed Apr 26 09:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/AnyTypeCode/BasicTypeTraits.cpp:
-        * tao/AnyTypeCode/BasicTypeTraits.h:
+        * tests/Portable_Interceptors/Bug_2510_Regression:
+          New regression test, thanks to Martin Cornelius
+          <Martin at Cornelius at smiths-heimann dot com> for creating
+          this test. This bug is not fixed yet.
 
-          Added a guard around code for wchars similar to that in
-          tao/Unbounded_Sequence_CDR_T.h, as a workaround for LynxOS,
-          which has no native wchar type. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for the tip.
+Wed Apr 26 09:44:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
 
-Wed Nov 29 13:45:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Bounded_Sequence_CDR_T.h:
+        * tao/Unbounded_Sequence_CDR_T.h:
+          Check in all marshal_sequence methods if we aren't trying to
+          marshal a nill sequence, this can happen when the user doesn't
+          initialize an out argument. In that case we throw a BAD_PARAM
+          exception as described in the C++ spec. This fixes bugzilla bug
+          1676.
 
-        * configure.ac:
+Wed Apr 26 08:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Configure Makefiles for new unit test subdirectories.
-
-        * tests/AMH_Exceptions/Makefile.am:
-        * tests/AMH_Oneway/Makefile.am:
-        * tests/AMI/Makefile.am:
-        * tests/AMI_Buffering/Makefile.am:
-        * tests/AMI_Timeouts/Makefile.am:
-        * tests/Abstract_Interface/Makefile.am:
-        * tests/Any/Makefile.am:
-        * tests/Any/Recursive/Makefile.am:
-        * tests/BiDirectional/Makefile.am:
-        * tests/BiDirectional_DelayedUpcall/Makefile.am:
-        * tests/BiDirectional_MultipleORB/Makefile.am:
-        * tests/BiDirectional_NestedUpcall/Makefile.am:
-        * tests/Big_AMI/Makefile.am:
-        * tests/Big_Oneways/Makefile.am:
-        * tests/Big_Reply/Makefile.am:
-        * tests/Big_Request_Muxing/Makefile.am:
-        * tests/Big_Twoways/Makefile.am:
-        * tests/Blocking_Sync_None/Makefile.am:
-        * tests/Bug_1020_Basic_Regression/Makefile.am:
-        * tests/Bug_1020_Regression/Makefile.am:
-        * tests/Bug_1254_Regression/Makefile.am:
-        * tests/Bug_1269_Regression/Makefile.am:
-        * tests/Bug_1270_Regression/Makefile.am:
-        * tests/Bug_1330_Regression/Makefile.am:
-        * tests/Bug_1361_Regression/Makefile.am:
-        * tests/Bug_1476_Regression/Makefile.am:
-        * tests/Bug_1476_Test/Makefile.am:
-        * tests/Bug_1482_Regression/Makefile.am:
-        * tests/Bug_1495_Regression/Makefile.am:
-        * tests/Bug_1535_Regression/Makefile.am:
-        * tests/Bug_1551_Regression/Makefile.am:
-        * tests/Bug_1568_Regression/Makefile.am:
-        * tests/Bug_1627_Regression/Makefile.am:
-        * tests/Bug_1635_Regression/Makefile.am:
-        * tests/Bug_1636_Regression/Makefile.am:
-        * tests/Bug_1639_Regression/Makefile.am:
-        * tests/Bug_1670_Regression/Makefile.am:
-        * tests/Bug_1676_Regression/Makefile.am:
-        * tests/Bug_1693_Test/Makefile.am:
-        * tests/Bug_1812_Regression/Makefile.am:
-        * tests/Bug_1813_Regression/Makefile.am:
-        * tests/Bug_1869_Regression/Makefile.am:
-        * tests/Bug_1904_Regression/Makefile.am:
-        * tests/Bug_2084_Regression/Makefile.am:
-        * tests/Bug_2119_Regression/Makefile.am:
-        * tests/Bug_2122_Regression/Makefile.am:
-        * tests/Bug_2124_Regression/Makefile.am:
-        * tests/Bug_2126_Regression/Makefile.am:
-        * tests/Bug_2134_Regression/Makefile.am:
-        * tests/Bug_2144_Regression/Makefile.am:
-        * tests/Bug_2174_Regression/Makefile.am:
-        * tests/Bug_2183_Regression/Makefile.am:
-        * tests/Bug_2186_Regression/Makefile.am:
-        * tests/Bug_2188_Regression/Makefile.am:
-        * tests/Bug_2201_Regression/Makefile.am:
-        * tests/Bug_2222_Regression/Makefile.am:
-        * tests/Bug_2234_Regression/Makefile.am:
-        * tests/Bug_2289_Regression/Makefile.am:
-        * tests/Bug_2319_Regression/Makefile.am:
-        * tests/Bug_2328_Regression/Makefile.am:
-        * tests/Bug_2345_Regression/Makefile.am:
-        * tests/Bug_2349_Regression/Makefile.am:
-        * tests/Bug_2375_Regression/Makefile.am:
-        * tests/Bug_2399_Regression/Makefile.am:
-        * tests/Bug_2417_Regression/Makefile.am:
-        * tests/Bug_2419_Regression/Makefile.am:
-        * tests/Bug_2424_Regression/Makefile.am:
-        * tests/Bug_2429_Regression/Makefile.am:
-        * tests/Bug_2494_Regression/Makefile.am:
-        * tests/Bug_2503_Regression/Makefile.am:
-        * tests/Bug_2542_Regression/Makefile.am:
-        * tests/Bug_2543_Regression/Makefile.am:
-        * tests/Bug_2549_Regression/Makefile.am:
-        * tests/Bug_2560_Regression/Makefile.am:
-        * tests/Bug_2593_Regression/Makefile.am:
-        * tests/Bug_2595_Regression/Makefile.am:
-        * tests/Bug_2654_Regression/Makefile.am:
-        * tests/Bug_2669_Regression/Makefile.am:
-        * tests/Bug_2683_Regression/Makefile.am:
-        * tests/Bug_2709_Regression/Makefile.am:
-        * tests/CDR/Makefile.am:
-        * tests/COIOP/Makefile.am:
-        * tests/CSD_Strategy_Tests/Broken/Makefile.am:
-        * tests/CSD_Strategy_Tests/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Common/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am:
-        * tests/Cache_Growth_Test/Makefile.am:
-        * tests/CallbackTest/Makefile.am:
-        * tests/Client_Leaks/Makefile.am:
-        * tests/CodeSets/Makefile.am:
-        * tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am:
-        * tests/CodeSets/libs/Makefile.am:
-        * tests/CodeSets/libs/UCS4_UTF16/Makefile.am:
-        * tests/CodeSets/simple/Makefile.am:
-        * tests/Codec/Makefile.am:
-        * tests/Collocation/Makefile.am:
-        * tests/CollocationLockup/Makefile.am:
-        * tests/Collocation_Exception_Test/Makefile.am:
-        * tests/Collocation_Oneway_Tests/Makefile.am:
-        * tests/Collocation_Opportunities/Makefile.am:
-        * tests/Collocation_Tests/Makefile.am:
-        * tests/Connect_Strategy_Test/Makefile.am:
-        * tests/Connection_Failure/Makefile.am:
-        * tests/Connection_Purging/Makefile.am:
-        * tests/Connection_Timeout/Makefile.am:
-        * tests/Crash_On_Write/Makefile.am:
-        * tests/Crashed_Callback/Makefile.am:
-        * tests/DII_Collocation_Tests/Makefile.am:
-        * tests/DII_Collocation_Tests/oneway/Makefile.am:
-        * tests/DII_Collocation_Tests/twoway/Makefile.am:
-        * tests/DLL_ORB/Makefile.am:
-        * tests/DSI_Gateway/Makefile.am:
-        * tests/DynAny_Test/Makefile.am:
-        * tests/Explicit_Event_Loop/Makefile.am:
-        * tests/Exposed_Policies/Makefile.am:
-        * tests/FL_Cube/Makefile.am:
-        * tests/Faults/Makefile.am:
-        * tests/File_IO/Makefile.am:
-        * tests/Forwarding/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Request/Makefile.am:
-        * tests/GIOP_Fragments/Makefile.am:
-        * tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am:
-        * tests/Hang_Shutdown/Makefile.am:
-        * tests/Hello/Makefile.am:
-        * tests/ICMG_Any_Bug/Makefile.am:
-        * tests/IDL_Test/Makefile.am:
-        * tests/IORManipulation/Makefile.am:
-        * tests/IOR_Endpoint_Hostnames/Makefile.am:
-        * tests/IPV6/Makefile.am:
-        * tests/InterOp-Naming/Makefile.am:
-        * tests/Leader_Followers/Makefile.am:
-        * tests/LongUpcalls/Makefile.am:
-        * tests/MProfile/Makefile.am:
-        * tests/MProfile_Connection_Timeout/Makefile.am:
-        * tests/MProfile_Forwarding/Makefile.am:
-        * tests/MT_BiDir/Makefile.am:
-        * tests/MT_Client/Makefile.am:
-        * tests/MT_Server/Makefile.am:
-        * tests/MT_Timeout/Makefile.am:
-        * tests/Makefile.am:
-        * tests/Multiple/Makefile.am:
-        * tests/Multiple_Inheritance/Makefile.am:
-        * tests/Muxed_GIOP_Versions/Makefile.am:
-        * tests/Muxing/Makefile.am:
-        * tests/Native_Exceptions/Makefile.am:
-        * tests/NestedUpcall/MT_Client_Test/Makefile.am:
-        * tests/NestedUpcall/Makefile.am:
-        * tests/NestedUpcall/Simple/Makefile.am:
-        * tests/NestedUpcall/Triangle_Test/Makefile.am:
-        * tests/Nested_Event_Loop/Makefile.am:
-        * tests/Nested_Upcall_Crash/Makefile.am:
-        * tests/No_Server_MT_Connect_Test/Makefile.am:
-        * tests/OBV/Any/Makefile.am:
-        * tests/OBV/Collocated/Forward/Makefile.am:
-        * tests/OBV/Collocated/Makefile.am:
-        * tests/OBV/Factory/Makefile.am:
-        * tests/OBV/Forward/Makefile.am:
-        * tests/OBV/Makefile.am:
-        * tests/OBV/Simple/Makefile.am:
-        * tests/OBV/TC_Alignment/Makefile.am:
-        * tests/OBV/Truncatable/Makefile.am:
-        * tests/OBV/ValueBox/Makefile.am:
-        * tests/ORB_Local_Config/Bug_1459/Makefile.am:
-        * tests/ORB_Local_Config/Bunch/Makefile.am:
-        * tests/ORB_Local_Config/Makefile.am:
-        * tests/ORB_Local_Config/Separation/Makefile.am:
-        * tests/ORB_Local_Config/Service_Dependency/Makefile.am:
-        * tests/ORB_Local_Config/Shared/Makefile.am:
-        * tests/ORB_Local_Config/Simple/Makefile.am:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am:
-        * tests/ORB_destroy/Makefile.am:
-        * tests/ORB_init/Makefile.am:
-        * tests/ORB_init/Portspan/Makefile.am:
-        * tests/ORB_shutdown/Makefile.am:
-        * tests/ORT/Makefile.am:
-        * tests/Object_Loader/Makefile.am:
-        * tests/Objref_Sequence_Test/Makefile.am:
-        * tests/OctetSeq/Makefile.am:
-        * tests/Ondemand_Write/Makefile.am:
-        * tests/Oneway_Buffering/Makefile.am:
-        * tests/Oneway_Timeouts/Makefile.am:
-        * tests/Oneways_Invoking_Twoways/Makefile.am:
-        * tests/Optimized_Connection/Makefile.am:
-        * tests/POA/Bug_2511_Regression/Makefile.am:
-        * tests/POA/Current/Makefile.am:
-        * tests/POA/Deactivate_Object/Makefile.am:
-        * tests/POA/Default_Servant/Makefile.am:
-        * tests/POA/EndpointPolicy/Makefile.am:
-        * tests/POA/Etherealization/Makefile.am:
-        * tests/POA/Excessive_Object_Deactivations/Makefile.am:
-        * tests/POA/Identity/Makefile.am:
-        * tests/POA/MT_Servant_Locator/Makefile.am:
-        * tests/POA/Makefile.am:
-        * tests/POA/Nested_Non_Servant_Upcalls/Makefile.am:
-        * tests/POA/Non_Servant_Upcalls/Makefile.am:
-        * tests/POA/Object_Reactivation/Makefile.am:
-        * tests/POA/POAManagerFactory/Makefile.am:
-        * tests/POA/POA_Destruction/Makefile.am:
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/POA/Policies/Makefile.am:
-        * tests/POA/Reference_Counting/Makefile.am:
-        * tests/POA/Single_Threaded_POA/Makefile.am:
-        * tests/POA/wait_for_completion/Makefile.am:
-        * tests/Parallel_Connect_Strategy/Makefile.am:
-        * tests/Param_Test/Makefile.am:
-        * tests/Permanent_Forward/Makefile.am:
-        * tests/Policies/Makefile.am:
-        * tests/Portable_Interceptors/AMI/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlot/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlotExt/Makefile.am:
-        * tests/Portable_Interceptors/Benchmark/Makefile.am:
-        * tests/Portable_Interceptors/Bug_1559/Makefile.am:
-        * tests/Portable_Interceptors/Bug_2088/Makefile.am:
-        * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am:
-        * tests/Portable_Interceptors/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/ForwardRequest/Makefile.am:
-        * tests/Portable_Interceptors/IORInterceptor/Makefile.am:
-        * tests/Portable_Interceptors/Makefile.am:
-        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
-        * tests/Portable_Interceptors/PICurrent/Makefile.am:
-        * tests/Portable_Interceptors/PolicyFactory/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
-        * tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am:
-        * tests/Portable_Interceptors/Register_Initial_References/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
-        * tests/Portable_Interceptors/Slot/Makefile.am:
-        * tests/QtTests/Makefile.am:
-        * tests/Queued_Message_Test/Makefile.am:
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am:
-        * tests/RTCORBA/Banded_Connections/Makefile.am:
-        * tests/RTCORBA/Client_Propagated/Makefile.am:
-        * tests/RTCORBA/Client_Protocol/Makefile.am:
-        * tests/RTCORBA/Collocation/Makefile.am:
-        * tests/RTCORBA/Destroy_Thread_Pool/Makefile.am:
-        * tests/RTCORBA/Diffserv/Makefile.am:
-        * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am:
-        * tests/RTCORBA/Explicit_Binding/Makefile.am:
-        * tests/RTCORBA/Linear_Priority/Makefile.am:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am:
-        * tests/RTCORBA/Makefile.am:
-        * tests/RTCORBA/ORB_init/Makefile.am:
-        * tests/RTCORBA/Persistent_IOR/Makefile.am:
-        * tests/RTCORBA/Policies/Makefile.am:
-        * tests/RTCORBA/Policy_Combinations/Makefile.am:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am:
-        * tests/RTCORBA/Private_Connection/Makefile.am:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am:
-        * tests/RTCORBA/RTMutex/Makefile.am:
-        * tests/RTCORBA/Server_Declared/Makefile.am:
-        * tests/RTCORBA/Server_Protocol/Makefile.am:
-        * tests/RTCORBA/Thread_Pool/Makefile.am:
-        * tests/RTScheduling/Current/Makefile.am:
-        * tests/RTScheduling/DT_Spawn/Makefile.am:
-        * tests/RTScheduling/Makefile.am:
-        * tests/RTScheduling/Scheduling_Interceptor/Makefile.am:
-        * tests/RTScheduling/Thread_Cancel/Makefile.am:
-        * tests/RTScheduling/VoidData/Makefile.am:
-        * tests/Reliable_Oneways/Makefile.am:
-        * tests/Sequence_Unit_Tests/Makefile.am:
-        * tests/Servant_To_Reference_Test/Makefile.am:
-        * tests/Server_Connection_Purging/Makefile.am:
-        * tests/Server_Leaks/Makefile.am:
-        * tests/Server_Port_Zero/Makefile.am:
-        * tests/Single_Read/Makefile.am:
-        * tests/Smart_Proxies/Benchmark/Makefile.am:
-        * tests/Smart_Proxies/Collocation/Makefile.am:
-        * tests/Smart_Proxies/Makefile.am:
-        * tests/Smart_Proxies/On_Demand/Makefile.am:
-        * tests/Smart_Proxies/Policy/Makefile.am:
-        * tests/Smart_Proxies/dtor/Makefile.am:
-        * tests/Stack_Recursion/Makefile.am:
-        * tests/Strategies/Makefile.am:
-        * tests/Timed_Buffered_Oneways/Makefile.am:
-        * tests/Timeout/Makefile.am:
-        * tests/Two_Objects/Makefile.am:
-        * tests/Typedef_String_Array/Makefile.am:
-        * tests/UNKNOWN_Exception/Makefile.am:
-        * tests/Xt_Stopwatch/Makefile.am:
-
-          New files, baseline Makefile.am's for TAO's tests subdirectory.
-
-Wed Nov 29 13:25:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * 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/Default_Servant/POA_Default_Servant.mpc:
-        * examples/POA/DSI/POA_DSI.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/examples/Notify/Lanes/Notify_Lanes.mpc:
-        * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc:
-        * orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc:
-        * orbsvcs/examples/ORT/ORT.mpc:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-        * orbsvcs/IFR_Service/IFR_Service.mpc:
-        * orbsvcs/orbsvcs/IFRService.mpc:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc:
-        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc:
-        * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc:
-        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc:
-        * orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc:
-        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
-        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
-        * orbsvcs/tests/FT_App/FT_App.mpc:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
-        * orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.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:
-        * orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc:
-        * orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc:
-        * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
-        * performance-tests/Latency/Deferred/Deferred.mpc:
-        * performance-tests/Latency/DII/DII.mpc:
-        * performance-tests/Latency/DSI/DSI.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/Deferred/Deferred.mpc:
-        * performance-tests/Sequence_Latency/DII/DII.mpc:
-        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
-        * tao/EndpointPolicy.mpc:
-        * tests/Bug_1535_Regression/Bug_1535_Regression.mpc:
-        * tests/Bug_1636_Regression/test.mpc:
-        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc:
-        * tests/Faults/Faults.mpc:
-        * tests/File_IO/File_IO.mpc:
-        * tests/ICMG_Any_Bug/Hello.mpc:
-        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
-        * tests/Param_Test/Param_Test.mpc:
-        * tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc:
-        * tests/POA/Default_Servant/Default_Servant.mpc:
-        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
-        * tests/POA/Etherealization/Etherealization.mpc:
-        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc:
-        * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc:
-        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
-        * tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc:
-        * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc:
-        * tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.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:
-        * tests/Servant_To_Reference_Test/Servant_to_Reference.mpc:
-          Added avoids_corba_e_compact as base project, these all
-          have also avoids_minimum_corba, so it was just a search/
-          replace.
-
-Wed Nov 29 12:07:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
+        * tao/ObjRefTemplate/Default_ORTC.h:
+        * tao/Messaging/ExceptionHolderC.h:
+          Include the Valuetype_Adapter_Factory_Impl.h so that the
+          Valuetype library gets linked in a static build, this is
+          already updated earlier in the IDL compiler
 
-        * TAO_IDL/be/be_codegen.cpp:
-          When generating the A.h file we don't need to generate an include
-          of another A.h file when we include a .idl file
+Wed Apr 26 08:17:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
 
-Wed Nov 29 02:51:19 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/Bug_1676_Regression/client.cpp:
+          Extended this test to explicitly test for BAD_PARAM exception
+          when the server not initializes an out argument
 
-        * configure.ac:
+Wed Apr 26 07:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Configure Makefiles for new unit test subdirectories.
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+          Removed invalid template export
 
-        * examples/Makefile.am:
+Wed Apr 26 03:46:16 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Regenerate to descend into CSD_Strategy subdirectory.
+        * tao/Valuetype/AbstractBase.cpp:
 
-        * examples/CSD_Strategy/ThreadPool/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+          Fixed scoreboard detected warning.
 
-          Regenerate.
+Tue Apr 25 19:24:48 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
-        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
-        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
-        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
-        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
 
-          Split out IDL compilation into separate MPC project.
+          Missed a patch from the earlier commit.
 
-        * tao/Makefile.am:
+Tue Apr 25 19:09:08 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          Regenerate.
+        * orbsvcs/examples/ORT/Server_IORInterceptor.h:
+        * orbsvcs/examples/ORT/Server_IORInterceptor.cpp:
 
-Wed Nov 29 000:11:49 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp:
 
-        * tao/DynamicAny/DynAnyUtils_T.h:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.h:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp:
 
-          Removed some 'typename' qualifiers that Visual Studio seems
-          fine with either way, but which may be causing problems
-          with gcc.
+        * tao/AnyTypeCode/PI_ForwardA.h:
 
-Tue Nov 28 22:44:08 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+        * tao/CSD_Framework/CSD_POA.h:
+        * tao/CSD_Framework/CSD_POA.cpp:
 
-        * tao/DynamicAny/DynStruct_i.cpp:
+        * tao/IIOP_Endpoint.h:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Profile.h:
+        * tao/IIOP_Profile.cpp:
 
-          Fixed typo (case error) in #include directive.
+        * tao/IORInterceptor/IORInfo.h:
+        * tao/IORInterceptor/IORInfo.cpp:
+        * tao/IORInterceptor/IORInfoC.h:
+        * tao/IORInterceptor/IORInterceptorC.h:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
 
-        * tao/AnyTypeCode/BasicTypeTraits.h:
+        * tao/IORInterceptor_Adapter.h:
+        * tao/PI_Forward.pidl:
+        * tao/PI_ForwardC.h:
 
-          Replace forward declaration of enum TCKind with #include of
-          tao/Typecode_typesC.h to eliminate gcc complaints.
+        * tao/PortableServer/Default_Acceptor_Filter.h:
+        * tao/PortableServer/Default_Servant_Dispatcher.h:
+        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/POAManager.h:
+        * tao/PortableServer/POAManager.i:
+        * tao/PortableServer/POAManager.cpp:
+        * tao/PortableServer/POAManager.pidl:
+        * tao/PortableServer/POAManagerC.h:
+        * tao/PortableServer/PortableServer.h:
+        * tao/PortableServer/PortableServer.pidl:
+        * tao/PortableServer/PortableServerC.h:
+        * tao/PortableServer/Regular_POA.h:
+        * tao/PortableServer/Regular_POA.cpp:
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Servant_Dispatcher.h:
 
-Tue Nov 28 22:17:08 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/Profile.h:
+        * tao/Profile.cpp:
 
-        * tao/AnyTypeCode/BasicTypeTraits_T.h:
+        * tao/RTPortableServer/RT_POA.h:
+        * tao/RTPortableServer/RT_POA.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.h:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
 
-          Added missing newline at the end of the file. Thanks to
-          Phil Mesnier <mesnier_p@ociweb.com> for reporting it.
+        * tao/orbconf.h:
+        * tao/params.cpp:
 
-Tue Nov 28 21:00:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tests/ORT/ORT_test_IORInterceptor.h:
+        * tests/ORT/ORT_test_IORInterceptor.cpp:
 
-        * TAO_IDL/fe/lex.yy.cpp.diff:
+        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
+        * tests/POA/EndpointPolicy/Hello.h:
+        * tests/POA/EndpointPolicy/Hello.cpp:
+        * tests/POA/EndpointPolicy/README:
+        * tests/POA/EndpointPolicy/Test.idl:
+        * tests/POA/EndpointPolicy/client.cpp:
+        * tests/POA/EndpointPolicy/run_test.pl:
+        * tests/POA/EndpointPolicy/server.cpp:
+
+        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
+        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
+        * tests/POA/POAManagerFactory/run_test.pl:
 
-          Applied patch sent by Chad Elliott <elliott_c@ociweb.com>.
+        * tests/POA/README:
 
-Tue Nov 28 20:03:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
+        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp:
 
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-          Improvement to the script for running on platforms with many
-          endpoints, such as those with IPv6. These improvements were
-          motivated by the discovery that the use of environment variables
-          by the ImplRepo Activator leads to trouble if the IMR IOR is
-          particularly long, which can happen if multiple profiles are
-          included in the IOR.
+Tue Apr 25 17:38:34 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Tue Nov 28 19:32:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * tao/Messaging/ExceptionHolderC.h:
+        * tao/Messaging/ExceptionHolderC.cpp:
+        * tao/ObjRefTemplate/Default_ORTC.h:
+        * tao/ObjRefTemplate/Default_ORTC.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/AbstractBase.cpp:
+        * tao/Valuetype/StringValueC.h:
+        * tao/Valuetype/StringValueC.inl:
+        * tao/Valuetype/ValueBase.h:
+        * tao/Valuetype/ValueBase.cpp:
 
-        * tao/AnyTypeCode/BasicTypeTraits.cpp:
-        * tao/AnyTypeCode/BasicTypeTraits.h:
-        * tao/AnyTypeCode/BasicTypeTraits_T.h:
+          These are further valuetype changes that are related to Bugzilla
+          #2162. The problem is that TAO assumes that a valuetype's
+          typecode is always encoded as 0x7FFFFF02 <repID> but that is not
+          compliant with the spec. It is also valid to encode a valuetype
+          typecode as 0x7FFFFF00 which indicates that the actual type of
+          the value matches the formal type for the argument for which the
+          value is a parameter.  TAO already had most of the hooks in
+          place to support this, but was missing a key bit of
+          functionality. This patch adds that functionality, the ability
+          to test that the formal type matches the actual type when
+          marshaling values.
+
+          Valuetypes encoded this way are substantially more efficient, if
+          the type can be implied then there is no need to carry the
+          actual type id.  Unfortunately to do so blindly would break
+          backwards compatibility with all previous versions of TAO.
+          For the time being, the effective code to cause TAO to marshal
+          values using the more efficient typecode is disabled using a new
+          compile-time flag, TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING,
+          which must be defined to give TAO the opportunity to use this
+          new technique. THIS FLAG BREAKS BACKWARDS COMPATIBILITY. It is
+          not a violation of the spec to always encode the valuetype's
+          type ID when marshaling, so TAO can continue being backwards
+          compatible and not be in violation of the spec. The only
+          violation comes when failing to unmarshal a value which is using
+          an implied type ID.
+
+          I would prefer to not have a compiler flag to guard the use of
+          optimized marshaling, but I don't know any other way to do it.
+          At the point where the decision is made, there is no reference
+          to an ORB Core so there is no easy way to set a dynamic option
+          that could be used to selectively control this optimization.
+
+Tue Apr 25 15:14:13 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+          Merging in truncatable valuetype support. This work was done on
+          an OCI controlled patch then brought in via patch. The premise
+          is to support the "truncatable" keyword for valuetypes as
+          defined in sections 3.9.1.3, 5.2.5.3 and 15.3.4.1 of the CORBA
+          3.0.3 specification. Practically, this means supporting the
+          marshaling of typecode lists and chunked values. Chunked values
+          requires the retention of state, namely nesting level, during
+          the marshaling. This was handled by creating a new ChunkInfo
+          type that is created on the stack during the marshaling of a
+          valuetype and is passed through all the intermediate marshal
+          methods. This commit resolves Bugzilla #2483
+
+        * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
 
-          New files, defining and specializing template
-          utiities for using Anys and typecodes with
-          IDL basic types.
+          Valueboxes by definition cannot be made truncatable, but they
+          derive from the same valuebase, thus they must support the same
+          signature for creating a list of repository ids. Otherwise these
+          are whitespace only changes.
 
-        * tao/AnyTypeCode.mpc:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
 
-          Added new files described above.
+          These are changes for generating code that manages the chunkinfo
+          data as it passes through the value members.
 
-        * tao/DynamicAny/DynAnyUtils_T.h:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp:
 
-          New file containing templatized code factored
-          out from the insert_* and get_* methods, and
-          using the AnyTypeCode utilities described above.
-          Also contains code factored out from
-          DynAnyFactory methods.
+          Whitespace changes.
 
-        * tao/DynamicAny/DynValue_i.cpp:
-        * tao/DynamicAny/DynAnyFactory.h:
-        * tao/DynamicAny/DynArray_i.cpp:
-        * tao/DynamicAny/DynCommon.cpp:
-        * tao/DynamicAny/DynStruct_i.cpp:
-        * tao/DynamicAny/DynCommon.h:
-        * tao/DynamicAny/DynValueBox_i.cpp:
-        * tao/DynamicAny/DynValueCommon_i.cpp:
-        * tao/DynamicAny/DynAny_i.cpp:
-        * tao/DynamicAny/DynUnion_i.cpp:
-        * tao/DynamicAny/DynUnion_i.h:
-        * tao/DynamicAny/DynAnyFactory.cpp:
-        * tao/DynamicAny/DynSequence_i.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
 
-          - Added implementations of get_*_seq()
-            and insert_*_seq(), spec-defined
-            methods for each IDL basic type.
+          Removed the warning about support for truncatables.
 
-          - Added implementation of insert_abstract()
-            and get_abstract().
+        * tao/AnyTypeCode/skip.cpp:
 
-          - Factored out code from existing insert_*
-            and get_* methods to templatized
-            utility code described above.
+          Fixed the type for the valuetag.
 
-          - Factored out code from DynAnyFactory
-            methods similarly.
+        * tao/Messaging/ExceptionHolderC.h:
+        * tao/Messaging/ExceptionHolderC.cpp:
+        * tao/ObjRefTemplate/Default_ORTC.h:
+        * tao/ObjRefTemplate/Default_ORTC.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
 
-          - Fixed bug in get_reference() and get_val()
-            that (incorrectly) took ownership of the
-            dynamic any's contents. Thanks to Phil
-            Mesnier <mesnier_p@ociweb.com> for
-            reporting the bug.
+          These are the changes required by the truncatable support that
+          would ordinarily be generated by the IDL compiler.
 
         * tao/Valuetype/AbstractBase.h:
         * tao/Valuetype/AbstractBase.cpp:
-
-          Added declaration and definition of typecode
-          for AbstractBase.
-
+        * tao/Valuetype/StringValueC.h:
+        * tao/Valuetype/StringValueC.cpp:
         * tao/Valuetype/ValueBase.h:
+        * tao/Valuetype/ValueBase.inl:
         * tao/Valuetype/ValueBase.cpp:
+        * tao/Valuetype/Value_CORBA_methods.h:
 
-          Added virtual _tao_type() method that returns
-          the associated typecode polymorphically. This
-          method is a TAO extension, and is for internal
-          use only (currently used in Any insertion
-          operators for valuetypes - see below). It
-          does not make a copy.
+          The changes for StringValue and AbstractBase are the same as the
+          generated code. The changes in ValueBase are those common to all
+          value types, used to determine how to marshal values if the
+          truncatable keyword was defined or not. This also includes the
+          definintion of the new ChunkInfo type.
 
-        * docs/dynany/index.html:
+        * tests/AMI/ami_test.idl:
+        * tests/AMI/ami_test_i.cpp:
+        * tests/AMI/simple_client.cpp:
 
-          Updated documentation to include the changes
-          described above.
+          Changes test misc. fixes for support of wchar data in exceptions.
 
-        * tests/DynAny_Test/test_dynstruct.cpp:
-        * tests/DynAny_Test/test_dynany.cpp:
-        * tests/DynAny_Test/test_dynunion.cpp:
-        * tests/DynAny_Test/data.cpp:
-        * tests/DynAny_Test/data.h:
-        * tests/DynAny_Test/test_dynenum.cpp:
-        * tests/DynAny_Test/test_dynsequence.cpp:
-        * tests/DynAny_Test/analyzer.cpp:
-        * tests/DynAny_Test/test_dynarray.cpp:
-        * tests/DynAny_Test/analyzer.h:
-        * tests/DynAny_Test/driver.cpp:
-        * tests/DynAny_Test/da_tests.idl:
+        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
+        * tests/OBV/Truncatable/README:
+        * tests/OBV/Truncatable/Truncatable.idl:
+        * tests/OBV/Truncatable/TruncatableS_impl.h:
+        * tests/OBV/Truncatable/TruncatableS_impl.cpp:
+        * tests/OBV/Truncatable/client.cpp:
+        * tests/OBV/Truncatable/run_test.pl:
+        * tests/OBV/Truncatable/server.cpp:
 
-          Updated tests to cover some of the new Dynamic Any
-          methods described above.
+          A new test specific to validating the truncatable valuetypes.
+          Note this test is also added to the ace/bin/tao_orb_tests.lst.
 
-        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * tests/Param_Test/svc.conf:
 
-          Changed code that uses DynamicAnyFactory method,
-          a consequence of the refactoring in Dynamic Any
-          described above.
+          Remove the explicit override of the wchar codeset for the
 
-        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/ast/ast_decl.cpp:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
+Tue Apr 25 14:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          - Fixed bugs in code generation for eventtypes. Thanks
-            to Ming Xiong <mxiong@dre.vanderbilt.edu> for
-            reporting a problem with anonymous sequence eventtype
-            members that led to the discovery of the other
-            inconsistencies.
-
-          - Added patches to the lex file and to the corresponding
-            generated C++ file that (1) corrects inconsistencies
-            between these two files and (2) fixes problems with
-            the SunCC preprocessor. Also patched the corresponding
-            lex.yy.cpp.diff file. Thanks to Chad Elliott
-            <elliott_c@ociweb.com> for supplying the patches.
-
-          - Added generation of virtual _tao_type() method for
-            valuetypes (and eventtypes), as well as use of this
-            method in the corresponding Any insertion operators.
-            These changes make Any insertion completely polymorphic
-            for valuetypes and eventtypes. These changes include
-            boxed valuetypes.
-
-          - Fixed a bug in the handling of #pragma prefix directives
-            when they occur before included IDL files. Thanks to
-            Viola Wang <vwang@eso.org> for reporting the problem.
-            This change closes [BUGID:2714].
+        Reverted this change below, this change broke this test
 
-        * NEWS:
+        Fri Apr 21 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/tests/Trading/TTest.idl:
+          Use the CORBA predefined sequence types
 
-          Added items listing the new Dynamic Any methods.
+Tue Apr 25 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Nov 28 17:01:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
+          Added missing unbouded array unit test
 
-        * tao/TAO_Internal.cpp:
-          Fix to restore processing of the -ORBNegotiateCodesets 1
-          option.
+Tue Apr 25 11:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Oneway_Timeouts/client.cpp:
-          Reimplement the timeout evaluation to avoid the use of
-          std::abs() as that function is not available on 64-bit windows
-          builds using the intel c++ compiler with VC 7.1 IDE.
-
-Tue Nov 28 16:54:36 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/utl_err.h (version_syntax_error):
-        * TAO_IDL/fe/lex.yy.cpp (idl_store_pragma):
-        * TAO_IDL/fe/idl.ll (idl_store_pragma):
-        * TAO_IDL/util/utl_err.cpp (version_syntax_error):
-
-          Qualified the char* parameter in the signature of the
-          recently-added version_syntax_error() with 'const'. Also
-          qualified the char* arg passed to it in idl_store_pragma()
-          similarly, since the rhs of this arg initialization is
-          a string literal, and thus causes a warning on some
-          compilers.
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.{h,cpp}:
+        * orbsvcs/orbsvcs/Trader/Offer_Database.{h,cpp}:
+        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.{h,cpp}:
+        * orbsvcs/orbsvcs/Trader/Trader.h
+        * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.{h,cpp}:
+        * orbsvcs/orbsvcs/Trader/Trader_Utils.{h,cpp}:
+          Fixed duplicate symbols when linking with vc7/vc8. The trading
+          service used the TAO_String_Hash_Key class to store strings
+          in hash maps, this class is derived from CORBA::String_var which
+          has been refactored to a template. This causes problems with
+          vc7/vc8 because the base template is exported from multiple
+          libraries. This has been resolved by usign CORBA::String_var
+          in the hash map and deliver an ACE_Hash, ACE_Equal_To and
+          ACE_Less_Then template specialization. This solves now the
+          link problems, the runtime issue that appeared after the
+          sequence merge has not been fixed yet. Also see bugzilla bug
+          2520 for more info.
 
-Tue Nov 28 13:46:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Apr 25 08:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * configure.ac:
+        * tao/ORB.cpp:
+          Removed runtime check of the sizes of the basic data types. We
+          now always use bool for CORBA::Boolean independent of the size
+          of bool, see also bugzilla 2515
 
-          Configure Makefiles for new unit test subdirectories.
+Tue Apr 25 06:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/tests/Event/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
+        * tao/Object.{h,cpp}:
+          Made the signature of the static marshal method the same in the
+          definition and the implementation.
 
-          Regenerate to descend into new test subdirectories.
+Mon Apr 24 19:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/tests/Event/UDP/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am:
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+          Explicitly export the base template to fix duplicate symbol
+          errors with vc71/vc8
 
-          New files, Makefile.am's for newly supported unit tests.
+Mon Apr 24 14:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/tests/Event/UDP/RtEC_UDP.mpc:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp:
+          Improved debug messages so that we can see if a string is empty
+          or not.
 
-          Split out IDL compilation into separate MPC project.
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h:
+          Doxygen cleanup
 
-Tue Nov 28 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+          Improved debugging output to resolve bug that seems to be introduced
+          by the sequence changes, the flowspec sequence has length of 1 but
+          just an empty string as value
 
-        * tao/Bounded_Basic_String_Sequence_T.h:
-          Fixed doxygen errors
+Mon Apr 24 13:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/Unbounded_Basic_String_Sequence_T.h:
-          Improved doxygen documentation
+        * tao/params.cpp:
+          Small const improvement
 
-Mon Nov 27 21:03:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/ORB.{h,cpp}:
+          Updated CORBA::ORB::RequestSeq to CORBA::RequestSeq as the spec
+          describes. Fixes bugzilla bug 2512.
 
-        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+Mon Apr 24 12:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          - Cosmetic changes to source code, mostly addition of
-            braces around single-line IF bodies.
+        * tao/ORB.cpp:
+          Added include of ObjectIdListC.h to resolve compile errors related
+          to this type with Sun Studio 10
 
-          - Cosmetic changes to generated code, to keep line
-            lengths less than 80 characters.
+Mon Apr 24 11:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDLbe/be_visitor_typecode/typecode_defn.cpp:
+        Reverted change below, set method is IDL generated.
 
-          Changed check to tell if interface or valuetype members
-          are defined, and thus if they need a forward declared
-          typecode generated. This need for this change is a
-          consequence of recent changes in the way forward
-          declared interfaces and valuetypes are handled.
+        Mon Apr 24 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/Runtime_Scheduler.{h,cpp}:
+          Made the arguments of the set method a const reference, this fixes
+          the internal backend errors in the BCB2006 release builds.
 
-        * TAO_IDLast/ast_interface_fwd.cpp:
+Mon Apr 24 11:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed an unnecessary line of source code.
+        * tao/ORB_Core.cpp:
+          When we can't get a valuetype adapter throw an internal corba
+          exception
 
-Mon Nov 27 17:34:21 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * TAO_IDL/be/be_codegen.cpp:
+          Updated include generated for the valuetype library, makes sure
+          that the valuetype library gets linked into the executable when
+          building static.
 
-        * TAO_IDL/include/utl_err.h:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/util/utl_err.cpp:
-
-          Added error check in #pragma version parsing, and a new
-          error message to output if an error is found with this
-          check. Since the only related error that was checked
-          for and reported before was an invalid version number,
-          an additional case was needed for a more general syntax
-          error. Thanks to Johnny Willemsen <jwillemsen@remedy.nl>
-          for supplying the example IDL that caused a crash due
-          to the lack of this error checking. This fix closes
-          [BUGID:2728].
-
-Mon Nov 27 14:46:18 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
-
-        * tests/Bug_2709_Regression/Bug_2709_Regression.mpc
-        * tests/Bug_2709_Regression/client.cpp
-        * tests/Bug_2709_Regression/Client_Task.cpp
-        * tests/Bug_2709_Regression/Client_Task.h
-        * tests/Bug_2709_Regression/README
-        * tests/Bug_2709_Regression/run_test.pl
-        * tests/Bug_2709_Regression/server.cpp
-        * tests/Bug_2709_Regression/Server_Task.cpp
-        * tests/Bug_2709_Regression/Server_Task.h
-        * tests/Bug_2709_Regression/Test.idl
-        * tests/Bug_2709_Regression/TestImpl.cpp
-        * tests/Bug_2709_Regression/TestImpl.h
-          Added a regression for bug 2709.
-
-Mon Nov 27 14:29:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Mon Apr 24 10:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/tao.mpc:
-        * tao/AnyTypeCode.mpc:
+        * tests/Bug_1676_Regression/*:
+          Added regression for bug 1676 written by Kees van Marle. This bug
+          seems not to be fixed yet.
 
-          Move list generated typecode (*A.h) header files from tao.mpc
-          to AnyTypeCode.mpc.  Even though the files are generated from
-          rules in tao.mpc, they belong in AnyTypeCode.mpc (the sources
-          are compiled there, etc.).  This also helps with a latent MPC
-          bug that expressed itself in the borland builds, where the
-          directory separator was not changed from '/' to '\'.
+Mon Apr 24 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Nov 27 12:50:48 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+        * orbsvcs/orbsvcs/Runtime_Scheduler.{h,cpp}:
+          Made the arguments of the set method a const reference, this fixes
+          the internal backend errors in the BCB2006 release builds.
 
-        * tao/Object.h:
-        * tao/Object.cpp:
+Mon Apr 24 06:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Provide hooks to enable custom Object to IOR conversion or
-          allowing local objects (such as Smart Proxies) to be converted to
-          an IOR string.
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl:
+          Removed some left over ACE_NESTED_CLASS usage
 
-        * tao/ORB.cpp:
+Sun Apr 23 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Utilize the new hooks when performing the Object to IOR string
-          conversion.
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
+          Removed some left over ACE_NESTED_CLASS usage
 
-        * tests/Smart_Proxies/Smart_Proxy_Impl.h:
-        * tests/Smart_Proxies/Smart_Proxy_Impl.cpp:
-        * tests/Smart_Proxies/client.cpp:
-        * tests/Smart_Proxies/run_test.pl:
+Fri Apr 21 20:43:24 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          This test has been modified to implement both aforementioned
-          hooks and perform comparisons to ensure that the right thing has
-          been done.
+        * examples/Makefile.am:
+        * performance-tests/Makefile.am:
 
-Mon Nov 27 09:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Remove handful of subdirectories that have not yet been updated
+          to work with autoconf builds.
 
-        * tao/HTTP_Client.h:
-        * tao/HTTP_Handler.h:
-          Export these classes from the TAO lib. These can be reused then
-          by several parts in CIAO and that way we don't have code
-          duplication and smaller footprint
+Fri Apr 21 19:32:27 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Mon Nov 27 08:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * configure.ac:
 
-        * *.mpc:
-          Removed exceptions as base project because TAO already requires
-          exceptions and renamed minimum_corba to avoids_minimum_corba
+          Added orbsvcs/tests/Bug_2377_Regression/Makefile to
+          AC_CONFIG_FILES.
 
-Mon Nov 27 08:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
 
-        Document the changes I have done last weekend to resolve link
-        problems with vc8. With vc8 we now explicitly export the base
-        templates for the basic sequences. This also requires that
-        applications do import these base templates which in practice
-        means that when you use any of the sequences of basic types
-        you must include (in)directly the ones in the corba library.
-        If you don't do that you get compile/link errors related
-        to the basic sequences
+          New file.
 
-        * tao/tao.mpc:
-          Enabed -Gse for ULongLongSeq
+Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/Makefile.am:
+        * docs/Makefile.am:
+        * docs/tutorials/Makefile.am:
+        * docs/tutorials/Quoter/Makefile.am:
+        * docs/tutorials/Quoter/AMI/Makefile.am:
+        * docs/tutorials/Quoter/Event_Service/Makefile.am:
+        * docs/tutorials/Quoter/Naming_Service/Makefile.am:
+        * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
+        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Client/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Persistent/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Server/Makefile.am:
+        * docs/tutorials/Quoter/idl/Makefile.am:
+        * examples/Makefile.am:
+        * examples/AMH/Makefile.am:
+        * examples/AMH/Sink_Server/Makefile.am:
+        * examples/AMI/Makefile.am:
+        * examples/AMI/FL_Callback/Makefile.am:
+        * examples/Advanced/Makefile.am:
+        * examples/Advanced/ch_3/Makefile.am:
+        * examples/Buffered_AMI/Makefile.am:
+        * examples/Buffered_Oneways/Makefile.am:
+        * examples/CSD_Strategy/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool4/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+        * examples/Callback_Quoter/Makefile.am:
+        * examples/Content_Server/Makefile.am:
+        * examples/Content_Server/AMI_Iterator/Makefile.am:
+        * examples/Content_Server/AMI_Observer/Makefile.am:
+        * examples/Content_Server/SMI_Iterator/Makefile.am:
+        * examples/Event_Comm/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
+        * examples/Load_Balancing/Makefile.am:
+        * examples/Load_Balancing_persistent/Makefile.am:
+        * examples/Logging/Makefile.am:
+        * examples/OBV/Makefile.am:
+        * examples/OBV/Typed_Events/Makefile.am:
+        * examples/POA/Makefile.am:
+        * examples/POA/Adapter_Activator/Makefile.am:
+        * examples/POA/DSI/Makefile.am:
+        * examples/POA/Default_Servant/Makefile.am:
+        * examples/POA/Explicit_Activation/Makefile.am:
+        * examples/POA/Explicit_Activation/Alt_Resources/Makefile.am:
+        * examples/POA/FindPOA/Makefile.am:
+        * examples/POA/Forwarding/Makefile.am:
+        * examples/POA/Generic_Servant/Makefile.am:
+        * examples/POA/Loader/Makefile.am:
+        * examples/POA/NewPOA/Makefile.am:
+        * examples/POA/On_Demand_Activation/Makefile.am:
+        * examples/POA/On_Demand_Loading/Makefile.am:
+        * examples/POA/POA_BiDir/Makefile.am:
+        * examples/POA/Reference_Counted_Servant/Makefile.am:
+        * examples/POA/RootPOA/Makefile.am:
+        * examples/POA/TIE/Makefile.am:
+        * examples/Persistent_Grid/Makefile.am:
+        * examples/PluggableUDP/Makefile.am:
+        * examples/PluggableUDP/tests/Makefile.am:
+        * examples/PluggableUDP/tests/Basic/Makefile.am:
+        * examples/PluggableUDP/tests/Performance/Makefile.am:
+        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
+        * examples/Quoter/Makefile.am:
+        * examples/RTCORBA/Makefile.am:
+        * examples/RTCORBA/Activity/Makefile.am:
+        * examples/RTScheduling/Makefile.am:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
+        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
+        * examples/Simple/Makefile.am:
+        * examples/Simple/bank/Makefile.am:
+        * examples/Simple/chat/Makefile.am:
+        * examples/Simple/echo/Makefile.am:
+        * examples/Simple/grid/Makefile.am:
+        * examples/Simple/time/Makefile.am:
+        * examples/Simple/time-date/Makefile.am:
+        * examples/Simulator/Makefile.am:
+        * examples/Simulator/Event_Supplier/Makefile.am:
+        * examples/TypeCode_Creation/Makefile.am:
+        * examples/ior_corbaloc/Makefile.am:
+        * examples/mfc/Makefile.am:
+        * interop-tests/Makefile.am:
+        * interop-tests/wchar/Makefile.am:
+        * orbsvcs/Makefile.am:
+        * orbsvcs/Concurrency_Service/Makefile.am:
+        * orbsvcs/CosEvent_Service/Makefile.am:
+        * orbsvcs/Dump_Schedule/Makefile.am:
+        * orbsvcs/Event_Service/Makefile.am:
+        * 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/IFR_Service/Makefile.am:
+        * orbsvcs/ImplRepo_Service/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/Naming_Service/Makefile.am:
+        * orbsvcs/Notify_Service/Makefile.am:
+        * orbsvcs/Scheduling_Service/Makefile.am:
+        * orbsvcs/TAO_Service/Makefile.am:
+        * orbsvcs/Time_Service/Makefile.am:
+        * orbsvcs/Trading_Service/Makefile.am:
+        * orbsvcs/examples/Makefile.am:
+        * orbsvcs/examples/CosEC/Makefile.am:
+        * orbsvcs/examples/CosEC/Factory/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am:
+        * orbsvcs/examples/CosEC/Simple/Makefile.am:
+        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
+        * orbsvcs/examples/FaultTolerance/Makefile.am:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
+        * orbsvcs/examples/ImR/Makefile.am:
+        * orbsvcs/examples/ImR/Advanced/Makefile.am:
+        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
+        * orbsvcs/examples/LoadBalancing/Makefile.am:
+        * orbsvcs/examples/Log/Makefile.am:
+        * orbsvcs/examples/Log/Basic/Makefile.am:
+        * orbsvcs/examples/Log/Event/Makefile.am:
+        * orbsvcs/examples/Log/Notify/Makefile.am:
+        * orbsvcs/examples/Log/RTEvent/Makefile.am:
+        * orbsvcs/examples/Notify/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/Agent/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/Gate/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am:
+        * orbsvcs/examples/Notify/Filter/Makefile.am:
+        * orbsvcs/examples/Notify/Lanes/Makefile.am:
+        * orbsvcs/examples/Notify/Subscribe/Makefile.am:
+        * orbsvcs/examples/Notify/ThreadPool/Makefile.am:
+        * orbsvcs/examples/ORT/Makefile.am:
+        * orbsvcs/examples/RtEC/Makefile.am:
+        * orbsvcs/examples/RtEC/IIOPGateway/Makefile.am:
+        * orbsvcs/examples/RtEC/Kokyu/Makefile.am:
+        * orbsvcs/examples/RtEC/MCast/Makefile.am:
+        * orbsvcs/examples/RtEC/Schedule/Makefile.am:
+        * orbsvcs/examples/RtEC/Simple/Makefile.am:
+        * orbsvcs/examples/Security/Makefile.am:
+        * orbsvcs/examples/Security/Send_File/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * 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:
+        * orbsvcs/tests/Makefile.am:
+        * orbsvcs/tests/AVStreams/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/BiDir_CORBALOC/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/Bug_2074_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2137_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2316_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:
+        * 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:
+        * orbsvcs/tests/HTIOP/Makefile.am:
+        * orbsvcs/tests/HTIOP/AMI/Makefile.am:
+        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
+        * orbsvcs/tests/HTIOP/Hello/Makefile.am:
+        * orbsvcs/tests/IOR_MCast/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Makefile.am:
+        * orbsvcs/tests/ImplRepo/NameService/Makefile.am:
+        * orbsvcs/tests/ImplRepo/scale/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am:
+        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am:
+        * orbsvcs/tests/Log/Makefile.am:
+        * orbsvcs/tests/Log/Basic_Log_Test/Makefile.am:
+        * orbsvcs/tests/Miop/Makefile.am:
+        * orbsvcs/tests/Miop/McastHello/Makefile.am:
+        * orbsvcs/tests/Notify/Makefile.am:
+        * orbsvcs/tests/Notify/Basic/Makefile.am:
+        * orbsvcs/tests/Notify/Blocking/Makefile.am:
+        * orbsvcs/tests/Notify/Destroy/Makefile.am:
+        * orbsvcs/tests/Notify/Discarding/Makefile.am:
+        * orbsvcs/tests/Notify/Driver/Makefile.am:
+        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
+        * orbsvcs/tests/Notify/Ordering/Makefile.am:
+        * orbsvcs/tests/Notify/PluggableTopology/Makefile.am:
+        * orbsvcs/tests/Notify/RT_lib/Makefile.am:
+        * orbsvcs/tests/Notify/Reconnecting/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Test_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/XML_Persistence/Makefile.am:
+        * orbsvcs/tests/Notify/lib/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
+        * orbsvcs/tests/Property/Makefile.am:
+        * orbsvcs/tests/Redundant_Naming/Makefile.am:
+        * orbsvcs/tests/Sched/Makefile.am:
+        * orbsvcs/tests/Sched_Conf/Makefile.am:
+        * orbsvcs/tests/Security/Makefile.am:
+        * orbsvcs/tests/Security/BiDirectional/Makefile.am:
+        * orbsvcs/tests/Security/Big_Request/Makefile.am:
+        * orbsvcs/tests/Security/Callback/Makefile.am:
+        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
+        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
+        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
+        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
+        * orbsvcs/tests/Simple_Naming/Makefile.am:
+        * orbsvcs/tests/Time/Makefile.am:
+        * orbsvcs/tests/Trading/Makefile.am:
+        * orbsvcs/tests/ior_corbaname/Makefile.am:
+        * orbsvcs/tests/tests_svc_loader/Makefile.am:
+        * performance-tests/Makefile.am:
+        * performance-tests/Anyop/Makefile.am:
+        * performance-tests/CSD_Strategy/Makefile.am:
+        * performance-tests/CSD_Strategy/TestApps/Makefile.am:
+        * performance-tests/CSD_Strategy/TestInf/Makefile.am:
+        * performance-tests/CSD_Strategy/TestServant/Makefile.am:
+        * performance-tests/Callback/Makefile.am:
+        * performance-tests/Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/Makefile.am:
+        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
+        * performance-tests/Latency/Makefile.am:
+        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Latency/AMI/Makefile.am:
+        * performance-tests/Latency/Collocation/Makefile.am:
+        * performance-tests/Latency/DII/Makefile.am:
+        * performance-tests/Latency/DSI/Makefile.am:
+        * performance-tests/Latency/Deferred/Makefile.am:
+        * performance-tests/Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Memory/Makefile.am:
+        * performance-tests/Memory/IORsize/Makefile.am:
+        * performance-tests/Memory/Single_Threaded/Makefile.am:
+        * performance-tests/POA/Makefile.am:
+        * performance-tests/POA/Create_Reference/Makefile.am:
+        * performance-tests/POA/Demux/Makefile.am:
+        * performance-tests/POA/Implicit_Activation/Makefile.am:
+        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
+        * performance-tests/Pluggable/Makefile.am:
+        * performance-tests/Protocols/Makefile.am:
+        * performance-tests/RTCorba/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am:
+        * performance-tests/RTCorba/Oneways/Makefile.am:
+        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
+        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
+        * performance-tests/Sequence_Latency/Makefile.am:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/AMI/Makefile.am:
+        * performance-tests/Sequence_Latency/DII/Makefile.am:
+        * performance-tests/Sequence_Latency/DSI/Makefile.am:
+        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
+        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Throughput/Makefile.am:
+        * tao/Makefile.am:
+        * utils/Makefile.am:
+        * utils/catior/Makefile.am:
+        * utils/nslist/Makefile.am:
 
-        * orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl:
-          Use the CORBA::ULongLongSeq predefined typedef
+          Regenerate with latest MPC and *.mpc/*.mpb changes.
 
-        * orbsvcs/orbsvcs/CosTrading.idl:
-        * orbsvcs/orbsvcs/SecurityLevel3.idl:
-          Include a pidl file from core to get the import of the
-          base template
+Fri Apr 21 09:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Portable_Interceptors/PICurrent/client.cpp:
-          Check also the length of the returned sequence
+        * tao/Transport_Connector.cpp:
+          Removed the fix for bug 2417, according to the test stats things
+          didn't got fixed.
 
-Sun Nov 26 02:41:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Fri Apr 21 08:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/tests/Event/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
+        * tao/String_Traits_Base_T.h:
+          Disabled the warning when wchar_t is not a native type. This
+          makes the vxworks logs unreadable.
 
-          Hand tweak to avoid subdirectories that aren't yet supported.
+Fri Apr 21 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sat Nov 25 13:56:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * orbsvcs/tests/Trading/TTest.idl:
+          Use the CORBA predefined sequence types
 
-        * orbsvcs/orbsvcs/Makefile.am:
+Fri Apr 21 07:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Regenerated.
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl:
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.h:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
+        * tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp:
+          Removed usage of ACE_NESTED_CLASS
 
-        * orbsvcs/orbsvcs/ec_typed_events_idl.mpb:
+Thu Apr 20 14:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Add -GT to idlflags.  We generate tie classes for the untyped
-          CosEvent interfaces, we should do the same for the typed ones
-          for symmetry.
+        * tao/extra_core.mpb:
+        * tao/tao.mpc:
+          Moved ServicesC.cpp to tao.mpc
 
-Fri Nov 24 14:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Apr 20 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Sequence_Unit_Tests/Bounded_String.cpp:
-          Updated because of string sequence changes earlier today
+        * tao/Bounded_Sequence_CDR_T.h:
+        * tao/Unbounded_Sequence_CDR_T.h:
+          Include orbconf.h instead of one of the sequence header files
 
-Fri Nov 24 13:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Apr 20 13:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Portable_Interceptors/PICurrent/client.cpp:
-          Added a test for bugzilla 2656
+        * tao/Asynch_Reply_Dispatcher_Base.{h,cpp}:
+        * tao/ObjectKey_Table.cpp:
+        * tao/Refcounted_ObjectKey.{h,cpp,inl}:
+          Made the refcounts CORBA::ULong and only return the refcount
+          from the incr/decr methods when really needed, using the refcount
+          form external is always tricky. Fixes bugzilla bug 2505.
 
-        * tao/Stub.cpp (get_policy_overrides):
-          When policies is zero, return an empty sequence instead of
-          a nill pointer. This fixes bugzilla 2656. Thanks to
-          Richard Ridgway <Richard_Ridgway at ml dot com> for
-          delevering the test extension and the patch for this file.
+Thu Apr 20 12:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Nov 24 13:43:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        Integrated ondemand branch to cvs head. This makes an ondemand write
+        possible. The user specified maximum is at this moment not a hard
+        maximum, it is more an indication how large the GIOP fragments
+        should become, we can send out smaller and larger fragments if needed.
 
-        * configure.ac:
+        * tao/tests/Ondemand_Write/*:
+          New test
 
-          Configure Bug_2615_Regression unit test.
+        Mon Apr  3 12:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/tests/Makefile.am:
+        * tao/On_Demand_Fragmentation_Strategy.cpp:
+          Print the debug message after we padded it so that sizes do match
+          in the logs
 
-          Regenerated to include Bug_2615_Regression subdirectory.
+        * tao/GIOP_Message_Base.cpp:
+          For fragments also retrieve the request/reply id
 
-        * orbsvcs/tests/Bug_2615_Regression/Makefile.am:
+        * tests/Ondemand_Write:
+          Simple test for ondemand write, needs now inspection of output to
+          check if things work ok
 
-          New file, Makefile.am for new-ish unit test.
+        Mon Apr  3 07:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Nov 24 13:39:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/CDR.h:
+          Commented out write_octet_array decleration, there is no
+          implementation yet.
 
-        * configure.ac:
+        Thu Mar 30 13:02:18 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-          Configure RTCORBA Quoter tutorial.
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+          Added the missing transport parameter to the TAO_GIOP_Message_Base
+          constructor.
 
-        * docs/tutorials/Quoter/Makefile.am
+        Thu Mar 30 12:41:17 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-          Regenerated to include RTCORBA subdirectory.
+        * tao/CDR.cpp:
+        * tao/On_Demand_Fragmentation_Strategy.cpp:
 
-        * docs/tutorials/Quoter/RTCORBA/Makefile.am
+          Fixed checks for return values.
 
-          New file, Makefile.am for new-ish tutorial.
+        Wed Mar 22 20:13:22 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Fri Nov 24 13:24:56 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Messaging/Asynch_Invocation.cpp (remote_invocation):
 
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+          Added missing GIOP fragmentation support.
 
-          Regenerated.
+        Wed Mar 22 13:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Nov 24 13:21:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/ORB_Core.h:
+          Fixed warning of the Intel compiler
+
+        Wed Mar 22 01:33:47 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/CDR.cpp:
+        * tao/CDR.h:
+        * tao/CDR.i:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/GIOP_Message_Base.h:
+        * tao/GIOP_Message_Generator_Parser.h:
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+        * tao/GIOP_Message_Generator_Parser_10.h:
+        * tao/GIOP_Message_Generator_Parser_12.cpp:
+        * tao/GIOP_Message_Generator_Parser_12.h:
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/GIOP_Message_Lite.h:
+        * tao/ORB_Core.cpp:
+        * tao/On_Demand_Fragmentation_Strategy.cpp:
+        * tao/Pluggable_Messaging.h:
+        * tao/Remote_Invocation.cpp:
+        * tao/Synch_Invocation.cpp:
+        * tao/TAO_Server_Request.cpp:
+        * tao/default_resource.cpp:
+        * tao/PortableServer/Upcall_Wrapper.cpp:
 
-        * configure.ac:
+          Added remaining code necessary to send fragments through the
+          underlying transport.
 
-          Added AM_CONDITIONAL for BUILD_STL and BUILD_BOOST, so we can
-          generate Makefile.am's with these options.  Default to false,
-          until we can write feature tests for these options.
+          Added missing outgoing GIOP reply fragment support.
 
-Fri Nov 24 13:21:00 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        Tue Mar 21 22:18:45 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * orbsvcs/orbsvcs/Makefile.am:
+        * docs/Options.html:
 
-          Regenerated.
+          Document new "-ORBMaxMessageSize" ORB option.
 
-        * orbsvcs/orbsvcs/ec_typed_events_skel.mpb:
+        Tue Mar 21 15:16:43 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Removed *S_T.inl files from the Inline_Files section.
+        * tao/GIOP_Message_Base.cpp (set_giop_flags):
 
-Fri Nov 24 13:19:24 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Cast CDR stream buffer to an array of octets.
 
-        * tao/Makefile.am:
+        * tao/GIOP_Message_Base.h (set_giop_flags):
 
-          Regenerated.
+          Added missing method declaration.
 
-        * tao/Strategies.mpc:
+        * tao/Resource_Factory.h (fragmentation_strategy):
+        * tao/default_resource.cpp:
+        * tao/default_resource.h:
 
-          Clear PIDL_Files section as the Strategies *.pidl files are
-          processed within the IDL_Files section, and this results in
-          duplicate entries.
+          Made factory method name consistent with existing naming
+          convention, i.e. create_fragmentation_strategy().
 
-Fri Nov 24 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Corrected return value.  It should have been
+          auto_ptr<TAO_GIOP_Fragmentation_Strategy>, not
+          TAO_GIOP_Fragmentation_Strategy *.
 
-        * tao/Bounded_Basic_String_Sequence_T.h:
-        * tao/Unbounded_Basic_String_Sequence_T.h:
-          Moved these templates from TAO::details to TAO namespace because
-          we are going to move these templates directly
+        * tao/IIOP_Transport.cpp:
+        * tao/Strategies/DIOP_Transport.cpp:
+        * tao/Strategies/SCIOP_Transport.cpp:
+        * tao/Strategies/SHMIOP_Transport.cpp:
+        * tao/Strategies/UIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
 
-        * tao/Bounded_String_Sequence_T.h:
-        * tao/Bounded_Wstring_Sequence_T.h:
-        * tao/Unbounded_String_Sequence_T.h:
-        * tao/Unbounded_Wstring_Sequence_T.h:
-          Removed, not used anymore, the IDL compiler uses the basic string
-          sequence directly.
+          The TAO_GIOP_Message_Base constructor now accepts a pointer to
+          TAO_Transport parameter.  Updated constructor call accordingly.
 
-        * TAO_IDL/be/be_visitor_template_export.cpp:
-          Removed special handling for (w)string sequences
+        * tao/CDR.h:
+        * tao/CDR.i:
+        * tao/CDR.cpp:
 
-        * TAO_IDL/be/be_sequence.cpp:
-          Changed generation to use basic string sequence template directly
+          Added missing fragmentation-enabling constructor and
+          fragmentation flag accessors.
 
-        * tao/Sequence_T.h:
-        * tao/tao.mpc:
-          Removed the files that got removed
+          Removed legacy initial implementa code.  Addresses build
+          errors.
 
-        * tao/Unbounded_Sequence_CDR_T.h:
-        * tao/Bounded_Sequence_CDR_T.h:
-          Updated because of the move of the basic string sequence files
-          from TAO::details to TAO
+        * tao/GIOP_Fragmentation_Strategy.h (TAO_GIOP_Fragmentation_Strategy):
 
-Fri Nov 24 06:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Export to allow users to provide their own implementation
+          through the resource factory.
 
-        * tao/tao.mpc:
-          Don't use -Gse for ULongLongSeq at this moment, vc8 seems to
-          have a problem with this file
+          (fragment):
 
-Thu Nov 23 14:51:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Return an "int" instead of "void".  Allows the error status of
+          the underlying transport send to be propagated up the stack.
 
-        * tao/Makefile.am:
+        * tao/Null_Fragmentation_Strategy.h (fragment):
+        * tao/Null_Fragmentation_Strategy.cpp (fragment):
+        * tao/On_Demand_Fragmentation_Strategy.h (fragment):
+        * tao/On_Demand_Fragmentation_Strategy.cpp (fragment):
 
-          Regenerated.
+          Likewise.
 
-Thu Nov 23 14:20:33 UTC 2006  Simon McQueen  <sm@prismtech.com>
+        * tao/operation_details.cpp (marshal_args):
 
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
+          Mark the CDR as having no other fragments to send after all
+          arguments have been marshaled, not before the last one is
+          marshaled.
 
-          (Hopefully) fix Borland warning.
+        * ORB_Core.h (fragmentation_Strategy):
 
-Thu Nov 23 14:15:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Added missing transport parameter.
 
-        * orbsvcs/orbsvcs/Makefile.am:
+          Removed const qualifier.  The resource_factory() accessor isn't
+          a const method.
 
-          Regenerated.
+        * ORB_Core.cpp (fragmentation_strategy):
 
-        * orbsvcs/orbsvcs/CosEvent.mpc:
+          Likewise.
 
-          Removed *S_T.inl files from the Inline_Files section.
+        * params.h:
+        * params.i:
+        * params.cpp:
 
-Thu Nov 23 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added missing max_message_size attribute.
 
-        * tao/tao.mpc:
-          Readded -Gse again
+        Fri Mar 17 10:59:02 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/be/be_codegen.cpp:
-          Fixed wrong comment in A.h generation
+        * tao/Resource_Factory.h:
+          Added missing include of Basic_Types and added forward declarations
 
-        * TAO_IDL/be/be_interface.cpp:
-          Const improvement
+        * tao/On_Demand_Fragmentation_Strategy.h:
+          Fixed copy constructor/assignment operators
 
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-          Removed some unneeded c-style casts
+        * tao/CDR.h:
+          Removed do_fragmentation method, there is no implementation, added
+          fragment_stream
 
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-          Small code change to define the local variable and assign
-          it on the same line.
+        * tao/CDR.i:
+          Fixed typo
 
-        * TAO_IDL/be/be_visitor_template_export.cpp:
-          Added special handling for octet/wstring and string sequences.
-          Removed generation of long comment why we explicitly
-          export the base templates, not usefull in generated code
+        * tao/default_resource.cpp:
+          Added missing includes and updated signature of
+          create_fragmentation_strategy to match header file
 
-        * TAO_IDL/util/utl_global.cpp:
-          Removed spaces.
+        Fri Mar 17 07:48:02 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/PolicyC.cpp:
-          Removed not needed Borland pragma option
+          Updated code after update from Ossama Othman
 
-Thu Nov 23 12:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/On_Demand_Fragmentation_Strategy.{h,cpp}:
+          New files
 
-        * tao/tao.mpc:
-          Removed -Gse for the sequence files, causes some problems
-          on the scoreboard.
+        * tao/default_resource.{h,cpp}:
+          Added create_fragmentation_strategy
+
+        * tao/GIOP_Fragmentation_Strategy.h:
+          Doxygen improvements
 
-Thu Nov 23 11:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Resource_Factory.h:
+          Added pure virtual fragmentation_strategy method
 
-        * Release:
-          Changed TAO_ACE* to TAO_*mwc. That prevents that the TAO_ACE*.sln
-          files are added twice to the tar archive. This fixes bug 2680
+        * tao/ORB_Core.{h,cpp}:
+          Added fragmentation_strategy accessor method
 
-Thu Nov 23 10:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/GIOP_Message_Base.{h,cpp}:
+          Added TAO_Transport to the constructor arguments
 
-        * tests/Bug_2669_Regression/Child.idl:
-        * tests/Bug_2669_Regression/client.cpp:
-          Added a regression for bug 2714 which hasn't been fixed yet.
+        * tao/GIOP_Message_Base.cpp:
+          Added come comments
 
-Thu Nov 23 07:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/True_Fragmentation_Strategy.{h,cpp}:
+          Removed again, replaced by On_Demand so far as I can tell
 
         * tao/tao.mpc:
-          Simplified the idlflags to put the common flags for all pidl files
-          at the top of this file. Added regeneration of OctetSeq.pidl
-          and UShortSeq.pidl, these can now be regenerated using the new
-          -Gse option which is enabled for all sequence files
+          Added new files
 
-        * tao/OctetSeqC.{h,cpp}:
-        * tao/UShortSeqC.{h,cpp}:
-        * tao/OctetSeqS.h:
-        * tao/UShortSeqS.h:
-        * tao/AnyTypeCode/OctetSeqA.{h,cpp}:
-        * tao/AnyTypeCode/UShortSeqA.{h,cpp}:
-        * tao/diffs/OctetSeq.diff:
-        * tao/diffs/UShortSeq.diff:
-          Removed all these files, they are not regenerated as part of the
-          build.
+        Thu Mar 16 07:48:02 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/OctetSeq.pidl:
-        * tao/UShortSeq.pidl:
-          Removed remark about applying a diff
+          Integrated first set of code from Ossama Othman
 
-Thu Nov 23 06:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/GIOP_Fragmentation_Strategy.{h,cpp}:
+        * tao/Null_Fragmentation_Strategy.{h,cpp}:
+        * tao/True_Fragmentation_Strategy.{h,cpp}:
+          New files
 
-        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
-          Also don't build the server when ace_for_tao is enabled
+        * tao/operation_details.cpp:
+          When marshaling the last argument put this information on the
+          cdr_stream
 
-        * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
-          Don't build in ace_for_tao
+        * tao/GIOP_Message_Base.cpp:
+          Some refactoring
 
-Thu Nov 23 03:20:04 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/CDR.{h,cpp,i}:
+          Call fragment_stream as part of the streaming calls
 
-        * orbsvcs/orbsvcs/Makefile.am:
+Thu Apr 20 11:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Regenerated.
+        * orbsvcs/orbsvcs/sfp.idl:
+          Use CORBA::OctetSeq and CORBA::ULongSeq
 
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-        * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/CosProperty.mpc:
+        * tao/Strategies/SCIOP_Profile.cpp:
+          Fixed compile error
 
-          Removed *S_T.* files from the Header_Files, Inline_Files, and
-          Template_Files sections, cooresponding to the recent change to
-          orbsvcslib.mpb which removed -GT from the command line options
-          passed to tao_idl.
+Thu Apr 20 08:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Nov 23 01:05:04 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp:
+          Fixed compile error
 
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-          Fix typo in ACE_Get_Opt option specification which made it
-          impossible to specify the number of threads.
+Thu Apr 20 07:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Nov 22 22:20:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h:
+          Fixed template instantiation
 
-        * TAO_IDL/Makefile.am:
+Wed Apr 19 18:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Regenerated.
+        * tao/UShortSeqC.h:
+        * tao/OctetSeqC.h:
+          Do an explicit export of the base template
 
-Wed Nov 22 20:29:03 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Wed Apr 19 16:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Makefile.am:
+        * tao/Messaging/ExceptionHolderC.{h,cpp}:
+          Added constructor that accepts all values as generated now by the
+          IDL compiler
 
-          Regenerated.
+        * tao/Messaging/ExceptionHolder_i.cpp:
+          Use the new constructor
 
-Wed Nov 22 20:18:50 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+Wed Apr 19 14:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/be/be_visitor_template_export.cpp:
-        * TAO_IDL/be_include/be_visitor_template_export.h:
+        * tao/Exception.h:
+          Made the copy constructor public again, vc7.1 complains when
+          it is protected. Made a todo in this file again, have to retest
+          this later.
 
-          New files, defining a new visitor that optionally
-          generates an explicit export of the template base class
-          of the C++ class generated for an IDL sequence. This
-          visitor is triggered by the new command line option
-          described below, and is intended as a workaround for a
-          bug in Visual Studio. This fixes bugzilla 2703.
+Wed Apr 19 13:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be_include/be_global.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp:
+        * examples/Advanced/ch_12/icp.cpp:
+        * examples/Advanced/ch_21/icp.cpp:
+        * examples/Advanced/ch_18/icp.cpp:
+        * examples/Advanced/ch_8_and_10/icp.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.h:
+          Removed workarounds for vc6
 
-          - Added new command line option -Gse that will trigger the
-            generation of an explicit export described above.
+Wed Apr 19 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          - Fixed call to lookup_by_name() when it is used to locate
-            CCMObject in the AST and store it for future access in
-            the backend global data class. An additional argument
-            was recently added to lookup_by_name() and should have
-            been used in this call but wasn't. Thanks to Johnny
-            Willemsen <jwillemsen@remedy.nl> for reporting the
-            resulting incorrect code generation in the copy
-            constructor for components. This fixes bugzilla 2724.
+        * tao/Valuetype/AbstractBase.cpp:
+          Use true/false, const improvements
 
-        * TAO_IDL/be/be_interface.cpp:
+        * tao/Valuetype/AbstractBase.cpp:
+          Use C++ cast instead of C cast
 
-          Cosmetic changes.
+Wed Apr 19 13:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * docs/releasenotes/index.html:
-        * docs/compiler.html:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.h:
+          Removed not needed forward declarations
 
-          Updated IDL compiler documentation with the new command line
-          option.
+        * tao/AnyTypeCode/Any.cpp:
+        * tao/AnyTypeCode/Any_Impl.cpp:
+        * tao/BiDir_GIOP/BiDirPolicy_Validator.cpp:
+          Use false/true instead of 0/1 for bool
 
-Wed Nov 22 19:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PortableServer/Object_Adapter.h:
+          Don't export poa_name_iterator and iteratable_poa_name
 
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-          Add -GT to the idlflags because we have some examples that use
-          the TIE files from these services
+        * tao/PortableServer/Object_Adapter.cpp:
+          Use true/false and when the object adapter can't be found
+          throw a OBJECT_NOT_EXIST with minor code 2
 
-Wed Nov 22 18:50:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Wed Apr 19 12:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * tao/Transport_Timer.h:
+          No need to export this class from the TAO lib
 
-          Now the infinate recursion problem has been resolved, we invoke
-          TAO_LogMgr_i::create_log_reference() from TAO_Log_i::init() and
-          stash it away in a member variable.  This allows us to remove
-          the code that lazily obtained the object reference within the
-          active data path of the server.
+        * tao/ORB.h:
+          Use false for the default of the shutdown method
 
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+Wed Apr 19 12:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Changed TAO_LogMgr_i::create_log_reference() to use
-          _unchecked_narrow() while narrowing the object reference.  This
-          avoids the infinite recursion which occured with _narrow() when
-          this was called by the servant activator's incarnate() method.
+        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc:
+          Made these projects dependent on each other to make sure
+          that they don't build in parallel and generate the same idl
+          file twice at the same moment. Thanks to Chad Elliot for the
+          info how to do this the easiest
 
+Wed Apr 19 12:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Nov 22 18:48:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
+          Generate doxygen documentation style and use true instead of 1
 
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+          Generate true for boolean instead of 1
+
+        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
+          Generate also argument names in the header file so that doxygen
+          can parse IDL generated code
+
+Wed Apr 19 12:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.{h,cpp,i}:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.{h,i}:
+          Use bool and prefix increment/decrement
+
+Wed Apr 19 11:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_Oneways/run_test.pl:
+        * tests/Hello/run_test.pl:
+        * performance-tests/Throughput/run_test.pl:
+          Check the return value of spawn, speedsup the builds when no
+          executable is build
+
+        * performance-tests/Throughput/Receiver.cpp:
+          Prefix increment
+
+        * performance-tests/Throughput/Receiver_Factory.cpp:
+          Initialise pointer with 0
+
+        * performance-tests/Throughput/Throughput.mpc:
+          Simplified
+
+Wed Apr 19 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Integrated iioptbranch. This fixes bugzilla 2467
+
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+        No need to include IIOP files, just use the base classes
+
+        Wed Mar 29 08:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/default_resource.cpp
+        * tao/IIOP_Acceptor.cpp
+        * tao/IIOP_Acceptor.h
+        * tao/IIOP_Acceptor.i
+        * tao/IIOP_Connection_Handler.cpp
+        * tao/IIOP_Connection_Handler.h
+        * tao/IIOP_Connector.cpp
+        * tao/IIOP_Connector.h
+        * tao/IIOP_Endpoint.cpp
+        * tao/IIOP_Endpoint.h
+        * tao/IIOP_Endpoint.i
+        * tao/IIOP_Factory.cpp
+        * tao/IIOP_Factory.h
+        * tao/IIOP_Lite_Factory.cpp
+        * tao/IIOP_Lite_Factory.h
+        * tao/IIOP_Profile.cpp
+        * tao/IIOP_Profile.h
+        * tao/IIOP_Transport.cpp
+        * tao/IIOP_Transport.h
+        * tao/orbconf.h
+        * tao/TAO_Internal.cpp
+        Added TAO_HAS_IIOP. This is default set to 1 but can be overridden
+        in the config.h file to 0 meaning we don't support IIOP. This is
+        usefull for embedded systems that support one of the other
+        pluggable protocols and don't need IIOP support at all. With
+        TAO_HAS_IIOP set to 0 not everything will compile, just the
+        core libs itself.
+
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Integrated sequpdate3 branch. Thanks to Carlos O'Ryan for the initial
+        work for this new sequence implementation which I merged to cvs head
+        and finished
+
+        This fixes the following bugzilla entries:
+        2492 - Simplify TAO_Seq_Out_T
+        2493 - Simplify _reset method on union generated code
+        2352 - Valuefactory operations not safe
+        2353 - Valuefactories stored per process instead of per orb
+        2349 - ORB::destroy() should throw BAD_INV_ORDER if called during a
+        2315 - Reimplement (w)string_var/_out as templates
+        1989 - Footprint reduction issue, split Sequence files
+        2273 - Deprecate old AMI support
+        2300 - Simplify serialize/deserialize of sequences
+        2299 - Reimplement string/wstring managers as templates
+        1936 - Unnecessary usage of virtual functions in sequence implementation
+        1673 - operator[] of sequence<string> returns TAO_SeqElem_String_Manager
+        instead of TAO_String_Manager. Thanks to Mark Paulus <mark dot paulus
+        at mci dot com> for reporting this one.
+        1930 - Assignment operator for sequences is not exception safe.
+        1931 - The length() member function for sequences is not exception-safe.
+        1933 - Incomplete implementation of freebuf() for reference types.
+        1934 - const version of operator[] for string sequences allows assignment
+        1938 - Possible incorrect duplication in sequences of references
+        1928 - Assignment from T_mgr to sequence elements does not duplicate
+        2417 - Double delete on Transport when using oneways with sync_none
+        Thanks to Jan Ohlenburg <jan dot ohlenburg at fit dot fraunhofer dot de>
+        for reporting this.
+        2355 - oneway op. with timeout crashes client due to server termination
+        Thans to Jan Zima <jan dot zima at sofis dot cz> for reporting this.
+
+        Also did several const changes throughout the code
+
+        Fri Apr  7 08:03:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
+
+        * tao/Valuetype_Adapter_Factory.{h,cpp}:
+        New files, value type adapter factory
 
-          Remove extraneous ACE_DEBUG's in destructor.
+        * tao/tao.mpc:
+        Added new files
 
-Wed Nov 22 18:42:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Valuetype/Valuetype_Adapter_Factory_Impl.h:
+        Value type adapter factory implementation
 
-        * orbsvcs/examples/Log/Event/run_test.pl:
-        * orbsvcs/examples/Log/RTEvent/run_test.pl:
-        * orbsvcs/examples/Log/Notify/run_test.pl:
+        * tao/Valuetype/ValueFactory_Map.{h,cpp}:
+        Map isn't a singleton anymore and guard access with a mutex
 
-          Increase timeout so that test passes on slower systems.
+        * tao/Valuetype/Valuetype_Adapter_Impl.{h,cpp}:
+        The value type adapter isn't loaded with service configurator
+        anymore, the value type factory is now the one we load on demand
 
-Wed Nov 22 15:38:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/ORB.cpp:
+        Updated the value type methods to use the new ORB_Core method
+        to get the valuetype adapter, is the ORB_Core can't get the
+        adapter it will throw already the internal exception
 
-        * tao/Version.h:
+        * tao/ORB_Core.{h,cpp,i}:
+        Get the value type adapter factory with svc conf instead of the
+        adapter itself. Create a unique instance per orb.
 
-          Remove extraneous whitespace from TAO_VERSION macro definition.
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+        * tao/AnyTypeCode/append.cpp:
+        * tao/AnyTypeCode/skip.cpp:
+        Changed the way we get the valuetype adapter
 
-Wed Nov 22 15:14:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        Store the value type factories per orb and made things thread safe.
+        This fixes bugzilla bugs 2352 and 23253.
 
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/tests/Event/Makefile.am:
-        * orbsvcs/tests/Simple_Naming/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/Trading/Makefile.am:
-        * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
-        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
-        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
-        * orbsvcs/tests/Redundant_Naming/Makefile.am:
-        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
-        * orbsvcs/tests/Notify/lib/Makefile.am:
-        * orbsvcs/tests/FT_App/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
-        * orbsvcs/examples/CosEC/Factory/Makefile.am:
-        * orbsvcs/examples/LoadBalancing/Makefile.am:
-        * tao/Makefile.am:
-        * docs/tutorials/Quoter/idl/Makefile.am:
-        * performance-tests/Sequence_Latency/DSI/Makefile.am:
-        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/DII/Makefile.am:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/AMI/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am:
-        * performance-tests/Callback/Makefile.am:
-        * performance-tests/Latency/DSI/Makefile.am:
-        * performance-tests/Latency/Deferred/Makefile.am:
-        * performance-tests/Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Latency/DII/Makefile.am:
-        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Latency/AMI/Makefile.am:
-        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-        * performance-tests/Throughput/Makefile.am:
-        * examples/POA/TIE/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/Makefile.am:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-        * examples/RTCORBA/Activity/Makefile.am:
-        * examples/AMH/Sink_Server/Makefile.am:
-        * examples/mfc/Makefile.am:
-        * examples/AMI/FL_Callback/Makefile.am:
-        * examples/PluggableUDP/tests/Basic/Makefile.am:
-        * examples/PluggableUDP/tests/Performance/Makefile.am:
-        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
+        Thu Apr  6 09:17:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Regenerated.
+        * tao/Transport_Connector.cpp:
+        Applied fix of bug 2417, let us see what the results are in the
+        branch build
+
+        Thu Apr  6 09:08:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/POA/FindPOA/FindPOA.cpp:
+        * tests/Bug_2349_Regression/client.cpp:
+        * tests/Bug_2349_Regression/foo.idl:
+        * tests/Bug_2349_Regression/server.cpp:
+        Improved tests
+
+        * tao/Adapter_Registry.{h,cpp}:
+        Remove the empty throw spec for close and check_close. This way
+        exceptions from lower layers are propagated up.
+
+        * tao/ORB_Core.{h,cpp}:
+        Removed empty throw spec from shutdown, if there are exceptions from
+        a lower layer and as a result we can't shutdown, let the user be
+        aware of it. This fixes bugzilla bug 2349
+
+        Mon Apr  3 07:59:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO/IDL/be/be_visitor_union/discriminant_ci.cpp
+        * TAO/IDL/be/be_visitor_union/union_ch.cpp
+        * TAO/IDL/be/be_visitor_union/union_cs.cpp
+        * TAO/IDL/be/be_visitor_union_branch/public_ci.cpp
+        * tao/GIOPC.{h,cpp,inl}:
+        Removed arguments from the _reset method on the union generated,
+        these are not used.
+
+        Sun Apr  2 18:56:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+        * tao/BooleanSeqC.h
+        * tao/CONV_FRAMEC.h
+        * tao/CharSeqC.h
+        * tao/DomainC.h
+        * tao/DoubleSeqC.h
+        * tao/FloatSeqC.h
+        * tao/IIOPC.h
+        * tao/IIOP_EndpointsC.h
+        * tao/IOP_IORC.h
+        * tao/LongDoubleSeqC.h
+        * tao/LongLongSeqC.h
+        * tao/LongSeqC.h
+        * tao/Messaging_PolicyValueC.h
+        * tao/ORB.h
+        * tao/ObjectIdListC.h
+        * tao/Object_KeyC.h
+        * tao/OctetSeqC.h
+        * tao/Policy_ForwardC.h
+        * tao/Seq_Out_T.h
+        * tao/Seq_Out_T.inl
+        * tao/ServicesC.h
+        * tao/ShortSeqC.h
+        * tao/StringSeqC.h
+        * tao/ULongLongSeqC.h
+        * tao/ULongSeqC.h
+        * tao/UShortSeqC.h
+        * tao/WCharSeqC.h
+        * tao/WStringSeqC.h
+        * tao/AnyTypeCode/AnySeqC.h
+        * tao/AnyTypeCode/DynamicC.h
+        * tao/DynamicAny/DynamicAnyC.h
+        * tao/IFR_Client/IFR_BaseC.h
+        * tao/IFR_Client/IFR_BasicC.h
+        * tao/IFR_Client/IFR_ComponentsC.h
+        * tao/IFR_Client/IFR_ExtendedC.h
+        * tao/IORManipulation/IORC.h
+        * tao/ImR_Client/ImplRepoC.h
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+        * tao/PortableServer/PortableServerC.h
+        * tao/RTCORBA/RTCORBAC.h
+        * tao/RTScheduling/RTSchedulerC.h
+        * tao/Strategies/sciop_endpointsC.h
+        * tao/Strategies/uiop_endpointsC.h
+        Simplified TAO_Seq_Out_T to just use one template argument. Updated
+        the IDL compiler for this. Also use false for the release argument
+        of generated sequence constructors and add an argument to
+        _tao_encode/_tao_decode when generated in a header file to help
+        doxygen.
+
+        * TAO_Objref_Out_T.{h,inl}:
+        Assinging _var to _out is not allowed according to the spec
+
+        * tao/Messaging/*:
+        Removed old AMI mapping. Fixes partly bugzilla bug 2273, need to
+        update the IDL compiler yet
+
+        * tao/Exception.h:
+        Moved constructors, assignment operator and copy constructor to
+        protected now vc6 has been dropped. Also moved
+        create_system_exception from TAO_Exceptions class to TAO namespace
+
+        * tao/Messaging/Messaging.cpp:
+        * tao/Sync_Invocation.cpp:
+        * tao/SystemException.cpp:
+        Updated because of the create_system_exception move
+
+        * tao/String_Manager_T.h:
+        Renamed String_Manager to String_Manager_T, this way we can have
+        TAO::String_Manager and TAO::WString_Manager. These replace
+        TAO_String_Manager and TAO_WString_Manager
+
+        * CIAO/tools/Config_Handlers/DnC_Dump.cpp
+        * CIAO/tools/Config_Handlers/DnC_Dump.h
+        * TAO_IDL/be/be_visitor_array/array.cpp
+        * TAO_IDL/be/be_visitor_field/field_ch.cpp
+        * orbsvcs/PSS/PSDL_Exception_Visitor.cpp
+        * orbsvcs/PSS/PSDL_Node.h
+        * orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+        * tao/CORBA_String.h
+        * tao/IIOPC.h
+        * tao/IIOP_EndpointsC.h
+        * tao/IOP_IORC.h
+        * tao/String_Manager_T.h
+        * tao/String_Traits_Base_T.h
+        * tao/Tagged_Profile.h
+        * tao/DynamicAny/DynamicAnyC.h
+        * tao/IFR_Client/IFR_BaseC.h
+        * tao/IFR_Client/IFR_BasicC.h
+        * tao/IFR_Client/IFR_ComponentsC.h
+        * tao/IFR_Client/IFR_ExtendedC.h
+        * tao/ImR_Client/ImplRepoC.h
+        * tao/PI/ORBInitInfoC.h
+        * tao/Strategies/sciop_endpointsC.h
+        * tao/Strategies/uiop_endpointsC.h
+        Updated all these files because of TAO::String_Manager and
+        TAO::WString_Manager introduction
+
+        * tests/Sequence_Unit_Tests/mock_reference.cpp:
+        * tests/Sequence_Unit_Tests/mock_reference.hpp:
+        Added counter to count number of marshal calls
+
+        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp:
+        Check the right counter, should be marshal.
+
+        * tao/PI/ClientRequestDetails.cpp:
+        * tao/PI_Server/ServerRequestDetails.cpp:
+        Added missing duplicate call
+
+        * TAO_IDL/be/be_interface.cpp
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+        * TAO_IDL/be/be_visitor_interface/tie_si.cpp
+        * TAO_IDL/be/be_visitor_root/root.cpp
+        * tao/CurrentC.cpp
+        * tao/DomainC.cpp
+        * tao/ORB_Core.cpp
+        * tao/Object.cpp
+        * tao/Object_Ref_Table.cpp
+        * tao/PolicyC.cpp
+        * tao/Pseudo_VarOut_T.cpp
+        * tao/Pseudo_VarOut_T.inl
+        * tao/TAOC.cpp
+        * tao/AnyTypeCode/Any_Array_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Basic_Impl.cpp
+        * tao/AnyTypeCode/Any_Basic_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Impl.cpp
+        * tao/AnyTypeCode/Any_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Special_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+        * tao/AnyTypeCode/TypeCode.cpp
+        * tao/AnyTypeCode/TypeCode.inl
+        * tao/BiDir_GIOP/BiDirPolicyC.cpp
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+        * tao/CSD_Framework/CSD_FrameworkC.cpp
+        * tao/CSD_Framework/CSD_POA.cpp
+        * tao/CodecFactory/IOP_CodecC.cpp
+        * tao/DynamicAny/DynamicAnyC.cpp
+        * tao/DynamicInterface/Dynamic_Implementation.cpp
+        * tao/DynamicInterface/ExceptionList.cpp
+        * tao/DynamicInterface/Request.cpp
+        * tao/DynamicInterface/Server_Request.cpp
+        * tao/IFR_Client/IFR_BaseC.cpp
+        * tao/IFR_Client/IFR_BasicC.cpp
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+        * tao/IFR_Client/IFR_ComponentsC.cpp
+        * tao/IFR_Client/IFR_ExtendedC.cpp
+        * tao/IORInterceptor/IORInfoC.cpp
+        * tao/IORInterceptor/IORInterceptorC.cpp
+        * tao/IORManipulation/IORC.cpp
+        * tao/IORManipulation/IORManipulation.cpp
+        * tao/IORTable/IORTableC.cpp
+        * tao/IORTable/Table_Adapter.cpp
+        * tao/ImR_Client/ImplRepoC.cpp
+        * tao/ImR_Client/ServerObjectC.cpp
+        * tao/Messaging/MessagingC.cpp
+        * tao/Messaging/Messaging_No_ImplC.cpp
+        * tao/Messaging/Messaging_RT_PolicyC.cpp
+        * tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+        * tao/Messaging/PollableC.cpp
+        * tao/Messaging/TAO_ExtC.cpp
+        * tao/PI/ClientRequestInfoC.cpp
+        * tao/PI/ClientRequestInterceptorC.cpp
+        * tao/PI/InterceptorC.cpp
+        * tao/PI/ORBInitInfo.cpp
+        * tao/PI/ORBInitInfoC.cpp
+        * tao/PI/ORBInitializerC.cpp
+        * tao/PI/PICurrentC.cpp
+        * tao/PI/PolicyFactoryC.cpp
+        * tao/PI/PolicyFactory_Registry.cpp
+        * tao/PI/ProcessingModePolicyC.cpp
+        * tao/PI/RequestInfoC.cpp
+        * tao/PI_Server/ServerRequestInfoC.cpp
+        * tao/PI_Server/ServerRequestInterceptorC.cpp
+        * tao/PortableServer/AdapterActivatorC.cpp
+        * tao/PortableServer/IdAssignmentPolicyC.cpp
+        * tao/PortableServer/IdUniquenessPolicyC.cpp
+        * tao/PortableServer/ImplicitActivationPolicyC.cpp
+        * tao/PortableServer/LifespanPolicyC.cpp
+        * tao/PortableServer/Object_Adapter.cpp
+        * tao/PortableServer/POAManager.cpp
+        * tao/PortableServer/POAManagerC.cpp
+        * tao/PortableServer/PS_CurrentC.cpp
+        * tao/PortableServer/PortableServerC.cpp
+        * tao/PortableServer/RequestProcessingPolicyC.cpp
+        * tao/PortableServer/Root_POA.cpp
+        * tao/PortableServer/ServantActivatorC.cpp
+        * tao/PortableServer/ServantLocatorC.cpp
+        * tao/PortableServer/ServantManagerC.cpp
+        * tao/PortableServer/ServantRetentionPolicyC.cpp
+        * tao/PortableServer/ThreadPolicyC.cpp
+        * tao/RTCORBA/RTCORBAC.cpp
+        * tao/RTPortableServer/RTPortableServerC.cpp
+        * tao/RTScheduling/Current.cpp
+        * tao/RTScheduling/RTSchedulerC.cpp
+        * tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+        * tao/Utils/Server_Main.cpp
+        * tao/Valuetype/AbstractBase.cpp:
+        Use :: before ::CORBA
+
+        * TAO_IDL/be/be_interface.cpp
+        * tao/DomainC.cpp
+        * tao/DomainC.inl
+        * tao/GIOPC.h
+        * tao/PolicyC.cpp
+        * tao/PolicyC.h
+        * tao/PolicyC.inl
+        * tao/WrongTransactionC.cpp
+        * tao/AnyTypeCode/Alias_TypeCode.inl
+        * tao/AnyTypeCode/Alias_TypeCode_Static.inl
+        * tao/AnyTypeCode/BoundsC.cpp
+        * tao/AnyTypeCode/Empty_Param_TypeCode.inl
+        * tao/AnyTypeCode/Enum_TypeCode.inl
+        * tao/AnyTypeCode/Enum_TypeCode_Static.inl
+        * tao/AnyTypeCode/Fixed_TypeCode.inl
+        * tao/AnyTypeCode/Objref_TypeCode.inl
+        * tao/AnyTypeCode/Objref_TypeCode_Static.inl
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
+        * tao/AnyTypeCode/Sequence_TypeCode.inl
+        * tao/AnyTypeCode/Sequence_TypeCode_Static.inl
+        * tao/AnyTypeCode/String_TypeCode.inl
+        * tao/AnyTypeCode/String_TypeCode_Static.inl
+        * tao/AnyTypeCode/Struct_TypeCode.inl
+        * tao/AnyTypeCode/Struct_TypeCode_Static.inl
+        * tao/AnyTypeCode/Union_TypeCode.inl
+        * tao/AnyTypeCode/Union_TypeCode_Static.inl
+        * tao/AnyTypeCode/Value_TypeCode.inl
+        * tao/AnyTypeCode/Value_TypeCode_Static.inl
+        * tao/BiDir_GIOP/BiDir_Policy_i.cpp
+        * tao/CodecFactory/IOP_CodecC.cpp
+        * tao/Domain/DomainS.cpp
+        * tao/DynamicAny/DynamicAnyC.cpp
+        * tao/IFR_Client/IFR_BaseC.cpp
+        * tao/IFR_Client/IFR_BaseC.h
+        * tao/IFR_Client/IFR_BaseC.inl
+        * tao/IFR_Client/IFR_BasicC.cpp
+        * tao/IFR_Client/IFR_BasicC.h
+        * tao/IFR_Client/IFR_BasicC.inl
+        * tao/IFR_Client/IFR_ComponentsC.cpp
+        * tao/IFR_Client/IFR_ComponentsC.inl
+        * tao/IFR_Client/IFR_ExtendedC.cpp
+        * tao/IFR_Client/IFR_ExtendedC.h
+        * tao/IFR_Client/IFR_ExtendedC.inl
+        * tao/IORManipulation/IORC.cpp
+        * tao/IORTable/IORTableC.cpp
+        * tao/ImR_Client/ImplRepoC.cpp
+        * tao/ImR_Client/ImplRepoC.inl
+        * tao/ImR_Client/ServerObjectC.cpp
+        * tao/ImR_Client/ServerObjectC.inl
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp
+        * tao/Messaging/MessagingC.cpp
+        * tao/Messaging/MessagingC.inl
+        * tao/Messaging/Messaging_Policy_i.cpp
+        * tao/Messaging/PollableC.cpp
+        * tao/PI/InvalidSlotC.cpp
+        * tao/PI/ORBInitInfoC.cpp
+        * tao/PI/PIForwardRequestC.cpp
+        * tao/PortableServer/ForwardRequestC.cpp
+        * tao/PortableServer/POAManagerC.cpp
+        * tao/PortableServer/PS_CurrentC.cpp
+        * tao/PortableServer/PortableServerC.cpp
+        * tao/RTCORBA/RTCORBAC.cpp
+        * tao/RTCORBA/RT_Policy_i.cpp
+        * tao/RTScheduling/RTSchedulerC.cpp
+        * tao/TypeCodeFactory/Recursive_TypeCode.inl
+        * tao/Valuetype/StringValueC.inl
+        Removed ACE_NESTED_CLASS
+
+        * TAO_IDL/ast/ast_type.cpp
+        * TAO_IDL/be/be_interface.cpp
+        * TAO_IDL/be/be_visitor_component/component_ci.cpp
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_is.cpp
+        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+        * TAO_IDL/be/be_visitor_operation/operation.cpp
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+        Removed generation of ACE_NESTED_CLASS, just use A::B instead
+
+        All changes below is the merge of the branch sequenceupdate to
+        sequpdate2. This is the new sequence implementation for TAO.
+
+        * tao/Array_VarOut_T.h:
+        Only do an empty forward declaration of Array_Traits. This will
+        make sure that we have to do each specialization explicitly, if
+        we lack one, we get a compile error instead of this empty default
+        one.
+
+        * tao/Objref_VarOut_T.h:
+        Only do an empty forward declaration of Objref_Traits. This will
+        make sure that we have to do each specialization explicitly, if
+        we lack one, we get a compile error instead of this empty default
+        one.
+
+        * tao/Basic_Types.h:
+        Updated the string types, these are implemented by a template now.
+
+        * tao/BooleanSeqC.{h,cpp}:
+        * tao/CharSeqC.{h,cpp}:
+        * tao/CONV_FRAMEC.{h,cpp}:
+        * tao/CurrentC.{h,cpp}:
+        * tao/DomainC.{h,cpp}:
+        * tao/DoubleSeqC.{h,cpp}:
+        * tao/FloatSeqC.{h,cpp}:
+        * tao/WStringSeqC.{h,cpp}:
+        * tao/LongSeqC.{h,cpp}:
+        * tao/WCharSeqC.{h,cpp}:
+        * tao/Object_KeyC.{h,cpp}:
+        * tao/ObjectIdListC.{h,cpp}:
+        * tao/IIOP_EndpointsC.{h,cpp}:
+        * tao/LongLongSeqC.{h,cpp}:
+        * tao/IIOPC.{h,cpp}:
+        * tao/IOP_IORC.{h,cpp}:
+        * tao/LongDoubleSeqC.{h,cpp}:
+        * tao/Messaging_PolicyValueC.{h,cpp}:
+        * tao/OctetSeqC.{h,cpp}:
+        * tao/Policy_ForwardC.{h,cpp}:
+        * tao/PolicyC.{h,cpp}:
+        * tao/ServicesC.{h,cpp}:
+        * tao/ShortSeqC.{h,cpp}:
+        * tao/StringSeqC.{h,cpp}:
+        * tao/TAOC.{h,cpp}:
+        * tao/ULongLongSeqC.{h,cpp}:
+        * tao/ULongSeqC.{h,cpp}:
+        * tao/UShortSeqC.{h,cpp}:
+        * tao/AnyTypeCode/AnySeqC.{h,cpp}:
+        * tao/AnyTypeCode/DynamicC.{h,cpp}:
+        * tao/DynamicAny/DynamicAnyC.{h,cpp}:
+        * tao/IFR_Client/IFR_ExtendedC.{h,cpp}:
+        * tao/IFR_Client/IFR_ComponentsC.{h,cpp}:
+        * tao/IFR_Client/IFR_BasicC.{h,cpp}:
+        * tao/IFR_Client/IFR_BaseC.{h,cpp}:
+        * tao/ImR_Client/ImplRepoC.{h,cpp}:
+        * tao/IORManipulation/IORC.{h,cpp}:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.{h,cpp}:
+        * tao/PortableServer/PortableServerC.{h,cpp}:
+        * tao/RTCORBA/RTCORBAC.{h,cpp}:
+        * tao/RTScheduling/RTSchedulerC.{h,cpp}:
+        * tao/Strategies/sciop_endpointsC.{h,cpp}:
+        * tao/Strategies/uiop_endpointsC.{h,cpp}:
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.{h,cpp}:
+        Updated all these files because of the changes to the sequence
+        implementation. The base classes are changed including the way we
+        marshal and demarshal sequences. The argument to the marshal method
+        is also const.
+
+        * tao/Bounded_Array_Allocation_Traits.h:
+        * tao/Bounded_Reference_Allocation_Traits_T.h:
+        * tao/Bounded_Value_Allocation_Traits_T.h:
+        New allocation traits for bounded sequences
+
+        * tao/Value_Traits_T.h:
+        New value traits.
+
+        * tao/Bounded_Array_Sequence_T.h:
+        New template for Bounded Array Sequences
+
+        * tao/Bounded_Basic_String_Sequence_T.h:
+        * tao/Bounded_String_Sequence_T.h:
+        * tao/Bounded_Wstring_Sequence_T.h:
+        New template for bounded strings, derived are string and wstring
+        bounded sequences
 
-Wed Nov 22 12:34:29 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Bounded_Object_Reference_Sequence_T.h:
+        New template for bounded object reference sequences
 
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h:
-        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h:
-        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h:
-        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h:
-        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h:
-        * orbsvcs/tests/Bug_2137_Regression/README:
-        * orbsvcs/tests/Bug_2137_Regression/client.cpp:
-        * orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc:
-        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h:
-        * orbsvcs/tests/Bug_2248_Regression/test.idl:
-        * orbsvcs/tests/Bug_2248_Regression/server.cpp:
-        * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp:
-        * orbsvcs/tests/Bug_2248_Regression/README:
-        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
-        * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h:
-        * orbsvcs/tests/Bug_2248_Regression/client.h:
-        * orbsvcs/tests/Bug_2248_Regression/test_i.cpp:
-        * orbsvcs/tests/Bug_2248_Regression/tests.idl:
-        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
-        * orbsvcs/tests/Bug_2248_Regression/Client_i.h:
-        * orbsvcs/tests/Bug_2248_Regression/test_i.h:
-        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp:
-        * orbsvcs/tests/Bug_2247_Regression/Manager.h:
-        * orbsvcs/tests/Bug_2247_Regression/test.idl:
-        * orbsvcs/tests/Bug_2247_Regression/server.cpp:
-        * orbsvcs/tests/Bug_2247_Regression/test_i.cpp:
-        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
-        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
-        * orbsvcs/tests/Bug_2247_Regression/Client_i.h:
-        * orbsvcs/tests/Bug_2247_Regression/README:
-        * orbsvcs/tests/Bug_2247_Regression/test_i.h:
-        * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp:
-        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp:
-        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h:
-        * orbsvcs/Logging_Service/Event_Logging_Service/README:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/README:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/README:
-        * tao/PortableServer/Servant_var.inl:
-        * tao/PortableServer/Servant_var.cpp:
-        * tao/PortableServer/Servant_var.h:
-        * tao/Incoming_Message_Stack.inl:
-        * tao/Incoming_Message_Stack.h:
-        * tests/Bug_2222_Regression/test.cpp:
-        * tests/Bug_2222_Regression/Bug_2222_Regression.mpc:
-        * tests/Bug_2222_Regression/TestCase.idl:
-        * tests/Bug_2222_Regression/TestType.idl:
-        * tests/Bug_2144_Regression/test.cpp:
-        * tests/Bug_2144_Regression/Bug_2144_Regression.mpc:
-        * tests/Bug_2144_Regression/test.idl:
-        * tests/Bug_2144_Regression/README:
-        * tests/QtTests/client.cpp:
-        * tests/QtTests/client.h:
-        * tests/QtTests/test.idl:
-        * tests/QtTests/server.cpp:
-        * tests/QtTests/test_i.cpp:
-        * tests/QtTests/test_i.h:
-        * tests/Bug_2375_Regression/test.cpp:
-        * tests/Bug_2375_Regression/test.idl:
-        * tests/Bug_2375_Regression/Bug_2375_Regression.mpc:
-        * tests/Bug_2375_Regression/README:
-        * tests/Bug_1812_Regression/test.cpp:
-        * tests/Bug_1812_Regression/Bug_1812_Regession.mpc:
-        * tests/Bug_1812_Regression/Test.idl:
-        * tests/MProfile_Forwarding/Servant_Locator.cpp:
-        * tests/MProfile_Forwarding/test.idl:
-        * tests/MProfile_Forwarding/server.cpp:
-        * tests/MProfile_Forwarding/test_i.inl:
-        * tests/MProfile_Forwarding/Servant_Locator.h:
-        * tests/Permanent_Forward/Permanent_Forward.mpc:
-        * tests/Permanent_Forward/README:
-        * tests/Permanent_Forward/StubTest.cpp:
-        * tests/ICMG_Any_Bug/client.cpp:
-        * tests/ICMG_Any_Bug/HelloWorld.h:
-        * tests/ICMG_Any_Bug/Hello.cpp:
-        * tests/ICMG_Any_Bug/server.cpp:
-        * tests/ICMG_Any_Bug/Hello.h:
-        * tests/Bug_2183_Regression/client.cpp:
-        * tests/Bug_2183_Regression/Hello.cpp:
-        * tests/Bug_2183_Regression/Test.idl:
-        * tests/Bug_2183_Regression/server.cpp:
-        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc:
-        * tests/Bug_2183_Regression/Hello.h:
-        * tests/Bug_2183_Regression/README:
-        * tests/IDL_Test/array_only.idl:
-        * tests/Bug_1813_Regression/test.cpp:
-        * tests/Bug_1813_Regression/Bug_1813_Regession.mpc:
-        * tests/Bug_1813_Regression/Test.idl:
-        * examples/RTCORBA/Activity/Job.idl:
-        * examples/RTCORBA/Activity/README:
-        * examples/Load_Balancing_persistent/Identity_i.cpp:
-        * examples/Load_Balancing_persistent/Load_Balancing_Service.h:
-        * examples/Load_Balancing_persistent/Identity_i.h:
-        * examples/Load_Balancing_persistent/README:
-        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
-        * examples/Load_Balancing_persistent/Identity.idl:
-        * examples/Load_Balancing_persistent/Identity_Server.cpp:
-        * examples/Load_Balancing_persistent/Load_Balancer_i.h:
-        * examples/Load_Balancing_persistent/Identity_Server.h:
-        * examples/Load_Balancing_persistent/Identity_Client.cpp:
-        * examples/Load_Balancing_persistent/Identity_Client.h:
-        * examples/Load_Balancing_persistent/Load_Balancer.idl:
-        * examples/Load_Balancing_persistent/Load_Balancing_Service.cpp:
+        New allocation traits for bounded reference
 
-          Removed svn:executable property.
+        * tao/Bounded_Sequence_CDR_T.h:
+        Template method for sequence marshal/demarshal
 
-Wed Nov 22 11:51:49 UTC 2006  Simon McQueen  <sm@prismtech.com>
+        * tao/corba.h:
+        Updated includes, Managed_Types.h is replaced with
+        String_Manager_T.h
 
-        * orbsvcs/IFR_Service/IFR_Server.cpp:
-        * orbsvcs/IFR_Service/IFR_Service.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
-        * orbsvcs/orbsvcs/IFRService/Options.cpp:
+        * tao/CORBA_String.{h,cpp,inl}:
+        The CORBA::String_var/_out and CORBA::WString_var/_out are now
+        implemented with the new TAO::String_var/_out template
 
-          Make IFR exit when it receives an invalid startup option and improve
-          usage message. Fixes bugzilla #2720.
+        * tao/Generic_Sequence_T.h:
+        New generic sequence template
 
-Wed Nov 22 11:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Managed_Types.{h,cpp,i}:
+        Removed these files
 
-        * tao/FlResource/FlResource_Factory.cpp:
-        * tao/FlResource/FlResource_Factory.h:
-        * tao/QtResource/QtResource_Factory.cpp:
-        * tao/QtResource/QtResource_Factory.h:
-        * tao/TkResource/TkResource_Factory.cpp:
-        * tao/TkResource/TkResource_Factory.h:
-        * tao/XtResource/XtResource_Factory.cpp:
-        * tao/XtResource/XtResource_Factory.h:
-          Updated these files because the reactors they use are moved
-          to their own directories in ACE.
+        * tao/MProfile.cpp:
+        Initialise pointers with 0 and fixed retrieval of a policy
 
-Wed Nov 22 10:54:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Object.{h,cpp}:
+        Made the argument of the marshal method const
 
-        * tao/Strategies.mpc:
-          Now build with ace_for_tao but derive from core_strategies
+        * tao/operation_details.i:
+        Changed the way we reset the service info
 
-        * tao/tao.mpc:
-          Added new HTTP files and moved all sequence.pidl files to one
-          group because soon they all will get a special tao_idl argument
-          to be used.
+        * tao/ORB.h:
+        Updated all typedefs in this file
 
-        * tao/TAO_Internal.cpp:
-        * tao/default_resource.cpp:
-          Added HTTP
+        * tao/Policy_Set.{h,cpp.i}:
+        Made the get_policy_by_index const and fixed the
+        set_policy_overrides to work with the new sequences, as a result
+        the workarounds could be removed
 
-        * tao/GUIResource_Factory.{h,cpp}:
-          Changed dynamically_allocated_reactor to bool
+        * tao/Sequence_T.{cpp,i}:
+        Removed these files
 
-        * tao/ORB_Core.{h,cpp,inl}:
-          Changed has_shutdown to a real bool
+        * tao/Sequence_T.h:
+        Include all new sequence template files, makes it easy for old apps
+        to keep compiling
 
-        * tao/Valuetype/ValueBase.h:
-          Doxygen improvement
-
-Wed Nov 22 10:23:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Callback/Callback.mpc:
-        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
-        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
-        * performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc:
-        * performance-tests/Latency/Collocation/Collocation.mpc:
-        * performance-tests/Latency/Deferred/Deferred.mpc:
-        * performance-tests/Latency/DII/DII.mpc:
-        * performance-tests/Latency/DSI/DSI.mpc:
-        * performance-tests/Latency/Single_Threaded/Single_Threaded.mpc:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc:
-        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
-        * performance-tests/Sequence_Latency/DII/DII.mpc:
-        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
-        * performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc:
-          Explicitly add avoids += ace_for_tao to these projects. At this
-          moment they are not build because the strategies library is not
-          available with ace_for_tao, but this is something I will change
-          but besides strategies these projects do use some ACE classes
-          which are not available in the ace_for_tao configuration
+        * tao/String_Alloc.{h,cpp}:
+        All string allocation methods
 
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
-          Const improvement
+        * tao/VarOut_T.h:
+        Removed THIS_OUT_TYPE typedef
 
-        * orbsvcs/tests/Event/UDP/Consumer.cpp:
-        * orbsvcs/tests/Event/UDP/receiver.cpp:
-        * orbsvcs/tests/Event/UDP/Supplier.cpp:
-        * orbsvcs/tests/Event/UDP/Supplier.h:
-        * orbsvcs/tests/Event/UDP/Test.idl:
-          Extended this test and reproduced the bug we had in CIAO. This
-          test now will fail until Jeff Parsons commits some related
-          valuetype changes.
+        * tao/DynamicInterface/Request.h:
+        Removed include of Sequence.h, not needed
 
-Wed Nov 22 10:17:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Profile.h:
+        Updated typedef for TAO_opaque
 
-        * Release:
-          Removed dsw files
+        * tao/Object_Reference_Sequence_Element_T.h:
+        * tao/Object_Reference_Traits_Base_T.h:
+        * tao/Object_Reference_Traits_T.h:
+        * tao/Range_Checking_T.h:
+        New files
 
-        * docs/ORBEndpoint.html:
-          Added reuse_addr to the list of options, request has been made
-          to OCI to check and extend the documentation of this option
-          which has been available starting TAO 1.4.8
+        * tao/Seq_Out_T.{h,inl}:
+        Removed TAO_MngSeq_Out_T, not needed anymore
 
-        * TAO_IDL/be/be_codegen.cpp:
-          Removed check for IFR_Client, we do have an empty A.h file for
-          the IFR_Client files now
+        * tao/Sequence.{h,cpp,i}:
+        Removed
 
-        * TAO_IDL/be/be_global.cpp:
-          Updated help of -GA
+        * tao/Seq_Var_T.{h,cpp.inl}:
+        Removed TAO_MngSeq_Var_T, not needed anymore
 
-        * tao/AnyTypeCode/NVList.cpp:
-          Use true/false
+        * tao/String_Manager_T.h:
+        TAO string manager as template, new file
 
-        * tao/HTTP_Client.{h,cpp}:
-        * tao/HTTP_Handler.{h,cpp}:
-        * tao/HTTP_Parser.{h,cpp}:
-          New files to support http:/ as IOR format. Fixes bugzilla bugs
-          2670 and 372
+        * tao/String_Sequence_Element_T.h:
+        Element in a string sequence
 
-        * tao/IIOP_Acceptor.cpp:
-          Removed check for priority, that is gone already a long time and
-          this takes footprint.
+        * tao/String_Traits_Base_T.h:
+        * tao/String_Traits_T.h:
+        String traits
 
-        * tao/Stub.cpp:
-          Const changes and removed TAO_Synchronous_Cancellation_Required which
-          doesn't seem used at all.
+        * tao/Unbounded_Array_Allocation_Traits_T.h
+        * tao/Unbounded_Array_Sequence_T.h
+        * tao/Unbounded_Basic_String_Sequence_T.h
+        * tao/Unbounded_Object_Reference_Sequence_T.h
+        * tao/Unbounded_Octet_Sequence_T.h
+        * tao/Unbounded_Reference_Allocation_Traits_T.h
+        * tao/Unbounded_Sequence_CDR_T.h
+        * tao/Unbounded_String_Sequence_T.h
+        * tao/Unbounded_Value_Allocation_Traits_T.h
+        * tao/Unbounded_Value_Sequence_T.h
+        * tao/Unbounded_Wstring_Sequence_T.h
+        Unbounded sequence files
+
+        * tao/diffs/Object_Key.diff:
+        Updated
+
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI_Server/ServerRequestInfo.cpp:
+        Removed temporary object usage
+
+        * tao/RTCORBA/RT_Stub.cpp:
+        * tao/RTScheduling/Request_Interceptor.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+        Updated for the fact that an object sequence now returns a _ptr
+        on the subscript operators instead of the _var which wasn't
+        confirming to the CORBA C++ mapping
+
+        * tao/RTScheduling/Current.h:
+        Updated IdType typedef
+
+        * tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h
+        * tao/Valuetype/Bounded_Valuetype_Sequence_T.h
+        * tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h
+        * tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
+        * tao/Valuetype/Valuetype_Sequence_Element_T.h
+        * tao/Valuetype/Valuetype_Traits_Base_T.h
+        * tao/Valuetype/Valuetype_Traits_T.h
+        New sequence implementated for valuetypes
+
+        * tao/Valuetype/Sequence_T.{cpp,inl}:
+        Removed
+
+        * tao/Valuetype/Sequence_T.h:
+        Just include the new files, easier for backward compatibility
+
+        * tao/Valuetype/Value_VarOut_T.{h,cpp}:
+        Just define an empty Value_Traits, make sure we get all
+        specializations
 
-Mon Nov 20 08:16:34 2006  Simon McQueen  <sm@prismtech.com>
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be_include/be_visitor_traits.h:
+        Updated for new sequence implementation
 
-        * TAO version 1.5.4 released.
+        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
+        * examples/Load_Balancing/Identity_Client.cpp:
+        * examples/Load_Balancing_persistent/Identity_Client.cpp:
+        * examples/POA/NewPOA/NewPOA.cpp:
+        * examples/POA/POA_BiDir/POA_BiDir.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp:
+        * tests/DynAny_Test/test_dynsequence.cpp:
+        * tests/Sequence_Unit_Tests/*:
+        * tests/ORT/ServerRequestInterceptor.cpp:
+        * tests/Param_Test/big_union.cpp:
+        *
+        tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp:
+        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
+        * orbsvcs/orbsvcs/DsLogAdmin.idl:
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.{cpp,i}:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.{h,cpp,i}
+        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp
+        * orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.h:
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.{h,cpp}
+        * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp:
+        * orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp:
+        * orbsvcs/tests/AVStreams/Component_Switching/sender.cpp:
+        * orbsvcs/tests/Bug_1393_Regression/client.cpp:
+        * orbsvcs/tests/FT_App/FT_Client.cpp:
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp:
+        *
+        orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp:
+        * tests/RTScheduling/Current/Thread_Task.cpp:
+        * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
+        Updated for sequence implementation
+
+        * tests/Sequence_Unit_Tests/*:
+        Removed files that are now in the core TAO lib
+
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2503_Regression/*:
+          New regression for bug 2503. Thanks to Carlos O'Ryan for creating
+          this test
+
+Tue Apr 18 20:51:48 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * TAO version 1.5.1 released.
 
 Local Variables:
 mode: change-log
diff --git a/TAO/ChangeLogs/ChangeLog-06b b/TAO/ChangeLogs/ChangeLog-06b
deleted file mode 100644
index bbe4135e861..00000000000
--- a/TAO/ChangeLogs/ChangeLog-06b
+++ /dev/null
@@ -1,12577 +0,0 @@
-Mon Nov 20 10:10:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-
-          Slight tidy-up, to keep release notes / NEWS in step.
-
-Fri Nov 17 09:08:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
-
-          Slight tidy-up, to keep release notes / NEWS in step.
-          Wallace Zhang's fix for shutdown run-time windows test problem.
-
-Thu Nov 16 10:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * tao/IIOP_Profile.cpp:
-
-          Committed for Phil Mesnier. Patch so that Bug_2604_Regression
-          test passes on windows. The problem was that an IIOP_Profile
-          that is decoded from a CDR buffer does not correctly set the
-          is_ipv6_decimal_ flag for the first endpoint only. After the
-          beta is out more changes have to be made to remove the friend
-          relationships and cleanup more code. Need to also update
-          tests/IPV6 so that we have a regression in the repo for this
-          problem. Thanks to Johnny Willemsen and Martin Corino for
-          quickly testing this fix.
-
-Thu Nov 16 00:07:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-        * tao/DynamicAny.mpc:
-
-          Changed to inherit from core.mpb, so that library and headers
-          will be installed for automake build.
-
-Wed Nov 15 16:38:29 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.h:
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
-
-          Removed code that had been in #if 0/#endif, which had been part
-          of an earlier, more complete design but more difficult to
-          implement.
-
-          Eliminated #include of non-existent inline file that gave the
-          fuzz build heartburn.
-
-Wed Nov 15 10:35:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-
-          Added entries.
-
-Wed Nov 15 10:05:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * tests/Oneway_Timeouts/client.cpp:
-
-          Windows warnings removed (for Phil Mesnier).
-
-Wed Nov 15 08:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Options.html:
-
-          Added ORBServiceConfigLoggerKey, thanks to Doug and Abdul for
-          finding out this was lacking.
-
-Wed Nov 15 04:00:22 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
-        * examples/RTScheduling/Makefile.am:
-
-          Regenerated.
-
-Wed Nov 15 02:04:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-        * tao/tao.mpc:
-
-          Add Header_Files section containing all the fooA.h headers
-          generated from *.pidl files.  These aren't automagically
-          added (possibly because of the use of MPC's >> construct),
-          which results in these headers not being installed in
-          automake builds.
-
-Tue Nov 14 16:17:04 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/RTScheduling/RTSchedTestLib.mpc:
-        * examples/RTScheduling/rtschedtestlib_export.h:
-
-          New files, representing a new build created to hold common
-          code factored out from the other builds. Motivated not only
-          by good design, but by necessity on our scoreboard
-          platforms with parallel builds, where strict dependency
-          ordering in required.
-
-        * examples/RTScheduling/Thread_Task.h:
-        * examples/RTScheduling/Synch_i.h:
-        * examples/RTScheduling/Job.mpc:
-        * examples/RTScheduling/POA_Holder.cpp:
-        * examples/RTScheduling/Fixed_Priority_Scheduler\FP_DT_Creator.cpp:
-        * examples/RTScheduling/Fixed_Priority_Scheduler\FP_DT_Creator.h:
-        * examples/RTScheduling/Fixed_Priority_Scheduler\Fixed_Priority_Scheduler.mpc:
-        * examples/RTScheduling/POA_Holder.h:
-        * examples/RTScheduling/Synch.mpc:
-        * examples/RTScheduling/Job_i.cpp:
-        * examples/RTScheduling/Starter.cpp:
-        * examples/RTScheduling/Task_Stats.h:
-        * examples/RTScheduling/DT_Creator.cpp:
-        * examples/RTScheduling/Job_i.h:
-        * examples/RTScheduling/MIF_Scheduler\MIF_Scheduler.mpc:
-        * examples/RTScheduling/MIF_Scheduler\MIF_Scheduler.h:
-        * examples/RTScheduling/MIF_Scheduler\test.cpp:
-        * examples/RTScheduling/MIF_Scheduler\test.h:
-        * examples/RTScheduling/MIF_Scheduler\MIF_Task.cpp:
-        * examples/RTScheduling/Starter.h:
-        * examples/RTScheduling/Thread_Task.cpp:
-        * examples/RTScheduling/DT_Creator.h:
-
-          Factored files and dependencies out of existing MPC files to
-          be consistent with the new MPC file above. Also, in C++
-          files, re-ordered includes, added export macros, and made
-          other cosmetic changes.
-
-Tue Nov 14 15:23:43 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * NEWS:
-
-          Updated this file with information about my two bug fixes.
-
-Tue Nov 14 13:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Wait_Strategy.cpp:
-        * tao/Wait_On_Leader_Follower.cpp:
-        * tao/default_client.cpp:
-          Added some missing markers for FOCUS to work
-
-Tue Nov 14 09:00:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-
-          Submitted by Jeff Parsons.
-
-Tue Nov 14 04:59:41 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
-
-          Correct problems related to missing string functions on
-          non-inline builds.
-
-Mon Nov 13 22:40:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Event/ThreadFlags/Makefile.am:
-
-          Regenerated.
-
-Mon Nov 13 22:36:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
-        * examples/RTScheduling/Makefile.am:
-
-          Regenerated.
-
-Mon Nov 13 20:01:51 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.h:
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
-        * orbsvcs/tests/Event/ThreadFlags/testflags.cpp:
-
-          Various fixes to enable Versioned Namespace builds to complete.
-
-Mon Nov 13 19:22:06 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/RTScheduling/Job.mpc:
-        * examples/RTScheduling/job_export.h:
-        * examples/RTScheduling/Synch.mpc:
-        * examples/RTScheduling/synch_export.h:
-
-          New files, factored out IDL files common to some or all
-          of the examples in this directory into separate builds,
-          to eliminate problems with parallel builds when IDL
-          files are repeated in builds in the same directory.
-
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc:
-        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc:
-
-          Modified these files to make them consistent with the
-          changes above.
-
-Mon Nov 13 15:23:05 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp (TAO_EC_TPC_debug_level):
-
-          Moved declaration to fix versioned namespace builds.
-
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.h:
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
-
-          Add in versioned namespace boundary macros to fix versioned
-          namespace builds.
-
-Mon Nov 13 15:21:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/default_resource.h:
-
-          It turns out, exporting of the TAO_Codeset_Parameters is indeed
-          necessary (the advanced resource factory needs it,
-          too). Partially reverting "Fri Nov 10 21:09:53 UTC 2006".
-
-Sat Nov 11 17:19:31 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/tests/Event/ThreadFlags/testflags.cpp: Remove extraneous
-          semicolon after ACE_RCSID.  There should be a fuzz check for
-          this.
-
-Sat Nov 11 09:31:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Event/ThreadFlags/tftest.mpc:
-
-          Fix broken dependency by inheriting from rtevent_serv.mpb
-          instead of appending TAO_RTEvent_Serv to libs.
-
-Fri Nov 10 21:09:53 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/default_resource.h:
-
-          Cleaning up the code that fixes bug #2651 to fix typos and
-          eliminate unnecessary exports. (Thanks Johnny!)
-
-Fri Nov 10 15:51:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/ORB_Core.cpp (fini, ~TAO_ORB_Core):
-
-          Calling TAO::ORB::close_services() prior to the dtor may cause
-          non-yet-destroyed-heap-allocated objects to end up in unmapped
-          memory (like the policy_factory_registry_, for example).  This
-          can happen if the dynamic service object, which allocated them
-          gets unloaded before the core dtor deletes them.  The change
-          ensures the core sevice destruction (close_services) is
-          postponed until everything else the core owns has been deleted.
-
-Fri Nov 10 09:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Wait_On_Read.cpp:
-        * tao/SystemException.cpp:
-        * tao/Synch_Invocation.cpp:
-        * tao/Base_Transport_Property.cpp:
-          Const improvements
-
-        * tao/Stub.cpp:
-          Removed TAO_Synchronous_Cancellation_Required, not used and
-          const improvements
-
-Fri Nov 10 08:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-          Export this template specialization to resolve application link
-          errors with Intel 9.0
-
-Fri Nov 10 01:29:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/CosEvent/Makefile.am:
-        * orbsvcs/tests/Event/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Makefile.am:
-
-          Regenerated to recurse into new test directories.
-
-        * configure.ac:
-
-          Configure Makefiles in new test directories.
-
-        * orbsvcs/tests/CosEvent/Timeout/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am:
-        * orbsvcs/tests/Event/ThreadFlags/Makefile.am:
-
-          New files.  Makefile.am's for new test directories.
-
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc:
-          Add automake specific section so that includes is set relative
-          to $(srcdir).  Fix includes so it is correct on case-sensitive
-          filesystems.
-
-Thu Nov  9 22:34:28 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
-
-          Removed semicolon after ACE_RCSID that caused problems with some
-          compilers, but not others, and caused a domino effect of no
-          RTEC-related stuff to build.
-
-Thu Nov  9 19:27:16 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated (again, to catch changes made while I was preparing
-          the last set of changes).
-
-Thu Nov  9 18:52:15 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * NEWS: Updated to reflect RTEC changes.
-
-Thu Nov  9 15:42:32 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * docs/ec_options.html: Add documentation for TPC and
-          -ECDispatchingThreadFlags options.
-
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-
-          Added new option, -ECDispatchingThreadsFlags, that allows the
-          user to pass in a list of thread creation flags and priority for
-          dispatching threads.  These can be used for either the MT
-          dispatching strategy or the TPC dispatching strategy.
-
-          Also added -ECDebug option to enable debugging output from the
-          RTEC.  Only the option and variable was added, but no messages.
-          Therefore, at the moment, this does not generate much output.
-
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Factory.cpp:
-
-          Added support for RTEC's debug level.
-
-        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
-
-          (CTOR) Changed so that thread flags can be passed in just like
-          with the MT dispatching strategy.
-
-          (add_consumer) Modified so that it passes the thread flags set
-          in the CTOR to the dispatching task's activate call.
-
-        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp (create_dispatching):
-
-          Update to reflect new CTOR args for EC_TPC_Dispatching.
-
-        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl:
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:
-
-          Change references to EC_TPC_debug_level to
-          TAO_EC_TPC_debug_level for proper scoping.
-
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.h:
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
-
-          Added new abstraction around thread flags.  This also handles
-          parsing of text representation of THR_* options.  Ideally this
-          is part of ACE, but such a low-level change is difficult to push
-          through in general, much less in a patch.
-
-        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
-
-          Updated with new files.
-
-        * orbsvcs/tests/Event/ThreadFlags/testflags.cpp:
-        * orbsvcs/tests/Event/ThreadFlags/tftest.mpc:
-
-          Added unit test for TAO_EC_Thread_Flags abstraction.
-          Unfortunately, due to the way that some of the thread flags
-          are encoded on some platforms, e.g., Linux, the test can
-          give false failing indications.  I've left this as-is for
-          now because I haven't decided if this is a flaw in the test,
-          a flaw in the TAO_EC_Thread_Flags abstraction, or a flaw in
-          the way ACE assigns values when a THR_ symbol is not provided
-          by the platform itself.
-
-Thu Nov  9 12:17:10 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * docs/tutorials/Quoter/AMI/Makefile.am:
-        * docs/tutorials/Quoter/Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/Makefile.am:
-        * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
-        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am:
-        * docs/tutorials/Quoter/idl/Makefile.am:
-        * examples/AMH/Sink_Server/Makefile.am:
-        * examples/AMI/FL_Callback/Makefile.am:
-        * examples/Buffered_AMI/Makefile.am:
-        * examples/Buffered_Oneways/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool4/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-        * examples/Callback_Quoter/Makefile.am:
-        * examples/Content_Server/AMI_Iterator/Makefile.am:
-        * examples/Content_Server/AMI_Observer/Makefile.am:
-        * examples/Content_Server/SMI_Iterator/Makefile.am:
-        * examples/Event_Comm/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
-        * examples/Load_Balancing/Makefile.am:
-        * examples/Load_Balancing_persistent/Makefile.am:
-        * examples/Logging/Makefile.am:
-        * examples/Makefile.am:
-        * examples/OBV/Typed_Events/Makefile.am:
-        * examples/POA/Adapter_Activator/Makefile.am:
-        * examples/POA/DSI/Makefile.am:
-        * examples/POA/Default_Servant/Makefile.am:
-        * examples/POA/Explicit_Activation/Alt_Resources/Makefile.am:
-        * examples/POA/Explicit_Activation/Makefile.am:
-        * examples/POA/FindPOA/Makefile.am:
-        * examples/POA/Forwarding/Makefile.am:
-        * examples/POA/Generic_Servant/Makefile.am:
-        * examples/POA/Loader/Makefile.am:
-        * examples/POA/NewPOA/Makefile.am:
-        * examples/POA/On_Demand_Activation/Makefile.am:
-        * examples/POA/On_Demand_Loading/Makefile.am:
-        * examples/POA/POA_BiDir/Makefile.am:
-        * examples/POA/Reference_Counted_Servant/Makefile.am:
-        * examples/POA/RootPOA/Makefile.am:
-        * examples/POA/TIE/Makefile.am:
-        * examples/Persistent_Grid/Makefile.am:
-        * examples/PluggableUDP/tests/Basic/Makefile.am:
-        * examples/PluggableUDP/tests/Performance/Makefile.am:
-        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
-        * examples/Quoter/Makefile.am:
-        * examples/RTCORBA/Activity/Makefile.am:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
-        * examples/Simple/bank/Makefile.am:
-        * examples/Simple/chat/Makefile.am:
-        * examples/Simple/echo/Makefile.am:
-        * examples/Simple/grid/Makefile.am:
-        * examples/Simple/time-date/Makefile.am:
-        * examples/Simple/time/Makefile.am:
-        * examples/Simulator/Event_Supplier/Makefile.am:
-        * examples/TypeCode_Creation/Makefile.am:
-        * examples/ior_corbaloc/Makefile.am:
-        * examples/mfc/Makefile.am:
-        * interop-tests/wchar/Makefile.am:
-        * 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/ImplRepo_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/TAO_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/examples/CosEC/Factory/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am:
-        * orbsvcs/examples/CosEC/Simple/Makefile.am:
-        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
-        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
-        * orbsvcs/examples/LoadBalancing/Makefile.am:
-        * orbsvcs/examples/Log/Basic/Makefile.am:
-        * orbsvcs/examples/Log/Event/Makefile.am:
-        * orbsvcs/examples/Log/Notify/Makefile.am:
-        * orbsvcs/examples/Log/RTEvent/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/Agent/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/Gate/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am:
-        * orbsvcs/examples/Notify/Filter/Makefile.am:
-        * orbsvcs/examples/Notify/Lanes/Makefile.am:
-        * orbsvcs/examples/Notify/Subscribe/Makefile.am:
-        * orbsvcs/examples/Notify/ThreadPool/Makefile.am:
-        * orbsvcs/examples/ORT/Makefile.am:
-        * orbsvcs/examples/RtEC/IIOPGateway/Makefile.am:
-        * orbsvcs/examples/RtEC/Kokyu/Makefile.am:
-        * orbsvcs/examples/RtEC/MCast/Makefile.am:
-        * orbsvcs/examples/RtEC/Schedule/Makefile.am:
-        * orbsvcs/examples/RtEC/Simple/Makefile.am:
-        * orbsvcs/examples/Security/Send_File/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/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:
-        * 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/BiDir_CORBALOC/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/Bug_2074_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2137_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
-        * orbsvcs/tests/Concurrency/Makefile.am:
-        * orbsvcs/tests/CosEvent/Basic/Makefile.am:
-        * orbsvcs/tests/CosEvent/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/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Common/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Complex/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/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:
-        * orbsvcs/tests/FT_App/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:
-        * orbsvcs/tests/HTIOP/AMI/Makefile.am:
-        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
-        * orbsvcs/tests/HTIOP/Hello/Makefile.am:
-        * orbsvcs/tests/IOR_MCast/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
-        * orbsvcs/tests/ImplRepo/NameService/Makefile.am:
-        * orbsvcs/tests/ImplRepo/scale/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am:
-        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am:
-        * orbsvcs/tests/Log/Basic_Log_Test/Makefile.am:
-        * orbsvcs/tests/Makefile.am:
-        * orbsvcs/tests/Miop/McastHello/Makefile.am:
-        * orbsvcs/tests/Notify/Basic/Makefile.am:
-        * orbsvcs/tests/Notify/Blocking/Makefile.am:
-        * orbsvcs/tests/Notify/Destroy/Makefile.am:
-        * orbsvcs/tests/Notify/Discarding/Makefile.am:
-        * orbsvcs/tests/Notify/Driver/Makefile.am:
-        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
-        * orbsvcs/tests/Notify/Ordering/Makefile.am:
-        * orbsvcs/tests/Notify/PluggableTopology/Makefile.am:
-        * orbsvcs/tests/Notify/RT_lib/Makefile.am:
-        * orbsvcs/tests/Notify/Reconnecting/Makefile.am:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Test_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/XML_Persistence/Makefile.am:
-        * orbsvcs/tests/Notify/lib/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
-        * orbsvcs/tests/Property/Makefile.am:
-        * orbsvcs/tests/Redundant_Naming/Makefile.am:
-        * orbsvcs/tests/Sched/Makefile.am:
-        * orbsvcs/tests/Sched_Conf/Makefile.am:
-        * orbsvcs/tests/Security/BiDirectional/Makefile.am:
-        * orbsvcs/tests/Security/Big_Request/Makefile.am:
-        * orbsvcs/tests/Security/Callback/Makefile.am:
-        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
-        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
-        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
-        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
-        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
-        * orbsvcs/tests/Simple_Naming/Makefile.am:
-        * orbsvcs/tests/Time/Makefile.am:
-        * orbsvcs/tests/Trading/Makefile.am:
-        * orbsvcs/tests/ior_corbaname/Makefile.am:
-        * orbsvcs/tests/tests_svc_loader/Makefile.am:
-        * performance-tests/Anyop/Makefile.am:
-        * performance-tests/CSD_Strategy/TestApps/Makefile.am:
-        * performance-tests/CSD_Strategy/TestInf/Makefile.am:
-        * performance-tests/CSD_Strategy/TestServant/Makefile.am:
-        * performance-tests/Callback/Makefile.am:
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
-        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Latency/AMI/Makefile.am:
-        * performance-tests/Latency/Collocation/Makefile.am:
-        * performance-tests/Latency/DII/Makefile.am:
-        * performance-tests/Latency/DSI/Makefile.am:
-        * performance-tests/Latency/Deferred/Makefile.am:
-        * performance-tests/Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Memory/IORsize/Makefile.am:
-        * performance-tests/Memory/Single_Threaded/Makefile.am:
-        * performance-tests/POA/Create_Reference/Makefile.am:
-        * performance-tests/POA/Demux/Makefile.am:
-        * performance-tests/POA/Implicit_Activation/Makefile.am:
-        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
-        * performance-tests/Pluggable/Makefile.am:
-        * performance-tests/Protocols/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am:
-        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
-        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/AMI/Makefile.am:
-        * performance-tests/Sequence_Latency/DII/Makefile.am:
-        * performance-tests/Sequence_Latency/DSI/Makefile.am:
-        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
-        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Throughput/Makefile.am:
-        * tao/Makefile.am:
-        * utils/catior/Makefile.am:
-        * utils/nslist/Makefile.am:
-        * utils/wxNamingViewer/Makefile.am:
-
-          Regenerate.
-
-Thu Nov  9 09:54:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Bug_2654_Regression/Hello.cpp:
-
-          Fixed the last fix to get rid of compile warning;-).
-
-Thu Nov  9 06:46:21 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * docs/Options.html:
-
-          Added description of new "dev_poll" Advanced_Resource_Factory
-          reactor type.
-
-Thu Nov  9 01:19:02 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be_include/be_decl.h:
-
-          Fixed bug where TIE class skeleton code is generated twice
-          when AMH code generation is enabled.
-
-Wed Nov  8 16:16:37 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * docs/releasenotes/index.html:
-        * docs/compiler.html:
-
-          Update IDL compiler documentation to reflect the changes in
-
-          Tue Nov  7 23:13:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Wed Nov  8 14:12:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/AMH_Exceptions/Test.idl:
-        * tests/AMH_Exceptions/server.cpp:
-        * tests/AMH_Exceptions/client.cpp:
-        * tests/AMH_Exceptions/run_test.pl:
-
-          Added clean shutdown option.
-
-Wed Nov  8 13:22:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Muxing/Test.idl:
-        * tests/Muxing/Receiver{.h .cpp}:
-        * tests/Muxing/server.cpp:
-        * tests/Muxing/client.cpp:
-        * tests/Muxing/run_test.pl:
-
-          Added clean shutdown option.
-
-Wed Nov  8 13:14:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Bug_2654_Regression/Hello.cpp:
-
-          Fixed typo causing compile error.
-
-Wed Nov  8 07:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/DSI_Gateway/client.cpp:
-        * tests/DSI_Gateway/test_i.{h,cpp,inl}:
-        * tests/DSI_Gateway/test.idl:
-          Extended this test to also test an attribute, this extension
-          exhibits a few bugs in the DII code. Thanks to Venkat
-          <swara101 at yahoo dot com> for extending this test.
-
-        * tao/DynamicInterface/Context.cpp:
-        * tao/DynamicInterface/DII_Arguments.cpp:
-        * tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp:
-          Const changes and small performance improvements
-
-        * tao/DynamicInterface/Request.cpp:
-          Fixed a few bugs related to the number of arguments, also
-          applied a few const and performance improvements.
-
-Tue Nov  7 23:13:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_operation/tie_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_si.cpp:
-        * TAO_IDL/be_include/be_visitor_interface/tie_si.h:
-        * TAO_IDL/be_include/be_visitor_operation/tie_si.h:
-
-          Removed these files.
-
-        * TAO_IDL/be/be_visitor_operation/tie_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_ss.cpp:
-        * TAO_IDL/be_include/be_visitor_interface/tie_ss.h:
-        * TAO_IDL/be_include/be_visitor_operation/tie_ss.h:
-
-          Added these files, in effect renaming the ones listed
-          as removed above.
-
-        * TAO_IDL/be/be_visitor_operation.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_root/root_si.cpp:
-        * TAO_IDL/be/be_visitor_root/root_sth.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ss.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-        * TAO_IDL/be_include/be_visitor_operation.h:
-
-          Uninlined the generated code for TIE classes, since much
-          of this code consists of virtual functions, and can thus
-          cause problems related to RTTI on some compilers. Thanks
-          to Ossama Othman <ossama@dre.vanderbilt.edu> for
-          reporting the problem. This fix closes [BUGID:2699].
-
-Tue Nov  7 19:45:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2654_Regression/Hello.cpp:
-          ACE_OS::exit() doesn't seem to work well when called from
-          non-main threads on windows. Switching to ORB::shutdown() may
-          improve the performance a bit.
-
-        * tests/Oneway_Timeouts/client.cpp:
-          Replaced cout/cerr with ACE_DEBUG/ACE_ERROR. Also reset the
-          timeout test value before issuing the shutdown invocation. I
-          believe this invocation was the major cause of failures because
-          it would cause a timeout after a delay in a scenaro that is
-          otherwise intended to be asynchronous and otherwise have no
-          delay at all. I also increased the TIME_THRESHOLD value to
-          better accomodate preemptively multitasking test hosts.
-
-Tue Nov  7 20:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * be/be_visitor_exception/exception_cs.cpp:
-          Generate the constructor taking all members as first method. The
-          gcc 3.2.3 based rtems compiler seems to get confused in the
-          generated tests/IDL_Test/anonymousC.cpp file when it is the last
-          method. For other compilers it doesn't make a difference but at
-          least with this change we have an error free compilation for
-          rtems
-
-        * be/be_visitor_valuetype/valuetype_cs.cpp:
-          Generate const for retval
-
-Tue Nov  7 19:06:12 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tao/ORB_Core.cpp (orbinitializer_registry_i):
-
-          Temporarily reverted
-          "Thu Nov  2 23:23:16 UTC 2006  Ossama Othman  <ossama_othman at
-          symantec.com>" change.  It's not completely correct since it
-          prevents dynamic ORB unloading from working properly when
-          ORBInitializers have been registered.  The existing code isn't
-          correct either but go with it for now since it has been tested
-          more.
-
-Tue Nov  7 12:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Two_Objects/worker.{h,cpp}:
-        * tests/Two_Objects/server.cpp:
-          Renamed timeout to orb_timeout, resolves the warnings in the
-          rtems build where timeout is also something in the rtems
-          glue code.
-
-Tue Nov  7 09:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
-          Fixed warning abour variable not used in rtems build
-
-Tue Nov  7 06:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2654_Regression/client.cpp:
-          Fixed warning in vc7 builds
-
-Mon Nov  6 20:04:53 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2654_Regression/Hello.cpp:
-          Replace ::exit() with ACE_OS::exit() for portability.
-
-Mon Nov  6 19:33:15 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/Object.cpp (_set_policy_overrides):
-
-           When setting the policy overrides on an Object, we need to ensure
-           that when it is collocated it has a collocated servant.
-           Otherwise, narrowing the Object afterward will cause an exception
-           to be thrown.  Thanks to Artur DeEsperanto <DrEsperanto at gmx
-           dot net> for reporting this.
-
-        * tests/Bug_2134_Regression/Bug_2134_Regression.mpc:
-        * tests/Bug_2134_Regression/Hello.cpp:
-
-          Modified this test to utilize _set_policy_overrides() on the
-          collocated object to exercise the change above.
-
-Mon Nov  6 09:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/CollocationLockup/CollocationLockup.cpp:
-        * tests/CollocationLockup/AB.idl:
-          Renamed struct B to struct C to resolve compile problems with
-          rtems which seems to have a struct B.
-
-        * tests/Multiple_Inheritance/client.cpp:
-        * tests/Multiple_Inheritance/Multiple_Inheritance.idl:
-          Renamed B to intB to resolve compile problems with
-          rtems which seems to have a struct B.
-
-Fri Nov  3 22:16:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_sequence.cpp (in_recursion):
-
-          Fixed a possible bug in the check for recursive IDL type.
-          The change will in any case speed up the performance of
-          this method somewhat, since it will short-circuit the
-          checking if the sequence's element type is neither a struct,
-          a union, nor a sequence.
-
-Fri Nov  3 18:05:20 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp (visit_predefined_type):
-
-          Simplified the code in this method, owing to the changes in
-
-          Thu Nov  2 20:53:16 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          to AST_Type::nested_name().
-
-Fri Nov  3 16:10:31 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp:
-
-          More cases of ad hoc generation of the global "::" that can be
-          removed because such generation is now handled systematically
-          in AST_Type::nested_name(), see
-
-          Thu Nov  2 20:53:16 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          Thanks to Simon Massey <simon.massey@prismtechnologies.com> for
-          pointing out the code generation errors in the Security Service
-          that uncovered the omissions.
-
-Fri Nov  3 15:54:35 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Strategies/SHMIOP_Connector.cpp (make_connection):
-          scoreboard cleanup.
-
-Fri Nov  3 12:35:41 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/Connection_Handler.inl:
-
-          Added a missing #include "tao/Transport.h".
-
-Fri Nov  3 00:22:27 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
-        * tao/Connection_Handler.h:
-        * tao/Connection_Handler.inl:
-        * tao/Connection_Handler.cpp:
-        * tao/IIOP_Connection_Handler.h:
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/IIOP_Connector.cpp:
-        * tao/Strategies/SCIOP_Connection_Handler.cpp:
-        * tao/Strategies/SCIOP_Connector.cpp:
-        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
-        * tao/Strategies/SHMIOP_Connector.cpp:
-        * tao/Strategies/UIOP_Connection_Handler.cpp:
-        * tao/Strategies/UIOP_Connector.cpp:
-
-          Propagating the changes applied just to IIOP for bug 2654 to the
-          other DOC managed ESIOPs.
-
-Thu Nov  2 23:23:16 UTC 2006  Ossama Othman  <ossama_othman at symantec.com>
-
-        * tao/ORB_Core.cpp (orbinitializer_registry_i):
-
-          The ORBInitializer registry is supposed to be (and originally
-          was) a singleton.  Store it in the global service configuration,
-          not the ORB-specific one.  Addresses disjoint ORBInitializer
-          lists, and redundant ORBInitializer registrations.
-
-        * tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp (pre_init):
-
-          Corrected CORBA::BAD_PARAM minor code check to use
-          CORBA::OMGVMCID instead.  Easier to read and understand.
-
-Thu Nov  2 20:28:04 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
-          (send_reply):
-
-          Fixed exit(1) to be ACE_OS::exit(1).
-
-Thu Nov  2 20:53:16 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp:
-        * TAO_IDL/be/be_visitor_union/discriminant_ch.cpp:
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
-        * TAO_IDL/ast/ast_type.cpp:
-
-          Fixed generation of nested type name to add a double
-          colon if the name includes the canonical CORBA
-          namespace, to disambiguate it from any scoped
-          name which may include a different, nested namespace
-          named CORBA. Thanks to N Johnson <nj@artesys.info>
-          for reporting the bug.
-
-        * tests/IDL_Test/nested_scope.idl:
-
-          Added use case from the bug report above to the IDL file.
-
-Wed Nov  1 18:48:26 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * tests/Bug_2174_Regression/run_test.pl:
-
-          Add a sleep to prevent spurious fails on win32.
-
-Mon Oct 30 19:49:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/CodeSets/simple/simple.idl:
-        * tests/CodeSets/simple/client.cpp:
-        * tests/CodeSets/simple/server.cpp:
-        * tests/CodeSets/simple/run_test.pl:
-
-          Added proper shutdown operation to have test behave better
-          under (at least) OpenVMS.
-
-Mon Oct 30 19:08:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Muxing/client.cpp:
-        * tests/Muxing/Server_Task.cpp:
-        * tests/Muxing/run_test.pl:
-
-          Some adjustments of testparameters for when test running on
-          OpenVMS where the original test takes far too long for the
-          the timeouts set.
-
-Mon Oct 30 18:56:03 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp (to_object):
-
-          Modified the decoding to be from a copy of the class
-          member CDR stream, rather than from the stream itself,
-          so the Any will retain ownership of the value as
-          mandated by the CORBA spec. Thanks to Phil Mesnier
-          <mesnier_p@ociweb.com> for reporting the bug and
-          suggesting the fix. Also changed several instances of
-          '0' to 'false' where CORBA::Boolean is referenced.
-
-        * tao/AnyTypeCode/Marshal.cpp:
-
-          Added CORBA::tk_event case values to the switch
-          statements in perform_append() and perform_skip(),
-          so that IDL eventtypes will be handled correctly.
-
-Mon Oct 30 15:09:24 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
-
-          Set the correct pragma prefix value on the AMI reply handlers
-          for inherited interfaces.
-
-        * tests/Bug_2669_Regression/Bug_2669_Regression.mpc:
-        * tests/Bug_2669_Regression/Child.idl:
-        * tests/Bug_2669_Regression/Parent.idl:
-        * tests/Bug_2669_Regression/README:
-        * tests/Bug_2669_Regression/client.cpp:
-        * tests/Bug_2669_Regression/run_test.pl:
-
-          Regression test for the above fix.
-
-Mon Oct 30 14:35:24 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
-          Do not build on minimum_corba platforms.
-
-Mon Oct 30 13:48:48 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2654_Regression/client.cpp (init_callback):
-          Scoreboard cleanup.
-
-Sun Oct 29 17:08:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2654_Regression/Hello.cpp:
-          Took out temporary, unix-only, header.
-
-Sun Oct 29 16:51:47 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Connection_Handler.cpp:
-        * tao/IIOP_Connector.cpp:
-        * tao/Transport.h:
-        * tao/Transport.cpp:
-
-          The fix for bug 2654. Thanks to Chris Reed <cr at progress dot
-          com> an Scott Mitchell <rsm at progress dot com> for help
-          tracking this down.
-
-        * tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
-        * tests/Bug_2654_Regression/Hello.h:
-        * tests/Bug_2654_Regression/Hello.idl:
-        * tests/Bug_2654_Regression/Hello.cpp:
-        * tests/Bug_2654_Regression/README:
-        * tests/Bug_2654_Regression/client.cpp:
-        * tests/Bug_2654_Regression/run_test.pl:
-        * tests/Bug_2654_Regression/server.cpp:
-
-          The new test for ensuring bug 2654 is fixed.
-
-Sun Oct 29 10:58:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tao/Strategies/advanced_resource.cpp:
-
-          Changed size argument for TP_Reactor construction from
-          ACE_TP_Reactor::DEFAULT_SIZE to ACE::max_handles () (as it is in
-          default_resource.cpp) to solve CTOR failures on OpenVMS (and
-          most likely also LynxOS) in OctetSeq and Leader_Followers
-          tests.
-
-Sat Oct 28 16:11:12 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Acceptor.cpp (open):
-
-          When using an explicit, default address for the endpoint such as
-          iiop://:12345 this change is necessary to ensure the encoded
-          address is correct for either IPv4 or IPv6 as configured.
-
-Fri Oct 28 03:23:18 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * examples/POA/On_Demand_Loading/Servant_Manager.cpp:
-        * examples/POA/Loader/Servant_Activator.cpp:
-        * examples/POA/Loader/Servant_Locator.cpp:
-
-          Addressed 64-bit conversion warnings.
-
-Thu Oct 27 02:53:53 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tao/GIOP_Message_Base.cpp (parse_request_id):
-
-          Corrected GIOP version check so that the GIOP 1.{0,1} case
-          doesn't apply to all major versions greater than or equal to
-          one, i.e. {1,2,3,...,N}.{0,1}.  The case in question is only
-          meant for GIOP 1.0 or 1.1.
-
-Thu Oct 27 01:59:19 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tao/GIOP_Message_Base.cpp (parse_request_id):
-
-          Simplified error return logic.  Addresses "code not reached"
-          warning.
-
-        * tao/ORB.cpp (ORB_init):
-
-          Do not pass down the default CORBA::Environment from TSS in the
-          native C++ exception case.  Simply pass a locally instantiated
-          CORBA::Environment.  Removes an unnecessary TSS access.
-
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.h:
-
-          Moved TAO_POA_Manager forward declaration into the versioned
-          namespace.
-
-        * tao/PortableServer/Servant_var.h:
-
-          Removed suggestion of adding an exception specification.
-          They've fallen out of favor by most C++ gurus.
-
-        * tao/Strategies/advanced_resource.cpp:
-        * tao/Strategies/advanced_resource.h:
-
-          Added support ACE_Dev_Poll_Reactor.
-
-        * tao/Valuetype/ValueBase.cpp (_tao_write_value_header):
-
-          Fixed Coverity DEADCODE error.
-
-        From Russell Mora <russell_mora at symantec dot com>
-        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
-        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
-        * tao/Strategies/SHMIOP_Acceptor.cpp:
-        * tao/Strategies/SHMIOP_Acceptor.h:
-        * tao/Strategies/SHMIOP_Factory.h:
-
-          Added support for 64-bit file offsets.
-
-        From Duane Binder <duane_binder at symantec dot com>
-        * TAO_IDL/be/be_helper.cpp:
-
-          Buffer I/O by removing fflush() calls.  Greatly improves tao_idl
-          performance, particularly over networked filesystems.
-
-        * TAO_IDL/be/be_interface.cpp (gen_gperf_lookup_methods):
-
-          Flush the output stream. Gperf also uses it as output.  Ensure
-          current contents are written before gperf writes.
-
-Thu Oct 26 14:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Event/UDP/receiver.cpp:
-          Register the value factory
-
-        * orbsvcs/tests/Event/UDP/run_test.pl:
-          Also run the test with a valuetype in the event.
-
-Thu Oct 26 13:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
-          Reverted the change below. Thew new UDP RTEC test showed
-          that the consumer was receiving duplicate events without being
-          able to detect that. So a single send resulted in two events
-          being received. The original problem needs to be resolved in
-          a different way because this breaks any assumptions about events
-
-          Mon Aug 21 15:37:23 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-          * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i:
-          * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp: Made the
-            simplest fix to the problem where if a UDP RTEC supplier
-            restarts while the consumer is still running, it gets duplicate
-            fragment errors.  The cost of this fix is that duplicate
-            completed requests are no longer detected.  Thanks to Keith
-            Nicewarner for these fixes.
-
-Thu Oct 26 12:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp:
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
-          Const improvements
-
-Thu Oct 26 10:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Event/UDP/*:
-          New regression test for the RTEC using UDP federations. By default
-          we just send the string ACE/TAO/CIAO in the Any and this works, but
-          when -v is passed to the run_test.pl we send a valuetype which
-          contains the string. With the current svn head version of today
-          this fails because on the receiver side we can't extract the valuetype
-          out of the Any
-
-Wed Oct 25 15:33:27 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/PortableServer/Root_POA.cpp:
-
-          My change from Mon Oct 23 12:24:57 UTC 2006 uncovered yet another
-          reference counting problem.  The TAO_Root_POA was not manipulating
-          the reference count of the TAO_POA_Manager that it held.
-
-Mon Oct 23 12:24:57 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/PortableServer/Object_Adapter.h:
-        * tao/PortableServer/Object_Adapter.cpp:
-
-          Added a helper method to correctly release the
-          TAO_POAManager_Factory which is used in both the destructor and
-          the close method.
-
-        * tao/PortableServer/POAManagerFactory.h:
-        * tao/PortableServer/POAManagerFactory.cpp:
-
-          When CORBA::release() is called on the POAManagerFactory, the
-          reference count does not necessarily go to zero because it has a
-          set of objects that are still holding on to a reference to the
-          factory.
-
-          I added a method to the POAManagerFactory to remove all the
-          registered poa managers.  This is called by the helper method in
-          the TAO_Object_Adapter class.
-
-          Thanks to Artur DeEsperanto <DrEsperanto at gmx dot net> for
-          reporting this.  This fixes bugid 2686.
-
-Fri Oct 20 16:54:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-
-          Fixed a memory leak where the TAO_Adapter would be leaked in the
-          event that an exception occurred before the adapter was added to
-          the adapter registry.  Thanks to Artur DeEsperanto <DrEsperanto
-          at gmx dot net> for reporting this.
-
-        * tao/PortableServer/Object_Adapter.cpp:
-
-          Clean up the TAO_Root_POA and TAO_POAManager_Factory pointers in
-          the destructor in the event that the close() method was never
-          called.
-
-Fri Oct 20 07:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport_Connector.cpp:
-          Updated formatting of a debug message to match the others
-          in TAO
-
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp:
-          Use LM_ERROR together with ACE_ERROR, const improvements
-
-Tue Oct 17 22:04:33 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tao/Strategies/advanced_resource.cpp:
-          Believe the default reactor for advanced resources and default
-          resources should be the same. No reason for the advanced
-          resources recator not to automatically restart upon signal
-          interruption.
-
-Tue Oct 17 18:02:25 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IORTable/Table_Adapter.cpp:
-          Fix to improve compiling on borland.
-
-Tue Oct 17 15:41:50 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp:
-
-          Cosmetic changes.
-
-        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
-
-          Changed generated implementation of Any operators to
-          pass the alias typecode for typedefed sequences and
-          arrays. Formerly the raw sequence or array typecode
-          was used in all cases.
-
-Tue Oct 17 14:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-          Fixed warning in VxWorks 5.5.2PPC build, some layout changes
-          and use prefix increment instead of postfix
-
-Tue Oct 17 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Optimized_Connection/run_test.pl:
-          Removed commented out test code
-
-Tue Oct 17 11:58:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IORTable/IOR_Table_Impl.h:
-        * tests/Bug_2683_Regression/server.cpp:
-
-          Clean up scoreboard related problems.
-
-Mon Oct 16 21:16:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IORTable/Table_Adapter.cpp:
-        * tao/IORTable/Table_Adapter.h:
-        * tao/IORTable/IOR_Table_Impl.cpp:
-        * tao/IORTable/IOR_Table_Impl.h:
-          Added var type for the impl, to avoid casting.
-
-Mon Oct 16 10:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Nested_Upcall_Crash/run_test.pl:
-          Check whether we could spawn the server, if not, give an error
-          and exit directly.
-
-Mon Oct 16 08:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-          Const changes
-
-Sun Oct 15 23:23:53 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IORTable/Table_Adapter.cpp:
-        * tao/IORTable/Table_Adapter.h:
-          Fix for bug 2683. The problem was that if ORB::shutdown() was
-          called by another thread, the Table_Adapter::root_ reference
-          could go to nil while it was needed for processing in the
-          find_object() method. The fix is to use the reference counting
-          already supplied for the root_ reference to ensure the pointer
-          can never go nil while it is needed. Further, a synchronized
-          flag is used to restrict access to find_object() to ensure it is
-          not called once ORB::shutdown() was invoked.
-
-        * tests/Bug_2683_Regression/*:
-          A new regression test for this bug. As this bug is the result of
-          a race condition, it is hard to detect anyway. The best way to
-          observe the bug is to revert the above change to Table_Adapter*
-          and add a small sleep to the find_object() method. This simply
-          forces the race condition. Adding a small sleep along with the
-          above fix demonstrates that the problem no longer occurs.
-
-          Thanks to Chris Reed, cr at progress dot com, for reporting this
-          bug.
-
-Fri Oct 13 10:28:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/COIOP/*:
-          Extended this test so that we check whether a call should
-          succeed or not. This test requires that COIOP is the only
-          pluggable protocol available.
-
-Thu Oct 12 14:17:11 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
-
-          Split a debug message into two messages to work around a strange
-          bug in Visual Studio 2005.
-
-Thu Oct 12 14:13:44 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl:
-
-          Use a random port number for the Naming_Service instead of a
-          hard-coded port number.
-
-Tue Oct 10 12:11:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/ORT/README:
-          Layout improvement
-
-        * orbsvcs/orbsvcs/CosConcurrencyControl.idl:
-        * orbsvcs/orbsvcs/CosLoadBalancing.idl:
-        * orbsvcs/orbsvcs/CosNaming.idl:
-          Doxygen improvements
-
-        * orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp:
-          Const/bool improvements
-
-Tue Oct 10 09:24:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/ior_parsing.html:
-          Updated that match_prefix returns bool
-
-Tue Oct 10 09:19:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Connection_Handler.cpp:
-          Layout change
-
-        * tao/CORBALoc_Parser.{h,cpp}:
-        * tao/CORBAName_Parser.{h,cpp}:
-        * tao/DLL_Parser.{h,cpp}:
-        * tao/FILE_Parser.{h,cpp}:
-        * tao/IOR_Parser.{h,cpp}:
-        * tao/MCAST_Parser.{h,cpp}:
-          Changed match_prefix to return a bool instead of an int.
-
-        * tao/CORBALoc_Parser.cpp:
-        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
-        * tao/Environment.cpp:
-        * tao/Exception.cpp:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_Profile.cpp:
-        * tao/ORB_Core.cpp:
-        * tao/Strategies/SCIOP_Connector.cpp:
-        * tao/Strategies/UIOP_Connector.cpp:
-        * tao/SystemException.cpp:
-          When using LM_ERROR, use ACE_ERROR as macro
-
-        * tao/IIOP_Connection_Handler.cpp:
-          Const improvment
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
-          Cleanup of comment
-
-        * tao/Strategies/DIOP_Profile.cpp:
-          Small code improvement assuming the fact that operator>> returns
-          bool
-
-Tue Oct 10 06:08:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/COIOP/*:
-          New test for COIOP
-
-Thu Oct 05 00:35:37 2006  William R. Otte  wotte@dre.vanderbilt.edu
-
-        * TAO version 1.5.3 released.
-
-Tue Oct  3 17:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/tutorials/Quoter/Simple/Client/index.html:
-          Corrected filenames generated by tao_idl
-
-Tue Oct  3 14:13:55 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * NEWS
-
-          Updated NEWS file.
-
-Mon Oct  2 12:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
-          Renamed VERIFY macro to fix warning in mfc build and use
-          ACE_ERROR instead of ACE_DEBUG
-
-Thu Sep 28 15:13:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * tao/Connection_Handler.h:
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/Strategies/SCIOP_Connection_Handler.cpp:
-        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
-        * tao/Strategies/UIOP_Connection_Handler.cpp:
-
-          Fixing a regression on bug 2074 caused by CH::handle_timeout()
-          trying to update its instance, when the latter has already been
-          deallocated by CH::close(). This case only occurs when the
-          reference count on the Connection handler drops down to one. The
-          solution is to use a kind of auto pointer (TAO_Auto_Reference)
-          which magically increments the reference count in its
-          constructor and decrements it in its destructor.
-
-Thu Sep 28 14:55:06 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2188_Regression/broken_i.cpp:
-          Silence the Borland warning.
-
-Wed Sep 27 07:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Merged in the patch from bugzilla bug 2425, this fixes the crashing
-        of the notification service with vc8. This matches earlier investigations,
-        calling the set_qos seems to crash with vc8 because it is implemented
-        in a strange multiple inheritance setup.
-
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
-          Changed to call TAO_Notify_Object::set_qos()
-          directly within the init() method (within the scope
-          of a guard) to work around an apparent memory
-          corruption error that is seen only in Visual C++ 8
-          builds.  Thanks to zhamak dehghani <zhamakd at gmail
-          dot com> for initially reporting the problem and
-          providing a proposed fix, and to Charles Calkins
-          <calkinsc at ociweb dot com> for testing and
-          tweaking the proposed fix and further analyzing the
-          problem.  (Not yet found, however, is the actual
-          cause of the memory corruption that existed before
-          this work around.)
-
-Tue Sep 26 11:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies/COIOP_*.*:
-          New pluggable protocol COIOP, this is Collocated Only IOP. It is
-          almost finished, some small improvements are pending which will
-          be added soon. This protocol only allows collocated invocations and
-          must be explicitly enabled by defined TAO_HAS_COIOP to 1. At the
-          moment all other protocols are disabled with their defines it is
-          then possible to run a collocated TAO application without using
-          any network API's which safes footprint for an application.
-
-        * tao/DynamicAny/DynCommon.h:
-          No need for a pragma push/pop
-
-        * tao/ORB_Constants.h:
-          Added COIOP profile constant
-
-        * tao/Strategies.mpc:
-          Extended for COIOP
-
-        * tao/Strategies/advanced_resource.cpp:
-          Added COIOP factory
-
-        * utils/catior/catior.cpp:
-          Added support for COIOP
-
-        * docs/releasenotes/index.html:
-          Added COIOP
-
-Tue Sep 26 06:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Timeout/run_test.pl:
-          Don't use a hardcoded timeout and when there is no executable, exit
-          directly
-
-Mon Sep 25 22:27:24 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * tao/Connection_Handler.cpp:
-        * tao/IIOP_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:
-
-          Removed the call to release_os_resources call from the base
-          Connection_Handler destructor, and added code to each of the
-          protocol-specific CHs to report an error if release_os_resources
-          returns -1.
-
-Mon Sep 25 17:09:58 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
-
-        * tests/Timeout/client.cpp:
-        * tests/Timeout/run_test.pl:
-        * tests/Timeout/test_i.cpp:
-        * tests/Timeout/README.expected_behavior:
-        * tests/Timeout/README:
-
-          Made relatively modest changes to track statistics on per type
-          of timeout.  Also added a file README.expected_behavior that
-          carefully describes the timeout behavior that we should observe
-          on a proper real-time platform.  Please address comments and
-          questions to Gautam Thaker <gthaker@atl.lmco.com>.
-
-Fri Sep 22 21:29:26 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/DynamicAny/DynAnyFactory.h:
-        * tao/DynamicAny/DynamicAny.pidl:
-        * tao/DynamicAny/DynCommon.cpp:
-        * tao/DynamicAny/DynCommon.h:
-        * tao/DynamicAny/DynAnyFactory.cpp:
-        * tao/DynamicAny.mpc:
-
-          Updated spec IDL to conform to CORBA
-          3.0.3 (formal/2004-03-01) and added
-          dummy implementations of new operations
-          in existing interfaces. Also modified
-          the MPC file to inherit from valuetype.mpb,
-          to accommodate the new DynValue and
-          DynValueBox interfaces.
-
-        * tao/DynamicAny/DynValue_i.cpp:
-        * tao/DynamicAny/DynValue_i.h:
-        * tao/DynamicAny/DynValueCommon_i.cpp:
-        * tao/DynamicAny/DynValueBox_i.cpp:
-        * tao/DynamicAny/DynValueBox_i.h:
-        * tao/DynamicAny/DynValueCommon_i.h:
-
-          New files containing implementation classes
-          for new DynAny types related to valuetypes.
-          All of the operations in these classes are
-          dummy impls at present.
-
-Fri Sep 22 15:31:54 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Acceptor.cpp:
-          Fix for remaining IPV6 test failures.
-
-        * tests/Bug_2188_Regression/broken.mpc:
-        * tests/Bug_2188_Regression/client.cpp:
-          Updated the mpc file to be consistent with current builds. Added
-          an explicit type case to the client to silence some build warnings.
-
-
-Thu Sep 21 14:59:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2188_Regression:
-        * tests/Bug_2188_Regression/broken.idl:
-        * tests/Bug_2188_Regression/broken.mpc:
-        * tests/Bug_2188_Regression/broken_i.h:
-        * tests/Bug_2188_Regression/broken_i.cpp:
-        * tests/Bug_2188_Regression/client.cpp:
-        * tests/Bug_2188_Regression/run_test.pl:
-        * tests/Bug_2188_Regression/server.cpp:
-
-          A new test for an old problem. The actual problem is now
-          resolved, but I never got around to adding this test when I
-          should have.
-
-Wed Sep 20 21:37:58 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Acceptor.cpp:
-
-          Fix for non-IPV6 builds. This relates back to the test for an
-          explicitly supplied any addr.
-
-Wed Sep 20 21:02:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Acceptor.cpp:
-
-          Make sure the port_separator_loc value is used to compute the
-          string length only when it is not 0.
-
-Wed Sep 20 01:10:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/default_resource.cpp:
-
-          Fixing the extra semicolon, causing hickups on some
-          platforms. Thanks to Phil Mesnier for catching it.
-
-Tue Sep 19 19:31:15 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Acceptor.h:
-        * tao/IIOP_Acceptor.cpp:
-
-          Fix the treatment of explicitly defaulted endpoints on
-          potentially dual-stack hosts. Prior to this fix, expressing
-          certain forms of defaulted endpoints are inappropriately encoded
-          in the IOR using the literal string provided, rather than using
-          the probed interface addresses. When an endpoint is specified as
-          iiop://[::]:, iiop://[]:, or iiop://0.0.0.0:, this patch now
-          treats the first two as indicating that all IPv6 interfaces
-          should be included, but no IPv4. The third indicates that only
-          IPv4 interface addresses should be listed in the IOR. Using
-          iiop://: means that both IPv4 and IPv6 interface addresses are
-          to be included.
-
-Mon Sep 18 23:53:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TAO_Internal.cpp:
-
-          Replacing the usage of the global ACE lock with a separate
-          mutex, because the DLL Manager is also using the global
-          lock. This can cause a race condition in applications, which
-          re-enter the Service Configurator to load another DLL as part of
-          their own initialization.
-
-Mon Sep 18 23:11:31 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          This change fixes bug#2651, related to the order of destruction
-          of Codeset Manager instances, owned by the Default Resource
-          Factory. It is a prerequisite for correctly fixing bug#2612 and
-          also fixes a design artifact left over from the splitting of the
-          codesets in their own library. See the bugzilla entry for more
-          details.
-
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.cpp:
-
-          The Core is now responsible for managing the life-cycle of the
-          Codeset Manager instance, instead of the Resource Factory.
-
-        * tao/default_resource.h:
-        * tao/default_resource.cpp:
-
-          Introducing a TAO_Codeset_Parameters class, which encapsulates
-          codeset configuration information. Keeping the configuration
-          information instead of the configured instance, allows the
-          Resource Factory to give up ownership of objects it creates (as
-          it should). Removed the ACE_Dynamic_Service_Dependency instance
-          member, which was a crude attempt at solving the issue,
-          described in bug#2651.
-
-Mon Sep 18 19:54:49 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype.cpp:
-        * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp:
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-
-          Fixed cases of code generation involving
-          CORBA::AbstractBase that were overlooked in
-
-          Fri Sep 15 19:02:58 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Mon Sep 18 16:44:10 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tao/Transport_Connector.cpp:
-          Removed an extra semi-colon.
-
-Fri Sep 15 19:02:58 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/include/ast_predefined_type.h:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/ast/ast_predefined_type.cpp:
-        * TAO_IDL/fe/fe_init.cpp:
-        * TAO_IDL/util/utl_global.cpp:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Added recognition of CORBA::AbstractBase as a pseudo
-          object, similarly to the existing support for Object,
-          ValueBase, and TypeCode. Also added automatic inclusion
-          of tao/Valuetype/AbstractBase.h in generated code
-          if AbstractBase is seen in IDL.
-
-Wed Sep 13 14:58:24 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tao/Transport_Connector.h:
-        * tao/Transport_Connector.inl:
-        * tao/Transport_Connector.cpp:
-          The TransportCleanupGuard class is for local usage, so am moving
-          it into an anonymous namespace.
-
-Fri Sep  8 20:03:26 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * tao/Strategies/DIOP_Connection_Handler.cpp:
-        * tao/Strategies/SCIOP_Connection_Handler.cpp:
-        * tao/Strategies/UIOP_Connection_Handler.cpp:
-        * NEWS:
-          Applied fix from Tue Aug 29 17:40:01 UTC 2006  Phil Mesnier
-          <mesnier_p@ociweb.com> to other protocols. This explicitly calls
-          release_os_resources from the derived destructor, as was
-          originally intended. This resolves bug 2649.
-
-Thu Sep  7 14:19:58 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tao/Transport_Connector.inl:
-          Removed the extra semicolon. This was creating havoc on the
-          windows builds.
-
-Tue Sep  5 20:39:15 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tao/PortableServer/Servant_var.h:
-        * tao/PortableServer/Servant_var.inl:
-          Commented out the member templates code. See:
-          Tue Aug 15 21:25:50 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-Tue Sep  5 13:56:58 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tests/Bug_1476_Test/run_test.pl:
-          Took out a debug print statement.
-
-Thu Aug 31 23:05:46 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-          Access to the TAO_ORB_Core_Static_Resources was through the
-          static instance() API. This created a bug when the object which
-          earlier was a true singleton was converted to a service object
-          under the control of the service config. The service config
-          depending upon the access point can either return the global
-          object or the object local to the particular orb. In this case
-          (during an invocation) we need to access the local object and
-          the service config was returning the global object. This led to
-          incorrect synch-scope policies being set in invocations via a
-          non-default orb (named orb). Since at this point the ORB_Core
-          has a pointer to the local service config, its safe to query it
-          to request the local service object.
-
-        * tao/Transport_Connector.h:
-        * tao/Transport_Connector.inl:
-        * tao/Transport_Connector.cpp:
-
-          In case of a asynch connection establishment failure or
-          registration failure we need to clean up teh transport, else we
-          have a file descriptor leak. The 'TransportCleanupGuard' takes
-          care of that.
-
-        * tests/Bug_1476_Test:
-        * tests/Bug_1476_Test/Bug_1476_Test.mpc:
-        * tests/Bug_1476_Test/Hello.idl:
-        * tests/Bug_1476_Test/README:
-        * tests/Bug_1476_Test/client.cpp:
-        * tests/Bug_1476_Test/run_test.pl:
-          Add new regression test for buzilla 1476
-
-Fri Sep  1 14:05:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Bug_2183_Regression/run_test.pl:
-          Fixed spawning of PERL process on OpenVMS.
-
-        * tests/File_IO/run_test.pl:
-          Replaced literal timeout value ('10') with platformdependent
-          variable defined in PerlACE/Run_Test.pm for that purpose.
-
-        * tests/Faults/test_i.cpp:
-        * tests/Crashed_Callback/Crashed_Callback.cpp:
-        * tests/Nested_Upcall_Crash/Client_Peer.cpp:
-          Fixed these tests for OpenVMS replacing ACE_OS::abort() as deliberate
-          crash trigger by ACE_OS::_exit() as using abort() causes these tests
-          to 'hang' instead of crash.
-
-Thu Aug 31 18:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/PortableServer.cpp:
-          With CORBA/e micro don't use single thread strategy and non
-          retain servant retention strategy
-
-Thu Aug 31 11:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Messaging/Messaging_Loader.cpp:
-          Changed called_once to a real bool
-
-        * tao/Base_Transport_Property.{cpp,inl}:
-        * tao/Cache_Entries.inl:
-        * tao/Transport_Descriptor_Interface.{h,cpp}:
-          Use true/false instead of 1/0
-
-        * tao/Transport_Cache_Manager.cpp:
-          Const improvements
-
-Thu Aug 31 03:35:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Asynch_Queued_Message.cpp:
-        * tao/Invocation_Adapter.cpp:
-          Fix for timed, asynch messages that happen to expire during
-          transport resolution. This fixes part of the Oneway_Timeout test.
-
-        * tests/Big_Oneways/run_test.pl:
-          This test still has an undefined intermittent deadlock, but I
-          lowered the timeout thresholds so it doesn't wait 15 minutes in
-          a deadlock condition. If any client fails, they all deadlock, so
-          there is no reason to wait 5 minutes before killing clients 2
-          and 3.
-
-        * tests/Oneway_Timeouts/client.cpp:
-        * tests/Oneway_Timeouts/run_test.pl:
-
-          Fixed a math error in run_test.pl that falsely triggered a
-          timeout failure every time. Rearranged the semantics of forced
-          connection establishment to ensure it always works without
-          regard to messaging timeouts.
-
-Wed Aug 30 13:20:38 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Connection_Handler.h:
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/IIOP_Connector.cpp:
-
-          Revised the fix for bug 2417. That fix added a reference count
-          to IIOP Connection Handlers associated with pending asynch
-          connections to accomodate a reference held by an ACE component
-          that does not participate in reference counting. However,
-          blindly adding a reference caused the Connection_Handler to not
-          get cleaned up as part of ORB destruction. This then caused
-          trouble on windows platforms where any sockets that were open at
-          program termination were aborted with a RST and undelivered
-          stream content purged.
-
-          This fix gives control of this additional reference to the
-          connection handler itself, so that upon successful completion of
-          connection establishment, that reference is removed and no
-          resource is leaked.
-
-Wed Aug 30 13:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/PortableServer.cpp:
-
-          Don't do the process_directives for the policies that aren't
-          supported with CORBA/e micro, this will reduce the footprint for
-          a static build.
-
-Wed Aug 30 06:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2560_Regression/server.cpp:
-
-          No need to explicitly set the defaul thread policy, makes it possible
-          to use this test when minimum corb is enabled
-
-Wed Aug 30 04:20:00 UTC 2006  Frank Rehberger <frehberger@prismtech.com>
-
-        * NEWS: explains user-visible implications of patch #2301
-
-Tue Aug 29 21:55:05 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Profile_Transport_Resolver.cpp:
-          Fixing syntax to comply with ACE coding guidelines.
-
-Tue Aug 29 20:02:01 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * examples/POA/Forwarding/Servant_Activator.h:
-
-        * examples/POA/Loader/Servant_Activator.h:
-        * examples/POA/Loader/Servant_Locator.h:
-
-        * examples/POA/On_Demand_Activation/Servant_Activator.h:
-        * examples/POA/On_Demand_Activation/Servant_Locator.h:
-
-        * examples/POA/On_Demand_Loading/Servant_Activator.h:
-        * examples/POA/On_Demand_Loading/Servant_Locator.h:
-
-          These all use Servant Managers which are local objects, but need
-          to be reference counted so that they may be shutdown properly
-          and thereby release their reference to the ORB_Core so it can be
-          finalized and clean up resources it owns.
-
-Tue Aug 29 17:40:01 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Connection_Handler.cpp:
-          Explicitly call release_os_resources from the dtor.
-          Release_os_resources is a virtual method, but of course calling
-          that from the base class's destructor won't work. This fix
-          ensures that sockets are really closed when the connection
-          handler is destroyed.
-
-Tue Aug 29 17:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2560_Regression/Bug_2560_Regression.mpc:
-          Set needed idlflags and fixed build order, should fix the gcc4 linker
-          errors
-
-Tue Aug 29 13:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport.cpp (schedule_output_i):
-          Check whether we have a reactor, if not, return -1, this fixes
-          bugzilla bug 2560. Thanks to Andy Salnikov <a_salnikov at yahoo dot com>
-          for reporting this bug and making a test program
-
-Tue Aug 29 12:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2560_Regression/*:
-          New regression for bug 2560. Thanks to Andy Salnikov
-          <a_salnikov at yahoo dot com> for creating this test.
-
-Tue Aug 29 11:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-          Fixed small bug
-
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-          Replaced .i with .inl
-
-Tue Aug 29 07:54:00 UTC 2006  Frank Rehberger   <frehberger@prismtech.com>
-
-        * tao/PortableServer/Object_Adapter.cpp:
-
-          Handle location forward requests raised by colocal
-          ServerInterceptor. This fixes bug #2301.
-
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp:
-
-          Extend test to verify the forward request raised by colocal
-          ServerInterceptor is handled correctly
-
-Mon Aug 28 14:30:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * orbsvcs/tests/Security/BiDirectional/run_test.pl:
-
-          Updated the test to run in SSL mode by default.
-
-        * orbsvcs/tests/Security/BiDirectional/ssl/ca.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem:
-
-          Updated expired certificates.
-
-Mon Aug 28 12:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/DII_Collocation_Tests/twoway/Hello.cpp:
-          Added needed include to fix test failures in static builds
-
-Mon Aug 28 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/Simple/run_test.pl:
-          Updated for VxWorks
-
-Mon Aug 28 09:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Makefile.am:
-          Regenerated
-
-Mon Aug 28 07:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Bounded_Sequence_CDR_T.h:
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Only deliver the CORBA::WChar specialization when ACE_LACKS_NATIVE_WCHAR_T
-          is not defined. Thanks to Birgit Platt <bhe at newbase dot de> and
-          Jules Colding <colding at omesc dot com> for reporting this problem
-
-Sun Aug 27 11:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc:
-          New file to build this test
-
-        * tests/DII_Collocation_Tests/twoway/run_test.pl:
-          Also cleanup the simple test ior file
-
-        * tests/DII_Collocation_Tests/twoway/Server_Task.cpp:
-          Layout changes and initialiser pointer to 0
-
-Sat Aug 26 11:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2429_Regression/run_test.pl:
-          Updated work with vxworks
-
-Fri Aug 25 21:53:55 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/tao_idl.cpp:
-
-          Added an output message with the name of the IDL file
-          being processed.
-
-Fri Aug 25 15:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.cpp:
-          Use true/false for opt_for_collocation and use_global_collocation
-
-        * tao/GIOP_Message_Lite.cpp:
-        * tao/GIOP_Message_Base.cpp:
-          Add include of ace/Min_Max.h to resolve compile errors with VxWorks
-          6.3 and the diab 5.4.0 compiler
-
-Thu Aug 24 13:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.{h,cpp}:
-          Removed minor_ and major_ members, where not used at all
-
-Thu Aug 24 10:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Security/BiDirectional/run_test.pl:
-        * orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl:
-          Check the result of spawn so that when there is no executable we
-          directly return an error
-
-Wed Aug 23 18:41:15 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl: Reverted changes
-          to the copy constructor so that it initializes the data members
-          properly.
-
-Wed Aug 23 17:43:29 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tao\PortableServer\DII_Arguments_Converter.h:
-        * tao\PortableServer\DII_Arguments_Converter.cpp:
-        * tao\DynamicInterface\DII_Arguments_Converter_Impl.h:
-        * tao\DynamicInterface\DII_Arguments_Converter_Impl.cpp:
-
-          Reverted back the changes
-          "Tue Aug 22 20:28:26 UTC 2006  Yan Dai  <dai_y@ociweb.com>".
-          Added the virtual destructor to TAO_DII_Arguments_Converter
-          class to let the rtti work with gcc4 to resolve the oneway
-          test failure on gcc4 builds.
-
-Wed Aug 23 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IIOP_Factory.{h,cpp}:
-        * tao/IIOP_Lite_Factory.{h,cpp}:
-        * tao/Strategies/DIOP_Factory.{h,cpp}:
-        * tao/Strategies/SCIOP_Factory.{h,cpp}:
-        * tao/Strategies/SCIOP_Lite_Factory.{h,cpp}:
-        * tao/Strategies/SHMIOP_Factory.{h,cpp}:
-        * tao/Strategies/UIOP_Factory.{h,cpp}:
-        * tao/Strategies/UIOP_Lite_Factory.{h,cpp}:
-          Removed the minor_ and major_ members, they where only initialized
-          to a value and then never used at all. Saves a few bytes of footprint
-
-Tue Aug 22 20:28:26 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tao\PortableServer\DII_Arguments_Converter.cpp:
-        * tao\PortableServer\DII_Arguments_Converter.h:
-        * tao\DynamicInterface\DII_Arguments_Converter_Impl.h:
-        * tao\DynamicInterface\DII_Arguments_Converter_Impl.cpp:
-
-          Made the TAO_DII_Arguments_Converter service object registered
-          when PortableServer lib is loaded and the TAO_DII_Arguments_Converter_Impl
-          object will overwrite the registered "DII_Arguments_Converter" service
-          object. This would fix dynamic_cast failure when accessing the
-          "DII_Arguments_Converter" dynamic service object in Upcall_Wrapper::upcall()
-          on FC4 with gcc4.x builds. This should fix the
-          $TAO_ROOT/tests/DII_Collocation_Tests/oneway test failure on FC4 with
-          gcc4.x builds.
-
-Tue Aug 22 19:39:07 UTC 2006  Ciju John  <john@ociweb.com>
-
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
-          For increased portability replaced iostream API with ACE IO
-          macros.
-
-        * tao/Wait_On_Read.cpp:
-          If reactor registration fails, the 'is_registered_' flag
-          shouldn't be set.
-
-        * tests/Oneway_Timeouts/client.cpp:
-          Std header <cmath> is contains the signature for std::abs ().
-
-Tue Aug 22 14:57:18 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Oneway_Timeouts/client.cpp:
-          Added a test case for transient exceptions. The TAO-specific
-          connection timout causes a connection attempt to give up, which
-          in turn causes the invocation endpoint selector to try
-          connecting to a new endpoint. If no more endpoints are available
-          for connecting, a transient exception is raised. Thus the ORB
-          code is working correctly, but the test was not handing the
-          transient exception as it should.
-
-Tue Aug 22 11:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
-          Initialise pointer with 0 to fix gcc4 warning
-
-Tue Aug 22 09:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport_Conector.cpp:
-          Made some debug statements consistent with the regular
-          way we format things in TAO
-
-Tue Aug 22 09:49:48 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * tao/Client_Strategy_Factory.h:
-        * tao/Client_Strategy_Factory.cpp:
-        * tao/Fault_Tolerance_Service.h:
-        * tao/Fault_Tolerance_Service.inl:
-        * tao/Fault_Tolerance_Service.cpp:
-        * tao/ORB.h:
-        * tao/ORB.cpp:
-        * tao/default_client.h:
-        * tao/default_client.cpp:
-
-          Remove spurious FT methods. This fixes bug #2644.
-
-Tue Aug 22 09:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI_Server.mpc:
-          Removed invalid -Sc flag, thanks to Simon McQueen for reporting
-          this.
-
-Tue Aug 22 07:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl:
-          Added missing include
-
-Mon Aug 21 21:38:15 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
-
-          Removed a dependancy that the Stock_Database had on IDL.
-
-Mon Aug 21 18:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Seq_Var_T.{cpp,inl}:
-          Moved include of OS_Memory.h from cpp to inl file to resolve
-          compile problems when building static and TAO_NO_COPY_OCTET_SEQUENCES
-          is defined to 0. This file is included to get ACE_NEW which is
-          only used in the inl file
-
-Mon Aug 21 18:04:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h:
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp:
-
-          Changed a CORBA::Boolean class member to native boolean,
-          since it isn't used in a CORBA call.
-
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl:
-
-          Added a workaround IDL module called 'Components',
-          containing just enough for the IFR loader to look up
-          necessary stuff, eliminating the need to include
-          Components.idl and the corresponding dependency on CIAO.
-
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl:
-
-          Removed CIAO_ROOT/ciao from the list of include paths.
-
-Mon Aug 21 15:37:23 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i:
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp: Made the
-          simplest fix to the problem where if a UDP RTEC supplier
-          restarts while the consumer is still running, it gets duplicate
-          fragment errors.  The cost of this fix is that duplicate
-          completed requests are no longer detected.  Thanks to Keith
-          Nicewarner for these fixes.
-
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
-          (set_state): Fixed a problem with type punning.  Thanks to
-          Thomas Girard <thomas.g.girard at free dot fr> for reporting
-          this.
-
-        * examples/Advanced/ch_8_and_10/server.cpp: Fixed a compile error
-          by adding a _duplicate() call.  Thanks to Christoph Schmalhofer
-          <christoph dot schmalhofer at gmx dot net> for contributing this
-          fix.  This fixes bugid 2611.
-
-Mon Aug 21 16:28:51 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
-        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
-        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
-        * docs/tutorials/Quoter/RTCORBA/Common.idl
-        * docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
-
-          More updates to the Quoter tutorial, the most significant
-          being a redesign on the Stock_Database to make is more generic
-          and easily plugged into other Quoter examples.
-
-Mon Aug 21 10:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Bug_2510_Regression/*:
-          Integrated more advanced test, thanks to Martin Cornelius
-          <Martin dot Cornelius at smiths-heimann dot com> for creating
-          this version. This test doesn't crash anymore, probably due
-          to the recent PI refactoring
-
-Mon Aug 21 05:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-          When TAO_NO_COPY_OCTET_SEQUENCES is defined to 0 use the global
-          operator == and != to resolve compile errors with TAO. Some compilers
-          had problems with these operators so they where fully commented out
-          but this made it impossible to define TAO_NO_COPY_OCTET_SEQUENCES to
-          0 completely
-
-Sat Aug 19 22:03:03 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
-
-          Added the DII_Arguments_Converter_Impl.h include to force static builds
-          to load the DII_Arguments_Converter service.
-
-Fri Aug 18 17:00:15 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        Merged OCI changes that fix the problem that CORBA::Request::send_oneway()
-        crashes on get_in_arg() or gives incorrect arguments when the request is
-        collocated oneway request. These fixes are combination of
-        "Tue Dec 27 13:20:58 USMST 2005  Yan Dai  <dai_y@ociweb.com>" and
-        "Tue May  2 16:52:43 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>"
-        (See BugZilla #2545 for details).
-        Note this only fixed the oneway DII collocation requests, the twoway
-        collocation request was not tested yet.
-
-        * tao/Invocation_Adapter.cpp:
-        * tao/Invocation_Adapter.h:
-        * tao/Invocation_Adapter.inl:
-
-          Added is_dii_request_ data member.
-          Added an extra parameter is_dii_request(defaults to false - not a dii request)
-          to the invoke() function so it can be passed to the Operation_Details
-          to mark the request is a dii request.
-
-        * tao/operation_details.h:
-        * tao/operation_details.i:
-
-          Added is_dii_request_ data member and the accessor and added the is_dii_request
-          parameter to the constructor.
-
-        * tao/DynamicInterface/DII_Arguments.h:
-        * tao/DynamicInterface/DII_Arguments.inl:
-
-          Added accessor to the NVList.
-
-        * tao/PortableServer/Upcall_Wrapper.cpp:
-
-          Updated upcall () to use the DII_Argument_Convert to expand the
-          DII request parameter from NVList to list of *SArgument.
-          This would make DII request parameters in NVList from the client
-          side to be changed to the list of arguments so the server side
-          can correctly retrieve the arguments.
-
-        * tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp:
-        * tao/DynamicInterface/DII_Arguments_Converter_Impl.h:
-        * tao/PortableServer/DII_Arguments_Converter.h:
-
-          An abstract class DII_Arguments_Converter is added for conversion
-          of the NVList to list of *SArgument.
-          These new files are added to resolve the library circuit dependency
-          problem. This makes the conversion of NVList to list of *SArgument
-          can be done in DynamicInterface instead of in PortableServer. The
-          expanded skel args are used in get_in_arg() to give the correct
-          "IN" arguments.
-
-        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
-
-          Passed is_dii_request true to Invocation_Adapter constructor to
-          indicate it's a dii request invocation.
-
-        * tao/DynamicInterface/Request.cpp:
-
-          Passed is_dii_request true to construct Invocation_Adapter object to
-          indicate it's a dii request invocation.
-
-        * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
-
-          Removed the commented include.
-
-Fri Aug 18 16:18:35 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Timed_Buffered_Oneways/client.cpp:
-        * tests/Timed_Buffered_Oneways/test_i.cpp:
-
-          I am unable to reproduce the failure in this test locally. The
-          output in the scoreboard files is inconclusive, but the failure
-          seems to be consistent on the affected platforms. This is just
-          some additional output to help make sense of what might be
-          causing the failure.
-
-Fri Aug 18 13:34:43 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Profile_Transport_Resolver.cpp:
-          Fix for connection timeout errors introduced by Adam's commit of
-          Justin's changes in Tue Aug 15 14:56:35 UTC 2006  Adam Mitz
-          <mitza@ociweb.com>
-
-Fri Aug 18 13:27:02 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * tests/Oneway_Timeouts/client.cpp:
-          Eliminated warnings due to using var's without ".in()".
-
-Fri Aug 18 09:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/GIOP_Message_Generator_Parser*.*:
-          Changed all write_* methods to return a bool instead of int, the
-          return value was used as bool, so made this explicit. Also added
-          more const usage when possible.
-
-        * tao/GIOP_Message_Base.cpp:
-          Use true for a bool
-
-        * tao/GIOP_Mesage_Locate_Header.{h,inl}:
-          Const improvements
-
-        * tao/GIOP_Utils.h:
-          Removed stuff that was not used
-
-        * tao/GIOP_Utils.cpp:
-          Removed this file, not used at all
-
-        * tao/tao.mpc:
-          Removed GIOP_Utils.cpp
-
-Fri Aug 18 07:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/GIOP_Message_Base.cpp:
-          Fixed incorrect method name in debug macro. When the parsing of the
-          request header has failed, throw the marshal exception directly, don't
-          try to process the service context and assign translators, we just
-          don't know at this stage if that is safe to do, so don't do that.
-          Also in parse_request_id do the demarshaling of the service contexts
-          and the request id in two seperate steps, if the demarshaling of the
-          service context fails, then we can't demarshal the request id
-          safely.
-
-        * tao/GIOP_Message_Generator_Parser.cpp (parse_reply):
-          When the demarshaling of the request id failed then return with -1
-          instead of trying to demarshal anymore data. Also when we have
-          received an unknow reply status return -1 instead of returning 0
-
-        * tao/GIOP_Message_Generator_Parser_10.cpp :
-          In parse_request_header check whether the demarshaling of the
-          service contexts didn't fail. Also in parse_reply log an error when
-          demarshaling fails.
-
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/Transport_Cache_Manager.cpp:
-          Const improvement
-
-Thu Aug 17 20:46:29 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
-          Set the exename explicitly, the default wasn't behaving as expected.
-
-        * tests/Oneway_Timeouts/client.cpp:
-          Added a cast to int to eliminate Borland compiler error due to
-          ambiguous call to std::abs().
-
-        * tests/Timed_Buffered_Oneways/client.cpp:
-          Eliminated warnings due to using var's without ".in()".
-
-Thu Aug 17 12:54:58 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp:
-
-          Touched this file, to eliminate warnings about it being possible
-          outdated, since minor changes were made in
-
-          Wed Aug 16 17:29:44 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          to idl.ll, which generates it.
-
-Wed Aug 16 21:48:22 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/docs/broker.html
-        * docs/tutorials/Quoter/RTCORBA/docs/database.html
-        * docs/tutorials/Quoter/RTCORBA/docs/distributor.html
-        * docs/tutorials/Quoter/RTCORBA/docs/idl.html
-        * docs/tutorials/Quoter/RTCORBA/docs/index.html
-        * docs/tutorials/Quoter/RTCORBA/docs/mpc.html
-        * docs/tutorials/Quoter/RTCORBA/docs/nameConsumer.html
-        * docs/tutorials/Quoter/RTCORBA/docs/prioritymapping.html
-        * docs/tutorials/Quoter/RTCORBA/docs/run.html
-          Update these files according to William R. Otte's modification to the
-          corresponding source code.
-
-Wed Aug 16 18:09:44 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
-
-          Improved valuetype memory management.
-
-Wed Aug 16 17:29:44 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp:
-
-          Cosmetic changes.
-
-        * TAO_IDL/fe/idl.ll:
-
-          Replace overlooked instances of idl_bool with native bool,
-          and corresponding values I_TRUE and I_FALSE with the
-          native versions.
-
-        * TAO_IDL/util/utl_identifier.cpp:
-
-          In the constructor from char*, if the input arg begins
-          with '_cxx_', the logic is changed. If the tail of the
-          arg matches a C++ keyword, the arg is left unchanged.
-          Otherwise, the leading underscore is stripped as with
-          all other 'escaped' input args. This fix closes [BUGID:2634],
-          thanks to Boris Kolpackov <boris@dre.vanderbilt.edu> for
-          reporting it.
-
-Wed Aug 16 17:17:30 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/Common_Export.h
-        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor.idl
-        * docs/tutorials/Quoter/RTCORBA/Common_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
-        * docs/tutorials/Quoter/RTCORBA/Common_i.h
-        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
-        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker.idl
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
-        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
-        * docs/tutorials/Quoter/RTCORBA/Common.idl
-        * docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
-        * docs/tutorials/Quoter/RTCORBA/Admin.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
-
-          This is a major overhaul of the RTCORBA tutorial to fix bugs,
-          correct a broken priority model, and add new features.
-
-          Thanks to Doug Schmidt for providing code, feedback, and suggestions.
-
-Wed Aug 16 15:35:29 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp: fixed warning (unused arg)
-        * tao/Asynch_Queued_Message.h: fixed error in VERSIONED_NAMESPACE build
-
-Tue Aug 15 21:25:50 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tao/PortableServer/Servant_var.h:
-        * tao/PortableServer/Servant_var.inl:
-
-          Removed the member templates as
-          - They dodn't seem to be serving any purpose. It appears that the
-          only reason these member templates were defined was so that the
-          hand-crafted constructor could be declared to be
-          explicit. However since the member template constructor is
-          implicit this just adds complexity without any benefits.
-          - They were causing build problems in SunStudio 11 builds and
-          VxWorks builds using gcc 2.96.
-
-          Made the Servant_var constructor implicit to comply with the c++
-          language mapping.
-
-Wed Aug 16 08:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl
-        * tao/PortableServer/PortableServer_include.pidl
-        * tao/RTCORBA/RTCORBA_include.pidl
-          Added empty pragma prefix to be able to compile these pidl files
-          correctly when the visual age preprocessor is used on AIX
-
-Wed Aug 16 04:47:24 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * tests/Timed_Buffered_Oneways/client.cpp:
-          Added #include for ACE_OS::gettimeofday().
-
-Tue Aug 15 19:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Policies/Policies.mpc:
-          Simplified this file
-
-Tue Aug 15 17:57:20 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp (drv_post_init):
-
-          Added check for environment variable CIAO_ROOT when adding
-          default include paths for CIAO_ROOT and CIAO_ROOT/ciao. This
-          check is necessary if the middleware SubVersion modules have
-          been checked out in non-nested mode, since in that case,
-          CIAO_ROOT cannot be derived from TAO_ROOT or ACE_ROOT.
-
-Tue Aug 15 17:24:05 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tao/Strategies/SCIOP_Endpoint.cpp (preferred_interfaces):
-
-          Use new ACE_CString::size_type type to hold string
-          position/index value, instead of "int".  Addresses "comparison
-          between signed and unsigned" warnings.
-
-Tue Aug 15 14:56:35 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        Checking in on behalf of Justin Michel <michel_j at ociweb dot com>...
-
-        Fixed bugs related to OCI RT8769. There were several problems
-        identified in this ticket.
-
-        All of these changes are on the branch "OCI_Oneway_Buffering".
-
-        1. The SyncScopes SYNC_NONE, SYNC_DELAYED_BUFFERING, and
-           SYNC_EAGER_BUFFERING use non-blocking connects, but the
-           non-blocking connect mechanism allows the caller to
-           effectively block, because it enters the reactor.  (Even
-           though it used a timeout of zero, this still makes it
-           possible for the caller to be blocked.)  The solution is to
-           queue any messages until the connection is complete, and to
-           rely on the reactor to complete the connection. This was
-           already implemented, and the fix just involved NOT polling
-           the reactor. A side-effect of this change, is that
-           applications that make connections within oneway requests
-           with the above SyncScope policies must call orb->run() to
-           complete the connection. Alternatively an invocation that
-           doesn't use the above SyncScopes can be made to complete
-           the connection.
-
-        2. Connection and request timeouts did not work correctly for
-           every scenario. (e.g. For non-blocking connects, the
-           request timeout should not be used even if it's less than
-           the connect timeout, because the connect does not happen in
-           the context of the request.)  The fix required numerous
-           changes detailed below.
-
-        3. Queued messages would never be expired even if a roundtrip
-           request timeout policy was in place. The solution is to
-           calculate an absolute expiration time for queued
-           asynchronous messages that have timeouts. The messages are
-           then discarded in Transport::drain_queue_i() if expired.
-
-        4. Connection timeouts result in TRANSIENT instead of TIMEOUT.
-           The fix required numerous changes detailed below.
-
-        5. Queued messages were flushed at connection startup, which
-           effectively ignored the buffering constraint policies.
-           Removed the code that flushed the messages.
-
-        * NEWS: explains user-visible implications of these changes
-
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
-        * tao/Messaging/Connection_Timeout_Policy_i.cpp:
-        * tao/Messaging/Messaging_Policy_i.cpp:
-
-          Enhanced display of millisecond timeouts in log
-          messages. Log messages now say "Connect timeout <50ms>" or
-          "Request timeout <100ms>" instead of "timeout <100>".
-
-        * examples/Buffered_Oneways/client.cpp:
-
-          Add a check to make sure that the test is run with a valid
-          buffering constraint policy.
-
-        * tao/Connection_Handler.h:
-        * tao/Connection_Handler.inl:
-
-          Added an is_timeout() method for Connection_Handler() so that
-          we can tell the difference between a timeout and a close.
-
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/IIOP_Connector.cpp:
-        * tao/Strategies/SCIOP_Connection_Handler.cpp:
-        * tao/Strategies/SCIOP_Connector.cpp:
-        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
-        * tao/Strategies/UIOP_Connection_Handler.cpp:
-        * tao/Strategies/UIOP_Connector.cpp:
-
-          Update log message during IIOP_Connection_Handler::open() to
-          show ip address and port instead of just ip address.
-
-          Update all connection handlers that closed a connection due
-          to timeout to set the state to TAO_LF_Event::LFS_TIMEOUT
-          instead of closed.
-
-          Changed xxx_Connector to NOT set synch_options.timeout() to
-          ACE_Time_Value::zero when the connect is
-          non-blocking. Setting it here is unnecessary and prevents
-          non-blocking timeouts from working.
-
-          Update the IIOP_Connector logged error message to show
-          errno in addition to the errno description.
-
-          Increment the reference count of the xxx_Connection_Handler
-          when the xxx_Connector is unable to complete the connection
-          synchronously. (Same as BugZilla 2417, but for all protocols
-          instead of just IIOP.)
-
-        * tao/Invocation_Adapter.cpp:
-
-          Move the max_wait_time variable to an inner scope in
-          Invocation_Adapter::invoke_i(), because it wasn't needed in
-          most code paths.
-
-        * tao/Profile_Transport_Resolver.cpp:
-
-          Fixed the logic in profile_transport_resolver::resolve() to
-          correctly detect TIMEOUT exceptions, and to ensure that the
-          connection timeout uses the minimum of the connection
-          timeout policy and request timeout for blocking
-          connects. Also ensure that request timeout is never used as
-          the connection timeout for non-blocking connects.
-
-        * tao/Asynch_Queued_Message.h:
-        * tao/Asynch_Queued_Message.cpp:
-        * tao/Queued_Message.h:
-        * tao/Queued_Message.cpp:
-        * tao/Synch_Queued_Message.cpp:
-
-          Add expiration time to Asynch_Queued_Messages. The
-          constructor now takes an ACE_Time_Value for the relative
-          timeout. If the timeout is nonzero and nonnull then it is
-          used to calculate an absolute expiration time using the high
-          res timer.
-
-          Update Queued_Message constructor to allow specifying an
-          absolute timeout, and a new is_expired() method to check
-          whether the queued message is expired.
-
-
-        * tao/Synch_Invocation.cpp:
-        * tao/Transport.h:
-        * tao/Transport.cpp:
-
-          Update various places in Transport and Synch_Invocation to
-          create queued messages with the correct timeout value. This
-          includes ensuring that partially delivered messages can
-          never timeout.
-
-          Update Transport to discard expired messages. This happens
-          in drain_queue_i().
-
-          Add more descriptive logging output to
-          Transport::cleanup_queue_i.
-
-          Update Transport post_open to NOT flush queued
-          messages. This effectively ignored the specified buffering
-          constraint policies.
-
-        * tao/Transport_Connector.cpp:
-
-          Update Transport_Connector to correctly detect timed out
-          connections. Also fixed the code that checked the return
-          value of
-          base_transport->wait_strategy()->register_handler(). This
-          was recently changed from "if != 0" to "if == 0", but the
-          correct check for failure should be "if == -1".
-
-          Updated Transport_Connector to not enter the wait strategy
-          for non-blocking connects. Instead we rely on the
-          application to eventually call orb->run() which will
-          complete the connection, and send any queued messages.
-
-        * tao/Transport_Queueing_Strategies.cpp:
-
-          Update Eager_Transport_Queuing_Strategy to not use a pointer
-          to something that looks like it could go out of scope. I
-          think the code was actually safe, but it was confusing.
-
-        * tao/Block_Flushing_Strategy.cpp:
-        * tao/Flushing_Strategy.h:
-
-          Change block_flushing strategy to NOT synchronously flush in
-          the schedule_output() method. Instead we added a new special
-          return value indicating that the caller should do the flush
-          immediately. This allows the calling code to hold a lock
-          during the call to schedule_output() that can be released
-          before calling flush_transport().
-
-        * tests/AMI_Buffering/client.cpp:
-        * tests/AMI_Buffering/run_buffer_size.pl:
-        * tests/AMI_Buffering/run_message_count.pl:
-        * tests/AMI_Buffering/run_test.pl:
-        * tests/AMI_Buffering/run_timeout.pl:
-        * tests/AMI_Buffering/run_timeout_reactive.pl:
-        * tests/Oneway_Buffering/client.cpp:
-        * tests/Oneway_Buffering/run_buffer_size.pl:
-        * tests/Oneway_Buffering/run_message_count.pl:
-        * tests/Oneway_Buffering/run_test.pl:
-        * tests/Oneway_Buffering/run_timeout.pl:
-        * tests/Oneway_Buffering/run_timeout_reactive.pl:
-        * tests/Queued_Message_Test/Queued_Message_Test.cpp:
-        * tests/Timed_Buffered_Oneways/client.cpp:
-        * tests/Timed_Buffered_Oneways/run_test.pl:
-        * tests/Timed_Buffered_Oneways/server.cpp:
-        * tests/Timed_Buffered_Oneways/test.idl:
-        * tests/Timed_Buffered_Oneways/test_i.h:
-        * tests/Timed_Buffered_Oneways/test_i.cpp:
-
-          Updated various tests to comply with the above changes.
-
-          Fixed tests that used sync_none or sync_delayed_buffering
-          without calling orb->run().
-
-        * tests/Oneway_Timeouts:
-        * tests/Oneway_Timeouts/Test.idl:
-        * tests/Oneway_Timeouts/client.cpp:
-        * tests/Oneway_Timeouts/run_test.pl:
-        * tests/Oneway_Timeouts/server.cpp:
-        * tests/Oneway_Timeouts/test.mpc:
-
-          Added new test for various combinations of timeouts with oneways:
-          connection timeouts and relative round-trip timeouts.
-
-Tue Aug 15 14:02:23 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
-
-          Before cloning the arguments, check to make sure that we have at
-          least one argument/return value.
-
-Tue Aug 15 11:37:06 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/AnyTypeCode/TypeCode.h:
-
-          Changed the export on In_Object_Argument_Cloner_T from TAO_Export
-          to TAO_AnyTypeCode_Export.  Thanks to Johnny Willemsen for
-          pointing out the build warnings.
-
-Tue Aug 15 11:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Big_Reply/Client_Task.cpp:
-          Added some more debug output to better see why this test fails on
-          OpenVMS.
-
-Tue Aug 15 10:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/RTCORBA/Server_Protocol/run_test.pl:
-          OpenVMS doesn't have uiop
-
-Tue Aug 15 10:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2503_Regression/run_test.pl:
-          Extended wait time for server to let this test succeed on OpenVMS
-
-        * tests/RTCORBA/Client_Protocol/run_test.pl:
-          Small update for OpenVMS
-
-Tue Aug 15 08:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Bug_1393_Regression/run_test.pl:
-        * tests/CollocationLockup/CollocationLockup.mpc:
-        * tests/Bug_2494_Regression/Bug_2494_Regression.mpc:
-        * tests/Abstract_Interface/Abstract_Interface.mpc:
-        * orbsvcs/tests/Trading/Trading.mpc:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
-        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-        * orbsvcs/orbsvcs/HTIOP.mpc:
-        * tao/ImR_Client.mpc:
-        * tao/PI.mpc:
-          Don't use -Sc as tao_idl option, this doesn't exist anymore
-
-Tue Aug 15 08:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
-          Const improvement
-
-        * tao/RTPortableServer.mpc:
-        * tao/RTScheduler.mpc:
-          Fixed regeneration instructions
-
-        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
-          Cleanup of old stuff
-
-Mon Aug 14 19:05:38 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tao/PortableServer/Object_Adapter.h:
-        * tao/PortableServer/Object_Adapter.cpp:
-
-          Made the TAO_Object_Adapter keep a reference to POAManager
-          object on minimum corba builds to fix leaking of POAManager object.
-
-Mon Aug 14 17:21:00 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tao/PortableServer/Object_Adapter.cpp:
-
-          Fixed a bug in open() on minimum corba builds. The problems is
-          the new poa_manager passed to create_Root_POA() was actually
-          destructed when exit from open() function. This would cause
-          access violation when application access the poa manager in
-          the Root_POA.
-
-Mon Aug 14 13:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/*.h:
-          Added /**/ to the include of the export and versioned
-          namespace files to get them out of the doxygen include
-          pictures
-
-Mon Aug 14 13:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer.mpc:
-          Enabed regeneration of PortableServer.pidl
-
-        * tao/PortableServer/PortableServer{A,C,S}.{h,cpp}:
-        * tao/PortableServer/diffs/PortableServer.diff:
-          Removed from the repo
-
-Mon Aug 14 12:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/CodecFactory.mpc:
-        * tao/ObjRefTemplate.mpc:
-        * tao/PortableServer.mpc:
-        * tao/RTCORBA.mpc:
-        * tao/RTPortableServer.mpc:
-        * tao/RTScheduler.mpc:
-        * tao/PI_Server.mpc:
-          Enabed regeneration of *_include.pidl files, this will result
-          in an almost empty C.cpp file but that is needed to retrigger
-          the regeneration of the header files.
-
-        * tao/CodecFactory/IOP_Codec_include{A,C,S}.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_include{A,C,S}.h:
-        * tao/PI_Server/PI_Server_include{A,C,S}.h:
-        * tao/PortableServer/PortableServer_include{A,C,S}.h:
-        * tao/RTCORBA/RTCORBA_include{A,C,S}.h:
-        * tao/RTPortableServer/RTPortableServer_include{A,C,S}.h:
-        * tao/RTScheduling/RTScheduler_include{A,C,S}.h:
-        * tao/RTScheduling/diffs/RTScheduler.diff:
-        * tao/RTPortableServer/RTPortableServerA.h:
-          Removed from the archive
-
-Mon Aug 14 12:49:11 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        * TAO_IDL/be_include/be_global.h:
-
-          Added a new option (-b) which controls the use of clonable in
-          arguments on oneway calls.
-
-        * tao/AnyTypeCode/TypeCode.h:
-        * tao/AnyTypeCode/TypeCode.cpp:
-        * tao/Argument.h:
-        * tao/Argument.cpp:
-        * tao/BD_String_Argument_T.h:
-        * tao/BD_String_Argument_T.inl:
-        * tao/BD_String_Argument_T.cpp:
-        * tao/Basic_Argument_T.h:
-        * tao/Basic_Argument_T.inl:
-        * tao/Basic_Argument_T.cpp:
-        * tao/Basic_Arguments.h:
-        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
-        * tao/Fixed_Array_Argument_T.h:
-        * tao/Fixed_Array_Argument_T.inl:
-        * tao/Fixed_Array_Argument_T.cpp:
-        * tao/Fixed_Size_Argument_T.h:
-        * tao/Fixed_Size_Argument_T.inl:
-        * tao/Fixed_Size_Argument_T.cpp:
-        * tao/Object.h:
-        * tao/Object.cpp:
-        * tao/Object_Argument_T.h:
-        * tao/Object_Argument_T.inl:
-        * tao/Object_Argument_T.cpp:
-        * tao/Special_Basic_Argument_T.h:
-        * tao/Special_Basic_Argument_T.inl:
-        * tao/Special_Basic_Argument_T.cpp:
-        * tao/UB_String_Argument_T.h:
-        * tao/UB_String_Argument_T.inl:
-        * tao/UB_String_Argument_T.cpp:
-        * tao/Var_Array_Argument_T.h:
-        * tao/Var_Array_Argument_T.inl:
-        * tao/Var_Array_Argument_T.cpp:
-        * tao/Var_Size_Argument_T.h:
-        * tao/Var_Size_Argument_T.inl:
-        * tao/Var_Size_Argument_T.cpp:
-
-          Created "clonable" template classes based on all In_*_Argument_T.
-          Through the use of traits, the clonable templates are not
-          instantiated unless the idl generated code uses them (through the
-          -b option).
-
-          Code in the CSD_FW_Server_Request is able to determine if the
-          arguments (for collocated oneway's) can be cloned or not.  If they
-          can be, they will be cloned during the copy of the server request.
-          If they can not be cloned, it will use the original method of
-          marshaling the pararameters to copy them. [RT 8372]
-
-        * tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc:
-        * tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc:
-
-          Use the -b option for the idl files in these projects.  I left
-          some CSD tests to not use the -b option to exercise both methods
-          of argument copying.
-
-Mon Aug 14 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/TypeCode_Case_Enum_T.{h,cpp,inl}:
-          Fixed gcc warnings
-
-Mon Aug 14 10:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-          Part of fixes for bug 2605, when generating the include of
-          config-all.h, Versioned_Namespace.h and the export include
-          do generate /**/ between the include statement and the filename
-          so that doxygen doesn't add these standard includes to the
-          include picture to make them more readable.
-
-Mon Aug 14 09:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/compiler.html:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be_include/be_global.h:
-          Added -Wb,unique_include as option, when this is specifified
-          instead of the normal includes only the specified include is
-          done. This is needed for regeneration the *_include.pidl files
-          in the archive as part of the regular build
-
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-          Generate false instead of 0
-
-Mon Aug 14 09:07:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * examples/Simulator/Event_Supplier/Logging_Sup.cpp:
-          Small OpenVMS compatibility changes.
-
-Mon Aug 14 08:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Messaging/Messaging.h:
-        * tao/Messaging/messaging_export.h:
-          Moved the undef of TRANSPART to the export file to fix
-          compile errors on solaris. This way we don't need to handcraft
-          generated files for the messaging lib
-
-Mon Aug 14 07:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/TypeCode_Case_Enum_T.{h,cpp,inl}:
-        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
-          Fixed handling of union with enums. This fixes bugzilla bug
-          2446, thanks to Tommy Persson <tpe at ida dot liu dot se> for
-          reporting this bug. Also it fixes bugzilla bug 2539 which
-          has been reported by sdjiangwei@sina.com. The real fix has
-          been made by Dale Boan <boan at sedsystems dot ca>, many thanks
-          to him.
-
-Sun Aug 13 23:30:02 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-          These changes excluded the POAManagerFactory and EndpointPolicy
-          from minimum corba, minimum poa and CORBA/e builds.
-
-        * tao/PortableServer/POA.pidl:
-
-          Excluded the_POAManagerFactory attribute in POA.
-
-        * tao/PortableServer/POAManagerFactory.pidl:
-
-          Excluded POAManagerFactory interface.
-
-        * tao/PortableServer/POAManager.cpp:
-        * tao/PortableServer/POAManager.inl:
-        * tao/PortableServer/POAManager.h:
-        * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/Object_Adapter.h:
-        * tao/PortableServer/Acceptor_Filter_Factory.cpp:
-        * tao/PortableServer/Acceptor_Filter_Factory.h:
-        * tao/PortableServer/POAManagerFactory.cpp:
-        * tao/PortableServer/POAManagerFactory.h:
-        * tao/PortableServer/Root_POA.cpp:
-        * tao/PortableServer/Root_POA.h:
-
-          Excluded the use of POAManagerFactory in the code.
-
-        * tao/EndpointPolicy.mpc:
-        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
-        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
-
-          Made these projects inherit from minimum_corba.
-
-Fri Aug 11 12:49:55 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tests/Optimized_Connection/Optimized_Connection.mpc:
-        * tests/Optimized_Connection/README:
-        * tests/Optimized_Connection/Test.idl:
-        * tests/Optimized_Connection/oc.ior:
-
-          This test was failing on OpenVMS due to the way the linker
-          handles template instantiations. Copied the Hello test IDL here,
-          so the test is now self-contained.
-
-Fri Aug 11 11:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTPortableServer/RT_POA.{h,cpp}:
-          CORBA/e changes
-
-        * tao/Utils/Auto_Function.h:
-          Marked this header as deprecated
-
-Fri Aug 11 09:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IFR_Client.mpc:
-          Added -GX to the generation of the pidl files to get empty
-          A.h files
-
-        * tao/IFR_Client/*A.h:
-          Removed from the repo, do get regenerated now automatically
-
-Fri Aug 11 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/be_include/be_global.h:
-        * docs/compiler.html:
-          Added -Scc to suppress generation of client stub and -Ssc of
-          generation of server skeleton file. These options don't check
-          if something is generated in these files or not, they just
-          suppress the generation. Usefull for some pidl files in the
-          core libraries. This fixes bugzilla 2631
-
-Fri Aug 11 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
-          Initialise pointer with 0 to address gcc 4.1 warning
-
-Fri Aug 11 07:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Messaging/Messaging_Types.pidl:
-          Moved all policy type constants to this new pidl file that is
-          included by the other pidl files. This way the catior utility
-          only needs to include the generated client file for this pidl
-          file.
-
-        * tao/Messaging/Messaging_No_Impl.pidl:
-        * tao/Messaging/Messaging_RT_Policy.pidl:
-        * tao/Messaging/Messaging_SyncScope_Policy.pidl:
-          Moved the policy constants out of these file and included the
-          new file above
-
-        * tao/Messaging.mpc:
-          Added new pidl file
-
-        * tao/utils/catior/catior.cpp:
-          Include Messaging_TypesC.h instead of all seperate messaging
-          files.
-
-Thu Aug 10 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Messaging.mpc:
-          Enabled regeneration of Messaging_No_Impl.pidl. This had a diff
-          to undef TRANSPARENT if it was defined, we moved that to
-          Messaging.h
-
-        * tao/Messaging/diffs/*:
-          Removed, not needed anymore
-
-        * tao/Messaging/Messaging.h:
-          Undef TRANSPARENT when it is defined
-
-        * tao/Messaging/Messaging.pidl:
-          Documentation cleanup
-
-        * tao/Messaging/Messaging_No_Impl{A,C,S}.{h,cpp,inl}:
-          Removed, will get regenerated as part of the build
-
-Thu Aug 10 12:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-          In the server header include the safe include when this is defined
-
-        * tao/Messaging.mpc:
-          Enabled regeneration of Messaging.pidl and added some -GX flags to
-          get the empty A.h files
-
-        * tao/Messaging/Messaging_No_ImplS.h:
-          Added empty file, needed because Messaging.pidl gets regenerated
-
-        * tao/Messaging/Messaging.pidl:
-          Removed include of OldExceptionHolder.pidl which got removed some
-          time ago.
-
-        * tao/Messaging/Messaging{A,C,S}.{h,cpp,inl}:
-          Removed because they get regenerated as part of the build
-
-Thu Aug 10 10:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be/be_codegen.cpp:
-        * docs/compiler.html
-          Added -GX option, generates an empty A.h file. This can be used
-          for the pidl files in the archive which can't be build with -GA
-          but we do need an A.h file to not get compile errors when end
-          users do include the pidl files directly.
-
-        * tao/CodecFactory.mpc:
-        * tao/ImR_Client.mpc:
-        * tao/ObjRefTemplate.mpc:
-        * tao/PI.mpc:
-        * tao/RTScheduler.mpc:
-        * tao/IORManipulation.mpc:
-          Use the new -GX option
-
-        * tao/CodecFactory/IOP_CodecA.h:
-        * tao/ImR_Client/ImplRepoA.h:
-        * tao/IORManipulation/IORA.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateA.h:
-        * tao/PI/ORBInitInfoA.h:
-        * tao/RTScheduling/RTSchedulerA.h:
-          Removed from the repo, do get generated now with -GX.
-
-Thu Aug 10 09:43:56 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/CodecFactory/IOP_Codec.pidl:
-        * tao/CSD_Framework/CSD_Framework.pidl:
-          Documentation improvements
-
-        * tao/Connector_Registry.cpp:
-          Improved some debug statements to mention the class and method
-          where the debug message is coming from
-
-        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
-          Initialize some pointers with 0
-
-        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
-        * tao/Invocation_Adapter.cpp:
-        * tao/LocateRequest_Invocation_Adapter.cpp:
-        * tao/operation_details.{h,inl}:
-          Removed the argument_flag as member, we just determine whether
-          we have arguments or not on the number of arguments. Changed the
-          accessor to just check it when requested. Introduced a flag
-          whether the stub arguments should be used or not, this can
-          then be changed is some part of the code knows the stub
-          arguments are not valid, for example with AMI.
-
-        * tao/operation_details.h:
-          Guarded the ft_* methods with TAO_HAS_INTERCEPTORS, the
-          implementation did use the macro, just not the declaration
-
-        * tao/extra_core.mpb:
-          Removed a generated file from the list of files
-
-        * tao/GIOP_Message_Generator_Parser_12.cpp:
-        * tao/Service_Context.{h,inl}:
-          is_service_id is now returning a real bool
-
-        * tao/Messaging/Async_Invocation_Adapter.{h,cpp}:
-          Overruled invoke_collocated_i to set the use_stub_args
-          flag in the operations details to false, when using
-          collocation we should use the skeleton arguments. This fixes
-          bugzilla bug 2503, thanks to Charles Frasch <cfrash at atdesk dot com>
-          for reporting this bug.
-
-        * tao/PortableServer/get_arg.h:
-          Use the operation_details stub_args method to determine
-          which args should be used
-
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-          Small optimization for AMI operations with just out arguments as
-          supplied by Ossama Othman as partly fix for bug 2503.
-
-        * tao/PortableServer/Root_POA.cpp:
-          Don't use POAManagerFactory with CORBA/e compact.
-
-Wed Aug  9 15:00:55 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp:
-          Added dependency on ImR_Client library so that static builds can make
-          use of ImR features without dynamic library loading.
-
-Tue Aug  8 22:39:56 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tao/CSD_ThreadPool.mpc:
-          Replaced the requires for threads with dependency upon
-          threads.mpb which does essentially the same thing. Only looks
-          cleaner.
-
-Wed Aug  9 13:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2503_Regression/run_test.pl:
-          No need to run the client with orb debug level 10
-
-Wed Aug  9 08:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTCORBA/RT_Protocol_Hooks.cpp:
-          Use true instead of 1
-
-        * tao/RTCORBA/RTCORBA.pidl:
-          Doxygen changes
-
-Tue Aug  8 14:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BiDIR_GIOP/BiDir_PolicyFactory.cpp:
-          No need to extract the value twice out of the any
-
-Tue Aug  8 14:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/tests/Codesets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h:
-        * tao/tests/Codesets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h:
-        * tao/tests/Codesets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.h:
-          Updated includes because of the removal of Codeset_Translator_Factory.h
-          from the core TAO directory
-
-Tue Aug  8 09:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
-          Initailize some pointers explicitly with 0 to fix gcc41 warnings
-
-Tue Aug  8 09:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_type.cpp:
-          Initailize some pointers explicitly with 0 to fix gcc41 warnings
-
-Tue Aug  8 08:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Codeset_Translator_Factory.h:
-          Removed, it was deprecated for more then a year
-
-        * tao/tao.mpc:
-          Removed remark about Codeset_Translator_Factory.h
-
-Tue Aug  8 07:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO-INSTALL.html:
-          Removed vc6 info, added VxWorks 6.3 as supported platform
-
-Tue Aug  8 07:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-          Fixed typo in comment
-
-Mon Aug  7 19:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/EndpointPolicy.mpc:
-          Enabed regeneration of EndpointPolicyType.pidl:
-
-        * tao/EndpointPolicy/EndpointPolicy{A,C}.{h,cpp}:
-          Removed, not needed anymore
-
-        * tao/EndpointPolicy/EndpointPolicyType.pidl:
-          Include Policy_Forward.pidl, Policy.pidl pulls in too
-          much.
-
-        * tao/BiDIR_GIOP/BiDIR_GIOP.{h,cpp}:
-          Changed is_activated to a bool
-
-        * tao/Profile.cpp (decode):
-          Only get encap_len when ACE_NLOGGING is not defined, if it is
-          defined then we don't use this variable, so no need to get it.
-
-Mon Aug  7 17:06:52 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tao/PortableServer/POAManagerFactory.cpp:
-
-          Removed hard coded policy checking in create_POAManager().
-          Instead, the TAO_Policy_Validator is used to validate the
-          policies.
-
-        * tao/orbconf.h:
-
-          Fixed a bug that the TAO_CACHED_POLICY_ENDPOINT was set
-          after TAO_CACHED_POLICY_MAX_CACHED. This would fix the
-          access beyond cached_policies_ array bound problem.
-
-        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
-
-          Fixed a bug in TAO_EndpointPolicy_Factory::create_policy()
-          that initializes the local variable "found_one" to true which
-          makes the supplied endpoints are never verified against
-          the ORB listening endpoints.
-
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.h:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp:
-
-          Fixed a bug that does not count all endpoints if multiple
-          endpoint policies are supplied. Previously, it just counted
-          the endpoints in the first endpoint policy.
-
-        * tao/EndpointPolicy/EndpointPolicy_i.cpp:
-        * tao/EndpointPolicy/EndpointPolicy_i.h:
-
-          Added virtual destructor and reset endpoint_list to length 0
-          when the policy is destroyed.
-
-        * tao/EndpointPolicy/IIOPEndpointValue_i.cpp:
-
-          Removed the duplicate of the const char* ("") since the
-          CORBA::String_var constructor duplicates the string internally.
-
-Mon Aug  7 11:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORManipulation/IOR.pidl:
-          Converted documentation to doxygen style
-
-Fri Aug  4 09:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/default_resource.{h,cpp}:
-        * tao/IIOP_Transport.{h,cpp}:
-        * tao/MMAP_Allocator.{h,cpp}:
-        * tao/orbconf.h:
-        * tao/Transport.{h,cpp}:
-        * docs/Options.html:
-          Added TAO_HAS_SENDFILE, this is set to 1 when ACE_HAS_SENDFILE
-          is enabled, else it is set to 0. Users can explicitly define
-          this to 0 also to build TAO without sendfile support, this
-          reduces then the footprint for applications running on a
-          platform that supports sendfile but where the app doesn't
-          use it. This fixes bugzilla bug 2587.
-
-Wed Aug  2 22:47:53 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-
-          Added a note about the valuetype fix.
-
-Wed Aug  2 21:51:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Valuetype/ValueBase.cpp:
-        * tao/Valuetype/ValueBase.h:
-
-          Restore the ability to properly interpret indirect repository
-          IDs for valuetypes to improve interoperability with other ORBs,
-          notably JacORB. Secondarily, I've renamed some internal
-          (private) methods to include the prefix _tao_ so as to avoid
-          potential namespace collisions with names generated by the IDL
-          compiler.
-
-          Thanks to Eric Danielou <eric dot danielou at eads dot com>
-          for identifying this flaw.
-
-Wed Aug  2 21:32:27 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/examples/ImR/Advanced/run_test.pl:
-        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
-        * orbsvcs/tests/ImplRepo/scale/run_test.pl:
-        * orbsvcs/tests/Notify/Reconnecting/run_test.pl:
-        * orbsvcs/tests/Notify/XML_Persistence/run_test.pl:
-
-          In each case, the Perl scripts were depending on the fact that
-          $TAO_ROOT and $ACE_ROOT/TAO were the same value.  These changes
-          make use of the new $PerlACE::TAO_ROOT variable so that the tests
-          will run when $TAO_ROOT is not $ACE_ROOT/TAO but still assume that
-          $TAO_ROOT is $ACE_ROOT/TAO if $TAO_ROOT is not set.
-
-Wed Aug  2 20:15:37 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
-          Updated comment to reflect what's actually in the code.
-
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
-
-          This is a fix for bugzilla bug #2604.  This only applies to
-          per_client activation mode.  The ImR may receive
-          "server_is_running()" invocations from servers that it did
-          not launch (they may have been launched by a prior instance
-          of the ImR or manually).  When this happens the ImR records
-          the info about the running server and places it on a queue.
-          Later, when a client request comes in a new server is
-          launched (as it should be), but the old queued server info is
-          used to ping it.  This can fail with various exceptions
-          depending on if the old process is still alive or if some
-          other process is now running on its port.  If it fails enough
-          times (greater than the retry count) the client invocation
-          will fail.  The fix is simply to keep track of whether or not
-          the ImR expects a new server (that it launched) to be coming
-          online.  If not, it can ignore the server_is_running().  This
-          mechanism is already in place for normal activation, but due
-          to differences in per_client it doesn't work there.
-
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/README:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl:
-
-          New regeression test for the bugfix described above.
-
-Wed Aug  2 15:11:08 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
-
-          Do not transmit a FT_REQUEST service context if the destination is
-          not an IOGR (i.e. does not contain a IOP::TAG_FT_GROUP component).
-
-        * orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc:
-        * orbsvcs/tests/Bug_2615_Regression/Hello.h:
-        * orbsvcs/tests/Bug_2615_Regression/Hello.cpp:
-        * orbsvcs/tests/Bug_2615_Regression/README:
-        * orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h:
-        * orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp:
-        * orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h:
-        * orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp:
-        * orbsvcs/tests/Bug_2615_Regression/Test.idl:
-        * orbsvcs/tests/Bug_2615_Regression/client.cpp:
-        * orbsvcs/tests/Bug_2615_Regression/run_test.pl:
-        * orbsvcs/tests/Bug_2615_Regression/server.cpp:
-
-          Regression test for the above.
-
-Wed Aug  2 13:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicInterface/DII_Invocation_Adapter.{h,cpp}:
-          Doxygen improvements
-
-Wed Aug  2 12:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
-          Don't run the UIOP test on OpenVMS
-
-Tue Aug  1 07:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/Bug_2619_Regression.idl:
-        * tests/IDL_Test/IDL_Test.mpc:
-          New regression for bug 2619, confirms that this is fixed. Thanks
-          to Graeme Bell <graemeb at econz dot com> for reporting this.
-
-Fri Jul 28 18:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/Bug_2616_Regression.idl:
-          Made the types unique within the IDL_Test project
-
-Fri Jul 28 15:38:11 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Makefile.am
-        * orbsvcs/tests/Event/lib/Makefile.am
-        * orbsvcs/tests/Security/Crash_Test/Makefile.am
-        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
-        * orbsvcs/tests/EC_Mcast/Makefile.am
-        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
-        * orbsvcs/examples/Security/Send_File/Makefile.am
-        * tao/Makefile.am
-        * performance-tests/POA/Demux/Makefile.am
-        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
-        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
-        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
-        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
-
-          Fixed Makefile.ams to reflect changes from
-          Thu Jul 27 20:50:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-Fri Jul 28 14:29:53 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * Most remaining run_test.pl and run_all.pl scripts
-
-          These scripts were missing from
-          Fri Jul 28 00:44:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>,
-          as they used " instead of ' in their use lib line.
-
-Fri Jul 28 14:08:35 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * TAO_IDL/fe/fe_lookup.cpp
-
-          Rolled this file back a version, accidentally got pulled in by
-          Thu Jul 27 20:50:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp
-
-          Re committing this file to update the timestamp.
-
-Fri Jul 28 12:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl:
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl:
-          Fixed file tag
-
-Fri Jul 28 10:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/Bug_2616_Regression.idl:
-        * tests/IDL_Test/IDL_Test.mpc:
-          Added regression for bug 2616. Thanks to Keith Nicewarner
-          <Keith dot Nicewarner at SpaceDev dot com> for delivering this
-          test case, it failed with 1.5.2 but works on the head version,
-          just storing it to prevent the bug to appear in the future.
-
-Fri Jul 28 00:44:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * Most run_test.pl scripts in the TAO repository
-
-          Updated to use the ACE_ROOT environment variable to find
-          PerlACE.  This is necessary for the flattened ACE/TAO/CIAO
-          Thanks to Adam Mitz for reporting the problem and
-          suggesting a solution.
-
-Thu Jul 27 20:50:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Scheduler_Factory.inl
-        * orbsvcs/orbsvcs/Event_Utilities.inl
-        * orbsvcs/orbsvcs/Scheduler_Utilities.h
-        * orbsvcs/orbsvcs/Scheduler_Utilities.i
-        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl
-        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
-        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.i
-        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
-        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.inl
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
-        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.i
-        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
-        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.inl
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
-        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.i
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i
-        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
-        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.inl
-        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.i
-        * orbsvcs/orbsvcs/Time_Utilities.h
-        * orbsvcs/orbsvcs/Time_Utilities.i
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i
-        * orbsvcs/orbsvcs/Sched/DynSched.cpp
-        * orbsvcs/orbsvcs/Sched/DynSched.inl
-        * orbsvcs/orbsvcs/Sched/DynSched.h
-        * orbsvcs/orbsvcs/Sched/DynSched.i
-        * orbsvcs/orbsvcs/Sched/SchedEntry.inl
-        * orbsvcs/orbsvcs/Sched/SchedEntry.cpp
-        * orbsvcs/orbsvcs/Sched/SchedEntry.h
-        * orbsvcs/orbsvcs/Sched/SchedEntry.i
-        * orbsvcs/orbsvcs/Scheduler_Factory.h
-        * orbsvcs/orbsvcs/Scheduler_Factory.i
-        * orbsvcs/orbsvcs/Channel_Clients_T.cpp
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
-        * orbsvcs/orbsvcs/Event_Utilities.h
-        * orbsvcs/orbsvcs/Event_Utilities.i
-        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
-        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
-        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
-        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
-        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i
-        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
-        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
-        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
-        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
-        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl
-        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
-        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i
-        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
-        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
-        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
-        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
-        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
-        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
-        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i
-        * orbsvcs/orbsvcs/Channel_Clients_T.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
-        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
-        * orbsvcs/orbsvcs/Scheduler_Utilities.cpp
-        * orbsvcs/orbsvcs/AV/Policy.cpp
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
-        * orbsvcs/orbsvcs/AV/MCast.cpp
-        * orbsvcs/orbsvcs/AV/QoS_UDP.inl
-        * orbsvcs/orbsvcs/AV/AVStreams_i.inl
-        * orbsvcs/orbsvcs/AV/UDP.cpp
-        * orbsvcs/orbsvcs/AV/Transport.h
-        * orbsvcs/orbsvcs/AV/Transport.i
-        * orbsvcs/orbsvcs/AV/AVStreams_i.h
-        * orbsvcs/orbsvcs/AV/AVStreams_i.i
-        * orbsvcs/orbsvcs/AV/Transport.inl
-        * orbsvcs/orbsvcs/AV/UDP.h
-        * orbsvcs/orbsvcs/AV/UDP.i
-        * orbsvcs/orbsvcs/AV/Policy.inl
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
-        * orbsvcs/orbsvcs/AV/MCast.inl
-        * orbsvcs/orbsvcs/AV/QoS_UDP.cpp
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
-        * orbsvcs/orbsvcs/AV/UDP.inl
-        * orbsvcs/orbsvcs/AV/Policy.h
-        * orbsvcs/orbsvcs/AV/Policy.i
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
-        * orbsvcs/orbsvcs/AV/MCast.h
-        * orbsvcs/orbsvcs/AV/MCast.i
-        * orbsvcs/orbsvcs/AV/QoS_UDP.h
-        * orbsvcs/orbsvcs/AV/QoS_UDP.i
-        * orbsvcs/orbsvcs/AV/Transport.cpp
-        * orbsvcs/orbsvcs/Time_Utilities.cpp
-        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
-        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i
-        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i
-        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
-        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl
-        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i
-        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
-        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.i
-        * orbsvcs/orbsvcs/Event/EC_Filter.h
-        * orbsvcs/orbsvcs/Event/EC_Filter.i
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.i
-        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
-        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
-        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
-        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
-        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.i
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
-        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
-        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i
-        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
-        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
-        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i
-        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
-        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl
-        * orbsvcs/orbsvcs/Event/EC_Filter.cpp
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
-        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl
-        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
-        * orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
-        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl
-        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
-        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i
-        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
-        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
-        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
-        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i
-        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
-        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl
-        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
-        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
-        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
-        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i
-        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
-        * orbsvcs/orbsvcs/Event/EC_QOS_Info.h
-        * orbsvcs/orbsvcs/Event/EC_QOS_Info.i
-        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
-        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
-        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i
-        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
-        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.i
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
-        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl
-        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
-        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
-        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
-        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
-        * orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
-        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
-        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
-        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
-        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
-        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.i
-        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
-        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
-        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
-        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
-        * orbsvcs/orbsvcs/Event/EC_Filter.inl
-        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
-        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
-        * orbsvcs/orbsvcs/Scheduler_Factory.cpp
-        * orbsvcs/orbsvcs/Event_Utilities.cpp
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
-        * orbsvcs/orbsvcs/Scheduler_Utilities.inl
-        * orbsvcs/orbsvcs/Channel_Clients_T.h
-        * orbsvcs/orbsvcs/Channel_Clients_T.i
-        * orbsvcs/orbsvcs/Time_Utilities.inl
-        * orbsvcs/tests/Event/lib/Driver.h
-        * orbsvcs/tests/Event/lib/Driver.i
-        * orbsvcs/tests/Event/lib/Driver.inl
-        * orbsvcs/tests/Event/lib/Driver.cpp
-        * orbsvcs/tests/Security/Crash_Test/test_i.inl
-        * orbsvcs/tests/Security/Crash_Test/test_i.cpp
-        * orbsvcs/tests/Security/Crash_Test/test_i.h
-        * orbsvcs/tests/Security/Crash_Test/test_i.i
-        * orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
-        * orbsvcs/tests/Security/MT_SSLIOP/test_i.inl
-        * orbsvcs/tests/Security/MT_SSLIOP/test_i.h
-        * orbsvcs/tests/Security/MT_SSLIOP/test_i.i
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.inl
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.h
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.i
-        * orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
-        * orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
-        * orbsvcs/tests/HTIOP/BiDirectional/test_i.h
-        * orbsvcs/tests/HTIOP/BiDirectional/test_i.i
-        * orbsvcs/examples/Security/Send_File/test_i.cpp
-        * orbsvcs/examples/Security/Send_File/test_i.inl
-        * orbsvcs/examples/Security/Send_File/test_i.h
-        * orbsvcs/examples/Security/Send_File/test_i.i
-        * tao/Tagged_Components.cpp
-        * tao/IIOP_Endpoint.h
-        * tao/operation_details.cpp
-        * tao/IIOP_Endpoint.i
-        * tao/CDR.cpp
-        * tao/Tagged_Profile.inl
-        * tao/Endpoint.cpp
-        * tao/ORB_Core.cpp
-        * tao/target_specification.h
-        * tao/target_specification.i
-        * tao/GIOP_Message_Locate_Header.h
-        * tao/Object.inl
-        * tao/GIOP_Message_Locate_Header.i
-        * tao/Fault_Tolerance_Service.h
-        * tao/Fault_Tolerance_Service.i
-        * tao/LocalObject.inl
-        * tao/Asynch_Reply_Dispatcher_Base.cpp
-        * tao/Policy_Set.cpp
-        * tao/PortableServer/Servant_Base.cpp
-        * tao/PortableServer/POA_Cached_Policies.inl
-        * tao/PortableServer/POA_Cached_Policies.h
-        * tao/PortableServer/POA_Cached_Policies.i
-        * tao/PortableServer/POA_Policy_Set.h
-        * tao/PortableServer/POA_Policy_Set.i
-        * tao/PortableServer/POAManager.cpp
-        * tao/PortableServer/POAManager.h
-        * tao/PortableServer/POAManager.i
-        * tao/PortableServer/Active_Object_Map.h
-        * tao/PortableServer/Active_Object_Map.i
-        * tao/PortableServer/Object_Adapter.h
-        * tao/PortableServer/Object_Adapter.i
-        * tao/PortableServer/POA_Cached_Policies.cpp
-        * tao/PortableServer/Active_Object_Map.inl
-        * tao/PortableServer/Object_Adapter.inl
-        * tao/PortableServer/POA_Policy_Set.inl
-        * tao/PortableServer/Servant_Base.inl
-        * tao/PortableServer/Active_Object_Map.cpp
-        * tao/PortableServer/Object_Adapter.cpp
-        * tao/PortableServer/Servant_Base.h
-        * tao/PortableServer/Servant_Base.i
-        * tao/PortableServer/POAManager.inl
-        * tao/PortableServer/POA_Policy_Set.cpp
-        * tao/CORBALOC_Parser.cpp
-        * tao/IIOP_Endpoint.inl
-        * tao/Tagged_Components.h
-        * tao/Tagged_Components.i
-        * tao/Tagged_Profile.h
-        * tao/IIOP_Acceptor.cpp
-        * tao/Tagged_Profile.i
-        * tao/MCAST_Parser.h
-        * tao/Parser_Registry.h
-        * tao/MCAST_Parser.i
-        * tao/Parser_Registry.i
-        * tao/Acceptor_Registry.h
-        * tao/Acceptor_Registry.i
-        * tao/Buffering_Constraint_Policy.h
-        * tao/Buffering_Constraint_Policy.i
-        * tao/Exception.h
-        * tao/Exception.i
-        * tao/Bind_Dispatcher_Guard.inl
-        * tao/Stub.cpp
-        * tao/MCAST_Parser.cpp
-        * tao/Endpoint.h
-        * tao/Endpoint.i
-        * tao/Exception.inl
-        * tao/MProfile.inl
-        * tao/params.h
-        * tao/params.i
-        * tao/Reply_Dispatcher.cpp
-        * tao/MProfile.h
-        * tao/MProfile.i
-        * tao/params.cpp
-        * tao/Parser_Registry.cpp
-        * tao/target_specification.cpp
-        * tao/Policy_Manager.inl
-        * tao/GIOP_Message_Locate_Header.inl
-        * tao/Asynch_Reply_Dispatcher_Base.h
-        * tao/Asynch_Reply_Dispatcher_Base.i
-        * tao/Tagged_Components.inl
-        * tao/CORBALOC_Parser.h
-        * tao/operation_details.inl
-        * tao/CORBALOC_Parser.i
-        * tao/CDR.inl
-        * tao/IIOP_Acceptor.h
-        * tao/IIOP_Acceptor.i
-        * tao/Reply_Dispatcher.h
-        * tao/Reply_Dispatcher.i
-        * tao/Leader_Follower.h
-        * tao/Leader_Follower.i
-        * tao/Endpoint.inl
-        * tao/Fault_Tolerance_Service.cpp
-        * tao/ORB_Core.inl
-        * tao/Profile.cpp
-        * tao/Asynch_Reply_Dispatcher_Base.inl
-        * tao/Environment.h
-        * tao/Policy_Set.inl
-        * tao/Environment.i
-        * tao/ORB.cpp
-        * tao/CORBALOC_Parser.inl
-        * tao/IIOP_Acceptor.inl
-        * tao/RTPortableServer/RT_POA.cpp
-        * tao/RTPortableServer/RT_POA.inl
-        * tao/RTPortableServer/RT_POA.h
-        * tao/RTPortableServer/RT_POA.i
-        * tao/ORB.h
-        * tao/ORB.i
-        * tao/Leader_Follower.cpp
-        * tao/Stub.inl
-        * tao/MCAST_Parser.inl
-        * tao/Acceptor_Registry.cpp
-        * tao/Environment.cpp
-        * tao/Profile.h
-        * tao/Profile.i
-        * tao/Object.h
-        * tao/Object.i
-        * tao/Stub.h
-        * tao/Stub.i
-        * tao/Messaging/Messaging_Policy_i.cpp
-        * tao/Messaging/Messaging_Policy_i.inl
-        * tao/Messaging/Messaging_Policy_i.h
-        * tao/Messaging/Messaging_Policy_i.i
-        * tao/Policy_Manager.h
-        * tao/Policy_Manager.i
-        * tao/Reply_Dispatcher.inl
-        * tao/Pluggable_Messaging_Utils.cpp
-        * tao/Principal.cpp
-        * tao/TAO_Server_Request.cpp
-        * tao/Connector_Registry.cpp
-        * tao/params.inl
-        * tao/Parser_Registry.inl
-        * tao/target_specification.inl
-        * tao/ORB_Core.h
-        * tao/ORB_Core.i
-        * tao/Connector_Registry.h
-        * tao/Connector_Registry.i
-        * tao/Strategies/SHMIOP_Endpoint.inl
-        * tao/Strategies/SCIOP_Endpoint.cpp
-        * tao/Strategies/DIOP_Acceptor.h
-        * tao/Strategies/UIOP_Endpoint.h
-        * tao/Strategies/DIOP_Acceptor.i
-        * tao/Strategies/UIOP_Endpoint.i
-        * tao/Strategies/DIOP_Endpoint.inl
-        * tao/Strategies/SCIOP_Acceptor.inl
-        * tao/Strategies/SHMIOP_Endpoint.h
-        * tao/Strategies/SHMIOP_Endpoint.i
-        * tao/Strategies/DIOP_Acceptor.cpp
-        * tao/Strategies/UIOP_Endpoint.inl
-        * tao/Strategies/SHMIOP_Endpoint.cpp
-        * tao/Strategies/DIOP_Endpoint.h
-        * tao/Strategies/DIOP_Endpoint.i
-        * tao/Strategies/SCIOP_Acceptor.h
-        * tao/Strategies/SCIOP_Acceptor.i
-        * tao/Strategies/SCIOP_Endpoint.inl
-        * tao/Strategies/DIOP_Endpoint.cpp
-        * tao/Strategies/SCIOP_Acceptor.cpp
-        * tao/Strategies/DIOP_Acceptor.inl
-        * tao/Strategies/UIOP_Endpoint.cpp
-        * tao/Strategies/SCIOP_Endpoint.h
-        * tao/Strategies/SCIOP_Endpoint.i
-        * tao/Buffering_Constraint_Policy.cpp
-        * tao/CDR.h
-        * tao/CDR.i
-        * tao/Policy_Set.h
-        * tao/Policy_Set.i
-        * tao/TAO_Server_Request.h
-        * tao/Principal.h
-        * tao/TAO_Server_Request.i
-        * tao/Principal.i
-        * tao/Fault_Tolerance_Service.inl
-        * tao/Profile.inl
-        * tao/Tagged_Profile.cpp
-        * tao/Object.cpp
-        * tao/RTScheduling/RTScheduler_Manager.inl
-        * tao/RTScheduling/RTScheduler_Manager.cpp
-        * tao/RTScheduling/RTScheduler_Manager.h
-        * tao/RTScheduling/RTScheduler_Manager.i
-        * tao/ORB.inl
-        * tao/Bind_Dispatcher_Guard.h
-        * tao/Bind_Dispatcher_Guard.i
-        * tao/LocalObject.cpp
-        * tao/Pluggable_Messaging_Utils.h
-        * tao/Pluggable_Messaging_Utils.i
-        * tao/Leader_Follower.inl
-        * tao/Acceptor_Registry.inl
-        * tao/IIOP_Endpoint.cpp
-        * tao/Environment.inl
-        * tao/operation_details.h
-        * tao/operation_details.i
-        * tao/Bind_Dispatcher_Guard.cpp
-        * tao/Pluggable_Messaging_Utils.inl
-        * tao/Principal.inl
-        * tao/TAO_Server_Request.inl
-        * tao/Connector_Registry.inl
-        * tao/LocalObject.h
-        * tao/LocalObject.i
-        * tao/Exception.cpp
-        * tao/MProfile.cpp
-        * tao/Policy_Manager.cpp
-        * tao/Buffering_Constraint_Policy.inl
-        * tao/GIOP_Message_Locate_Header.cpp
-        * tao/RTCORBA/Network_Priority_Mapping_Manager.inl
-        * tao/RTCORBA/Priority_Mapping_Manager.h
-        * tao/RTCORBA/Priority_Mapping_Manager.i
-        * tao/RTCORBA/Network_Priority_Mapping_Manager.h
-        * tao/RTCORBA/Network_Priority_Mapping_Manager.i
-        * tao/RTCORBA/Priority_Mapping_Manager.inl
-        * tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
-        * tao/RTCORBA/Priority_Mapping_Manager.cpp
-        * performance-tests/POA/Demux/demux_test_client.cpp
-        * performance-tests/POA/Demux/demux_test_client.inl
-        * performance-tests/POA/Demux/demux_test_client.i
-        * performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
-        * performance-tests/RTCorba/Oneways/Reliable/test_i.inl
-        * performance-tests/RTCorba/Oneways/Reliable/test_i.h
-        * performance-tests/RTCorba/Oneways/Reliable/test_i.i
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.i
-        * tests/Faults/ping_i.cpp
-        * tests/Faults/ping_i.inl
-        * tests/Faults/ping_i.h
-        * tests/Faults/ping_i.i
-        * tests/Faults/test_i.inl
-        * tests/Faults/test_i.cpp
-        * tests/Faults/test_i.h
-        * tests/Faults/test_i.i
-        * tests/Muxed_GIOP_Versions/test_i.cpp
-        * tests/Muxed_GIOP_Versions/test_i.inl
-        * tests/Muxed_GIOP_Versions/test_i.h
-        * tests/Muxed_GIOP_Versions/test_i.i
-        * tests/DSI_Gateway/test_dsi.cpp
-        * tests/DSI_Gateway/test_dsi.inl
-        * tests/DSI_Gateway/test_dsi.h
-        * tests/DSI_Gateway/test_dsi.i
-        * tests/DSI_Gateway/test_i.inl
-        * tests/DSI_Gateway/test_i.cpp
-        * tests/DSI_Gateway/test_i.h
-        * tests/DSI_Gateway/test_i.i
-        * tests/MT_Client/test_i.inl
-        * tests/MT_Client/test_i.cpp
-        * tests/MT_Client/test_i.h
-        * tests/MT_Client/test_i.i
-        * tests/OctetSeq/test_i.inl
-        * tests/OctetSeq/test_i.cpp
-        * tests/OctetSeq/test_i.h
-        * tests/OctetSeq/test_i.i
-        * tests/BiDirectional_DelayedUpcall/test_i.cpp
-        * tests/BiDirectional_DelayedUpcall/test_i.inl
-        * tests/BiDirectional_DelayedUpcall/test_i.h
-        * tests/BiDirectional_DelayedUpcall/test_i.i
-        * tests/MT_Server/test_i.cpp
-        * tests/MT_Server/test_i.inl
-        * tests/MT_Server/test_i.h
-        * tests/MT_Server/test_i.i
-        * tests/BiDirectional/test_i.cpp
-        * tests/BiDirectional/test_i.inl
-        * tests/BiDirectional/test_i.h
-        * tests/BiDirectional/test_i.i
-        * tests/Strategies/simple_test_i.cpp
-        * tests/Strategies/simple_test_i.inl
-        * tests/Strategies/simple_test_i.h
-        * tests/Strategies/simple_test_i.i
-        * tests/MProfile_Forwarding/test_i.cpp
-        * tests/MProfile_Forwarding/test_i.inl
-        * tests/MProfile_Forwarding/test_i.h
-        * tests/MProfile_Forwarding/test_i.i
-        * tests/Native_Exceptions/test_i.cpp
-        * tests/Native_Exceptions/test_i.inl
-        * tests/Native_Exceptions/test_i.h
-        * tests/Native_Exceptions/test_i.i
-        * tests/Forwarding/test_i.cpp
-        * tests/Forwarding/test_i.inl
-        * tests/Forwarding/test_i.h
-        * tests/Forwarding/test_i.i
-        * tests/BiDirectional_NestedUpcall/test_i.cpp
-        * tests/BiDirectional_NestedUpcall/test_i.inl
-        * tests/BiDirectional_NestedUpcall/test_i.h
-        * tests/BiDirectional_NestedUpcall/test_i.i
-        * TAO_IDL/fe/fe_lookup.cpp
-        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
-        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
-        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
-        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.i
-        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
-        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
-        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
-        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.i
-        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
-        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
-        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
-        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.i
-
-          Moved .i to .inl, and updated the associated header and source files.
-
-Thu Jul 27 19:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO-INSTALL.html:
-          Updated to use subversion and updated minimum corba documentation
-
-Thu Jul 27 18:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/minimumTAO.html:
-          Fixed some incorrect hyperlinks
-
-Thu Jul 27 18:07:44 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * TAO_ACE.mwc
-
-          Replaced relative reference to ACE with an environment variable.
-          This is necessary to allow TAO to build in flattened repo layout.
-
-Wed Jul 26 07:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO-INSTALL.html:
-        * tao/Transport.h:
-        * docs/releasenotes/ftcorba_services.html:
-        * docs/Security/SSLIOP-Usage.html:
-          Updated documentation to point to the new svn repository
-
-Mon Jul 24 21:54:22 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
-        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h
-        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
-        * tao/RTScheduling/RTSchedulerC.cpp
-        * tao/RTScheduling/RTSchedulerC.h
-
-          Removed these, they were kept around erroneously.
-
-        * ./TAO/performance-tests/AMI_Latency
-        * ./TAO/performance-tests/Deferred_Latency
-        * ./TAO/performance-tests/DII_Latency
-        * ./TAO/performance-tests/DSI_Latency
-        * ./TAO/performance-tests/Single_Threaded_Latency
-        * ./TAO/performance-tests/Thread_Per_Connection_Latency
-        * ./TAO/performance-tests/Thread_Pool_Latency
-
-          Removed these directories, which had been previously merged into
-          performance-tests/Latency
-
-Mon Jul 24 19:02:33 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * TAO/RTScheduling/RTSchedulerA.h
-
-          Should not have been removed.
-
-Mon Jul 24 18:52:33 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * TAO/RTScheduling/RTSchedulerA.cpp
-
-          Removed, these were kept around erroneously by the conversion script.
-
-Mon Jul 24 17:39:38 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * TAO_IDL/fe/fe_lookup.cpp
-
-          Re committing this file, as the subversion script probably backdated
-          the timestamp on the file, which was causing it to be regenerated as
-          part of the build process.
-
-Mon Jul 24 15:45:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * Subversion conversion completed at revision 73730
-
-Sun Jul 23 15:44:43 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * Repository frozen for repository conversion
-
-Sat Jul 22 11:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/QtTests/client.cpp:
-          Updated include because of QtResource move
-
-Fri Jul 21 14:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Reliable_Oneways/server.cpp:
-          Initialise pointer with 0
-
-Fri Jul 21 14:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/RTScheduling/Current/Thread_Task.cpp:
-        * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
-          Simplified printing the elements of a string sequence
-
-Fri Jul 21 14:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/PICurrent/client.cpp:
-        * tests/Portable_Interceptors/PICurrent/test.idl:
-        * tests/Portable_Interceptors/PICurrent/test_i.{h,cpp}:
-          Extended this test
-
-Fri Jul 21 13:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Connection_Timeout/Connection_Timeout.mpc:
-          Simplified this file
-
-Fri Jul 21 13:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2503_Regression/client.cpp:
-        * tests/Bug_2503_Regression/server.cpp:
-        * tests/Bug_2503_Regression/Test.idl:
-        * tests/Bug_2503_Regression/test_i.{h,cpp}:
-          Extended this test in such a way that the client does a shutdown
-          invocation on the server when it is ready.
-
-Fri Jul 21 12:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1551_Regression/Reply_Handler.cpp:
-          At the moment there is a bug in the AMI code it could happen that
-          the exception holder pointer is nill, in that case print an error
-          message instead of trying to invoke a method on it. This shouldn't
-          normally happen, but makes it a lot easier to analyze the problem
-          because we now just get an error message instead of an access
-          violation.
-
-Fri Jul 21 11:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Notify/lib/Peer.cpp:
-          Removed include of Arg_Shifter.h, it is already done in the header
-          file
-
-Fri Jul 21 08:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * utils/catior/catior.cpp:
-          Added needed include to build catior when IIOP has been disabled
-          in the orb
-
-        * tao/Object_T.cpp:
-          Const improvements, use true/false for bool
-
-Fri Jul 21 07:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies/UIOP_Profile.cpp:
-        * tao/Strategies/DIOP_Profile.cpp:
-        * tao/Strategies/SCIOP_Profile.cpp:
-          Use true/false instead of 1/0
-
-Fri Jul 21 07:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Load_Protocol_Factory_T.h:
-          Added missing return statement
-
-Thu Jul 20 20:38:08 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
-        * docs/tutorials/Quoter/RTCORBA/Common_i.h
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
-        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
-        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
-
-          Fixed some errors. Addressed the comments from Will.
-
-Thu Jul 20 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IIOP_Profile.cpp (do_is_equivalent):
-          Use true/false
-
-Thu Jul 20 12:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies/DIOP_Endpoint.{h,cpp}:
-          Made object_addr_set_ a bool instead of int
-
-Thu Jul 20 12:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies/DIOP_Endpoint.h:
-          Removed commented out method
-
-Thu Jul 20 12:26:59 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * tests/Bug_2549_Regression/test.idl:
-
-          Replace <> with "" to fix fuxx error.
-
-Thu Jul 20 11:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Load_Protocol_Factory_T.h:
-          New template method that can be used to load a specific pluggable
-          protocol.
-
-        * tao/tao.mpc:
-          Added new file
-
-        * tao/default_resource.cpp:
-        * tao/Strategies/advanced_resource.cpp:
-          Use the new template method to load the pluggable protocols. This
-          way we can remove a lot of duplicated code that was copied just for
-          each specific protocol.
-
-Thu Jul 20 10:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies/DIOP_Transport.h:
-          Removed commented out methods
-
-Thu Jul 20 10:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/tao.mpc:
-        * tao/EndpointPolicy.mpc:
-          Add tao_no_iiop as base project, when we enable this feature these
-          projects are affected
-
-        * tao/IIOP.pidl:
-        * tao/EndpointPolicy/IIOPEndpointValue.pidl:
-          Guard this with !TAO_LACKS_IIOP, when tao_no_iiop is enabled as MPC
-          feature we don't generate code for these files.
-
-        * tao/Endpoint_Acceptor_Filter.cpp:
-          No need to include IIOP specific files, base classes are all we need
-          here.
-
-        * tao/EndpointPolicy/IIOPEndpointValue_i.{h,cpp}:
-          Don't compile these files when IIOP is disabled.
-
-Thu Jul 20 08:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1639_Regression/struct_client.cpp:
-        * tests/DynAny_Test/test_dynany.cpp:
-        * tests/DynAny_Test/analyzer.h:
-          Reordered includes to fix problems with gcc4
-
-Thu Jul 20 07:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/IDL_Test.mpc:
-          Added regression for bug 2582 again
-
-Thu Jul 20 03:43:30 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
-
-          Added some comments for Shanshan.
-
-Wed Jul 19 22:44:16 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h:
-
-          Add version macros.
-
-Wed Jul 19 22:28:50 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
-
-          The open() initializes the underlying socket that is later
-          enabled to be non-blocking. Without open() the enable call will
-          fail as it should. This fixes the scoreboard failure introduced
-          in:
-
-          Mon Jul 17 14:26:08 UTC 2006  Ciju John  <john_c@ociweb.com>
-
-Wed Jul 19 19:20:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be_include/be_global.h:
-        * docs/compiler.html:
-        * docs/releasenotes/index.html:
-
-          - Added IDL compiler command line option -oS, which sets an
-            output directory for all skeleton (*S*) files, similar to what
-            the -oA option does for *A.* files. Overrides the -o option
-            value, if any. Also updated IDL compiler and related docs.
-            This feature will make it easier to automate the generation
-            from IDL files for services like the Interface Repository,
-            where the stub and skeleton files go to different directories.
-            This fix closes [BUGID:2603].
-
-          - Changed all occurrences of 'base_name_only' parameters from
-          int to bool.
-
-Wed Jul 19 17:49:47 UTC 2006  Nanbor Wang  <nanbor (a) txcorp (d) com>
-
-        * orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp: Enhanced
-          the client to use more than 2 replicas.  The limitation of using
-          2 replicas was causing the client to exit when one of the server
-          crashes.  This is due to the way ACE_TMCase handling a single
-          server as a fault.  But allowing more than 2 replicas, the 2
-          remaining servers can continue to work and thus demonstrate how
-          FT work.
-
-        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp:
-        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h:
-          Minor fixup to throw spec.
-
-Wed Jul 19 17:07:12 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-
-          Fixed bug in the logic of the decisioin whether or not to generate
-          the arg traits template specialization for a typedef. This fix
-          addresses the reopening of [BUGID:2582], which will now be set
-          to FIXED unless and until another bug is found.
-
-Wed Jul 19 17:21:38 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
-          (load_ep_addr):
-
-          Use new ACE_CString::size_type type to hold string
-          position/index value, instead of "int".  Addresses "comparison
-          between signed and unsigned" warnings.
-
-        * tao/Strategies/DIOP_Acceptor.cpp (parse_options):
-        * tao/Strategies/SCIOP_Acceptor.cpp (parse_options):
-        * tao/Strategies/SHMIOP_Acceptor.cpp (parse_options):
-        * tao/Strategies/UIOP_Acceptor.cpp (parse_options):
-
-          Applied Ciju's substring fix.  See "Tue Jul 18 21:38:55 UTC 2006
-          Ciju John  <johnc@ociweb.com>" below for details.
-
-Wed Jul 19 15:52:11 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/IDL_Test/anonymous.idl:
-        * tests/IDL_Test/typedef.idl:
-        * tests/IDL_Test/valuetype.idl:
-
-          Entries to test sequence of valuetype as valuetype member
-          and typedefs of string with the same bound repeated in
-          different compilation units that are linked in the same
-          build.
-
-Wed Jul 19 15:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbscvs/orbsvcs/IFRService/*S.h:
-          Replace ace\pre.h with ace/pre.h, seems generation with MPC is
-          dependent on windows or linux
-
-Wed Jul 19 13:18:41 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/Codeset/Codeset_Descriptor.cpp:
-        * tao/Codeset/UTF16_BOM_Translator.cpp:
-
-          Added static casts to remove build warnings from some 64-bit
-          compilers where unsigned long and ACE_CDR::ULong were mixed.
-          It was necessary to use static_cast<> as the size of the data in
-          most cases needed to be size_t/unsigned long.
-
-Wed Jul 19 12:31:50 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/LocalObject.cpp:
-        * tao/ORB.h:
-        * tao/ORB.i:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/Principal.h:
-        * tao/Principal.i:
-        * tao/Profile.h:
-        * tao/Profile.cpp:
-
-          In my change from Mon Jul 17 14:40:43 UTC 2006, I modified these
-          files to use an ACE_Atomic_Op<> with an unsigned long.  They all
-          had instances where unsigned long and CORBA::ULong were being
-          mixed which causes warnings with some 64-bit compilers.  I have
-          modified these to all use unsigned long in places where
-          CORBA::ULong was previously used.
-
-Wed Jul 19 12:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbscvs/orbsvcs/IFRService/*.S*.*:
-          Regenerated these files
-
-        * tao/IFR_Client.mpc:
-          Only use the stub export tao_idl options
-
-Wed Jul 19 10:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTScheduler.mpc:
-          Enabled regeneration of the pidl file
-
-        * tao/RTScheduling/RTSchedulerA.cpp:
-        * tao/RTScheduling/RTSchedulerC.cpp:
-        * tao/RTScheduling/RTSchedulerC.h:
-        * tao/RTScheduling/RTSchedulerS.h:
-          Removed from the repo
-
-Wed Jul 19 10:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_module.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be_include/be_visitor_module/module.h:
-          Support generating native within a module
-
-Wed Jul 19 08:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * utils/nslist/nslist.cpp:
-
-          Bug fix for over optimizing Borland compiler.
-
-Wed Jul 19 08:03:36 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * tao/CodecFactory/IOP_CodecA.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateA.h:
-        * tao/PortableServer/PortableServerA.h:
-        * tao/RTCORBA/RTCORBAA.h:
-        * tao/RTCORBA/RTCORBAS.h:
-        * tao/RTPortableServer/RTPortableServerA.h:
-        * tao/RTPortableServer/RTPortableServer_includeA.h:
-        * tao/RTScheduling/RTSchedulerA.h:
-        * tao/RTScheduling/RTSchedulerS.h:
-
-          Added these 'empty' files. Works around problems with the IDL
-          preprocessing. This fixes bug #2549. See ticket for more.
-
-        * tests/Bug_2549_Regression/Bug_2549_Regression.mpc:
-        * tests/Bug_2549_Regression/README:
-        * tests/Bug_2549_Regression/test.cpp:
-        * tests/Bug_2549_Regression/test.idl:
-
-          Compile only regression test for the above fix.
-
-Wed Jul 19 08:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_native/native_ch.cpp:
-          Add generation for CORBA::VoidData which is a native that is used
-          in the RTScheduling library.
-
-Tue Jul 18 21:38:55 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tao/IIOP_Acceptor.cpp:
-
-          substring() 2nd parameter is supposed to be the relative
-          length, not the absolute position as before.
-
-Tue Jul 18 14:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/HTIOP.mpc:
-          Simplified this file
-
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-          Regenerate the pidl file
-
-        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.{h,cpp}:
-          Removed from the repo
-
-Tue Jul 18 13:51:09 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/tests/CosEvent/Timeout/Timeout.mpc:
-          Added the "threads" base project to exclude this test from single-
-          threaded builds.
-
-Tue Jul 18 11:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/VarOut_T.inl:
-          Fixed bug 2595, when the _var is nil and the .out() is invoked
-          we have to allocate a new instance instead of deference a
-          nill pointer. This matches the latest CORBA C++ mapping, thanks
-          to Abdul Sowayan <abdullah dot sowayan at lmco dot com> for
-          reporting this bug
-
-Tue Jul 18 10:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2595_Regression/*
-          New regression for bug 2595, not fixed yet, makes it possible
-          to retest things on linux before we enable this test in
-          the regression suite
-
-Tue Jul 18 10:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1639_Regression/struct_client.cpp:
-        * tests/DynAny_Test/test_dynany.h:
-          Fixed compile errors with gcc4
-
-Tue Jul 18 10:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp:
-          Use true/false
-
-        * orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl:
-          Updated comments
-
-Tue Jul 18 09:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IIOP_Acceptor.cpp:
-          Const improvement
-
-Tue Jul 18 09:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/HTIOP.mpc:
-          Enabled regeneration of the pidl file
-
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl:
-          Updated comments
-
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.{h,cpp}:
-          Removed from the repo
-
-Tue Jul 18 09:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/QtTests/server.cpp:
-        * tests/FL_Cube/client.cpp:
-          Fixed include paths because resource factories got moved
-
-Tue Jul 18 08:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * orbsvcs/orbsvcs/Naming/Storable.h:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
-
-          Fix bugzilla 2600 - Naming Service Flat File Persistance with
-          Federated naming contexts.
-
-Mon Jul 17 18:35:32 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/Admin.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
-        * docs/tutorials/Quoter/RTCORBA/Common_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Common_i.h
-        * docs/tutorials/Quoter/RTCORBA/Distributor.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
-
-        * docs/tutorials/Quoter/RTCORBA/docs/broker.html
-        * docs/tutorials/Quoter/RTCORBA/docs/common.html
-        * docs/tutorials/Quoter/RTCORBA/docs/database.html
-        * docs/tutorials/Quoter/RTCORBA/docs/distributor.html
-        * docs/tutorials/Quoter/RTCORBA/docs/idl.html
-        * docs/tutorials/Quoter/RTCORBA/docs/run.html
-
-          Make some minor changes.
-
-Mon Jul 17 17:49:41 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * examples/POA/On_Demand_Loading/Servant_Manager.cpp:
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-        * orbsvcs/orbsvcs/AV/AV_Core.cpp:
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
-        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
-        * orbsvcs/ImplRepo_Service/utils.h:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp:
-        * tao/Strategies/DIOP_Acceptor.cpp:
-        * tao/Strategies/SHMIOP_Acceptor.cpp:
-        * tao/Strategies/UIOP_Acceptor.cpp:
-
-          Use new ACE_CString::size_type type to hold string
-          position/index value, instead of "int".  Addresses "comparison
-          between signed and unsigned" warnings.
-
-Mon Jul 17 14:46:26 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
-
-          Replaced deprecated call to ACE_SOCK_Dgram_Mcast::subscribe()
-          with ACE_SOCK_Dgram_Mcast::join(). Thanks to Johnny for pointing
-          this out.
-
-Mon Jul 17 14:40:43 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
-
-          The memset of the discriminator was redundant as it is assigned
-          directly after the memset of the union data.
-
-        * tao/CDR.h:
-        * tao/CDR.cpp:
-
-          Added a constructor that takes an ACE_Data_Block* which can be
-          used to avoid an allocation while constructing the
-          ACE_Message_Block held by the ACE_OutputCDR. [RT 8372]
-
-        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h:
-        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
-
-          Use the new inline TAO_ServerRequest constructor.  This avoids
-          having to allocate a costly dummy input and output cdr.
-
-          Avoid using ACE_CString for the operation name which will avoid
-          memory allocations when it isn't necessary.  Most of the time, the
-          operation name can be shared from the operation_details_ object.
-
-          When the type of TAO_Tagged_Profile::type_id_ changed in the
-          previous commit, the cloning needed to take that into account.
-          [RT 8372]
-
-          When cloning the operation details, allocate an input cdr with a
-          "large" message block that will be shared by the output cdr as
-          the marshaling of the arguments is done.  This allows us to
-          avoid the copying of the data block, in most situations, from the
-          output cdr into the input cdr as was done in the previous version.
-          [RT 8372]
-
-        * tao/CSD_ThreadPool.mpc:
-
-          Added a requires for threads as this project shouldn't be built if
-          thread support is not going to be built into TAO.
-
-        * tao/Client_Strategy_Factory.h:
-        * tao/Client_Strategy_Factory.cpp:
-        * tao/Configurable_Refcount.h:
-        * tao/Configurable_Refcount.inl:
-        * tao/Configurable_Refcount.cpp:
-        * tao/Object.h:
-        * tao/Object.i:
-        * tao/Object.cpp:
-        * tao/Profile.h:
-        * tao/Profile.cpp:
-        * tao/Resource_Factory.h:
-        * tao/Resource_Factory.cpp:
-        * tao/default_client.h:
-        * tao/default_client.cpp:
-        * tao/default_resource.h:
-        * tao/tao.mpc:
-
-          The TAO_Configurable_Refcount can be used as an ACE_Atomic_Op with
-          either a null mutex or a thread mutex.  Those classes that use it
-          used to use either a null mutex or a thread mutex and an integer
-          based reference count.
-
-        * tao/GIOP_Message_Base.cpp:
-
-          When processing a request, a character buffer is allocated on the
-          stack.  Previously, it was passed as a parameter to the
-          TAO_OutputCDR and an ACE_Data_Block was heap allocated during the
-          construction of the ACE_Message_Block held by the ACE_OutputCDR.
-
-          Now, the ACE_Data_Block is constructed on the stack as well and
-          passed in during the construction of the ACE_Message_Block to
-          avoid heap allocations altogether. [RT 8372]
-
-        * tao/GIOP_Message_Lite.cpp:
-        * tao/Incoming_Message_Queue.h:
-        * tao/Incoming_Message_Queue.cpp:
-
-          Factored various forms of creating a TAO_Queued_Data (with and
-          without an ACE_Message_Block) into a single method.  Doing this
-          allows us to avoid extra manipulations of the reference count in
-          the ACE_Data_Block involved.
-
-        * tao/Environment.i:
-        * tao/Leader_Follower.cpp:
-        * tao/TAO_Singleton_Manager.cpp:
-        * tao/Var_Size_Argument_T.cpp:
-        * tao/default_resource.cpp:
-        * tao/IORTable/Table_Adapter.cpp:
-        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
-        * tao/RTCORBA/Thread_Pool.cpp:
-
-          Replace many instances of the use of a bare 'new' with the
-          equivalent ACE_NEW or ACE_NEW_RETURN macro. [RT 8372]
-
-        * tao/LocalObject.h:
-        * tao/Principal.h:
-        * tao/Stub.h:
-        * tao/Stub.cpp:
-        * tao/AnyTypeCode/Any_Impl.h:
-        * tao/AnyTypeCode/NVList.h:
-        * tao/Messaging/AMH_Response_Handler.cpp:
-        * tao/Valuetype/ValueBase.h:
-
-          Use unsigned long instead of CORBA::ULong to be able to take
-          advantage of the ACE_Atomic_Op<> template specialization.
-          CORBA::ULong doesn't necessarily equate to unsigned long.
-
-        * tao/ORB.h:
-        * tao/ORB.i:
-        * tao/ORB.cpp:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-
-          Switch from using a thread mutex and CORBA::ULong to an
-          ACE_Atomic_Op<> with a thread mutex and unsigned long.  When the
-          assembler based specialization of ACE_Atomic_Op<> is used, there
-          is a performance benefit.
-
-        * tao/PortableServer/POA_Current_Impl.h:
-        * tao/PortableServer/POA_Current_Impl.inl:
-        * tao/PortableServer/POA_Current_Impl.cpp:
-        * tao/PortableServer/Servant_Upcall.h:
-        * tao/PortableServer/Servant_Upcall.cpp:
-
-          Use an octet sequence array of a specific size (512 bytes by
-          default) when constructing the ObjectId.  This allows us to avoid
-          allocations during an upcall in most situations. [RT 8372]
-
-        * tao/PortableServer/Root_POA.cpp:
-
-          Begin the starting_at index at the TAO_OBJECTKEY_PREFIX_SIZE
-          instead of starting it at zero and then adding the value directly
-          after that.  This is probably immeasurable performance-wise.
-
-        * tao/TAO_Server_Request.h:
-        * tao/TAO_Server_Request.i:
-        * tao/TAO_Server_Request.cpp:
-
-          Avoid using ACE_CString for the operation name which will avoid
-          memory allocations when it isn't necessary.  Most of the time, the
-          operation name can be shared from the operation_details_ object.
-
-        * tao/Tagged_Profile.h:
-        * tao/Tagged_Profile.i:
-        * tao/Tagged_Profile.cpp:
-
-          Avoid using ACE_CString as the type_id_.  The type_id_ was never
-          used for anything more than a holder of a char* that it didn't
-          own, but incurred allocation penalties during construction.
-
-Mon Jul 17 14:26:08 UTC 2006  Ciju John  <john_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
-
-          Addendum to
-          Fri Jul 14 18:34:41 UTC 2006  john_c  <johnc@ociweb.com>
-
-          Previously the code created a connection, then made the socket
-          non-blocking. This change first make the socket
-          non-blocking then initiates the connection. Previous code left a
-          small window, which I think was causing a hangup in certain
-          conditions.
-
-Mon Jul 17 13:15:58 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/examples/ORT/client.cpp:
-
-          Modified this code to correctly utilize the exception macros.  It
-          was using ACE_TRY_ENV as a parameter to CORBA::ORB_init().
-
-Mon Jul 17 12:55:48 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/tests/Event/Mcast/Complex/consumer.cpp:
-
-          Modified this code to correctly utilize the exception macros.  It
-          was using ACE_TRY_ENV as a parameter to CORBA::ORB_init().
-
-Mon Jul 18 11:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies.mpc:
-          Enabled regeneration of the pidl files
-
-        * tao/Strategies/sciop_endpoints.pidl:
-        * tao/Strategies/uiop_endpoints.pidl:
-          Updated comments block to resolve warnings during recompilation
-
-        * tao/Strategies/uiop_endpointsC.{h,cpp}:
-        * tao/Strategies/sciop_endpointsC.{h,cpp}:
-          Removed from the repo
-
-Mon Jul 18 11:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Valuetype/ValueBase.{h,cpp}:
-          Removed typecode for ValueModifier, it is also in the AnyTypeCode
-          library but it seems that in the handcrafted code the export
-          of this typecode was gone, now we regenate things automatically
-          some linkers complain about the duplicate symbols
-
-Mon Jul 18 10:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicAny/*.cpp:
-          Reordered includes and added missing includes to fix compile
-          errors with gcc
-
-Mon Jul 17 09:50:45 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp:
-          Eliminate warning with String_var usage on GCC 2.96.
-
-Mon Jul 18 07:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IFR_Client.mpc:
-          Removed -Sorb, gives problems for users of this lib
-
-Sun Jul 17 06:49:21 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tao/PortableServer/Servant_var.inl (_retn):
-
-          Removed extraneous "this" pointer usage on local variable.
-
-Mon Jul 17 00:20:29 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-          Added news entry re Bug 2593.
-
-Sun Jul 16 23:28:27 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
-
-          Change method signatures to pass ACE_Time_Value by const-reference.
-
-Sat Jul 15 22:08:58 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/Admin.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
-        * docs/tutorials/Quoter/RTCORBA/Common_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Common_i.h
-        * docs/tutorials/Quoter/RTCORBA/Distributor.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
-        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
-
-        * docs/tutorials/Quoter/RTCORBA/docs/broker.html
-        * docs/tutorials/Quoter/RTCORBA/docs/common.html
-        * docs/tutorials/Quoter/RTCORBA/docs/database.html
-        * docs/tutorials/Quoter/RTCORBA/docs/distributor.html
-        * docs/tutorials/Quoter/RTCORBA/docs/index.html
-        * docs/tutorials/Quoter/RTCORBA/docs/mpc.html
-
-          Modify these files based on the suggestions of William R. Otte.
-
-Sat Jul 15 12:25:11 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Bug_1393_Regression/client.cpp:
-        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp:
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp:
-        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp:
-        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h:
-        * orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h:
-          Added needed include
-
-Sat Jul 15 05:07:11 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/index.html
-
-          Added a link to the RTCORBA tutorial.
-
-        * docs/tutorials/Quoter/RTCORBA/Broker.idl
-        * docs/tutorials/Quoter/RTCORBA/Common.idl
-        * docs/tutorials/Quoter/RTCORBA/Distributor.idl
-
-          Corrected IDL files which had been corrupted by overzealous
-          removal of DOS style line endings.
-
-Sat Jul 15 00:47:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/IDL_Test.mpc:
-          Disabled the regression for bug 2582, I tested it weeks ago and
-          it worked, but now it fails when I added the test
-
-Sat Jul 15 00:42:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/tao.mpc:
-          Fixed casing of include
-
-Fri Jul 14 23:44:45 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tao/Utils/Servant_Var.h:
-
-          Removed "#warning" preprocess directive.  It's not portable.
-          Thanks to Jeff for pointing this out.
-
-Fri Jul 14 23:42:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-          When generating a pidl file change the guard we generate in the
-          header file. Fixes problems with TimeBase.pidl and TimeBase.idl
-          which both exist.
-
-Fri Jul 14 21:43:55 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Acceptor.cpp (parse_address):
-          Reverted change at Johnny's request. See bug 2599 for a
-          discussion of the reason why.
-
-Fri Jul 14 21:43:58 UTC 2006  john_c  <johnc@ociweb.com>
-
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc:
-        * tests/Optimized_Connection/oc_client.cpp:
-
-          Minor fixes to make Fuzz builds happy.
-
-Fri Jul 14 21:42:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/BooleanSeqA.*
-        * tao/AnyTypeCode/CharSeqA.*
-        * tao/AnyTypeCode/CONV_FRAMEA.*
-        * tao/AnyTypeCode/CurrentA.*
-        * tao/AnyTypeCode/DoubleSeqA.*
-        * tao/AnyTypeCode/FloatSeqA.*
-        * tao/AnyTypeCode/GIOPA.*
-        * tao/AnyTypeCode/IIOP_EndpointsA.*
-        * tao/AnyTypeCode/IIOPA.*
-        * tao/AnyTypeCode/IOP_IORA.*
-        * tao/AnyTypeCode/IOPA.*
-        * tao/AnyTypeCode/LongDoubleSeqA.*
-        * tao/AnyTypeCode/LongLongSeqA.*
-        * tao/AnyTypeCode/LongSeqA.*
-        * tao/AnyTypeCode/Messaging_PolicyValueA.*
-        * tao/AnyTypeCode/Messaging_SyncScopeA.*
-        * tao/AnyTypeCode/ObjectIdListA.*
-        * tao/AnyTypeCode/orb_typesA.*
-        * tao/AnyTypeCode/ParameterModeA.*
-        * tao/AnyTypeCode/PI_ForwardA.*
-        * tao/AnyTypeCode/Policy_ForwardA.*
-        * tao/AnyTypeCode/PortableInterceptorA.*
-        * tao/AnyTypeCode/ServicesA.*
-        * tao/AnyTypeCode/ShortSeqA.*
-        * tao/AnyTypeCode/TAOA.*
-        * tao/AnyTypeCode/TimeBaseA.*
-        * tao/AnyTypeCode/ULongLongSeqA.*
-        * tao/AnyTypeCode/ULongSeqA.*
-        * tao/AnyTypeCode/WCharSeqA.*
-        * tao/AnyTypeCode/WStringSeqA.*
-        * tao/BooleanSeqC.*
-        * tao/CharSeqC.*
-        * tao/CONV_FRAMEC.*
-        * tao/CurrentC.*
-        * tao/DoubleSeqC.*
-        * tao/FloatSeqC.*
-        * tao/GIOPC.*
-        * tao/IIOP_EndpointsC.*
-        * tao/IIOPC.*
-        * tao/IOP_IORC.*
-        * tao/IOPC.*
-        * tao/LongDoubleSeqC.*
-        * tao/LongLongSeqC.*
-        * tao/LongSeqC.*
-        * tao/Messaging_PolicyValueC.*
-        * tao/Messaging_SyncScopeC.*
-        * tao/ObjectIdListC.*
-        * tao/orb_typesC.*
-        * tao/ParameterModeC.*
-        * tao/PI_ForwardC.*
-        * tao/Policy_ForwardC.*
-        * tao/PortableInterceptorC.*
-        * tao/ServicesC.*
-        * tao/ShortSeqC.*
-        * tao/StringSeqC.*
-        * tao/TAOC.*
-        * tao/TimeBaseC.*
-        * tao/ULongLongSeqC.*
-        * tao/ULongSeqC.*
-        * tao/WCharSeqC.*
-        * tao/WStringSeqC.*
-          Removed from the repo, all regenerated as part of the build
-
-        * tao/tao.mpc:
-          Enabled regeneration for a lot of pidl files
-
-        * tao/DynamicAny/diffs/DynamicAny.diff:
-          Removed, not needed anymore
-
-Fri Jul 14 21:10:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicAny.mpc:
-          Enabled regeneration of the pidl files
-
-        * tao/DynamicAny/DynamicAnyC.{h,cpp}:
-          Removed from the repo, will get regenerated automatically
-
-        * tao/*Resource*.*:
-          Moved the different resources files (Qt,Fl,Tk, and Xt) to
-          subdirectories so that in TAO/tao we only have the tao lib
-          core
-
-Fri Jul 14 21:15:32 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * TAO_IDL/ast/ast_decl.cpp (version):
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
-        * tao/Acceptor_Registry.cpp:
-        * tao/CORBANAME_Parser.cpp:
-        * tao/IIOP_Acceptor.cpp:
-        * tao/IIOP_Endpoint.cpp:
-        * tao/IIOP_Profile.cpp:
-        * tao/Transport_Connector.cpp:
-        * tao/params.cpp:
-        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
-        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
-
-          ACE string class  operations now consistently return and accept an
-          unsigned index/position value instead of a mix of signed and
-          unsigned return index types.  Use the "size_type" typedef
-          instead of int or ssize_t, and the "npos" constant instead of
-          "-1".
-
-        * TAO_IDL/fe/fe_init.cpp:
-
-          Use ACE_CString::npos instead of ACE_String_Base_Const::npos.
-          The latter is not meant for use outside of ACE.
-
-        * orbsvcs/Trading_Service/Trading_Service.h:
-        * orbsvcs/orbsvcs/Shutdown_Utilities.h:
-
-          Include "ace/Sig_Handler.h" to pull in ACE_Sig_Handler class
-          declaration.
-
-        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h:
-
-          Moved TAO_Notify_ProxySupplier forward declaration within the
-          TAO versioned namespace.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
-          (accept_svc_handler):
-
-          Ensure that errno is preserved in case the svc_handler close()
-          method resets it.
-
-        * orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc:
-
-          Removed "naming" MPC base project from "CosEvent Test Lib"
-          project.  That test library does not depending on the Naming
-          Service.
-
-        * tao/GIOP_Message_Base.cpp:
-
-          Cosmetic changes.
-
-        * tao/ORB_Core.cpp:
-
-          Access ORB table lock using the new lock accessor rather than
-          directly using the lock member because of a (now removed) friend
-          declaration.  Folks, stop being lazy. :)
-
-        * tao/ORB_Table.h:
-        * tao/ORB_Table.inl:
-
-          The ORB table now has no friends, nor should it!  HP aCC 3.63
-          was confused by the global scope qualifier in the friend
-          declaration, due to broken namespace scoping support.
-
-          Added a public lock accessor method.
-
-        * tao/Policy_Manager.h (TAO_Policy_Manager, operator=):
-
-          Added private and unimplemented copy constructor and assignment
-          operator.  TAO_Policy_Manager should not be copied.
-
-        * tao/PortableServer.mpc (Template_Files):
-
-          Explicitly list template files since the Servant_var.* template
-          sources will otherwise not be considered template sources.
-
-        * tao/AnyTypeCode/Any_Array_Impl_T.cpp (marshal_value, value):
-        * tao/AnyTypeCode/Any_Array_Impl_T.inl:
-        * tao/AnyTypeCode/Any_Basic_Impl_T.cpp:
-        * tao/AnyTypeCode/Any_Basic_Impl_T.inl:
-        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
-        * tao/AnyTypeCode/Any_Dual_Impl_T.inl:
-        * tao/AnyTypeCode/Any_Impl_T.cpp:
-        * tao/AnyTypeCode/Any_Impl_T.inl:
-        * tao/AnyTypeCode/Any_Special_Impl_T.cpp:
-        * tao/AnyTypeCode/Any_Special_Impl_T.inl:
-
-          Moved inline virtual methods out of line.  Virtual methods
-          generally should not be inlined.  Addresses potential RTTI
-          problems with g++ 4.x.
-
-        * tao/PortableServer/Object_Adapter.cpp
-          (wait_for_non_servant_upcalls_to_complete):
-
-          Removed explicit use of CORBA::Environment in native C++
-          exception builds.  It isn't needed.
-
-          (dispatch, get_collocated_servant):
-
-          Prevent potential buffer overread.  (From Andrew Schnable)
-
-        * tao/PortableServer/Object_Adapter.h
-          (wait_for_non_servant_upcalls_to_complete):
-
-          Removed explicit use of CORBA::Environment in native C++
-          exception builds.  It isn't needed.
-
-        * tao/PortableServer/PS_ForwardC.h:
-
-          PortableServer::ServantBase_var is now a specialization of the
-          new (standard) PortableServer::Servant_var<> class template.
-
-        * tao/PortableServer/Servant_Base.cpp:
-        * tao/PortableServer/Servant_Base.h:
-        * tao/PortableServer/Servant_Base.i:
-
-          Removed TAO_ServantBase_var class.  It's functionality is now
-          provided by the PortableServer::Servant_var<> class template.
-
-        * tao/PortableServer/Servant_Upcall.cpp (upcall_cleanup):
-
-          Renamed wait_for_non_servant_upcall_to_complete() method
-          call to the name (..._to_complete_no_throw()).
-
-        * tao/PortableServer/Servant_var.cpp:
-        * tao/PortableServer/Servant_var.h:
-        * tao/PortableServer/Servant_var.inl:
-
-          Implementation of the standard PortableServer::Servant_var<>
-          class template.
-
-        * tao/Utils/Servant_Var.h:
-
-          Marked TAO::Utils::Servant_var<> class template as deprecated.
-          Use standard PortableServer::Servant_var class template
-          instead.
-
-        * utils/catior/catior.cpp (catior):
-
-          Fixed crash due to buffer overrun.  The message block write
-          pointer should be set to the end of the message block, not twice
-          the length of message block.  Thanks to Sriram Chandramouli
-          <sriram_chandramouli at symantec dot com> for pointing out this
-          problem.
-
-Fri Jul 14 21:10:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicAny.mpc:
-          Enabled regeneration of the pidl files
-
-        * tao/DynamicAny/DynamicAnyC.{h,cpp}:
-          Removed from the repo, will get regenerated automatically
-
-        * tao/*Resource*.*:
-          Moved the different resources files (Qt,Fl,Tk, and Xt) to
-          subdirectories so that in TAO/tao we only have the tao lib
-          core
-
-Fri Jul 14 21:03:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/IDL_Test.mpc:
-          This fix closes [BUGID:2582]. Thanks to Heesuk Shin
-          <heesuks@econz.com> for reporting the bug.
-          Also fixes bug 2583.
-
-Fri Jul 14 20:50:30 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_decl.cpp:
-        * TAO_IDL/ast/ast_typedef.cpp:
-        * TAO_IDL/include/ast_decl.h:
-        * TAO_IDL/include/ast_typedef.h:
-
-          Fixed bug in the recursive check for local type
-          containment that was causing CDR operators to
-          get generated for types that contain a local
-          interface at some level of nesting. This fix
-          closes [BUGID:2583].
-
-Fri Jul 14 20:38:07 UTC 2006  john_c  <johnc@ociweb.com>
-
-        * tests/AlternateIIOP/run_test.pl:
-
-          Split a long string.
-
-        * tests/Optimized_Connection/Optimized_Connection.mpc:
-        * tests/Optimized_Connection/README:
-        * tests/Optimized_Connection/oc.ior:
-        * tests/Optimized_Connection/oc_client.cpp:
-        * tests/Optimized_Connection/oc_svc.conf:
-        * tests/Optimized_Connection/run_test.pl:
-
-          Created new test to test the Optimized_Connection Selector.
-
-        * tests/AlternateIIOP/svc.conf:
-
-          Removed this file. This test shouldn't be testing the Optimized
-          Connection Selector.
-
-Fri Jul 14 19:20:34 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/RTCORBA/Admin.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker.idl
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Broker_i.h
-        * docs/tutorials/Quoter/RTCORBA/Common.idl
-        * docs/tutorials/Quoter/RTCORBA/Common_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Common_i.h
-        * docs/tutorials/Quoter/RTCORBA/Distributor.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor.idl
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
-        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h
-        * docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp
-        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h
-        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
-        * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
-        * docs/tutorials/Quoter/RTCORBA/docs/broker.html
-        * docs/tutorials/Quoter/RTCORBA/docs/common.html
-        * docs/tutorials/Quoter/RTCORBA/docs/database.html
-        * docs/tutorials/Quoter/RTCORBA/docs/distributor.html
-        * docs/tutorials/Quoter/RTCORBA/docs/idl.html
-        * docs/tutorials/Quoter/RTCORBA/docs/index.html
-        * docs/tutorials/Quoter/RTCORBA/docs/mpc.html
-        * docs/tutorials/Quoter/RTCORBA/docs/prioritymapping.html
-        * docs/tutorials/Quoter/RTCORBA/docs/run.html
-
-          A RTCORBA tutorial based on the Quoter by Shanshan Jiang.
-
-Fri Jul 14 18:34:41 UTC 2006  john_c  <johnc@ociweb.com>
-
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
-
-          Set handle options after a proper handle has been assigned. This
-          was causing a race condition at a client location. We couldn't
-          reproduce the problem, but the change is valid.
-
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf:
-
-          Adding a test to traverse the changed code path.
-
-Fri Jul 14 17:00:49 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp:
-
-          Fixed a bug in create_object() that uses an incorrect index
-          to access the policy in the policy list.
-
-Fri Jul 14 16:01:38 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * tests/Bug_2494_Regression/client.cpp:
-        * tests/Bug_2494_Regression/run_test.pl:
-
-        Eliminate false failures of this test due to the client process
-        printing the exception or exiting with a non-zero status.
-
-Fri Jul 14 15:11:11 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
-
-        Added two new options to the CEC_Default_Factory,
-        -CECConsumerOperationTimeout and -CECSupplierOperationTimeout.
-        These options apply relative roundtrip timeout policies for consumer
-        and supplier objects.  This allows users to minimize the ill effects of
-        unresponsive consumer and supplier operations (i.e. push() or pull()).
-        See bugzilla #2594 and docs/cec_options.html.
-        Also, exposed the "disconnect_callbacks" event channel attribute
-        as the "-b" option to the CosEvent_Service executable.
-
-        * NEWS
-        * docs/cec_options.html:
-
-        Documented the Timeout feature described above.
-
-        * orbsvcs/tests/CosEvent/Timeout/README:
-        * orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h:
-        * orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp:
-        * orbsvcs/tests/CosEvent/Timeout/Timeout.mpc:
-        * orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp:
-        * orbsvcs/tests/CosEvent/Timeout/cosevent.conf:
-        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
-
-        Functional test for the Timeout feature described above.
-
-Fri Jul 14 02:02:55 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Acceptor.cpp:
-          Fix for parsing IPv6 endpoints not using the enclosing []. An
-          address such as fe80::a0f2:2510:7549:12345 is a legitemate IPv6
-          address but would be misinterpreted.
-
-        * tao/Profile.cpp:
-        * tests/Bug_2593_Regression/Bug_2593_Regression.mpc:
-        * tests/Bug_2593_Regression/Hello.h:
-        * tests/Bug_2593_Regression/Hello.cpp:
-        * tests/Bug_2593_Regression/README:
-        * tests/Bug_2593_Regression/Test.idl:
-        * tests/Bug_2593_Regression/client.cpp:
-        * tests/Bug_2593_Regression/run_test.pl:
-        * tests/Bug_2593_Regression/server.conf:
-        * tests/Bug_2593_Regression/server.cpp:
-          A fix and a new regression test for bug 2593. Thanks to Jules
-          Colding, <colding at omesc dot com> for finding this.
-
-Thu Jul 13 10:26:42 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tao/EndpointPolicy/EndpointPolicyTypeA.h:
-        * tao/EndpointPolicy/Endpoint_Value_Impl.cpp:
-
-          Added missing versioned namespace macros.
-
-Thu Jul 12 18:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ObjRefTemplate.mpc:
-          Added versioning base project
-
-Wed Jul 12 18:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORManipulation.mpc:
-          Enabled regeneration of pidl files
-
-        * tao/IORManipulation/IORA.h:
-          Temporarily new file to keep other A.h files happy
-
-        * tao/IORManipulation/IORC.{h,cpp}:
-        * tao/IORManipulation/IORA.cpp:
-          Removed from the repo
-
-Wed Jul 12 10:25:12 UTC 2006  Martin Corino <mcorino@remedy.nl>
-
-        * tests/CollocationLockup/CollocationLockup.cpp:
-        * tests/CollocationLockup/run_test.pl:
-          Added some customization to have this test run correctly on OpenVMS.
-
-        * tests/Object_Loader/Loader.cpp:
-        * tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp:
-          Removed deprecated OpenVMS specific include.
-
-Tue Jul 11 12:12:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BiDir_GIOP/diffs/BiDirPolicy.diff:
-        * tao/CodecFactory/diff/IOP_Codec.diff:
-        * tao/IORInterceptor/diff/IORInterceptor.diff:
-        * tao/IORTable/diff/IORTable.diff:
-        * tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff:
-        * tao/RTPortableServer/diffs/RTPortableServer.diff:
-          Removed, not needed anymore
-
-        * tao/RTPortableServer.mpc:
-          Enabed regeneration of the pidl files
-
-        * tao/RTPortableServer/RTPortableServerA.cpp:
-        * tao/RTPortableServer/RTPortableServerC.cpp:
-        * tao/RTPortableServer/RTPortableServerC.h:
-        * tao/RTPortableServer/RTPortableServerS.h:
-          Removed from the repo
-
-Tue Jul 11 12:07:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode.mpc:
-          Enabled regeneration of the pidl files
-
-        * tao/AnyTypeCode/TypeCode.h:
-          Added include that was first pulled in indirectly
-
-        * tao/AnyTypeCode/AnySeqA.cpp
-        * tao/AnyTypeCode/AnySeqA.h
-        * tao/AnyTypeCode/AnySeqC.cpp
-        * tao/AnyTypeCode/AnySeqC.h
-        * tao/AnyTypeCode/AnySeqS.h
-        * tao/AnyTypeCode/BoundsA.cpp
-        * tao/AnyTypeCode/BoundsA.h
-        * tao/AnyTypeCode/BoundsC.cpp
-        * tao/AnyTypeCode/BoundsC.h
-        * tao/AnyTypeCode/Dynamic_ParameterA.cpp
-        * tao/AnyTypeCode/Dynamic_ParameterA.h
-        * tao/AnyTypeCode/Dynamic_ParameterC.cpp
-        * tao/AnyTypeCode/Dynamic_ParameterC.h
-        * tao/AnyTypeCode/ValueModifierA.cpp
-        * tao/AnyTypeCode/ValueModifierA.h
-        * tao/AnyTypeCode/ValueModifierC.cpp
-        * tao/AnyTypeCode/ValueModifierC.h
-        * tao/AnyTypeCode/ValueModifierS.h
-        * tao/AnyTypeCode/VisibilityA.cpp
-        * tao/AnyTypeCode/VisibilityA.h
-        * tao/AnyTypeCode/VisibilityC.cpp
-        * tao/AnyTypeCode/VisibilityC.h
-        * tao/AnyTypeCode/VisibilityS.h
-          Removed from the repository, regenerated now automatically
-
-Tue Jul 11 11:59:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Object_Adapter.cpp:
-          Fix for CORBA/e
-
-Tue Jul 11 11:08:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BiDir_GIOP.mpc:
-          Fixed casing of include
-
-Tue Jul 11 08:30:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * utils/nslist/nslist.cpp:
-        * utils/nslist/run_test.pl:
-          Fix bugzilla 2592.
-
-Tue Jul 11 08:10:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
-          Fix bugzilla 2591.
-
-Tue Jul 11 01:43:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/Bug_2582_Regression.idl:
-        * tests/IDL_Test/Bug_2583_Regression.idl:
-          New tests for TAO_IDL, mpc file will be committed when the latest
-          change from Jeff is in the archive
-
-Tue Jul 11 01:40:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/TAO_Singleton_Manager.cpp:
-          Initialise pointer with 0
-
-Tue Jul 11 01:20:01 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be/be_global.cpp:
-        * docs/compiler.html:
-        * TAO_IDL/be/be_codegen.cpp:
-          Added support for -Wb,include_guard= and -Wb,safe_include=.
-          The include guard is a define that is generated in the C.h file
-          that prevents the user from including this generated file, the
-          safe_include is the file that the user should include instead
-          of the C.h and which is also used in the generated A.cpp and
-          C.cpp. With these new options a lot of generated files can be
-          removed also from the repository
-
-        * tao/RTCORBA/RT_Transport_Descriptor.cpp:
-        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
-        * tao/Valuetype/ValueBase.cpp:
-          Bool and const changes
-
-        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
-        * tao/PI_Server/PortableServer_PolicyFactory.cpp:
-        * tao/PortableServer/Root_POA.cpp:
-        * tao/PortableServer/Object_Adapter.cpp:
-          Fixes for CORBA/e
-
-        * tao/CodecFactory.mpc:
-        * tao/BiDir_GIOP.mpc:
-        * tao/IORInterceptor.mpc:
-        * tao/IORTable.mpc:
-        * tao/ObjRefTemplate.mpc:
-          Enabled regeneration of the pidl files
-
-        * tao/CodecFactory/IOP_CodecC.{h,cpp}:
-        * tao/CodecFactory/IOP_CodecS.h:
-        * tao/BiDir_GIOP/BiDirPolicyC.{h,cpp}:
-        * tao/IORInterceptor/IORInfoC.{h,cpp}:
-        * tao/IORInterceptor/IORInterceptorC.{h,cpp}:
-        * tao/IORTable/IORTableC.{h,cpp}:
-        * tao/ObjRefTemplate/Default_ORTC.{h,cpp,inl}:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.{h,cpp,inl}:
-          Removed from the repo, will get regenerated as part of the
-          building of the core lib.
-
-        * tao/BiDir_GIOP/BiDirPolicy.pidl:
-        * tao/IIOP_Endpoints.pidl:
-          Updated comments to resolve warnings during recompilation
-
-Sun Jul 09 05:56:55 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO version 1.5.2 released.
-
-Tue Jul  3 07:51:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
-          Fixed missing 'const' in argument declaration.
-
-Mon Jul  3 15:05:55 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_typedef.cpp:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be_include/be_typedef.h:
-
-          Changed logic of how the seen_in_operation_ flag is handled
-          and how the arg traits visitor works for typedefs. There
-          was an interaction between a typedef valuetype member
-          and the use of the base type in an interface operation.
-          This fix closes [BUGID:2577]. Thanks to Heesuk Shin
-          <heesuks@econz.com> for reporting the bug.
-
-        * tests/IDL_Test/Bug_2577_Regression.idl:
-
-          Removed the preprocessor condition around the line that
-          reproduces the bug, and added a comment.
-
-Mon Jul  3 14:29:07 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/OBV/Any/client.cpp:
-          Guard against running the test using Any::to_value() with a
-          streamed any when compiled with optimized valuetype marshaling
-          as this test case still fails. See the verbose comment in the
-          source for details.
-
-Mon Jul  3 14:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/EndpointPolicy/EndpointPolicyTypeC.h:
-          Fixed versioning macros
-
-Mon Jul  3 14:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-          Fixed versioning macros
-
-Mon Jul  3 13:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/ast/ast_decl.cpp:
-          Const improvements
-
-        * TAO_IDL/fe/fe_init.cpp:
-        * TAO_IDL/util/utl_stack.cpp:
-          Initialise pointer with 0
-
-Mon Jul  3 11:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ORBInitInfoA.h:
-          Added this file, needed because other files can include the
-          pidl file and this file isn't generated by the idl compiler
-          because we don't use -GA when regenerating the pidl file
-
-Mon Jul  3 11:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
-          Temporarily disabled the array sequence ut, the mock_array
-          isn't updated after all array refactoring and this needs
-          more time then we have for the upcoming beta
-
-Mon Jul  3 10:59:59 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/OBV/Any/OBV_Any.mpc:
-        * tests/OBV/Any/client.cpp:
-
-        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
-        * tests/OBV/Truncatable/TruncatableS_impl.cpp:
-        * tests/OBV/Truncatable/client.cpp:
-
-          Bug 2576 turned out to be invalid. There is already a mechanism
-          present to address the problem I raised. I've updated the tests
-          to work with the correct value extraction methods.
-
-Mon Jul  3 12:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/Bug_2577_Regression.idl:
-        * tests/IDL_Test/IDL_Test.mpc:
-          Added regression for bug 2577, this is not fixed yet, but I had
-          this in my workspace, so commit the test for others. The
-          file should be changed to reproduce the bug. Thanks to
-          Heesuk Shin <heesuks at econz dot com> for delivering this test
-          case.
-
-Mon Jul  3 10:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ORBInitializer.pidl:
-          Added workaround for bug 2569 to get the solaris/icc builds
-          running again.
-
-        * tests/IDL_Test/typeprefix.idl:
-          Comment part of this test case to get the builds running again
-
-Mon Jul  3 09:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-        * TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
-          Fixed versioning macros generation
-
-Mon Jul  3 00:54:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/AnyTypeCode/skip.cpp:
-        * tao/Valuetype/Valuetype_Adapter_Impl.h:
-        * tao/Valuetype/Valuetype_Adapter_Impl.cpp:
-        * tao/Valuetype_Adapter.h:
-          Reworked the new interfaces added to the valuetype adapter to be
-          a little more logical, and added one for detecting chunking.
-          Skipping the chunks turns out to be really easy, the chunk start
-          is the length in bytes to skip. Skip that length, then get the
-          chunk end tag, which is the negated length. If the chunk start
-          value is negative, that indicates the end of a nesting level, so
-          this process is repeated until a nesting level of -1 is reached,
-          indicating the end of the value.
-
-          This change enables truncatable values to be encapsulated in
-          anys.
-
-        * tao/Valuetype/ValueBase.cpp:
-          Reformatted a long comment
-
-        * tests/OBV/Any/Any.idl:
-        * tests/OBV/Any/AnyS_impl.h:
-        * tests/OBV/Any/AnyS_impl.cpp:
-        * tests/OBV/Any/OBV_Any.mpc:
-        * tests/OBV/Any/client.cpp:
-        * tests/OBV/Truncatable/Extra.idl:
-        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
-        * tests/OBV/Truncatable/Truncatable.idl:
-        * tests/OBV/Truncatable/TruncatableS_impl.h:
-        * tests/OBV/Truncatable/TruncatableS_impl.cpp:
-        * tests/OBV/Truncatable/client.cpp:
-
-          Adding the change for encapsulating truncatables gave rise to a
-          new bug, 2576. This bug illustrates that TAO does not properly
-          extract a valuetype to a base value pointer, even though the
-          base value type is carried as part of the Any's typeID
-          information. So as not to increase the number of failures on the
-          scoreboard at this time the test code illustrating this bug is
-          guarded by a #if defined (TAO_TEST_BUG_2576).
-
-Sat Jul  1 19:16:11 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-          Documented the TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING switch.
-
-Sat Jul  1 15:32:43 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/AnyTypeCode/skip.cpp:
-        * tao/Valuetype/Valuetype_Adapter_Impl.h:
-        * tao/Valuetype/Valuetype_Adapter_Impl.cpp:
-        * tao/Valuetype_Adapter.h:
-
-          Added an exclusion for Valuetypes marshaled with implied types.
-          Implicitly typed values are those for which the actual valuetype
-          matches the formal valuetype. For values inserted into an Any
-          this is always true as the Any separately marshals the typecode
-          making it redundant to do this again by the value itself.
-
-          TAO only marshals values this way when compiled to use optimized
-          valuetype marshaling which is not the default case since it
-          breaks backwards compatibility.
-
-          This resolves bug 2575.
-
-        * tao/TAO_Server_Request.h:
-
-          Fixed a typo in a comment.
-
-Sat Jul  1 12:16:20 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Valuetype/ValueBase.cpp:
-          Fixed spelling of TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING
-
-Fri Jun 30 13:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Profile.cpp (is_equivalent):
-          Use true/false for bool
-
-Fri Jun 30 10:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_module/module_ch.cpp:
-          Removed some versioning macro calls
-
-Thu Jun 29 14:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.{h,cpp}:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp:
-          Moved destroy_ec out of the destructor to a seperate method
-
-Thu Jun 29 10:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/include/utl_string.h:
-        * TAO_IDL/util/utl_string.cpp:
-          Changed compare_quiet to return a real bool.
-
-        * TAO_IDL/util/utl_identifier.cpp:
-          Const improvement
-
-Thu Jun 29 09:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Bounded_Array_Sequence_T.h:
-        * tao/Bounded_Sequence_CDR_T.h:
-        * tao/Unbounded_Array_Sequence_T.h:
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Moved (de)marshal_sequence methods from CDR file to the Array
-          file.
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-          Slightly reworked the way the any includes are generated. This
-          way the versioning macros are generated better in the A.cpp file.
-
-Thu Jun 29 08:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rules.tao.GNU:
-          Removed check for templates=explicit
-
-Thu Jun 29 01:45:29 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Wed Jun 28 15:23:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * docs/libraries.html:
-          Added text describing the new TAO_EndpointPolicy library.
-
-Wed Jun 28 13:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/typeprefix.idl:
-          New file with small example of IDL construct with typeprefix
-          that fails to compile when TAO_IDL is build with Intel C++
-          and Sun C++ at this moment. Changing the forward declared
-          interface B to a real interface makes it compiling, no idea
-          what happens and why this only fails with the mentioned
-          compilers
-
-        * tests/IDL_Test/IDL_Test.mpc:
-          Added new file
-
-Wed Jun 28 12:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * utils/nslist/nslist.cpp:
-          Fix overzellous VuWorks renaming of variables from last fix.
-
-Wed Jun 28 11:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/LoadBalancer/LoadManager.cpp:
-          When we can't register the signal handler, use ACE_ERROR_RETURN
-          so that it is visible from the test output why things fail.
-
-Wed Jun 28 09:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Valuetype/AbstractBase.cpp:
-          Use false instead of 0 for a bool
-
-Wed Jun 28 09:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Profile.h:
-          Removed commented out method
-
-        * tao/Profile.cpp:
-          Compilation fix for CORBA/e micro
-
-Wed Jun 28 09:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/tao.mpc:
-          Added base projects for corba/e and minimum corba
-
-Wed Jun 28 08:00:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * utils/nslist/nsadd.cpp:
-        * utils/nslist/nslist.cpp:
-          Fix minor compiler warnings. Anoying cut and paste
-          ; subsitution for a , in nsadd.cpp.
-
-Wed Jun 28 06:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * utils/catior/catior.mpc:
-          Removed not needed libpaths and added messaging as base project
-          so that we are sure we build this exe after messaging
-
-Tue Jun 27 19:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POAManager.pidl:
-          Added missing checks for minimum poa
-
-Tue Jun 27 19:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.{h,cpp}:
-        * examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp:
-        * examples/Content_Server/SMI_Iterator/Web_Server.idl:
-        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.{h,cpp}:
-        * examples/Content_Server/AMI_Iterator/Web_Server.idl:
-          Made the filesize a CORBA::ULongLong so that we could handle files
-          bigger then 2Gb, this also resolves some warnings we have on
-          windows
-
-Tue Jun 27 19:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI_Server.mpc:
-        * tao/PI_Server/ServerRequestInterceptor{A,C,S}.{h,cpp}:
-          Readded these generated files and removed the regeneration of these
-          files from the core libs. The generated files had a diff that I
-          missed this morning, need to resolve that handcrafting first
-
-Tue Jun 27 19:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/WCharSeqA.cpp:
-          Removed some versioning macros that don't seem correct, if this
-          solves the errors in the versioning builds I have to change the
-          IDL compiler for this.
-
-Tue Jun 27 18:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/XtResource.mpc:
-          And the last mpc file to get an empty IDL_Files section. Thanks to
-          Chad Elliot for noticing this last missing file
-
-Tue Jun 27 18:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Domain/DomainS.cpp:
-          Fixed compile error
-
-Tue Jun 27 18:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/FlResource.mpc:
-        * tao/QtResource.mpc:
-        * tao/TkResource.mpc:
-          Added empty IDL_Files section to prevent orb.idl to appear in these
-          projects when building for corba/e or minimum corba. Thanks to Chad
-          Elliot for bringing these files to my attention.
-
-Tue Jun 27 17:35:02 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/CSD_Framework.mpc:
-        * tao/EndpointPolicy.mpc:
-        * tao/ImR_Client.mpc:
-        * tao/Messaging.mpc:
-        * tao/PI.mpc:
-        * tao/PI_Server.mpc:
-        * tao/PortableServer.mpc:
-
-          Reverted the work-around for MPC where generated A.cpp files
-          needed to be added.  The bug in MPC has been fixed.
-
-Tue Jun 27 14:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Fixed_Array_SArgument_T.{h,cpp,inl}:
-          Fixed crashing of multdim array part of the param test
-
-Tue Jun 27 14:40:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * utils/nslist/nsadd.cpp:
-          Fix a resource leak.
-
-Tue Jun 27 12:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO-INSTALL.html:
-          Updated supported platforms
-
-Tue Jun 27 12:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/CSD_Framework.mpc:
-          Enabled recompilation for the pidl files of CSD_Framework
-
-        * tao/CSD_Framework/CSD_Framework.pidl:
-          Updated instructions, removed comments about the patch, not needed
-
-        * tao/CSD_Framework/CSD_Framework*.*:
-          Removed from the repo
-
-        * tao/CSD_Framework/diffs/CSD_Framework.diff:
-          Removed, not needed anymore
-
-Tue Jun 27 11:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI_Server.mpc:
-          Enabled recompilation for the pidl files of PI_Server
-
-        * tao/PI_Server/ServerRequestInterceptor*.*:
-        * tao/PI_Server/ServerRequestInfo*.*:
-          Removed from the repo
-
-Tue Jun 27 10:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI.mpc:
-          Enabled recompilation for the pidl files of PI
-
-        * tao/PI/ClientRequestInfo*.*:
-        * tao/PI/ClientRequestInterceptor*.*:
-        * tao/PI/Interceptor*.*:
-        * tao/PI/InvalidSlot*.*:
-        * tao/PI/ORBInitializer*.*:
-        * tao/PI/ORBInitInfo*.*:
-        * tao/PI/PICurrent*.*:
-        * tao/PI/PIForwardRequest*.*:
-        * tao/PI/ProcessingModePolicy*.*:
-        * tao/PI/RequestInfo*.*:
-          Removed from the repo
-
-Tue Jun 27 10:25:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-        * utils/nslist/nsadd.cpp:
-        * utils/nslist/nsdel.cpp:
-        * utils/nslist/nslist.cpp:
-          Enhanced the nslist utilities.
-
-Tue Jun 27 10:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Messaging.mpc:
-          Enabled recompilation for the pidl files of Messaging
-
-        * tao/Messaging/TAO_ExtC.*:
-        * tao/Messaging/TAO_ExtA.*:
-        * tao/Messaging/PollableC.*:
-        * tao/Messaging/PollableA.*:
-        * tao/Messaging/Messaging_SyncScope_PolicyC.*:
-        * tao/Messaging/Messaging_SyncScope_PolicyA.*:
-        * tao/Messaging/Messaging_RT_PolicyC.*:
-        * tao/Messaging/Messaging_RT_PolicyA.*:
-        * tao/Messaging/ExceptionHolderC.*:
-        * tao/Messaging/ExceptionHolderA.*:
-        * tao/Messaging/ExceptionHolderS.*:
-          Removed from the repo
-
-Tue Jun 27 09:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ImR_Client.mpc:
-          Enabled recompilation for the pidl files of ImR_Client
-
-        * tao/ImR_Client/ImplRepoS.*:
-        * tao/ImR_Client/ImplRepoA.cpp:
-        * tao/ImR_Client/ImplRepoC.*:
-        * tao/ImR_Client/ServerObjectA.*:
-        * tao/ImR_Client/ServerObjectC.*:
-        * tao/ImR_Client/ServerObjectS.*:
-          Removed from the repo, do get regenerated as part of the building
-          of the core libs
-
-        * tao/ImR_Client/ImplRepoA.h:
-          Dummy file that just includes ImplRepoC.h, using -GA for this file
-          doesn't work
-
-Tue Jun 27 09:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/BiDirectional/run_test.pl:
-          Use wait_interval_for_process_creation instead of hardcoded value
-
-        * tests/Hello/server.cpp:
-          Added newline after debug message
-
-        * tests/Stack_Recursion/server.cpp:
-          Initialise pointer with 0
-
-        * tests/Stack_Recursion/Sender.{h,cpp}:
-          Changed is_done to a real bool
-
-Tue Jun 27 08:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/PolicyS.cpp:
-          Forgot to patch this file
-
-Tue Jun 27 06:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/*.mpc:
-          Removed tao_versioning_idl_defaults as explicit base, this is coming
-          from taolib. Added empty IDL_Files section to all files that didn't
-          had one to prevent the compilation of orb.idl in the corba/e builds
-
-        * tao/IFR_Client/IFR_BaseC.*
-        * tao/IFR_Client/IFR_BasicC.*
-        * tao/IFR_Client/IFR_ComponentsC.*
-        * tao/IFR_Client/IFR_ExtendedC.*
-          Removed these files from the repo
-
-        * tao/IFR_Client.mpc:
-          Regenerate the pidl files as part of the build
-
-        * tao/Basic_Arguments.h:
-        * tao/Basic_Argument_T.{h,cpp.inl}:
-        * tao/BD_String_Argument_T.{h,cpp,inl}:
-        * tao/Fixed_Array_Argument_T.{h,cpp,inl}:
-        * tao/Fixed_Size_Argument_T.{h,cpp,inl}:
-        * tao/Object_Argument_T.{h,cpp,inl}:
-        * tao/Object.h:
-        * tao/Special_Basic_Argument_T.{h,cpp,inl}:
-        * tao/Special_Basic_Arguments.h:
-        * tao/UB_String_Argument_T.{h,cpp,inl}:
-        * tao/UB_String_Argument.h:
-        * tao/Var_Array_Argument_T.{h,cpp,inl}:
-        * tao/Var_Size_Argument_T.{h,cpp,inl}:
-        * tao/AnyTypeCode/Any_Arg_Traits.h:
-        * tao/AnyTypeCode/TypeCode.h:
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
-        * tao/PortableServer/Any_SArg_Traits.h:
-        * tao/PortableServer/Basic_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Basic_SArguments.h:
-        * tao/PortableServer/BD_String_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Fixed_Array_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Fixed_Size_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Object_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Object_SArg_Traits.h:
-        * tao/PortableServer/Var_Size_SArgument_T.{h,cpp,inl}:
-        * tao/Valuetype/ValueBase.h:
-        * tao/Valuetype/AbstractBase.h:
-        * tao/PortableServer/Special_Basic_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Special_Basic_SArgument.h:
-        * tao/PortableServer/TypeCode_SArg_Traits.h:
-        * tao/PortableServer/Var_Array_SArgument_T.{h,cpp,inl}:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-          Removed the introduction of template template arguments for any
-          insertion strategy. The HP aCC3 compiler doesn't support this at
-          all so it broke that support fully.
-
-Mon Jun 26 13:27:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-          Added PICurrent refactoring note.
-
-Sat Jun 24 22:13:38 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/Simple/Impl-Repo/index.html: Enhanced this
-          file so it explains how to run the Implementation Repository.
-          Thanks to Ben Creech <bpcreech at alumni dot ncsu dot edu> for
-          contributing the improvement.
-
-Mon Jun 26 09:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * tao/ServerRequestInterceptor_Adapter.h:
-        * tao/TAO_Server_Request.cpp:
-        * tao/TAO_Server_Request.h:
-        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
-        * tao/PI/ClientRequestInfo.cpp:
-        * tao/PI/ClientRequestInfo.h:
-        * tao/PI/PICurrent.h:
-        * tao/PI/PICurrent_Copy_Callback.cpp: (Deleted)
-        * tao/PI/PICurrent_Copy_Callback.h:   (Deleted)
-        * tao/PI/PICurrent_Impl.cpp:
-        * tao/PI/PICurrent_Impl.h:
-        * tao/PI/PICurrent_Impl.inl:
-        * tao/PI_Server/PICurrent_Guard.cpp:
-        * tao/PI_Server/PICurrent_Guard.h:
-        * tao/PI_Server/ServerInterceptorAdapter.cpp:
-        * tao/PI_Server/ServerInterceptorAdapter.h:
-
-          This refactors the PICurrent implimentaion and fixes issue 2552
-          (TAO358).
-
-Mon Jun 26 08:17:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tao/RTScheduling/RTScheduler_includeA.h:
-        * tao/RTScheduling/RTScheduler_includeC.h:
-          Changed include for RTSheduler,h to make it compatible for OpenVMS.
-
-        * tests/Bug_1020_Regression/server.cpp:
-        * tests/Bug_1361_Regression/shutdown.cpp:
-        * tests/Nested_Upcall_Crash/scavenger.cpp:
-        * tests/Object_Loader/Loader.cpp:
-        * tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp:
-          Small OpenVMS compatibility changes.
-
-Fri Jun 23 19:03:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Valuetype.mpc:
-        * tao/EndpointPolicy.mpc:
-        * tao/PortableServer.mpc:
-          Explicitly list the generated A.cpp in the source section because
-          MPC doesn't add them at this moment
-
-Fri Jun 23 18:39:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Valuetype.mpc:
-        * tao/EndpointPolicy.mpc:
-          Don't substract -Sa from the idlflags, it can be used for the
-          pidl files
-
-        * tao/PortableServer.mpc:
-          Handle ForwardRequest.pidl differently because of special
-          idlflags
-
-        * orbsvcs/IFR_Service/IFR_Service.mpc:
-          Fixed error in this file
-
-Fri Jun 23 13:42:54 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/IFR_Service/IFR_Service.mpc:
-
-          Added $(TAO_ROOT) to the 'includes' line of the IFR loader
-          executable project, because of a change in the way
-          TAO/Version.h is included.
-
-Fri Jun 23 07:36:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Fixed_Array_SArgument_T.h:
-          Fixed compile problem
-
-Thu Jun 22 15:27:04 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_1459/a.conf:
-          Fix the test by making it use UIOP rather than SSLIOP as the
-          alternative protocol. The original problem results from first
-          using SSLIOP in the non-default ORB which loads the SSL library,
-          which in turn registers with the ACE Object Manager. At shutdown
-          time, the SSL library is unloaded in order, but then the ACE
-          Object Manager tries to clean it up, but can't, because it is
-          already gone.
-
-Thu Jun 22 16:13:29 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/PortableServer/Fixed_Array_SArgument_T.cpp:
-        * tao/PortableServer/Fixed_Array_SArgument_T.h:
-        * tao/PortableServer/Fixed_Array_SArgument_T.inl:
-
-          Changed the member type of all classes except the out arg
-          class from array type to forany type. Almost every operation
-          in these classes was first converting the member to forany
-          type first, and there is no forany constructor directly from
-          array type. This new design is similar to the stub argument
-          classes for fixed arrays in TAO.
-
-Thu Jun 22 15:01:21 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
-
-          Added missing SSLIOP namespace qualifier to typedef inside
-          the SSLIOP_Credentials class.
-
-Thu Jun 22 14:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/BD_String_SArgument_T.cpp:
-          Fixed compile problems in Debian Core build
-
-Thu Jun 22 07:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Var_Array_SArgument_T.cpp:
-          Fixed compile problem
-
-Thu Jun 22 06:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/Any.{h,cpp,inl}:
-          Moved include of Object.h to the header file to resolve compile
-          problems with Borland in release mode when inlining is enabled
-
-Thu Jun 22 06:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BD_String_Argument_T.cpp:
-          Fixed bug in this file
-
-Wed Jun 21 20:46:09 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/Array_VarOut_T.h:
-
-          Added a typedef of FORANY in the TAO_FixedArray_Var_T<> and
-          TAO_VarArray_Var_T<> classes that just refer to the existing
-          typedef for FORANY in the common base class. Some compilers,
-          when parsing template code, will not look into a base class
-          unless they are forced to, so the base class typedef was not
-          seen when referenced in a derived class. Thanks to Will Otte
-          <wotte@dre.vanderbilt.edu> for figuring this out.
-
-Wed Jun 21 14:10:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/Array_VarOut_T.h:
-
-          Removed 'typename' qualifier in typedef of FORANY inside the
-          TAO_Array_Var_Base_T template class, since it was causing
-          problems on the FC4_CIAO_Core build.
-
-Wed Jun 21 13:50:57 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
-        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h:
-
-          Added typedefs _ptr_type, _var_type, and _out_type to
-          these "interface" classes, since the typedefs are now
-          required by the *_var and *_out template classes.
-
-Wed Jun 21 12:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
-        * tao/Array_Traits_T.h
-        * tao/Array_VarOut_T.cpp
-        * tao/Array_VarOut_T.h
-        * tao/Array_VarOut_T.inl
-        * tao/BD_String_Argument_T.cpp
-        * tao/Bounded_Array_Sequence_T.h
-        * tao/Bounded_Sequence_CDR_T.h
-        * tao/Fixed_Array_Argument_T.cpp
-        * tao/Unbounded_Array_Sequence_T.h
-        * tao/Unbounded_Sequence_CDR_T.h
-        * tao/Var_Array_Argument_T.cpp
-          Reworked array support, remove the traits struct I added and use the
-          forany class in most templates, this is how Jeff refactoring things
-          earlier this week, my approach just gave to much problems.
-
-Wed Jun 21 07:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BD_String_Argument_T.cpp:
-          Fixed compile problems by added a seperate typedef and use
-          this in the methods.
-
-Wed Jun 21 07:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/EndpointPolicy.mpc:
-        * tao/PortableServer.mpc:
-        * tao/TypeCodeFactory.mpc:
-        * tao/Valuetype.mpc:
-          Removed the <%quote%>, it did break on several platforms, just
-          don't add the quotes in the mpc file, the IDL compiler will
-          add quotes around the include string
-
-Wed Jun 21 02:02:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/Makefile.am:
-
-          Regenerated.
-
-        * TAO_IDL/tao_idl.mpc:
-
-          Changed automake specific include "$(srcdir)/.." to $(TAO_ROOT).
-          This is enough to trigger the MPC heuristic that this is a TAO
-          rather than ACE project.  No more hand edits!
-
-Tue Jun 20 20:58:35 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated with updated MPC automake.mpd.
-
-Tue Jun 20 18:17:04 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * TAO_IDL/tao_idl.cpp:
-        * TAO_IDL/tao_idl.mpc:
-          Changed include directive for "../tao/Version.h" to "tao/Version.h"
-          and added ".." and "$(srcdir)/.." to the list of include dirs in
-          tao_idl.mpc.
-          OpenVMS doesn't grok the "../tao/Version.h" when toa_idl.cpp is
-          compiled for the IFR project.
-
-        * TAO_IDL/driver/drv_preproc.cpp:
-        * TAO_IDL/util/utl_global.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-          Changes to circumvent OpenVMS differences regarding subprocesses,
-          redirection and file naming.
-
-        * TAO_IDL/be/be_helper.cpp:
-          Disabled ACE_OS::fflush () calls for OpenVMS as these slow down
-          things dramatically.
-
-Tue Jun 20 18:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
-          Fixed compile errors
-
-Tue Jun 20 17:21:42 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/EndpointPolicy.mpc:
-        * tao/PortableServer.mpc:
-        * tao/TypeCodeFactory.mpc:
-        * tao/Valuetype.mpc:
-
-          Replaced double quotes in these files with <%quote%>. Thanks
-          to Chad Elliott <elliott_c@ociweb.com> for providing
-          the fix that allowed the generated *.vcproj files to
-          load on MSVC 7.1.
-
-Tue Jun 20 15:28:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/Makefile.am:
-        * tao/Makefile.am:
-
-          Regenerated.
-
-        * tao/TypeCodeFactory.mpc:
-
-          Remove TypeCodeFactory subdirectory from PIDL_Files section,
-          as it's now listed in IDL_Files.
-
-Tue Jun 20 13:43:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Remove setting of servant retention policy when creating the new
-          POA because this policy is not available with Minimum CORBA.  We
-          were just being pedantic and setting it to the default value
-          (RETAIN) anyway.
-
-Tue Jun 20 13:35:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h:
-          Updated for all changes
-
-Tue Jun 20 12:41:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/BD_String_SArgument_T.cpp:
-          Fixed compilation problems with Borland
-
-Tue Jun 20 12:29:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Options.html:
-          Document ORBOutputCDRAllocator and don't refer to cvs.doc.wustl.edu
-          for files, just get them locally
-
-        * docs/compiler.html:
-          Document -Sorb
-
-Tue Jun 20 10:21:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h:
-          Fixed compile error
-
-Tue Jun 20 08:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Any_Insert_Policy_T.h:
-          Reworded the policies to just contain a static method so that we
-          don't need to create an instance
-
-        * tao/Argument.h:
-          When we don't have interceptors, just don't declare the In/Out/InOut
-          classes, just typedef them to Argument
-
-        * tao/Basic_Arguments.h:
-        * tao/Basic_Argument_T.{h,cpp.inl}:
-        * tao/BD_String_Argument_T.{h,cpp,inl}:
-        * tao/Fixed_Array_Argument_T.{h,cpp,inl}:
-        * tao/Fixed_Size_Argument_T.{h,cpp,inl}:
-        * tao/Object_Argument_T.{h,cpp,inl}:
-        * tao/Object.h:
-        * tao/Special_Basic_Argument_T.{h,cpp,inl}:
-        * tao/Special_Basic_Arguments.h:
-        * tao/UB_String_Argument_T.{h,cpp,inl}:
-        * tao/UB_String_Argument.h:
-        * tao/Var_Array_Argument_T.{h,cpp,inl}:
-        * tao/Var_Size_Argument_T.{h,cpp,inl}:
-        * tao/AnyTypeCode/Any_Arg_Traits.h:
-        * tao/AnyTypeCode/TypeCode.h:
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
-        * tao/PortableServer/Any_SArg_Traits.h:
-        * tao/PortableServer/Basic_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Basic_SArguments.h:
-        * tao/PortableServer/BD_String_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Fixed_Array_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Fixed_Size_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Object_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Object_SArg_Traits.h:
-        * tao/PortableServer/Var_Size_SArgument_T.{h,cpp,inl}:
-        * tao/Valuetype/ValueBase.h:
-        * tao/Valuetype/AbstractBase.h:
-        * tao/PortableServer/Special_Basic_SArgument_T.{h,cpp,inl}:
-        * tao/PortableServer/Special_Basic_SArgument.h:
-        * tao/PortableServer/TypeCode_SArg_Traits.h:
-        * tao/PortableServer/Var_Array_SArgument_T.{h,cpp,inl}:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-          The any insert policy has been changed to a template template
-          argument.
-
-        * tao/PortableServer/PolicyS.cpp:
-        * tao/WCharSeqS.h:
-        * tao/WCharSeqC.h:
-        * tao/CONV_FRAMEC.h:
-        * tao/DomainC.cpp:
-        * tao/IIOP_EndpointsC.h:
-        * tao/IIOPC.h:
-        * tao/Messaging_PolicyValueC.h:
-        * tao/IOP_IORC.h:
-        * tao/OctetSeqC.h:
-        * tao/WCharSeqC.cpp:
-        * tao/Policy_ForwardC.h:
-        * tao/PolicyC.cpp:
-        * tao/StringSeqC.h:
-        * tao/ServicesC.h:
-        * tao/GIOPC.h:
-        * tao/AnyTypeCode/Dynamic_ParameterC.h:
-        * tao/AnyTypeCode/WCharSeqA.{h,cpp}:
-        * tao/Domain/DomainS.cpp:
-        * tao/DynamicAny/DynamicAnyC.h:
-        * tao/IFR_Client/IFR_ExtendedC.{h,cpp}:
-        * tao/IFR_Client/IFR_ComponentsC.{h,cpp}:
-        * tao/IFR_Client/IFR_BasicC.{h,cpp}:
-        * tao/IFR_Client/IFR_BaseC.{h,cpp}:
-        * tao/ImR_Client/ImplRepoC.{h,cpp}:
-        * tao/ImR_Client/ImplRepoS.cpp:
-        * tao/ImR_Client/ServerObjectS.cpp:
-        * tao/IORInterceptor/IORInfoC.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
-        * tao/RTCORBA/RTCORBAC.h:
-        * tao/RTScheduling/RTSchedulerC.cpp:
-        * tao/Strategies/sciop_endpointsC.h:
-        * tao/Strategies/uiop_endpointsC.h:
-        * tao/PortableServer/PortableServerC.{h,cpp}:
-        * tao/PortableServer/PortableServerS.h:
-          Updated for all template changes
-
-        * tao/Sequence_T.h:
-          Reordered includes
-
-        * tao/Blocked_Connect_Strategy.{h,cpp}:
-          Removed not needed virtual destructor
-
-        * tao/Connection_Handler.cpp:
-        * tao/Wait_On_Leader_Follower.cpp:
-        * tao/Wait_On_Reactor.cpp:
-        * tao/Wait_On_Read.cpp:
-        * tao/Wait_Strategy.{h,cpp,inl}:
-        * tao/Transport_Cache_Manager.cpp:
-          Changed is_registered flag of the wait stratetegy to a real bool
-
-        * tao/Object_Reference_Sequence_Element_T.h:
-        * tao/String_Sequence_Element_T.h:
-          Added in accessor
-
-        * tao/Object.cpp:
-        * tao/PortableServer/IdAssignmentPolicy.{h,cpp}:
-        * tao/PortableServer/IdUniquenessPolicy.{h,cpp}:
-        * tao/PortableServer/ImplicitActivationPolicy.{h,cpp}:
-        * tao/PortableServer/LifespanPolicy.{h,cpp}:
-        * tao/PortableServer/POA_Cached_Policies.cpp:
-        * tao/PortableServer/POA_Policy_Set.cpp:
-        * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/POAManager.{h,cpp}:
-        * tao/PortableServer/POAManagerFactory.{h,cpp}:
-        * tao/PortableServer/RequestProcessingPolicy.{h,cpp}:
-        * tao/ORB.{h,cpp}:
-        * tao/PortableServer/PortableServer.cpp:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.{h,cpp}:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.{h,cpp}:
-        * tao/PortableServer/RequestProcessingStrategyServantActivator.{h,cpp}:
-        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.{h,cpp}:
-        * tao/PortableServer/RequestProcessingStrategyServantLocator.{h,cpp}:
-        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.{h,cpp}:
-        * tao/PortableServer/RequestProcessingStrategyServantManager.{h,cpp}:
-        * tao/PortableServer/Servant_Upcall.cpp:
-        * tao/PortableServer/Root_POA.{h,cpp}:
-        * tao/PortableServer/ThreadPolicy.{h,cpp}:
-        * tao/PortableServer/ServantRetentionStrategyRetain.{h,cpp}:
-        * tao/PortableServer/ServantRetentionStrategyNonRetain.{h,cpp}:
-        * tao/PortableServer/ServantRetentionStrategy.h:
-        * tao/PortableServer/ServantRetentionPolicy.{h,cpp}:
-          Added support for CORBA/e
-
-        * tao/PortableServer/IdAssignmentPolicy.pidl:
-        * tao/PortableServer/PS_Current.pidl:
-        * tao/TypeCodeFactory/TypeCodeFactory.pidl:
-        * tao/Valuetype/StringValue.pidl:
-        * tao/PortableServer/RequestProcessingPolicy.pidl:
-        * tao/PortableServer/ServantActivator.pidl:
-        * tao/PortableServer/ServantLocator.pidl:
-        * tao/PortableServer/ServantManager.pidl:
-        * tao/PortableServer/ServantRetentionPolicy.pidl:
-        * tao/PortableServer/ThreadPolicy.pidl:
-          Updated regeneration instructions and support CORBA/e
-
-        * tao/OctetSeq.pidl:
-          Added -Sorb to the regeneration instructions
-
-        * tao/Policy_Forward.pidl:
-          Updated regeneration instructions, handcrafting is not needed anymore
-
-        * tao/diffs/Policy_Forward.diff:
-          Removed from the repo
-
-        * tao/VarOut_T.{h,inl}:
-          Zapped one template argument
-
-        * tao/IIOP_Transport.{h,cpp}:
-        * tao/default_resource.{h,cpp}:
-        * tao/Transport.{h,cpp}:
-          Added support for sendfile
-
-        * tao/orbconf.h:
-          Added TAO_USE_OUTPUT_CDR_MMAP_MEMORY_POOL with which sendfile
-          can be forced during compilation
-
-        * tao/Transport_Cache_Manager.cpp:
-          Use ACE_TEXT with debug macros
-
-        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
-        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
-        * tao/Valuetype/AbstractBase_T.cpp:
-          Const improvements
-
-        * tao/PortableServer/get_arg.h:
-          Check if the details do have args before doing a cast, part of
-          bug 2503
-
-        * tao/PortableServer/POA.pidl:
-        * tao/PortableServer/PortableServer.pidl:
-          Moved most contents to POA.pidl to make regeneration easier
-
-        * tao/Bounded_Sequence_CDR_T.h:
-          Moved array code to this file
-
-        * tao/Array_VarOut_T.{h,cpp,inl}:
-        * tao/Array_Traits_T.h:
-        * tao/Bounded_Array_Sequence_T.h:
-        * tao/Unbounded_Array_Sequence_T.h:
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Refactored array support, mix of the changes from Jeff from
-          yesterday and my work. Need to cleanup a little when things
-          compile again.
-
-        * tao/TypeCodeFactory.mpc:
-        * tao/Valuetype.mpc:
-        * tao/PortableServer.mpc:
-        * tao/ImR_Client.mpc:
-        * tao/EndpointPolicy.mpc:
-          Enabled regeneration of pidl files as part of building the core
-          TAO libs. More pidl files will get regenerated as part of the
-          build, this is the first step.
-
-        * tao/tao.mpc:
-          Added new sendfile files
-
-        * tao/RTCORBA/RT_Transport_Descriptor.h:
-          Use false for a boolean
-
-        * tao/Strategies/FIFO_Connection_Purging_Strategy.{h,cpp}:
-        * tao/Strategies/LFU_Connection_Purging_Strategy.{h,cpp}:
-        * tao/Strategies/NULL_Connection_Purging_Strategy.{h,cpp}:
-          Removed not needed virtual destructors
-
-        * tao/PortableServer/diffs/AdapterActivator.diff
-        * tao/PortableServer/diffs/ForwardRequest.diff
-        * tao/PortableServer/diffs/ImplicitActivationPolicy.diff
-        * tao/PortableServer/diffs/POAManager.diff
-        * tao/PortableServer/diffs/RequestProcessingPolicy.diff
-        * tao/PortableServer/diffs/ServantActivator.diff
-        * tao/PortableServer/diffs/ServantLocator.diff
-        * tao/PortableServer/diffs/ServantManager.diff
-        * tao/PortableServer/diffs/ServantRetentionPolicy.diff
-        * tao/PortableServer/diffs/ThreadPolicy.diff
-          Removed, not needed anymore
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be_include/be_decl.h:
-          Made generation of ORB.h optional, can be suppressed using -Sorb
-
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be_include/be_interface_fwd.h:
-        * TAO_IDL/be_include/be_type.h:
-        * TAO_IDL/be_include/be_typedef.h:
-          Removed old code related to explicit template instantiations
-
-        * TAO_IDL/be/be_sequence.cpp:
-          Updated generation of array sequences
-
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp:
-          Updated generation for arrays
-
-        * TAO_IDL/be/be_visitor_interface.cpp:
-          Added support for native keyword, needed to generate typedefs  from
-          the pidl files
-
-        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-          Small layout improvements
-
-        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_module/module_ch.cpp:
-        * TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
-        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-          Added missing generation of versioning macros.
-
-        * TAO_IDL/be/be_visitor_interface/interface.cpp:
-        * TAO_IDL/be_include/be_visitor_interface/interface.h:
-          Handle native
-
-        * TAO_IDL/be/be_visitor_native/native_ch.cpp:
-        * TAO_IDL/be_include/be_visitor_native.h:
-        * TAO_IDL/be_include/be_visitor_native/native_ch.h:
-          New file for native generation
-
-        * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
-          Updated for array changes
-
-        * TAO_IDL/fe/fe_extern.cpp:
-          Const improvement
-
-Mon Jun 19 22:55:04 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/Array_VarOut_T.h:
-
-          Added 'typename' to the typedef of FORANY in class
-          TAO_Array_Var_Base_T.
-
-Mon Jun 19 19:39:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/EndpointPolicy/EndpointPolicyA.*:
-        * tao/EndpointPolicy/EndpointPolicyC.*:
-        * tao/EndpointPolicy/EndpointPolicyTypeA.*:
-        * tao/EndpointPolicy/EndpointPolicyTypeC.*:
-        * tao/EndpointPolicy/IIOPEndpointValueA.*:
-        * tao/EndpointPolicy/IIOPEndpointValueC.*:
-        * tao/PortableServer/AdapterActivatorC.*:
-        * tao/PortableServer/AdapterActivatorA.*:
-        * tao/PortableServer/ForwardRequestC.*:
-        * tao/PortableServer/ForwardRequestA.*:
-        * tao/PortableServer/IdAssignmentPolicyC.*:
-        * tao/PortableServer/IdAssignmentPolicyA.*:
-        * tao/PortableServer/IdUniquenessPolicyC.*:
-        * tao/PortableServer/IdUniquenessPolicyA.*:
-        * tao/PortableServer/ThreadPolicyC.*:
-        * tao/PortableServer/ThreadPolicyA.*:
-        * tao/PortableServer/ServantRetentionPolicyC.*:
-        * tao/PortableServer/ServantRetentionPolicyA.*:
-        * tao/PortableServer/ServantManagerC.*:
-        * tao/PortableServer/ServantManagerA.*:
-        * tao/PortableServer/ServantLocatorC.*:
-        * tao/PortableServer/ServantLocatorA.*:
-        * tao/PortableServer/ServantActivatorC.*:
-        * tao/PortableServer/ServantActivatorA.*:
-        * tao/PortableServer/RequestProcessingPolicyC.*:
-        * tao/PortableServer/RequestProcessingPolicyA.*:
-        * tao/PortableServer/PS_CurrentC.*:
-        * tao/PortableServer/PortableServerA.cpp:
-        * tao/PortableServer/POAManagerFactoryC.*:
-        * tao/PortableServer/POAManagerC.*:
-        * tao/PortableServer/LifespanPolicyC.*:
-        * tao/PortableServer/LifespanPolicyA.*:
-        * tao/PortableServer/ImplicitActivationPolicyC.*:
-        * tao/PortableServer/ImplicitActivationPolicyA.*:
-        * tao/TypeCodeFactory/TypeCodeFactoryA.*:
-        * tao/TypeCodeFactory/TypeCodeFactoryC.*:
-        * tao/Valuetype/StringValueC.*:
-          Removed from the repo, will be generated with tao_idl during the build
-          of the core libs in the future.
-
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
-          Const improvement
-
-        * tao/EndpointPolicy/EndpointPolicy.pidl:
-        * tao/EndpointPolicy/EndpointPolicyType.pidl:
-        * tao/EndpointPolicy/IIOPEndpointValue.pidl:
-          Removed regeneration instructions, stored in mpc file in the future
-
-        * tao/PortableServer/AdapterActivator.pidl:
-        * tao/PortableServer/ForwardRequest.pidl:
-        * tao/PortableServer/IdUniquenessPolicy.pidl:
-        * tao/PortableServer/ImplicitActivationPolicy.pidl:
-        * tao/PortableServer/POAManagerFactory.pidl:
-        * tao/PortableServer/POAManager.pidl:
-        * tao/PortableServer/LifespanPolicy.pidl:
-          Removed regeneration instructions and updated for CORBA/e
-
-        * tao/PortableServer/Creation_Time.h:
-          Made single argument constructor explicit
-
-        * tao/Connector_Registry.{h,cpp,i}:
-        * tao/Incoming_Message_Queue.{h,inl}:
-          Const improvements
-
-        * tao/MMAP_Allocator.{h,cpp}:
-          New files part of the sendfile support
-
-        * tao/Stub.h:
-          Doxygen improvements
-
-        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
-        * tao/PortableServer/Default_Policy_Validator.cpp:
-        * tao/PortableServer/Adapter_Activator.{h,cpp}:
-          Added support for CORBA/e
-
-Mon Jun 19 14:49:25 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/Abstract_Servant_Base.h:
-        * tao/Adapter.h:
-        * tao/Adapter_Registry.h:
-        * tao/AnyTypeCode.mpc
-        * tao/Array_Traits_T.h:
-        * tao/Array_VarOut_T.cpp:
-        * tao/Array_VarOut_T.h:
-        * tao/Array_VarOut_T.inl:
-        * tao/BD_String_Argument_T.cpp:
-        * tao/BD_String_Argument_T.h:
-        * tao/BD_String_Argument_T.inl:
-        * tao/Basic_Argument_T.h:
-        * tao/Basic_Arguments.h:
-        * tao/BooleanSeqC.h:
-        * tao/Bounded_Array_Sequence_T.h:
-        * tao/CharSeqC.h:
-        * tao/Collocation_Proxy_Broker.h:
-        * tao/DoubleSeqC.h:
-        * tao/Environment.h:
-        * tao/Fixed_Array_Argument_T.cpp:
-        * tao/Fixed_Array_Argument_T.h:
-        * tao/Fixed_Array_Argument_T.inl:
-        * tao/Fixed_Size_Argument_T.cpp:
-        * tao/Fixed_Size_Argument_T.h:
-        * tao/Fixed_Size_Argument_T.inl:
-        * tao/FloatSeqC.h:
-        * tao/LocalObject.h:
-        * tao/LongDoubleSeqC.h:
-        * tao/LongLongSeqC.h:
-        * tao/LongSeqC.h:
-        * tao/ORB.h:
-        * tao/Object.h:
-        * tao/Object_Argument_T.h:
-        * tao/OctetSeqC.h:
-        * tao/PolicyC.h:
-        * tao/Policy_ForwardC.h:
-        * tao/Principal.h:
-        * tao/Pseudo_VarOut_T.h:
-        * tao/Pseudo_VarOut_T.inl:
-        * tao/Request_Dispatcher.h:
-        * tao/ShortSeqC.h:
-        * tao/StringSeqC.h:
-        * tao/String_Traits_Base_T.h:
-        * tao/TypeCodeFactory_Adapter.h:
-        * tao/UB_String_Argument_T.cpp:
-        * tao/UB_String_Argument_T.h:
-        * tao/UB_String_Argument_T.inl:
-        * tao/UB_String_Arguments.h:
-        * tao/ULongLongSeqC.h:
-        * tao/ULongSeqC.h:
-        * tao/UShortSeqC.h:
-        * tao/Unbounded_Array_Sequence_T.h:
-        * tao/Var_Array_Argument_T.cpp:
-        * tao/Var_Array_Argument_T.h:
-        * tao/Var_Array_Argument_T.inl:
-        * tao/Var_Size_Argument_T.cpp:
-        * tao/Var_Size_Argument_T.h:
-        * tao/Var_Size_Argument_T.inl:
-        * tao/WCharSeqC.h:
-        * tao/WStringSeqC.h:
-        * tao/AnyTypeCode/Any.h:
-        * tao/AnyTypeCode/AnySeqC.h:
-        * tao/AnyTypeCode/Any_Arg_Traits.h:
-        * tao/AnyTypeCode/NVList.h:
-        * tao/AnyTypeCode/TypeCode.h:
-        * tao/Domain/DomainS.cpp:
-        * tao/DynamicInterface/Context.h:
-        * tao/DynamicInterface/ExceptionList.h:
-        * tao/DynamicInterface/Request.h:
-        * tao/DynamicInterface/Server_Request.h:
-        * tao/IFR_Client/IFR_BaseC.cpp:
-        * tao/IFR_Client/IFR_BaseC.h:
-        * tao/IFR_Client/IFR_BaseC.inl:
-        * tao/IFR_Client/IFR_BasicC.cpp:
-        * tao/IFR_Client/IFR_BasicC.h:
-        * tao/IFR_Client/IFR_BasicC.inl:
-        * tao/IFR_Client/IFR_ComponentsC.cpp:
-        * tao/IFR_Client/IFR_ComponentsC.h:
-        * tao/IFR_Client/IFR_ComponentsC.inl:
-        * tao/IFR_Client/IFR_ExtendedC.cpp:
-        * tao/IFR_Client/IFR_ExtendedC.h:
-        * tao/IFR_Client/IFR_ExtendedC.inl:
-        * tao/ImR_Client/ImplRepoC.cpp:
-        * tao/ImR_Client/ImplRepoC.h:
-        * tao/ImR_Client/ImplRepoS.cpp:
-        * tao/ImR_Client/ServerObjectS.cpp:
-        * tao/Messaging/MessagingS.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
-        * tao/PortableServer/Any_SArg_Traits.h:
-        * tao/PortableServer/BD_String_SArgument_T.cpp:
-        * tao/PortableServer/BD_String_SArgument_T.h:
-        * tao/PortableServer/BD_String_SArgument_T.inl:
-        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
-        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h:
-        * tao/PortableServer/Fixed_Array_SArgument_T.cpp:
-        * tao/PortableServer/Fixed_Array_SArgument_T.h:
-        * tao/PortableServer/Fixed_Array_SArgument_T.inl:
-        * tao/PortableServer/Fixed_Size_SArgument_T.h:
-        * tao/PortableServer/Object_SArg_Traits.h:
-        * tao/PortableServer/Object_SArgument_T.h:
-        * tao/PortableServer/PolicyS.cpp:
-        * tao/PortableServer/Servant_Upcall.h:
-        * tao/PortableServer/TypeCode_SArg_Traits.h:
-        * tao/PortableServer/Var_Array_SArgument_T.cpp:
-        * tao/PortableServer/Var_Array_SArgument_T.h:
-        * tao/PortableServer/Var_Array_SArgument_T.inl:
-        * tao/PortableServer/Var_Size_SArgument_T.cpp:
-        * tao/PortableServer/Var_Size_SArgument_T.h:
-        * tao/PortableServer/Var_Size_SArgument_T.inl:
-        * tao/PortableServer/get_arg.h:
-        * tao/RTScheduling/RTSchedulerC.cpp:
-        * tao/Valuetype/AbstractBase.h:
-        * tao/Valuetype/ValueBase.h:
-
-          Reduced the number of template parameters in _var,
-          _out, _forany and arg template classes.
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-
-          Changes to generated code corresponding with the
-          changes to middleware code described above.
-
-Mon Jun 19 12:11:09 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/driver/drv_preproc.cpp:
-          Fixed copy past error which resulted in a non working tao_idl
-          with BCB
-
-Sat Jun 17 20:47:09 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/tao_idl.cpp:
-        * TAO_IDL/driver/drv_preproc.cpp:
-
-          Changed the type of the DRV_arglist variable from char*[]
-          to const char*[], since Borland compilers are strict about
-          array types and won't implicitly qualify char*[] to be
-          passed as const char*[]. This change also required
-          casting away constness when the array elements are
-          deleted during cleanup. Thanks to Johnny Willemsen
-          <jwillemsen@rememdy.nl> for his expertise with Borland
-          compilers.
-
-Fri Jun 16 20:25:45 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
-        * orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp:
-
-          Added CORBA::string_dup() around the identifier string of
-          an argument, when it is inserted into the sequence of
-          parameter descriptions that is passed to the IFR to make
-          an entry for an operation or a factory. Since the
-          sequence in question manages its own memory, we were
-          getting double deletions of this identifier string before.
-          Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for
-          pointing out the Interface Repository tests failures
-          causes by this problem.
-
-Fri Jun 16 14:29:23 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/fe_interface_header.cpp:
-        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
-
-          Removed unused variables and identifiers for unused args.
-
-Thu Jun 15 20:35:41 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-
-          Partially reverted this mornings fix. The
-          _tao_obv_static_repository_id function is not virtual and may
-          safely stay inlined.
-
-Thu Jun 15 15:05:43 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be_include/be_visitor_interface/remote_proxy_impl_cs.h:
-        * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp:
-
-                Removed these files from the repository, they are no
-                longer used.
-
-        * TAO_IDL/tao_idl.cpp:
-        * TAO_IDL/ast/ast_argument.cpp:
-        * TAO_IDL/ast/ast_array.cpp:
-        * TAO_IDL/ast/ast_attribute.cpp:
-        * TAO_IDL/ast/ast_check.cpp:
-        * TAO_IDL/ast/ast_concrete_type.cpp:
-        * TAO_IDL/ast/ast_constant.cpp:
-        * TAO_IDL/ast/ast_decl.cpp:
-        * TAO_IDL/ast/ast_enum.cpp:
-        * TAO_IDL/ast/ast_exception.cpp:
-        * TAO_IDL/ast/ast_expression.cpp:
-        * TAO_IDL/ast/ast_factory.cpp:
-        * TAO_IDL/ast/ast_field.cpp:
-        * TAO_IDL/ast/ast_generator.cpp:
-        * TAO_IDL/ast/ast_home.cpp:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/ast/ast_module.cpp:
-        * TAO_IDL/ast/ast_native.cpp:
-        * TAO_IDL/ast/ast_operation.cpp:
-        * TAO_IDL/ast/ast_predefined_type.cpp:
-        * TAO_IDL/ast/ast_root.cpp:
-        * TAO_IDL/ast/ast_sequence.cpp:
-        * TAO_IDL/ast/ast_string.cpp:
-        * TAO_IDL/ast/ast_structure.cpp:
-        * TAO_IDL/ast/ast_structure_fwd.cpp:
-        * TAO_IDL/ast/ast_type.cpp:
-        * TAO_IDL/ast/ast_typedef.cpp:
-        * TAO_IDL/ast/ast_union_branch.cpp:
-        * TAO_IDL/ast/ast_union_label.cpp:
-        * TAO_IDL/ast/ast_valuebox.cpp:
-        * TAO_IDL/ast/ast_valuetype.cpp:
-        * TAO_IDL/be/be_argument.cpp:
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_constant.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_factory.cpp:
-        * TAO_IDL/be/be_field.cpp:
-        * TAO_IDL/be/be_generator.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_home.cpp:
-        * TAO_IDL/be/be_init.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_interface_strategy.cpp:
-        * TAO_IDL/be/be_module.cpp:
-        * TAO_IDL/be/be_native.cpp:
-        * TAO_IDL/be/be_operation.cpp:
-        * TAO_IDL/be/be_operation_strategy.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/be/be_root.cpp:
-        * TAO_IDL/be/be_scope.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_structure_fwd.cpp:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_union_branch.cpp:
-        * TAO_IDL/be/be_union_fwd.cpp:
-        * TAO_IDL/be/be_union_label.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
-        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be/be_visitor_attribute.cpp:
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-        * TAO_IDL/be/be_visitor_context.cpp:
-        * TAO_IDL/be/be_visitor_decl.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_valuetype.cpp:
-        * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
-        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_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_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_ch.cpp:
-        * TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp:
-        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
-        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
-        * TAO_IDL/be_include/be_argument.h:
-        * TAO_IDL/be_include/be_array.h:
-        * TAO_IDL/be_include/be_attribute.h:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_extern.h:
-        * TAO_IDL/be_include/be_field.h:
-        * TAO_IDL/be_include/be_generator.h:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be_include/be_interface_strategy.h:
-        * TAO_IDL/be_include/be_native.h:
-        * TAO_IDL/be_include/be_operation_strategy.h:
-        * TAO_IDL/be_include/be_root.h:
-        * TAO_IDL/be_include/be_union_branch.h:
-        * TAO_IDL/be_include/be_union_label.h:
-        * TAO_IDL/be_include/be_valuebox.h:
-        * TAO_IDL/be_include/be_visitor.h:
-        * TAO_IDL/be_include/be_visitor_ami_pre_proc.h:
-        * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h:
-        * TAO_IDL/be_include/be_visitor_decl.h:
-        * TAO_IDL/driver/drv_args.cpp:
-        * TAO_IDL/driver/drv_preproc.cpp:
-        * TAO_IDL/fe/fe_declarator.cpp:
-        * TAO_IDL/fe/fe_extern.cpp:
-        * TAO_IDL/fe/fe_init.cpp:
-        * TAO_IDL/fe/fe_interface_header.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/y.tab.cpp:.diff:
-        * TAO_IDL/fe/y.tab.h:
-        * TAO_IDL/include/ast_argument.h:
-        * TAO_IDL/include/ast_array.h:
-        * TAO_IDL/include/ast_attribute.h:
-        * TAO_IDL/include/ast_concrete_type.h:
-        * TAO_IDL/include/ast_decl.h:
-        * TAO_IDL/include/ast_exception.h:
-        * TAO_IDL/include/ast_expression.h:
-        * TAO_IDL/include/ast_field.h:
-        * TAO_IDL/include/ast_generator.h:
-        * TAO_IDL/include/ast_interface.h:
-        * TAO_IDL/include/ast_interface_fwd.h:
-        * TAO_IDL/include/ast_native.h:
-        * TAO_IDL/include/ast_sequence.h:
-        * TAO_IDL/include/ast_structure.h:
-        * TAO_IDL/include/ast_structure_fwd.h:
-        * TAO_IDL/include/ast_typedef.h:
-        * TAO_IDL/include/ast_union_branch.h:
-        * TAO_IDL/include/ast_union_label.h:
-        * TAO_IDL/include/ast_valuebox.h:
-        * TAO_IDL/include/drv_extern.h:
-        * TAO_IDL/include/fe_extern.h:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/include/utl_exceptlist.h:
-        * TAO_IDL/include/utl_exprlist.h:
-        * TAO_IDL/include/utl_labellist.h:
-        * TAO_IDL/include/utl_list.h:
-        * TAO_IDL/include/utl_namelist.h:
-        * TAO_IDL/include/utl_scope.h:
-        * TAO_IDL/util/utl_exceptlist.cpp:
-        * TAO_IDL/util/utl_exprlist.cpp:
-        * TAO_IDL/util/utl_global.cpp:
-        * TAO_IDL/util/utl_idlist.cpp:
-        * TAO_IDL/util/utl_labellist.cpp:
-        * TAO_IDL/util/utl_list.cpp:
-        * TAO_IDL/util/utl_namelist.cpp:
-        * TAO_IDL/util/utl_scope.cpp:
-        * TAO_IDL/util/utl_string.cpp:
-
-                - Plugged all memory leaks occuring during successful
-                  execution, and most of the leaks occuring when there
-                  is some kind of error. For some syntax errors
-                  reported by the parser, it's not known how far
-                  the parser has looked ahead (and thus what memory
-                  it may have already allocated) when the error
-                  is detected. Creating the AST out of types that
-            manage their own memory, or creating the AST on
-                  the stack, would solve all memory leak problems,
-                  but would require substantial redesign of the IDL
-                  compiler front end.
-
-                - Added generation of sendc_* operations inherited
-                  by local interfaces, if AMI code is being generated.
-
-                - Fixed required check for parallel inheritance of
-                  valuetypes and their corresponding supported
-                  interfaces, if any.
-
-                - Added workarounds to skip problem code generation
-                  when IDL3 constructs and AMI code generation
-                  occur together. Integration of AMI with components
-                  is a future development item.
-
-                - Fixed the logic of the decision whether or not to
-                  generate inheritance of a reference counting
-                  parent class for valuetype OBV_* classes.
-
-                - Added default generation of Any insertion/extraction
-                  operators for local interfaces, and a command line
-                  option  - '-Sal' -  to suppress it.
-
-        * orbsvcs/IFR_Service/be_extern.h:
-        * orbsvcs/IFR_Service/be_init.cpp:
-        * orbsvcs/IFR_Service/be_produce.cpp:
-
-                Changes to the IFR loader backend corresponding to the
-                memory leak fixes above.
-
-        * docs/compiler.html:
-        * docs/releasenotes/index.html:
-
-          Documented new IDL compiler command line option
-                described above.
-
-Thu Jun 15 12:32:58 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-
-          Moved virtual methods from inline to out-of-line.
-
-Wed Jun 14 14:48:07 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * tests/ORB_Local_Config/ORB_Local_Config.mwc:
-
-          Removed the nonexistent Limits directory from
-          the workspace. This should correct the setup
-          error shown on Win2003_VC71_Debug hosted by OCI.
-
-Tue Jun 13 15:24:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
-
-          Removed orb, added LogMgr argument to constructor.
-
-          Changed constructor to create a new log-channel specific poa
-          for iterators.  Activate iterators in the new poa.
-
-          Changed destructor to destroy the new poa, which ensures any
-          interators that may exist will be destroyed at the same time
-          as the log channel.  This fixes bugzilla bug #2551.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.h
-
-          Removed orb argument from constructor.
-          Changed to pass LogMgr to Hash_LogRecordStore constructor.
-
-        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp:
-
-          Changed to pass only LogMgr to Hash_LogStore constructor.
-
-        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h:
-        * orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h:
-
-          Removed orb argument from create_log_store().
-
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp
-        * orbsvcs/orbsvcs/Log/LogMgr_i.h
-
-          Added orb(), factory_poa(), and log_poa() methods.  We're
-          changing most objects to have a reference to the LogMgr, so we
-          don't have pass orbs and poas around, especially for the cases
-          where we're already passing the LogMgr.
-
-          Changed to pass only "this" to strategy's create_log_store()
-          method.
-
-Tue Jun 13 14:56:01 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Don't close the LogRecordStore in the TAO_Log_i destructor, if
-          the log channel was destroyed, it will be a dangling reference.
-          The LogStore should be responsible for opening and closing its
-          LogRecordStores.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp (remove):
-
-          Obtain and delete LogRecordStore when unbinding from map.
-          Avoids leak.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp (query_i):
-
-          Re-indent to match coding conventions.
-
-Tue Jun 13 13:51:11 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * tests/Bug_2494_Regression/client.cpp:
-
-          The scoreboard was marking this test as "failed" because it printed
-          "EXCEPTION" (from the client process).  This isn't a failure as long
-          as the server process still exits cleanly.  The test is now modified
-          so that it doesn't print "EXCEPTION".
-
-Sun Jun 11 16:46:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/EventLog_i.cpp:
-        * orbsvcs/orbsvcs/NotifyLog_i.cpp:
-        * orbsvcs/orbsvcs/RTEventLog_i.cpp:
-
-          Changed destructor to invoke destroy() on the event channel.
-          This notifies suppliers and consumers, and avoids a resource
-          leak.  Fixes bugzilla bug #2559.
-
-Sun Jun 11 00:54:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/BasicLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/BasicLog_i.h:
-        * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLog_i.h:
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
-
-          Remove member variable logmgr_i_, as it's also a protected
-          member in the base class.
-
-Sat Jun 10 21:54:00 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * NEWS:
-
-          Mention that NT_Naming_Service and NT_Notify_Service must
-          be enabled by new MPC feature variable "winnt".
-
-Sat Jun 10 18:30:42 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * performance-tests/Makefile.am:
-
-          Disable building CSD_Strategy tests.
-
-Sat Jun 10 10:40:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * examples/RTScheduling/Job_i.h:
-        * examples/RTScheduling/POA_Holder.h:
-        * orbsvcs/tests/Notify/lib/Periodic_Consumer.h:
-        * orbsvcs/tests/Notify/lib/Periodic_Supplier.h:
-
-          More files where ace/Arg_Shifter.h needed to be directly
-          included.
-
-Sat Jun 10 05:03:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add AM_CONDITIONAL for BUILD_WINNT and BUILD_WXWINDOWS.
-
-Sat Jun 10 04:34:32 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * docs/tutorials/Quoter/AMI/Makefile.am:
-        * docs/tutorials/Quoter/Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
-        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/idl/Makefile.am:
-        * examples/AMH/Sink_Server/Makefile.am:
-        * examples/AMI/FL_Callback/Makefile.am:
-        * examples/Advanced/ch_3/Makefile.am:
-        * examples/Buffered_AMI/Makefile.am:
-        * examples/Buffered_Oneways/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool4/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-        * examples/Callback_Quoter/Makefile.am:
-        * examples/Content_Server/AMI_Iterator/Makefile.am:
-        * examples/Content_Server/AMI_Observer/Makefile.am:
-        * examples/Content_Server/SMI_Iterator/Makefile.am:
-        * examples/Event_Comm/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
-        * examples/Load_Balancing/Makefile.am:
-        * examples/Load_Balancing_persistent/Makefile.am:
-        * examples/Logging/Makefile.am:
-        * examples/OBV/Typed_Events/Makefile.am:
-        * examples/POA/DSI/Makefile.am:
-        * examples/POA/Default_Servant/Makefile.am:
-        * examples/POA/Forwarding/Makefile.am:
-        * examples/POA/Generic_Servant/Makefile.am:
-        * examples/POA/TIE/Makefile.am:
-        * examples/Persistent_Grid/Makefile.am:
-        * examples/PluggableUDP/tests/Basic/Makefile.am:
-        * examples/PluggableUDP/tests/Performance/Makefile.am:
-        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
-        * examples/Quoter/Makefile.am:
-        * examples/RTCORBA/Activity/Makefile.am:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
-        * examples/Simple/bank/Makefile.am:
-        * examples/Simple/chat/Makefile.am:
-        * examples/Simple/echo/Makefile.am:
-        * examples/Simple/grid/Makefile.am:
-        * examples/Simple/time/Makefile.am:
-        * examples/Simple/time-date/Makefile.am:
-        * examples/Simulator/Event_Supplier/Makefile.am:
-        * examples/TypeCode_Creation/Makefile.am:
-        * examples/ior_corbaloc/Makefile.am:
-        * examples/mfc/Makefile.am:
-        * interop-tests/wchar/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-        * orbsvcs/examples/CosEC/Factory/Makefile.am:
-        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
-        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
-        * orbsvcs/examples/ImR/Advanced/Makefile.am:
-        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
-        * orbsvcs/examples/LoadBalancing/Makefile.am:
-        * orbsvcs/examples/ORT/Makefile.am:
-        * orbsvcs/examples/Security/Send_File/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-        * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
-        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/FT_App/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
-        * orbsvcs/tests/FtRtEvent/Makefile.am:
-        * orbsvcs/tests/HTIOP/AMI/Makefile.am:
-        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
-        * orbsvcs/tests/HTIOP/Hello/Makefile.am:
-        * orbsvcs/tests/IOR_MCast/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
-        * orbsvcs/tests/ImplRepo/scale/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
-        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
-        * orbsvcs/tests/Miop/McastHello/Makefile.am:
-        * orbsvcs/tests/Notify/Blocking/Makefile.am:
-        * orbsvcs/tests/Notify/Discarding/Makefile.am:
-        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
-        * orbsvcs/tests/Notify/Ordering/Makefile.am:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/lib/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
-        * orbsvcs/tests/Redundant_Naming/Makefile.am:
-        * orbsvcs/tests/Security/BiDirectional/Makefile.am:
-        * orbsvcs/tests/Security/Big_Request/Makefile.am:
-        * orbsvcs/tests/Security/Callback/Makefile.am:
-        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
-        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
-        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
-        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
-        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
-        * orbsvcs/tests/Simple_Naming/Makefile.am:
-        * orbsvcs/tests/Trading/Makefile.am:
-        * orbsvcs/tests/ior_corbaname/Makefile.am:
-        * performance-tests/Makefile.am:
-        * performance-tests/Anyop/Makefile.am:
-        * performance-tests/CSD_Strategy/TestInf/Makefile.am:
-        * performance-tests/CSD_Strategy/TestServant/Makefile.am:
-        * performance-tests/Callback/Makefile.am:
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
-        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Latency/AMI/Makefile.am:
-        * performance-tests/Latency/Collocation/Makefile.am:
-        * performance-tests/Latency/DII/Makefile.am:
-        * performance-tests/Latency/DSI/Makefile.am:
-        * performance-tests/Latency/Deferred/Makefile.am:
-        * performance-tests/Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Memory/IORsize/Makefile.am:
-        * performance-tests/Memory/Single_Threaded/Makefile.am:
-        * performance-tests/POA/Demux/Makefile.am:
-        * performance-tests/POA/Implicit_Activation/Makefile.am:
-        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
-        * performance-tests/Pluggable/Makefile.am:
-        * performance-tests/Protocols/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
-        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
-        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/AMI/Makefile.am:
-        * performance-tests/Sequence_Latency/DII/Makefile.am:
-        * performance-tests/Sequence_Latency/DSI/Makefile.am:
-        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
-        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Throughput/Makefile.am:
-        * tao/Makefile.am:
-        * utils/Makefile.am:
-
-          Regenerated.
-
-        * configure.ac:
-
-          Configure utils/wxNamingViewer/Makefile.am.
-
-        * utils/wxNamingViewer/Makefile.am:
-
-          New file.
-
-Sat Jun 10 03:52:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Naming_Service/Naming_Service.mpc:
-
-          Changed NT_Naming_Service project to require new MPC feature
-          variable "winnt". Avoids building and installing this on non
-          Windows systems.  Fixes bugzilla bug #2412.
-
-        * orbsvcs/Notify_Service/Notify_Service.mpc:
-
-          Changed NT_Notify_Service project to require new MPC feature
-          variable "winnt". Avoids building and installing this on non
-          Windows systems.  Fixes bugzilla bug #2411.
-
-Fri Jun  9 18:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/performance-tests/RTEvent/lib/Client_Options.{h,cpp}:
-        * examples/RTCORBA/Activity/POA_Holder.{h,cpp}:
-        * examples/RTCORBA/Activity/Periodic_Task.{h,cpp}:
-        * examples/RTCORBA/Activity/Job_i.{h,cpp}:
-        * examples/RTCORBA/Activity/Builder.{h,cpp}:
-        * orbsvcs/tests/Notify/lib/Peer.h:
-          Just include ACE_Arg_Shifter in the header file instead of
-          using a forward declaration
-
-Fri Jun  9 14:49:06 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Stack_Recursion/run_test.pl:
-
-          Doubled the timeout to accomodate really slow machines. This was
-          necessitated by new sequence initialization code.
-
-Fri Jun  9 14:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Notify/lib/Options_Parser.{h,cpp}:
-          Moved the include of Arg_Shifter.h from cpp to header file
-
-Fri Jun  9 14:35:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Big_Request_Muxing/Client_Task.h:
-        * tests/Big_Request_Muxing/Client_Task.cpp:
-        * tests/Big_Request_Muxing/Payload_Receiver.h:
-        * tests/Big_Request_Muxing/Payload_Receiver.cpp:
-        * tests/Big_Request_Muxing/Test.idl:
-        * tests/Big_Request_Muxing/client.cpp:
-        * tests/Big_Request_Muxing/run_test.pl:
-        * tests/Big_Request_Muxing/server.cpp:
-
-          This test frequently shows false errors due dropped SYNC_NONE
-          messages. These errors are false because dropping such messages
-          is not an error. The test now separately accounts for SYNC_NONE
-          invocations separately by using a different operation.
-
-          I also modified the timeout loop in an earlier attempt to
-          resolve the periodic dropped messages, thinking the timeout
-          occured due to heavy loads. Now the timeout less about the whole
-          event and more about the duration of individual requests.
-
-Thu Jun  8 02:16:30 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * orbsvcs/Event_Service/Event_Service.cpp (parse_args): Added a
-          missing break statement.  Thanks to Sunil Rottoo <sunil dot
-          rottoo at idilia dot com> for reporting this.
-
-Wed Jun  7 14:24:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Now with all with the cleanup, we can switch from using a
-          ACE_Hash_Map to a ACE_RB_Tree by changing one typedef.
-
-          Now that LogRecords are ordered by RecordId, for all practical
-          purposes this resolves bugzilla bugs #1980 and #1981.  While it
-          doesn't handle the case where the RecordId's wrap, with 64 bits,
-          that's not worth losing too much sleep over.  Even if we logged
-          1,000,000 records per second, it would take nearly 600,000 years
-          to wrap.
-
-Wed Jun  7 09:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Invocation_Adapter.cpp:
-
-          Corrected the check whether a request has arguments or not. This
-          fixes interoperability issues with Orbix. Thanks to Phil
-          Billingham <phil_billingham at ml dot com> for reporting
-          this. This fixes bugzilla bug 2548
-
-Tue Jun  6 21:05:19 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp:
-          There was a buffer overrun inside this test case.
-
-Tue Jun  6 17:25:15 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * TAO_IDL/tao_idl.mpc:
-
-          Combined two automake specific sections into one.
-
-        * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc:
-        * orbsvcs/tests/FtRtEvent/FtRtEvent.mpc:
-
-          Replaced a gnuace specific section to link in tje TAO_Strategies
-          library with the inheritance of the strategies base project.
-
-Tue Jun  6 17:02:57 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tests/DII_Collocation_Tests/Client_Task.cpp:
-        * tests/DII_Collocation_Tests/Client_Task.h:
-        * tests/DII_Collocation_Tests/Collocated_Test.cpp:
-        * tests/DII_Collocation_Tests/Hello.cpp:
-        * tests/DII_Collocation_Tests/Hello.h:
-        * tests/DII_Collocation_Tests/README:
-        * tests/DII_Collocation_Tests/run_test.pl:
-        * tests/DII_Collocation_Tests/Server_Task.cpp:
-        * tests/DII_Collocation_Tests/Server_Task.h:
-        * tests/DII_Collocation_Tests/Test.idl:
-
-          Added incomplete twoway test. More test cases (OUT, INOUT and
-          RETURN) need be added.
-
-Tue Jun  6 14:48:33 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp:
-
-          Use iter->item() instead of (*iter).int_id_ to dereference
-          iterators.
-
-          Changed get() to set the length of the output sequence to the
-          maximum number of log records (this will be shrunk to the real
-          value once we find how many records match the constraint).  We
-          must have got lucky with the old sequence implementation...
-
-Tue Jun  6 13:56:49 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.h:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Consistantly use the LOG_RECORD_STORE typedef instead of
-          LOG_RECORD_HASH_MAP.  The former is supposed to abstract the
-          latter.
-
-Tue Jun  6 13:38:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Rename rec_hash_ member variable to rec_map_, as we plan to
-          change the type.
-
-Tue Jun  6 13:23:06 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Use iter->item() instead of (*iter).int_id_ to dereference
-          iterators.
-
-Tue Jun  6 12:29:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
-          Explicitly duplicate the command-line arguments passed to the
-          client and server ORBs. On some platforms, it wasn't enough to
-          merely readjust the length by setting last argv to 0.
-
-Mon Jun  5 03:19:58 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-        * tao/ORB_Core.h:
-
-          There is a class for containing certain initialization values
-          used by the ORB Core that are set during Dynamic loading of
-          service configuration objects where there is no way to get a
-          pointer to an ORB Core instance. These values were stored in
-          a static instance of this class, TAO_ORB_Core_Static_Resources.
-          However, using a static instance of this class is incongruent
-          with the notion of per-ORB configuration, so this change
-          addresses the problem by making the resources container a
-          service object which is initialized in the local configuration
-          context for each ORB, as well as a copy in the global
-          configuration context.
-
-          This fix specifically addresses the problem of having a later
-          ORB initialization, such as for a second ORB, affecting the
-          configuration of earlier ORBs. If this happens in separate
-          threads, a race can occur leading to unpredictable results.
-
-          However, it might be possible for some ORB-related configuration
-          to be supplied via service configuration after ORB_init is
-          called. If that is the case, then the appropriate configuration
-          context must be set with ACE_Service_Config_Guard during the
-          duration of the configuration. This will ensure the newly loaded
-          configuration object goes into the correct context.
-
-        * tao/CSD_Framework/CSD_Framework_Loader.cpp:
-
-          Reverted the temporary fix, it is no longer needed.
-
-Sun Jun  4 16:04:36 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/DII_Collocation_Tests/oneway/Server_Task.h:
-
-          Add versioned namespace wrappers for the forward declaration of
-          an ACE class.
-
-Sun Jun  4 14:39:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
-        * tao/CSD_Framework/CSD_Framework_Loader.cpp:
-
-          This is a temporary (duration unknown) resolution to a problem
-          highlighted by the intermitant failure in the Two_DLL_ORB test.
-          The problem is that the POA factory name and POA factory
-          directive are held in a static instance of the
-          TAO_ORB_Core_Static_Resoures. The problem is that with multiple
-          configuration contexts, the ORBs are supposed to be configured
-          separately, but this static resource violates that principle.
-
-Sat Jun  3 19:38:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Added new varient of remove_i() that takes an iterator instead
-          of a record id as its argument.  In almost all cases, we have a
-          current iterator when deleting removing a log record; if we use
-          it when unbinding from the map, we avoid an extraneous lookup.
-          Update callers.
-
-Sat Jun  3 19:03:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Remove TODO comments about storing the id on a list when a log
-          record is deleted, and reusing those ids when a new log record
-          is inserted.  If we did this, ids would be practically useless
-          for use by client applications.  It's much more useful to have
-          montonically increasing ids.
-
-Sat Jun  3 17:37:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Changed last instance of use of old iterator API to the new
-          STL-like API.
-
-          Changed purge_old_records(), delete_records(), and
-          remove_old_records() to increment iterator before removing log
-          record.  Removing the record invalidates the current iterator,
-          and incrementing afterwards it resulted in undefined behavior.
-
-Sat Jun  3 16:10:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Changed the match() and delete_records() methods to iterate
-          through the map by themselves instead of invoking match_i().
-          While match_i() factored out common code, it did so at the
-          expense of an extra conditional in the hot path.  Removed
-          match_i().
-
-Sat Jun  3 15:46:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Remove private remove() method.  Update callers to invoke
-          remove_i().
-
-          Rename update() to update_i().
-          Rename retrieve() to retrieve_i().
-
-Sat Jun  3 05:25:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/PersistStore.cpp:
-        * orbsvcs/orbsvcs/Log/PersistStore.h:
-        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp:
-        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.h:
-
-          Remove files.  This was an old attempt at log record persistence
-          that predated the plug-in strategy.
-
-Sat Jun  3 05:20:50 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Declare LOG_RECORD_HASH_MAP_ENTRY and LOG_RECORD_HASH_MAP_ITER
-          in terms of LOG_RECORD_HASH_MAP::ENTRY, ...::ITERATOR, instead
-          of duplicating all the template stuff.  Will make it easier to
-          migrate to an ordered ma types, for bugzilla bugs #1980, #1981,
-          etc.
-
-Sat Jun  3 05:19:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/examples/Log/Event/run_test.pl:
-        * orbsvcs/examples/Log/Notify/run_test.pl:
-        * orbsvcs/examples/Log/RTEvent/run_test.pl:
-
-          Kill the Consumer process instead of considering the test to be
-          failed if it did not exit itself.  The Consumer connects to the
-          Log Factory's event channel, not the event/notification channel
-          for the log, so even though its disconnect_push_consumer method
-          invokes shutdown on the orb, the it doesn't matter since it's
-          not going to be called when the log is destroyed.
-
-Sat Jun  3 05:03:15 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/TAO_Internal.cpp:
-          Added ACE_MT guards around new synchronization code to make it
-          single-thread-build safe.
-
-Sat Jun  3 04:26:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/README:
-
-          Added a bit of a documentation on the test
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
-
-          Modified to conditionaly excersise one of the two test
-          scenarios. Originally, the test used SSLIOP, however that
-          service is not built by default. So the change makes use of
-          another service, which is normally available in "default"
-          builds.
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf:
-
-          Added a simple names for the the configuration files.
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test2.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test3.conf:
-
-          Removed these files.
-
-Fri Jun  2 21:02:46 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
-          Fixed a typo from the earlier commit.
-
-Fri Jun  2 19:52:19 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tests/DII_Collocation_Tests/twoway/Client_Task.cpp:
-        * tests/DII_Collocation_Tests/twoway/Client_Task.h:
-        * tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp:
-        * tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc:
-        * tests/DII_Collocation_Tests/twoway/Hello.cpp:
-        * tests/DII_Collocation_Tests/twoway/Hello.h:
-        * tests/DII_Collocation_Tests/twoway/README:
-        * tests/DII_Collocation_Tests/twoway/run_test.pl:
-        * tests/DII_Collocation_Tests/twoway/Server_Task.cpp:
-        * tests/DII_Collocation_Tests/twoway/Server_Task.h:
-        * tests/DII_Collocation_Tests/twoway/Test.idl:
-
-          Removed twoway test.
-
-Fri Jun  2 12:05:13 USMST 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
-
-          Fixed compilation errors due to reference to a new file.
-
-Fri Jun  2 13:33:19 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Big_Twoways/server.cpp:
-          Fixed a minor memory leak caused by not cleaning up servants.
-
-        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
-          Addressed compiler warnings generated by some platforms with
-          2-byte wchars. This codeset translator should only be used on
-          hosts with 4-byte wchars, since UCS4 is a 32-bit codeset, but
-          not all of the test platforms meet that criterium.
-
-Fri Jun  2 12:36:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TAO_Internal.cpp:
-
-           Adding synchronization, in the form of a condition variable to
-           fix a race condition occurring when a non-default ORB enters
-           open_services, before the default ORB has completed
-           initializing the global service objects. According to the spec,
-           the default ORB is the one that gets to call ORB_init
-           first. The ORB-specific configuration implementation designates
-           the default ORB to initialize globally available service
-           objects, like the Resource Factory. If a non-default ORB beats
-           it to the resource initialization, it would cause a SEGV.
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test.conf:
-
-           As a consequence of implementing the ORB-specific
-           configuration, we discovered many implicit assumptions about
-           the lifetime of objects. For example, process-global Singletons
-           are created by service objects, loaded by ORBs, which are
-           themselves initialized from a DLL-loaded code. If that DLL,
-           which also contains the code for tearing down the Singleton
-           gets unloaded (for instance, as a consequence of calling
-           orb->destroy()), its TEXT segment will no longer be mapped in
-           memory when the Object Manager tries to destroy the Singleton.
-
-           Ossama has a solution for a similar problem, involving the TAO
-           Singleton Manager, for DLL-loaded ORBs (see the DLL_ORB test),
-           however it doesn't cover the ACE Object Manager.
-
-           This configuration change is a workaround the fact that SSLIOP,
-           loaded as a private service object by a DLL-based ORB,
-           registers a process-global Singleton - ACE_SLL_Context, with
-           the Object Manager. In an use-case with multiple dynamically
-           loaded components containing ORBs, SSLIOP should be loaded
-           prior to loading any of the dynamic components using it. In
-           general, any SO that uses ACE Singletons must be treated
-           similarly, or rewritten.
-
-Fri Jun  2 04:44:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLog_i.h:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
-
-          We must pass both the RootPOA and the Log POA to the log servant
-          ctor, destroy() needs to deactivate the servant on the Log POA.
-
-Thu Jun  1 23:13:58 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tests/DII_Collocation_Tests/Client_Task.cpp:
-        * tests/DII_Collocation_Tests/Client_Task.h:
-        * tests/DII_Collocation_Tests/Collocated_Test.cpp:
-        * tests/DII_Collocation_Tests/DII_Collocation_Tests.mpc:
-        * tests/DII_Collocation_Tests/Hello.cpp:
-        * tests/DII_Collocation_Tests/Hello.h:
-        * tests/DII_Collocation_Tests/README:
-        * tests/DII_Collocation_Tests/run_test.pl:
-        * tests/DII_Collocation_Tests/Server_Task.cpp:
-        * tests/DII_Collocation_Tests/Server_Task.h:
-        * tests/DII_Collocation_Tests/Test.idl:
-
-          These files are moved to the tests/DII_Collocation_Tests/oneway
-          directory since a new test for twoway collocated DII request
-          is added.
-
-        * tests/DII_Collocation_Tests/oneway/Client_Task.cpp:
-        * tests/DII_Collocation_Tests/oneway/Client_Task.h:
-        * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
-        * tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc:
-        * tests/DII_Collocation_Tests/oneway/Hello.cpp:
-        * tests/DII_Collocation_Tests/oneway/Hello.h:
-        * tests/DII_Collocation_Tests/oneway/README:
-        * tests/DII_Collocation_Tests/oneway/run_test.pl:
-        * tests/DII_Collocation_Tests/oneway/Server_Task.cpp:
-        * tests/DII_Collocation_Tests/oneway/Server_Task.h:
-        * tests/DII_Collocation_Tests/oneway/Test.idl:
-
-          These files are moved from tests/DII_Collocation_Tests directory.
-
-        * tests/DII_Collocation_Tests/twoway/Client_Task.cpp:
-        * tests/DII_Collocation_Tests/twoway/Client_Task.h:
-        * tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp:
-        * tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc:
-        * tests/DII_Collocation_Tests/twoway/Hello.cpp:
-        * tests/DII_Collocation_Tests/twoway/Hello.h:
-        * tests/DII_Collocation_Tests/twoway/README:
-        * tests/DII_Collocation_Tests/twoway/run_test.pl:
-        * tests/DII_Collocation_Tests/twoway/Server_Task.cpp:
-        * tests/DII_Collocation_Tests/twoway/Server_Task.h:
-        * tests/DII_Collocation_Tests/twoway/Test.idl:
-
-          Added a test for twoway collocation DII request via invoke ().
-          This test should fail now for the same reason as the
-          oneway collocation DII request. See bugzilla bug #2545
-          for details.
-
-Thu Jun  1 17:53:33 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-
-          Pass the RootPOA instead of the Log POA to the log servant ctor.
-          The log servant creates and attempts to activate a event channel
-          on the Log POA, which was failed because TAO's log event channel
-          implementation uses implicit activation (_this), and the Log POA
-          ImplicitActivationPolicy is NO_IMPLICIT_ACTIVATION.  In time, we
-          should consider whether we should create another POA just for
-          the event channels.
-
-        * orbsvcs/examples/Log/Event/run_test.pl:
-        * orbsvcs/examples/Log/Notify/run_test.pl:
-        * orbsvcs/examples/Log/RTEvent/run_test.pl:
-
-          New files.
-
-Thu Jun  1 16:54:56 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * tests/DII_Collocation_Tests/Client_Task.cpp:
-        * tests/DII_Collocation_Tests/Client_Task.h:
-        * tests/DII_Collocation_Tests/Collocated_Test.cpp:
-        * tests/DII_Collocation_Tests/DII_Collocation_Tests.mpc:
-        * tests/DII_Collocation_Tests/Hello.cpp:
-        * tests/DII_Collocation_Tests/Hello.h:
-        * tests/DII_Collocation_Tests/README:
-        * tests/DII_Collocation_Tests/run_test.pl:
-        * tests/DII_Collocation_Tests/Server_Task.cpp:
-        * tests/DII_Collocation_Tests/Server_Task.h:
-        * tests/DII_Collocation_Tests/Test.idl:
-
-          Added new DII_Collocation_Tests test to show bug #2545.
-          The test crashes on get_in_arg() or gives incorrect arguments
-          when the request is collocated oneway request and has "IN"
-          arguments. See bugzilla bug #2545.
-
-Thu Jun  1 14:16:06 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Changed reset_capacity_alarm_thresholds() to do nothing if
-          LogFullActionType is wrap.
-
-Thu Jun  1 14:06:20 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/examples/Log/Basic/run_test.pl:
-
-          New file.
-
-Thu Jun  1 14:02:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Changed set_records_attribute() to validate the query language
-          grammar.
-
-          Changed query_i() to set the length of the output sequence to
-          the maximum number of log records (this will be shrunk to the
-          real value once we find how many records match the constraint).
-          We must have got lucky with the old sequence implementation...
-
-Thu Jun  1 11:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Valuetype/ValueBase.cpp:
-          Const improvements
-
-Thu Jun  1 10:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/LocateRequest_Invocation_Adapter.cpp:
-          Use false instead of 0
-
-        * tao/operation_details.h:
-          Improved documentation
-
-Thu Jun  1 08:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
-          Return false instead 0
-
-        * tao/AnyTypeCode/*.cpp:
-          Fixed rcsid tags
-
-Thu Jun  1 02:26:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/RTCORBA/RT_PolicyFactory.h:
-        * tests/AMH_Oneway/client.cpp:
-        * tests/AMH_Oneway/server.cpp:
-          Memory leak fixes.
-
-Wed May 31 17:47:55 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/AnyTypeCode/Marshal.cpp:
-          Fuzz fix.
-
-Wed May 31 13:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/Marshal.cpp:
-          Handle a valuebox in the same way as a regular valuetype. Fixes
-          bugzilla bug 2542. Thanks to Jiang Wei
-          <jiangwei_1976 at yahoo dot com dot cn> for reporting this.
-
-Wed May 31 10:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/skip.cpp:
-          Const improvements
-
-Wed May 31 03:54:20 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/TAO_Internal.cpp:
-
-          Revert Jeff's May 25 change, it prevented the calling of a
-          necessary function if the debuglevel wasn't set high
-          enough. Reworked the logic enough to ensure the value Jeff's
-          change was protecting didn't start causing problems again.
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test2.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test3.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
-
-          Update this test to resolve some runtime issues and to ensure
-          the proper loading of subsequent service configuration files.
-
-Tue May 30 19:17:28 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/orbsvcs/Security/Security_PolicyFactory.h:
-
-          Fix a memory leak resulting from the failure to use a reference
-          counted local object for the policy factory.
-
-        * tao/ORBInitializer_Registry.cpp:
-        * tao/ORB_Core.cpp:
-
-          Make use of changes in the ACE_Service_Gestalt and
-          ACE_Dynamic_Service<> classes to address separation of
-          configuration contexts.
-
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-
-          Fix for memory leaks induced through improper ORB destruction.
-
-Tue May 30 18:33:12 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tao/DLL_Parser.h: Updated the documentation to explain the
-         lookup scheme when a filename is given.  Thanks to Phlip
-          <phlip2005 at gmail dot com> for motivating this.
-
-Tue May 30 16:31:14 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/Bug_2543_Regression/bug_2542_regression.cpp:
-
-          Added .in() to an OctetSeq_var passed as an argument.
-
-Tue May 30 16:25:24 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/Bug_2542_Regression/bug_2542_regression.cpp:
-
-          Added .in() to an OctetSeq_var passed as an argument.
-
-Tue May 30 15:53:50 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp (set_records_attribute):
-
-          Commented out unused argument.
-
-Tue May 30 14:34:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/array.idl:
-          Added FourDArray as testcase
-
-Tue May 30 14:24:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-          Generate false instead of 0
-
-        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
-          Const improvement to generated code
-
-        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
-          Fixed 64bit conversion warning
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-          Const improvement to generated code and use false instead of 0
-
-Tue May 30 14:10:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/Marshal.cpp:
-        * tao/AnyTypeCode/Marshal.inl:
-        * tao/AnyTypeCode/skip.cpp:
-        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
-        * tao/AnyTypeCode/Any.cpp:
-        * tao/CodecFactory/CDR_Encaps_Codec.cpp:
-        * tao/PI/PI.cpp:
-          Use true/false and const improvements
-
-Tue May 30 13:42:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/GIOP_Message_Base.{h,cpp}:
-          Removed the buffer as member, let the cdr stream get the buffer
-          from the allocator. This allocation is just done once at the
-          creation so this shouldn't impact performance a lot. Also use
-          the size argument passed to the constructor, specific protocol
-          implementations to pass this down to its base to set a
-          specific initial buffer size.
-
-Tue May 30 10:04:07 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2543_Regression/bug_2543_regression.cpp:
-        * tests/Bug_2542_Regression/bug_2542_regression.cpp:
-          Fixed conversion warnings
-
-Tue May 30 01:59:07 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Changed set_records_attribute() to iterate through all the
-          records in the hash map instead of calling query() and (if there
-          are enough matching records) fiddling with iterators, etc.  This
-          is not only faster, it also avoids a deadlock that shows up when
-          the iterator takes the already held rwlock.
-
-Tue May 30 01:01:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * NEWS:
-
-          Document changes.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          When a log channel's LogFullActionType is wrap, the capacity
-          threshold alarms "are triggered as if coupled to a gauge that
-          counts from zero to the highest capacity threshold value and
-          then resets to zero".
-
-          The log service didn't implement such a gauge and compared the
-          log channel's current size with the maximum size (as if the
-          LogFullActionType was halt).  This could result in an alarm
-          being sent for each log record, as the log channel will almost
-          always be "full".
-
-          Changed plug-in Strategy to maintain gauge.  Added get_gauge()
-          and reset_gauge().
-
-          Changed log channel to compare the value of the gauge with the
-          maximum size when the LogFullActionType is wrap.
-
-          Fixes bugzilla #2420.
-
-Mon May 29 14:28:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * NEWS:
-
-          Document changes.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Changed plug-in Strategy interface.  Added get_record_attribute(),
-          set_record_attribute(), and set_records_attribute(); removed
-          retrieve(), update(), and remove().
-
-          This will allow plug-in Strategies to handle these high-level
-          operations more efficiently.
-
-Mon May 29 08:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2542_Regression/*:
-          New regression for Bug_2542. Thanks to Jiang Wei
-          <jiangwei_1976 at yahoo dot com dot cn> for creating this regression.
-
-        * tests/Bug_2543_Regression/*:
-          New regression for Bug_2543. Thanks to Jiang Wei
-          <jiangwei_1976 at yahoo dot com dot cn> for creating this regression.
-
-Sun May 28 23:15:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Reworked checks for the log being full.  Just log the record,
-          the LogRecordStore will return an error if it is full.  This
-          avoids extra conditions in the write hot path.
-
-Sun May 28 23:10:03 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * docs/releasenotes/index.html:
-
-          Update for changes to the telecom logging service that have been
-          made over the last few months.
-
-Sun May 28 16:24:24 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Valuetype/ValueBase.cpp:
-          Add explicit dereferences where the ValueFactory_var is used in
-          equality tests.
-
-Sun May 28 15:18:19 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Removed unused LogRecord variable in write_recordlist().  This
-          avoids its construction and destruction in the write hot path.
-
-Sat May 27 22:00:08 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Don't invoke reset_capacity_thresholds() if no log records were
-          actually removed.
-
-Fri May 26 22:09:09 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Valuetype/ValueBase.cpp:
-          Fixed a memory leak introduced by the refactoring of
-          _tao_unmarshal_pre. The ValueFactory reference was moved into
-          the unmarshal_pre method directly, and in doing so inadvertently
-          got its _var status stripped.
-
-Fri May 26 11:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
-          Applied workarounds for BCB2006 and BCB6 in release mode, the
-          code results in the original form in an internal backend
-          error, reported this to Borland as QC27961.
-
-Thu May 25 23:12:56 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/TAO_Internal.cpp:
-
-          Fixed logic in open_services() to eliminate an unused local
-          variable warning (which happened when the TAO debug level
-          was less than 3) and made many cosmetic changes to the
-          whole file to bring the code into line with the ACE
-          style guidelines.
-
-Thu May 25 03:27:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/OctetSeqC.h:
-        * tao/OctetSeqC.cpp:
-        * tao/diffs/OctetSeq.diff:
-          Reverted change from Tue May 16 19:08:49 UTC 2006 Phil Mesnier
-          <mesnier_p@ociweb.com>
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-          Moved the equality operations into the octet sequence class,
-          making them member functions. This seems to resolve the
-          namespace related problems.
-
-
-Wed May 24 19:43:16 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp:
-          My fix for the servant reference counting used a ServantBase_var
-          as the owner of the pointer to the servant instance, but that
-          cannot be used as a target within ACE_NEW_RETURN macros on
-          windows because the MSVC compiler doesn't appropriately map the
-          post-assignment equality test. This minor change is to use a
-          servant type pointer for initialization with ACE_NEW, then
-          assign the result to a ServantBase_var for reference management.
-
-Wed May 24 18:27:13 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
-
-          Along with the /FORCE:MULTIPLE link option that is added by
-          MPC specifically for em3, nmake, vc6, and vc71 builds, added
-          the /INCREMENTAL:NO link option since the above option is
-          incompatible with incremental linking, and produces warnings
-          on the platforms where it is in force.
-
-Wed May 24 16:00:03 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/TAO_Internal.cpp:
-          Refactored recent change to skip over global parameters after
-          the first initialization pass.
-
-Wed May 24 12:40:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/EndpointPolicy/IIOPEndpointValue_i.h:
-          Fixed memory leak. Unlike servants, local objects are not
-          intrinsically reference counted. Therefore it is still necessary
-          to explicitly inherit from TAO_RefCount_LocalObject rather than
-          from CORBA::LocalObject.
-
-Wed May 24 10:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/String_Manager_T.h (out, _retn):
-          Just set ptr_ to 0 instead of initializing it with an default
-          string. Now we get the same behaviour as with the old string
-          manager, fixes runtime memory leaks when the string managers
-          are used
-
-Wed May 24 09:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies/DIOP_Connector.cpp:
-          Const improvements
-
-Wed May 24 09:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/performance.html:
-          Added ACE_NLOGGING=1 as one of the options that can be used to
-          reduce footprint. Adding this to the footprint build resulted in
-          a footprint drop of about 10% for the Hello client.
-
-Wed May 24 08:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Bounded_Sequence_CDR_T.h:
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Fixed memory leak in the demarshaling of (w)string sequences.
-
-Wed May 24 03:01:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/PortableServer/POAManager.cpp:
-        * tao/PortableServer/POAManagerFactory.cpp:
-
-          Cleaned up redundant debug messages.
-
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp:
-
-          Add (%P|%t) to many debug lines to improve ability to track
-          thread behavior during collocated calls. Also switched the
-          servant to using the modern reference counting method of using a
-          ServantBase_var to manage the local reference to the servant
-          rather than using an explicit call to _remove_ref() from within
-          the shutdown operation. Finally, added a slight delay after
-          orb->run() and before orb->destroy() to avoid thread races. See
-          bugzilla bug #2538 for more information about this race.
-
-Tue May 23 16:09:05 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
-        * tao/ORB_Constants.h:
-
-          See bugzilla #2500.  Around the time of TAO 1.4.7 the tags for UIPMC
-          (multicast) changed from TAO-assigned to OMG-assigned.  The
-          ComponentID and the ProfileID were added to tao/IOP_IORC.h but the
-          change to the new ProfileID was never completed, since code still
-          referred to the value in tao/ORB_Constants.h.  This change eliminates
-          the old ProfileID and changes all uses to the new one.  This causes a
-          break in multicast interoperability between applications using TAO
-          before this change and TAO after this change, but should enable
-          multicast interoperability between TAO and a different ORB.
-
-Tue May 23 13:05:43 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-          Fixed a typo in a service name.
-
-        * tao/TAO_Internal.cpp:
-
-          Added a function to address the situation where a second ORB is
-          initialized with arguments that are global and expected to be
-          removed from argv before ORB_Core::init starts parsing args.
-
-          Since the first initialized ORB is the default ORB, it is also
-          the one that sets global options, such as debug level, and
-          daemonization. In situations where multiple ORBs are initialized
-          indeterminately, such as via dynamically loaded service objects,
-          an application wanting a concrete set of global options should
-          explicitly initialize a default ORB.
-
-        * tao/IIOP_Acceptor.cpp:
-        * tao/PortableServer/Root_POA.cpp:
-        * tests/CollocationLockup/CollocationLockup.cpp:
-        * tests/InterOp-Naming/INS_test_client.cpp:
-        * tests/POA/EndpointPolicy/server.cpp:
-          Fixed memory leaks.
-
-
-Thu May 18 17:16:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-
-          Regenerated.
-
-          NB: The reason the Makefile.am's for the Event and RTEvent
-          Logging Services were not changed is because currently the
-          automake config are generated with the typed event channel
-          support enabled, which also requires valuetype.
-
-        * 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 the valuetype base project.
-
-          This is required in the case the event / log record embeds a
-          valuetype.  A event or log record contains one or more CORBA
-          anys.  The current implementation demarshals the any before
-          touching any app code.  Thus if the any were to contain a
-          valuetype, the valuetype library will be called upon to
-          demarshal the data.
-
-          The same change was made for the Notification Service in:
-                Mon Jul 18 13:12:15 2005  Ciju John  <john_c@ociweb.com>
-
-          This fixes bugzilla issue #2524.
-
-Thu May 18 15:10:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/run_tests_all.pl:
-
-          Updated to remove the Limits test from the list. The
-          functionality has been moved to the Service_Config_Test under
-          ACE.
-
-        * tests/ORB_Local_Config/Limits/Limits.mpc:
-        * tests/ORB_Local_Config/Limits/Test.cpp:
-        * tests/ORB_Local_Config/Limits/run_test.pl:
-
-          Removed these files.
-
-Thu May 18 13:52:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
-
-          Replaced servant activation using _this() with one explicitly
-          referencing the desired POA, using activate_object(). As usual,
-          using _this() outside the scope of an upcall yields surprising
-          results, because it is using the first ORB in the orb table, no
-          matter which one that is. Within a single process, it is
-          possible for the server's servant to get activated in the client
-          ORB's POA and then the client will fail to communicate with it,
-          because the client POA is not active.
-
-Wed May 17 23:07:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/OctetSeqC.h:
-        * tao/OctetSeqC.cpp:
-        * tao/diffs/OctetSeq.diff:
-
-          Fuzz removal.
-
-Wed May 17 19:35:09 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-
-          In the generated code for setting the member value,
-          removed the parentheses from the constructor call in
-          ACE_NEW, if the member type is a fixed-size IDL struct.
-          These parens were producing a warning on one of the
-          scoreboard's VC 7.1 builds, due to a behavior change
-          in the compiler. This behavior change is to initialize
-          PODs (for which an IDL fixed struct qualifies) to the
-          default value without requiring the parens denoting
-          a default constructor call.
-
-        * tests/Bug_2234_Regression/server.cpp:
-        * tests/OBV/ValueBox/client.cpp:
-
-          Made changes in hand-written client and server code in TAO/tests
-          similar to the changes in IDL compiler generated code above.
-
-Wed May 17 19:09:36 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        Merged OCI's changes
-          "Fri May 12 21:59:41 UTC 2006  Yan Dai  <dai_y@ociweb.com>"
-
-        * TAO/tao/Intrusive_Ref_Count_Handle_T.inl:
-
-          Fixed a potential memory leaks in operator==(T*) function.
-          The memory leak could happen when this assignment operator
-          is used to assign the same instance.
-
-        * TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp:
-
-          Made the TP_Dispatchable_Visitor object reset() called after
-          the request is dispatched. This would avoid the delay deletion
-          of the request and its referenced objects.
-
-        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
-
-          Made the transport object in TAO_ServerRequest be reference
-          counted by the CSD. Increment the reference counter when the
-          TAO_ServerRequest is cloned, and decrement the reference counter
-          when the server request is destroyed. This would avoid crash
-          when the transport object is destroyed but CSD has not finished
-          dispatching the request.
-
-        Merged OCI's changes
-          "Thu Apr 20 13:29:44 2006  Ciju John  <john_c@ociweb.com>"
-
-          Made an SSLIOP endpoint value of 'iiop://:/ssl_port=xyz' listen
-          on all available network interfaces instead of listening on a
-          specific IP address. These changes make the 'iiop://:/ssl_port=xyz'
-          and 'iiop:///ssl_port=xyz' have same semantics.
-
-        * tao/IIOP_Acceptor.h :
-        * tao/IIOP_Acceptor.cpp :
-
-          Refactored the address parsing code into a new method
-          'parse_address'.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp (open):
-
-          Use TAO_IIOP_Acceptor::parse_address() to initialize
-          ACE_INET_Addr.
-
-Wed May 17 18:47:22 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/AMH_Oneway/server.cpp:
-
-          Fix for an error in the construction of the test. This error is
-          a result of using a stack based servant, as well as a stack
-          based helper ORB-running helper class. The main for this test
-          instantiated the helper on the stack first, then the servant. It
-          was done in this order so that the servant could obtain a
-          reference to the helper's ORB. However, stack based objects are
-          destroyed in reverse order, meaning that the servant instance
-          was destroyed before the helper's instance. Thus the POA in the
-          helper ended up with a stale pointer to a prematurely deleted
-          servant when it came time to do an orderly shutdown.
-
-          There were several options for cleaning this up, the servant
-          could have been allocated on the stack and have all reference
-          but the POA's removed, the servant's destructor could have
-          deactivated itself from the POA, or an explicit cleanup method
-          could be added to the helper class so the main could force the
-          proper order of desctruction. I chose this last option since the
-          main was in charge of determining the order of creation.
-
-Wed May 17 16:34:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/AMI_Buffering/AMI_Buffering.h:
-
-          Fix scoping for new nested class used to avoid spurious comm
-          fail exceptions. This fix resolves build fails that only affect
-          the BCB compiler.
-
-Wed May 17 14:11:35 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
-        * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h:
-
-          Added generation of an anonymous namespace inside the
-          TAO::TypeCode namespaces already generated, for
-          typecodes ggenerated for anonymous types (sequences,
-          arrays, and bounded (w)stringts). This change prevents
-          a multiple definition link error with a typecode
-          generated for an identical type in another translation
-          unit. The exisiting generated ifdef guards prevent
-          the same error within the same translation unit.
-          Thanks to Ossmama Othman <ossama.othman@symantec.com>
-          for suggesting the fix. This fix closes [BUGID:2521].
-
-          Also removed many lines of commented out code from
-          this file.
-
-Wed May 17 12:10:58 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Bounded_Sequence_CDR_T.h:
-
-          Reverting this change, it didn't work.
-          Mon May 15 22:25:23 UTC 2006  Phil Mesnier <mesnier_p@ociweb.com>
-
-           * tao/Bounded_Sequence_CDR_T.h:
-             Added explicit include to satisfy the HP compiler.
-
-
-Wed May 17 11:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_traits.cpp:
-          Added extra newline so that the zero method is on its own line
-
-Wed May 17 09:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc:
-          Simplified this mpc file
-
-Tue May 16 19:08:49 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-          Add decription of new features/fixes.
-
-        * tao/BiDir_GIOP/BiDirGIOP.h:
-        * tao/CSD_Framework/CSD_Object_Adapter_Factory.h:
-        * tao/EndpointPolicy/EndpointPolicy.h:
-        * tao/EndpointPolicy/EndpointPolicy.cpp:
-        * tao/Messaging/Messaging_Loader.h:
-        * tao/PI_Server/PI_Server_Loader.h:
-        * tao/RTScheduling/RTScheduler_Loader.h:
-
-          Fix for certain static builds, notably VC71 on WinXP, for
-          libraries that depend on the Portable Interceptors library for
-          registering ORB Initializers.
-
-        * tests/Bug_2417_Regression/publisher_impl.cpp:
-
-          This test runs very long for what it is demonstrating. With the
-          underlying reference counting problem resolved, the server now
-          runs to completion. Since the test is using asynch connection
-          establishment and SYNCH_NONE oneways, there is no way for the
-          publisher to detect that the subscriber is gone until it makes a
-          synchronizing twoway call. The period between synch tests was so
-          long that on a slow machine the test would time out.
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
-        * tao/OctetSeqC.cpp:
-        * tao/OctetSeqC.h:
-        * tao/diffs/OctetSeq.diff:
-
-          Applying fixes to the problems still remaining in the versioned
-          namespace builds. Not all compilers found the problem in
-          Reconfig_Scheduler_T.cpp, but gcc 3.3.1 did. The OctetSeq change
-          might represent a candidate for a change to the IDL compiler,
-          but for now I think not, as octet sequences are treated as a
-          special case, having an explicit template instanciation provided
-          along with explicit equality operators.
-
-Tue May 16 14:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Strategies/Strategies.mpc:
-        * tests/Bug_2134_Regression/Bug_2134_Regression.mpc:
-        * tests/Bug_2494_Regression/Bug_2494_Regression.mpc:
-          Simplified these mpc files
-
-Tue May 16 14:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/AV/TCP.cpp:
-          Const improvments and initialise some pointers with 0
-
-        * orbsvcs/orbsvcs/AV/RTP.cpp:
-        * orbsvcs/orbsvcs/AV/sfp.cpp:
-          Use a CORBA::ULong to iterate through the TAO_AV_PolicyList
-
-Tue May 16 14:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/CosProperty.idl:
-          Corrected incorrect filename in the header of this file
-
-Tue May 16 12:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Asynch_Queued_Message.cpp:
-        * tao/Synch_Queued_Message.cpp:
-        * tao/GIOP_Message_Generator_Parser_10.cpp:
-        * tao/Object.cpp:
-        * tao/Profile.cpp:
-        * tao/IIOP_Profile.cpp:
-        * tao/Strategies/DIOP_Acceptor.cpp:
-        * tao/Strategies/DIOP_Endpoint.cpp:
-          Const improvements
-
-        * tao/GIOP_Message_State.cpp:
-          Improved error message when the GIOP header can't be parsed
-
-        * tao/ORB.cpp:
-          Initialise pointer with 0.
-
-        * tao/PortableServer/PolicyS_T.h:
-          Use true instead of 1
-
-Tue May 16 05:22:15 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Connector.cpp:
-
-          This is a potential fix for the Bug 2417 flaw. The problem is
-          that when using nonblocking connects, in conjunction with asynch
-          invocations, it is possible for a transport to be returned by
-          the connector even though the network connection has not
-          completed. For asynchronous invocations using the SYNCH_NONE
-          policy, this is appropriate, as request messages may be queued
-          for delivery if/when the connection completes.
-
-          Bug 2417 describes a scenario where such a nonblocking
-          connection attempt fails, but the actual failure happens after
-          the transport has already been returned to the caller. This
-          causes a problem because the underlying ACE connector framework
-          relies on "borrowing" the reference to the connection handler
-          during the time it is waiting for connections to complete or
-          fail. For blocked connects this is fine because either the
-          transport will be returned to the caller associated with a
-          completely established connection, or a failure will occur.
-
-          The issue for nonblocking connects is that when a transport is
-          returned associated with a pending connection, the existing
-          transport connector and protocol-specific connector end up
-          associating to referrers to the same connection handler, without
-          incrementing the reference count. The two are the transport
-          being returned and the ACE_NonBlock_Connection_Handler that is
-          actually registered with the reactor waiting for success or
-          failure on the pending connection.
-
-          When a connection completes OK, the NBCH surrenders its
-          reference to the connection handler, thus restoring parity, as
-          the transport and/or cache entry will still hold the remaining
-          references, and the count is OK. But when the connection fails,
-          the base connector ends up calling close() on the connection
-          handler which in turn decrements the reference count. This then
-          sets the stage for a later crash from an apparent double delete.
-
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/Transport_Connector.cpp:
-
-          Added some comments and cleaned up some whitespace.
-
-Mon May 15 22:25:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Bounded_Sequence_CDR_T.h:
-          Added explicit include to satisfy the HP compiler.
-
-Mon May 15 18:17:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Codeset_Manager_Factory_Base.h:
-        * tao/Codeset_Manager_Factory_Base.cpp:
-        * tao/PortableServer/Acceptor_Filter_Factory.h:
-        * tao/PortableServer/Acceptor_Filter_Factory.cpp:
-
-          Moved the static initializer from inside the .cpp to the header
-          file. This change was necesitated by the VC7.1 static build that
-          was apparently skipping over the static initializer if it wasn't
-          in the .h.
-
-Mon May 15 13:28:01 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/AMI_Buffering/AMI_Buffering.h:
-        * tests/AMI_Buffering/AMI_Buffering.cpp:
-        * tests/AMI_Buffering/client.cpp:
-
-          The tests still fail on a lot of machines with a series of
-          COMM_FAIL exceptions being reported. These are due to a nesting
-          problem within the server, since it is receiving requests from
-          the client and also making requests to the admin. What happens
-          is that with the asynchronous calls, a whole bunch of requests
-          are sent to the server, and before it gets a chance to receive
-          all the replies from the admin, the client sends a shutdown.
-          This immediately closes the server's client-side connection to
-          the admin, and if any replies were pending, those are lost,
-          causing the comm fails. I've also added a log message reporting
-          the maximum nesting level attained by the server.
-
-          The client now delegates responsibility of shutting down the
-          admin to the server as another way of eliminating any races that
-          might cause spurious error reports.
-
-Mon May 15 12:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-          Fixed compile problem when TAO_NO_COPY_OCTET_SEQUENCES is defined
-          to 0
-
-Mon May 15 09:59:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-
-          A potential solution to the namespace problem. This at least
-          works for the gcc/linux build.
-
-Mon May 15 02:50:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/AMI_Buffering/client.cpp:
-        * tests/Oneway_Buffering/client.cpp:
-
-          Add the header for defining sleep for the platforms that don't
-          happen to get it indirectly.
-
-Sun May 14 13:32:33 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/AMI_Buffering/client.cpp:
-        * tests/Oneway_Buffering/client.cpp:
-
-          Minor change to insert a pause after killing the server but
-          before killing the admin. This gives the server a moment to
-          flush out any messages it wants to send to the admin. Without
-          this pause, the test occasionally reports spurious comm failures
-          that cause the scoreboard to count the test as failed.
-
-        * tests/Connection_Timeout/client.cpp:
-
-          Added more information to failure output.
-
-Sat May 13 22:07:04 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/LF_CH_Event.h:
-        * tao/LF_CH_Event.cpp:
-        * tao/Transport_Connector.cpp:
-
-          This is a fix for intermittent timeout problems when using
-          asynch connections. Some tests, most notably the AMI_Buffering
-          timeout test, randomly fail in that the client seems to just
-          stop dead. I found that this failure occured when using
-          nonblocking connects with at least 2 threads, one of which is
-          invoking ORB::run while the other is trying to connect.
-
-          The problem is that an asynch connection might cause the
-          transport to cached in an unconnected state, relying on a
-          subsequent connection request to enter the connection wait
-          strategy and complete the connection. When using the leader
-          follower wait strategy, a non-blocking connect will "poll" by
-          setting the timeout value to be ACE_Time_Value::zero. A race
-          could occur when the other thread actually handles the
-          connection completion, but after the interested thread starts to
-          enter the leader-follower. In this case the timeout of zero
-          causes the LF to change the connection handler's state to
-          TIMEOUT, but this was not detected as an error condition. Thus
-          the LF_Event relating to the connection completion was never
-          successful or an error and the waiting thread became the leader
-          and was then stuck.
-
-          This fix works by first treating the TIMEOUT state as an error,
-          to break out of the LF loop, then the connector will reset the
-          timeout state if that is appropriate. Finally, a second error in
-          the connector is fixed where the transport's register_handler
-          method return value was incorrectly tested.
-
-        * tests/AMI_Buffering/client.cpp:
-
-          Adjusted the timeout values a bit. On a sufficiently fast
-          computer, it is possible for the sender to overflow the TCP
-          buffers thus taking too long to flush and spuriously reporting
-          errors.
-
-Sat May 13 14:34:23 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
-
-          Removing the use of ACE_OS::unlink() since it is causing
-          unresolved link errors on windoze. Using alternative IOR file
-          truncation method to get rid of "stale" IOR files from previous
-          executions.
-
-Fri May 12 14:00:17 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl:
-        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
-
-          Updated the test to account for the case where the server may
-          not have completed writing out its IOR, by the time the client
-          tries to use it to get an object reference. Added ACE_TEXT where
-          appropriate.
-
-Thu May 11 21:13:22 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/AnyTypeCode/Any_Unknown_IDL_Type.h:
-        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
-
-          Having a lock_ as a global static makes this code subject to the
-          whim of the specific compiler implementation and library
-          ordering. It is up to the compiler to decide the order in which
-          our instance is initialized and destroyed. Typically, this
-          becomes a problem when a code that depends on that instance
-          finds that the runtime has already destroyed it. The scenario
-          plays almost always in the process shutdown code, after main()
-          exits (which is a lot of fun to debug :).  The change replaces
-          the static class member with static-local variable, defined
-          within a static member function. C++ guarantees that the local
-          static variable will be initialized at the first method
-          invocation.
-
-        * tao/ORB_Core.cpp:
-
-          Reversing a changes, introduced by this:
-          Wed Apr 26 20:21:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          I had incorrectly assumed that the same pattern of dynamic
-          loading of factories applies to all factories. In fact many of
-          them are optional and their usage is predicated on having a svc
-          conf file, having their library statically linked. This change
-          removes the overly aggressive attempts to load such services and
-          the incorrect usage of TAO_AS_STATIC_LIBS macro..
-
-Thu May 11 19:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Reverted the change below, it breaks some gcc builds, have to figure
-        out another change.
-
-        Thu May 11 13:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-        * tao/Unbounded_Octet_Sequence_T.h:
-          Moved equal and not equal operators for the octet sequence to
-          the TAO namespace, this fixes the build error in the vc71
-          namespace build.
-
-Thu May 11 09:22:10 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * performance-tests/Throughput/Receiver.cpp (done),
-        * performance-tests/Throughput/client.cpp (main): Changed
-          division by 10000000 to division by 1000000.  Thanks to
-          Jason Zhao <jason.zhao at lmco dot com>.
-
-Thu May 11 13:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1254_Regression/BlobServer.h:
-        * tests/Bug_1254_Regression/client.cpp:
-          Fixed casing of includes
-
-Thu May 11 13:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-          Moved equal and not equal operators for the octet sequence to
-          the TAO namespace, this fixes the build error in the vc71
-          namespace build.
-
-        * tests/OBV/Truncatable/client.cpp:
-          Added missing string_dup calls, fixes crashing of this test
-          with Borland C++
-
-Thu May 11 10:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Generic_Sequence_T.h:
-          Small layout change
-
-Thu May 11 07:19:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
-
-        * tests/Bug_1254_Regression/*
-          New regression for bug 1254
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-          Fixed a bug in the octet sequence when used as inout argument and
-          when shrinking the lenght while a message block was being used
-          the full message block was send back, not the smaller length.
-          We now do a copy of the data to really make sure we don't
-          modify the mb incorrectly. Thanks to Peter van Merkerk
-          <Peter dot van dot Merkerk at meco dot nl> and
-          Marc Walrave <marc dot walrave at meco dot nl> for reporting this.
-          This fixes bugzilla bug 1254.
-
-Wed May 10 20:13:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/PI/ORBInitializer_Registry_Impl.h:
-        * tao/PI/ORBInitializer_Registry_Impl.cpp:
-        * tao/PI/PI.cpp:
-
-          My change from last night (04:26:14 UTC) swung the pendulum too
-          far back in the other direction. I discovered that once again
-          some dynamic PI tests were breaking. I've rectified this by
-          putting Iliyan's code back in ORBInitialiser_Registry_Impl but
-          with a !TAO_AS_STATIC_LIBS guard around the code to avoid the
-          redundant processing that might occur with static libs.
-
-Wed May 10 17:21:26 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/EndpointPolicy/Endpoint_Value_Impl.h:
-
-          I missed committing this with the other versioned namespace
-          changes.
-
-Wed May 10 11:49:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/PortableServer/Acceptor_Filter_Factory.h:
-        * tao/PortableServer/POAManagerFactoryC.h:
-        * tao/PortableServer/POAManagerFactoryC.cpp:
-
-          Cleaning up Versioned namespace related issues.
-
-Wed May 10 04:26:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-
-          Removed the agressive loading of the IORInterceptor adaptor
-          factory. It truely is optional, thus its failure to load is not
-          an error. At least not an error in the ORB core.
-
-        * tao/PI/ORBInitializer_Registry_Impl.h:
-        * tao/PI/ORBInitializer_Registry_Impl.cpp:
-        * tao/PI/PI.h:
-        * tao/PI/PI.cpp:
-        * tao/PI/PolicyFactory_Loader.h:
-        * tao/PI/PolicyFactory_Loader.cpp:
-
-          Reverted most of the changes used to resolve a circular
-          dependency problem with the PI initialization. The problem is
-          that the initial fix then broke the static builds. The solution
-          of using TAO_AS_STATIC_BUILDS is a reasonable compromise as it
-          allows dynamic builds to not get caught in a circular
-          initialization situation, but lets static builds get the
-          initialization they need.
-
-Tue May  9 19:05:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-          Added -GT to the idlflags
-
-Tue May  9 16:32:01 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-
-          Added a clarifying comment.
-
-        * tao/TAO_Internal.cpp:
-
-          Fixing a problem in processing -ORBSvcConf command-line
-          options. Both the process-wide and the ORB-local service
-          gestalts were processing configuration files. This was causing
-          the loading of the default svc.conf file, even when another one
-          had been specified by -ORBSvcConf. The fix is to give the
-          process-wide gestalt a chance to load the svc conf file, if it
-          is being initialized for the first time.
-
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-
-          Minor updates.
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
-
-          Updated the tests to eliminate some possibilities for TRANSIENT
-          exceptions.
-
-Tue May  9 11:37:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/tutorials/Quoter/idl/Quoter_idl.mpc:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * examples/POA/TIE/Makefile.am:
-        * docs/tutorials/Quoter/idl/Makefile.am:
-          Add -GT to the idlflags
-
-Tue May  9 07:46:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/String_Alloc.cpp:
-          Small const fix, simplified CORBA::string_dup a little bit
-
-Tue May  9 07:36:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_global.cpp:
-          Don't generate the TIE files (_S.*) by default anymore. The
-          commandline option -Sc has been removed, this suppressed the
-          generation of these files. The new option -GT has been added,
-          if you need the TIE files, use the -GT option when compiling
-          your idl files. This safes disk space on all systems and on
-          slower machines the builds run then faster. Fixes bug 2525
-
-        * docs/compiler.html:
-          Removed -Sc, added -GT
-
-        * NEWS:
-          Mention the TIE behaviour change
-
-        * examples/POA/TIE/POA_TIE.mpc:
-          Added -GT to the idlflags
-
-        * tao/*.pidl:
-          Removed the -Sc flag in the regeneration instructions
-
-Mon May  8 15:52:31 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be_visitor_union_branch/cdr_op_cs.cpp (visit_enum):
-
-          Added code generation to initialize an enum member of a
-          union when it is declared for demarshaling. This change
-          eliminates warnings in gcc 4.0.2 and possibly other
-          compilers.
-
-Mon May  8 10:06:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * docs/Options.html:
-        * docs/ORBEndpoint.html:
-        * docs/INS.html:
-          Added IPv6 specific info regarding endpoint and corbaloc
-          definitions.
-          Added some links for easier crossreferencing.
-
-Mon May  8 09:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Hello/run_test.pl:
-          Added support for a -debug commandline arugment, if this is
-          passed when starting this script then -ORBDebugLevel 10 is
-          passed to client and server.
-
-Sun May  7 21:39:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bunch/Test.cpp:
-
-          Removed a misplaced semicolon.
-
-Sun May  7 14:56:20 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bunch/Test.cpp:
-
-          Removed semicolons after if() - cleaning the residue from
-          replacing the ACE_ASSERTs.
-
-Sun May  7 06:59:54 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-
-          Replaced 'new' with ACE_NEW.
-
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-        * tests/ORB_Local_Config/Shared/Test.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl:
-        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h:
-
-          Minor edits and cleanup.
-
-Fri Apr 28 10:47:26 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * tao/Stub.cpp: Added a #include of "tao/CDR.h" to support SunC++.
-          Thanks to Vladimir Panov <gbr at voidland dot org> for reporting
-          this.
-
-Fri Apr 14 17:47:18 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * docs/releasenotes/index.html: Updated the documentation to
-          include more pluggable protocols.  Thanks to Willie Chen
-          <wchen12 at ucla dot edu> for motivating this.
-
-Fri May  5 18:48:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/TAO_Internal.cpp:
-        * tao/default_resource.cpp:
-          In addtion to the reorganization Iliyan did, it was discovered
-          that the codeset library was not getting properly
-          initialized. When the codeset negotiation feature was made
-          optional for footprint considerations, the loading of the
-          codeset library was put into the default Resource
-          Factory. However now that we have the potential for multiple
-          service repositories, it was no longer sufficient do such late
-          initialization of the codeset library. Doing so put it codeset
-          manager and default translators in the configuration context of
-          the first ORB, not in the global configuration context. Moving
-          the bootstrap loading of the Codeset library to TAO internals
-          resolves that. The -ORBNegotiateCodeset flag is still evaluated
-          making codeset loading optional. It will be loaded to the global
-          configuration context by the first ORB that needs it.
-
-Fri May  5 18:05:04 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-        * tests/ORB_Local_Config/Bunch/Test.cpp:
-        * tests/ORB_Local_Config/Limits/Test.cpp:
-        * tests/ORB_Local_Config/Separation/Test.cpp:
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-        * tests/ORB_Local_Config/Shared/Test.cpp:
-        * tests/ORB_Local_Config/Simple/Test.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
-
-          Eliminating the use of ACE_ASSERT and replacing with if's and
-          ACE_ERROR. The ACE_ASSERT may cause an abort(), which will cause
-          resources to not be cleaned correctly on embedded targets like
-          VxWorks. Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for
-          clarifying this.
-
-        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h:
-
-          A little cleanup.
-
-Fri May  5 16:12:17 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-        * tao/TAO_Internal.cpp:
-
-          The initialization of the additional services, which runs right
-          after the global repository initialization (open()) was supposed
-          to execute in the context of that same global repository. This
-          is necessary in case the initialization causes additional
-          services to be registered. Fixes a problem with
-          $TAO_ROOT/tests/RTCORBA/ORB_init.
-
-Fri May  5 11:26:42 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Asynch_Queued_Message.{h,cpp}:
-        * tao/Synch_Queued_Message.{h,cpp}:
-          Changed is_heap_allocated to a real bool so that it matches
-          the base class.
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-          Small const improvment
-
-        * tao/GIOP_Message_Base.cpp:
-          Fixed typo in comment
-
-        * tao/DynamicInterface/Request.h:
-          Removed commented out method
-
-Thu May  4 16:22:42 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h:
-
-          Regenerated the file to fix a problem with building the test in
-          static builds.
-
-Thu May  4 13:36:00 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-
-          Eliminated a "magic" constant, used for the number of expected
-          services, because it can vary dependent on the particular TAO
-          configuration, like mincorba, static, etc.
-
-Thu May  4 08:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ClientRequestInfo.cpp:
-          Fixed bug 2510 in such a way that TAO doesn't crash but it seems
-          we then miss some functionalify. The reporter will extend the test
-          to detect the missing functionality. Thanks to Martin Cornelius
-          <Martin dot Cornelius at smiths-heimann dot com>
-          for reporting this bug and providing a regression test
-
-Thu May  4 07:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
-          Fixed warning in VxWorks 5.5.1 builds
-
-Thu May  4 00:45:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Removed EndpointPolicy/EndpointPolicyC.inl.
-
-Wed May  3 21:26:07 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/TAO_Internal.cpp:
-          The order of initialization of static services was modified as
-          multi-orb configuration feature implementation. Somehow during
-          that refactoring some services that are required to be initialized
-          ended up having that done before the svc.conf file is processed.
-          For instance RT_ORB_Loader. This change breaks up the loading of
-          and initializing of these services to ensure that svc.conf always
-          gets processed first before doing any default initialization.
-
-Wed May  3 19:14:12 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
-
-          Updated to resolve buld failures (vc71+Windows) - the two DLLs
-          produced, now contain identical code. It determines at runtime,
-          whether to act as a client or as a server - a decision
-          influenced by a command-line option, in the service
-          configuration file.
-
-Wed May  3 18:32:29 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/POA/EndpointPolicy/run_test.pl:
-          The test was failing on Windows because TAO apparently gets
-          built with -ORBDottedDecimalAddresses defaulted to 1. The
-          current version of the endpoint policy is very simple in that it
-          uses literal string comparisons for determining the suitability
-          of a given candidate profile endpoint. The test is specificly
-          trying to match "localhost" but fails when the server
-          substitutes "127.0.0.1" Perhaps an alternative solution would be
-          to test both literal strings.
-
-Wed May  3 16:54:41 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
-
-          Fix an apparent typo introduced the previous commit.
-
-Wed May  3 16:06:56 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc:
-        * tests/ORB_Local_Config/Bunch/Bunch.mpc:
-        * tests/ORB_Local_Config/Limits/Limits.mpc:
-        * tests/ORB_Local_Config/Separation/Separation.mpc:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
-        * tests/ORB_Local_Config/Shared/Shared.mpc:
-        * tests/ORB_Local_Config/Simple/Simple.mpc:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
-
-          Removed the dependency on ACE test_output library to make it
-          possible to build the TAO tests without having to build ACE
-          tests. This is often the case on embedded platforms (VxWorks),
-          where part of the tests run outside the host platform. Thanks to
-          Johnny Willemsen for pointing that out.
-
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-        * tests/ORB_Local_Config/Bunch/Test.cpp:
-        * tests/ORB_Local_Config/Limits/Test.cpp:
-        * tests/ORB_Local_Config/Separation/Test.cpp:
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-        * tests/ORB_Local_Config/Shared/Test.cpp:
-        * tests/ORB_Local_Config/Simple/Test.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
-
-          Updated the code to use its own ACE_MAIN and fixed some typos.
-
-Wed May  3 15:42:14 UTC 2006  Yan Dai  <dai_y@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
-
-          Fixed the DDS compilation errors due to the recent
-          unbounded string sequence implementation changes.
-
-Wed May  3 13:03:03 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-        * tao/tao.mpc:
-
-          Fix yet another typo.
-
-Wed May  3 09:56:10 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Bug_2510_Regression/client.cpp:
-          At the end of the test shutdown the server
-
-Wed May  3 03:35:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/LF_Multi_Event.h:
-        * tao/LF_Multi_Event.cpp:
-        * tao/PortableServer/POAManagerFactory.h:
-        * tao/PortableServer/POAManagerFactory.cpp:
-        * tao/PortableServer/POAManagerFactoryC.h:
-          Adding in Versioned namespace macros.
-
-Tue May  2 22:01:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
-          Added the portableserver base project to both the client lib and
-          server lib projects, since both require client and server
-          behavior. This is required for windows builds where apparently
-          DLLs must have all symbols fully resolved at link time, unlike
-          .so's where they only need to be satisfied at runtime.
-
-Tue May  2 19:08:18 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h:
-
-        Changing auto_ptr to ACE_Auto_Ptr, because some platforms
-        (WinXP64_Intel90_64bit) provide an auto_ptr<> without the reset
-        method.
-
-Tue May  2 15:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp:
-        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp:
-          Added missing includes. Thanks to Carlos O'Ryan for
-          reporting this
-
-Tue May  2 13:24:26 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/tao.mpc:
-          Reverted J.T.'s change from Mon May  1 20:03:59 UTC 2006
-          to flush out the cvs conflict markers and reapplied just his
-          typo fix.
-
-Tue May  2 11:47:55 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Separation/Test.cpp:
-        * tests/ORB_Local_Config/Shared/Test.cpp:
-        * tests/ORB_Local_Config/Simple/Test.cpp:
-
-          The test don't need more specialized type than the base
-          ACE_Service_Object, in order to demonstrate the intent.
-
-Tue May  2 08:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/driver/drv_preproc.cpp:
-          When we can't remove the input or output file use %p to print
-          the error so that the info from the OS why this couldn't be
-          done is also reported to the user.
-
-Tue May  2 03:59:17 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Connector.h:
-        * tao/IIOP_Connector.cpp:
-        * tao/Transport_Descriptor_Interface.h:
-        * tao/Transport_Descriptor_Interface.cpp:
-
-          This fix resolves a problem exposed by the
-          performance-tests/RTCorba/Oneway/Reliable test. That failure was
-          showing up as a pure virtual function call, but the root cause
-          was related to the changes to the IIOP_Connector in how it
-          cached new transports. I was creating a new transport descriptor
-          out of the successful endpoint, but using creating a new
-          Base_Transport_Descriptor rather than reusing the supplied
-          transport descriptor. This broke RT tests in that subsequent
-          invocations would fail to find the cached endpoint since the
-          type was different. I've resolved that by adding the new
-          reset_endpoint method on the Transport_Descriptor_Interface
-          which allows the transport connector to set a new endpoint to
-          the existing transport descriptor before caching the value.
-
-Mon May  1 21:54:05 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bunch/Test.cpp:
-
-          Modified the test not to require the ability to fully
-          instantiate TAO_CORBANAME_Parser, etc. which is a class in
-          another library and it is not declared so that it is "visible"
-          outside of it. The test does not require that in order to be
-          functional - using the base class ACE_Service_Object.
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
-
-          Added some more logging.
-
-Mon May  1 20:03:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-        * tao/tao.mpc:
-
-          Fix typo.
-
-Mon May  1 19:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/Simple/OBV_Simple.mpc:
-          This test isn't dependent on minimum_corba
-
-Mon May  1 18:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/TypeCode.{h,cpp}:
-          Made type TypeCode_ptr argument of operator << const so that
-          the signature is the same as declared in DynamicA.h
-
-Mon May  1 15:33:00 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/OBV/Truncatable/client.cpp:
-          This is an improvement to what I committed earlier. Since the
-          valuetypes are passed by value, it is perfectly reasonable to
-          allocate them on the stack locally. That way I could get away
-          from the use of the var to store a reference to the local value
-          instance, and also avoid the awkward initialization code used to
-          avoid the ambiguity BCB6 was complaining about.
-
-        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
-          Changed the name of an internal catch value. I'm not sure, but I
-          suspect this is what was causing the BCB compiler to complain at
-          the point of ACE_CATCHANY.
-
-Mon May  1 12:04:17 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/OBV/Truncatable/client.cpp:
-        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
-          The Borland BCB6 compiler has trouble with var types and const
-          vs. non-const assignment or comparisons. These changes are an
-          attempt to address this trouble. I don't like the nature of
-          these changes as they are moving away from the built-in type
-          safety C++ is supposed to provide.
-
-Mon May  1 03:43:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Parallel_Connect_Strategy/run_test.pl:
-          The fix for this test was to ensure the CORBALOC parser put all
-          the listed endpoints into a single Profile.
-
-Sun Apr 30 22:53:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-          Somehow when I applied my patch for the alternate connection
-          timeout hook, used allow either or both the AMI connection
-          timeout policy or the optimized connection endpoint selector to
-          set the connection timeout hook, I managed to apply my change to
-          the relative round trip timeout hook. This change addresses that
-          and fixes the AMI_Timeout test.
-
-Sun Apr 30 20:24:39 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc:
-        * tests/ORB_Local_Config/Bunch/Bunch.mpc:
-        * tests/ORB_Local_Config/Limits/Limits.mpc:
-        * tests/ORB_Local_Config/Separation/Separation.mpc:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-        * tests/ORB_Local_Config/Shared/Shared.mpc:
-        * tests/ORB_Local_Config/Simple/Simple.mpc:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
-        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h:
-
-          Updated to simplify the tests and the build process
-
-        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.cpp:
-        * tests/ORB_Local_Config/lib/lib.mpc:
-
-          Removed these files.
-
-Sun Apr 30 15:36:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
-        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
-          Fixed the assignment to the sequence to hand a buffer the
-          sequence can properly release.
-
-Sun Apr 30 14:24:20 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * TAO/tao/Profile_Transport_Resolver.cpp:
-          Removed invalid semicolons.
-
-        * TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
-          Fixed the dynamic flag for windows builds.
-
-Sun Apr 30 04:54:25 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-
-          Cleaned up the test a bit to clarify the intent.
-
-Sun Apr 30 00:47:10 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-          Undoing the damage caused by my too-hasty previous checkin.
-
-        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
-        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
-          Addressing some more compiler warnings
-
-Sat Apr 29 15:34:15 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/PortableServer/POAManagerFactory.cpp:
-
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf:
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h:
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
-
-        * tests/ORT/ORT_test_IORInterceptor.cpp:
-
-        * tests/POA/EndpointPolicy/server.cpp:
-
-          Fixes for various build-specific errors/warnings.
-
-Sat Apr 29 14:17:32 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-
-          Removed references  to <iostream> and unreferenced variables.
-
-Sat Apr 29 13:13:20 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-          Fuzz cleanup.
-
-Sat Apr 29 02:26:49 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/EndpointPolicy/EndpointPolicy_i.cpp:
-          Removed the apparently redundant ACE_NESTED_CLASS macros.
-
-Fri Apr 28 22:25:57 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bunch/Test.cpp:
-        * tests/ORB_Local_Config/Limits/Test.cpp:
-        * tests/ORB_Local_Config/Separation/Test.cpp:
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-        * tests/ORB_Local_Config/Shared/Test.cpp:
-        * tests/ORB_Local_Config/Simple/Test.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
-
-          Modified to eliminate warnings about unused variables on
-          ACE_NDEBUG builds.
-
-Fri Apr 28 22:04:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc:
-        * tests/ORB_Local_Config/Bug_1459/README:
-        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
-        * tests/ORB_Local_Config/Bug_1459/a.conf:
-        * tests/ORB_Local_Config/Bug_1459/b.conf:
-        * tests/ORB_Local_Config/Bug_1459/m.conf:
-        * tests/ORB_Local_Config/Bug_1459/m1.conf:
-        * tests/ORB_Local_Config/Bug_1459/run_test.pl:
-        * tests/ORB_Local_Config/Bug_1459/server_cert.pem:
-        * tests/ORB_Local_Config/Bug_1459/server_key.pem:
-
-          Added a test I borrowed from bugzilla 1459. It tests the ability
-          to have two differently configured ORBs in the same process.
-
-        * examples/Simple/time-date/Time_Date.cpp:
-
-          Provided an ID for the ORB, initialized in a code that was
-          loaded from the DLL. The ORB-specific Service Repo changes
-          eliminated the need to make TAO_Singleton_Manager not register
-          with the Object Manager, when initialized from a DLL.
-
-Fri Apr 28 15:14:04 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.UTF-16.conf:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.UTF-16.conf.xml:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.WCHAR_T.conf:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.WCHAR_T.conf.xml:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.conf:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.conf.xml:
-
-          Moved these files to Service_Dependency, which also received the
-          code that uses these.
-
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.UTF-16.conf:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.UTF-16.conf.xml:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.WCHAR_T.conf:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.WCHAR_T.conf.xml:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml:
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-
-          Moved here the config files from the Bunch test as it may be run
-          in single threaded builds and the code that uses these config
-          files requires multiple threads.
-
-Fri Apr 28 14:51:20 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TAO_Internal.cpp:
-
-          Fixed an error, that prevented the initialization of static
-          services during Service_Config::open, The override for the
-          default argument (ignore_static_svcs = 1) was missed during the
-          refactoring.
-
-Fri Apr 28 13:46:43 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bunch/Test.cpp:
-        * tests/ORB_Local_Config/Limits/Test.cpp:
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-        * tests/ORB_Local_Config/Shared/Test.cpp:
-        * tests/ORB_Local_Config/Simple/Test.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
-
-          Updated to shut up unused variable warnings on builds where
-          ACE_NDEBUG has been defined.
-
-Thu Apr 27 21:09:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Profile.cpp:
-          Fix a problem that caused the endpoint selector to spin when
-          using shared profiles and none of the endpoints were valid.
-
-Thu Apr 27 15:03:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bunch/Test.cpp:
-        * tests/ORB_Local_Config/Limits/Test.cpp:
-        * tests/ORB_Local_Config/Simple/Test.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
-
-          Fixed fuzz issues (unmatched ACE_TRACE)
-
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
-
-          Modified to change the DLL name to avoid name conflict with the
-          one in ACE_ROOT/tests.
-
-Thu Apr 27 14:20:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Endpoint.cpp:
-          Fixed a recursion problem with the IPv6 endpoint selection.
-
-        * tao/PortableServer/POAManagerFactory.cpp:
-          Cleaned up compiler warnings.
-
-Thu Apr 27 06:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/ORB_Local_Config/lib/lib.mpc:
-          Added base project, this would at least get our builds running again
-
-Thu Apr 27 03:46:34 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
-
-          Found the trouble that was crashing the endpoint test. It was
-          nothing wierd with the new sequence code, it was merely an
-          incorrect index variable - i should have been j.
-
-Thu Apr 27 03:05:31 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/params.cpp:
-
-          One of my patches inadvertently flipped the sense of the
-          share_profiles default from 0 to 1. However, I think that 1
-          should be the default, since it generates more compact IORs. It
-          has been that way for years in the OCI version of TAO, but I am
-          keeping the default 0 here for tradition. This value is
-          overridden by using -ORBUseSharedProfile [0|1] ORB_init option.
-
-Thu Apr 27 02:58:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/EndpointPolicy/Endpoint_Value_Impl.cpp:
-        * tao/EndpointPolicy/Endpoint_Value_Impl.h:
-
-          Added a virtual destructor to this otherwise abstract base
-          class.
-
-Wed Apr 26 21:24:54 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * NEWS:
-
-          Added an entry to the NEWS file.
-
-Wed Apr 26 20:21:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          The motivation for these changes was to enable support for
-          ORB-local Service Objects. This for instance, makes it possible
-          for differently configured ORBs to coexist within the same
-          proces.
-
-          In order to accomplish this, each orb (core) owns a "Gestalt",
-          i.e. a service object repository instance. There is also a
-          process-wide, or "global" gestalt, which is the default
-          repository where service objects are registered. The latter
-          retains the interface and behavioral compatibility with any
-          existing code. As a consequence of this design choice, any
-          un-named orb(s) will default to using the ubergestalt, which is
-          consistent with the prior behavior.
-
-        * tao/DLL_Parser.cpp:
-
-          Fixed the parse_string() method to use the correct ORB gestalt
-          when looking up a dynamic service object. That resolves a
-          failure in TAO/tests/Object_Loader test.
-
-        * tao/ORB.cpp:
-
-          Relocated some aging comments about having first to instantiate
-          the singleton manager to the correct place (ORB_init). Added a
-          gestalt parameter to the call to open_services. Edited a few
-          lines to fit within the standard length requirement.
-
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Core.cpp:
-
-          Added a member and an accessors for the private service gestalt,
-          owned by the core. Replaced the call to methods that use the
-          implicit ubergestalt with ones that specify the gestalt to use
-          for service objects.
-
-          Added an ACE_Service_Config_Guard to make sure the ORB
-          initialization uses the correct repository.
-
-          Updated more references to process_directive() and instance() to
-          use ACE_TCHAR.  Updated references to process_directive() to use
-          ACE_TCHAR for consistency.
-
-          Added #if !defined(TAO_AS_STATIC_LIBS)/#endif around code, which
-          is only meaningful when TAO is _not_ statically compiled;
-          Updated the service and DLL symbol names used to load the
-          CodecFactory_Loader, PolicyFactory_Loader and
-          TypeCodeFactory_Loader dynamic services, in the cases where
-          those services are not statically linked and TAO supports
-          dynamic linking. (Thanks Ossama, for pointing that out.)  Added
-          code to try and explicitly load an IORInterceptor adapter and
-          Concrete_IORInterceptor_Adapter_Factory, if TAO supports (is
-          built with) dynamic linking;
-
-          Updated the code that loads the IORTable adapter to be exception
-          safe; Edited a few lines to fit within the standard length
-          requirement.
-
-        * tao/Parser_Registry.cpp:
-
-          Updated to explicitly specify the correct gestalt for the ORB.
-
-        * tao/TAO_Internal.h:
-        * tao/TAO_Internal.cpp:
-
-          Refactored the initialization code to separate process-wide
-          aspects of initialization from those having to do with the ORB
-          instance. It is necessary to deal with global initialization
-          because of the large number of use cases, where the first thing
-          a process does is to call ORB_init, and consequently -
-          open_services. There are also cases where a process calls
-          Service_Config::open, initializing the process-wide
-          configuration and only then proceeds to call ORB_init - for
-          example when using Service Configurator to load a DLL that uses
-          an ORB. The close_service is now only responsible for calling
-          close in the ORB's own gestalt, the ACE Object Manager is the
-          one that is clobering the process-wide Service Configuration.
-          Updated to explicitly specify the correct gestalt to be used.
-
-        * tao/default_resource.h:
-        * tao/default_resource.cpp:
-
-          Added the ACE_Dynamic_Service_Dependency member to the default
-          resource factory to expressly maintain the factory's dependance
-          on TAO_Codeset library, because the order of destruction may be
-          reversed in some cases. The member help us keep our access to
-          TAO_Codeset_Manager instances by upping the ref count on
-          TAO_Codeset's DLL. This is far from elegant, but a complete
-          reference counting scheme for the ORB services is a more complex
-          undertaking than what the available resources currently permit.
-
-        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
-
-          Fixed an (unrelated) issue arising from a call to strcmp() with
-          two different character types - only visible when ACE_USES_WCHAR
-          is in effect.
-
-        * tao/Codeset/Codeset_Manager_i.h:
-        * tao/Codeset/Codeset_Manager_i.cpp:
-
-          (minor) Added void as argument to the ctor and dtor.
-
-        * tao/PI/ORBInitializer_Registry_Impl.h:
-        * tao/PI/ORBInitializer_Registry_Impl.cpp:
-
-          Implemented an init() method, which registers all the static
-          services, usually taken for granted with the loading of
-          TAO_PI. Previously, static initializers were used, however the
-          dependent static services were being registered only globally,
-          which broke the ORBs that needed ORB-local services.
-
-        * tao/PI/PI.h:
-        * tao/PI/PI.cpp:
-        * tao/PI/PolicyFactory_Loader.h:
-        * tao/PI/PolicyFactory_Loader.cpp:
-
-          Removed the static initializers code and made it part of the
-          dynamic service's init method. See the comment above.
-
-        * tao/PortableServer/Root_POA.cpp:
-
-          Explicitly specified the gestalt to be used for registering
-          dynamic services.
-
-        * tests/DLL_ORB/Test_Client_Module.cpp:
-        * tests/DLL_ORB/Test_Server_Module.cpp:
-
-          Provided an ID for the client and server's ORB.  In the future,
-          an option may be devised so that the user can specify if they
-          want any ORB to use its own gestalt, even if it does not have an
-          ID. The reverse would be to force all ORBs to use the global SR,
-          even if they have an ID.  Fixed a a SEGV upon process
-          termination. The first thing a client process does in its main()
-          is to load a dynamic service - Test_Client_Module, using a call
-          to ACE_Service_Config::process_directive(). The service does
-          call ORB_init(), which causes the population of the SR with a
-          number of static and dynamic SOs. At process termination now
-          however, any services registered following the ORB_init () call
-          are destroyed first and will be unavailable when the
-          Test_Client_Module is finalized. Like the Resource Factory, for
-          example.
-
-          The solution is to provide and ORB id for any ORB, which will
-          loaded as part of a dynamic service.  Since the service gestalt
-          is tied to the ORB id, this will cause the new ORBs to create
-          and manage the lifetime of their own Service Repositories. The
-          ORB_init() will be invoked in the context of each distinct SR
-          and any SO an ORB needs will go there. At process termination,
-          the Test_Client_Module will be finalized, which will clobber the
-          ORB's SR and any SO registered there.
-
-        * tests/ORB_Local_Config/ORB_Local_Config.mwc:
-        * tests/ORB_Local_Config/README:
-        * tests/ORB_Local_Config/run_tests_all.pl:
-
-          Added tests and examples of the functionality affected by the
-          introduction of the multiple private (per-ORB) service
-          configuration repositories.
-
-        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h:
-        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.cpp:
-        * tests/ORB_Local_Config/lib/lib.mpc:
-
-          Common test code.
-
-        * tests/ORB_Local_Config/Bunch/Bunch.mpc:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.UTF-16.conf:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.UTF-16.conf.xml:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.WCHAR_T.conf:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.WCHAR_T.conf.xml:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.conf:
-        * tests/ORB_Local_Config/Bunch/Service_Config_Test.conf.xml:
-        * tests/ORB_Local_Config/Bunch/Test.cpp:
-        * tests/ORB_Local_Config/Bunch/run_test.pl:
-
-          A collection of miscellaneous tests for compatibility of the new
-          interfaces with the old; Processing of the command-line
-          directives; Loading dynamic services in a local repository;
-          Loading the ORBInitializer_Registry locally; Test the helper
-          components used to implement the temporary substitution of the
-          repository currently used as "global" for the sake of
-          registering static services, which are dependent on a dynamic
-          service;
-
-        * tests/ORB_Local_Config/Limits/Limits.mpc:
-        * tests/ORB_Local_Config/Limits/Test.cpp:
-        * tests/ORB_Local_Config/Limits/run_test.pl:
-
-          Testing the size limits of a gestalt.
-
-        * tests/ORB_Local_Config/Separation/Separation.mpc:
-        * tests/ORB_Local_Config/Separation/Test.cpp:
-        * tests/ORB_Local_Config/Separation/run_test.pl:
-
-          Services registered with separate repositories must remain
-          separate and inaccessible through anyone but the gestalt they
-          were registered with.
-
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
-        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
-        * tests/ORB_Local_Config/Service_Dependency/run_test.pl:
-
-          Tests the working of the ACE_Dynamic_Service_Dependency class
-
-        * tests/ORB_Local_Config/Shared/Shared.mpc:
-        * tests/ORB_Local_Config/Shared/Test.cpp:
-        * tests/ORB_Local_Config/Shared/run_test.pl:
-
-          Test that the default repository is available through any
-          Service Gestalt, created with its default ctor.
-
-        * tests/ORB_Local_Config/Simple/Simple.mpc:
-        * tests/ORB_Local_Config/Simple/Test.cpp:
-        * tests/ORB_Local_Config/Simple/run_test.pl:
-
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h:
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Service_Config_ORB_Test2.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test.idl:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
-        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl:
-        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
-
-          Testing the loading a dynamic service, which initializes its own
-          ORB. The test is a variant of the Hello test with the twist that
-          both the client and the server are service objects, loaded by
-          the Service Configuration mechanism.
-
-Wed Apr 26 20:09:33 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/EndpointPolicy/EndpointPolicyC.h:
-        * tao/EndpointPolicy/EndpointPolicyC.cpp:
-
-          Fixed fuzz errors.
-
-        * tao/EndpointPolicy/EndpointPolicyC.inl:
-
-          Removed this file.
-
-Wed Apr 26 19:44:36 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-        * tao/EndpointPolicy.mpc:
-
-          Added Pkgconfig_Files definition.
-
-        * tao/EndpointPolicy/TAO_EndpointPolicy.pc.in:
-
-          New file, pkg-config *.pc template for TAO_EndpointPolicy
-          library.
-
-Wed Apr 26 19:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/Simple/Client_i.h:
-          Fixed casing of include
-
-Wed Apr 26 19:13:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/ORB_Core.cpp:
-        * tao/params.h:
-        * tao/params.i:
-        * tao/params.cpp:
-
-          This change was of OCI by David.Gibbs@igindex.co.uk. He had
-          previously requested the addition of support for SO_KEEPALIVE
-          and as a result we found that the framework existed for
-          communicating a value of SO_DONTROUTE, so it was decided that we
-          go ahead and add the feature. I consider this change provisional
-          in that it isn't strictly required and so if someone strongly
-          objects to its existence it can be pulled. Otherwise it is
-          simply completing what someone else had started a while ago by
-          adding configuration values for socket options to IIOP protocol
-          properties definition.
-
-Wed Apr 26 18:47:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-        * tao/ORB_Core.h:
-
-          Add an alternate connection timeout hook. This is necessary for
-          users of the Optimized Connect Endpoint Selector with its
-          timeout while also using CORBA messaging and the Connection
-          Timeout policy. Both of these connection timeouts are
-          dynamically loaded and one would override the other. This change
-          allows both to be loaded, and if both are initialized to nonzero
-          values, the lesser of the two timeouts is used. This results
-          from a bug originally reported to OCI by friedhelm.wolf@homag.de.
-
-        * tao/Strategies/OC_Endpoint_Selector_Loader.cpp:
-        * tao/Strategies/OC_Endpoint_Selector_Loader.h:
-
-          Cleaned up the initializer to be more consistent with others.
-
-        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
-
-          Fixed wihtespace in debug output.
-
-Wed Apr 26 16:42:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * docs/Options.html:
-
-          Adding text for the new commandline options used to control the
-          parallel connect feature.
-
-        * tao/Blocked_Connect_Strategy.h:
-        * tao/Blocked_Connect_Strategy.cpp:
-        * tao/CORBALOC_Parser.cpp:
-        * tao/Client_Strategy_Factory.h:
-        * tao/Client_Strategy_Factory.cpp:
-        * tao/Connect_Strategy.h:
-        * tao/Connect_Strategy.cpp:
-        * tao/Endpoint.h:
-        * tao/Endpoint.cpp:
-        * tao/IIOP_Connection_Handler.h:
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/IIOP_Connector.h:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_Endpoint.h:
-        * tao/IIOP_Endpoint.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.cpp:
-        * tao/Invocation_Endpoint_Selectors.h:
-        * tao/Invocation_Endpoint_Selectors.cpp:
-        * tao/LF_CH_Event.h:
-        * tao/LF_Connect_Strategy.h:
-        * tao/LF_Connect_Strategy.cpp:
-        * tao/LF_Event.h:
-        * tao/LF_Multi_Event.h:
-        * tao/LF_Multi_Event.cpp:
-        * tao/MProfile.h:
-        * tao/MProfile.i:
-        * tao/MProfile.cpp:
-        * tao/ORB_Core.cpp:
-        * tao/Profile.h:
-        * tao/Profile.cpp:
-        * tao/Profile_Transport_Resolver.h:
-        * tao/Profile_Transport_Resolver.cpp:
-        * tao/Reactive_Connect_Strategy.h:
-        * tao/Reactive_Connect_Strategy.cpp:
-        * tao/Transport.cpp:
-        * tao/Transport_Connector.h:
-        * tao/Transport_Connector.cpp:
-        * tao/Transport_Descriptor_Interface.h:
-        * tao/Transport_Descriptor_Interface.inl:
-        * tao/Transport_Descriptor_Interface.cpp:
-        * tao/default_client.h:
-        * tao/default_client.cpp:
-        * tao/params.h:
-        * tao/params.i:
-        * tao/params.cpp:
-        * tao/tao.mpc:
-
-          These changes support a new technique for active connection
-          establishment when presented with a profile containing multiple
-          possible endpoints. This commit resolves bugzilla bug #2485.
-
-          The technique in question is "parallel connects" meaning
-          attempting to connect to many endpoints simultaniously. It was
-          conceived as a way to deal with timeouts when the Invocation
-          Endpoint Selector would first try to connect to one or more
-          unreachable endpoints. If those endpoints were defined as IP
-          addresses (not hostnames) or as resolvable hostnames that
-          pointed to unreachable IP addresses, the connection
-          establishment would take potentially several minutes to time out
-          and eventually encounter a reachable endpoint. In the case of
-          shared profiles (those using TAG_ALTERNATE_IIOP_ENDPOINT) this
-          delay impacts every single invocation.
-
-          This parallel connect feature (also referred to somewhat
-          inacurately as a strategy) avoids this by supplying all the
-          endpoints in a profile to the connector and letting it first
-          test to see if any are already cached and available, and if not,
-          to open connections to each and wait for a winner. When the
-          first connection completes, any pending connections are
-          terminated.
-
-          In order to minimize the use of pending connections, an iterator
-          traverses the list of endpoints creating new connections and
-          also checking any existing connections for completion. If the
-          first endpoint happens to be reachable and the server responds
-          quickly enough, the client may not open any more connections.
-
-          If the server does not respond immediately, a wait strategy is
-          entered. This wait strategy may be Reactive or Leader/Follower
-          based. In either case, a specal "multi event" type is used to
-          allow a single thread to wait on one of many connectors, and
-          then to clean up those that didn't finish in time. The parallel
-          connect feature is also available using blocking connects, but
-          the only advantage there is in checking the cache for all
-          endpoints in the profile, there is no performance gain during
-          actual connection establishment.
-
-          The parallel connect strategy differs from another endpoint
-          selection optimization, available in
-          tao/Strategies/Optimized_Connection_Endpoint_Selector.*. That
-          strategy works by examining all profiles simultaniously, this
-          feature still treats separate profiles separately. This profile
-          separation is necessary to support Load Balancing and Fault
-          Tolerence. Also, this feature requires additional support to be
-          built into protocol specific connectors (IIOP is currently the
-          only protocol supporting parallel connects) whereas the other
-          feature works regardless of the protocol.
-
-          As this is a new feature, it is disabled by default. Use the
-          -ORBUseParallelConnects option to enable its use. A second
-          option, -ORBParallelConnectDelay, is used to introduce a small
-          delay between the opening of new potential connections if the
-          server is particularly busy. This is useful to minimize the
-          impact on a busy server if more than one of the available
-          endpoints is reachable. Also, because this feature only focuses
-          on one profile at a time, the server must be run with
-          -ORBUseSharedProfiles enabled (it is disabled by default).
-
-        * tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc:
-        * tests/Parallel_Connect_Strategy/README:
-        * tests/Parallel_Connect_Strategy/Test.idl:
-        * tests/Parallel_Connect_Strategy/Test_i.h:
-        * tests/Parallel_Connect_Strategy/Test_i.cpp:
-        * tests/Parallel_Connect_Strategy/blocked.conf:
-        * tests/Parallel_Connect_Strategy/client.cpp:
-        * tests/Parallel_Connect_Strategy/reactive.conf:
-        * tests/Parallel_Connect_Strategy/run_test.pl:
-        * tests/Parallel_Connect_Strategy/server.cpp:
-
-          This is a new test for the parallel connect feature. It works by
-          having the server open two endpoints, one aliased to something
-          unreachable. The client then uses different wait strategies to
-          make invocations on the server and records the time for
-          each. These tests also include counter-examples in which
-          parallel connects are not used, and these take several minutes
-          to run. On my Linux machine the timeout period is about 3
-          minutes which causes the overall test to take about 9 minutes to
-          run.
-
-Wed Apr 26 16:30:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/PortableServer/POAManagerFactory.cpp:
-
-          Correct a bug found by the Borland compiler.
-
-Wed Apr 26 13:47:28 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/EndpointPolicy.mpc:
-        * tao/EndpointPolicy/EndpointPolicy.h:
-        * tao/EndpointPolicy/EndpointPolicy.pidl:
-        * tao/EndpointPolicy/EndpointPolicy.cpp:
-        * tao/EndpointPolicy/EndpointPolicyA.h:
-        * tao/EndpointPolicy/EndpointPolicyA.cpp:
-        * tao/EndpointPolicy/EndpointPolicyC.h:
-        * tao/EndpointPolicy/EndpointPolicyC.inl:
-        * tao/EndpointPolicy/EndpointPolicyC.cpp:
-        * tao/EndpointPolicy/EndpointPolicyType.pidl:
-        * tao/EndpointPolicy/EndpointPolicyTypeA.h:
-        * tao/EndpointPolicy/EndpointPolicyTypeA.cpp:
-        * tao/EndpointPolicy/EndpointPolicyTypeC.h:
-        * tao/EndpointPolicy/EndpointPolicyTypeC.cpp:
-        * tao/EndpointPolicy/EndpointPolicy_Export.h:
-        * tao/EndpointPolicy/EndpointPolicy_Factory.h:
-        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
-        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h:
-        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp:
-        * tao/EndpointPolicy/EndpointPolicy_i.h:
-        * tao/EndpointPolicy/EndpointPolicy_i.cpp:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.h:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp:
-        * tao/EndpointPolicy/Endpoint_Value_Impl.h:
-        * tao/EndpointPolicy/IIOPEndpointValue.pidl:
-        * tao/EndpointPolicy/IIOPEndpointValueA.h:
-        * tao/EndpointPolicy/IIOPEndpointValueA.cpp:
-        * tao/EndpointPolicy/IIOPEndpointValueC.h:
-        * tao/EndpointPolicy/IIOPEndpointValueC.cpp:
-        * tao/EndpointPolicy/IIOPEndpointValue_i.h:
-        * tao/EndpointPolicy/IIOPEndpointValue_i.cpp:
-
-          The EndpointPolicy is a new, TAO-specific policy that is applied
-          to POAManagers via the POAManagerFactory. This commit resolves
-          Bugzilla bug #2484.
-
-          The Endpoint policy acts as a filter for constraining the final
-          endpoints or profiles listed in an IOR when it is created by a
-          POA associated with the POAManager containing the policy. The
-          EndpointPolicy value is a sequence, allow multiple endpoints to
-          be published.
-
-          The way this works is that the ORB is initialized with all the
-          -ORBEndpoint options it needs to provide access to all the
-          objects it will serve. Then POAManagers are created with
-          Endpoint policies that contain only the endpoints that are to be
-          used for its subset of objects. For instance, the ORB could
-          define one endpoint for insecure, internal-use-only objects, and
-          another for secure internet-facing objects. Using the Endpoint
-          Policy these different objects would only get one or the other
-          endpoint. Mechanically what happens is that first all Acceptors
-          are queried to construct an MProfile, then the resulting
-          profiles/endpoints are compared to entries in the policy, those
-          not matching are eliminated. It is possible that an endpoint
-          policy will exclude all the profiles, which would result in an
-          exception being raised at object reference construction time.
-
-          Endpoints are matched in their final form. This means that if an
-          IIOP Endpoint makes use of the hostname_in_ior attribute, that
-          is the name the policy will use to match.
-
-          Endpoint values are protocol specific. A value for IIOP is
-          provided, but new values must be defined to support other
-          protocols. The Endpoint value is a local object. New protocol
-          specific values do not have to be added to the
-          TAO_EndpointPolicy library, but they must specialize
-          EndpointPolicy::ValueBase and the implementation must derive
-          from TAO_Endpoint_Value_Impl.
-
-        * tao/IIOP_Endpoint.h:
-        * tao/IIOP_Endpoint.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.cpp:
-        * tao/Profile.h:
-        * tao/Profile.cpp:
-
-          The profile contains the base endpoint as an attribute. This
-          caused a problem for the endpoint removal scheme mentioned
-          above. If a profile contains two or more endpoints, and the base
-          happens to be the one to be eliminated as a result of the
-          endpoint comparison, the only thing that could be done is to
-          copy the contents of the first alternate into the base, then
-          eliminate the duplicate.
-
-        * tao/orbconf.h:
-
-          Added a tag for the new policy.
-
-        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
-        * tests/POA/EndpointPolicy/Hello.h:
-        * tests/POA/EndpointPolicy/Hello.cpp:
-        * tests/POA/EndpointPolicy/README:
-        * tests/POA/EndpointPolicy/Test.idl:
-        * tests/POA/EndpointPolicy/client.cpp:
-        * tests/POA/EndpointPolicy/run_test.pl:
-        * tests/POA/EndpointPolicy/server.cpp:
-        * tests/POA/README:
-
-          A new test case for the endpoint policy. This test currently
-          fails due to an unresolved interaction with the sequence
-          code. The error appears to be related to memory corruption, but
-          the cause has not yet been determined. The error only manifests
-          when the multiple profiles portion of the test is being
-          run. This is where an unmodified IOR would contain two profiles,
-          each with one endpoint. The problem does not occur when a single
-          profile has two endpoints.
-
-Wed Apr 26 14:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Smart_Proxies/client.cpp:
-        * tests/Smart_Proxies/Benchmark/client.cpp:
-        * tests/Smart_Proxies/dtor/client.cpp:
-        * tests/Smart_Proxies/Policy/client.cpp:
-          Removed remarks about the KAI compiler, more compilers do
-          give these warnings and support for the KAI compilers
-          has been removed
-
-Wed Apr 26 13:29:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/examples/ORT/Server_IORInterceptor.h:
-        * orbsvcs/examples/ORT/Server_IORInterceptor.cpp:
-
-        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp:
-
-        * orbsvcs/orbsvcs/PortableGroup/GOA.h:
-        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h:
-        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp:
-
-        * tao/AnyTypeCode/PI_ForwardA.h:
-
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
-        * tao/CSD_Framework/CSD_POA.h:
-        * tao/CSD_Framework/CSD_POA.cpp:
-
-        * tao/IORInterceptor/IORInfo.h:
-        * tao/IORInterceptor/IORInfo.cpp:
-        * tao/IORInterceptor/IORInfoC.h:
-        * tao/IORInterceptor/IORInterceptorC.h:
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
-
-        * tao/IORInterceptor_Adapter.h:
-        * tao/PI_Forward.pidl:
-        * tao/PI_ForwardC.h:
-
-        * tao/RTPortableServer/RT_POA.h:
-        * tao/RTPortableServer/RT_POA.cpp:
-        * tao/RTPortableServer/RT_Servant_Dispatcher.h:
-        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
-
-        * tests/ORT/ORT_test_IORInterceptor.h:
-        * tests/ORT/ORT_test_IORInterceptor.cpp:
-
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp:
-
-          These are more changes related to the POAManagerFactory. They
-          are coupled with my 13:10:59 utc checkin.
-
-Wed Apr 26 13:10:59 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/PortableServer/Acceptor_Filter_Factory.h:
-        * tao/PortableServer/Acceptor_Filter_Factory.cpp:
-        * tao/PortableServer/Default_Acceptor_Filter.h:
-        * tao/PortableServer/Default_Servant_Dispatcher.h:
-        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
-        * tao/PortableServer/Object_Adapter.h:
-        * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/POAManager.h:
-        * tao/PortableServer/POAManager.i:
-        * tao/PortableServer/POAManager.pidl:
-        * tao/PortableServer/POAManager.cpp:
-        * tao/PortableServer/POAManagerC.h:
-        * tao/PortableServer/POAManagerFactory.h:
-        * tao/PortableServer/POAManagerFactory.cpp:
-        * tao/PortableServer/POAManagerFactory.pidl:
-        * tao/PortableServer/POAManagerFactoryC.h:
-        * tao/PortableServer/POAManagerFactoryC.cpp:
-        * tao/PortableServer/PortableServer.h:
-        * tao/PortableServer/PortableServer.pidl:
-        * tao/PortableServer/PortableServerC.h:
-        * tao/PortableServer/Regular_POA.h:
-        * tao/PortableServer/Regular_POA.cpp:
-        * tao/PortableServer/Root_POA.h:
-        * tao/PortableServer/Root_POA.cpp:
-        * tao/PortableServer/Servant_Dispatcher.h:
-
-          These files are new/updated to support the POAManagerFactory,
-          which was added to the CORBA 3.0.2 specification. The PMF is
-          used to allow for the explicit creation of POA Managers which
-          can then be supplied to POAs during POA creation. POA Managers
-          may now also carry policies which will influence all POAs
-          associated with it. This work builds on the effort originally
-          started by Johnny Willemsen back in the pre-1.4.8 era. This
-          commit resolves Bugzilla bug #1785.
-
-        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
-        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
-        * tests/POA/POAManagerFactory/run_test.pl:
-
-          This is a new test for the POAManagerFactory.
-
-Wed Apr 26 13:01:48 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Valuetype/AbstractBase.cpp:
-        * tao/Valuetype/AbstractBase.h:
-          The _tao_marshal_v method is supposed to be const.
-
-Wed Apr 26 13:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/POA/Bug_2511_Regression/*:
-          Added new regression for bug 2511. Thanks to Martin Cornelius
-          <Martin at Cornelius at smiths-heimann dot com> for creating
-          this regression
-
-Wed Apr 26 12:20:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/AMI/ami_test.idl:
-        * tests/AMI/ami_test_i.cpp:
-        * tests/AMI/simple_client.cpp:
-          Reverting earlier test changes. They were causing problems on
-          some platforms and I don't have a clear enough memory of the
-          original motivation for the change.
-
-Wed Apr 26 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
-          Fixed a bug in these tests, in the test code for element 0 of
-          a string sequence was set and after that the length was set to 1.
-          The setting of 0 is possible because the OMG doesn't define
-          exceptions for this so it is allowed, then setting the length to
-          1 does reinitialize element 0 so that we don't get old values.
-          This was not done with the old sequences, then just the old
-          value was returned and things worked then.
-
-Wed Apr 26 11:21:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Valuetype/ValueBase.cpp:
-
-          Fix for errant removal of throw, this corrects the OBV/Factory
-          test.
-
-Wed Apr 26 10:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Added missing include of SystemException
-
-Wed Apr 26 10:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/Simple/*:
-          Added very simple OBV test
-
-Wed Apr 26 09:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Bug_2510_Regression:
-          New regression test, thanks to Martin Cornelius
-          <Martin at Cornelius at smiths-heimann dot com> for creating
-          this test. This bug is not fixed yet.
-
-Wed Apr 26 09:44:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
-
-        * tao/Bounded_Sequence_CDR_T.h:
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Check in all marshal_sequence methods if we aren't trying to
-          marshal a nill sequence, this can happen when the user doesn't
-          initialize an out argument. In that case we throw a BAD_PARAM
-          exception as described in the C++ spec. This fixes bugzilla bug
-          1676.
-
-Wed Apr 26 08:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
-        * tao/ObjRefTemplate/Default_ORTC.h:
-        * tao/Messaging/ExceptionHolderC.h:
-          Include the Valuetype_Adapter_Factory_Impl.h so that the
-          Valuetype library gets linked in a static build, this is
-          already updated earlier in the IDL compiler
-
-Wed Apr 26 08:17:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
-
-        * tests/Bug_1676_Regression/client.cpp:
-          Extended this test to explicitly test for BAD_PARAM exception
-          when the server not initializes an out argument
-
-Wed Apr 26 07:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
-          Removed invalid template export
-
-Wed Apr 26 03:46:16 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Valuetype/AbstractBase.cpp:
-
-          Fixed scoreboard detected warning.
-
-Tue Apr 25 19:24:48 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-
-          Missed a patch from the earlier commit.
-
-Tue Apr 25 19:09:08 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/examples/ORT/Server_IORInterceptor.h:
-        * orbsvcs/examples/ORT/Server_IORInterceptor.cpp:
-
-        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp:
-
-        * orbsvcs/orbsvcs/PortableGroup/GOA.h:
-        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h:
-        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp:
-
-        * tao/AnyTypeCode/PI_ForwardA.h:
-
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
-        * tao/CSD_Framework/CSD_POA.h:
-        * tao/CSD_Framework/CSD_POA.cpp:
-
-        * tao/IIOP_Endpoint.h:
-        * tao/IIOP_Endpoint.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.cpp:
-
-        * tao/IORInterceptor/IORInfo.h:
-        * tao/IORInterceptor/IORInfo.cpp:
-        * tao/IORInterceptor/IORInfoC.h:
-        * tao/IORInterceptor/IORInterceptorC.h:
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
-
-        * tao/IORInterceptor_Adapter.h:
-        * tao/PI_Forward.pidl:
-        * tao/PI_ForwardC.h:
-
-        * tao/PortableServer/Default_Acceptor_Filter.h:
-        * tao/PortableServer/Default_Servant_Dispatcher.h:
-        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
-        * tao/PortableServer/Object_Adapter.h:
-        * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/POAManager.h:
-        * tao/PortableServer/POAManager.i:
-        * tao/PortableServer/POAManager.cpp:
-        * tao/PortableServer/POAManager.pidl:
-        * tao/PortableServer/POAManagerC.h:
-        * tao/PortableServer/PortableServer.h:
-        * tao/PortableServer/PortableServer.pidl:
-        * tao/PortableServer/PortableServerC.h:
-        * tao/PortableServer/Regular_POA.h:
-        * tao/PortableServer/Regular_POA.cpp:
-        * tao/PortableServer/Root_POA.h:
-        * tao/PortableServer/Root_POA.cpp:
-        * tao/PortableServer/Servant_Dispatcher.h:
-
-        * tao/Profile.h:
-        * tao/Profile.cpp:
-
-        * tao/RTPortableServer/RT_POA.h:
-        * tao/RTPortableServer/RT_POA.cpp:
-        * tao/RTPortableServer/RT_Servant_Dispatcher.h:
-        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
-
-        * tao/orbconf.h:
-        * tao/params.cpp:
-
-        * tests/ORT/ORT_test_IORInterceptor.h:
-        * tests/ORT/ORT_test_IORInterceptor.cpp:
-
-        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
-        * tests/POA/EndpointPolicy/Hello.h:
-        * tests/POA/EndpointPolicy/Hello.cpp:
-        * tests/POA/EndpointPolicy/README:
-        * tests/POA/EndpointPolicy/Test.idl:
-        * tests/POA/EndpointPolicy/client.cpp:
-        * tests/POA/EndpointPolicy/run_test.pl:
-        * tests/POA/EndpointPolicy/server.cpp:
-
-        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
-        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
-        * tests/POA/POAManagerFactory/run_test.pl:
-
-        * tests/POA/README:
-
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp:
-
-Tue Apr 25 17:38:34 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * tao/Messaging/ExceptionHolderC.h:
-        * tao/Messaging/ExceptionHolderC.cpp:
-        * tao/ObjRefTemplate/Default_ORTC.h:
-        * tao/ObjRefTemplate/Default_ORTC.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
-        * tao/Valuetype/AbstractBase.h:
-        * tao/Valuetype/AbstractBase.cpp:
-        * tao/Valuetype/StringValueC.h:
-        * tao/Valuetype/StringValueC.inl:
-        * tao/Valuetype/ValueBase.h:
-        * tao/Valuetype/ValueBase.cpp:
-
-          These are further valuetype changes that are related to Bugzilla
-          #2162. The problem is that TAO assumes that a valuetype's
-          typecode is always encoded as 0x7FFFFF02 <repID> but that is not
-          compliant with the spec. It is also valid to encode a valuetype
-          typecode as 0x7FFFFF00 which indicates that the actual type of
-          the value matches the formal type for the argument for which the
-          value is a parameter.  TAO already had most of the hooks in
-          place to support this, but was missing a key bit of
-          functionality. This patch adds that functionality, the ability
-          to test that the formal type matches the actual type when
-          marshaling values.
-
-          Valuetypes encoded this way are substantially more efficient, if
-          the type can be implied then there is no need to carry the
-          actual type id.  Unfortunately to do so blindly would break
-          backwards compatibility with all previous versions of TAO.
-          For the time being, the effective code to cause TAO to marshal
-          values using the more efficient typecode is disabled using a new
-          compile-time flag, TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING,
-          which must be defined to give TAO the opportunity to use this
-          new technique. THIS FLAG BREAKS BACKWARDS COMPATIBILITY. It is
-          not a violation of the spec to always encode the valuetype's
-          type ID when marshaling, so TAO can continue being backwards
-          compatible and not be in violation of the spec. The only
-          violation comes when failing to unmarshal a value which is using
-          an implied type ID.
-
-          I would prefer to not have a compiler flag to guard the use of
-          optimized marshaling, but I don't know any other way to do it.
-          At the point where the decision is made, there is no reference
-          to an ORB Core so there is no easy way to set a dynamic option
-          that could be used to selectively control this optimization.
-
-Tue Apr 25 15:14:13 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-          Merging in truncatable valuetype support. This work was done on
-          an OCI controlled patch then brought in via patch. The premise
-          is to support the "truncatable" keyword for valuetypes as
-          defined in sections 3.9.1.3, 5.2.5.3 and 15.3.4.1 of the CORBA
-          3.0.3 specification. Practically, this means supporting the
-          marshaling of typecode lists and chunked values. Chunked values
-          requires the retention of state, namely nesting level, during
-          the marshaling. This was handled by creating a new ChunkInfo
-          type that is created on the stack during the marshaling of a
-          valuetype and is passed through all the intermediate marshal
-          methods. This commit resolves Bugzilla #2483
-
-        * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-
-          Valueboxes by definition cannot be made truncatable, but they
-          derive from the same valuebase, thus they must support the same
-          signature for creating a list of repository ids. Otherwise these
-          are whitespace only changes.
-
-        * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
-
-          These are changes for generating code that manages the chunkinfo
-          data as it passes through the value members.
-
-        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp:
-
-          Whitespace changes.
-
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/idl.yy:
-
-          Removed the warning about support for truncatables.
-
-        * tao/AnyTypeCode/skip.cpp:
-
-          Fixed the type for the valuetag.
-
-        * tao/Messaging/ExceptionHolderC.h:
-        * tao/Messaging/ExceptionHolderC.cpp:
-        * tao/ObjRefTemplate/Default_ORTC.h:
-        * tao/ObjRefTemplate/Default_ORTC.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
-
-          These are the changes required by the truncatable support that
-          would ordinarily be generated by the IDL compiler.
-
-        * tao/Valuetype/AbstractBase.h:
-        * tao/Valuetype/AbstractBase.cpp:
-        * tao/Valuetype/StringValueC.h:
-        * tao/Valuetype/StringValueC.cpp:
-        * tao/Valuetype/ValueBase.h:
-        * tao/Valuetype/ValueBase.inl:
-        * tao/Valuetype/ValueBase.cpp:
-        * tao/Valuetype/Value_CORBA_methods.h:
-
-          The changes for StringValue and AbstractBase are the same as the
-          generated code. The changes in ValueBase are those common to all
-          value types, used to determine how to marshal values if the
-          truncatable keyword was defined or not. This also includes the
-          definintion of the new ChunkInfo type.
-
-        * tests/AMI/ami_test.idl:
-        * tests/AMI/ami_test_i.cpp:
-        * tests/AMI/simple_client.cpp:
-
-          Changes test misc. fixes for support of wchar data in exceptions.
-
-        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
-        * tests/OBV/Truncatable/README:
-        * tests/OBV/Truncatable/Truncatable.idl:
-        * tests/OBV/Truncatable/TruncatableS_impl.h:
-        * tests/OBV/Truncatable/TruncatableS_impl.cpp:
-        * tests/OBV/Truncatable/client.cpp:
-        * tests/OBV/Truncatable/run_test.pl:
-        * tests/OBV/Truncatable/server.cpp:
-
-          A new test specific to validating the truncatable valuetypes.
-          Note this test is also added to the ace/bin/tao_orb_tests.lst.
-
-        * tests/Param_Test/svc.conf:
-
-          Remove the explicit override of the wchar codeset for the
-
-Tue Apr 25 14:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Reverted this change below, this change broke this test
-
-        Fri Apr 21 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-        * orbsvcs/tests/Trading/TTest.idl:
-          Use the CORBA predefined sequence types
-
-Tue Apr 25 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
-          Added missing unbouded array unit test
-
-Tue Apr 25 11:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Offer_Database.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Trader.h
-        * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.{h,cpp}:
-          Fixed duplicate symbols when linking with vc7/vc8. The trading
-          service used the TAO_String_Hash_Key class to store strings
-          in hash maps, this class is derived from CORBA::String_var which
-          has been refactored to a template. This causes problems with
-          vc7/vc8 because the base template is exported from multiple
-          libraries. This has been resolved by usign CORBA::String_var
-          in the hash map and deliver an ACE_Hash, ACE_Equal_To and
-          ACE_Less_Then template specialization. This solves now the
-          link problems, the runtime issue that appeared after the
-          sequence merge has not been fixed yet. Also see bugzilla bug
-          2520 for more info.
-
-Tue Apr 25 08:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.cpp:
-          Removed runtime check of the sizes of the basic data types. We
-          now always use bool for CORBA::Boolean independent of the size
-          of bool, see also bugzilla 2515
-
-Tue Apr 25 06:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Object.{h,cpp}:
-          Made the signature of the static marshal method the same in the
-          definition and the implementation.
-
-Mon Apr 24 19:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
-          Explicitly export the base template to fix duplicate symbol
-          errors with vc71/vc8
-
-Mon Apr 24 14:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp:
-          Improved debug messages so that we can see if a string is empty
-          or not.
-
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h:
-          Doxygen cleanup
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-          Improved debugging output to resolve bug that seems to be introduced
-          by the sequence changes, the flowspec sequence has length of 1 but
-          just an empty string as value
-
-Mon Apr 24 13:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/params.cpp:
-          Small const improvement
-
-        * tao/ORB.{h,cpp}:
-          Updated CORBA::ORB::RequestSeq to CORBA::RequestSeq as the spec
-          describes. Fixes bugzilla bug 2512.
-
-Mon Apr 24 12:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.cpp:
-          Added include of ObjectIdListC.h to resolve compile errors related
-          to this type with Sun Studio 10
-
-Mon Apr 24 11:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Reverted change below, set method is IDL generated.
-
-        Mon Apr 24 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-        * orbsvcs/orbsvcs/Runtime_Scheduler.{h,cpp}:
-          Made the arguments of the set method a const reference, this fixes
-          the internal backend errors in the BCB2006 release builds.
-
-Mon Apr 24 11:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.cpp:
-          When we can't get a valuetype adapter throw an internal corba
-          exception
-
-        * TAO_IDL/be/be_codegen.cpp:
-          Updated include generated for the valuetype library, makes sure
-          that the valuetype library gets linked into the executable when
-          building static.
-
-Mon Apr 24 10:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1676_Regression/*:
-          Added regression for bug 1676 written by Kees van Marle. This bug
-          seems not to be fixed yet.
-
-Mon Apr 24 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Runtime_Scheduler.{h,cpp}:
-          Made the arguments of the set method a const reference, this fixes
-          the internal backend errors in the BCB2006 release builds.
-
-Mon Apr 24 06:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl:
-          Removed some left over ACE_NESTED_CLASS usage
-
-Sun Apr 23 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
-          Removed some left over ACE_NESTED_CLASS usage
-
-Fri Apr 21 20:43:24 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/Makefile.am:
-        * performance-tests/Makefile.am:
-
-          Remove handful of subdirectories that have not yet been updated
-          to work with autoconf builds.
-
-Fri Apr 21 19:32:27 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added orbsvcs/tests/Bug_2377_Regression/Makefile to
-          AC_CONFIG_FILES.
-
-        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
-
-          New file.
-
-Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/Makefile.am:
-        * docs/Makefile.am:
-        * docs/tutorials/Makefile.am:
-        * docs/tutorials/Quoter/Makefile.am:
-        * docs/tutorials/Quoter/AMI/Makefile.am:
-        * docs/tutorials/Quoter/Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/Naming_Service/Makefile.am:
-        * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
-        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Client/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am:
-        * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Persistent/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Server/Makefile.am:
-        * docs/tutorials/Quoter/idl/Makefile.am:
-        * examples/Makefile.am:
-        * examples/AMH/Makefile.am:
-        * examples/AMH/Sink_Server/Makefile.am:
-        * examples/AMI/Makefile.am:
-        * examples/AMI/FL_Callback/Makefile.am:
-        * examples/Advanced/Makefile.am:
-        * examples/Advanced/ch_3/Makefile.am:
-        * examples/Buffered_AMI/Makefile.am:
-        * examples/Buffered_Oneways/Makefile.am:
-        * examples/CSD_Strategy/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool4/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-        * examples/Callback_Quoter/Makefile.am:
-        * examples/Content_Server/Makefile.am:
-        * examples/Content_Server/AMI_Iterator/Makefile.am:
-        * examples/Content_Server/AMI_Observer/Makefile.am:
-        * examples/Content_Server/SMI_Iterator/Makefile.am:
-        * examples/Event_Comm/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
-        * examples/Load_Balancing/Makefile.am:
-        * examples/Load_Balancing_persistent/Makefile.am:
-        * examples/Logging/Makefile.am:
-        * examples/OBV/Makefile.am:
-        * examples/OBV/Typed_Events/Makefile.am:
-        * examples/POA/Makefile.am:
-        * examples/POA/Adapter_Activator/Makefile.am:
-        * examples/POA/DSI/Makefile.am:
-        * examples/POA/Default_Servant/Makefile.am:
-        * examples/POA/Explicit_Activation/Makefile.am:
-        * examples/POA/Explicit_Activation/Alt_Resources/Makefile.am:
-        * examples/POA/FindPOA/Makefile.am:
-        * examples/POA/Forwarding/Makefile.am:
-        * examples/POA/Generic_Servant/Makefile.am:
-        * examples/POA/Loader/Makefile.am:
-        * examples/POA/NewPOA/Makefile.am:
-        * examples/POA/On_Demand_Activation/Makefile.am:
-        * examples/POA/On_Demand_Loading/Makefile.am:
-        * examples/POA/POA_BiDir/Makefile.am:
-        * examples/POA/Reference_Counted_Servant/Makefile.am:
-        * examples/POA/RootPOA/Makefile.am:
-        * examples/POA/TIE/Makefile.am:
-        * examples/Persistent_Grid/Makefile.am:
-        * examples/PluggableUDP/Makefile.am:
-        * examples/PluggableUDP/tests/Makefile.am:
-        * examples/PluggableUDP/tests/Basic/Makefile.am:
-        * examples/PluggableUDP/tests/Performance/Makefile.am:
-        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
-        * examples/Quoter/Makefile.am:
-        * examples/RTCORBA/Makefile.am:
-        * examples/RTCORBA/Activity/Makefile.am:
-        * examples/RTScheduling/Makefile.am:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
-        * examples/Simple/Makefile.am:
-        * examples/Simple/bank/Makefile.am:
-        * examples/Simple/chat/Makefile.am:
-        * examples/Simple/echo/Makefile.am:
-        * examples/Simple/grid/Makefile.am:
-        * examples/Simple/time/Makefile.am:
-        * examples/Simple/time-date/Makefile.am:
-        * examples/Simulator/Makefile.am:
-        * examples/Simulator/Event_Supplier/Makefile.am:
-        * examples/TypeCode_Creation/Makefile.am:
-        * examples/ior_corbaloc/Makefile.am:
-        * examples/mfc/Makefile.am:
-        * interop-tests/Makefile.am:
-        * interop-tests/wchar/Makefile.am:
-        * orbsvcs/Makefile.am:
-        * orbsvcs/Concurrency_Service/Makefile.am:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Dump_Schedule/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * 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/IFR_Service/Makefile.am:
-        * orbsvcs/ImplRepo_Service/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/Naming_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-        * orbsvcs/Scheduling_Service/Makefile.am:
-        * orbsvcs/TAO_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/examples/Makefile.am:
-        * orbsvcs/examples/CosEC/Makefile.am:
-        * orbsvcs/examples/CosEC/Factory/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am:
-        * orbsvcs/examples/CosEC/Simple/Makefile.am:
-        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
-        * orbsvcs/examples/FaultTolerance/Makefile.am:
-        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
-        * orbsvcs/examples/ImR/Makefile.am:
-        * orbsvcs/examples/ImR/Advanced/Makefile.am:
-        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
-        * orbsvcs/examples/LoadBalancing/Makefile.am:
-        * orbsvcs/examples/Log/Makefile.am:
-        * orbsvcs/examples/Log/Basic/Makefile.am:
-        * orbsvcs/examples/Log/Event/Makefile.am:
-        * orbsvcs/examples/Log/Notify/Makefile.am:
-        * orbsvcs/examples/Log/RTEvent/Makefile.am:
-        * orbsvcs/examples/Notify/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/Agent/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/Gate/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am:
-        * orbsvcs/examples/Notify/Filter/Makefile.am:
-        * orbsvcs/examples/Notify/Lanes/Makefile.am:
-        * orbsvcs/examples/Notify/Subscribe/Makefile.am:
-        * orbsvcs/examples/Notify/ThreadPool/Makefile.am:
-        * orbsvcs/examples/ORT/Makefile.am:
-        * orbsvcs/examples/RtEC/Makefile.am:
-        * orbsvcs/examples/RtEC/IIOPGateway/Makefile.am:
-        * orbsvcs/examples/RtEC/Kokyu/Makefile.am:
-        * orbsvcs/examples/RtEC/MCast/Makefile.am:
-        * orbsvcs/examples/RtEC/Schedule/Makefile.am:
-        * orbsvcs/examples/RtEC/Simple/Makefile.am:
-        * orbsvcs/examples/Security/Makefile.am:
-        * orbsvcs/examples/Security/Send_File/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * 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:
-        * orbsvcs/tests/Makefile.am:
-        * orbsvcs/tests/AVStreams/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/BiDir_CORBALOC/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/Bug_2074_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2137_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2316_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:
-        * 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:
-        * orbsvcs/tests/HTIOP/Makefile.am:
-        * orbsvcs/tests/HTIOP/AMI/Makefile.am:
-        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
-        * orbsvcs/tests/HTIOP/Hello/Makefile.am:
-        * orbsvcs/tests/IOR_MCast/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
-        * orbsvcs/tests/ImplRepo/NameService/Makefile.am:
-        * orbsvcs/tests/ImplRepo/scale/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am:
-        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am:
-        * orbsvcs/tests/Log/Makefile.am:
-        * orbsvcs/tests/Log/Basic_Log_Test/Makefile.am:
-        * orbsvcs/tests/Miop/Makefile.am:
-        * orbsvcs/tests/Miop/McastHello/Makefile.am:
-        * orbsvcs/tests/Notify/Makefile.am:
-        * orbsvcs/tests/Notify/Basic/Makefile.am:
-        * orbsvcs/tests/Notify/Blocking/Makefile.am:
-        * orbsvcs/tests/Notify/Destroy/Makefile.am:
-        * orbsvcs/tests/Notify/Discarding/Makefile.am:
-        * orbsvcs/tests/Notify/Driver/Makefile.am:
-        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
-        * orbsvcs/tests/Notify/Ordering/Makefile.am:
-        * orbsvcs/tests/Notify/PluggableTopology/Makefile.am:
-        * orbsvcs/tests/Notify/RT_lib/Makefile.am:
-        * orbsvcs/tests/Notify/Reconnecting/Makefile.am:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Test_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/XML_Persistence/Makefile.am:
-        * orbsvcs/tests/Notify/lib/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
-        * orbsvcs/tests/Property/Makefile.am:
-        * orbsvcs/tests/Redundant_Naming/Makefile.am:
-        * orbsvcs/tests/Sched/Makefile.am:
-        * orbsvcs/tests/Sched_Conf/Makefile.am:
-        * orbsvcs/tests/Security/Makefile.am:
-        * orbsvcs/tests/Security/BiDirectional/Makefile.am:
-        * orbsvcs/tests/Security/Big_Request/Makefile.am:
-        * orbsvcs/tests/Security/Callback/Makefile.am:
-        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
-        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
-        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
-        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
-        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
-        * orbsvcs/tests/Simple_Naming/Makefile.am:
-        * orbsvcs/tests/Time/Makefile.am:
-        * orbsvcs/tests/Trading/Makefile.am:
-        * orbsvcs/tests/ior_corbaname/Makefile.am:
-        * orbsvcs/tests/tests_svc_loader/Makefile.am:
-        * performance-tests/Makefile.am:
-        * performance-tests/Anyop/Makefile.am:
-        * performance-tests/CSD_Strategy/Makefile.am:
-        * performance-tests/CSD_Strategy/TestApps/Makefile.am:
-        * performance-tests/CSD_Strategy/TestInf/Makefile.am:
-        * performance-tests/CSD_Strategy/TestServant/Makefile.am:
-        * performance-tests/Callback/Makefile.am:
-        * performance-tests/Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/Makefile.am:
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
-        * performance-tests/Latency/Makefile.am:
-        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Latency/AMI/Makefile.am:
-        * performance-tests/Latency/Collocation/Makefile.am:
-        * performance-tests/Latency/DII/Makefile.am:
-        * performance-tests/Latency/DSI/Makefile.am:
-        * performance-tests/Latency/Deferred/Makefile.am:
-        * performance-tests/Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Memory/Makefile.am:
-        * performance-tests/Memory/IORsize/Makefile.am:
-        * performance-tests/Memory/Single_Threaded/Makefile.am:
-        * performance-tests/POA/Makefile.am:
-        * performance-tests/POA/Create_Reference/Makefile.am:
-        * performance-tests/POA/Demux/Makefile.am:
-        * performance-tests/POA/Implicit_Activation/Makefile.am:
-        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
-        * performance-tests/Pluggable/Makefile.am:
-        * performance-tests/Protocols/Makefile.am:
-        * performance-tests/RTCorba/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am:
-        * performance-tests/RTCorba/Oneways/Makefile.am:
-        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
-        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
-        * performance-tests/Sequence_Latency/Makefile.am:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/AMI/Makefile.am:
-        * performance-tests/Sequence_Latency/DII/Makefile.am:
-        * performance-tests/Sequence_Latency/DSI/Makefile.am:
-        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
-        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Throughput/Makefile.am:
-        * tao/Makefile.am:
-        * utils/Makefile.am:
-        * utils/catior/Makefile.am:
-        * utils/nslist/Makefile.am:
-
-          Regenerate with latest MPC and *.mpc/*.mpb changes.
-
-Fri Apr 21 09:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport_Connector.cpp:
-          Removed the fix for bug 2417, according to the test stats things
-          didn't got fixed.
-
-Fri Apr 21 08:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/String_Traits_Base_T.h:
-          Disabled the warning when wchar_t is not a native type. This
-          makes the vxworks logs unreadable.
-
-Fri Apr 21 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Trading/TTest.idl:
-          Use the CORBA predefined sequence types
-
-Fri Apr 21 07:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl:
-        * orbsvcs/orbsvcs/Notify/ETCL_Filter.h:
-        * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
-        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
-        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
-        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
-        * tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp:
-          Removed usage of ACE_NESTED_CLASS
-
-Thu Apr 20 14:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/extra_core.mpb:
-        * tao/tao.mpc:
-          Moved ServicesC.cpp to tao.mpc
-
-Thu Apr 20 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Bounded_Sequence_CDR_T.h:
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Include orbconf.h instead of one of the sequence header files
-
-Thu Apr 20 13:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Asynch_Reply_Dispatcher_Base.{h,cpp}:
-        * tao/ObjectKey_Table.cpp:
-        * tao/Refcounted_ObjectKey.{h,cpp,inl}:
-          Made the refcounts CORBA::ULong and only return the refcount
-          from the incr/decr methods when really needed, using the refcount
-          form external is always tricky. Fixes bugzilla bug 2505.
-
-Thu Apr 20 12:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Integrated ondemand branch to cvs head. This makes an ondemand write
-        possible. The user specified maximum is at this moment not a hard
-        maximum, it is more an indication how large the GIOP fragments
-        should become, we can send out smaller and larger fragments if needed.
-
-        * tao/tests/Ondemand_Write/*:
-          New test
-
-        Mon Apr  3 12:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/On_Demand_Fragmentation_Strategy.cpp:
-          Print the debug message after we padded it so that sizes do match
-          in the logs
-
-        * tao/GIOP_Message_Base.cpp:
-          For fragments also retrieve the request/reply id
-
-        * tests/Ondemand_Write:
-          Simple test for ondemand write, needs now inspection of output to
-          check if things work ok
-
-        Mon Apr  3 07:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/CDR.h:
-          Commented out write_octet_array decleration, there is no
-          implementation yet.
-
-        Thu Mar 30 13:02:18 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
-          Added the missing transport parameter to the TAO_GIOP_Message_Base
-          constructor.
-
-        Thu Mar 30 12:41:17 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/CDR.cpp:
-        * tao/On_Demand_Fragmentation_Strategy.cpp:
-
-          Fixed checks for return values.
-
-        Wed Mar 22 20:13:22 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Messaging/Asynch_Invocation.cpp (remote_invocation):
-
-          Added missing GIOP fragmentation support.
-
-        Wed Mar 22 13:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.h:
-          Fixed warning of the Intel compiler
-
-        Wed Mar 22 01:33:47 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/CDR.cpp:
-        * tao/CDR.h:
-        * tao/CDR.i:
-        * tao/GIOP_Message_Base.cpp:
-        * tao/GIOP_Message_Base.h:
-        * tao/GIOP_Message_Generator_Parser.h:
-        * tao/GIOP_Message_Generator_Parser_10.cpp:
-        * tao/GIOP_Message_Generator_Parser_10.h:
-        * tao/GIOP_Message_Generator_Parser_12.cpp:
-        * tao/GIOP_Message_Generator_Parser_12.h:
-        * tao/GIOP_Message_Lite.cpp:
-        * tao/GIOP_Message_Lite.h:
-        * tao/ORB_Core.cpp:
-        * tao/On_Demand_Fragmentation_Strategy.cpp:
-        * tao/Pluggable_Messaging.h:
-        * tao/Remote_Invocation.cpp:
-        * tao/Synch_Invocation.cpp:
-        * tao/TAO_Server_Request.cpp:
-        * tao/default_resource.cpp:
-        * tao/PortableServer/Upcall_Wrapper.cpp:
-
-          Added remaining code necessary to send fragments through the
-          underlying transport.
-
-          Added missing outgoing GIOP reply fragment support.
-
-        Tue Mar 21 22:18:45 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * docs/Options.html:
-
-          Document new "-ORBMaxMessageSize" ORB option.
-
-        Tue Mar 21 15:16:43 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/GIOP_Message_Base.cpp (set_giop_flags):
-
-          Cast CDR stream buffer to an array of octets.
-
-        * tao/GIOP_Message_Base.h (set_giop_flags):
-
-          Added missing method declaration.
-
-        * tao/Resource_Factory.h (fragmentation_strategy):
-        * tao/default_resource.cpp:
-        * tao/default_resource.h:
-
-          Made factory method name consistent with existing naming
-          convention, i.e. create_fragmentation_strategy().
-
-          Corrected return value.  It should have been
-          auto_ptr<TAO_GIOP_Fragmentation_Strategy>, not
-          TAO_GIOP_Fragmentation_Strategy *.
-
-        * tao/IIOP_Transport.cpp:
-        * tao/Strategies/DIOP_Transport.cpp:
-        * tao/Strategies/SCIOP_Transport.cpp:
-        * tao/Strategies/SHMIOP_Transport.cpp:
-        * tao/Strategies/UIOP_Transport.cpp:
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
-
-          The TAO_GIOP_Message_Base constructor now accepts a pointer to
-          TAO_Transport parameter.  Updated constructor call accordingly.
-
-        * tao/CDR.h:
-        * tao/CDR.i:
-        * tao/CDR.cpp:
-
-          Added missing fragmentation-enabling constructor and
-          fragmentation flag accessors.
-
-          Removed legacy initial implementa code.  Addresses build
-          errors.
-
-        * tao/GIOP_Fragmentation_Strategy.h (TAO_GIOP_Fragmentation_Strategy):
-
-          Export to allow users to provide their own implementation
-          through the resource factory.
-
-          (fragment):
-
-          Return an "int" instead of "void".  Allows the error status of
-          the underlying transport send to be propagated up the stack.
-
-        * tao/Null_Fragmentation_Strategy.h (fragment):
-        * tao/Null_Fragmentation_Strategy.cpp (fragment):
-        * tao/On_Demand_Fragmentation_Strategy.h (fragment):
-        * tao/On_Demand_Fragmentation_Strategy.cpp (fragment):
-
-          Likewise.
-
-        * tao/operation_details.cpp (marshal_args):
-
-          Mark the CDR as having no other fragments to send after all
-          arguments have been marshaled, not before the last one is
-          marshaled.
-
-        * ORB_Core.h (fragmentation_Strategy):
-
-          Added missing transport parameter.
-
-          Removed const qualifier.  The resource_factory() accessor isn't
-          a const method.
-
-        * ORB_Core.cpp (fragmentation_strategy):
-
-          Likewise.
-
-        * params.h:
-        * params.i:
-        * params.cpp:
-
-          Added missing max_message_size attribute.
-
-        Fri Mar 17 10:59:02 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Resource_Factory.h:
-          Added missing include of Basic_Types and added forward declarations
-
-        * tao/On_Demand_Fragmentation_Strategy.h:
-          Fixed copy constructor/assignment operators
-
-        * tao/CDR.h:
-          Removed do_fragmentation method, there is no implementation, added
-          fragment_stream
-
-        * tao/CDR.i:
-          Fixed typo
-
-        * tao/default_resource.cpp:
-          Added missing includes and updated signature of
-          create_fragmentation_strategy to match header file
-
-        Fri Mar 17 07:48:02 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-          Updated code after update from Ossama Othman
-
-        * tao/On_Demand_Fragmentation_Strategy.{h,cpp}:
-          New files
-
-        * tao/default_resource.{h,cpp}:
-          Added create_fragmentation_strategy
-
-        * tao/GIOP_Fragmentation_Strategy.h:
-          Doxygen improvements
-
-        * tao/Resource_Factory.h:
-          Added pure virtual fragmentation_strategy method
-
-        * tao/ORB_Core.{h,cpp}:
-          Added fragmentation_strategy accessor method
-
-        * tao/GIOP_Message_Base.{h,cpp}:
-          Added TAO_Transport to the constructor arguments
-
-        * tao/GIOP_Message_Base.cpp:
-          Added come comments
-
-        * tao/True_Fragmentation_Strategy.{h,cpp}:
-          Removed again, replaced by On_Demand so far as I can tell
-
-        * tao/tao.mpc:
-          Added new files
-
-        Thu Mar 16 07:48:02 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-          Integrated first set of code from Ossama Othman
-
-        * tao/GIOP_Fragmentation_Strategy.{h,cpp}:
-        * tao/Null_Fragmentation_Strategy.{h,cpp}:
-        * tao/True_Fragmentation_Strategy.{h,cpp}:
-          New files
-
-        * tao/operation_details.cpp:
-          When marshaling the last argument put this information on the
-          cdr_stream
-
-        * tao/GIOP_Message_Base.cpp:
-          Some refactoring
-
-        * tao/CDR.{h,cpp,i}:
-          Call fragment_stream as part of the streaming calls
-
-Thu Apr 20 11:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/sfp.idl:
-          Use CORBA::OctetSeq and CORBA::ULongSeq
-
-        * tao/Strategies/SCIOP_Profile.cpp:
-          Fixed compile error
-
-Thu Apr 20 08:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp:
-          Fixed compile error
-
-Thu Apr 20 07:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h:
-          Fixed template instantiation
-
-Wed Apr 19 18:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/UShortSeqC.h:
-        * tao/OctetSeqC.h:
-          Do an explicit export of the base template
-
-Wed Apr 19 16:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Messaging/ExceptionHolderC.{h,cpp}:
-          Added constructor that accepts all values as generated now by the
-          IDL compiler
-
-        * tao/Messaging/ExceptionHolder_i.cpp:
-          Use the new constructor
-
-Wed Apr 19 14:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Exception.h:
-          Made the copy constructor public again, vc7.1 complains when
-          it is protected. Made a todo in this file again, have to retest
-          this later.
-
-Wed Apr 19 13:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp:
-        * examples/Advanced/ch_12/icp.cpp:
-        * examples/Advanced/ch_21/icp.cpp:
-        * examples/Advanced/ch_18/icp.cpp:
-        * examples/Advanced/ch_8_and_10/icp.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/params_dup.h:
-          Removed workarounds for vc6
-
-Wed Apr 19 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Valuetype/AbstractBase.cpp:
-          Use true/false, const improvements
-
-        * tao/Valuetype/AbstractBase.cpp:
-          Use C++ cast instead of C cast
-
-Wed Apr 19 13:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/Any_Unknown_IDL_Type.h:
-          Removed not needed forward declarations
-
-        * tao/AnyTypeCode/Any.cpp:
-        * tao/AnyTypeCode/Any_Impl.cpp:
-        * tao/BiDir_GIOP/BiDirPolicy_Validator.cpp:
-          Use false/true instead of 0/1 for bool
-
-        * tao/PortableServer/Object_Adapter.h:
-          Don't export poa_name_iterator and iteratable_poa_name
-
-        * tao/PortableServer/Object_Adapter.cpp:
-          Use true/false and when the object adapter can't be found
-          throw a OBJECT_NOT_EXIST with minor code 2
-
-Wed Apr 19 12:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport_Timer.h:
-          No need to export this class from the TAO lib
-
-        * tao/ORB.h:
-          Use false for the default of the shutdown method
-
-Wed Apr 19 12:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc:
-          Made these projects dependent on each other to make sure
-          that they don't build in parallel and generate the same idl
-          file twice at the same moment. Thanks to Chad Elliot for the
-          info how to do this the easiest
-
-Wed Apr 19 12:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
-          Generate doxygen documentation style and use true instead of 1
-
-        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
-          Generate true for boolean instead of 1
-
-        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
-          Generate also argument names in the header file so that doxygen
-          can parse IDL generated code
-
-Wed Apr 19 12:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.{h,cpp,i}:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.{h,i}:
-          Use bool and prefix increment/decrement
-
-Wed Apr 19 11:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Big_Oneways/run_test.pl:
-        * tests/Hello/run_test.pl:
-        * performance-tests/Throughput/run_test.pl:
-          Check the return value of spawn, speedsup the builds when no
-          executable is build
-
-        * performance-tests/Throughput/Receiver.cpp:
-          Prefix increment
-
-        * performance-tests/Throughput/Receiver_Factory.cpp:
-          Initialise pointer with 0
-
-        * performance-tests/Throughput/Throughput.mpc:
-          Simplified
-
-Wed Apr 19 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Integrated iioptbranch. This fixes bugzilla 2467
-
-        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
-        No need to include IIOP files, just use the base classes
-
-        Wed Mar 29 08:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/default_resource.cpp
-        * tao/IIOP_Acceptor.cpp
-        * tao/IIOP_Acceptor.h
-        * tao/IIOP_Acceptor.i
-        * tao/IIOP_Connection_Handler.cpp
-        * tao/IIOP_Connection_Handler.h
-        * tao/IIOP_Connector.cpp
-        * tao/IIOP_Connector.h
-        * tao/IIOP_Endpoint.cpp
-        * tao/IIOP_Endpoint.h
-        * tao/IIOP_Endpoint.i
-        * tao/IIOP_Factory.cpp
-        * tao/IIOP_Factory.h
-        * tao/IIOP_Lite_Factory.cpp
-        * tao/IIOP_Lite_Factory.h
-        * tao/IIOP_Profile.cpp
-        * tao/IIOP_Profile.h
-        * tao/IIOP_Transport.cpp
-        * tao/IIOP_Transport.h
-        * tao/orbconf.h
-        * tao/TAO_Internal.cpp
-        Added TAO_HAS_IIOP. This is default set to 1 but can be overridden
-        in the config.h file to 0 meaning we don't support IIOP. This is
-        usefull for embedded systems that support one of the other
-        pluggable protocols and don't need IIOP support at all. With
-        TAO_HAS_IIOP set to 0 not everything will compile, just the
-        core libs itself.
-
-Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Integrated sequpdate3 branch. Thanks to Carlos O'Ryan for the initial
-        work for this new sequence implementation which I merged to cvs head
-        and finished
-
-        This fixes the following bugzilla entries:
-        2492 - Simplify TAO_Seq_Out_T
-        2493 - Simplify _reset method on union generated code
-        2352 - Valuefactory operations not safe
-        2353 - Valuefactories stored per process instead of per orb
-        2349 - ORB::destroy() should throw BAD_INV_ORDER if called during a
-        2315 - Reimplement (w)string_var/_out as templates
-        1989 - Footprint reduction issue, split Sequence files
-        2273 - Deprecate old AMI support
-        2300 - Simplify serialize/deserialize of sequences
-        2299 - Reimplement string/wstring managers as templates
-        1936 - Unnecessary usage of virtual functions in sequence implementation
-        1673 - operator[] of sequence<string> returns TAO_SeqElem_String_Manager
-        instead of TAO_String_Manager. Thanks to Mark Paulus <mark dot paulus
-        at mci dot com> for reporting this one.
-        1930 - Assignment operator for sequences is not exception safe.
-        1931 - The length() member function for sequences is not exception-safe.
-        1933 - Incomplete implementation of freebuf() for reference types.
-        1934 - const version of operator[] for string sequences allows assignment
-        1938 - Possible incorrect duplication in sequences of references
-        1928 - Assignment from T_mgr to sequence elements does not duplicate
-        2417 - Double delete on Transport when using oneways with sync_none
-        Thanks to Jan Ohlenburg <jan dot ohlenburg at fit dot fraunhofer dot de>
-        for reporting this.
-        2355 - oneway op. with timeout crashes client due to server termination
-        Thans to Jan Zima <jan dot zima at sofis dot cz> for reporting this.
-
-        Also did several const changes throughout the code
-
-        Fri Apr  7 08:03:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
-
-        * tao/Valuetype_Adapter_Factory.{h,cpp}:
-        New files, value type adapter factory
-
-        * tao/tao.mpc:
-        Added new files
-
-        * tao/Valuetype/Valuetype_Adapter_Factory_Impl.h:
-        Value type adapter factory implementation
-
-        * tao/Valuetype/ValueFactory_Map.{h,cpp}:
-        Map isn't a singleton anymore and guard access with a mutex
-
-        * tao/Valuetype/Valuetype_Adapter_Impl.{h,cpp}:
-        The value type adapter isn't loaded with service configurator
-        anymore, the value type factory is now the one we load on demand
-
-        * tao/ORB.cpp:
-        Updated the value type methods to use the new ORB_Core method
-        to get the valuetype adapter, is the ORB_Core can't get the
-        adapter it will throw already the internal exception
-
-        * tao/ORB_Core.{h,cpp,i}:
-        Get the value type adapter factory with svc conf instead of the
-        adapter itself. Create a unique instance per orb.
-
-        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
-        * tao/AnyTypeCode/append.cpp:
-        * tao/AnyTypeCode/skip.cpp:
-        Changed the way we get the valuetype adapter
-
-        Store the value type factories per orb and made things thread safe.
-        This fixes bugzilla bugs 2352 and 23253.
-
-        Thu Apr  6 09:17:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport_Connector.cpp:
-        Applied fix of bug 2417, let us see what the results are in the
-        branch build
-
-        Thu Apr  6 09:08:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/POA/FindPOA/FindPOA.cpp:
-        * tests/Bug_2349_Regression/client.cpp:
-        * tests/Bug_2349_Regression/foo.idl:
-        * tests/Bug_2349_Regression/server.cpp:
-        Improved tests
-
-        * tao/Adapter_Registry.{h,cpp}:
-        Remove the empty throw spec for close and check_close. This way
-        exceptions from lower layers are propagated up.
-
-        * tao/ORB_Core.{h,cpp}:
-        Removed empty throw spec from shutdown, if there are exceptions from
-        a lower layer and as a result we can't shutdown, let the user be
-        aware of it. This fixes bugzilla bug 2349
-
-        Mon Apr  3 07:59:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO/IDL/be/be_visitor_union/discriminant_ci.cpp
-        * TAO/IDL/be/be_visitor_union/union_ch.cpp
-        * TAO/IDL/be/be_visitor_union/union_cs.cpp
-        * TAO/IDL/be/be_visitor_union_branch/public_ci.cpp
-        * tao/GIOPC.{h,cpp,inl}:
-        Removed arguments from the _reset method on the union generated,
-        these are not used.
-
-        Sun Apr  2 18:56:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
-        * tao/BooleanSeqC.h
-        * tao/CONV_FRAMEC.h
-        * tao/CharSeqC.h
-        * tao/DomainC.h
-        * tao/DoubleSeqC.h
-        * tao/FloatSeqC.h
-        * tao/IIOPC.h
-        * tao/IIOP_EndpointsC.h
-        * tao/IOP_IORC.h
-        * tao/LongDoubleSeqC.h
-        * tao/LongLongSeqC.h
-        * tao/LongSeqC.h
-        * tao/Messaging_PolicyValueC.h
-        * tao/ORB.h
-        * tao/ObjectIdListC.h
-        * tao/Object_KeyC.h
-        * tao/OctetSeqC.h
-        * tao/Policy_ForwardC.h
-        * tao/Seq_Out_T.h
-        * tao/Seq_Out_T.inl
-        * tao/ServicesC.h
-        * tao/ShortSeqC.h
-        * tao/StringSeqC.h
-        * tao/ULongLongSeqC.h
-        * tao/ULongSeqC.h
-        * tao/UShortSeqC.h
-        * tao/WCharSeqC.h
-        * tao/WStringSeqC.h
-        * tao/AnyTypeCode/AnySeqC.h
-        * tao/AnyTypeCode/DynamicC.h
-        * tao/DynamicAny/DynamicAnyC.h
-        * tao/IFR_Client/IFR_BaseC.h
-        * tao/IFR_Client/IFR_BasicC.h
-        * tao/IFR_Client/IFR_ComponentsC.h
-        * tao/IFR_Client/IFR_ExtendedC.h
-        * tao/IORManipulation/IORC.h
-        * tao/ImR_Client/ImplRepoC.h
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h
-        * tao/PortableServer/PortableServerC.h
-        * tao/RTCORBA/RTCORBAC.h
-        * tao/RTScheduling/RTSchedulerC.h
-        * tao/Strategies/sciop_endpointsC.h
-        * tao/Strategies/uiop_endpointsC.h
-        Simplified TAO_Seq_Out_T to just use one template argument. Updated
-        the IDL compiler for this. Also use false for the release argument
-        of generated sequence constructors and add an argument to
-        _tao_encode/_tao_decode when generated in a header file to help
-        doxygen.
-
-        * TAO_Objref_Out_T.{h,inl}:
-        Assinging _var to _out is not allowed according to the spec
-
-        * tao/Messaging/*:
-        Removed old AMI mapping. Fixes partly bugzilla bug 2273, need to
-        update the IDL compiler yet
-
-        * tao/Exception.h:
-        Moved constructors, assignment operator and copy constructor to
-        protected now vc6 has been dropped. Also moved
-        create_system_exception from TAO_Exceptions class to TAO namespace
-
-        * tao/Messaging/Messaging.cpp:
-        * tao/Sync_Invocation.cpp:
-        * tao/SystemException.cpp:
-        Updated because of the create_system_exception move
-
-        * tao/String_Manager_T.h:
-        Renamed String_Manager to String_Manager_T, this way we can have
-        TAO::String_Manager and TAO::WString_Manager. These replace
-        TAO_String_Manager and TAO_WString_Manager
-
-        * CIAO/tools/Config_Handlers/DnC_Dump.cpp
-        * CIAO/tools/Config_Handlers/DnC_Dump.h
-        * TAO_IDL/be/be_visitor_array/array.cpp
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp
-        * orbsvcs/PSS/PSDL_Exception_Visitor.cpp
-        * orbsvcs/PSS/PSDL_Node.h
-        * orbsvcs/PSS/PSDL_Struct_Visitor.cpp
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
-        * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
-        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
-        * tao/CORBA_String.h
-        * tao/IIOPC.h
-        * tao/IIOP_EndpointsC.h
-        * tao/IOP_IORC.h
-        * tao/String_Manager_T.h
-        * tao/String_Traits_Base_T.h
-        * tao/Tagged_Profile.h
-        * tao/DynamicAny/DynamicAnyC.h
-        * tao/IFR_Client/IFR_BaseC.h
-        * tao/IFR_Client/IFR_BasicC.h
-        * tao/IFR_Client/IFR_ComponentsC.h
-        * tao/IFR_Client/IFR_ExtendedC.h
-        * tao/ImR_Client/ImplRepoC.h
-        * tao/PI/ORBInitInfoC.h
-        * tao/Strategies/sciop_endpointsC.h
-        * tao/Strategies/uiop_endpointsC.h
-        Updated all these files because of TAO::String_Manager and
-        TAO::WString_Manager introduction
-
-        * tests/Sequence_Unit_Tests/mock_reference.cpp:
-        * tests/Sequence_Unit_Tests/mock_reference.hpp:
-        Added counter to count number of marshal calls
-
-        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp:
-        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp:
-        Check the right counter, should be marshal.
-
-        * tao/PI/ClientRequestDetails.cpp:
-        * tao/PI_Server/ServerRequestDetails.cpp:
-        Added missing duplicate call
-
-        * TAO_IDL/be/be_interface.cpp
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/tie_si.cpp
-        * TAO_IDL/be/be_visitor_root/root.cpp
-        * tao/CurrentC.cpp
-        * tao/DomainC.cpp
-        * tao/ORB_Core.cpp
-        * tao/Object.cpp
-        * tao/Object_Ref_Table.cpp
-        * tao/PolicyC.cpp
-        * tao/Pseudo_VarOut_T.cpp
-        * tao/Pseudo_VarOut_T.inl
-        * tao/TAOC.cpp
-        * tao/AnyTypeCode/Any_Array_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Basic_Impl.cpp
-        * tao/AnyTypeCode/Any_Basic_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Impl.cpp
-        * tao/AnyTypeCode/Any_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Special_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
-        * tao/AnyTypeCode/TypeCode.cpp
-        * tao/AnyTypeCode/TypeCode.inl
-        * tao/BiDir_GIOP/BiDirPolicyC.cpp
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
-        * tao/CSD_Framework/CSD_FrameworkC.cpp
-        * tao/CSD_Framework/CSD_POA.cpp
-        * tao/CodecFactory/IOP_CodecC.cpp
-        * tao/DynamicAny/DynamicAnyC.cpp
-        * tao/DynamicInterface/Dynamic_Implementation.cpp
-        * tao/DynamicInterface/ExceptionList.cpp
-        * tao/DynamicInterface/Request.cpp
-        * tao/DynamicInterface/Server_Request.cpp
-        * tao/IFR_Client/IFR_BaseC.cpp
-        * tao/IFR_Client/IFR_BasicC.cpp
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
-        * tao/IFR_Client/IFR_ComponentsC.cpp
-        * tao/IFR_Client/IFR_ExtendedC.cpp
-        * tao/IORInterceptor/IORInfoC.cpp
-        * tao/IORInterceptor/IORInterceptorC.cpp
-        * tao/IORManipulation/IORC.cpp
-        * tao/IORManipulation/IORManipulation.cpp
-        * tao/IORTable/IORTableC.cpp
-        * tao/IORTable/Table_Adapter.cpp
-        * tao/ImR_Client/ImplRepoC.cpp
-        * tao/ImR_Client/ServerObjectC.cpp
-        * tao/Messaging/MessagingC.cpp
-        * tao/Messaging/Messaging_No_ImplC.cpp
-        * tao/Messaging/Messaging_RT_PolicyC.cpp
-        * tao/Messaging/Messaging_SyncScope_PolicyC.cpp
-        * tao/Messaging/PollableC.cpp
-        * tao/Messaging/TAO_ExtC.cpp
-        * tao/PI/ClientRequestInfoC.cpp
-        * tao/PI/ClientRequestInterceptorC.cpp
-        * tao/PI/InterceptorC.cpp
-        * tao/PI/ORBInitInfo.cpp
-        * tao/PI/ORBInitInfoC.cpp
-        * tao/PI/ORBInitializerC.cpp
-        * tao/PI/PICurrentC.cpp
-        * tao/PI/PolicyFactoryC.cpp
-        * tao/PI/PolicyFactory_Registry.cpp
-        * tao/PI/ProcessingModePolicyC.cpp
-        * tao/PI/RequestInfoC.cpp
-        * tao/PI_Server/ServerRequestInfoC.cpp
-        * tao/PI_Server/ServerRequestInterceptorC.cpp
-        * tao/PortableServer/AdapterActivatorC.cpp
-        * tao/PortableServer/IdAssignmentPolicyC.cpp
-        * tao/PortableServer/IdUniquenessPolicyC.cpp
-        * tao/PortableServer/ImplicitActivationPolicyC.cpp
-        * tao/PortableServer/LifespanPolicyC.cpp
-        * tao/PortableServer/Object_Adapter.cpp
-        * tao/PortableServer/POAManager.cpp
-        * tao/PortableServer/POAManagerC.cpp
-        * tao/PortableServer/PS_CurrentC.cpp
-        * tao/PortableServer/PortableServerC.cpp
-        * tao/PortableServer/RequestProcessingPolicyC.cpp
-        * tao/PortableServer/Root_POA.cpp
-        * tao/PortableServer/ServantActivatorC.cpp
-        * tao/PortableServer/ServantLocatorC.cpp
-        * tao/PortableServer/ServantManagerC.cpp
-        * tao/PortableServer/ServantRetentionPolicyC.cpp
-        * tao/PortableServer/ThreadPolicyC.cpp
-        * tao/RTCORBA/RTCORBAC.cpp
-        * tao/RTPortableServer/RTPortableServerC.cpp
-        * tao/RTScheduling/Current.cpp
-        * tao/RTScheduling/RTSchedulerC.cpp
-        * tao/TypeCodeFactory/TypeCodeFactoryC.cpp
-        * tao/Utils/Server_Main.cpp
-        * tao/Valuetype/AbstractBase.cpp:
-        Use :: before ::CORBA
-
-        * TAO_IDL/be/be_interface.cpp
-        * tao/DomainC.cpp
-        * tao/DomainC.inl
-        * tao/GIOPC.h
-        * tao/PolicyC.cpp
-        * tao/PolicyC.h
-        * tao/PolicyC.inl
-        * tao/WrongTransactionC.cpp
-        * tao/AnyTypeCode/Alias_TypeCode.inl
-        * tao/AnyTypeCode/Alias_TypeCode_Static.inl
-        * tao/AnyTypeCode/BoundsC.cpp
-        * tao/AnyTypeCode/Empty_Param_TypeCode.inl
-        * tao/AnyTypeCode/Enum_TypeCode.inl
-        * tao/AnyTypeCode/Enum_TypeCode_Static.inl
-        * tao/AnyTypeCode/Fixed_TypeCode.inl
-        * tao/AnyTypeCode/Objref_TypeCode.inl
-        * tao/AnyTypeCode/Objref_TypeCode_Static.inl
-        * tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
-        * tao/AnyTypeCode/Sequence_TypeCode.inl
-        * tao/AnyTypeCode/Sequence_TypeCode_Static.inl
-        * tao/AnyTypeCode/String_TypeCode.inl
-        * tao/AnyTypeCode/String_TypeCode_Static.inl
-        * tao/AnyTypeCode/Struct_TypeCode.inl
-        * tao/AnyTypeCode/Struct_TypeCode_Static.inl
-        * tao/AnyTypeCode/Union_TypeCode.inl
-        * tao/AnyTypeCode/Union_TypeCode_Static.inl
-        * tao/AnyTypeCode/Value_TypeCode.inl
-        * tao/AnyTypeCode/Value_TypeCode_Static.inl
-        * tao/BiDir_GIOP/BiDir_Policy_i.cpp
-        * tao/CodecFactory/IOP_CodecC.cpp
-        * tao/Domain/DomainS.cpp
-        * tao/DynamicAny/DynamicAnyC.cpp
-        * tao/IFR_Client/IFR_BaseC.cpp
-        * tao/IFR_Client/IFR_BaseC.h
-        * tao/IFR_Client/IFR_BaseC.inl
-        * tao/IFR_Client/IFR_BasicC.cpp
-        * tao/IFR_Client/IFR_BasicC.h
-        * tao/IFR_Client/IFR_BasicC.inl
-        * tao/IFR_Client/IFR_ComponentsC.cpp
-        * tao/IFR_Client/IFR_ComponentsC.inl
-        * tao/IFR_Client/IFR_ExtendedC.cpp
-        * tao/IFR_Client/IFR_ExtendedC.h
-        * tao/IFR_Client/IFR_ExtendedC.inl
-        * tao/IORManipulation/IORC.cpp
-        * tao/IORTable/IORTableC.cpp
-        * tao/ImR_Client/ImplRepoC.cpp
-        * tao/ImR_Client/ImplRepoC.inl
-        * tao/ImR_Client/ServerObjectC.cpp
-        * tao/ImR_Client/ServerObjectC.inl
-        * tao/Messaging/Connection_Timeout_Policy_i.cpp
-        * tao/Messaging/MessagingC.cpp
-        * tao/Messaging/MessagingC.inl
-        * tao/Messaging/Messaging_Policy_i.cpp
-        * tao/Messaging/PollableC.cpp
-        * tao/PI/InvalidSlotC.cpp
-        * tao/PI/ORBInitInfoC.cpp
-        * tao/PI/PIForwardRequestC.cpp
-        * tao/PortableServer/ForwardRequestC.cpp
-        * tao/PortableServer/POAManagerC.cpp
-        * tao/PortableServer/PS_CurrentC.cpp
-        * tao/PortableServer/PortableServerC.cpp
-        * tao/RTCORBA/RTCORBAC.cpp
-        * tao/RTCORBA/RT_Policy_i.cpp
-        * tao/RTScheduling/RTSchedulerC.cpp
-        * tao/TypeCodeFactory/Recursive_TypeCode.inl
-        * tao/Valuetype/StringValueC.inl
-        Removed ACE_NESTED_CLASS
-
-        * TAO_IDL/ast/ast_type.cpp
-        * TAO_IDL/be/be_interface.cpp
-        * TAO_IDL/be/be_visitor_component/component_ci.cpp
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp
-        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_is.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp
-        * TAO_IDL/be/be_visitor_operation/operation.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
-        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
-        Removed generation of ACE_NESTED_CLASS, just use A::B instead
-
-        All changes below is the merge of the branch sequenceupdate to
-        sequpdate2. This is the new sequence implementation for TAO.
-
-        * tao/Array_VarOut_T.h:
-        Only do an empty forward declaration of Array_Traits. This will
-        make sure that we have to do each specialization explicitly, if
-        we lack one, we get a compile error instead of this empty default
-        one.
-
-        * tao/Objref_VarOut_T.h:
-        Only do an empty forward declaration of Objref_Traits. This will
-        make sure that we have to do each specialization explicitly, if
-        we lack one, we get a compile error instead of this empty default
-        one.
-
-        * tao/Basic_Types.h:
-        Updated the string types, these are implemented by a template now.
-
-        * tao/BooleanSeqC.{h,cpp}:
-        * tao/CharSeqC.{h,cpp}:
-        * tao/CONV_FRAMEC.{h,cpp}:
-        * tao/CurrentC.{h,cpp}:
-        * tao/DomainC.{h,cpp}:
-        * tao/DoubleSeqC.{h,cpp}:
-        * tao/FloatSeqC.{h,cpp}:
-        * tao/WStringSeqC.{h,cpp}:
-        * tao/LongSeqC.{h,cpp}:
-        * tao/WCharSeqC.{h,cpp}:
-        * tao/Object_KeyC.{h,cpp}:
-        * tao/ObjectIdListC.{h,cpp}:
-        * tao/IIOP_EndpointsC.{h,cpp}:
-        * tao/LongLongSeqC.{h,cpp}:
-        * tao/IIOPC.{h,cpp}:
-        * tao/IOP_IORC.{h,cpp}:
-        * tao/LongDoubleSeqC.{h,cpp}:
-        * tao/Messaging_PolicyValueC.{h,cpp}:
-        * tao/OctetSeqC.{h,cpp}:
-        * tao/Policy_ForwardC.{h,cpp}:
-        * tao/PolicyC.{h,cpp}:
-        * tao/ServicesC.{h,cpp}:
-        * tao/ShortSeqC.{h,cpp}:
-        * tao/StringSeqC.{h,cpp}:
-        * tao/TAOC.{h,cpp}:
-        * tao/ULongLongSeqC.{h,cpp}:
-        * tao/ULongSeqC.{h,cpp}:
-        * tao/UShortSeqC.{h,cpp}:
-        * tao/AnyTypeCode/AnySeqC.{h,cpp}:
-        * tao/AnyTypeCode/DynamicC.{h,cpp}:
-        * tao/DynamicAny/DynamicAnyC.{h,cpp}:
-        * tao/IFR_Client/IFR_ExtendedC.{h,cpp}:
-        * tao/IFR_Client/IFR_ComponentsC.{h,cpp}:
-        * tao/IFR_Client/IFR_BasicC.{h,cpp}:
-        * tao/IFR_Client/IFR_BaseC.{h,cpp}:
-        * tao/ImR_Client/ImplRepoC.{h,cpp}:
-        * tao/IORManipulation/IORC.{h,cpp}:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.{h,cpp}:
-        * tao/PortableServer/PortableServerC.{h,cpp}:
-        * tao/RTCORBA/RTCORBAC.{h,cpp}:
-        * tao/RTScheduling/RTSchedulerC.{h,cpp}:
-        * tao/Strategies/sciop_endpointsC.{h,cpp}:
-        * tao/Strategies/uiop_endpointsC.{h,cpp}:
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.{h,cpp}:
-        Updated all these files because of the changes to the sequence
-        implementation. The base classes are changed including the way we
-        marshal and demarshal sequences. The argument to the marshal method
-        is also const.
-
-        * tao/Bounded_Array_Allocation_Traits.h:
-        * tao/Bounded_Reference_Allocation_Traits_T.h:
-        * tao/Bounded_Value_Allocation_Traits_T.h:
-        New allocation traits for bounded sequences
-
-        * tao/Value_Traits_T.h:
-        New value traits.
-
-        * tao/Bounded_Array_Sequence_T.h:
-        New template for Bounded Array Sequences
-
-        * tao/Bounded_Basic_String_Sequence_T.h:
-        * tao/Bounded_String_Sequence_T.h:
-        * tao/Bounded_Wstring_Sequence_T.h:
-        New template for bounded strings, derived are string and wstring
-        bounded sequences
-
-        * tao/Bounded_Object_Reference_Sequence_T.h:
-        New template for bounded object reference sequences
-
-        New allocation traits for bounded reference
-
-        * tao/Bounded_Sequence_CDR_T.h:
-        Template method for sequence marshal/demarshal
-
-        * tao/corba.h:
-        Updated includes, Managed_Types.h is replaced with
-        String_Manager_T.h
-
-        * tao/CORBA_String.{h,cpp,inl}:
-        The CORBA::String_var/_out and CORBA::WString_var/_out are now
-        implemented with the new TAO::String_var/_out template
-
-        * tao/Generic_Sequence_T.h:
-        New generic sequence template
-
-        * tao/Managed_Types.{h,cpp,i}:
-        Removed these files
-
-        * tao/MProfile.cpp:
-        Initialise pointers with 0 and fixed retrieval of a policy
-
-        * tao/Object.{h,cpp}:
-        Made the argument of the marshal method const
-
-        * tao/operation_details.i:
-        Changed the way we reset the service info
-
-        * tao/ORB.h:
-        Updated all typedefs in this file
-
-        * tao/Policy_Set.{h,cpp.i}:
-        Made the get_policy_by_index const and fixed the
-        set_policy_overrides to work with the new sequences, as a result
-        the workarounds could be removed
-
-        * tao/Sequence_T.{cpp,i}:
-        Removed these files
-
-        * tao/Sequence_T.h:
-        Include all new sequence template files, makes it easy for old apps
-        to keep compiling
-
-        * tao/String_Alloc.{h,cpp}:
-        All string allocation methods
-
-        * tao/VarOut_T.h:
-        Removed THIS_OUT_TYPE typedef
-
-        * tao/DynamicInterface/Request.h:
-        Removed include of Sequence.h, not needed
-
-        * tao/Profile.h:
-        Updated typedef for TAO_opaque
-
-        * tao/Object_Reference_Sequence_Element_T.h:
-        * tao/Object_Reference_Traits_Base_T.h:
-        * tao/Object_Reference_Traits_T.h:
-        * tao/Range_Checking_T.h:
-        New files
-
-        * tao/Seq_Out_T.{h,inl}:
-        Removed TAO_MngSeq_Out_T, not needed anymore
-
-        * tao/Sequence.{h,cpp,i}:
-        Removed
-
-        * tao/Seq_Var_T.{h,cpp.inl}:
-        Removed TAO_MngSeq_Var_T, not needed anymore
-
-        * tao/String_Manager_T.h:
-        TAO string manager as template, new file
-
-        * tao/String_Sequence_Element_T.h:
-        Element in a string sequence
-
-        * tao/String_Traits_Base_T.h:
-        * tao/String_Traits_T.h:
-        String traits
-
-        * tao/Unbounded_Array_Allocation_Traits_T.h
-        * tao/Unbounded_Array_Sequence_T.h
-        * tao/Unbounded_Basic_String_Sequence_T.h
-        * tao/Unbounded_Object_Reference_Sequence_T.h
-        * tao/Unbounded_Octet_Sequence_T.h
-        * tao/Unbounded_Reference_Allocation_Traits_T.h
-        * tao/Unbounded_Sequence_CDR_T.h
-        * tao/Unbounded_String_Sequence_T.h
-        * tao/Unbounded_Value_Allocation_Traits_T.h
-        * tao/Unbounded_Value_Sequence_T.h
-        * tao/Unbounded_Wstring_Sequence_T.h
-        Unbounded sequence files
-
-        * tao/diffs/Object_Key.diff:
-        Updated
-
-        * tao/PI/ClientRequestInfo.cpp:
-        * tao/PI_Server/ServerRequestInfo.cpp:
-        Removed temporary object usage
-
-        * tao/RTCORBA/RT_Stub.cpp:
-        * tao/RTScheduling/Request_Interceptor.cpp:
-        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
-        Updated for the fact that an object sequence now returns a _ptr
-        on the subscript operators instead of the _var which wasn't
-        confirming to the CORBA C++ mapping
-
-        * tao/RTScheduling/Current.h:
-        Updated IdType typedef
-
-        * tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h
-        * tao/Valuetype/Bounded_Valuetype_Sequence_T.h
-        * tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h
-        * tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
-        * tao/Valuetype/Valuetype_Sequence_Element_T.h
-        * tao/Valuetype/Valuetype_Traits_Base_T.h
-        * tao/Valuetype/Valuetype_Traits_T.h
-        New sequence implementated for valuetypes
-
-        * tao/Valuetype/Sequence_T.{cpp,inl}:
-        Removed
-
-        * tao/Valuetype/Sequence_T.h:
-        Just include the new files, easier for backward compatibility
-
-        * tao/Valuetype/Value_VarOut_T.{h,cpp}:
-        Just define an empty Value_Traits, make sure we get all
-        specializations
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be_include/be_visitor_traits.h:
-        Updated for new sequence implementation
-
-        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
-        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
-        * examples/Load_Balancing/Identity_Client.cpp:
-        * examples/Load_Balancing_persistent/Identity_Client.cpp:
-        * examples/POA/NewPOA/NewPOA.cpp:
-        * examples/POA/POA_BiDir/POA_BiDir.cpp:
-        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp:
-        * tests/DynAny_Test/test_dynsequence.cpp:
-        * tests/Sequence_Unit_Tests/*:
-        * tests/ORT/ServerRequestInterceptor.cpp:
-        * tests/Param_Test/big_union.cpp:
-        *
-        tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp:
-        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
-        * orbsvcs/orbsvcs/DsLogAdmin.idl:
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.{cpp,i}:
-        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.{h,cpp,i}
-        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
-        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/Container_i.cpp
-        * orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
-        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
-        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp:
-        * orbsvcs/orbsvcs/Log/Log_i.h:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.{h,cpp}
-        * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp:
-        * orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp:
-        * orbsvcs/tests/AVStreams/Component_Switching/sender.cpp:
-        * orbsvcs/tests/Bug_1393_Regression/client.cpp:
-        * orbsvcs/tests/FT_App/FT_Client.cpp:
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp:
-        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp:
-        *
-        orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp:
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp:
-        * tests/RTScheduling/Current/Thread_Task.cpp:
-        * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
-        Updated for sequence implementation
-
-        * tests/Sequence_Unit_Tests/*:
-        Removed files that are now in the core TAO lib
-
-Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2503_Regression/*:
-          New regression for bug 2503. Thanks to Carlos O'Ryan for creating
-          this test
-
-Tue Apr 18 20:51:48 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * TAO version 1.5.1 released.
-
-Local Variables:
-mode: change-log
-add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
-indent-tabs-mode: nil
-End:
diff --git a/TAO/MPC/config/avoids_corba_e_compact.mpb b/TAO/MPC/config/avoids_corba_e_compact.mpb
deleted file mode 100644
index 2a4398c9d81..00000000000
--- a/TAO/MPC/config/avoids_corba_e_compact.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(corba_e_compact) {
-  avoids += corba_e_compact
-}
diff --git a/TAO/MPC/config/avoids_corba_e_micro.mpb b/TAO/MPC/config/avoids_corba_e_micro.mpb
deleted file mode 100644
index 6d2a1479a45..00000000000
--- a/TAO/MPC/config/avoids_corba_e_micro.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(corba_e_micro) {
-  avoids += corba_e_micro
-}
diff --git a/TAO/MPC/config/avoids_minimum_corba.mpb b/TAO/MPC/config/avoids_minimum_corba.mpb
deleted file mode 100644
index a66e137439b..00000000000
--- a/TAO/MPC/config/avoids_minimum_corba.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(minimum_corba) {
-  avoids += minimum_corba
-}
diff --git a/TAO/MPC/config/compression.mpb b/TAO/MPC/config/compression.mpb
deleted file mode 100644
index 9319e9c14d6..00000000000
--- a/TAO/MPC/config/compression.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib {
-  after   += Compression
-  libs    += TAO_Compression
-}
diff --git a/TAO/MPC/config/concurrency_serv.mpb b/TAO/MPC/config/concurrency_serv.mpb
deleted file mode 100644
index 3d4ef81a22e..00000000000
--- a/TAO/MPC/config/concurrency_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, concurrency_skel, avoids_corba_e_micro {
-  after     += CosConcurrency_Serv
-  libs      += TAO_CosConcurrency_Serv
-}
diff --git a/TAO/MPC/config/core_strategies.mpb b/TAO/MPC/config/core_strategies.mpb
deleted file mode 100644
index 3c568c55192..00000000000
--- a/TAO/MPC/config/core_strategies.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(ace_for_tao) {
-  macros += TAO_HAS_SHMIOP=0 TAO_HAS_UIOP=0
-}
diff --git a/TAO/MPC/config/csd_tp_foo_a_lib.mpb b/TAO/MPC/config/csd_tp_foo_a_lib.mpb
deleted file mode 100644
index ec2c825faa8..00000000000
--- a/TAO/MPC/config/csd_tp_foo_a_lib.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : csd_tp_test_lib, avoids_corba_e_micro {
-  after += csd_tp_foo_a_lib
-  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-  libs += CSD_TP_Foo_A
-  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-}
diff --git a/TAO/MPC/config/csd_tp_foo_b_lib.mpb b/TAO/MPC/config/csd_tp_foo_b_lib.mpb
deleted file mode 100644
index 1098b7be411..00000000000
--- a/TAO/MPC/config/csd_tp_foo_b_lib.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : csd_tp_test_lib, avoids_corba_e_micro {
-  after += csd_tp_foo_b_lib
-  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-  libs += CSD_TP_Foo_B
-  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-}
diff --git a/TAO/MPC/config/csd_tp_foo_c_lib.mpb b/TAO/MPC/config/csd_tp_foo_c_lib.mpb
deleted file mode 100644
index 282aebf29df..00000000000
--- a/TAO/MPC/config/csd_tp_foo_c_lib.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : csd_tp_test_lib, avoids_corba_e_micro {
-  after += csd_tp_foo_c_lib
-  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-  libs += CSD_TP_Foo_C
-  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-}
diff --git a/TAO/MPC/config/endpointpolicy.mpb b/TAO/MPC/config/endpointpolicy.mpb
deleted file mode 100644
index 0c2f2c5ca71..00000000000
--- a/TAO/MPC/config/endpointpolicy.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, install, portableserver, pi {
-  after   += EndpointPolicy
-  libs    += TAO_EndpointPolicy
-}
diff --git a/TAO/MPC/config/event.mpb b/TAO/MPC/config/event.mpb
deleted file mode 100644
index 8ab08a3a0fa..00000000000
--- a/TAO/MPC/config/event.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, ec_use_typed_events, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after     += CosEvent
-  libs      += TAO_CosEvent
-  tagchecks += CosEvent
-}
diff --git a/TAO/MPC/config/event_serv.mpb b/TAO/MPC/config/event_serv.mpb
deleted file mode 100644
index 8d064aeada8..00000000000
--- a/TAO/MPC/config/event_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging_optional, naming, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after     += CosEvent_Serv
-  libs      += TAO_CosEvent_Serv
-}
diff --git a/TAO/MPC/config/event_skel.mpb b/TAO/MPC/config/event_skel.mpb
deleted file mode 100644
index efcd4bb4706..00000000000
--- a/TAO/MPC/config/event_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, event, ec_use_typed_events, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after     += CosEvent_Skel
-  libs      += TAO_CosEvent_Skel
-}
diff --git a/TAO/MPC/config/ftorbutils.mpb b/TAO/MPC/config/ftorbutils.mpb
deleted file mode 100644
index 994a7560287..00000000000
--- a/TAO/MPC/config/ftorbutils.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : iormanip, portableserver, orbsvcslib, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after     += FTORB_Utils
-  libs      += TAO_FTORB_Utils
-  tagchecks += FTORB_Utils
-}
diff --git a/TAO/MPC/config/ftrtevent.mpb b/TAO/MPC/config/ftrtevent.mpb
deleted file mode 100644
index dd6dd565807..00000000000
--- a/TAO/MPC/config/ftrtevent.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ftorbutils, rtevent_serv, naming, messaging, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after     += FtRtEvent
-  libs      += TAO_FtRtEvent
-  tagchecks += FtRtEvent
-}
diff --git a/TAO/MPC/config/ifrservice.mpb b/TAO/MPC/config/ifrservice.mpb
deleted file mode 100644
index 548ad255e9e..00000000000
--- a/TAO/MPC/config/ifrservice.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : iortable, svc_utils, typecodefactory, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  avoids    += ace_for_tao    // Requires ace/Configuration
-  after     += IFRService
-  libs      += TAO_IFRService
-  tagchecks += IFRService
-}
diff --git a/TAO/MPC/config/imr_locator.mpb b/TAO/MPC/config/imr_locator.mpb
deleted file mode 100644
index b596a1f1214..00000000000
--- a/TAO/MPC/config/imr_locator.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += ImR_Locator
-  libs  += TAO_ImR_Locator
-}
diff --git a/TAO/MPC/config/orbsvcslib.mpb b/TAO/MPC/config/orbsvcslib.mpb
deleted file mode 100644
index 483b93b2412..00000000000
--- a/TAO/MPC/config/orbsvcslib.mpb
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib_with_idl, orbsvcs_output, anytypecode {
-  tagname     = TAO_ORBSVCS
-  includes += $(TAO_ROOT)/orbsvcs
-  idlflags += -I$(TAO_ROOT)/orbsvcs
-
-  specific(automake) {
-    includes += $(TAO_BUILDDIR)/orbsvcs
-  }
-}
diff --git a/TAO/MPC/config/portablegroup.mpb b/TAO/MPC/config/portablegroup.mpb
deleted file mode 100644
index 168a0af6eaf..00000000000
--- a/TAO/MPC/config/portablegroup.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : naming, messaging, iormanip, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  libs      += TAO_PortableGroup
-  after     += PortableGroup
-  tagchecks += PortableGroup
-}
diff --git a/TAO/MPC/config/rtcorbacommon.mpb b/TAO/MPC/config/rtcorbacommon.mpb
deleted file mode 100644
index cba4215883d..00000000000
--- a/TAO/MPC/config/rtcorbacommon.mpb
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after    += RTCORBA_Common
-  libs     += RTCORBA_Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  }
-
-  includes += ../Common
-}
diff --git a/TAO/MPC/config/rtportableserver.mpb b/TAO/MPC/config/rtportableserver.mpb
deleted file mode 100644
index ec458f8f6be..00000000000
--- a/TAO/MPC/config/rtportableserver.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : pi, portableserver, rtcorba, avoids_corba_e_micro {
-  after   += RTPortableServer
-  libs    += TAO_RTPortableServer
-}
diff --git a/TAO/MPC/config/rtscheduling.mpb b/TAO/MPC/config/rtscheduling.mpb
deleted file mode 100644
index 5920352054d..00000000000
--- a/TAO/MPC/config/rtscheduling.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : rtcorba, portableserver, pi, pi_server, avoids_corba_e_micro {
-  after   += RTScheduler
-  libs    += TAO_RTScheduler
-}
diff --git a/TAO/MPC/config/strategies.mpb b/TAO/MPC/config/strategies.mpb
deleted file mode 100644
index ae5383f50cb..00000000000
--- a/TAO/MPC/config/strategies.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-project : taolib, anytypecode, core_strategies {
-  after   += Strategies
-  libs    += TAO_Strategies
-}
diff --git a/TAO/MPC/config/taoidldefaults.mpb b/TAO/MPC/config/taoidldefaults.mpb
deleted file mode 100644
index 0ad954815d7..00000000000
--- a/TAO/MPC/config/taoidldefaults.mpb
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  // Set the idl compiler and flags as template values
-  specific {
-    tao_idl      = $(ACE_ROOT)/bin/tao_idl
-    tao_idl_dep  = $(ACE_ROOT)/bin/tao_idl
-    tao_idlflags = -Wb,pre_include=ace/pre.h \
-                   -Wb,post_include=ace/post.h -I$(TAO_ROOT)
-  }
-
-  Define_Custom(IDL) {
-    automatic            = 1
-    dependent            = $(TAO_IDL_DEP)
-    command              = $(TAO_IDL)
-    libpath              = $(ACE_ROOT)/lib
-    inputext             = .idl
-    source_pre_extension = C
-    header_pre_extension = C, S
-    source_outputext     = .cpp, .cxx, .cc, .C
-    header_outputext     = .h, .hpp, .hxx, .hh
-    keyword idlflags     = commandflags
-
-    // Inline related options
-    optional(inline_outputext) {
-      commandflags(!-SS && !-Ssi || !-Sci || -GT && !-SS && !-oS) += .inl, .i
-    }
-    optional(inline_pre_extension) {
-      commandflags(!-SS && !-Ssi && !-oS) += S
-    }
-    optional(inline_pre_extension) {
-      commandflags(!-Sci) += C
-    }
-
-    // Source related options
-    optional(source_pre_extension) {
-      commandflags(!-SS && !-oS) += S
-    }
-    optional(source_pre_extension) {
-      commandflags(-GA && !-oA) += A
-    }
-    optional(header_outputext) {
-      commandflags(-SS && !-oS) += S
-    }
-
-    // Other
-    optional(template_outputext) {
-      commandflags(-GT && !-SS && !-oS) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C
-    }
-    optional(header_pre_extension) {
-      commandflags(-GT && !-SS && !-oS) += S_T
-    }
-    optional(header_pre_extension) {
-      commandflags(-GA && !-oA || -GX) += A
-    }
-  }
-
-  after    += TAO_IDL_EXE
-  idlflags += $(TAO_IDLFLAGS)
-  idlflags += -Sa -St
-}
diff --git a/TAO/MPC/config/tc.mpb b/TAO/MPC/config/tc.mpb
deleted file mode 100644
index 4a11f6882e0..00000000000
--- a/TAO/MPC/config/tc.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: taolib_with_idl, interceptors, pi {
-  after   += TC
-  libs    += TAO_TC
-}
diff --git a/TAO/MPC/config/tc_iiop.mpb b/TAO/MPC/config/tc_iiop.mpb
deleted file mode 100644
index f7cb304d457..00000000000
--- a/TAO/MPC/config/tc_iiop.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: tc {
-  after   += TC_IIOP
-  libs    += TAO_TC_IIOP
-}
diff --git a/TAO/MPC/config/trading_serv.mpb b/TAO/MPC/config/trading_serv.mpb
deleted file mode 100644
index 9660739947a..00000000000
--- a/TAO/MPC/config/trading_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, trading_skel, dynamicany, svc_utils, utils, iortable {
-  after     += CosTrading_Serv
-  libs      += TAO_CosTrading_Serv
-}
diff --git a/TAO/MPC/config/typecodefactory.mpb b/TAO/MPC/config/typecodefactory.mpb
deleted file mode 100644
index 50fc42a5ca1..00000000000
--- a/TAO/MPC/config/typecodefactory.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  libs    += TAO_TypeCodeFactory
-  after   += TypeCodeFactory
-}
diff --git a/TAO/MPC/config/valuetype.mpb b/TAO/MPC/config/valuetype.mpb
deleted file mode 100644
index 01c65a621ea..00000000000
--- a/TAO/MPC/config/valuetype.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: taolib, anytypecode, avoids_corba_e_micro {
-  after    += Valuetype
-  libs     += TAO_Valuetype
-}
diff --git a/TAO/MPC/config/zlibcompressor.mpb b/TAO/MPC/config/zlibcompressor.mpb
deleted file mode 100644
index 8530956c695..00000000000
--- a/TAO/MPC/config/zlibcompressor.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, compression, zlib {
-  requires += zlib
-  after   += ZlibCompressor
-  libs    += TAO_ZlibCompressor
-}
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index f33bf290a25..534cb5db6d1 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -28,8 +28,7 @@ endif
 if BUILD_TESTS
 SUBDIRS += \
 	performance-tests \
-	interop-tests \
-	tests
+	interop-tests
 endif
 
 SUBDIRS += \
diff --git a/TAO/NEWS b/TAO/NEWS
index 718bacc1320..2b9e5a40d68 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -6,121 +6,7 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 
 . (JTC) autoconf support for tests and examples subdirectories.
 
-PLANNED CHANGES FOR "TAO-5.5.6"
-===============================
-
-. (OO) Coverity error fixes for TAO.
-. (OO) Remove exception specifications from ORB mediated operations (C++
-       mapping requirement).
-. (OO) Various other fixes that have been piling up.
-
-USER VISIBLE CHANGES BETWEEN TAO-1.5.4 and TAO-1.5.5
-====================================================
-
-. Removed warning issued when using corbaloc with a default object key.
-
-. Added implementation of Dynamic Any methods insert_*_seq() and
-  get_*_seq() (spec-defined for sequences of IDL basic types),
-  as well as implementation of insert and get methods for abstract
-  interfaces.
-
-. Added support for CORBA/e compact
-
-. Added support for CORBA/e micro
-
-. Fixed issues relating to the CosTrading Server library.  The constraint
-  language lexer now allow negative floating point values, 64-bit signed and
-  unsigned integers (which can currently be represented as octal or decimal).
-  Also, fixed a bug where negative integers were being stored and compared as
-  unsigned integers which resulted in -3 > 0 evaluating to true.
-
-. Added Compression module that delivers the infrastructure
-  classes with which data can be compressed. This can be used
-  by regular applications but then also by the ORB in the future.
-
-. Removed support for -Ge 0 and -Ge 1 from the IDL compiler. In practice
-  this means that the IDL compiler doesn't generate any environment macros
-  anymore.
-
-. Fixed a problem where TAO mistakenly considered ALL messages
-  with zero-length payload to be errors and was thus not properly
-  parsing and handling the GIOP CloseConnection message.  This is
-  tested via Bug_2702_Regression.
-
-. Added an optimization to servant activation to eliminate calls to
-  check_bounds() on the object key sequence.  This has been observed
-  to yield a 30% decrease in activation time for debug builds on VC71
-  and linux gcc.
-
-. Merged in changes from OCI's distribution which originate from
-  OCI request tickets [RT 8449] and [RT 8881]. In their totality,
-  these changes add a feature whereby the notification service
-  implementation can utilize a separate ORB for dispatching events to
-  consumers.
-
-. Contributed the Transport::Current support - an optional
-  feature with IDL interfaces, which enables users to obtain
-  information about the Transports used to send or receive a
-  message.  The basic intent is to provide (typically) a
-  read-only interface to obtaining data like the number of bytes
-  transferred or the number of messages sent and received.
-  Since specific Transports may have very different
-  characteristics, a simple generic implementation for
-  Transport::Current is insufficient.  This implementation also
-  provides support for specific Transport implementations. See
-  the TC_IIOP implementation, which is an IIOP-specific
-  Transport::Current, which extends the generic interface with
-  operations providing information about IIOP endpoints, like
-  host and port.  To build TAO with support for this feature, a
-  macro named TAO_HAS_TRANSPORT_CURRENT must be defined and have
-  a value != 0. For more details of how the feature is intended
-  to be used, see docs/transport_current/index.html
-
-USER VISIBLE CHANGES BETWEEN TAO-1.5.3 and TAO-1.5.4
-====================================================
-
-. Added support for ACE_Dev_Poll_Reactor to Advanced_Resource_Factory.
-
-. Improved tao_idl performance, particularly over networked
-  filesystems.
-
-. Added new option for the RTEC, -ECDispatchingThreadsFlags, that
-  allows the user to pass in a list of thread creation flags and
-  priority for dispatching threads.  These can be used for either the
-  MT dispatching strategy or the TPC dispatching strategy.  See
-  docs/ec_options.html for usage information.
-
-  Also added -ECDebug option to enable debugging output from the RTEC.
-  Only the option and variable was added, but no messages.  Therefore,
-  at the moment, this does not generate much output.
-
-. Resolved Bugzilla #2651 to eliminate incompatibility with the new
-  mechanism, allowing per-ORB configurations.
-
-. Fixed Bugzilla #2686, which involved correctly managing memory during
-  exceptional situations.  Throwing an exception during the creation of the
-  Root POA would cause a leak of a TAO_Adapter and POA manager related
-  objects.
-
-. Fixed Bugzilla #2699, by uninlining generated code for the
-  TIE template classes. Inlining of virtual functions in this
-  code was causing problems with RTTI on some compilers. As a side
-  result, the idl compiler doesn't generate a S_T.inl file anymore.
-
-. Fixed a bug where calling _set_policy_overrides() on a collocated servant
-  would return an unusable object reference.
-
-. Addressed a number of Coverity errors (CHECKED_RETURN, DEADCODE, LOCK,
-  USE_AFTER_FREE, RESOURCE_LEAK, FORWARD_NULL).  In particular, missing
-  return value checks and unreachable code in the ACE CDR stream
-  implementation were addressed.  Memory and resource management in the ACE
-  Configuration classes was corrected.  A potential deadlock upon error was
-  fixed in ACE_OS::rw_unlock().  Missing return value checks were addressed
-  in ACE_OS::open() on Windows and ACE_Thread_Manager::wait().  A potential
-  dereference of a null pointer in ACE_OS::scandir_emulation() was
-  corrected.  Lastly, the ACE_UUID::lock() accessor interface and
-  implementation was cleaned up so that it would not return a lock whose
-  memory had been freed.
+. (Remedy) Add support for CORBA/e compact and micro
 
 USER VISIBLE CHANGES BETWEEN TAO-1.5.2 and TAO-1.5.3
 ====================================================
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index f99940e1c23..697ef774163 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -43,8 +43,8 @@
 To: tao-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 1.5.4
-    ACE VERSION: 5.5.4
+    TAO VERSION: 1.5.3
+    ACE VERSION: 5.5.3
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
@@ -59,7 +59,7 @@ Subject: [area]: [synopsis]
     THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you
     use a link to a platform-specific file, simply state which one
     (unless this isn't used in this case, e.g., with Microsoft Visual
-    C++)]:
+    C++)]: 
 
     CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
     (used by MPC when you generate your own makefiles):
diff --git a/TAO/Release b/TAO/Release
index 744d1e015b6..9e124881936 100644
--- a/TAO/Release
+++ b/TAO/Release
@@ -21,7 +21,7 @@ CONTROLLED_FILES = \
 	TAO/Release \
 	TAO/TAO-INSTALL.html \
 	TAO/TAO.mwc \
-        TAO/TAO_*.mwc \
+	TAO/TAO_ACE* \
 	TAO/TAO_IDL \
 	TAO/VERSION \
 	TAO/configure.ac \
@@ -32,7 +32,6 @@ CONTROLLED_FILES = \
 	TAO/orbsvcs \
 	TAO/performance-tests \
 	TAO/rules.tao.GNU \
-        TAO/MPC \
 	TAO/tao \
 	TAO/tests \
 	TAO/utils
@@ -40,6 +39,7 @@ CONTROLLED_FILES = \
 RELEASE_FILES = $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
                 ACE_wrappers/TAO/TAO-INSTALL \
 		ACE_wrappers/TAO/GNUmake* \
+		ACE_wrappers/TAO/*.dsw \
         	ACE_wrappers/TAO/*.sln \
         	ACE_wrappers/TAO/*.bor \
         	ACE_wrappers/TAO/Makefile.in \
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index eb9425bc1c7..0c95b9dcd66 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -71,7 +71,7 @@ enhancement requests in our
 <a href="../docs/usage-bugzilla.html">bug tracking system</a>.<P>
 
 TAO can be obtained <A
-HREF="http://download.dre.vanderbilt.edu">electronically</A>
+HREF="http://deuce.doc.wustl.edu/Download.html">electronically</A>
 via the WWW and ftp.  <A
 HREF="http://www.dre.vanderbilt.edu/TAO">TAO</A> is bundled
 with the <A
@@ -94,7 +94,7 @@ bundle as a single piece instead of trying to mix and match things up.<P>
       <UL>
         <LI>Change directory to <CODE>$ACE_ROOT/ace</CODE> and execute
             <CODE><A HREF="#makenotes">make</A></CODE>.<P>
-        <LI>Also build GPERF under <CODE>$ACE_ROOT/apps/gperf/src</CODE><P>
+        <LI>Also build GPERF under <CODE>$ACE_ROOT/apps/gperf</CODE><P>
       </UL>
 
   <LI>Set <CODE>TAO_ROOT</CODE> environment variable to
@@ -134,22 +134,14 @@ bundle as a single piece instead of trying to mix and match things up.<P>
         </P>
         <P> If you wish to compile all the core tao and orbsvcs,
           including its dependencies in ACE and ACEXML, you can do the
-          following <OL>
-          <LI>
-          Unpack the distribution from DOC group's
-          website.</LI>
-          <LI>
-          Set the environment variables $ACE_ROOT and
-          $TAO_ROOT.</LI>
-          <LI>Create config.h and platform_macros.GNU at
-          the right places</LI>
-          <LI>Delete all the GNUmakefiles (or sln and
+          following (1) Unpack the distribution from DOC group's
+          website. (2) Set the environment variables $ACE_ROOT and
+          $TAO_ROOT. (3) Create config.h and platform_macros.GNU at
+          the right places (4) Delete all the GNUmakefiles (or sln and
           vproj file as the case may be) from the TAO distrbution using
-          the 'find' command.</LI>
-          <LI>Change directory to $TAO_ROOT.</LI>
-          <LI>Run MPC like this, $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc -type gnuace </LI>
-          <LI>Run
-          'make'.</LI> </OL></P><P> This will create all the required libraries for TAO
+          the 'find' command. (5) Change directory to $TAO_ROOT. (6)
+          Run MPC like this, $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc. (7) Run
+          'make'. This will create all the required libraries for TAO
           and TAO orbsvcs. In step 6, use -type vc71 if you want to
           generate VC71 project and workspace files for Win32. Please
           see <A href="../MPC/docs/USAGE"> MPC USAGE </A> document for
@@ -198,17 +190,13 @@ It is not possible to use TAO with explicit templates. Your compiler
 must support implicit templates. <P>
 
 <HR><P>
-<h3>Using cross compilation</h3>
-
-With cross compilation you build on the so called host system for a certain
-target system. The host system can for example be linux and the target
-can for example be VxWorks, LynxOS or Linux.
+<h3>For Cross-Compiled Targets, such as VxWorks and LynxOS</h3>
 
 If you are building TAO for a VxWorks target, please see the detailed
 instructions for building and installing ACE and TAO in <a
 href="../ACE-INSTALL.html#vxworks">$ACE_ROOT/ACE-INSTALL.html</a>.<p>
 
-    <P>Cross-compiling TAO is not much different than building it for a
+    <P>Cross-compiling TAO is not much different than building it for
       self-host.  The one major difference is that TAO's IDL compiler
       must be built and run on the host; it's not necessary to run it
       on the target.
@@ -260,7 +248,7 @@ $ echo 'static_libs_only=1' \
 $ cd build/HOST
 $ export ACE_ROOT=$PWD
 $ make -C ace
-$ make -C apps/gperf/src
+$ make -C apps/gperf
 $ make -C TAO/TAO_IDL
 </PRE>
 
@@ -489,10 +477,10 @@ compiler flags must also be given to the compiler to enable them.</P>
 <P>By default, all components in TAO will be compiled.  If you only
 want support for <A HREF="docs/minimumTAO.html">minimumTAO</A>, define
 TAO_HAS_MINIMUM_CORBA. This can be accomplished by the following:
-create <code>ACE_wrappers/bin/MakeProjectCreator/config/default.features</code>
+create <code>ACE_wrappers/bin/MakeProjectCreator/config/default.features</code> 
 with the contents:</p>
 <code>minimum_corba=1</code><p>
-Then regenerate the project files with MPC using <code>perl bin/mwc.pl</code>,
+Then regenerate the project files with MPC using <code>perl bin/mwc.pl</code>, 
 see also <A HREF="../ACE-INSTALL.html#MPC">ACE-INSTALL.html</A> for more info
 about the MPC generation. This <code>miminum_corba=1</code> will add compiler
 flags to the C++ compiler and the IDL compiler to indicate that minimum corba
@@ -507,32 +495,11 @@ build the core libraries with minimum_corba=1!<P>
 <HR>
 <P>
 
-<H3>CORBA/e compact and micro</H3>
-
-<P>By default, all components in TAO will be compiled.  If you only
-want support for CORBA/e compact or micro you must regenerate the
-makefiles shipped with the distribution.
-This can be accomplished by the following:
-create <code>ACE_wrappers/bin/MakeProjectCreator/config/default.features</code>
-with the contents:</p>
-<code>corba_e_compact=1</code><p>
-or</p>
-<code>corba_e_micro=1</code><p>
-Then regenerate the project files with MPC using <code>perl bin/mwc.pl</code>,
-see also <A HREF="../ACE-INSTALL.html#MPC">ACE-INSTALL.html</A> for more info
-about the MPC generation. This <code>corba_e_x=1</code> will add compiler
-flags to the C++ compiler and the IDL compiler to indicate that CORBA/e
-is enabled.
-For your own project code you can define <code>CORBA_E_COMPACT</code> or
-<code>CORBA_E_MICRO</code>
-in the ace/config.h file.</P>
-<P>
-
 <HR><P>
 <H3><A NAME="resource_requirements">System Resource Requirements</A></H3>
 Please see the
-<a href="../ACE-INSTALL.html#resource_requirements">ACE-INSTALL.html</a> System
-Resource Requirements discussion for information on system resources
+<a href="../ACE-INSTALL.html#resource_requirements">ACE-INSTALL.html System
+Resource Requirements discussion</a> for information on system resources
 required to build ACE and TAO.<p>
 
 <HR>
@@ -565,7 +532,7 @@ quickly.
   href="../ACE-INSTALL.html#MPC">ACE-INSTALL</a>. GNUmakefiles and
   project files for TAO can be generated by using the following
   commands:<p>
-    <CODE> $ACE_ROOT/bin/mwc.pl TAO.mwc -type gnuace </CODE> <p>
+    <CODE> $ACE_ROOT/bin/mwc.pl TAO.mwc </CODE> <p>
    from <CODE> $TAO_ROOT </CODE> to generate GNUmakefiles. Use <CODE>
   -type vc71 </CODE> or <CODE>-type vc8</CODE> to generate VC71 and
   VC8 project and solution files.<p>
diff --git a/TAO/TAO_IDL/.cvsignore b/TAO/TAO_IDL/.cvsignore
new file mode 100644
index 00000000000..65c93c3e85c
--- /dev/null
+++ b/TAO/TAO_IDL/.cvsignore
@@ -0,0 +1 @@
+tao_idl
diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am
index c4e3c9fcf92..9c3f6e976d0 100644
--- a/TAO/TAO_IDL/Makefile.am
+++ b/TAO/TAO_IDL/Makefile.am
@@ -253,7 +253,6 @@ libTAO_IDL_BE_la_SOURCES = \
   be/be_visitor_sequence.cpp \
   be/be_visitor_structure.cpp \
   be/be_visitor_structure_fwd.cpp \
-  be/be_visitor_template_export.cpp \
   be/be_visitor_traits.cpp \
   be/be_visitor_typecode.cpp \
   be/be_visitor_typedef.cpp \
@@ -341,7 +340,6 @@ noinst_HEADERS += \
   be_include/be_visitor_sequence.h \
   be_include/be_visitor_structure.h \
   be_include/be_visitor_structure_fwd.h \
-  be_include/be_visitor_template_export.h \
   be_include/be_visitor_traits.h \
   be_include/be_visitor_typecode.h \
   be_include/be_visitor_typedef.h \
@@ -353,7 +351,6 @@ noinst_HEADERS += \
   be_include/be_visitor_valuetype_fwd.h
 
 ## Makefile.TAO_IDL_EXE.am
-
 bin_PROGRAMS = tao_idl
 
 tao_idl_CPPFLAGS = \
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index b1ed63db3e6..4db72002251 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -1016,20 +1016,18 @@ AST_Decl::set_id_with_typeid (char *value)
   {
     case AST_Decl::NT_field:
       {
-        AST_Decl::NodeType nt =
-          ScopeAsDecl (this->defined_in ())->node_type ();
+        AST_Interface *iface =
+          AST_Interface::narrow_from_scope (this->defined_in ());
 
-        if (nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype)
-          {
-            break;
-          }
-        else
+        if (iface == 0 || iface->node_type () == AST_Decl::NT_valuetype == 0)
           {
             idl_global->err ()->error1 (UTL_Error::EIDL_INVALID_TYPEID,
                                         this);
 
             return;
           }
+
+        break;
       }
     case AST_Decl::NT_module:
     case AST_Decl::NT_interface:
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 6d192c3ae9b..7e746c6eba8 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -1196,7 +1196,7 @@ AST_Interface::redef_clash_populate_r (AST_Interface *t)
 
   AST_Decl::NodeType nt = t->node_type ();
 
-  if (nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype)
+  if (nt == AST_Decl::NT_valuetype)
     {
       AST_ValueType *v = AST_ValueType::narrow_from_decl (t);
       AST_Interface **supports = v->supports ();
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
index c99d345e245..7d9c2e78a1b 100644
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -116,11 +116,9 @@ AST_InterfaceFwd::is_local (void)
   return this->full_definition ()->is_local ();
 }
 
-bool
-AST_InterfaceFwd::is_valuetype (void)
+bool AST_InterfaceFwd::is_valuetype (void)
 {
-  AST_Decl::NodeType nt = this->full_definition ()->node_type ();
-  return nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype;
+  return this->full_definition ()->node_type () == AST_Decl::NT_valuetype;
 }
 
 bool
@@ -135,33 +133,33 @@ AST_InterfaceFwd::full_def_seen (void)
 {
   UTL_Scope *s = this->defined_in ();
   AST_Interface *i = 0;
-
+  
   // If a full definition is seen in a previous module opening
   // or anywhere in the current scope (before or after our
   // declaration, reture TRUE.
-
+  
   if (AST_Decl::NT_module == s->scope_node_type ())
     {
       AST_Module *m = AST_Module::narrow_from_scope (s);
       AST_Decl *d = m->look_in_previous (this->local_name (), false);
-
+      
       if (0 != d)
         {
           i = AST_Interface::narrow_from_decl (d);
-
+          
           if (0 != i && i->is_defined ())
             {
               return true;
             }
         }
     }
-
+  
   for (UTL_ScopeActiveIterator iter (s, UTL_Scope::IK_decls);
         !iter.is_done ();
         iter.next ())
     {
       i = AST_Interface::narrow_from_decl (iter.item ());
-
+      
       if (0 != i && this->local_name ()->compare (i->local_name ()))
         {
           if (i->is_defined ())
@@ -170,7 +168,7 @@ AST_InterfaceFwd::full_def_seen (void)
             }
         }
     }
-
+    
   return false;
 }
 
@@ -212,6 +210,7 @@ void
 AST_InterfaceFwd::set_full_definition (AST_Interface *nfd)
 {
   delete this->pd_full_definition;
+  this->pd_full_definition = 0;
   this->pd_full_definition = nfd;
 }
 
@@ -224,31 +223,31 @@ AST_InterfaceFwd::is_defined (void)
     {
       AST_Module *m =
         AST_Module::narrow_from_scope (this->defined_in ());
-
+        
       if (0 != m)
         {
           AST_Decl *d = m->look_in_previous (this->local_name ());
-
+          
           if (0 != d)
             {
               // We could be looking at a superfluous forward decl
               // of an interface already defined.
               AST_Interface *full = AST_Interface::narrow_from_decl (d);
-
+              
               if (0 != full)
                 {
                   this->is_defined_ = true;
                 }
-
+                
               AST_InterfaceFwd *fwd =
                 AST_InterfaceFwd::narrow_from_decl (d);
-
+                
               // Since fwd_redefinition_helper() is called
               // before fe_add_interface(), we can't check
               // n_inherits() or is_defined(), but added()
               // is a sufficient way to tell if our full
               // definition has already gone through the
-              // add_to_scope process.
+              // add_to_scope process.  
               if (0 != fwd && fwd->full_definition ()->added ())
                 {
                   this->is_defined_ = true;
@@ -256,7 +255,7 @@ AST_InterfaceFwd::is_defined (void)
             }
         }
     }
-
+    
   return this->is_defined_;
 }
 
@@ -279,13 +278,13 @@ AST_InterfaceFwd::destroy (void)
     {
       // If our full definition is not defined, it
       // means that there was no full definition
-      // for us in this compilation unit, so we
+      // for us in this compilation unit, so we 
       // have to destroy this allocation.
       this->pd_full_definition->destroy ();
       delete this->pd_full_definition;
       this->pd_full_definition = 0;
     }
-
+    
   this->AST_Type::destroy ();
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
index 1a36324cc4a..6389a8b6f0a 100644
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ b/TAO/TAO_IDL/ast/ast_sequence.cpp
@@ -130,7 +130,7 @@ AST_Sequence::AST_Sequence (AST_Expression *ms,
   this->size_type (AST_Type::VARIABLE);
 
   AST_Decl::NodeType nt = bt->node_type ();
-
+  
   if (AST_Decl::NT_array == nt || AST_Decl::NT_sequence == nt)
     {
       this->owns_base_type_ = true;
@@ -154,7 +154,6 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
     }
 
   AST_Type *type = AST_Type::narrow_from_decl (this->base_type ());
-  AST_Decl::NodeType nt = type->node_type ();
 
   if (!type)
     {
@@ -169,14 +168,12 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
     {
       AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
       type = td->primitive_base_type ();
-      nt = type->node_type ();
-    }
+      AST_Decl::NodeType nt = type->node_type ();
 
-  if (nt != AST_Decl::NT_struct
-      && nt != AST_Decl::NT_union
-      && nt != AST_Decl::NT_sequence)
-    {
-      return false;
+      if (nt != AST_Decl::NT_struct && nt != AST_Decl::NT_union)
+        {
+          return false;
+        }
     }
 
   if (this->match_names (type, list))
@@ -258,7 +255,7 @@ AST_Sequence::destroy (void)
   this->pd_max_size->destroy ();
   delete this->pd_max_size;
   this->pd_max_size = 0;
-
+  
   this->AST_ConcreteType::destroy ();
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index 48384e0faae..b35a8851c8c 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -288,6 +288,9 @@ AST_Type::nested_name (const char* local_name,
                       0);
     }
 
+  // Our defining scope.
+  AST_Decl *def_scope = 0;
+
   // Hold the fully scoped name.
   char def_name [NAMEBUFSIZE];
   char use_name [NAMEBUFSIZE];
@@ -321,22 +324,13 @@ AST_Type::nested_name (const char* local_name,
   // macro. Whenever there is no match, the remaining components of the
   // def_scope form the second argument.
 
-  // This adds the global double colon for type names using the canonical
-  // CORBA namespace, replacing the ad hoc spot
-  // generations of "::" here and there, which have now been removed.
   UTL_Scope *s = this->defined_in ();
-  AST_Decl *def_scope = s != 0 ? ScopeAsDecl (s) : 0;
-  bool in_root =
-    def_scope != 0 && def_scope->node_type () == AST_Decl::NT_root;
-  ACE_CString fname (this->full_name ());
-  bool corba_type = fname.find ("CORBA::") == 0;
 
-  if (in_root && corba_type)
-    {
-      ACE_OS::strcat (this->nested_type_name_, "::");
-    }
+  def_scope = s ? ScopeAsDecl (s) : 0;
 
-  if (def_scope != 0 && !in_root && use_scope != 0)
+  if (def_scope
+      && def_scope->node_type () != AST_Decl::NT_root
+      && use_scope)
     // If both scopes exist and that we are not in the root scope.
     {
       ACE_OS::strcpy (def_name,
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index b73380b5b72..742e63a5870 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -24,7 +24,7 @@
 #include "global_extern.h"
 #include "utl_string.h"
 #include "idl_defines.h"
-#include "ace/os_include/os_ctype.h"
+ #include "ace/os_include/os_ctype.h"
 
 ACE_RCSID (be,
            be_codegen,
@@ -43,6 +43,7 @@ TAO_CodeGen::TAO_CodeGen (void)
     server_skeletons_ (0),
     server_template_skeletons_ (0),
     server_inline_ (0),
+    server_template_inline_ (0),
     anyop_header_ (0),
     anyop_source_ (0),
     gperf_input_stream_ (0),
@@ -241,6 +242,7 @@ TAO_CodeGen::start_client_header (const char *fname)
           // Make sure this file was actually got included, not
           // ignored by some #if defined compiler directive.
 
+
           // Get the clnt header from the IDL file name.
           const char* client_hdr =
             BE_GlobalData::be_get_client_hdr (&idl_name_str,
@@ -717,6 +719,15 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
       << be_global->be_get_server_template_hdr_fname (1)
       << "\"";
 
+  // Generate the code that includes the inline file if not included in the
+  // header file.
+  *this->server_template_skeletons_ << "\n\n#if !defined (__ACE_INLINE__)";
+  *this->server_template_skeletons_
+      << "\n#include \""
+      << be_global->be_get_server_template_inline_fname (1)
+      << "\"";
+  *this->server_template_skeletons_ << "\n#endif /* !defined INLINE */\n\n";
+
   // Begin versioned namespace support after initial headers have been
   // included, but before the inline file and post include
   // directives.
@@ -770,6 +781,47 @@ TAO_CodeGen::server_inline (void)
   return this->server_inline_;
 }
 
+// Set the server template inline stream.
+int
+TAO_CodeGen::start_server_template_inline (const char *fname)
+{
+  // Retrieve the singleton instance to the outstream factory.
+  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
+
+  // Clean up between multiple files.
+  delete this->server_template_inline_;
+  this->server_template_inline_ = factory->make_outstream ();
+
+  if (!this->server_template_inline_)
+    {
+      return -1;
+    }
+
+  if (this->server_template_inline_->open (fname,
+                                           TAO_OutStream::TAO_SVR_INL)
+       == -1)
+    {
+      return -1;
+    }
+
+  // Generate the ident string, if any.
+  this->gen_ident_string (this->server_template_inline_);
+
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->server_template_inline_ << be_global->versioning_begin ();
+
+  return 0;
+}
+
+// Get the server template inline stream.
+TAO_OutStream *
+TAO_CodeGen::server_template_inline (void)
+{
+  return this->server_template_inline_;
+}
+
 int
 TAO_CodeGen::start_anyop_header (const char *fname)
 {
@@ -835,25 +887,25 @@ TAO_CodeGen::start_anyop_header (const char *fname)
   // If anyop macro hasn't been set, default to stub macro.
   if (be_global->anyop_export_include () != 0)
     {
-      *this->anyop_header_ << "\n#include /**/ \""
+      *this->anyop_header_ << "\n#include \""
                            << be_global->anyop_export_include ()
                            << "\"";
     }
   else if (be_global->stub_export_include () != 0)
     {
-      *this->anyop_header_ << "\n#include /**/ \""
+      *this->anyop_header_ << "\n#include \""
                            << be_global->stub_export_include ()
                            << "\"";
     }
 
   const char *tao_prefix = "";
   ACE_CString pidl_checker (idl_global->filename ()->get_string ());
-  bool const got_tao_pidl =
+  bool const got_pidl =
     (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl");
 
   // If we're here and we have a .pidl file, we need to generate
-  // the *C.h include from the tao library.
-  if (got_tao_pidl)
+  // the *A.h include from the AnyTypeCode library.
+  if (got_pidl)
     {
       tao_prefix = "tao/";
     }
@@ -873,24 +925,22 @@ TAO_CodeGen::start_anyop_header (const char *fname)
         {
           char* idl_name = idl_global->included_idl_files ()[j];
 
+          // Make a String out of it.
+          UTL_String idl_name_str = idl_name;
+
+          const char *anyop_hdr =
+            BE_GlobalData::be_get_anyop_header (&idl_name_str, 1);
+
+          idl_name_str.destroy ();
+
           ACE_CString pidl_checker (idl_name);
           bool const got_pidl =
             (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl");
 
           // If we're here and we have a .pidl file, we need to generate
-          // the *A.h include, if it is not a .pidl file we don't generate
-          // a thing because the *C.h include is already generated in the
-          // C.h file
+          // the *A.h include from the AnyTypeCode library.
           if (got_pidl)
             {
-              // Make a String out of it.
-              UTL_String idl_name_str = idl_name;
-
-              const char *anyop_hdr =
-                BE_GlobalData::be_get_anyop_header (&idl_name_str, 1);
-
-              idl_name_str.destroy ();
-
               // Stripped off any scope in the name and add the
               // AnyTypeCode prefix.
               ACE_CString work_hdr (anyop_hdr);
@@ -923,6 +973,11 @@ TAO_CodeGen::start_anyop_header (const char *fname)
               this->anyop_header_->print ("\n#include \"%s\"",
                                           final_hdr.c_str ());
             }
+          else
+            {
+              this->anyop_header_->print ("\n#include \"%s\"",
+                                          anyop_hdr);
+            }
         }
     }
   *this->anyop_header_ << "\n";
@@ -1299,6 +1354,14 @@ TAO_CodeGen::end_server_template_header (void)
   // before this.
   *this->server_template_header_ << be_global->versioning_end ();
 
+  // Insert the code to include the inline file.
+  *this->server_template_header_ << "#if defined (__ACE_INLINE__)";
+  *this->server_template_header_
+      << "\n#include \""
+      << be_global->be_get_server_template_inline_fname (1)
+      << "\"";
+  *this->server_template_header_ << "\n#endif /* defined INLINE */";
+
   // Insert the code to include the template source file.
   *this->server_template_header_
       << "\n\n#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)";
@@ -1332,6 +1395,18 @@ TAO_CodeGen::end_server_template_header (void)
 }
 
 int
+TAO_CodeGen::end_server_template_inline (void)
+{
+  *this->server_template_inline_ << "\n";
+
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->server_template_inline_ << be_global->versioning_end ();
+
+  return 0;
+}
+
+int
 TAO_CodeGen::end_server_template_skeletons (void)
 {
   // End versioned namespace support.  Do not place include directives
@@ -1700,7 +1775,10 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
 
           ACE_CString pidl_checker (idl_name);
           bool got_pidl =
-            (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl");
+            (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl")
+            && (pidl_checker.find ("IFR_Client") == ACE_CString::npos);
+            // We can't use the -GA option on IFR_Client .pidl files,
+            // because there are decls inside interfaces.
 
           // If we're here and we have a .pidl file, we need to generate
           // the *A.h include from the AnyTypeCode library.
@@ -2387,6 +2465,7 @@ TAO_CodeGen::destroy (void)
   delete this->server_template_skeletons_;
   delete this->client_inline_;
   delete this->server_inline_;
+  delete this->server_template_inline_;
   delete this->anyop_source_;
   delete this->anyop_header_;
 #if !defined (linux) && !defined (__QNX__) && !defined (__GLIBC__)
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index f930a198fd7..9bdf24f9d94 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -60,7 +60,6 @@ be_decl::be_decl (void)
     srv_skel_gen_ (false),
     impl_skel_gen_ (false),
     srv_inline_gen_ (false),
-    tie_skel_gen_ (false),
     cli_hdr_any_op_gen_ (false),
     cli_stub_any_op_gen_ (false),
     cli_hdr_cdr_op_gen_ (false),
@@ -112,7 +111,6 @@ be_decl::be_decl (AST_Decl::NodeType type,
     srv_skel_gen_ (false),
     impl_skel_gen_ (false),
     srv_inline_gen_ (false),
-    tie_skel_gen_ (false),
     cli_hdr_any_op_gen_ (false),
     cli_stub_any_op_gen_ (false),
     cli_hdr_cdr_op_gen_ (false),
@@ -589,12 +587,6 @@ be_decl::srv_inline_gen (void)
 }
 
 bool
-be_decl::tie_skel_gen (void)
-{
-  return this->tie_skel_gen_;
-}
-
-bool
 be_decl::ccm_pre_proc_gen (void)
 {
   return this->ccm_pre_proc_gen_;
@@ -843,12 +835,6 @@ be_decl::srv_inline_gen (bool val)
 }
 
 void
-be_decl::tie_skel_gen (bool val)
-{
-  this->tie_skel_gen_ = val;
-}
-
-void
 be_decl::ccm_pre_proc_gen (bool val)
 {
   this->ccm_pre_proc_gen_ = val;
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index e6f1b26e4ba..26c63266936 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -69,6 +69,7 @@ BE_GlobalData::BE_GlobalData (void)
     server_skeleton_ending_ (ACE::strnew ("S.cpp")),
     server_template_skeleton_ending_ (ACE::strnew ("S_T.cpp")),
     server_inline_ending_ (ACE::strnew ("S.inl")),
+    server_template_inline_ending_ (ACE::strnew ("S_T.inl")),
     anyop_hdr_ending_ (ACE::strnew ("A.h")),
     anyop_src_ending_ (ACE::strnew ("A.cpp")),
     output_dir_ (0),
@@ -83,6 +84,11 @@ BE_GlobalData::BE_GlobalData (void)
     gen_assign_op_ (false),
     gen_thru_poa_collocation_ (true), // Default is thru_poa.
     gen_direct_collocation_ (false),
+#ifdef ACE_HAS_EXCEPTIONS
+    exception_support_ (true),
+#else
+    exception_support_ (false),
+#endif /* ACE_HAS_EXCEPTIONS */
     use_raw_throw_ (false),
     opt_tc_ (false),
     ami_call_back_ (false),
@@ -107,8 +113,7 @@ BE_GlobalData::BE_GlobalData (void)
     gen_client_stub_ (true),
     gen_server_skeleton_ (true),
     gen_local_iface_anyops_ (true),
-    use_clonable_in_args_ (false),
-    gen_template_export_ (false)
+    use_clonable_in_args_ (false)
 {
 }
 
@@ -354,6 +359,17 @@ BE_GlobalData::be_get_server_inline (UTL_String *idl_file_name,
 }
 
 const char *
+BE_GlobalData::be_get_server_template_inline (UTL_String *idl_file_name,
+                                              bool base_name_only)
+{
+  return be_change_idl_file_extension (idl_file_name,
+                                       be_global->server_template_inline_ending (),
+                                       base_name_only,
+                                       false,
+                                       true);
+}
+
+const char *
 BE_GlobalData::be_get_anyop_header (UTL_String *idl_file_name,
                                     bool base_name_only)
 {
@@ -448,6 +464,13 @@ BE_GlobalData::be_get_server_inline_fname (bool base_name_only)
 }
 
 const char *
+BE_GlobalData::be_get_server_template_inline_fname (bool base_name_only)
+{
+  return be_get_server_template_inline (idl_global->stripped_filename (),
+                                        base_name_only);
+}
+
+const char *
 BE_GlobalData::be_get_anyop_source_fname (bool base_name_only)
 {
   return be_get_anyop_source (idl_global->stripped_filename (),
@@ -828,6 +851,19 @@ BE_GlobalData::server_inline_ending (void) const
 }
 
 void
+BE_GlobalData::server_template_inline_ending (const char* s)
+{
+  delete [] this->server_template_inline_ending_;
+  this->server_template_inline_ending_ = ACE::strnew (s);
+}
+
+const char*
+BE_GlobalData::server_template_inline_ending (void) const
+{
+  return this->server_template_inline_ending_;
+}
+
+void
 BE_GlobalData::anyop_header_ending (const char* s)
 {
   delete [] this->anyop_hdr_ending_;
@@ -846,18 +882,6 @@ BE_GlobalData::use_clonable_in_args (void) const
   return this->use_clonable_in_args_;
 }
 
-bool
-BE_GlobalData::gen_template_export (void) const
-{
-  return this->gen_template_export_;
-}
-
-void
-BE_GlobalData::gen_template_export (bool val)
-{
-  this->gen_template_export_ = val;
-}
-
 const char*
 BE_GlobalData::anyop_header_ending (void) const
 {
@@ -1025,6 +1049,18 @@ BE_GlobalData::gen_direct_collocation (void) const
 }
 
 void
+BE_GlobalData::exception_support (bool val)
+{
+  this->exception_support_ = val;
+}
+
+bool
+BE_GlobalData::exception_support (void) const
+{
+  return this->exception_support_;
+}
+
+void
 BE_GlobalData::use_raw_throw (bool val)
 {
   this->use_raw_throw_ = val;
@@ -1213,6 +1249,9 @@ BE_GlobalData::destroy (void)
   delete [] this->server_inline_ending_;
   this->server_inline_ending_ = 0;
 
+  delete [] this->server_template_inline_ending_;
+  this->server_template_inline_ending_ = 0;
+
   delete [] this->anyop_hdr_ending_;
   this->anyop_hdr_ending_ = 0;
 
@@ -1290,8 +1329,6 @@ BE_GlobalData::ccmobject (void)
 
       AST_Decl *d =
         idl_global->scopes ().top_non_null ()->lookup_by_name (&sn,
-                                                               true,
-                                                               true,
                                                                true);
 
       sn.destroy ();
@@ -1627,7 +1664,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             be_global->use_clonable_in_args(true);
           }
         else
-          {
+          { 
             ACE_ERROR ((
                 LM_ERROR,
                 ACE_TEXT ("IDL: I don't understand")
@@ -1674,6 +1711,8 @@ BE_GlobalData::parse_args (long &i, char **av)
         //      Default is "S_T.cpp".
         // <-si Server's inline file name ending>
         //      Default is "S.inl".
+        // <-st Server's template inline file name ending>
+        //      Default is "S_T.inl".
         // <-sI Server's implementation skeleton file name ending>
         //      Default is "I.cpp".
 
@@ -1695,6 +1734,12 @@ BE_GlobalData::parse_args (long &i, char **av)
             be_global->server_inline_ending (av[i + 1]);
             ++i;
           }
+        else if (av[i][2] == 't')
+          {
+            idl_global->append_idl_flag (av[i + 1]);
+            be_global->server_template_inline_ending (av[i + 1]);
+            ++i;
+          }
         else if (av[i][2] == 'I')
           {
             idl_global->append_idl_flag (av[i + 1]);
@@ -1956,6 +2001,10 @@ BE_GlobalData::parse_args (long &i, char **av)
             idl_global->append_idl_flag (av[i + 1]);
             int option = ACE_OS::atoi (av[i + 1]);
 
+            // Exception support.
+            be_global->exception_support (option == 0
+                                          || option == 2);
+
             // Use of raw 'throw'.
             be_global->use_raw_throw (option == 2);
             ++i;
@@ -1967,11 +2016,6 @@ BE_GlobalData::parse_args (long &i, char **av)
                 // Smart proxies.
                 be_global->gen_smart_proxies (true);
               }
-            else if (av[i][3] == 'e')
-              {
-                // Explicit sequence base class template export.
-                be_global->gen_template_export (true);
-              }
             else
               {
                 ACE_ERROR ((
@@ -2183,19 +2227,8 @@ BE_GlobalData::parse_args (long &i, char **av)
           }
         else if (av[i][2] == 'S')
           {
-            if ('\0' == av[i][3])
-              {
-                // Disable skeleton file generation.
-                be_global->gen_skel_files (false);
-              }
-            else
-              {
-                ACE_ERROR ((
-                    LM_ERROR,
-                    ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
-                    av[i]
-                  ));
-              }
+            // Disable skeleton file generation.
+            be_global->gen_skel_files (false);
           }
         else if (av[i][2] == 's')
           {
@@ -2554,6 +2587,12 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -Ge [0|1]\t\tDisable/Enable generation of")
+      ACE_TEXT (" CORBA::Environment arguments (disabled by default")
+      ACE_TEXT (" if ACE_HAS_EXCEPTIONS)\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -Ge 2\t\t\tUse raw throw instead of ACE_THROW macro")
       ACE_TEXT (" (disabled by default)\n")
     ));
@@ -2621,18 +2660,14 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -GA\t\t\tgenerate Any operator and type codes in *A.{h,cpp}")
-      ACE_TEXT (" (generated in *C.{h,cpp} by default)\n")
+      ACE_TEXT (" -GA\t\t\tgenerate Any operator and type code bodies in *A.cpp")
+      ACE_TEXT (" (generated in *C.cpp by default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -Guc\t\t\tgenerate uninlined constant if declared ")
-      ACE_TEXT ("in a module (inlined by default)\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Gse\t\t\tgenerate explicit export of sequence's ")
-      ACE_TEXT ("template base class (not generated by default)\n")
+      ACE_TEXT ("in a module")
+      ACE_TEXT (" (inlined by default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
@@ -2706,6 +2741,11 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -st\t\t\tServer's template inline file name ending.")
+      ACE_TEXT (" Default S_T.inl\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -sT\t\t\tServer's template skeleton file name ending.")
       ACE_TEXT (" Default is S_T.cpp\n")
     ));
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index 86c0dec4cd7..65a0a7cc4b4 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -77,6 +77,44 @@ const TAO_INDENT be_idt_nl (1);
 const TAO_UNINDENT be_uidt;
 const TAO_UNINDENT be_uidt_nl (1);
 
+TAO_ENV_ARG::TAO_ENV_ARG (bool with_defaults,
+                          bool single,
+                          bool arg,
+                          bool not_used)
+  : with_defaults_ (with_defaults),
+    single_ (single),
+    arg_ (arg),
+    not_used_ (not_used)
+{
+}
+
+const TAO_ENV_ARG env_decl;
+const TAO_ENV_ARG env_dflts (true);
+const TAO_ENV_ARG env_sngl (false, true);
+const TAO_ENV_ARG env_sngl_dflts (true, true);
+const TAO_ENV_ARG env_not (false, false, false, true);
+const TAO_ENV_ARG env_sngl_not (false, true, false, true);
+const TAO_ENV_ARG env_arg (false, false, true);
+const TAO_ENV_ARG env_sngl_arg (false, true, true);
+
+TAO_ACE_CHECK::TAO_ACE_CHECK (const char *retval,
+                              bool do_return)
+  : retval_ (retval),
+    do_return_ (retval != 0 || do_return)
+{
+}
+
+TAO_ACE_TRY_CHECK::TAO_ACE_TRY_CHECK (void)
+{
+}
+
+TAO_ACE_ENDTRY::TAO_ACE_ENDTRY (void)
+{
+}
+
+const TAO_ACE_TRY_CHECK ace_try_check;
+const TAO_ACE_ENDTRY ace_endtry;
+
 // Methods of the TAO_OutStream class.
 
 TAO_OutStream::TAO_OutStream (void)
@@ -116,6 +154,8 @@ TAO_OutStream::open (const char *fname,
               ACE_OS::fprintf (this->fp_,
                                "%s\n",
                                copyright);
+
+              ACE_OS::fflush (this->fp_);
             }
 
           return 0;
@@ -155,7 +195,7 @@ TAO_OutStream::file (void)
 int
 TAO_OutStream::incr_indent (unsigned short flag)
 {
-  ++indent_level_;
+  indent_level_++;
 
   if (flag != 0)
     {
@@ -172,7 +212,7 @@ TAO_OutStream::incr_indent (unsigned short flag)
 int
 TAO_OutStream::decr_indent (unsigned short flag)
 {
-  --this->indent_level_;
+  this->indent_level_--;
   // Just in case somebody gets "unindent happy".
   if (this->indent_level_ < 0)
     {
@@ -208,6 +248,9 @@ TAO_OutStream::indent (void)
       for (int i = 0; i < this->indent_level_; i++)
         {
           ACE_OS::fprintf (this->fp_, "  ");
+#if !defined (ACE_OPENVMS)
+          ACE_OS::fflush (this->fp_);
+#endif
         }
     }
 
@@ -308,6 +351,9 @@ TAO_OutStream::print (const char *format, ...)
               int,
               -1,
               result);
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
   va_end (ap);
 
   return result;
@@ -317,6 +363,9 @@ TAO_OutStream &
 TAO_OutStream::operator<< (const char *str)
 {
   ACE_OS::fprintf (this->fp_, "%s", str);
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
   return *this;
 }
 
@@ -327,6 +376,10 @@ TAO_OutStream::operator<< (const ACE_CDR::UShort num)
                    "%hu",
                    num);
 
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
+
   return *this;
 }
 
@@ -337,6 +390,10 @@ TAO_OutStream::operator<< (const ACE_CDR::Short num)
                    "%hd",
                    num);
 
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
+
   return *this;
 }
 
@@ -347,6 +404,10 @@ TAO_OutStream::operator<< (const ACE_CDR::ULong num)
                    "%lu",
                    (unsigned long) num);
 
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
+
   return *this;
 }
 
@@ -357,6 +418,10 @@ TAO_OutStream::operator<< (const ACE_CDR::Long num)
                    "%ld",
                    (long) num);
 
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
+
   return *this;
 }
 
@@ -368,6 +433,10 @@ TAO_OutStream::operator<< (const ACE_CDR::ULongLong num)
                    ACE_UINT64_FORMAT_SPECIFIER,
                    num);
 
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
+
   return *this;
 }
 
@@ -378,6 +447,10 @@ TAO_OutStream::operator<< (const ACE_CDR::LongLong num)
                    ACE_INT64_FORMAT_SPECIFIER,
                    num);
 
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
+
   return *this;
 }
 #endif /* ACE_WIN64 */
@@ -389,6 +462,10 @@ TAO_OutStream::operator<< (const unsigned long num)
                    "%lu",
                    num);
 
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
+
   return *this;
 }
 
@@ -399,6 +476,10 @@ TAO_OutStream::operator<< (const long num)
                    "%ld",
                    num);
 
+#if !defined (ACE_OPENVMS)
+  ACE_OS::fflush (this->fp_);
+#endif
+
   return *this;
 }
 
@@ -439,6 +520,63 @@ TAO_OutStream::operator<< (const TAO_UNINDENT& i)
 }
 
 TAO_OutStream &
+TAO_OutStream::operator<< (const TAO_ENV_ARG& i)
+{
+  if (!be_global->use_raw_throw ())
+    {
+      (*this) << be_nl
+              << "ACE_ENV_"
+              << (i.single_ ? "SINGLE_" : "")
+              << "ARG_"
+              << (i.arg_ ? "PARAMETER" : "DECL")
+              << (i.with_defaults_ ? "_WITH_DEFAULTS" : "")
+              << (i.not_used_ ? "_NOT_USED" : "");
+    }
+
+  return *this;
+}
+
+TAO_OutStream &
+TAO_OutStream::operator<< (const TAO_ACE_CHECK& i)
+{
+  if (!be_global->use_raw_throw ())
+    {
+      (*this) << be_nl
+              << "ACE_CHECK"
+              << (i.do_return_ ? "_RETURN (" : "")
+              << (i.retval_ ? i.retval_ : "")
+              << (i.do_return_ ? ")" : "")
+              << ";";
+    }
+
+  return *this;
+}
+
+TAO_OutStream &
+TAO_OutStream::operator<< (const TAO_ACE_TRY_CHECK&)
+{
+  if (!be_global->use_raw_throw ())
+    {
+      (*this) << be_nl
+              << "ACE_TRY_CHECK;";
+    }
+
+  return *this;
+}
+
+TAO_OutStream &
+TAO_OutStream::operator<< (const TAO_ACE_ENDTRY&)
+{
+  if (!be_global->use_raw_throw ())
+    {
+      (*this) << be_nl
+              << "ACE_ENDTRY;";
+    }
+
+  return *this;
+}
+
+TAO_OutStream &
 TAO_OutStream::operator<< (Identifier *id)
 {
   return this->print (id);
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index e8fd08e7155..511abe72f82 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -103,11 +103,7 @@ be_interface::be_interface (UTL_ScopedName *n,
   ACE_NEW (this->strategy_,
            be_interface_default_strategy (this));
 
-  AST_Decl::NodeType nt = this->node_type ();
-
-  if (this->imported ()
-      || nt == AST_Decl::NT_valuetype
-      || nt == AST_Decl::NT_eventtype)
+  if (this->imported () || this->node_type () == AST_Decl::NT_valuetype)
     {
       return ;
     }
@@ -480,10 +476,12 @@ be_interface::redefine (AST_Interface *from)
 void
 be_interface::gen_def_ctors (TAO_OutStream *os)
 {
-  (void) this->traverse_inheritance_graph (
+  this->traverse_inheritance_graph (
       be_interface::gen_def_ctors_helper,
       os
     );
+
+  return;
 }
 
 
@@ -506,8 +504,7 @@ be_interface::gen_def_ctors_helper (be_interface* node,
         }
       else
         {
-          *os << ", " << be_global->impl_class_prefix ()
-              << base->flat_name ()
+          *os << ", " << be_global->impl_class_prefix () << base->flat_name ()
               << be_global->impl_class_suffix () << " ()";
         }
     }
@@ -767,8 +764,8 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface,
           if (d->accept (this->visitor_) == -1)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) Pure_Virtual_Regenerator::emit - "
-                                 "visit base interface operation failed\n"),
+                                "(%N:%l) Pure_Virtual_Regenerator::emit - "
+                                "visit base interface operation failed\n"),
                                 -1);
             }
 
@@ -926,8 +923,7 @@ be_interface::gen_operation_table (const char *flat_name,
         // interface.
 
         // Retrieve the singleton instance to the outstream factory.
-        TAO_OutStream_Factory *factory =
-          TAO_OUTSTREAM_FACTORY::instance ();
+        TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
 
         // Get a new instance for the temp file.
         TAO_OutStream *os = factory->make_outstream ();
@@ -1297,11 +1293,10 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
   *os << be_nl << be_nl
       << "ACE_INLINE void" << be_nl
       << derived->full_direct_proxy_impl_name ()
-      << "::" << prefix << d->local_name () << " ("
-      << be_idt << be_idt_nl
+      << "::" << prefix << d->local_name () << " (" << be_idt << be_idt_nl
       << "TAO_Abstract_ServantBase *servant," << be_nl
       << "TAO::Argument ** args," << be_nl
-      << "int num_args" << be_uidt_nl
+      << "int num_args" << env_decl << be_uidt_nl
       << ")";
 
   be_interface::gen_throw_spec (list, os);
@@ -1309,11 +1304,10 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
   *os << be_uidt_nl
       << "{" << be_idt_nl
       << ancestor->full_direct_proxy_impl_name ()
-      << "::" << prefix << d->local_name () << " ("
-      << be_idt << be_idt_nl
+      << "::" << prefix << d->local_name () << " (" << be_idt << be_idt_nl
       << "servant," << be_nl
       << "args," << be_nl
-      << "num_args" << be_uidt_nl
+      << "num_args" << env_arg << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}"<< be_nl;
 
@@ -1388,8 +1382,8 @@ be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
   if (insert_queue.enqueue_tail (this) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_interface::traverse_inheritance_graph"
-                         " - error generating entries\n"),
+                         "(%N:%l) be_interface::traverse_inheritance_graph - "
+                         "error generating entries\n"),
                         -1);
     }
 
@@ -1432,7 +1426,7 @@ be_interface::traverse_inheritance_graph (
             {
               (void) this->insert_non_dup (base);
 
-              long const n_supports = base->n_supports ();
+              long n_supports = base->n_supports ();
               AST_Interface **supports = base->supports ();
 
               for (long j = 0; j < n_supports; ++j)
@@ -1661,14 +1655,11 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
                          "fclose"),
                         -1);
     }
-
+    
   // Open the temp file.
 #if defined (ACE_OPENVMS)
-  ACE_HANDLE input = ::open (tao_cg->gperf_input_filename (),
-                             O_RDONLY,
-                             "shr=get,put,upd",
-                             "ctx=rec",
-                             "fop=dfw");
+  ACE_HANDLE input = ::open(tao_cg->gperf_input_filename(), O_RDONLY,
+                            "shr=get,put,upd", "ctx=rec", "fop=dfw");
 #else
   ACE_HANDLE input = ACE::open_temp_file (tao_cg->gperf_input_filename (),
                                           O_RDONLY);
@@ -1682,31 +1673,19 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
                         -1);
     }
 
-#ifndef ACE_OPENVMS
-  // Flush the output stream.  Gperf also uses it as output.  Ensure
-  // current contents are written before gperf writes.
-  ACE_OS::fflush (this->strategy_->get_out_stream ()->file ());
-#endif  /* !ACE_OPENVMS */
-
   // Stdout is server skeleton.  Do *not* close the file, just open
   // again with <ACE_OS::open> with WRITE + APPEND option.. After
   // this, remember to update the file offset to the correct location.
 
 #if defined (ACE_OPENVMS)
-  char* gperfOutput = tempnam (0, "idl_");
-
-  if (gperfOutput == 0)
+  char* gperfOutput = tempnam(NULL, "idl_");
+  if (gperfOutput == NULL)
     {
-      ACE_OS::close (input);
-      ACE_ERROR_RETURN ((LM_ERROR, "failed to allocate memory\n"), -1);
+    ACE_OS::close(input);
+    ACE_ERROR_RETURN ((LM_ERROR, "failed to allocate memory\n"), -1);
     }
-
-  ACE_HANDLE output = ::open (gperfOutput,
-                              O_WRONLY | O_CREAT | O_EXCL,
-                              ACE_DEFAULT_FILE_PERMS ,
-                              "shr=get,put,upd",
-                              "ctx=rec",
-                              "fop=dfw");
+  ACE_HANDLE output = ::open(gperfOutput, O_WRONLY | O_CREAT | O_EXCL,
+                             ACE_DEFAULT_FILE_PERMS , "shr=get,put,upd", "ctx=rec", "fop=dfw");
 #else
   ACE_HANDLE output = ACE_OS::open (this->strategy_->get_out_stream_fname (),
                                     O_WRONLY | O_APPEND);
@@ -1802,8 +1781,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
 
     default:
       ACE_ERROR ((LM_ERROR,
-                  "tao_idl:ERROR:%N:%l:Unknown "
-                  "Operation Lookup Strategy\n"));
+                  "tao_idl:ERROR:%N:%l:Unknown Operation Lookup Strategy\n"));
 
       result = -1;
   }
@@ -1824,8 +1802,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
       else if (process.wait () == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      "Error:%p:Error on waiting for "
-                      "completion of gperf program.\n",
+                      "Error:%p:Error on waiting for completion of gperf program.\n",
                       "process.wait"));
 
           result = -1;
@@ -1833,7 +1810,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
 
       // Adjust the file offset to the EOF for the server skeleton
       // file.
-      ACE_OS::fseek (this->strategy_->get_out_stream ()->file (),
+      ACE_OS::fseek (this->strategy_->get_out_stream()->file (),
                      0,
                      SEEK_END);
     }
@@ -1841,15 +1818,13 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
   ACE_OS::close (output);
   ACE_OS::close (input);
 
-#if defined (ACE_OPENVMS)
-  ACE_OS::unlink(tao_cg->gperf_input_filename ());
-  process_options.release_handles ();
-
+#if defined(ACE_OPENVMS)
+  ACE_OS::unlink(tao_cg->gperf_input_filename());
+  process_options.release_handles();
   if (result != -1)
     {
       FILE* gperfOutputFile;
-      gperfOutputFile = ::fopen (gperfOutput, "r");
-
+      gperfOutputFile = ::fopen(gperfOutput, "r");
       if (gperfOutputFile == 0)
         {
           ACE_ERROR ((LM_ERROR,
@@ -1859,28 +1834,24 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
         }
       else
         {
-          FILE* out = this->strategy_->get_out_stream ()->file ();
+          FILE* out = this->strategy_->get_out_stream()->file();
           int c;
-
           while ((c = fgetc(gperfOutputFile)) != EOF)
             {
-              fputc (c, out);
+              fputc(c, out);
             }
-
-          if (ferror (gperfOutputFile) || ferror (out))
+          if (ferror(gperfOutputFile) || ferror(out))
             {
               ACE_ERROR ((LM_ERROR,
                           "Error:%p:Couldn't open gperf output file\n",
                           "get/put"));
               result = -1;
             }
-
-          fclose (gperfOutputFile);
+          fclose(gperfOutputFile);
         }
     }
-
-  ACE_OS::unlink (gperfOutput);
-  free (gperfOutput);
+  ACE_OS::unlink(gperfOutput);
+  free(gperfOutput);
 #endif /* ACE_OPENVMS */
 
   return result;
@@ -1967,9 +1938,9 @@ be_interface::gen_skel_helper (be_interface *derived,
   if (ancestor->nmembers () > 0)
     {
       // If there are elements in ancestor scope i.e., any operations and
-      // attributes defined by "ancestor", become methods on the derived
-      // class which call the corresponding method of the base class by
-      // doing the proper casting.
+      // attributes defined by "ancestor", become methods on the derived class
+      // which call the corresponding method of the base class by doing the
+      // proper casting.
 
       for (UTL_ScopeActiveIterator si (ancestor, UTL_Scope::IK_decls);
            !si.is_done ();
@@ -1980,10 +1951,10 @@ be_interface::gen_skel_helper (be_interface *derived,
 
           if (d->node_type () == AST_Decl::NT_op)
             {
-              *os << be_nl << be_nl
-                  << "// TAO_IDL - Generated from" << be_nl
-                  << "// " << __FILE__ << ":" << __LINE__
-                  << be_nl << be_nl;
+              *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+                  << "// " << __FILE__ << ":" << __LINE__;
+
+              *os << be_nl << be_nl;
 
               if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
                 {
@@ -1993,7 +1964,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & server_request, " << be_nl
                       << "void * servant_upcall," << be_nl
-                      << "void * servant" << be_uidt_nl
+                      << "void * servant" << env_dflts << be_uidt_nl
                       << ");" << be_uidt;
                 }
               else
@@ -2006,7 +1977,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & server_request," << be_nl
                       << "void * servant_upcall," << be_nl
-                      << "void * servant" << be_uidt_nl
+                      << "void * servant" << env_decl << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
 
@@ -2020,7 +1991,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "server_request," << be_nl
                       << "servant_upcall," << be_nl
-                      << "impl" << be_uidt_nl
+                      << "impl" << env_arg << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}";
                 }
@@ -2044,7 +2015,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & server_request," << be_nl
                       << "void * servant_upcall," << be_nl
-                      << "void * servant" << be_uidt_nl
+                      << "void * servant" << env_dflts << be_uidt_nl
                       << ");" << be_uidt;
                 }
               else
@@ -2057,7 +2028,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & server_request," << be_nl
                       << "void * servant_upcall," << be_nl
-                      << "void * servant" << be_uidt_nl
+                      << "void * servant" << env_decl << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
 
@@ -2071,7 +2042,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "server_request," << be_nl
                       << "servant_upcall," << be_nl
-                      << "impl" << be_uidt_nl
+                      << "impl" << env_arg << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}";
                 }
@@ -2089,7 +2060,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "_skel (" << be_idt << be_idt_nl
                           << "TAO_ServerRequest & server_request," << be_nl
                           << "void * servant_upcall," << be_nl
-                          << "void * servant" << be_uidt_nl
+                          << "void * servant" << env_dflts << be_uidt_nl
                           << ");" << be_uidt;
                     }
                   else
@@ -2103,7 +2074,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "_skel (" << be_idt << be_idt_nl
                           << "TAO_ServerRequest & server_request," << be_nl
                           << "void * servant_upcall," << be_nl
-                          << "void * servant" << be_uidt_nl
+                          << "void * servant" << env_decl << be_uidt_nl
                           << ")" << be_uidt_nl
                           << "{" << be_idt_nl;
 
@@ -2117,7 +2088,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "_skel (" << be_idt << be_idt_nl
                           << "server_request," << be_nl
                           << "servant_upcall," << be_nl
-                          << "impl" << be_uidt_nl
+                          << "impl" << env_arg << be_uidt_nl
                           << ");" << be_uidt << be_uidt_nl
                           << "}";
                     }
@@ -2170,7 +2141,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
               << d->local_name () << " (" << be_idt << be_idt_nl
               << "TAO_Abstract_ServantBase *servant, " << be_nl
               << "TAO::Argument ** args," << be_nl
-              << "int num_args" << be_uidt_nl
+              << "int num_args" << env_dflts << be_uidt_nl
               << ")";
 
           list = be_operation::narrow_from_decl (d)->exceptions ();
@@ -2192,7 +2163,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
               << "_get_" << d->local_name () << " (" << be_idt << be_idt_nl
               << "TAO_Abstract_ServantBase *servant, " << be_nl
               << "TAO::Argument ** args," << be_nl
-              << "int num_args" << be_uidt_nl
+              << "int num_args" << env_dflts << be_uidt_nl
               << ")";
 
           list = attr->get_get_exceptions ();
@@ -2207,11 +2178,10 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
               // Generate the static method corresponding to
               // this method.
               *os << "static void" << be_nl
-                  << "_set_" << d->local_name () << " ("
-                  << be_idt << be_idt_nl
+                  << "_set_" << d->local_name () << " (" << be_idt << be_idt_nl
                   << "TAO_Abstract_ServantBase *servant, " << be_nl
                   << "TAO::Argument ** args," << be_nl
-                  << "int num_args" << be_uidt_nl
+                  << "int num_args" << env_dflts << be_uidt_nl
                   << ")";
 
               list = attr->get_set_exceptions ();
@@ -2460,7 +2430,7 @@ be_interface::destroy (void)
       delete this->strategy_;
       this->strategy_ = 0;
     }
-
+    
   // Call the destroy methods of our base classes.
   this->AST_Interface::destroy ();
   this->be_scope::destroy ();
@@ -2483,8 +2453,7 @@ be_interface::next_state (TAO_CodeGen::CG_STATE current_state,
 }
 
 int
-be_interface::has_extra_code_generation (
-  TAO_CodeGen::CG_STATE current_state)
+be_interface::has_extra_code_generation (TAO_CodeGen::CG_STATE current_state)
 {
   return this->strategy_->has_extra_code_generation (current_state);
 }
@@ -2516,7 +2485,7 @@ be_interface::has_mixed_parentage (void)
     }
 
   AST_Decl::NodeType nt = this->node_type ();
-
+  
   if (AST_Decl::NT_component == nt || AST_Decl::NT_home == nt)
     {
       return 0;
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index fb8131c0c32..57e3185c11b 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -467,7 +467,7 @@ be_sequence::instance_name ()
       if (this->unbounded ())
         {
           ACE_OS::sprintf (namebuf,
-                           "TAO::unbounded_basic_string_sequence<char>");
+                           "TAO::unbounded_string_sequence");
         }
       else
         {
@@ -481,7 +481,7 @@ be_sequence::instance_name ()
       if (this->unbounded ())
         {
           ACE_OS::sprintf (namebuf,
-                           "TAO::unbounded_basic_string_sequence<CORBA::WChar>");
+                           "TAO::unbounded_wstring_sequence");
         }
       else
         {
@@ -587,11 +587,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
     case be_sequence::MNG_STRING:
       if (this->unbounded ())
         {
-          *os << "TAO::unbounded_basic_string_sequence<char>";
+          *os << "TAO::unbounded_string_sequence";
         }
       else
         {
-          *os << "TAO::bounded_basic_string_sequence<char, "
+          *os << "TAO::bounded_string_sequence<"
               << this->max_size ()->ev ()->u.ulval << ">";
         }
 
@@ -599,11 +599,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
     case be_sequence::MNG_WSTRING:
       if (this->unbounded ())
         {
-          *os << "TAO::unbounded_basic_string_sequence<CORBA::WChar>";
+          *os << "TAO::unbounded_wstring_sequence";
         }
       else
         {
-          *os << "TAO::bounded_basic_string_sequence<CORBA::WChar, "
+          *os << "TAO::bounded_wstring_sequence<"
               << this->max_size ()->ev ()->u.ulval << ">";
         }
 
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index 6ee774cc817..6b81e89321f 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -135,7 +135,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
     {
       be_interface *intf =
         be_interface::narrow_from_decl (this->pd_supports[i]);
-
+        
       if (intf->has_mixed_parentage ())
         {
           this->supports_abstract_ = true;
@@ -900,7 +900,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest &req, " << be_nl
                       << "void *obj," << be_nl
-                      << "void *context" << be_uidt_nl
+                      << "void *context" << env_dflts << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
                 }
               else
@@ -912,7 +912,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
-                      << "void *context" << be_uidt_nl
+                      << "void *context" << env_decl << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
                   *os << ancestor->full_skel_name ()
@@ -925,7 +925,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete,
                       << "req," << be_nl
                       << "(" << ancestor->full_skel_name ()
                       << "_ptr) impl," << be_nl
-                      << "context" << be_uidt_nl
+                      << "context" << env_arg << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}\n";
                 }
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 8deb1967180..232bed31bea 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -185,16 +185,10 @@ be_visitor_amh_pre_proc::create_response_handler (
   response_handler->set_imported (node->imported ());
   response_handler->set_line (node->line ());
   response_handler->set_file_name (node->file_name ());
-  
-  // Set repo id to 0, so it will be recomputed on the next access,
-  // and set the prefix to the node's prefix. All this is
-  // necessary in case the node's prefix was modified after
-  // its declaration.
-  response_handler->AST_Decl::repoID (0);
-  response_handler->prefix (const_cast<char*> (node->prefix ()));
-  
   response_handler->gen_fwd_helper_name ();
+
   this->add_rh_node_members (node, response_handler, exception_holder);
+
   return response_handler;
 }
 
@@ -625,14 +619,6 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
 
   excep_holder->set_name (excep_holder_name);
   excep_holder->set_defined_in (node->defined_in ());
-  
-  // Set repo id to 0, so it will be recomputed on the next access,
-  // and set the prefix to the node's prefix. All this is
-  // necessary in case the node's prefix was modified after
-  // its declaration.
-  excep_holder->AST_Decl::repoID (0);
-  excep_holder->prefix (const_cast<char*> (node->prefix ()));
-  
   excep_holder->gen_fwd_helper_name ();
 
   // Now our customized valuetype is created, we have to
diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index 7d4f8b25d67..a9c46656f47 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -377,14 +377,6 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
 
   reply_handler->set_name (reply_handler_name);
   reply_handler->set_defined_in (s);
-  
-  // Set repo id to 0, so it will be recomputed on the next access,
-  // and set the prefix to the node's prefix. All this is
-  // necessary in case the node's prefix was modified after
-  // its declaration.
-  reply_handler->AST_Decl::repoID (0);
-  reply_handler->prefix (const_cast<char*> (node->prefix ()));
-  
   reply_handler->gen_fwd_helper_name ();
 
   // Now our customized reply handler is created, we have to
@@ -1243,10 +1235,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
 
           if (d != 0)
             {
-              retval[index] = AST_Interface::narrow_from_decl (d);
-              retval[index++]->set_prefix_with_typeprefix (parent->prefix () ?
-                                                           const_cast<char*> (parent->prefix()) :
-                                                           const_cast<char*> (""));
+              retval[index++] = AST_Interface::narrow_from_decl (d);
             }
 
           rh_parent_name->destroy ();
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 04c8b637c84..36f7a3cb20c 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -929,9 +929,7 @@ be_visitor_arg_traits::visit_field (be_field *node)
   // get handled elsewhere, and will also avoid nested valuetype
   // recursion. So we set the field node as processed (the
   // field *type* may not have been reached yet) and return.
-  AST_Decl::NodeType nt = bt->base_node_type ();
-  
-  if (nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype)
+  if (bt->base_node_type () == AST_Decl::NT_valuetype)
     {
       node->cli_traits_gen (true);
       return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index fc6d9700784..a236e184cad 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -65,11 +65,7 @@ int be_visitor_args_arglist::visit_argument (be_argument *node)
                         -1);
     }
 
-  if (this->ctx_->state () != TAO_CodeGen::TAO_TIE_OPERATION_ARGLIST_SH)
-    {
-      *os << " " << node->local_name ();
-    }
-    
+  *os << " " << node->local_name ();
   return 0;
 }
 
@@ -276,24 +272,8 @@ int be_visitor_args_arglist::visit_predefined_type (be_predefined_type *node)
 
 int be_visitor_args_arglist::visit_sequence (be_sequence *node)
 {
-  // There seems to be one case where the two conditions below
-  // are true - in generating get/set operations for an
-  // inherited valuetype member, which is included from
-  // another IDL file, and whose type is an anonymous 
-  // sequence. There is also no better place to make the
-  // call to create_name() - the node constructor sets the
-  // 'anonymous' flag to false, the typedef that resets it
-  // to true is created afterward. And any member of an
-  // included IDL declaration is not processed as part of
-  // the AST traversal. If create_name() is never called,
-  // then 'type_name' below will output 'sequence'.
-  if (node->imported () && node->anonymous ())
-    {
-      (void) node->create_name (0);
-    }
-
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
index da14b913fdc..166803e0a6a 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
@@ -655,8 +655,6 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
               case AST_Decl::NT_wstring:
               case AST_Decl::NT_valuetype:
               case AST_Decl::NT_valuetype_fwd:
-              case AST_Decl::NT_eventtype:
-              case AST_Decl::NT_eventtype_fwd:
               case AST_Decl::NT_valuebox:
                 *os << ".out ()";
                 break;
@@ -743,8 +741,6 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
               case AST_Decl::NT_wstring:
               case AST_Decl::NT_valuetype:
               case AST_Decl::NT_valuetype_fwd:
-              case AST_Decl::NT_eventtype:
-              case AST_Decl::NT_eventtype_fwd:
               case AST_Decl::NT_valuebox:
                 *os << ".in ()";
                 break;
diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp
index b476f445f34..e3502b3cf17 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp
@@ -1047,10 +1047,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
                 case AST_Decl::NT_string:
                 case AST_Decl::NT_wstring:
                 case AST_Decl::NT_valuetype:
-                case AST_Decl::NT_eventtype:
-                case AST_Decl::NT_eventtype_fwd:
                 case AST_Decl::NT_valuetype_fwd:
-                case AST_Decl::NT_valuebox:
                   *os << ".out ()";
                   break;
                 case AST_Decl::NT_pre_defined:
@@ -1159,10 +1156,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
                 case AST_Decl::NT_string:
                 case AST_Decl::NT_wstring:
                 case AST_Decl::NT_valuetype:
-                case AST_Decl::NT_eventtype:
-                case AST_Decl::NT_eventtype_fwd:
                 case AST_Decl::NT_valuetype_fwd:
-                case AST_Decl::NT_valuebox:
                   *os << ".in ()";
                   break;
                 case AST_Decl::NT_pre_defined:
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
index 43bda6159cc..93bcd6f9c2e 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
@@ -73,9 +73,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
 
   get_op.set_name ((UTL_IdList *) node->name ()->copy ());
   get_op.set_defined_in (node->defined_in ());
-
+  
   UTL_ExceptList *get_exceptions = node->get_get_exceptions ();
-
+  
   if (0 != get_exceptions)
     {
       get_op.be_add_exceptions (get_exceptions->copy ());
@@ -85,7 +85,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   // to the operation.
   be_operation_strategy *old_strategy =
     get_op.set_strategy (node->get_get_strategy ()->copy ());
-
+    
   if (0 != old_strategy)
     {
       old_strategy->destroy ();
@@ -160,9 +160,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = get_op.accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_TIE_SS:
+    case TAO_CodeGen::TAO_ROOT_TIE_SI:
       {
-        be_visitor_operation_tie_ss visitor (&ctx);
+        be_visitor_operation_tie_si visitor (&ctx);
         status = get_op.accept (&visitor);
         break;
       }
@@ -224,7 +224,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
           visitor = 0;
         }
     }
-
+    
   get_op.destroy ();
 
   // Do nothing for readonly attributes.
@@ -243,13 +243,13 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   // The return type  is "void".
   be_predefined_type rt (AST_PredefinedType::PT_void,
                          &sn);
-
+ 
   // Argument type is the same as the attribute type.
   AST_Argument *arg =
     idl_global->gen ()->create_argument (AST_Argument::dir_IN,
                                          node->field_type (),
                                          node->name ());
-
+                                         
   arg->set_name ((UTL_IdList *) node->name ()->copy ());
   // Create the operation.
   be_operation set_op (&rt,
@@ -260,9 +260,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   set_op.set_name ((UTL_IdList *) node->name ()->copy ());
   set_op.set_defined_in (node->defined_in ());
   set_op.be_add_argument (arg);
-
+  
   UTL_ExceptList *set_exceptions = node->get_set_exceptions ();
-
+  
   if (0 != set_exceptions)
     {
       set_op.be_add_exceptions (set_exceptions->copy ());
@@ -347,9 +347,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = set_op.accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_TIE_SS:
+    case TAO_CodeGen::TAO_ROOT_TIE_SI:
       {
-        be_visitor_operation_tie_ss visitor (&ctx);
+        be_visitor_operation_tie_si visitor (&ctx);
         status = set_op.accept (&visitor);
         break;
       }
@@ -424,7 +424,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
       delete visitor;
       visitor = 0;
     }
-
+    
   set_op.destroy ();
   rt.destroy ();
   return 0;
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 a6a4348bf1d..36706f181c7 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -117,7 +117,9 @@ be_visitor_component_ch::visit_component (be_component *node)
       << "static " << node->local_name () << "_ptr " << "_duplicate ("
       << node->local_name () << "_ptr obj);" << be_nl << be_nl
       << "static " << node->local_name () << "_ptr "
-      << "_narrow (::CORBA::Object_ptr obj);" << be_nl;
+      << "_narrow (" << be_idt << be_idt_nl
+      << "::CORBA::Object_ptr obj" << env_dflts << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl;
 
   // This method is defined in the header file to workaround old
   // g++ problems.
@@ -164,7 +166,9 @@ be_visitor_component_ch::visit_component (be_component *node)
     }
 
   *os << be_nl << be_nl
-      << "virtual ::CORBA::Boolean _is_a (const char *type_id);";
+      << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+      << "const char *type_id" << env_dflts << be_uidt_nl
+      << ");" << be_uidt;
 
   // The _interface_repository_id method.
   *os << be_nl << 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 2cf6a970b62..4e8cc346e23 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -203,7 +203,10 @@ be_visitor_component_cs::visit_component (be_component *node)
 
   // The _narrow method.
   *os << node->full_name () << "_ptr" << be_nl << node->full_name ()
-      << "::_narrow (::CORBA::Object_ptr _tao_objref)" << be_nl
+      << "::_narrow (" << be_idt << be_idt_nl
+      << "::CORBA::Object_ptr"
+      << " _tao_objref" << env_decl << be_uidt_nl
+      << ")" << be_uidt_nl
       << "{" << be_idt_nl;
 
   *os << "return" << be_idt_nl
@@ -215,7 +218,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       << "\"" << node->repoID () << "\"," << be_nl
       << node->flat_client_enclosing_scope ()
       << node->base_proxy_broker_name ()
-      << "_Factory_function_pointer" << be_uidt_nl
+      << "_Factory_function_pointer" << env_arg << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -234,7 +237,9 @@ be_visitor_component_cs::visit_component (be_component *node)
 
   // The is_a method.
   *os << "::CORBA::Boolean" << be_nl
-      << node->full_name () << "::_is_a (const char *value)" << be_nl
+      << node->full_name () << "::_is_a (" << be_idt << be_idt_nl
+      << "const char *value" << env_decl << be_uidt_nl
+      << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "if (" << be_idt << be_idt_nl;
 
@@ -243,7 +248,7 @@ be_visitor_component_cs::visit_component (be_component *node)
   while (ancestor != 0)
     {
       *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "value," << be_nl
+          << "(char *)value," << be_nl
           << "\"" << ancestor->repoID () << "\"" << be_uidt_nl
           << ") ||" << be_uidt_nl;
 
@@ -251,7 +256,7 @@ be_visitor_component_cs::visit_component (be_component *node)
     }
 
   *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-      << "value," << be_nl
+      << "(char *)value," << be_nl
       << "\"IDL:omg.org/Components/CCMObject:1.0\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
       << " )" << be_nl
@@ -260,7 +265,10 @@ be_visitor_component_cs::visit_component (be_component *node)
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl
-      << "return this->::CORBA::Object::_is_a (value);" << be_uidt_nl
+      << "return this->::CORBA::Object::_is_a ("
+      << be_idt << be_idt_nl
+      << "value" << env_arg << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_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 2ad02367163..f08209f25a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
@@ -160,52 +160,54 @@ be_visitor_component_sh::visit_component (be_component *node)
       << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_nl;
 
   // _is_a
-  *os << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl << be_nl;
+  *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+      << "const char* logical_type_id" << env_dflts << 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_uidt_nl
+      << "void *servant_upcall" << env_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_uidt_nl
+      << "void *servant_upcall" << env_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_uidt_nl
+      << "void *servant_upcall" << env_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_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _repository_id method.
   *os << "static void _repository_id_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *servant," << be_nl
-      << "void *servant_upcall" << be_uidt_nl
+      << "void *servant_upcall" << env_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_uidt_nl
+      << "void *_servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // _this
   *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt
-      << be_uidt_nl
+      << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // _interface_repository_id
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index 972cb55cedc..f432f30d54a 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -68,17 +68,21 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
-          << "try"
+          << (be_global->use_raw_throw () ? "try" :"ACE_TRY_NEW_ENV")
           << be_idt_nl
           << "{" << be_idt_nl
-          << "this->value_->_tao_decode (cdr);" << be_uidt_nl
+          << "this->value_->_tao_decode (cdr"
+          << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+          <<  ");" << ace_try_check << be_uidt_nl
           << "}" << be_uidt_nl
-          << "catch ( ::CORBA::Exception &)"
+          << (be_global->use_raw_throw ()
+                ? "catch ( ::CORBA::Exception &)"
+                : "ACE_CATCHANY")
           << be_idt_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
           << "}" << be_uidt
-          << be_nl << be_nl
+          << ace_endtry << be_nl << be_nl
           << "return true;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "}";
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
index fb1da0bd83e..0bfdc169d89 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -98,8 +98,12 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
   *os << "virtual ::CORBA::Exception *"
       << "_tao_duplicate (void) const;\n" << be_nl
       << "virtual void _raise (void) const;\n" << be_nl
-      << "virtual void _tao_encode (TAO_OutputCDR &cdr) const;" << be_nl
-      << "virtual void _tao_decode (TAO_InputCDR &cdr);" << be_nl;
+      << "virtual void _tao_encode (" << be_idt << be_idt_nl
+      << "TAO_OutputCDR &cdr" << env_decl << be_uidt_nl
+      << ") const;" << be_uidt_nl << be_nl
+      << "virtual void _tao_decode (" << be_idt << be_idt_nl
+      << "TAO_InputCDR &cdr" << env_decl << be_uidt_nl
+      << ");" << be_uidt;
 
   // Generate constructor that takes each member as a parameter. We need a
   // new state. Such a constructor exists if we have members.
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 589825b354d..376e6244a6a 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -49,7 +49,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   os->indent ();
 
-  // Generate stub code required of any anonymous types of members.
+  // Generate stub code  required of any anonymous types of members.
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,53 +59,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
                         -1);
     }
 
-  be_visitor_context ctx (*this->ctx_);
-
-  // Constructor taking all members. It exists only if there are any
-  // members.
-  if (node->member_count () > 0)
-    {
-      // Generate the signature.
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_CS);
-      be_visitor_exception_ctor ec_visitor (&ctx);
-
-      if (node->accept (&ec_visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception::"
-                             "visit_exception - "
-                             "codegen for ctor failed\n"),
-                            -1);
-        }
-
-      *os << be_idt_nl
-          << ": ::CORBA::UserException ("
-          << be_idt << be_idt << be_idt_nl
-          << "\"" << node->repoID () << "\"," << be_nl
-          << "\"" << node->local_name () << "\"" << be_uidt_nl
-          << ")" << be_uidt << be_uidt << be_uidt_nl;
-      *os << "{" << be_idt;
-
-      // Assign each individual member. We need yet another state.
-      ctx = *this->ctx_;
-
-      // Indicate that the special ctor is being generated.
-      ctx.exception (true);
-
-      be_visitor_exception_ctor_assign eca_visitor (&ctx);
-
-      if (node->accept (&eca_visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception_cs::"
-                             "visit_exception -"
-                             "codegen for scope failed\n"),
-                            -1);
-        }
-
-      *os << be_uidt_nl << "}" << be_nl << be_nl;
-    }
-
   *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -134,7 +87,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << ")" << be_uidt << be_uidt << be_uidt_nl;
   *os << "{";
 
-  ctx = *this->ctx_;
+  be_visitor_context ctx (*this->ctx_);
 
   if (node->nmembers () > 0)
     {
@@ -239,11 +192,12 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << "}" << be_nl << be_nl;
 
   *os << "void " << node->name ()
-      << "::_tao_encode (";
+      << "::_tao_encode (" << be_idt << be_idt_nl;
 
   if (!node->is_local ())
     {
-      *os << "TAO_OutputCDR &cdr) const" << be_nl
+      *os << "TAO_OutputCDR &cdr" << env_decl << be_uidt_nl
+          << ") const" << be_uidt_nl
           << "{" << be_idt_nl
           << "if (cdr << *this)" << be_idt_nl
           << "{" << be_idt_nl
@@ -263,7 +217,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     }
   else
     {
-      *os << "TAO_OutputCDR &) const" << be_nl
+      *os << "TAO_OutputCDR &" << env_decl << be_uidt_nl
+          << ") const" << be_uidt_nl
           << "{" << be_idt_nl;
 
       if (be_global->use_raw_throw ())
@@ -279,11 +234,12 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     }
 
   *os << "void " << node->name ()
-      << "::_tao_decode (";
+      << "::_tao_decode (" << be_idt << be_idt_nl;
 
   if (!node->is_local ())
     {
-      *os << "TAO_InputCDR &cdr)" << be_nl
+      *os << "TAO_InputCDR &cdr" << env_decl << be_uidt_nl
+          << ")" << be_uidt_nl
           << "{" << be_idt_nl
           << "if (cdr >> *this)" << be_idt_nl
           << "{" << be_idt_nl
@@ -303,7 +259,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     }
   else
     {
-      *os << "TAO_InputCDR &)" << be_nl
+      *os << "TAO_InputCDR &" << env_decl << be_uidt_nl
+          << ")" << be_uidt_nl
           << "{" << be_idt_nl;
 
       if (be_global->use_raw_throw ())
@@ -318,6 +275,52 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "}" << be_nl << be_nl;
     }
 
+  // Constructor taking all members. It exists only if there are any
+  // members.
+  if (node->member_count () > 0)
+    {
+      // Generate the signature.
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_CS);
+      be_visitor_exception_ctor ec_visitor (&ctx);
+
+      if (node->accept (&ec_visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_exception::"
+                             "visit_exception - "
+                             "codegen for ctor failed\n"),
+                            -1);
+        }
+
+      *os << be_idt_nl
+          << ": ::CORBA::UserException ("
+          << be_idt << be_idt << be_idt_nl
+          << "\"" << node->repoID () << "\"," << be_nl
+          << "\"" << node->local_name () << "\"" << be_uidt_nl
+          << ")" << be_uidt << be_uidt << be_uidt_nl;
+      *os << "{" << be_idt;
+
+      // Assign each individual member. We need yet another state.
+      ctx = *this->ctx_;
+
+      // Indicate that the special ctor is being generated.
+      ctx.exception (1);
+
+      be_visitor_exception_ctor_assign eca_visitor (&ctx);
+
+      if (node->accept (&eca_visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_exception_cs::"
+                             "visit_exception -"
+                             "codegen for scope failed\n"),
+                            -1);
+        }
+
+      *os << be_uidt_nl << "}" << be_nl << be_nl;
+    }
+
   // Switch streams to the *A.cpp file if we are using this option.
   if (be_global->gen_anyop_files ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
index 5cdd7112219..28303432bdf 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
@@ -272,12 +272,13 @@ int be_visitor_exception_ctor::visit_predefined_type (be_predefined_type *node)
     }
 
   AST_PredefinedType::PredefinedType pt = node->pt ();
+  const char *no_td_global = (td == 0 ? "::" : "");
 
   if (pt == AST_PredefinedType::PT_any)
     {
       if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
         {
-          *os << "const "
+          *os << "const " << no_td_global
               << bt->nested_type_name (this->ctx_->scope ());
         }
       else
@@ -294,7 +295,7 @@ int be_visitor_exception_ctor::visit_predefined_type (be_predefined_type *node)
     {
       if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
         {
-          *os << "const "
+          *os << "const " << no_td_global
               << bt->nested_type_name (this->ctx_->scope (), "_ptr ");
         }
       else
@@ -306,7 +307,7 @@ int be_visitor_exception_ctor::visit_predefined_type (be_predefined_type *node)
     {
       if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
         {
-          *os << bt->nested_type_name (this->ctx_->scope ());
+          *os << no_td_global << bt->nested_type_name (this->ctx_->scope ());
         }
       else
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index ea9cec530ae..e0bc53cf9ac 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -282,20 +282,64 @@ be_visitor_field_ch::visit_predefined_type (be_predefined_type *node)
       bt = node;
     }
 
-  *os << bt->nested_type_name (this->ctx_->scope ());
+  // If we are a typedef of a basic type, ACE_NESTED_CLASS might
+  // be emitted as part of the type name, in which case the '::'
+  // would be incorrect for certain expansions of the macro.
+  if (td == 0)
+    {
+      *os << "::";
+    }
+    
+  AST_PredefinedType::PredefinedType pt = node->pt ();
+
+  if (pt == AST_PredefinedType::PT_object
+      || pt == AST_PredefinedType::PT_abstract)
+    {
+      *os << bt->name () << "_var";
+    }
+  else if (pt == AST_PredefinedType::PT_value)
+    {
+      *os << bt->name () << " *";
+    }
+  else if (pt == AST_PredefinedType::PT_pseudo)
+    {
+      // This was a typedefed array.
+      // ACE_NESTED_CLASS macro generated by nested_type_name
+      // is necessary if the struct, union, or valuetype containing this
+      // field was not defined inside a module. In such a case, VC++
+      // complains that the non-module scope is not yet fully defined.
+      UTL_Scope *holds_container = this->ctx_->scope ()->defined_in ();
+      AST_Decl *hc_decl = ScopeAsDecl (holds_container);
 
-  switch (node->pt ())
+      if (hc_decl->node_type () != AST_Decl::NT_module)
+        {
+          *os << bt->nested_type_name (this->ctx_->scope (), "_var");
+        }
+      else
+        {
+          *os << bt->name () << "_var";
+        }
+    }
+  else
     {
-      case AST_PredefinedType::PT_object:
-      case AST_PredefinedType::PT_abstract:
-      case AST_PredefinedType::PT_pseudo:
-        *os << "_var";
-        break;
-      case AST_PredefinedType::PT_value:
-        *os << " *";
-        break;
-      default:
-        break;
+      // This was a typedefed array.
+      // ACE_NESTED_CLASS macro generated by nested_type_name
+      // is necessary if the struct, union, or valuetype containing this
+      // field was not defined inside a module. In such a case, VC++
+      // complains that the non-module scope is not yet fully defined.
+      UTL_Scope *holds_container = this->ctx_->scope ()->defined_in ();
+      AST_Decl *hc_decl = ScopeAsDecl (holds_container);
+
+      if (hc_decl->node_type () != AST_Decl::NT_module)
+        {
+          *os << bt->nested_type_name (this->ctx_->scope ());
+        }
+      else
+        {
+          // All the predefined types are in the CORBA namespace,
+          // so we go ahead and add the global :: qualifier.
+          *os << bt->name ();
+        }
     }
 
   return 0;
@@ -343,9 +387,7 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
       // If we are being reused by valutype, this would get generated
       // in the private section of the OBV_xx class, so we must
       // generate the typedef for that case elsewhere.
-      AST_Decl::NodeType snt = this->ctx_->scope ()->node_type ();
-      
-      if (snt != AST_Decl::NT_valuetype && snt != AST_Decl::NT_eventtype)
+      if (this->ctx_->scope ()->node_type () != AST_Decl::NT_valuetype)
         {
           // Generate the anonymous sequence member typedef.
           be_decl *bs = this->ctx_->scope ();
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 2494d2755f3..bab1d145dd5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -66,7 +66,7 @@
 #include "be_visitor_interface/interface_ss.cpp"
 #include "be_visitor_interface/interface_is.cpp"
 #include "be_visitor_interface/tie_sh.cpp"
-#include "be_visitor_interface/tie_ss.cpp"
+#include "be_visitor_interface/tie_si.cpp"
 #include "be_visitor_interface/any_op_ch.cpp"
 #include "be_visitor_interface/any_op_cs.cpp"
 #include "be_visitor_interface/cdr_op_ch.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index b6048ac5ed0..19e7340f37c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -120,47 +120,53 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
       << "& rhs);" << be_nl
       << "virtual ~" << class_name.c_str () << " (void);\n\n"
       << be_nl
-      << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl << be_nl;
+      << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+      << "const char* logical_type_id" << env_dflts << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl;
+
+//   *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 *obj," << be_nl
-      << "void *servant_upcall" << be_uidt_nl
+      << "void *servant_upcall" << env_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 *obj," << be_nl
-      << "void *servant_upcall" << be_uidt_nl
+      << "void *servant_upcall" << env_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 *obj," << be_nl
-      << "void *servant_upcall" << be_uidt_nl
+      << "void *servant_upcall" << env_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_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _repository_id method.
   *os << "static void _repository_id_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << be_uidt_nl
+      << "void *servant_upcall" << env_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_uidt_nl
+      << "void *_servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   this->this_method (node);
@@ -421,5 +427,7 @@ be_visitor_amh_interface_sh::this_method (be_interface *node)
   // interfaces is "special", because the returned type is not exactly
   // the type of the class, but the original class that "implied" the
   // AMH one.
-  *os << non_amh_name.c_str () << " *_this (void);\n" << be_uidt;
+  *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt
+      << env_dflts << be_uidt_nl
+      << ");\n" << be_uidt;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
index ada8c73a682..10118851bcf 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
@@ -135,7 +135,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "TAO_ServerRequest & req," << be_nl
                   << "void * context," << be_nl
-                  << "void * obj" << be_uidt_nl
+                  << "void * obj" << env_decl << be_uidt_nl
                   << ")" << be_uidt_nl
                   << "{" << be_idt_nl;
               *os << ancestor_amh_name
@@ -147,7 +147,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "req," << be_nl
                   << "context," << be_nl
-                  << "impl" << be_uidt_nl
+                  << "impl" << env_arg << be_uidt_nl
                   << ");" << be_uidt << be_uidt_nl
                   << "}";
             }
@@ -171,7 +171,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "TAO_ServerRequest & req," << be_nl
                   << "void * context," << be_nl
-                  << "void * obj" << be_uidt_nl
+                  << "void * obj" << env_decl << be_uidt_nl
                   << ")" << be_uidt_nl
                   << "{" << be_idt_nl;
 
@@ -185,7 +185,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "req," << be_nl
                   << "context," << be_nl
-                  << "impl" << be_uidt_nl
+                  << "impl" << env_arg << be_uidt_nl
                   << ");" << be_uidt << be_uidt_nl
                   << "}";
 
@@ -203,7 +203,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & req," << be_nl
                       << "void * context," << be_nl
-                      << "void * obj" << be_uidt_nl
+                      << "void * obj" << env_decl << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
 
@@ -217,7 +217,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "req," << be_nl
                       << "context," << be_nl
-                      << "impl" << be_uidt_nl
+                      << "impl" << env_arg << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}";
                 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index 4f2a6a11f59..3760418d94b 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -71,9 +71,13 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
 
   *os << non_amh_name.c_str () << "*" << be_nl
       << full_skel_name
-      << "::_this (void)" << be_nl
+      << "::_this ("
+      << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL")
+      << ")" << be_nl
       << "{" << be_idt_nl
-      << "TAO_Stub *stub = this->_create_stub ();" << be_nl << be_nl;
+      << "TAO_Stub *stub = this->_create_stub ("
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER")
+      << ");" << TAO_ACE_CHECK ("0") << be_nl << be_nl;
 
   *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl
       << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl
@@ -126,13 +130,13 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node)
   *os << "void" << be_nl
       << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
-      << "void * context" << be_uidt_nl
+      << "void * context" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "this->asynchronous_upcall_dispatch (" << be_idt << be_idt_nl
       << "req," << be_nl
       << "context," << be_nl
-      << "this" << be_uidt_nl
+      << "this" << env_arg << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}";
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
index 22f87873065..916f4cb041d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
@@ -50,7 +50,7 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface (
       << "select_proxy ("
       << be_idt << be_idt_nl;
 
-  *os << node->local_name () << " *object" << be_uidt_nl
+  *os << node->local_name () << " *object" << env_dflts << be_uidt_nl
       << ") = 0;"
       << be_uidt_nl  // idt = 1
       << be_uidt_nl; // idt = 0
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index c8bef6a36d7..6619f38955d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -156,7 +156,7 @@ be_visitor_interface::add_abstract_op_args (AST_Operation *old_op,
     }
 
   UTL_ExceptList *excep_list = old_op->exceptions ();
-
+  
   if (0 != excep_list)
     {
       new_op.be_add_exceptions (excep_list->copy ());
@@ -443,9 +443,9 @@ be_visitor_interface::visit_operation (be_operation *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_TIE_SS:
+    case TAO_CodeGen::TAO_ROOT_TIE_SI:
       {
-        be_visitor_operation_tie_ss visitor (&ctx);
+        be_visitor_operation_tie_si visitor (&ctx);
         status = node->accept (&visitor);
         break;
       }
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 099c064cd3d..cc30fc493a9 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -219,12 +219,16 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     {
       *os << "// These two are inherited from SessionComponent."
           << be_nl << be_nl
-          << "virtual void ciao_preactivate (void)" << be_nl
+          << "virtual void ciao_preactivate (" << be_idt << be_idt
+          << env_sngl_dflts << be_uidt_nl
+          << ")" << be_nl
           << "ACE_THROW_SPEC ((" << be_idt_nl
           << "::CORBA::SystemException," << be_nl
           << "::Components::CCMException" << be_uidt_nl
           << "));" << be_uidt_nl << be_nl
-          << "virtual void ciao_postactivate (void)" << be_nl
+          << "virtual void ciao_postactivate (" << be_idt << be_idt
+          << env_sngl_dflts << be_uidt_nl
+          << ")" << be_nl
           << "ACE_THROW_SPEC ((" << be_idt_nl
           << "::CORBA::SystemException," << be_nl
           << "::Components::CCMException" << be_uidt_nl
@@ -239,7 +243,9 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     }
 
   // The _is_a method
-  *os << "virtual ::CORBA::Boolean _is_a (const char *type_id);" << be_nl;
+  *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+      << "const char *type_id" << env_dflts << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl;
 
   // The _interface_repository_id method.
   *os << "virtual const char* _interface_repository_id (void) const;";
@@ -439,7 +445,7 @@ be_visitor_interface_ch::gen_xxx_narrow (const char *nar,
                                          TAO_OutStream *os)
 {
   *os << "static " << node->local_name () << "_ptr "
-      << nar << " (";
+      << nar << " (" << be_idt << be_idt_nl;
 
   if (node->is_abstract ())
     {
@@ -450,7 +456,8 @@ be_visitor_interface_ch::gen_xxx_narrow (const char *nar,
       *os << "::CORBA::Object_ptr obj";
     }
 
-  *os << ");" << be_nl;
+  *os << env_dflts << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl;
 
   return true;
 }
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 aa0b85df8ae..1ffea0d9e62 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -342,13 +342,19 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << "// These two are inherited from SessionComponent."
           << be_nl << be_nl
           << "void" << be_nl
-          << node->full_name () << "::ciao_preactivate (void)" << be_idt_nl
+          << node->full_name () << "::ciao_preactivate ("
+          << be_idt << be_idt
+          << env_sngl_not << be_uidt_nl
+          << ")" << be_uidt_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl
           << "                 ::Components::CCMException))" << be_uidt_nl
           << "{" << be_nl
           << "}" << be_nl << be_nl
           << "void" << be_nl
-          << node->full_name () << "::ciao_postactivate (void)" << be_idt_nl
+          << node->full_name () << "::ciao_postactivate ("
+          << be_idt << be_idt
+          << env_sngl_not << be_uidt_nl
+          << ")" << be_uidt_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl
           << "                 ::Components::CCMException))" << be_uidt_nl
           << "{" << be_nl
@@ -356,12 +362,23 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     }
 
   *os << "::CORBA::Boolean" << be_nl
-      << node->full_name () << "::_is_a (const char *value)" << be_nl;
+      << node->full_name () << "::_is_a (" << be_idt << be_idt_nl
+      << "const char *value";
 
-  *os << "{" << be_idt_nl
+  if (node->is_local () || node->is_abstract ())
+    {
+      *os << env_not;
+    }
+  else
+    {
+      *os << env_decl;
+    }
+
+  *os << be_uidt_nl << ")" << be_uidt_nl
+      << "{" << be_idt_nl
       << "if (" << be_idt << be_idt_nl;
 
-  int const status =
+  int status =
     node->traverse_inheritance_graph (be_interface::is_a_helper,
                                       os);
 
@@ -419,7 +436,10 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     }
   else
     {
-      *os << "return this->::CORBA::Object::_is_a (value);" << be_uidt_nl;
+      *os << "return this->::CORBA::Object::_is_a ("
+          << be_idt << be_idt_nl
+          << "value" << env_arg << be_uidt_nl
+          << ");" << be_uidt << be_uidt_nl;
     }
 
   *os << "}" << be_uidt << be_uidt_nl
@@ -512,6 +532,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
     }
 
   *os << " _tao_objref"
+      << (node->is_local () ? env_not : env_decl)
       << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
@@ -539,7 +560,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           << "\"" << node->repoID () << "\"," << be_nl
           << node->flat_client_enclosing_scope ()
           << node->base_proxy_broker_name ()
-          << "_Factory_function_pointer" << be_uidt_nl
+          << "_Factory_function_pointer" << env_arg << be_uidt_nl
           << ");" << be_uidt << be_nl
           << "return TAO_" << node->flat_name ()
           << "_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (proxy);"
@@ -566,7 +587,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           << "\"" << node->repoID () << "\"," << be_nl
           << node->flat_client_enclosing_scope ()
           << node->base_proxy_broker_name ()
-          << "_Factory_function_pointer" << be_uidt_nl
+          << "_Factory_function_pointer" << env_arg << be_uidt_nl
           << ");" << be_uidt << be_uidt << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
@@ -616,18 +637,18 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node,
           UTL_ScopedName *new_op_name =
             (UTL_ScopedName *)node->name ()->copy ();
           new_op_name->nconc (item_new_name);
-
+          
           be_operation *op = be_operation::narrow_from_decl (d);
           UTL_ScopedName *old_op_name =
             (UTL_ScopedName *) op->name ()->copy ();
           op->set_name (new_op_name);
           op->set_defined_in (node);
           op->is_abstract (node->is_abstract ());
-
+          
           ctx.state (TAO_CodeGen::TAO_OPERATION_CS);
           be_visitor_operation_cs op_visitor (&ctx);
           op_visitor.visit_operation (op);
-
+          
           op->set_name (old_op_name);
           op->set_defined_in (base);
           op->is_abstract (base->is_abstract ());
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 6c5f1929e09..82a0472a7ed 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -163,54 +163,59 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       *os << "// Default implementation of CIAO-specific operation," << be_nl
           << "// overridden in derived class generated by the CIDL compiler."
           << be_nl
-          << "virtual ::CORBA::Boolean ciao_is_substitutable (const char *event_repo_id)" << be_idt_nl
+          << "virtual ::CORBA::Boolean ciao_is_substitutable ("
+          << be_idt << be_idt_nl
+          << "const char *event_repo_id" << env_dflts << be_uidt_nl
+          << ")" << be_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException));"
           << be_uidt_nl << be_nl;
     }
 
   // _is_a
-  *os << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl << be_nl;
+  *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+      << "const char* logical_type_id" << env_dflts << 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_upcall," << be_nl
-      << "void * servant" << be_uidt_nl
+      << "void * servant" << env_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_upcall," << be_nl
-      << "void * servant" << be_uidt_nl
+      << "void * servant" << env_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_upcall," << be_nl
-      << "void * servant" << be_uidt_nl
+      << "void * servant" << env_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 * servant_upcall," << be_nl
-      << "void * servant" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _repository_id method.
   *os << "static void _repository_id_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
       << "void * servant_upcall," << be_nl
-      << "void * servant" << be_uidt_nl
+      << "void * servant" << env_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_uidt_nl
+      << "void * servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   this->this_method (node);
@@ -349,21 +354,21 @@ be_visitor_interface_sh::gen_abstract_ops_helper (
                                  attr->is_local (),
                                  attr->is_abstract ());
           new_attr.set_defined_in (node);
-
+          
           UTL_ExceptList *get_exceptions = attr->get_get_exceptions ();
-
+          
           if (0 != get_exceptions)
             {
               new_attr.be_add_get_exceptions (get_exceptions->copy ());
             }
-
+            
           UTL_ExceptList *set_exceptions = attr->get_set_exceptions ();
-
+          
           if (0 != set_exceptions)
             {
               new_attr.be_add_set_exceptions (set_exceptions->copy ());
             }
-
+            
           be_visitor_attribute attr_visitor (&ctx);
           attr_visitor.visit_attribute (&new_attr);
           ctx.attribute (0);
@@ -380,7 +385,9 @@ be_visitor_interface_sh::this_method (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Print out the _this() method.
-  *os << "::" << node->full_name () << " *_this (void);" << be_nl;
+  *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl
+      << env_dflts << be_uidt_nl
+      << ");" << be_uidt << be_nl;
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
index deacb66cb3d..1f140530861 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
@@ -100,6 +100,24 @@ be_visitor_interface_si::visit_interface (be_interface *node)
         }
     }
 
+  if (be_global->gen_tie_classes ())
+    {
+      // Generate the TIE class.
+      be_visitor_context ctx (*this->ctx_);
+      ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SI);
+      ctx.stream (tao_cg->server_template_inline ());
+      be_visitor_interface_tie_si visitor (&ctx);
+
+      if (node->accept (&visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_sh::"
+                             "visit_interface - "
+                             "codegen for TIE class failed\n"),
+                            -1);
+        }
+    }
+
   return 0;
 }
 
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 114a9d2e691..7b52627a051 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -210,7 +210,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "::_is_a_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
         << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant" << be_uidt_nl
+        << "void * servant" << env_decl << be_uidt_nl
         << ")" << be_uidt_nl;
     *os << "{" << be_idt;
 
@@ -277,13 +277,15 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       );";
+        << "                       "
+        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+        << ");" << TAO_ACE_CHECK ();
 
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
-        << "}" << be_nl << be_nl;
-
+        << "}";
+    
     is_a.destroy ();
     rt.destroy ();
     s.get ()->destroy ();
@@ -317,7 +319,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "::_non_existent_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
         << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant" << be_uidt_nl
+        << "void * servant" << env_decl << be_uidt_nl
         << ")" << be_uidt_nl;
     *os << "{" << be_idt;
 
@@ -383,13 +385,15 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       );";
+        << "                       "
+        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+        << ");" << TAO_ACE_CHECK ();
 
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
         << "}";
-
+        
     non_existent.destroy ();
     rt.destroy ();
   }
@@ -426,7 +430,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "::_repository_id_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
         << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant" << be_uidt_nl
+        << "void * servant" << env_decl << be_uidt_nl
         << ")" << be_uidt_nl;
     *os << "{" << be_idt;
 
@@ -492,13 +496,15 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       );";
+        << "                       "
+        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+        << ");" << TAO_ACE_CHECK ();
 
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
         << "}";
-
+    
     repository_id.destroy ();
     s.get ()->destroy ();
   }
@@ -511,7 +517,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "::_interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & server_request, " << be_nl
       << "void * /* servant_upcall */," << be_nl
-      << "void * servant" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "TAO_IFR_Client_Adapter *_tao_adapter =" << be_idt_nl
@@ -534,7 +540,12 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << be_uidt_nl;
 
   *os << "::CORBA::InterfaceDef_ptr _tao_retval = " << be_idt_nl
-      << "impl->_get_interface ();" << be_uidt
+      << "impl->_get_interface ("
+      << (be_global->use_raw_throw ()
+            ? ""
+            : "ACE_ENV_SINGLE_ARG_PARAMETER")
+      << ");" << be_uidt
+      << TAO_ACE_CHECK () << be_nl << be_nl
       << "server_request.init_reply ();" << be_nl
       << "TAO_OutputCDR &_tao_out = *server_request.outgoing ();"
       << be_nl << be_nl
@@ -553,7 +564,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   this->generate_send_reply (os);
 
   *os << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}";
 
 
   // Generate code for the _component skeleton.
@@ -586,7 +597,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "::_component_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
         << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant" << be_uidt_nl
+        << "void * servant" << env_decl << be_uidt_nl
         << ")" << be_uidt_nl;
     *os << "{" << be_idt;
 
@@ -651,9 +662,11 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       );" << be_uidt_nl
+        << "                       "
+        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+        << ");" << TAO_ACE_CHECK () << be_uidt_nl
         << "}";
-
+  
     get_component.destroy ();
     rt.destroy ();
   }
@@ -662,7 +675,9 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   *os << be_nl << be_nl
       << "::CORBA::Boolean " << full_skel_name
-      << "::_is_a (const char* value)" << be_nl
+      << "::_is_a (" << be_idt << be_idt_nl
+      << "const char* value" << env_not << be_uidt_nl
+      << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
       << "(" << be_idt_nl;
@@ -704,8 +719,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   if (node->is_event_consumer ())
     {
       *os << be_nl << be_nl
-          << "::CORBA::Boolean " << be_nl << full_skel_name
-          << "::ciao_is_substitutable (const char *)" << be_idt_nl
+          << "::CORBA::Boolean " << full_skel_name
+          << "::ciao_is_substitutable (" << be_idt << be_idt_nl
+          << "const char * /* event_repo_id */" << env_not << be_uidt_nl
+          << ")" << be_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl
           << "{" << be_idt_nl
           << "return true;" << be_uidt_nl
@@ -717,27 +734,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   this->this_method (node);
 
-  if (be_global->gen_tie_classes () && !node->tie_skel_gen ())
-    {
-      // Generate the TIE class.
-      be_visitor_context ctx (*this->ctx_);
-      ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SS);
-      ctx.stream (tao_cg->server_template_skeletons ());
-      be_visitor_interface_tie_ss visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_ss::"
-                             "visit_interface - "
-                             "codegen for TIE class failed\n"),
-                            -1);
-        }
-
-      // AMH generation reuses this visit_interface(), hence the flag.
-      node->tie_skel_gen (true);
-    }
-
   return 0;
 }
 
@@ -770,12 +766,12 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
                              "bad node in this scope\n"),
                             -1);
         }
-
+        
       AST_Decl::NodeType nt = d->node_type ();
-
+  
       UTL_ScopedName *item_new_name = 0;
       UTL_ScopedName *new_name = 0;
-
+      
       if (AST_Decl::NT_op == nt || AST_Decl::NT_attr == nt)
         {
           ACE_NEW_RETURN (item_new_name,
@@ -803,10 +799,10 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
           op->set_name (new_name);
           op->set_defined_in (node);
           op->is_abstract (node->is_abstract ());
-
+          
           be_visitor_operation_ss op_visitor (&ctx);
           op_visitor.visit_operation (op);
-
+          
           op->set_name (old_name);
           op->set_defined_in (base);
           op->is_abstract (base->is_abstract ());
@@ -821,21 +817,21 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
                                  attr->is_abstract ());
           new_attr.set_defined_in (node);
           new_attr.set_name (new_name);
-
+          
           UTL_ExceptList *get_exceptions = attr->get_get_exceptions ();
-
+          
           if (0 != get_exceptions)
             {
               new_attr.be_add_get_exceptions (get_exceptions->copy ());
             }
-
+            
           UTL_ExceptList *set_exceptions = attr->get_set_exceptions ();
-
+          
           if (0 != set_exceptions)
             {
               new_attr.be_add_set_exceptions (set_exceptions->copy ());
             }
-
+            
           be_visitor_attribute attr_visitor (&ctx);
           attr_visitor.visit_attribute (&new_attr);
           ctx.attribute (0);
@@ -857,10 +853,14 @@ be_visitor_interface_ss::this_method (be_interface *node)
   // the _this () operation.
   *os << node->full_name () << " *" << be_nl
       << node->full_skel_name ()
-      << "::_this (void)" << be_nl
+      << "::_this ("
+      << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL")
+      << ")" << be_nl
       << "{" << be_idt_nl
-      << "TAO_Stub *stub = this->_create_stub ();"
-      << be_nl << be_nl
+      << "TAO_Stub *stub = this->_create_stub ("
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER")
+      << ");"
+      << TAO_ACE_CHECK ("0") << be_nl << be_nl
       << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl;
 
   *os << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();"
@@ -905,12 +905,15 @@ be_visitor_interface_ss::dispatch_method (be_interface *node)
   *os << "void " << node->full_skel_name ()
       << "::_dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
-      << "void * servant_upcall" << be_uidt_nl
+      << "void * servant_upcall" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "this->synchronous_upcall_dispatch (req," << be_nl
       << "                                   servant_upcall," << be_nl
-      << "                                   this);"
+      << "                                   this" << be_nl
+      << "                                   "
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+      << ");"
       << be_uidt_nl;
   *os << "}";
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
index fca454e14bf..12c8f672665 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
@@ -58,7 +58,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface (
       << "select_proxy ("
       << be_idt << be_idt_nl;
 
-  *os << node->local_name () << " *object" << be_uidt_nl
+  *os << node->local_name () << " *object" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_uidt_nl;
 
   *os << "private:" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
index 8c9fd65d0e0..30d5a00dd13 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
@@ -84,7 +84,7 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (
   *os << node->full_base_proxy_impl_name () << "&" << be_nl
       <<node->full_remote_proxy_broker_name () << "::"
       << "select_proxy (" << be_idt << be_idt_nl
-      << "::" << node->full_name () << " *" << be_uidt_nl
+      << "::" << node->full_name () << " *" << env_not << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl // idt = 1
       << "return this->remote_proxy_impl_;"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
index e496357fd83..c55d08b839e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
@@ -75,7 +75,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << "virtual "<< node->local_name ()
       << "_ptr create_proxy (" << be_idt << be_idt_nl
       << node->local_name ()
-      << "_ptr proxy" << be_uidt_nl
+      << "_ptr proxy" << env_dflts << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "};\n\n";
 
@@ -88,12 +88,14 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>;" << be_nl << be_nl
       << "void register_proxy_factory (" << be_idt << be_idt_nl
       << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl
-      << "bool one_shot_factory = true" << be_uidt_nl
+      << "int one_shot_factory = 1" << env_dflts << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl
+      << "void unregister_proxy_factory (" << be_idt << be_idt
+      << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl
-      << "void unregister_proxy_factory (void);" << be_nl << be_nl
       << node->local_name ()
       << "_ptr create_proxy (" << be_idt << be_idt_nl
-      << node->local_name () << "_ptr proxy" << be_uidt_nl
+      << node->local_name () << "_ptr proxy" << env_dflts << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl << be_nl
       << "protected:" << be_idt_nl
       << "TAO_" << node->flat_name ()
@@ -107,8 +109,8 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << ");" << be_uidt_nl
       << "TAO_" << node->flat_name ()
       << "_Default_Proxy_Factory *proxy_factory_;" << be_nl
-      << "bool one_shot_factory_;" << be_nl
-      << "bool disable_factory_;"<<be_nl
+      << "int one_shot_factory_;" << be_nl
+      << "int disable_factory_;"<<be_nl
       << "TAO_SYNCH_RECURSIVE_MUTEX lock_;" << be_uidt_nl
       << "};";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
index 0c57077fdff..4c4c41b8013 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
@@ -97,7 +97,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl
           << "::" << node->full_name ()
-          << "_ptr proxy" << be_uidt_nl
+          << "_ptr proxy" << env_not << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "return proxy;" << be_uidt_nl
@@ -116,8 +116,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "TAO_"
           << node->flat_name () << "_Proxy_Factory_Adapter (void)" << be_idt_nl
           << ": proxy_factory_ (0)," << be_idt_nl
-          << "one_shot_factory_ (false)," << be_nl
-          << "disable_factory_ (false)" << be_uidt << be_uidt_nl
+          << "one_shot_factory_ (0)," << be_nl
+          << "disable_factory_ (0)" << be_uidt << be_uidt_nl
           << "{" << be_nl
           << "}\n\n";
 
@@ -157,7 +157,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "_Proxy_Factory_Adapter::register_proxy_factory (" << be_idt << be_idt_nl
           << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory *df," << be_nl
-          << "bool one_shot_factory" << be_uidt_nl
+          << "int one_shot_factory" << env_decl << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (" << be_idt << be_idt_nl
@@ -169,7 +169,11 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << ");" <<be_uidt_nl << be_nl
           << "// Remove any existing <proxy_factory_> and "
           << "replace with the new one." << be_nl
-          << "this->unregister_proxy_factory ();" << be_nl
+          << "this->unregister_proxy_factory ("
+          << (be_global->use_raw_throw ()
+                ? ""
+                : "ACE_ENV_SINGLE_ARG_PARAMETER")
+          << ");" << TAO_ACE_CHECK () << be_nl
           << "this->proxy_factory_ = df;" << be_nl
           << "this->one_shot_factory_ = one_shot_factory;" << be_uidt_nl
           << "}\n\n";
@@ -183,7 +187,10 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
         *os << "::";
 
       *os << "TAO_"<< node->flat_name ()
-          << "_Proxy_Factory_Adapter::unregister_proxy_factory (void)" << be_nl
+          << "_Proxy_Factory_Adapter::unregister_proxy_factory ("
+          << be_idt << be_idt
+          << env_sngl_not << be_uidt_nl
+          << ")" << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (" << be_idt << be_idt_nl
           << "ACE_GUARD (" << be_idt << be_idt_nl
@@ -192,12 +199,12 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "this->lock_" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << ");" <<be_uidt_nl << be_nl
-          << "if (this->one_shot_factory_)" << be_idt_nl
+          << "if (this->one_shot_factory_ == 1)" << be_idt_nl
           << "{" << be_idt_nl
-          << "this->disable_factory_ = true;" << be_uidt_nl
+          << "this->disable_factory_ = 1;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
           << "if ("
-          << "this->one_shot_factory_ == false && this->proxy_factory_ != 0)"
+          << "this->one_shot_factory_ == 0 && this->proxy_factory_ != 0)"
           << be_idt_nl
           << "{" << be_idt_nl
           << "delete "
@@ -217,7 +224,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "TAO_"<< node->flat_name ()
           << "_Proxy_Factory_Adapter::create_proxy (" << be_idt << be_idt_nl
           << "::" << node->full_name ()
-          << "_ptr proxy" << be_uidt_nl
+          << "_ptr proxy" << env_not << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (ACE_GUARD_RETURN ("
@@ -225,9 +232,9 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "this->lock_, 0));" << be_uidt_nl << be_nl
           << "// To take care of those <unchecked_narrow> methods where we " << be_nl
           << "// want to override the smart proxy factory if there exists one." << be_nl
-          << "if (this->disable_factory_)" << be_idt_nl
+          << "if (this->disable_factory_ == 1)" << be_idt_nl
           << "{" << be_idt_nl
-          << "this->disable_factory_ = false;" << be_nl
+          << "this->disable_factory_ = 0;" << be_nl
           << "return proxy;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
           << "// Verify that an <proxy_factory_> is available else make one." << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
index 466032f3221..baf3709e1b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
@@ -52,8 +52,10 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (
 
   *os << be_nl << be_nl
       << "TAO::Collocation_Strategy" << be_nl
-      << "get_strategy (::CORBA::Object_ptr obj)"
-      << be_idt_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt;
+      << "get_strategy (" << be_idt << be_idt_nl
+      << "::CORBA::Object_ptr obj" << env_decl << be_uidt_nl
+      << ")" << be_nl
+      << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt;
 
   *os << be_nl << be_nl
       << "void" << be_nl
@@ -64,7 +66,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (
       << "int num_args," << be_nl
       << "const char * op," << be_nl
       << "size_t op_len," << be_nl
-      << "TAO::Collocation_Strategy strategy" << be_uidt_nl
+      << "TAO::Collocation_Strategy strategy" << env_decl << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC (( ::CORBA::Exception));";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index b342717e39c..80ce04b3f3f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -67,12 +67,15 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
   *os << "TAO::Collocation_Strategy" << be_nl
       << node->full_strategized_proxy_broker_name () << "::"
       << "get_strategy (" << be_idt << be_idt_nl
-      << "::CORBA::Object_ptr obj" << be_uidt_nl
+      << "::CORBA::Object_ptr obj" << env_decl << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Collocation_Strategy strategy =" << be_idt_nl
-      << "TAO_ORB_Core::collocation_strategy (obj);" << be_uidt
+      << "TAO_ORB_Core::collocation_strategy (obj"
+      << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+      << ");" << be_uidt
+      << TAO_ACE_CHECK ("TAO::TAO_CS_REMOTE_STRATEGY")
       << be_nl << be_nl
       << "return strategy;" << be_uidt_nl
       << "}" << be_nl << be_nl;
@@ -87,7 +90,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "int num_args," << be_nl
       << "const char * op," << be_nl
       << "size_t op_len," << be_nl
-      << "TAO::Collocation_Strategy strategy" << be_uidt_nl
+      << "TAO::Collocation_Strategy strategy" << env_decl << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC (( ::CORBA::Exception))" << be_uidt_nl
       << "{" << be_idt_nl
@@ -99,7 +102,8 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "num_args," << be_nl
       << "op," << be_nl
       << "op_len," << be_nl
-      << "strategy);" << be_uidt << be_uidt_nl
+      << "strategy" << env_arg
+      << ");" << be_uidt << be_uidt_nl
       << "}";
 
   *os << be_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index 72843dc3259..d5d3c41885a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -117,7 +117,9 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "/// set the ownership" << be_nl << be_nl
       << "void _is_owner ( ::CORBA::Boolean b);" << be_nl
       << "// overridden ServantBase operations" << be_nl
-      << "PortableServer::POA_ptr _default_POA (void);";
+      << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt
+      << env_sngl_dflts << be_uidt_nl
+      << ");" << be_uidt;
 
   int status =
     node->traverse_inheritance_graph (
@@ -168,8 +170,8 @@ be_visitor_interface_tie_sh::method_helper (be_interface *,
     }
 
   be_visitor_context ctx;
-  ctx.stream (os);
   ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SH);
+  ctx.stream (os);
   be_visitor_interface_tie_sh visitor (&ctx);
 
   if (visitor.visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
new file mode 100644
index 00000000000..b92c0a98860
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -0,0 +1,252 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_si.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TIE classes for the Interface node in the
+//    inline file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           tie_si,
+           "$Id$")
+
+
+// ************************************************************************
+// Interface visitor for server inline
+// ************************************************************************
+
+be_visitor_interface_tie_si::be_visitor_interface_tie_si (
+    be_visitor_context *ctx
+  )
+  : be_visitor_interface (ctx)
+{
+}
+
+be_visitor_interface_tie_si::~be_visitor_interface_tie_si (void)
+{
+}
+
+int
+be_visitor_interface_tie_si::visit_interface (be_interface *node)
+{
+  if (node->srv_inline_gen ()
+      || node->imported ()
+      || node->is_abstract ())
+    {
+      return 0;
+    }
+
+  static char fulltiename [NAMEBUFSIZE];
+  static char localtiename [NAMEBUFSIZE];
+  static char localskelname [NAMEBUFSIZE];
+
+  ACE_OS::memset (fulltiename,
+                  '\0',
+                  NAMEBUFSIZE);
+  ACE_OS::memset (localtiename,
+                  '\0',
+                  NAMEBUFSIZE);
+  ACE_OS::memset (localskelname,
+                  '\0',
+                   NAMEBUFSIZE);
+
+  // Generate the skeleton class name which will be used to determine the TIE
+  // class name.
+
+  // We are outermost.
+  ACE_OS::sprintf (fulltiename,
+                   "%s_tie",
+                   node->full_skel_name ());
+
+  if (!node->is_nested ())
+    {
+      ACE_OS::sprintf (localskelname,
+                       "POA_%s",
+                       node->local_name ());
+      ACE_OS::sprintf (localtiename,
+                       "POA_%s_tie",
+                       node->local_name ());
+    }
+  else
+    {
+      ACE_OS::sprintf (localskelname,
+                       "%s",
+                       node->local_name ());
+      ACE_OS::sprintf (localtiename,
+                       "%s_tie",
+                       node->local_name ());
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE" << be_nl
+      << fulltiename << "<T>::" << localtiename << " (T &t)" << be_nl
+      << "\t: ptr_ (&t)," << be_nl
+      << "\t  poa_ (PortableServer::POA::_nil ())," << be_nl
+      << "\t  rel_ (0)" << be_nl
+      << "{}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE" << be_nl
+      << fulltiename << "<T>::" << localtiename
+      << " (T &t, PortableServer::POA_ptr poa)" << be_nl
+      << "\t: ptr_ (&t)," << be_nl
+      << "\t  poa_ (PortableServer::POA::_duplicate (poa))," << be_nl
+      << "\t  rel_ (0)" << be_nl
+      << "{}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE" << be_nl
+      << fulltiename << "<T>::" << localtiename
+      << " (T *tp, ::CORBA::Boolean release)" << be_nl
+      << "\t: ptr_ (tp)," << be_nl
+      << "\t  poa_ (PortableServer::POA::_nil ())," << be_nl
+      << "\t  rel_ (release)" << be_nl
+      << "{}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE" << be_nl
+      << fulltiename << "<T>::" << localtiename
+      << " (T *tp, PortableServer::POA_ptr poa, ::CORBA::Boolean release)"
+      << be_nl
+      << "\t: ptr_ (tp)," << be_nl
+      << "\t  poa_ (PortableServer::POA::_duplicate (poa))," << be_nl
+      << "\t  rel_ (release)" << be_nl
+      << "{}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE" << be_nl
+      << fulltiename << "<T>::~" << localtiename << " (void)" << be_nl
+      << "{" << be_idt_nl
+      << "if (this->rel_)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "delete this->ptr_;" << be_uidt_nl
+      << "}" << be_uidt << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE T *" << be_nl
+      << fulltiename << "<T>::_tied_object (void)" << be_nl
+      << "{" << be_idt_nl
+      << "return this->ptr_;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE void" << be_nl
+      << fulltiename << "<T>::_tied_object (T &obj)" << be_nl
+      << "{" << be_idt_nl
+      << "if (this->rel_)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "delete this->ptr_;" << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
+      << "this->ptr_ = &obj;" << be_nl
+      << "this->rel_ = 0;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE void" << be_nl
+      << fulltiename << "<T>::_tied_object (T *obj, "
+      << "::CORBA::Boolean release)" << be_nl
+      << "{" << be_idt_nl
+      << "if (this->rel_)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "delete this->ptr_;" << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
+      << "this->ptr_ = obj;" << be_nl
+      << "this->rel_ = release;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE ::CORBA::Boolean" << be_nl
+      << fulltiename << "<T>::_is_owner (void)" << be_nl
+      << "{" << be_idt_nl
+      << "return this->rel_;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE void" << be_nl
+      << fulltiename << "<T>::_is_owner ( ::CORBA::Boolean b)" << be_nl
+      << "{" << be_idt_nl
+      << "this->rel_ = b;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "template <class T> ACE_INLINE "
+      << "PortableServer::POA_ptr" << be_nl
+      << fulltiename
+      << "<T>::_default_POA ("
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_DECL")
+      << ")" << be_nl
+      << "{" << be_idt_nl
+      << "if (! ::CORBA::is_nil (this->poa_.in ()))" << be_idt_nl
+      << "{" << be_idt_nl
+      << "return PortableServer::POA::_duplicate (this->poa_.in ());"
+      << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
+      << "return this->" << localskelname
+      << "::_default_POA ("
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER")
+      << ");" << be_uidt_nl
+      << "}";
+
+  int status =
+    node->traverse_inheritance_graph (
+              be_visitor_interface_tie_si::method_helper,
+              os
+            );
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_tie_sh_ss::"
+                         "visit_interface - "
+                         "traversal of inhertance graph failed\n"),
+                        -1);
+    }
+
+  return 0;
+}
+
+int
+be_visitor_interface_tie_si::visit_component (be_component *node)
+{
+  return this->visit_interface (node);
+}
+
+int
+be_visitor_interface_tie_si::method_helper (be_interface *derived,
+                                            be_interface *node,
+                                            TAO_OutStream *os)
+{
+  // Any methods from abstract parents have already been
+  // "added" to the derived interface scope by the overridden
+  // visit_scope() method in be_visitor_interface, so we can skip
+  // this base interface, if it is abstract.
+  if (node->is_abstract ())
+    {
+      return 0;
+    }
+
+  be_visitor_context ctx;
+  ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SI);
+  ctx.interface (derived);
+  ctx.stream (os);
+  be_visitor_interface_tie_si visitor (&ctx);
+
+  if (visitor.visit_scope (node) == -1)
+
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_tie_si::"
+                         "method_helper\n"),
+                        -1);
+    }
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
deleted file mode 100644
index eb876a5a13c..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    tie_ss.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for TIE classes for the Interface node in the
-//    inline file.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_interface,
-           tie_ss,
-           "$Id$")
-
-
-// ************************************************************************
-// Interface visitor for server inline
-// ************************************************************************
-
-be_visitor_interface_tie_ss::be_visitor_interface_tie_ss (
-    be_visitor_context *ctx
-  )
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_tie_ss::~be_visitor_interface_tie_ss (void)
-{
-}
-
-int
-be_visitor_interface_tie_ss::visit_interface (be_interface *node)
-{
-  if (node->srv_inline_gen ()
-      || node->imported ()
-      || node->is_abstract ())
-    {
-      return 0;
-    }
-
-  static char fulltiename [NAMEBUFSIZE];
-  static char localtiename [NAMEBUFSIZE];
-  static char localskelname [NAMEBUFSIZE];
-
-  ACE_OS::memset (fulltiename,
-                  '\0',
-                  NAMEBUFSIZE);
-  ACE_OS::memset (localtiename,
-                  '\0',
-                  NAMEBUFSIZE);
-  ACE_OS::memset (localskelname,
-                  '\0',
-                   NAMEBUFSIZE);
-
-  // Generate the skeleton class name which will be used to determine the TIE
-  // class name.
-
-  // We are outermost.
-  ACE_OS::sprintf (fulltiename,
-                   "%s_tie",
-                   node->full_skel_name ());
-
-  if (!node->is_nested ())
-    {
-      ACE_OS::sprintf (localskelname,
-                       "POA_%s",
-                       node->local_name ());
-      ACE_OS::sprintf (localtiename,
-                       "POA_%s_tie",
-                       node->local_name ());
-    }
-  else
-    {
-      ACE_OS::sprintf (localskelname,
-                       "%s",
-                       node->local_name ());
-      ACE_OS::sprintf (localtiename,
-                       "%s_tie",
-                       node->local_name ());
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "template <class T>" << be_nl
-      << fulltiename << "<T>::" << localtiename << " (T &t)" << be_nl
-      << "\t: ptr_ (&t)," << be_nl
-      << "\t  poa_ (PortableServer::POA::_nil ())," << be_nl
-      << "\t  rel_ (0)" << be_nl
-      << "{}" << be_nl << be_nl;
-
-  *os << "template <class T> " << be_nl
-      << fulltiename << "<T>::" << localtiename
-      << " (T &t, PortableServer::POA_ptr poa)" << be_nl
-      << "\t: ptr_ (&t)," << be_nl
-      << "\t  poa_ (PortableServer::POA::_duplicate (poa))," << be_nl
-      << "\t  rel_ (0)" << be_nl
-      << "{}" << be_nl << be_nl;
-
-  *os << "template <class T>" << be_nl
-      << fulltiename << "<T>::" << localtiename
-      << " (T *tp, ::CORBA::Boolean release)" << be_nl
-      << "\t: ptr_ (tp)," << be_nl
-      << "\t  poa_ (PortableServer::POA::_nil ())," << be_nl
-      << "\t  rel_ (release)" << be_nl
-      << "{}" << be_nl << be_nl;
-
-  *os << "template <class T>" << be_nl
-      << fulltiename << "<T>::" << localtiename
-      << " (T *tp, PortableServer::POA_ptr poa, ::CORBA::Boolean release)"
-      << be_nl
-      << "\t: ptr_ (tp)," << be_nl
-      << "\t  poa_ (PortableServer::POA::_duplicate (poa))," << be_nl
-      << "\t  rel_ (release)" << be_nl
-      << "{}" << be_nl << be_nl;
-
-  *os << "template <class T>" << be_nl
-      << fulltiename << "<T>::~" << localtiename << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this->rel_)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "delete this->ptr_;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *os << "template <class T> T *" << be_nl
-      << fulltiename << "<T>::_tied_object (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return this->ptr_;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *os << "template <class T> void" << be_nl
-      << fulltiename << "<T>::_tied_object (T &obj)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this->rel_)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "delete this->ptr_;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->ptr_ = &obj;" << be_nl
-      << "this->rel_ = 0;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *os << "template <class T> void" << be_nl
-      << fulltiename << "<T>::_tied_object (T *obj, "
-      << "::CORBA::Boolean release)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this->rel_)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "delete this->ptr_;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->ptr_ = obj;" << be_nl
-      << "this->rel_ = release;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *os << "template <class T>  ::CORBA::Boolean" << be_nl
-      << fulltiename << "<T>::_is_owner (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return this->rel_;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *os << "template <class T> void" << be_nl
-      << fulltiename << "<T>::_is_owner ( ::CORBA::Boolean b)" << be_nl
-      << "{" << be_idt_nl
-      << "this->rel_ = b;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *os << "template <class T> "
-      << "PortableServer::POA_ptr" << be_nl
-      << fulltiename
-      << "<T>::_default_POA ()" << be_nl
-      << "{" << be_idt_nl
-      << "if (! ::CORBA::is_nil (this->poa_.in ()))" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return PortableServer::POA::_duplicate (this->poa_.in ());"
-      << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return this->" << localskelname
-      << "::_default_POA ();" << be_uidt_nl
-      << "}";
-
-  int status =
-    node->traverse_inheritance_graph (
-              be_visitor_interface_tie_ss::method_helper,
-              os
-            );
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_tie_sh_ss::"
-                         "visit_interface - "
-                         "traversal of inhertance graph failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_interface_tie_ss::visit_component (be_component *node)
-{
-  return this->visit_interface (node);
-}
-
-int
-be_visitor_interface_tie_ss::method_helper (be_interface *derived,
-                                            be_interface *node,
-                                            TAO_OutStream *os)
-{
-  // Any methods from abstract parents have already been
-  // "added" to the derived interface scope by the overridden
-  // visit_scope() method in be_visitor_interface, so we can skip
-  // this base interface, if it is abstract.
-  if (node->is_abstract ())
-    {
-      return 0;
-    }
-
-  be_visitor_context ctx;
-  ctx.interface (derived);
-  ctx.stream (os);
-  ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SS);
-  be_visitor_interface_tie_ss visitor (&ctx);
-
-  if (visitor.visit_scope (node) == -1)
-
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_tie_ss::"
-                         "method_helper\n"),
-                        -1);
-    }
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp
index 11b3ed2635b..6b5b8e35f33 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp
@@ -70,7 +70,7 @@
 #include "be_visitor_operation/rettype.cpp"
 #include "be_visitor_operation/rettype_return_cs.cpp"
 #include "be_visitor_operation/tie_sh.cpp"
-#include "be_visitor_operation/tie_ss.cpp"
+#include "be_visitor_operation/tie_si.cpp"
 #include "be_visitor_operation/upcall_command_ss.cpp"
 
 // AMI
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
index 41fff5467c0..3983afa8dbd 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
@@ -158,28 +158,44 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
       operation_name[idx] = '\0';
 
       *os << be_nl << "{" << be_idt_nl
-          << "try" << be_nl
+          << (be_global->use_raw_throw () ? "try" : "ACE_TRY") << be_nl
           << "{" << be_idt_nl
           << "holder->raise_" << operation_name.c_str ()
-          << " ();" << be_uidt_nl
+          << " ("
+          << (be_global->use_raw_throw ()
+                ? ""
+                : "ACE_ENV_SINGLE_ARG_PARAMETER")
+          << ");" << ace_try_check << be_uidt_nl
           << "}" << be_nl
-          << "catch ( ::CORBA::Exception& ex)"
+          << (be_global->use_raw_throw ()
+                ? "catch ( ::CORBA::Exception& ex)"
+                : "ACE_CATCH ( ::CORBA::Exception, ex)")
           << be_nl
           << "{" << be_idt_nl
-          << "this->_tao_rh_send_exception (ex);" << be_uidt_nl
-          << "}" << be_uidt_nl
+          << "this->_tao_rh_send_exception (ex"
+          << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+          << ");" << TAO_ACE_CHECK () << be_uidt_nl
+          << "}" << ace_endtry << be_uidt_nl
           << "}";
     }
   else
     {
       // Step 3: Generate actual code for the method
       *os << be_nl << "{" << be_idt_nl
-          << "this->_tao_rh_init_reply ();" << be_nl << be_nl;
+          << "this->_tao_rh_init_reply ("
+          << (be_global->use_raw_throw ()
+                ? ""
+                : "ACE_ENV_SINGLE_ARG_PARAMETER")
+          << ");" << TAO_ACE_CHECK () << be_nl << be_nl;
 
       this->marshal_params (node);
 
       *os << be_nl
-          << "this->_tao_rh_send_reply ();" << be_uidt_nl
+          << "this->_tao_rh_send_reply ("
+          << (be_global->use_raw_throw ()
+                ? ""
+                : "ACE_ENV_SINGLE_ARG_PARAMETER")
+          << ");" << be_uidt_nl
           << "}";
     }
 
@@ -220,7 +236,8 @@ be_visitor_amh_rh_operation_ss::marshal_params (be_operation *node)
           << "{" << be_idt_nl;
 
       // If marshaling fails, raise exception.
-      if (this->gen_raise_exception ("::CORBA::MARSHAL",
+      if (this->gen_raise_exception (0,
+                                     "::CORBA::MARSHAL",
                                      "") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
index 4d9fcfe18eb..333063bd543 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -83,7 +83,7 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
         }
     }
 
-  *os << be_uidt_nl
+  *os << env_decl << be_uidt_nl
       << ")" << be_uidt_nl;
 
   if (be_global->use_raw_throw ())
@@ -117,6 +117,11 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->generate_shared_prologue (node, os, "_get_");
 
+  if (!be_global->exception_support ())
+    {
+      *os << env_decl;
+    }
+
   *os << be_uidt_nl
       << ")" << be_uidt_nl
       << "ACE_THROW_SPEC (( ::CORBA::SystemException)) = 0;" << be_nl;
@@ -137,14 +142,19 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
   be_visitor_args_arglist visitor (&ctx);
 
   int status = visitor.visit_argument (&the_argument);
-
+  
   the_argument.destroy ();
-
+  
   if (-1 == status)
     {
       return -1;
     }
 
+  if (!be_global->exception_support ())
+    {
+      *os << env_decl;
+    }
+
   *os << be_uidt_nl << ")" << be_uidt_nl
       << "ACE_THROW_SPEC (( ::CORBA::SystemException)) = 0;" << be_nl;
 
@@ -166,7 +176,7 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_req," << be_nl
       << "void *_tao_obj," << be_nl
-      << "void *_tao_servant_upcall" << be_uidt_nl
+      << "void *_tao_servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // We need the interface node in which this operation was defined. However,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index ba881c6039a..909176025cf 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -125,7 +125,8 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
       *os << be_uidt_nl << "))" << be_nl;
 
       // If marshaling fails, raise exception.
-      if (this->gen_raise_exception ("::CORBA::MARSHAL",
+      if (this->gen_raise_exception (0,
+                                     "::CORBA::MARSHAL",
                                      "") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -172,6 +173,8 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
                               -1);
           }
       }
+
+    *os << env_arg;
   }
 
   if (this->generate_shared_epilogue (os) == -1)
@@ -199,6 +202,8 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
       return -1;
     }
 
+  *os << env_arg;
+
   if (this->generate_shared_epilogue (os) == -1)
     {
       return -1;
@@ -217,7 +222,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
   be_argument the_argument (AST_Argument::dir_IN,
                             node->field_type (),
                             node->name ());
-
+                            
   int status = 0;
 
   {
@@ -225,7 +230,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
     be_visitor_args_vardecl_ss vardecl_visitor (&ctx);
 
     status = vardecl_visitor.visit_argument (&the_argument);
-
+    
     if (-1 == status)
       {
         the_argument.destroy ();
@@ -246,7 +251,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
     be_visitor_args_marshal_ss marshal_visitor (&ctx);
 
     status = marshal_visitor.visit_argument (&the_argument);
-
+    
     if (-1 == status)
       {
         the_argument.destroy ();
@@ -258,7 +263,8 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
       << "{" << be_idt_nl;
 
   // If marshaling fails, raise exception.
-  status = this->gen_raise_exception ("::CORBA::MARSHAL",
+  status = this->gen_raise_exception (0,
+                                      "::CORBA::MARSHAL",
                                       "");
   if (-1 == status)
     {
@@ -279,15 +285,17 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
 
   {
     be_visitor_args_upcall_ss upcall_visitor (this->ctx_);
-    status = upcall_visitor.visit_argument (&the_argument);
+    status = upcall_visitor.visit_argument (&the_argument);   
     the_argument.destroy ();
-
+    
     if (-1 == status)
       {
         return -1;
       }
   }
 
+  *os << env_arg;
+
   if (-1 == this->generate_shared_epilogue (os))
     {
       return -1;
@@ -336,11 +344,11 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & _tao_server_request," << be_nl
       << "void * /* context */," << be_nl
-      << "void * _tao_servant" << be_uidt_nl
+      << "void * _tao_servant" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl;
 
   // Generate the actual code for the skeleton.
-  // last argument
+  // last argument - is always ACE_ENV_ARG_PARAMETER.
   *os << "{" << be_idt_nl;
 
   // Get the right object implementation.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 5040b2d6585..9cf17b17ab4 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -128,16 +128,23 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   // Generate the actual code for the stub. However, if any of the argument
   // types is "native", we flag a MARSHAL exception.
-  // last argument
+  // last argument - is always ACE_ENV_ARG_PARAMETER
   *os << be_nl << "{" << be_idt;
 
+  if (be_global->exception_support ())
+    {
+      *os << be_nl
+          << "ACE_DECLARE_NEW_CORBA_ENV;";
+    }
+
   if (node->has_native ()) // native exists => no stub
     {
       be_predefined_type bpt (AST_PredefinedType::PT_void,
                               0);
 
-      int const status = this->gen_raise_exception ("::CORBA::MARSHAL",
-                                                    "");
+      int status = this->gen_raise_exception (&bpt,
+                                              "::CORBA::MARSHAL",
+                                              "");
 
       if (status == -1)
         {
@@ -263,8 +270,9 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   *os << "AMI_" << parent->local_name () << "Handler::"
       << opname.fast_rep () + (this->ctx_->attribute () != 0)
-      << "_reply_stub" << be_uidt_nl
-      << ");" << be_uidt;
+      << "_reply_stub" << env_arg << be_uidt_nl
+      << ");" << be_uidt
+      << TAO_ACE_CHECK ();
 
   *os << be_uidt_nl
       << "}";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
index b3ab6250841..75921685b61 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
@@ -74,7 +74,10 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (
 
       *os << "TAO_InputCDR &_tao_reply_cdr," << be_nl
           << "::Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
-          << "::CORBA::ULong reply_status);" << be_uidt;
+          << "::CORBA::ULong reply_status";
+
+      *os << env_dflts << be_uidt_nl
+          << ");" << be_uidt;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 4061f48b16b..3ed6053a76b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -130,7 +130,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
   *os << "TAO_InputCDR &_tao_in, " << be_nl
       << "::Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
       << "::CORBA::ULong reply_status"
-      << ")" << be_uidt << be_uidt_nl
+      << env_decl << ")" << be_uidt << be_uidt_nl
       << "{" << be_idt_nl;
 
   *os << "// Retrieve Reply Handler object." << be_nl;
@@ -138,8 +138,10 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       << "_tao_reply_handler_object =" << be_idt_nl;
 
   *os << parent->full_name ();
-  *os << "::_narrow (_tao_reply_handler);" << be_uidt
-      << be_nl << be_nl
+  *os << "::_narrow (_tao_reply_handler"
+      << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+      << ");" << be_uidt
+      << TAO_ACE_CHECK () << be_nl << be_nl
       << "// Exception handling" << be_nl
       << "switch (reply_status)" << be_nl
       << "{" << be_idt_nl
@@ -273,8 +275,18 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       << node->local_name () << "_excep (" << be_idt << be_idt_nl
       << "exception_holder_var";
 
+  if (!be_global->exception_support ())
+    {
+      *os << " ACE_ENV_ARG_PARAMETER";
+    }
+
   *os << be_uidt_nl << ");" << be_uidt_nl;
 
+  if (!be_global->exception_support ())
+    {
+      *os << "ACE_CHECK;" << be_nl;
+    }
+
   *os << "break;" << be_uidt_nl
       << "}" << be_nl;
 
@@ -443,7 +455,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_marshal_and_invoke
     }
 
   *os << be_uidt_nl << ");" << be_uidt
-      << be_nl;
+      << TAO_ACE_CHECK () << be_nl;
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index ab820a630a9..5988f4c0049 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_operation,
-           arglist,
+ACE_RCSID (be_visitor_operation, 
+           arglist, 
            "$Id$")
 
 // ************************************************************
@@ -46,6 +46,8 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
 
   *os << " (" << be_idt << be_idt_nl;
 
+  int arg_emitted = 0;
+
   switch (this->ctx_->state ())
     {
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH:
@@ -57,6 +59,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
           *os << "," << be_nl;
         }
 
+      arg_emitted = 1;
       break;
     default:
       break;
@@ -72,12 +75,17 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
                         -1);
     }
 
-  if (node->argument_count () == 0)
+  if (this->gen_environment_decl (arg_emitted, node) == -1)
     {
-      *os << "void";
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_arglist::"
+                         "visit_operation - "
+                         "gen_environment_decl failed\n"),
+                        -1);
     }
 
-  *os << be_uidt_nl<< ")";
+  *os << be_uidt_nl
+      << ")";
 
   // Now generate the throw specs.
   if (this->gen_throw_spec (node) == -1)
@@ -101,7 +109,6 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
 
       break;
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH:
-    case TAO_CodeGen::TAO_TIE_OPERATION_ARGLIST_SH:
       break;
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
       *os << " = 0";
@@ -109,7 +116,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
     default:
       return 0;
     }
-
+    
   *os << ";";
 
   return 0;
@@ -140,7 +147,8 @@ be_visitor_operation_arglist::visit_argument (be_argument *node)
   // We need the interface node in which this operation was defined. However,
   // if this operation node was an attribute node in disguise, we get this
   // information from the context
-  be_interface *intf = this->ctx_->attribute ()
+  be_interface *intf;
+  intf = this->ctx_->attribute ()
     ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
     : be_interface::narrow_from_scope (op->defined_in ());
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index 413cb6a125e..fcd2fa84244 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -74,6 +74,8 @@ be_visitor_operation_argument::post_process (be_decl *bd)
 int
 be_visitor_operation_argument::visit_operation (be_operation *node)
 {
+  TAO_OutStream *os = this->ctx_->stream ();
+
   // All we do is hand over code generation to our scope.
   if (this->visit_scope (node) == -1)
     {
@@ -84,6 +86,33 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
                         -1);
     }
 
+  // If we are supporting the alternate mapping, we must pass the
+  // ACE_ENV_ARG_PARAMETER as the last parameter.
+  if (!be_global->exception_support ())
+    {
+      switch (this->ctx_->state ())
+        {
+        case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
+        case TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS:
+          // Applicable only to these cases where the actual upcall is made.
+
+          // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL depending on
+          // whether the operation node has parameters.
+          if (node->argument_count () > 0)
+            {
+              *os << env_arg;
+            }
+          else
+            {
+              *os << env_sngl_arg;
+            }
+
+          break;
+        default:
+          break;
+        }
+    }
+
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
index 44e2d250135..76b2b20752a 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -68,7 +68,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
     }
 
   *os << "," << be_nl
-      << "int" << be_uidt_nl
+      << "int" << env_decl << be_uidt_nl
       << ")";
 
   if (this->gen_throw_spec (node) != 0)
@@ -117,6 +117,10 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
 
   *os << be_uidt << be_uidt_nl;
 
+  if (!be_global->exception_support ())
+    {
+      *os << "ACE_CHECK;";
+    }
   *os << be_uidt_nl
       << "}" << be_nl;
 
@@ -141,7 +145,7 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke (
 
   if (si.is_done ())
     {
-      *os << be_uidt_nl
+      *os << env_sngl_arg << be_uidt_nl
           << ");";
 
       return 0;
@@ -181,7 +185,7 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke (
     }
 
   // End the upcall
-  *os << be_uidt_nl
+  *os << env_arg << be_uidt_nl
       << ");";
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index f766694a58a..4a5d6dfb5a3 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -148,9 +148,7 @@ be_visitor_operation::gen_throw_spec (be_operation *node)
       int is_amh_exception_holder = this->is_amh_exception_holder (iface);
       AST_Decl::NodeType nt = iface->node_type ();
 
-      if (nt != AST_Decl::NT_valuetype
-          && nt != AST_Decl::NT_eventtype
-          || is_amh_exception_holder)
+      if (nt != AST_Decl::NT_valuetype || is_amh_exception_holder)
         {
           *os << be_nl << throw_spec_open;
           *os << be_idt_nl << "::CORBA::SystemException";
@@ -188,13 +186,130 @@ be_visitor_operation::gen_throw_spec (be_operation *node)
 }
 
 int
-be_visitor_operation::gen_raise_exception (const char *exception_name,
+be_visitor_operation::gen_environment_decl (int argument_emitted,
+                                            be_operation *node)
+{
+  // Generate the CORBA::Environment parameter for the alternative mapping.
+  if (be_global->exception_support ())
+    {
+      return 0;
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL depending on
+  // whether the operation node has parameters.
+  const char *env_decl = "ACE_ENV_SINGLE_ARG_DECL";
+
+  if (this->ctx_->sub_state ()
+        == TAO_CodeGen::TAO_AMH_RESPONSE_HANDLER_OPERATION
+      && node->argument_count () == 0)
+    {
+      // Response handler operations don't use the environment arg
+      // unless there are other args in the operation.
+      env_decl = "ACE_ENV_SINGLE_ARG_DECL";
+      this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
+    }
+  else if (argument_emitted || node->argument_count () > 0)
+    {
+      env_decl = "ACE_ENV_ARG_DECL";
+    }
+
+  TAO_CodeGen::CG_STATE cgs = this->ctx_->state ();
+
+  if (node->argument_count () > 0
+      || cgs == TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH
+      || cgs == TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XS)
+    {
+      *os << be_nl;
+    }
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
+      // Last argument is always CORBA::Environment.
+      *os << env_decl << "_WITH_DEFAULTS";
+      break;
+    default:
+      *os << env_decl;
+      break;
+    }
+
+  return 0;
+}
+
+// Method that returns the appropriate CORBA::Environment variable.
+const char *
+be_visitor_operation::gen_environment_var (void)
+{
+  static const char *ace_try_env_decl = "ACE_DECLARE_NEW_CORBA_ENV;";
+  static const char *null_env_decl = "";
+
+  // Check if we are generating stubs/skeletons for
+  // true C++ exception support.
+  if (be_global->exception_support ())
+    {
+      return ace_try_env_decl;
+    }
+  else
+    {
+      return null_env_decl;
+    }
+}
+
+int
+be_visitor_operation::gen_raise_exception (be_type *return_type,
+                                           const char *exception_name,
                                            const char *exception_arguments)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << "throw "
-      << exception_name << "(" << exception_arguments << ");";
+  if (be_global->use_raw_throw ())
+    {
+      *os << "throw "
+          << exception_name << "(" << exception_arguments << ");\n";
+      return 0;
+    }
+
+  int is_void =
+    return_type == 0 || this->void_return_type (return_type);
+
+  if (is_void)
+    {
+      *os << "ACE_THROW (";
+    }
+  else
+    {
+      *os << "ACE_THROW_RETURN (";
+    }
+
+  *os << exception_name << " (" << exception_arguments << ")";
+
+  if (is_void)
+    {
+      *os << ");";
+
+      return 0;
+    }
+
+  *os << ",";
+
+  // Non-void return type.
+  be_visitor_context ctx (*this->ctx_);
+  be_visitor_operation_rettype_return_cs visitor (&ctx);
+
+  if (return_type->accept (&visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation::"
+                         "gen_raise_exception - "
+                         "codegen for return var failed\n"),
+                        -1);
+    }
+
+  *os << ");";
 
   return 0;
 }
@@ -225,7 +340,8 @@ be_visitor_operation::gen_stub_operation_body (
 
   if (node->has_native ()) // native exists => no stub
     {
-      if (this->gen_raise_exception ("::CORBA::MARSHAL",
+      if (this->gen_raise_exception (return_type,
+                                     "::CORBA::MARSHAL",
                                      "") == -1)
         {
           ACE_ERROR_RETURN ((
@@ -357,12 +473,23 @@ be_visitor_operation::gen_stub_operation_body (
       *os << "_tao_call.invoke (" << be_idt << be_idt_nl
           << "_tao_" << node->flat_name ()
           << "_exceptiondata," << be_nl
-          << node->exceptions ()->length () << be_uidt_nl
+          << node->exceptions ()->length () << env_arg << be_uidt_nl
           << ");" << be_uidt;
     }
   else
     {
-      *os << "_tao_call.invoke (0, 0);";
+      *os << "_tao_call.invoke (0, 0"
+          << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+          << ");";
+    }
+
+  if (this->void_return_type (return_type))
+    {
+      *os << TAO_ACE_CHECK ();
+    }
+  else
+    {
+      *os << TAO_ACE_CHECK ("_tao_retval.excp ()");
     }
 
   if (!this->void_return_type (return_type))
@@ -408,7 +535,18 @@ be_visitor_operation::gen_raise_interceptor_exception (
 
   if (this->void_return_type (bt))
     {
-      *os << "throw " << excep << "(" << completion_status << ");";
+      if (be_global->use_raw_throw ())
+        {
+          *os << "throw " << excep << "(" << completion_status << ");";
+        }
+      else
+        {
+          *os << "TAO_INTERCEPTOR_THROW (" << be_idt << be_idt_nl
+              << excep << " (" << be_idt << be_idt_nl
+              << completion_status << be_uidt_nl
+              << ")" << be_uidt << be_uidt_nl
+              << ");" << be_uidt;
+        }
     }
   else
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index 92bc5ab2eec..7bba7f41d3b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -113,7 +113,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
           << "_skel (" << be_idt << be_idt_nl
           << "TAO_ServerRequest & server_request," << be_nl
           << "void * servant_upcall," << be_nl
-          << "void * servant" << be_uidt_nl
+          << "void * servant" << env_decl << be_uidt_nl
           << ");" << be_uidt;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index a62f5e8c7cd..34adf67cb75 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -209,7 +209,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & server_request," << be_nl
       << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-      << "void * servant" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl;
 
   // Generate the actual code for the skeleton. However, if any of the
@@ -298,8 +298,10 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
       << "                       , exceptions" << be_nl
       << "                       , nexceptions"
       << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-      << "                       );" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "                       "
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+      << ");" << TAO_ACE_CHECK () << be_uidt_nl
+      << "}";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
index af21e45b74a..2990b9fde70 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -42,7 +42,7 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node)
   *os << node->local_name () << " (" << be_idt << be_idt_nl
       << "TAO_Abstract_ServantBase *servant," << be_nl
       << "TAO::Argument ** args," << be_nl
-      << "int num_args" << be_uidt_nl
+      << "int num_args" << env_decl << be_uidt_nl
       << ")";
 
   if (this->gen_throw_spec (node) != 0)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
index 6042227dc34..a0fc6da455e 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
@@ -77,10 +77,9 @@ be_visitor_operation_tie_sh::visit_operation (be_operation *node)
   // STEP 3: generate the argument list with the appropriate mapping. For these
   // we grab a visitor that generates the parameter listing
   ctx = *this->ctx_;
-  // We use this state here as a flag to leave out the param names in the
-  // arglist, to avoid a possible clash with the TIE class template
-  // parameter name.
-  ctx.state (TAO_CodeGen::TAO_TIE_OPERATION_ARGLIST_SH);
+  // we use the _CH state here because the _SH state produces pure virtual
+  // methods.
+  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_CH);
   be_visitor_operation_arglist oa_visitor (&ctx);
 
   if (node->accept (&oa_visitor) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
new file mode 100644
index 00000000000..ffa3758d8c8
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
@@ -0,0 +1,164 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_si.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for operations for the TIE class.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           tie_si,
+           "$Id$")
+
+// ************************************************************
+// Operation visitor for server inline for TIE class operations.
+// ************************************************************
+
+be_visitor_operation_tie_si::be_visitor_operation_tie_si (
+    be_visitor_context *ctx
+  )
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_operation_tie_si::~be_visitor_operation_tie_si (void)
+{
+}
+
+int be_visitor_operation_tie_si::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  be_interface *intf = this->ctx_->interface ();
+
+  if (!intf)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_tie_si::"
+                         "visit_operation - "
+                         "bad interface scope\n"),
+                        -1);
+    }
+
+  // Retrieve the operation return type.
+  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_tie_si::"
+                         "visit_operation - "
+                         "Bad return type\n"),
+                        -1);
+    }
+
+  // Although unlikely it is possible that the 'T' in 'template class<T>' will
+  // conflict with an argument name...
+  ACE_CString template_name ("T");
+  bool template_name_ok = false;
+
+  while (!template_name_ok)
+    {
+      template_name_ok = true;
+
+      for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
+          ! si.is_done () && template_name_ok;
+          si.next ())
+        {
+          // Check for conflicts between the arg name and the proposed template
+          // class identifier
+          AST_Argument *arg =
+            AST_Argument::narrow_from_decl (si.item ());
+
+          if (! ACE_OS::strcmp (arg->local_name ()->get_string (),
+                                template_name.c_str ()))
+            {
+              // clash !
+              template_name_ok = false;
+            }
+        }
+
+      if (! template_name_ok)
+        {
+          // We had a clash - postfix an underscore and try again
+          template_name += "_";
+        }
+    }
+
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  *os << "template <class " << template_name.c_str () << "> ACE_INLINE\n";
+
+  // Generate the return type mapping (same as in the header file).
+  be_visitor_context ctx (*this->ctx_);
+  be_visitor_operation_rettype oro_visitor (&ctx);
+
+  if (bt->accept (&oro_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_tie_si::"
+                         "visit_operation - "
+                         "codegen for return type failed\n"),
+                        -1);
+    }
+
+  *os << " " << intf->full_skel_name () << "_tie<" << template_name.c_str () << ">::"
+      << node->local_name () << " ";
+
+  // STEP 4: generate the argument list with the appropriate mapping (same as
+  // in the header file)
+  ctx = *this->ctx_;
+  be_visitor_operation_arglist oao_visitor (&ctx);
+
+  if (node->accept (&oao_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_cs::"
+                         "visit_operation - "
+                         "codegen for argument list failed\n"),
+                        -1);
+    }
+
+  *os << be_nl << "{" << be_idt_nl;
+
+  be_predefined_type *pdt = be_predefined_type::narrow_from_decl (bt);
+
+  if (pdt == 0 || pdt->pt () != AST_PredefinedType::PT_void)
+    {
+      *os << "return ";
+    }
+
+  *os << "this->ptr_->" << node->local_name () << " (" << be_idt;
+
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS);
+  be_visitor_operation_argument ocau_visitor (&ctx);
+
+  if (node->accept (&ocau_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ss::"
+                         "visit_operation - "
+                         "codegen for making upcall failed\n"),
+                        -1);
+    }
+
+  *os << be_uidt_nl;
+  *os << ");" << be_uidt_nl;
+  *os << "}";
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
deleted file mode 100644
index 8675c7ecd8f..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    tie_ss.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for operations for the TIE class.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_operation,
-           tie_ss,
-           "$Id$")
-
-// ************************************************************
-// Operation visitor for server inline for TIE class operations.
-// ************************************************************
-
-be_visitor_operation_tie_ss::be_visitor_operation_tie_ss (
-    be_visitor_context *ctx
-  )
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_tie_ss::~be_visitor_operation_tie_ss (void)
-{
-}
-
-int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  be_interface *intf = this->ctx_->interface ();
-
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_tie_ss::"
-                         "visit_operation - "
-                         "bad interface scope\n"),
-                        -1);
-    }
-
-  // Retrieve the operation return type.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_tie_ss::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // Although unlikely it is possible that the 'T' in 'template class<T>' will
-  // conflict with an argument name...
-  ACE_CString template_name ("T");
-  bool template_name_ok = false;
-
-  while (!template_name_ok)
-    {
-      template_name_ok = true;
-
-      for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
-          ! si.is_done () && template_name_ok;
-          si.next ())
-        {
-          // Check for conflicts between the arg name and the proposed template
-          // class identifier
-          AST_Argument *arg =
-            AST_Argument::narrow_from_decl (si.item ());
-
-          if (! ACE_OS::strcmp (arg->local_name ()->get_string (),
-                                template_name.c_str ()))
-            {
-              // clash !
-              template_name_ok = false;
-            }
-        }
-
-      if (! template_name_ok)
-        {
-          // We had a clash - postfix an underscore and try again
-          template_name += "_";
-        }
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "template <class " << template_name.c_str () << ">" << be_nl;
-
-  // Generate the return type mapping (same as in the header file).
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_operation_rettype oro_visitor (&ctx);
-
-  if (bt->accept (&oro_visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_tie_ss::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-
-  *os << " " << intf->full_skel_name () << "_tie<" << template_name.c_str () << ">::"
-      << node->local_name () << " ";
-
-  // STEP 4: generate the argument list with the appropriate mapping (same as
-  // in the header file)
-  ctx = *this->ctx_;
-  be_visitor_operation_arglist oao_visitor (&ctx);
-
-  if (node->accept (&oao_visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-
-  *os << be_nl << "{" << be_idt_nl;
-
-  be_predefined_type *pdt = be_predefined_type::narrow_from_decl (bt);
-
-  if (pdt == 0 || pdt->pt () != AST_PredefinedType::PT_void)
-    {
-      *os << "return ";
-    }
-
-  *os << "this->ptr_->" << node->local_name () << " (" << be_idt;
-
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS);
-  be_visitor_operation_argument ocau_visitor (&ctx);
-
-  if (node->accept (&ocau_visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for making upcall failed\n"),
-                        -1);
-    }
-
-  *os << be_uidt_nl;
-  *os << ");" << be_uidt_nl;
-  *os << "}";
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
index 9703b55a0f4..bdf0aff984d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
@@ -189,7 +189,9 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node,
      << "}" << be_nl << be_nl;
 
   // Generate execute() method.
-  os << "virtual void execute (void)" << be_nl
+  os << "virtual void execute ("
+     << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL")
+     << ")" << be_nl
      << "{" << be_idt_nl;
 
   if (!node->void_return_type ())
@@ -385,6 +387,15 @@ be_visitor_operation_upcall_command_ss::gen_upcall (be_operation * node)
          << (i == 0 ? "" : ", ") << "arg_" << i + 1;
     }
 
+  if (count > 0)
+    {
+      os << env_arg;
+    }
+  else
+    {
+      os << env_sngl_arg;
+    }
+
   os << ");";
 
   if (!node->void_return_type ())
@@ -393,7 +404,7 @@ be_visitor_operation_upcall_command_ss::gen_upcall (be_operation * node)
     }
 
   os << be_uidt
-     << be_uidt_nl;
+     << TAO_ACE_CHECK () << be_uidt_nl;
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp
index b88712b67f5..3cee0de1265 100644
--- a/TAO/TAO_IDL/be/be_visitor_root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root.cpp
@@ -59,7 +59,6 @@
 #include "be_visitor_home.h"
 #include "be_visitor_traits.h"
 #include "be_visitor_arg_traits.h"
-#include "be_visitor_template_export.h"
 #include "be_visitor_context.h"
 
 #include "be_visitor_root/root.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 74b1174c595..9c3ce0b4462 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -272,8 +272,8 @@ int be_visitor_root::visit_root (be_root *node)
     {
       case TAO_CodeGen::TAO_ROOT_CH:
         {
-          be_visitor_traits traits_visitor (&ctx);
-          status = node->accept (&traits_visitor);
+          be_visitor_traits visitor (&ctx);
+          status = node->accept (&visitor);
 
           if (status == -1)
             {
@@ -283,21 +283,6 @@ int be_visitor_root::visit_root (be_root *node)
                                  "failed to generate traits\n"),
                                 -1);
             }
-
-          if (be_global->gen_template_export ())
-            {
-              be_visitor_template_export export_visitor (&ctx);
-              status = node->accept (&export_visitor);
-
-              if (status == -1)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_visitor_root::"
-                                     "visit_root - "
-                                     "failed to export templates\n"),
-                                    -1);
-                }
-            }
         }
 
         break;
@@ -491,6 +476,11 @@ int be_visitor_root::visit_root (be_root *node)
         );
       break;
     case TAO_CodeGen::TAO_ROOT_SI:
+      if (be_global->gen_tie_classes ())
+        {
+          (void) tao_cg->end_server_template_inline ();
+        }
+
       tao_cg->end_server_inline ();
       break;
     case TAO_CodeGen::TAO_ROOT_SS:
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
index 86c0b7e6e71..77cd9ceb807 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root,
-           root_si,
+ACE_RCSID (be_visitor_root, 
+           root_si, 
            "$Id$")
 
 // ***********************************************
@@ -44,10 +44,24 @@ be_visitor_root_si::init (void)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root_si::init - "
-                         "server inline open failed\n"),
+                         "server inline open failed\n"), 
                         -1);
     }
 
+  if (be_global->gen_tie_classes ())
+    {
+      if (tao_cg->start_server_template_inline (
+              be_global->be_get_server_template_inline_fname ()
+            )
+          == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_root_si::init - "
+                             "Error opening server template inline file\n"),
+                            -1);
+        }
+    }
+
   // init stream
   this->ctx_->stream (tao_cg->server_inline ());
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
index dbc1581678b..fcaf4307fac 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root,
-           root_ss,
+ACE_RCSID (be_visitor_root, 
+           root_ss, 
            "$Id$")
 
 // ******************************************************
@@ -46,7 +46,7 @@ be_visitor_root_ss::init (void)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root_ss::init - "
-                         "Error opening server skeletons file\n"),
+                         "Error opening server skeletons file\n"), 
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
index a79c5025119..c0d397965d0 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root,
-           root_sth,
+ACE_RCSID (be_visitor_root, 
+           root_sth, 
            "$Id$")
 
 // ****************************************
@@ -156,7 +156,9 @@ be_visitor_root_sth::visit_interface (be_interface *node)
 
   // Generate the TIE class.
 
+  this->ctx_->state (TAO_CodeGen::TAO_ROOT_TIE_SH);
   this->ctx_->node (node);
+
   be_visitor_interface_tie_sh visitor (this->ctx_);
 
   if (node->accept (&visitor) == -1)
@@ -168,6 +170,8 @@ be_visitor_root_sth::visit_interface (be_interface *node)
                         -1);
     }
 
+  this->ctx_->state (TAO_CodeGen::TAO_ROOT_TIE_SH);
+
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index 7752e68912a..265e0b8261e 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -55,11 +55,12 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       return 0;
     }
 
+  be_type *bt = 0;
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the base type since we may need to do some code
   // generation for the base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  bt = be_type::narrow_from_decl (node->base_type ());
 
   if (bt == 0)
     {
@@ -73,7 +74,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   bt->seen_in_sequence (true);
   AST_Decl::NodeType nt = bt->node_type ();
 
-  // If our base type is an anonymous sequence, we must create a name
+  // If our base type is an anonymouse sequence, we must create a  name
   // and generate a class declaration for it as well.
   if (nt == AST_Decl::NT_sequence)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
index a34f26d4b4a..e7828e2eb85 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
@@ -1130,9 +1130,6 @@ switch (this->ctx_->sub_state ())
         case AST_Decl::NT_interface_fwd:
         case AST_Decl::NT_valuetype:
         case AST_Decl::NT_valuetype_fwd:
-        case AST_Decl::NT_eventtype:
-        case AST_Decl::NT_eventtype_fwd:
-        case AST_Decl::NT_valuebox:
           *os << "//DCPS does not support interfaces and value types";
 
           break;
@@ -1242,20 +1239,16 @@ switch (this->ctx_->sub_state ())
         case AST_Decl::NT_interface:
         case AST_Decl::NT_interface_fwd:
           *os << "//DCPS does not support interfaces";
-          
+
           break;
         case AST_Decl::NT_string:
         case AST_Decl::NT_wstring:
           *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);";
-          
           break;
         case AST_Decl::NT_valuetype:
         case AST_Decl::NT_valuetype_fwd:
-        case AST_Decl::NT_eventtype:
-        case AST_Decl::NT_eventtype_fwd:
-        case AST_Decl::NT_valuebox:
           *os << "//DCPS does not support value types";
-          
+
           break;
         case AST_Decl::NT_pre_defined:
           {
diff --git a/TAO/TAO_IDL/be/be_visitor_template_export.cpp b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
deleted file mode 100644
index 6fb14458121..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_template_export.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//=============================================================================
-/**
-*  @file   be_visitor_template_export.cpp
-*
-*  $Id$
-*
-*  This visitor generates template instantiations with export macro
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-
-#include "be_visitor_template_export.h"
-#include "be_visitor_context.h"
-#include "be_root.h"
-#include "be_module.h"
-#include "be_typedef.h"
-#include "be_sequence.h"
-#include "be_extern.h"
-#include "be_helper.h"
-#include "be_predefined_type.h"
-
-ACE_RCSID (be,
-           be_visitor_template_export,
-           "$Id$")
-
-be_visitor_template_export::be_visitor_template_export (
-  be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_template_export::~be_visitor_template_export (void)
-{
-}
-
-int
-be_visitor_template_export::visit_root (be_root *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT";
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_template_export::"
-                         "visit_root - visit scope failed\n"),
-                        -1);
-    }
-
-  *os << be_nl << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */";
-
-  return 0;
-}
-
-int
-be_visitor_template_export::visit_module (be_module *node)
-{
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_template_export::"
-                         "visit_module - visit scope failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_template_export::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  // TAO provides extensions for octet sequences, first find out if
-  // the base type is an octet (or an alias for octet).
-  be_predefined_type *predef = 0;
-
-  if (bt->base_node_type () == AST_Type::NT_pre_defined)
-    {
-      be_typedef* alias =
-            be_typedef::narrow_from_decl (bt);
-
-      if (alias == 0)
-        {
-          predef = be_predefined_type::narrow_from_decl (bt);
-        }
-      else
-        {
-          predef =
-            be_predefined_type::narrow_from_decl (
-                alias->primitive_base_type ()
-              );
-        }
-    }
-
-  // When it is a sequence add a special guard
-  if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet
-      && node->unbounded ())
-    {
-      *os << "\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 0)";
-    }
-
-  *os << be_idt << be_nl
-      << "template class " << be_global->stub_export_macro ()
-      << " ";
-
-  if (node->gen_base_class_name (os, "", this->ctx_->scope ()) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_template_export::"
-                         "visit_sequence - "
-                         "Base class name generation failed\n"),
-                        -1);
-    }
-
-  *os << ";" << be_uidt;
-
-  if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet
-      && node->unbounded ())
-    {
-      *os << "\n#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 0 */";
-    }
-
-  return 0;
-}
-
-int
-be_visitor_template_export::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  be_type *bt = node->primitive_base_type ();
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_template_export::"
-                         "visit_typedef - "
-                         "visit base type failed\n"),
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
index 525829db28e..0ff1d7c32dd 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
@@ -28,20 +28,18 @@ int
 TAO::be_visitor_struct_typecode::visit_structure (be_structure * node)
 {
   if (!node->is_defined ())
-    {
-      return this->gen_forward_declared_typecode (node);
-    }
+    return this->gen_forward_declared_typecode (node);
 
   // Check if we are repeated.
   be_visitor_typecode_defn::QNode const * const qnode =
     this->queue_lookup (this->tc_queue_, node);
 
   ACE_Unbounded_Queue<AST_Type *> recursion_queue;
-
   if (qnode
       && node->in_recursion (recursion_queue))
     {
       this->is_recursive_ = true;
+
       return 0;
     }
   else if (this->queue_insert (this->tc_queue_, node, 0) == 0)
@@ -54,11 +52,10 @@ TAO::be_visitor_struct_typecode::visit_structure (be_structure * node)
     }
 
   if (this->recursion_detect_ || this->is_nested_)
-    {
-      return 0;
-    }
+    return 0;
 
   static bool const is_exception = false;
+
   return this->visit (node, is_exception);
 }
 
@@ -66,14 +63,13 @@ int
 TAO::be_visitor_struct_typecode::visit_exception (be_exception * node)
 {
   if (this->recursion_detect_)
-    {
-      return 0;
-    }
+    return 0;
 
   // No need to check for recursion since exceptions are never
   // recursive.
 
   static bool const is_exception = true;
+
   return this->visit (node, is_exception);
 }
 
@@ -82,6 +78,7 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
                                         bool is_exception)
 {
   this->is_nested_ = true;
+
   TAO_OutStream & os = *this->ctx_->stream ();
 
   os << be_nl << be_nl
@@ -89,49 +86,42 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   if (this->gen_member_typecodes (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO::be_visitor_struct_typecode::visit_structure -"
-                         " Unable to generate structure/exception field "
-                         "TypeCodes.\n"),
-                        -1);
-    }
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "TAO::be_visitor_struct_typecode::visit_structure - "
+                       "Unable to generate structure/exception field "
+                       "TypeCodes.\n"),
+                      -1);
 
   static ACE_CString const tao_fields ("_tao_fields_");
   ACE_CString const fields_name (tao_fields
                                  + node->flat_name ());
 
   // Generate array containing struct field characteristics.
-  os << "static TAO::TypeCode::Struct_Field<" << be_idt_nl
-     << "char const *," << be_nl
-     << "::CORBA::TypeCode_ptr const *> const ";
+  os << "static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const ";
 
   if (node->nfields () == 0)
     {
       // Should only be possible for user exceptions with no fields.
-      os << "* const " << be_idt_nl
-         << fields_name.c_str () << " = 0;" << be_uidt_nl << be_uidt_nl;
+
+      os << "* const " << fields_name.c_str () << " = 0;" << be_nl;
     }
   else
     {
-      os << be_idt_nl
-         << fields_name.c_str () << "[] =" << be_idt_nl
+      os << fields_name.c_str () << "[] =" << be_idt_nl
          << "{" << be_idt_nl;
 
       if (this->visit_members (node) != 0)
-        {
-          return -1;
-        }
+        return -1;
 
       os << be_uidt_nl
-         << "};" << be_uidt << be_uidt_nl << be_uidt_nl;
+         << "};" << be_uidt_nl;
     }
 
   static char const StringType[]      = "char const *";
   static char const TypeCodeType[]    = "::CORBA::TypeCode_ptr const *";
-  static char const MemberArrayType[] = "TAO::TypeCode::Struct_Field";
-//    "TAO::TypeCode::Struct_Field<char const *, "
-//    "::CORBA::TypeCode_ptr const *> const *";
+  static char const MemberArrayType[] =
+    "TAO::TypeCode::Struct_Field<char const *, "
+    "::CORBA::TypeCode_ptr const *> const *";
 
   // Generate the TypeCode instantiation.
   os << "static ";
@@ -142,37 +132,33 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
     }
 
   // -- TypeCodeBase --
-  os << "TAO::TypeCode::Struct<" << be_idt_nl
-     << StringType << "," << be_nl
-     << TypeCodeType << "," << be_nl
-     << MemberArrayType << "<" << be_idt_nl
-     << StringType << "," << be_nl
-     << TypeCodeType << "> const *," << be_uidt_nl
-     << "TAO::Null_RefCount_Policy>";
+  os
+    << "TAO::TypeCode::Struct<" << StringType << "," << be_nl
+    << "                      " << TypeCodeType << "," << be_nl
+    << "                      " << MemberArrayType << "," << be_nl
+    << "                      TAO::Null_RefCount_Policy>";
 
   if (this->is_recursive_)
     {
-      os << "," << be_uidt_nl
+      os << "," << be_nl
          << TypeCodeType << "," << be_nl
-         << MemberArrayType << "<" << be_idt_nl
-         << StringType << "," << be_nl
-         << TypeCodeType << "> const *>" << be_uidt;
+         << MemberArrayType << " >" << be_uidt_nl;
     }
 
-  os << be_uidt_nl
-     << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
-     << "::CORBA::tk_" << (is_exception ? "except" : "struct") << ","
-     << be_nl
-     << "\"" << node->repoID () << "\"," << be_nl
-     << "\"" << node->original_local_name () << "\"," << be_nl
-     << "_tao_fields_" << node->flat_name () << "," << be_nl
-     << node->nfields () << ");"
-     << be_uidt_nl << be_nl;
+  os
+    << be_idt_nl
+    << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
+    << "::CORBA::tk_" << (is_exception ? "except" : "struct") << ","
+    << be_nl
+    << "\"" << node->repoID () << "\"," << be_nl
+    << "\"" << node->original_local_name () << "\"," << be_nl
+    << "_tao_fields_" << node->flat_name () << "," << be_nl
+    << node->nfields () << ");" << be_uidt_nl
+    << be_uidt_nl;
+
 
   if (this->gen_typecode_ptr (be_type::narrow_from_decl (node)) != 0)
-    {
-      return -1;
-    }
+    return -1;
 
   return 0;
 }
@@ -181,6 +167,7 @@ int
 TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node)
 {
   AST_Field ** member_ptr = 0;
+
   size_t const count = node->nfields ();
 
   for (size_t i = 0; i < count; ++i)
@@ -191,9 +178,7 @@ TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node)
         be_type::narrow_from_decl ((*member_ptr)->field_type ());
 
       if (this->is_typecode_generation_required (member_type))
-        {
-          (void) member_type->accept (this);
-        }
+        member_type->accept (this);
     }
 
   return 0;
@@ -203,7 +188,9 @@ int
 TAO::be_visitor_struct_typecode::visit_members (AST_Structure * node)
 {
   AST_Field ** member_ptr = 0;
+
   size_t const count = node->nfields ();
+
   TAO_OutStream & os = *this->ctx_->stream ();
 
   for (size_t i = 0; i < count; ++i)
@@ -222,9 +209,9 @@ TAO::be_visitor_struct_typecode::visit_members (AST_Structure * node)
          << " }";
 
       if (i < count - 1)
-        {
-          os << "," << be_nl;
-        }
+        os << ",";
+
+      os << be_nl;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index 76d1e86ec67..ebc99c86e5b 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -285,21 +285,12 @@ be_visitor_typecode_defn::is_typecode_generation_required (be_type * node)
   if (nt == AST_Decl::NT_interface
       || nt == AST_Decl::NT_interface_fwd
       || nt == AST_Decl::NT_valuetype
-      || nt == AST_Decl::NT_valuetype_fwd
-      || nt == AST_Decl::NT_eventtype
-      || nt == AST_Decl::NT_eventtype_fwd)
-    {
-      // Since all fwd decl 'full definition' members aren't updated when
-      // the full definition is seen, we need to make sure we have the
-      // full definition node (if it exists) on which to call is_defined().
-      // The last 'true' arg below filters out full-def members of fwd decls.
-      AST_Decl *d = node->defined_in ()->lookup_by_name (node->name (),
-                                                         true,
-                                                         true,
-                                                         true);
+      || nt == AST_Decl::NT_valuetype_fwd)
+    {
+      // interfaces, valuetypes, eventtypes and components
 
       be_interface * const intf =
-        d != 0 ? be_interface::narrow_from_decl (d) : 0;
+        be_interface::narrow_from_decl (node);
 
       if (intf && intf->is_defined ())
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
index 5cb90656c74..124845ab053 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_union,
-           discriminant_ch,
+ACE_RCSID (be_visitor_union, 
+           discriminant_ch, 
            "$Id$")
 
 // *************************************************************************
@@ -73,7 +73,7 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_union_discriminant_ch::"
                              "visit_enum - "
-                             "codegen failed\n"),
+                             "codegen failed\n"), 
                             -1);
         }
     }
@@ -82,7 +82,7 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
       << "// " << __FILE__ << ":" << __LINE__;
 
   // The set method.
-  *os << be_nl << be_nl
+  *os << be_nl << be_nl 
       << "void _d (" << bt->nested_type_name (bu) << ");" << be_nl;
   // The get method.
   *os << bt->nested_type_name (bu) << " _d (void) const;";
@@ -114,10 +114,10 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type
       << "// " << __FILE__ << ":" << __LINE__;
 
   // The set method.
-  *os << be_nl << be_nl
-      << "void _d ( " << bt->nested_type_name (bu) << ");" << be_nl;
+  *os << be_nl << be_nl 
+      << "void _d ( ::" << bt->nested_type_name (bu) << ");" << be_nl;
   // The get method.
-  *os << bt->nested_type_name (bu) << " _d (void) const;";
+  *os << "::" << bt->nested_type_name (bu) << " _d (void) const;";
 
   return 0;
 }
@@ -135,7 +135,7 @@ be_visitor_union_discriminant_ch::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_discriminant_ch::"
                          "visit_typedef - "
-                         "Bad primitive type\n"),
+                         "Bad primitive type\n"), 
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
index c6a0be19dff..ed55708c8ca 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_union_branch,
-           private_ch,
+ACE_RCSID (be_visitor_union_branch, 
+           private_ch, 
            "$Id$")
 
 // **********************************************
@@ -387,8 +387,9 @@ be_visitor_union_branch_private_ch::visit_predefined_type (
   *os << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl;
-
+  *os << be_nl
+      << (td == 0 ? "::" : "");
+      
   AST_PredefinedType::PredefinedType pt = node->pt ();
 
   if (pt == AST_PredefinedType::PT_object
@@ -399,7 +400,7 @@ be_visitor_union_branch_private_ch::visit_predefined_type (
     }
   else if (pt == AST_PredefinedType::PT_pseudo)
     {
-      *os << bt->nested_type_name (bu, "_ptr")
+      *os << bt->nested_type_name (bu, "_ptr") 
           << " " << ub->local_name () << "_;";
     }
   else if (pt == AST_PredefinedType::PT_value)
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
index 5bb3f5c14fa..7c41c84c7ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_union_branch,
-           public_ch,
+ACE_RCSID (be_visitor_union_branch, 
+           public_ch, 
            "$Id$")
 
 // **********************************************
@@ -124,7 +124,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node)
 
       // Now use this array as a "type" for the subsequent declarator
       // the set method.
-      *os << be_nl << be_nl
+      *os << be_nl << be_nl 
           << "void " << ub->local_name () << " ("
           << "_" << bt->local_name () << ");" << be_nl;
       // The get method.
@@ -458,41 +458,43 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
+      
+  const char *no_td_global = (td == 0 ? "::" : "");
 
   switch (node->pt ())
     {
     case AST_PredefinedType::PT_pseudo:
     case AST_PredefinedType::PT_object:
     case AST_PredefinedType::PT_abstract:
-      *os << be_nl << be_nl
-          << "void " << ub->local_name () << " (const "
+      *os << be_nl << be_nl 
+          << "void " << ub->local_name () << " (const " << no_td_global
           << bt->nested_type_name (bu, "_ptr") << ");" << be_nl;
-      *os << bt->nested_type_name (bu, "_ptr") << " "
+      *os << no_td_global << bt->nested_type_name (bu, "_ptr") << " "
           << ub->local_name () << " (void) const;";
       break;
     case AST_PredefinedType::PT_value:
-      *os << be_nl << be_nl
-          << "void " << ub->local_name () << " ( "
+      *os << be_nl << be_nl 
+          << "void " << ub->local_name () << " ( " << no_td_global
           << bt->nested_type_name (bu, " *") << ");" << be_nl;
-      *os << bt->nested_type_name (bu, " *") << " "
+      *os << no_td_global << bt->nested_type_name (bu, " *") << " "
           << ub->local_name () << " (void) const;";
       break;
     case AST_PredefinedType::PT_any:
-      *os << be_nl << be_nl
-          << "void " << ub->local_name () << " (const "
+      *os << be_nl << be_nl 
+          << "void " << ub->local_name () << " (const " << no_td_global
           << bt->nested_type_name (bu) << " &);" << be_nl;
-      *os << "const " << bt->nested_type_name (bu) << " &"
+      *os << "const " << no_td_global<< bt->nested_type_name (bu) << " &"
           << ub->local_name () << " (void) const;" << be_nl;
-      *os << bt->nested_type_name (bu) << " &"
+      *os << no_td_global << bt->nested_type_name (bu) << " &"
           << ub->local_name () << " (void);";
       break;
     case AST_PredefinedType::PT_void:
       break;
     default:
-      *os << be_nl << be_nl
-          << "void " << ub->local_name () << " ( "
+      *os << be_nl << be_nl 
+          << "void " << ub->local_name () << " ( " << no_td_global
           << bt->nested_type_name (bu) << ");" << be_nl;
-      *os << bt->nested_type_name (bu) << " "
+      *os << no_td_global << bt->nested_type_name (bu) << " "
           << ub->local_name () << " (void) const;";
     }
 
@@ -550,7 +552,7 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node)
       // Generate the anonymous sequence member typedef.
       // This provides a consistent name to use instead of the
       // implementation-specific name.
-      *os << be_nl << be_nl
+      *os << be_nl << be_nl 
           << "typedef " << bt->nested_type_name (bu)
           << " _" << ub->local_name () << "_seq;";
     }
@@ -558,7 +560,7 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl
+  *os << be_nl << be_nl 
       << "void " << ub->local_name () << " (const "
       << bt->nested_type_name (bu) << " &);" << be_nl;
   *os << "const " << bt->nested_type_name (bu) << " &"
@@ -593,7 +595,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node)
   // Three methods to set the string value
   if (node->width () == (long) sizeof (char))
     {
-      *os << be_nl << be_nl
+      *os << be_nl << be_nl 
           << "void " << ub->local_name () << " (char *);" << be_nl;
       *os << "void " << ub->local_name () << " (const char *);"
           << be_nl;
@@ -604,7 +606,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node)
     }
   else
     {
-      *os << be_nl << be_nl
+      *os << be_nl << be_nl 
           << "void " << ub->local_name () << " ( ::CORBA::WChar *);" << be_nl;
       *os << "void " << ub->local_name () << " (const ::CORBA::WChar *);"
           << be_nl;
@@ -666,7 +668,7 @@ be_visitor_union_branch_public_ch::visit_structure (be_structure *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl
+  *os << be_nl << be_nl 
       << "void " << ub->local_name () << " (const "
       << bt->nested_type_name (bu) << " &);" << be_nl
       << "const " << bt->nested_type_name (bu) << " &"
@@ -749,7 +751,7 @@ be_visitor_union_branch_public_ch::visit_union (be_union *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl
+  *os << be_nl << be_nl 
       << "void " << ub->local_name () << " (const "
       << bt->nested_type_name (bu) << " &);" << be_nl
       << "const " << bt->nested_type_name (bu) << " &"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
index d055409f156..b815e058f82 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
@@ -93,7 +93,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
       << "_tao_obv_repository_id (void) const;"
       << be_nl << be_nl
       << "virtual void "
-      << "_tao_obv_truncatable_repo_ids (Repository_Id_List &ids) const;"
+      << "_tao_obv_truncatable_repo_ids (Repository_Id_List &) const;"
       << be_nl << be_nl
       << "static const char* "
       << "_tao_obv_static_repository_id (void);" << be_nl << be_nl;
@@ -104,19 +104,6 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
       << node->local_name () << " *&" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
-
-  if (be_global->any_support ())
-    {
-      *os << "static void _tao_any_destructor (void *);"
-          << be_nl;
-    }
-
-  if (be_global->tc_support ())
-    {
-      *os << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"
-          << be_nl << be_nl;
-    }
-
   be_type *bt = be_type::narrow_from_decl (node->boxed_type ());
 
   // Emit the type specific elements.  The visit_* methods in this
@@ -124,11 +111,12 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
   if (!bt || (bt->accept (this) == -1))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuebox_ch::visit_valuebox - "
-                         "type-specific valuebox code generation failed\n"),
-                        -1);
+                       " (%N:%l) be_visitor_valuebox_ch::visit_valuebox - "
+                       "type-specific valuebox code generation failed\n"),
+                       -1);
     }
 
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
@@ -216,12 +204,10 @@ be_visitor_valuebox_ch::visit_array (be_array *node)
       << "_slice & operator[] ( ::CORBA::ULong index) const;" << be_nl;
 
   *os << node->full_name ()
-      << "_slice &  operator[] ( ::CORBA::ULong index);"
-      << be_nl << be_nl;
+      << "_slice &  operator[] ( ::CORBA::ULong index);" << be_nl << be_nl;
 
   // Explicit conversion functions
-  *os << "const " << node->full_name ()
-      << "_slice * _boxed_in (void) const;"
+  *os << "const " << node->full_name () << "_slice * _boxed_in (void) const;"
       << be_nl;
 
   *os << node->full_name () << "_slice * _boxed_inout (void);" << be_nl;
@@ -253,10 +239,8 @@ be_visitor_valuebox_ch::visit_interface (be_interface *node)
 int
 be_visitor_valuebox_ch::visit_predefined_type (be_predefined_type *node)
 {
-  return this->emit_for_predef_enum (
-    node,
-    "",
-    node->pt () == AST_PredefinedType::PT_any);
+  return this->emit_for_predef_enum (node, "",
+                                  node->pt () == AST_PredefinedType::PT_any);
 }
 
 
@@ -290,7 +274,6 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
   // Retrieve the base type since we will need to do some code
   // generation for it.
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  
   if (bt == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -337,8 +320,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
     }
 
   *os << " * buf," << be_nl
-      << "::CORBA::Boolean release = false" << be_uidt_nl << ");"
-      << be_uidt_nl;
+      << "::CORBA::Boolean release = false" << be_uidt_nl << ");" << be_uidt_nl;
 
   // Public constructor with single argument of type const T&
   this->emit_constructor_one_arg (node, "", "const ", "&");
@@ -363,34 +345,37 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
   if (bt->accept (&bt_visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          " (%N:%l) be_visitor_valuebox_ch::"
-                           "visit_sequence - "
-                          "base type visit failed\n"),
-                         -1);
+                       " (%N:%l) be_visitor_valuebox_ch::"
+                       "visit_sequence - "
+                       "base type visit failed\n"),
+                       -1);
     }
   *os << "& operator[] ( ::CORBA::ULong index);" << be_nl;
 
   // Generate base type for sequence then remainder of operator []
   *os << "const ";
-  
   if (bt->accept (&bt_visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         " (%N:%l) be_visitor_valuebox_ch::"
-                         "visit_sequence - "
-                         "base type visit failed\n"),
-                        -1);
+                       " (%N:%l) be_visitor_valuebox_ch::"
+                       "visit_sequence - "
+                       "base type visit failed\n"),
+                       -1);
     }
-    
-  *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl << be_nl
-      << "::CORBA::ULong maximum (void) const;" << be_nl
-      << "::CORBA::ULong length (void) const;" << be_nl
-      << "void length ( ::CORBA::ULong len);" << be_nl << be_nl;
+  *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl << be_nl;
+
+
+  *os << "::CORBA::ULong maximum (void) const;" << be_nl;
+
+  *os << "::CORBA::ULong length (void) const;" << be_nl;
+
+  *os << "void length ( ::CORBA::ULong len);" << be_nl << be_nl;
 
   // Member variable of underlying type;
   this->emit_boxed_member_var (node, "_var");
 
   return 0;
+
 }
 
 
@@ -401,7 +386,6 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
 
   const char *string_type;
   const char *char_type;
-  
   if (node->node_type () == AST_Decl::NT_string)
     {
       string_type = "String";
@@ -426,7 +410,8 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  this->emit_default_constructor ();
+  this->emit_default_constructor();
+
   this->emit_constructor_one_arg (node, "", "", "");
 
   // Public constructor with one argument of type const char *
@@ -461,30 +446,31 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
   *os << "// modifiers" << be_nl;
 
   // Modifier function with one argument of type char *
-  *os << "void _value (" << node->full_name () << " val);" << be_nl;
+  *os << "void" << " _value (" << node->full_name () << " val);" << be_nl;
 
   // Modifier function with one argument of type const char *
-  *os << "void _value (const " << node->full_name () << " val);"
+  *os << "void" << " _value (const " << node->full_name () << " val);"
       << be_nl;
 
   // Modifier function with one argument of type const CORBA::String_var&
-  *os << "void _value (const ::CORBA::" << string_type << "_var& var);"
+  *os << "void" << " _value (const ::CORBA::" << string_type << "_var& var);"
       << be_nl << be_nl;
 
   // Access to the boxed value for method signatures
   this->emit_boxed_access (node, "", "const ", "", "");
 
   // Overloaded subscript operators
-  *os << "// allows access and modification using a slot." << be_nl
-      << char_type << " & operator[] ( ::CORBA::ULong slot);"
-      << be_nl << be_nl
-      << "// allows only accessing thru a slot." << be_nl
-      << char_type << " operator[] ( ::CORBA::ULong slot) const;"
-      << be_nl;
+  *os << "// allows access and modification using a slot." << be_nl;
+  *os << char_type << " & operator[] ( ::CORBA::ULong slot);" << be_nl << be_nl;
+
+  *os << "// allows only accessing thru a slot." << be_nl;
+  *os << char_type << " operator[] ( ::CORBA::ULong slot) const;" << be_nl;
+
 
   // Member variable of underlying type;
-  *os << be_uidt_nl << "private:" << be_idt_nl
-      << "::CORBA::" << string_type << "_var" << " _pd_value;" << be_nl;
+  *os << be_uidt_nl << "private:" << be_idt_nl;
+
+  *os << "::CORBA::" << string_type << "_var" << " _pd_value;" << be_nl;
 
   return 0;
 }
@@ -532,7 +518,6 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
   AST_Field *field;
   be_type *bt;
   be_visitor_context ctx (*this->ctx_);
-  
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
        !si.is_done ();
         si.next ())
@@ -554,7 +539,6 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
 
       // Create a visitor and use that to process the type.
       be_visitor_valuebox_field_ch visitor (&ctx);
-      
       if (bt->accept (&visitor) == -1)
         {
           ACE_ERROR ((LM_ERROR,
@@ -570,6 +554,8 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
   this->emit_boxed_member_var (node, "_var");
 
   return 0;
+
+
 }
 
 
@@ -633,7 +619,6 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
   AST_Field *field;
   be_type *bt;
   be_visitor_context ctx (*this->ctx_);
-  
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
        !si.is_done ();
         si.next ())
@@ -655,7 +640,6 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
 
       // Create a visitor and use that to process the type.
       be_visitor_valuebox_field_ch visitor (&ctx);
-      
       if (bt->accept (&visitor) == -1)
         {
           ACE_ERROR ((LM_ERROR,
@@ -701,9 +685,9 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
 
 
 int
-be_visitor_valuebox_ch::emit_for_predef_enum (be_type *node,
-                                              const char * type_suffix,
-                                              bool is_any)
+be_visitor_valuebox_ch::emit_for_predef_enum(be_type *node,
+                                             const char * type_suffix,
+                                             bool is_any)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -820,6 +804,7 @@ be_visitor_valuebox_ch::emit_assignment (be_decl *node,
       << be_nl << be_nl;
 }
 
+
 void
 be_visitor_valuebox_ch::emit_boxed_access (be_decl *node,
                                            const char * type_suffix,
@@ -833,13 +818,19 @@ be_visitor_valuebox_ch::emit_boxed_access (be_decl *node,
 
   // Access to the boxed value for method signatures
   *os << const_prefix << node->full_name () << type_suffix << in_ref_modifier
-      << " _boxed_in (void) const;" << be_nl
-      << node->full_name () << type_suffix << "&"
-      << " _boxed_inout (void);" << be_nl
-      << node->full_name () << type_suffix << out_ref_modifier << "&"
+      << " _boxed_in (void) const;" << be_nl;
+
+  *os << node->full_name () << type_suffix << "&"
+      << " _boxed_inout (void);" << be_nl;
+
+  *os << node->full_name () << type_suffix << out_ref_modifier << "&"
       << " _boxed_out (void);" << be_nl;
+
 }
 
+
+
+
 void
 be_visitor_valuebox_ch::emit_accessor_modifier (be_decl *node)
 {
@@ -848,8 +839,7 @@ be_visitor_valuebox_ch::emit_accessor_modifier (be_decl *node)
   *os << "// accessors and modifier" << be_nl;
 
   // Public accessor method (const)
-  *os << "const " << node->full_name () << "& _value (void) const;"
-      << be_nl;
+  *os << "const " << node->full_name () << "& _value (void) const;" << be_nl;
 
   // Public accessor method
   *os << node->full_name () << "& _value (void);" << be_nl;
@@ -867,6 +857,7 @@ be_visitor_valuebox_ch::emit_boxed_member_var (be_decl *node,
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Member variable of underlying type;
-  *os << be_uidt_nl << "private:" << be_idt_nl
-      << node->full_name () << type_suffix << " _pd_value;" << be_nl;
+  *os << be_uidt_nl << "private:" << be_idt_nl;
+
+  *os << node->full_name () << type_suffix << " _pd_value;" << be_nl;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
index 49564510d96..f67657fbad5 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -123,12 +123,9 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "}" << be_nl << be_nl;
 
   *os << "void" << be_nl
-      << node->name ()
-      << "::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const"
-      << be_nl
+      << node->name () << "::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const" << be_nl
       << "{" << be_idt_nl
-      << "ids.push_back (this->_tao_obv_static_repository_id ());"
-      << be_uidt_nl
+      << "ids.push_back (this->_tao_obv_static_repository_id ());" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // _tao_match_formal_type method.  Generated because ValueBase interface
@@ -140,69 +137,31 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "{" << be_idt_nl
       << "return true;" << be_uidt_nl
       << "}" << be_nl << be_nl;
-      
-
-  if (be_global->any_support ())
-    {
-      *os << "void" << be_nl
-          << node->name ()
-          << "::_tao_any_destructor (void *_tao_void_pointer)" << be_nl
-          << "{" << be_idt_nl
-          << node->local_name () << " *_tao_tmp_pointer =" << be_idt_nl
-          << "static_cast<" << be_idt
-          << node->local_name () << " *> ("
-          << "_tao_void_pointer);" << be_uidt << be_uidt_nl
-          << "::CORBA::remove_ref (_tao_tmp_pointer);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
-    }
-
-  // Switch streams to the *A.cpp file if we are using this option.
-  if (be_global->gen_anyop_files ())
-    {
-      os = tao_cg->anyop_source ();
-    }
-
-  if (be_global->tc_support ())
-    {
-      *os << "// TAO extension - the virtual _type method." << be_nl;
-      *os << "::CORBA::TypeCode_ptr " << node->name ()
-          << "::_tao_type (void) const" << be_nl;
-      *os << "{" << be_idt_nl;
-      *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
-    }
-
-  // Make sure we are generating to *C.cpp regardless of the above.
-  os = tao_cg->client_stubs ();
 
   AST_Type * at = node->boxed_type()->unaliased_type();
   be_type *bt = be_type::narrow_from_decl (at);
   bool is_array = false;
+
   const char * unmarshal_arg;
   be_predefined_type *bpt = be_predefined_type::narrow_from_decl (bt);
-  
   if (bpt != 0)
     {
       switch (bpt->pt())
         {
         case AST_PredefinedType::PT_boolean:
-          unmarshal_arg =
-            "::ACE_InputCDR::to_boolean (vb_object->_pd_value)";
+          unmarshal_arg = "::ACE_InputCDR::to_boolean (vb_object->_pd_value)";
           break;
 
         case AST_PredefinedType::PT_char:
-          unmarshal_arg =
-            "::ACE_InputCDR::to_char (vb_object->_pd_value)";
+          unmarshal_arg = "::ACE_InputCDR::to_char (vb_object->_pd_value)";
           break;
 
         case AST_PredefinedType::PT_wchar:
-          unmarshal_arg =
-            "::ACE_InputCDR::to_wchar (vb_object->_pd_value)";
+          unmarshal_arg = "::ACE_InputCDR::to_wchar (vb_object->_pd_value)";
           break;
 
         case AST_PredefinedType::PT_octet:
-          unmarshal_arg =
-            "::ACE_InputCDR::to_octet (vb_object->_pd_value)";
+          unmarshal_arg = "::ACE_InputCDR::to_octet (vb_object->_pd_value)";
           break;
 
         case AST_PredefinedType::PT_any:
@@ -236,8 +195,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "if ( ::CORBA::ValueBase::_tao_validate_box_type (" << be_idt
       << be_idt << be_idt_nl
       << "strm," << be_nl
-      << node->local_name () << "::_tao_obv_static_repository_id (),"
-      << be_nl
+      << node->local_name () << "::_tao_obv_static_repository_id ()," << be_nl
       << "is_null_object"
       << be_uidt_nl
       << ") == false)" << be_uidt_nl
@@ -256,10 +214,9 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   if (is_array)
     {
-      *os << at->full_name()
-          << "_forany temp (vb_object->_boxed_inout ());" << be_nl;
+      *os << at->full_name() << "_forany temp (vb_object->_boxed_inout ());"
+          << be_nl;
     }
-    
   *os << "return (strm >> " << unmarshal_arg << ");" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -307,8 +264,7 @@ be_visitor_valuebox_cs::visit_array (be_array * node)
      << vb_node->name ()
      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
      << "{" << be_idt_nl
-     << node->name () << "_forany temp (this->_pd_value.ptr ());"
-     << be_nl
+     << node->name () << "_forany temp (this->_pd_value.ptr ());" << be_nl
      << "return (strm << temp);" << be_uidt_nl
      << "}" << be_nl << be_nl;
 
@@ -356,23 +312,19 @@ be_visitor_valuebox_cs::visit_predefined_type (be_predefined_type * node)
   switch (node->pt ())
     {
     case AST_PredefinedType::PT_boolean:
-      marshal_arg =
-        "::ACE_OutputCDR::from_boolean (this->_pd_value)";
+      marshal_arg = "::ACE_OutputCDR::from_boolean (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_char:
-      marshal_arg =
-        "::ACE_OutputCDR::from_char (this->_pd_value)";
+      marshal_arg = "::ACE_OutputCDR::from_char (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_wchar:
-      marshal_arg =
-        "::ACE_OutputCDR::from_wchar (this->_pd_value)";
+      marshal_arg = "::ACE_OutputCDR::from_wchar (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_octet:
-      marshal_arg =
-        "::ACE_OutputCDR::from_octet (this->_pd_value)";
+      marshal_arg = "::ACE_OutputCDR::from_octet (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_any:
@@ -417,7 +369,6 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
   // Retrieve the base type since we will need to do some code
   // generation for it.
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  
   if (bt == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -462,10 +413,10 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
   if (bt->accept (&bt_visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuebox_cs::"
-                         "visit_valuebox - "
-                         "base type visit failed\n"),
-                        -1);
+                       "(%N:%l) be_visitor_valuebox_cs::"
+                       "visit_valuebox - "
+                       "base type visit failed\n"),
+                       -1);
     }
 
   *os << " * buf," << be_nl
@@ -493,15 +444,14 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
   if (bt->accept (&bt_visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuebox_cs::"
-                         "visit_valuebox - "
-                         "base type visit failed\n"),
-                        -1);
+                       "(%N:%l) be_visitor_valuebox_cs::"
+                       "visit_valuebox - "
+                       "base type visit failed\n"),
+                       -1);
     }
 
   *os << " & " << be_nl
-      << vb_node->name () << "::operator[] ( ::CORBA::ULong index)"
-      << be_nl
+      << vb_node->name () << "::operator[] ( ::CORBA::ULong index)" << be_nl
       << "{" << be_idt_nl
       << "return (";
 
@@ -519,7 +469,6 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
 
   // Accessor: const
   *os << "const ";
-  
   if (bt->accept (&bt_visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -528,7 +477,6 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
                          "base type visit failed\n"),
                         -1);
     }
-    
   *os << " &" << be_nl;
   *os << vb_node->name ()
       << "::operator[] ( ::CORBA::ULong index) const" << be_nl
@@ -561,6 +509,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
         }
 
       *os << "&) this->_pd_value->operator[] (index);" << be_uidt_nl;
+
     }
 
   *os << "}" << be_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index b4b74e060fa..aa784e3a0e1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -123,7 +123,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
           << be_idt << be_idt_nl
           << "_tao_any," << be_nl
           << node->local_name () << "::_tao_any_destructor," << be_nl
-          << "(*_tao_elem)->_tao_type ()," << be_nl
+          << node->tc_name ()->last_component () << "," << be_nl
           << "*_tao_elem" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
           << "}" << be_nl << be_nl;
@@ -174,7 +174,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
-      << "(*_tao_elem)->_tao_type ()," << be_nl
+      << node->tc_name () << "," << be_nl
       << "*_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
index 05849c401e2..87186a23ea3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -72,7 +72,7 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
 
   *os << " (";
 
-  if (node->nmembers () > 0)
+  if (!be_global->exception_support () || node->nmembers () > 0)
     {
       *os << be_idt << be_idt_nl;
 
@@ -86,6 +86,59 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
                             -1);
         }
 
+      // Generate the ACE_ENV_ARG_DECL parameter for the alternative mapping.
+      if (!be_global->exception_support ())
+        {
+          /***********************************************************/
+          // If it ian an AMHExceptionHolder we are going to generate the
+          // function definition "in-place" right here.  Also all
+          // AMHExceptionHolder 'raise' methods do not take any
+          // parameters.  So always declare
+          // ACE_ENV_SINGLE_ARG_DECL_NOT_USED when generating argument
+          // list for AMHExceptioHolders
+          /***********************************************************/
+          if (amh_valuetype)
+            {
+              *os << (be_global->use_raw_throw ()
+                        ? ""
+                        : "ACE_ENV_SINGLE_ARG_DECL");
+            }
+          /***********************************************************/
+          else
+            {
+              // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL
+              // depending on whether the operation node has parameters.
+
+              if (node->argument_count () == 0)
+                {
+                  *os << (be_global->use_raw_throw ()
+                            ? ""
+                            : " ACE_ENV_SINGLE_ARG_DECL");
+                }
+              else
+                {
+                  *os << (be_global->use_raw_throw ()
+                            ? ""
+                            : " ACE_ENV_ARG_DECL");
+                }
+            }
+
+          if (!amh_valuetype)
+            {
+              switch (this->ctx_->state ())
+                {
+                case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
+                  // Last argument - is always ACE_ENV_ARG_DECL.
+                  *os << (be_global->use_raw_throw ()
+                            ? ""
+                            : "_WITH_DEFAULTS");
+                  break;
+                default:
+                  break;
+                }
+            }
+        }
+
       *os << be_uidt_nl
           << ")";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index 190c730ec48..ef1bcb17051 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -157,7 +157,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
 
   if (inh)
     {
-      *os << "if (!ci.handle_chunking (strm))" << be_idt_nl;
+      *os << "if (! ci.handle_chunking (strm))" << be_idt_nl;
       *os << "return false;" << be_uidt_nl << be_nl;
 
       if (inh->opt_accessor ())
@@ -173,7 +173,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
         }
       else // only can access base class via virtual function
         {
-          *os << "if (!this->_tao_unmarshal__"
+          *os << "if (! this->_tao_unmarshal__"
               <<       inh->flat_name ()
               << " (strm, ci))" << be_idt_nl
               << "{" << be_idt_nl
@@ -187,7 +187,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
 
   if (node->data_members_count () > 0)
     {
-      *os << "if (!ci.handle_chunking (strm))" << be_idt_nl;
+      *os << "if (! ci.handle_chunking (strm))" << be_idt_nl;
       *os << "return false;" << be_uidt_nl << be_nl;
       *os << "CORBA::Boolean const ret = " << be_idt << be_idt_nl;
 
@@ -197,7 +197,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
 
       *os << ";" << be_uidt << be_uidt_nl;
 
-      *os << "if (!ret) " << be_idt_nl;
+      *os << "if ( ! ret) " << be_idt_nl;
       *os << "return false; " << be_uidt_nl << be_nl;
       *os << "if (this->require_truncation_)" << be_idt_nl;
       *os << "return ci.skip_chunks (strm);" << be_uidt_nl << be_nl;
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 e10420944f3..fef8e7466a5 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -218,12 +218,6 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       *os << "static void _tao_any_destructor (void *);";
     }
 
-  if (be_global->tc_support ())
-    {
-      *os << be_nl << be_nl
-          << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;";
-    }
-
   // Generate code for the valuetype definition.
   if (this->visit_valuetype_scope (node) == -1)
     {
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 ea3f10ab578..8e577ec39bf 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -108,31 +108,24 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
 
   // The _tao_obv_repository_id method.
   *os << "const char *" << be_nl
-      << node->name ()
-      << "::_tao_obv_repository_id (void) const" << be_nl
+      << node->name () << "::_tao_obv_repository_id (void) const" << be_nl
       << "{" << be_idt_nl
-      << "return this->_tao_obv_static_repository_id ();"
-      << be_uidt_nl
+      << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << "void" << be_nl
-      << node->name ()
-      << "::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const"
-      << be_nl
+      << node->name () << "::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const" << be_nl
       << "{" << be_idt_nl
       << "ids.push_back (this->_tao_obv_static_repository_id ());";
 
   if (node->truncatable ())
     {
-      *os << be_nl
-          << node->inherits_concrete ()->name ()
-          << "::_tao_obv_truncatable_repo_ids (ids);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+      *os << be_nl;
+      *os << node->inherits_concrete ()->name () << "::_tao_obv_truncatable_repo_ids (ids);" << be_uidt_nl;
+      *os << "}" << be_nl << be_nl;
     }
   else
-    {
-      *os << be_uidt_nl << "}" << be_nl << be_nl;
-    }
+    *os << be_uidt_nl << "}" << be_nl << be_nl;
 
   if (be_global->any_support ())
     {
@@ -148,34 +141,14 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << "}" << be_nl << be_nl;
     }
 
-  // Switch streams to the *A.cpp file if we are using this option.
-  if (be_global->gen_anyop_files ())
-    {
-      os = tao_cg->anyop_source ();
-    }
-
-  if (be_global->tc_support ())
-    {
-      *os << "// TAO extension - the virtual _type method." << be_nl;
-      *os << "::CORBA::TypeCode_ptr " << node->name ()
-          << "::_tao_type (void) const" << be_nl;
-      *os << "{" << be_idt_nl;
-      *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
-    }
-
-  // Make sure we are generating to *C.cpp regardless of the above.
-  os = tao_cg->client_stubs ();
-
   // Generate destructor.
   //
   // @@ Do not inline this destructor.  It is virtual.  Inlining
   //    virtual functions, including virtual destructors, wreaks havoc
   //    with g++ >= 4.0 RTTI support when the
   //    "-fvisibility-inlines-hidden" command line option is used.
-  *os << node->name () << "::~" << node->local_name () << " (void)"
-      << be_nl
-      << "{}" << be_nl << be_nl;
+  *os << node->name () << "::~" << node->local_name () << " (void)" << be_nl;
+  *os << "{}\n" << be_nl;
 
   bool is_an_amh_exception_holder =
     this->is_amh_exception_holder (node);
@@ -188,7 +161,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << node->name ()
           << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
           << "{" << be_idt_nl
-          << "TAO_ChunkInfo ci (this->is_truncatable_ || this->chunking_);"
+          << "TAO_ChunkInfo ci(this->is_truncatable_ || this->chunking_);"
           << be_nl
           << "return ";
 
@@ -215,7 +188,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << "::_tao_unmarshal_v (TAO_InputCDR & strm)"
           << be_nl
           << "{" << be_idt_nl
-          << "TAO_ChunkInfo ci (this->is_truncatable_ || this->chunking_, 1);"
+          << "TAO_ChunkInfo ci(this->is_truncatable_ || this->chunking_ ,1);"
           << be_nl
           << "return ";
 
@@ -306,23 +279,19 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::ValueBase *base = 0;" << be_nl
-      << "::CORBA::Boolean const retval =" << be_idt_nl
-      << "::CORBA::ValueBase::_tao_unmarshal_pre ("
-      << be_idt << be_idt_nl
+      << "::CORBA::Boolean retval =" << be_idt_nl
+      << "::CORBA::ValueBase::_tao_unmarshal_pre (" << be_idt << be_idt_nl
       << "strm," << be_nl
       << "base," << be_nl
-      << node->local_name () << "::_tao_obv_static_repository_id ()"
-      << be_uidt_nl
+      << node->local_name () << "::_tao_obv_static_repository_id ()" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl << be_nl
       << "if (!retval)" << be_idt_nl
       << "return false;" << be_uidt_nl << be_nl
       << "if (base != 0 && ! base->_tao_unmarshal_v (strm))" << be_idt_nl
       << "return false;" << be_uidt_nl << be_nl
-      << "// Now base must be null or point to the unmarshaled object."
-      << be_nl
+      << "// Now base must be null or point to the unmarshaled object." << be_nl
       << "// Align the pointer to the right subobject." << be_nl
-      << "new_object = " << node->local_name () << "::_downcast (base);"
-      << be_nl
+      << "new_object = " << node->local_name () << "::_downcast (base);" << be_nl
       << "return true;" << be_uidt_nl
       << "}";
 
@@ -421,8 +390,8 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node)
   // STEP 2: Generate the operation name.
   *os << be_nl << parent->name () << "::" << node->local_name ();
 
-  // STEP 3: Generate the argument list with the appropriate mapping.
-  // For these, we grab a visitor that generates the parameter listing.
+  // STEP 3: Generate the argument list with the appropriate mapping. For these
+  // we grab a visitor that generates the parameter listing.
   ctx = *this->ctx_;
   ctx.state (TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CS);
   be_visitor_obv_operation_arglist ooa_visitor (&ctx);
@@ -446,9 +415,14 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node)
   // and without native exception support).
   *os << be_nl
       << "{" << be_nl
-      << "auto_ptr< ::CORBA::Exception> safety (this->exception);"
-      << be_nl
+      << "#if defined (TAO_HAS_EXCEPTIONS)" << be_idt_nl
+      << "auto_ptr< ::CORBA::Exception> safety (this->exception);" << be_nl
+      << "// Direct throw because we don't have the ACE_TRY_ENV." << be_nl
       << "this->exception->_raise ();" << be_uidt_nl
+      << "#else" << be_idt_nl
+      << "// We can not use ACE_THROW here." << be_nl
+      << "ACE_TRY_ENV.exception (this->exception);" << be_uidt_nl
+      << "#endif" << be_nl
       << "}"
       << be_uidt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
index 701bb1d3816..c68a18b7670 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
@@ -107,13 +107,18 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
       // generate create_for_unmarshal
       os << be_nl << be_nl
          << "virtual ::CORBA::ValueBase *" << be_nl
-         << "create_for_unmarshal (void);";
+         << "create_for_unmarshal ("
+         << be_idt << be_idt
+         << env_sngl_dflts << be_uidt_nl
+         << ");" << be_uidt;
 
       if (node->supports_abstract ())
         {
           os << be_nl << be_nl
              << "virtual ::CORBA::AbstractBase_ptr" << be_nl
-             << "create_for_unmarshal_abstract (void);" << be_uidt;
+             << "create_for_unmarshal_abstract (" << be_idt << be_idt
+             << env_sngl_dflts << be_uidt_nl
+             << ");" << be_uidt;
         }
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
index 638abe1c108..07d27795d03 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
@@ -118,7 +118,11 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
       // generate create_for_unmarshal()
       *os << be_nl << be_nl
           << "::CORBA::ValueBase *" << be_nl
-          << fname << "::create_for_unmarshal (void)" << be_nl
+          << fname << "::create_for_unmarshal" << " ("
+          << (be_global->use_raw_throw ()
+                ? "void"
+                : "ACE_ENV_SINGLE_ARG_DECL")
+          << ")" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::ValueBase *ret_val = 0;" << be_nl
           << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl
@@ -133,7 +137,11 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
           {
             *os << be_nl << be_nl
                 << "::CORBA::AbstractBase_ptr" << be_nl
-                << fname << "::create_for_unmarshal_abstract (void)" << be_nl
+                << fname << "::create_for_unmarshal_abstract ("
+                << (be_global->use_raw_throw ()
+                      ? "void"
+                      : "ACE_ENV_SINGLE_ARG_DECL")
+                << ")" << be_nl
                 << "{" << be_idt_nl
                 << "::CORBA::AbstractBase *ret_val = 0;" << be_nl
                 << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index eb5d05505a3..a6e2aa20c89 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -96,7 +96,6 @@ public:
 
       TAO_OPERATION_ARGLIST_CH,               // parameter list in op signature
       TAO_OPERATION_ARGLIST_SH,               // ... for server header
-      TAO_TIE_OPERATION_ARGLIST_SH,           // ... for TIE class header
 
       TAO_OPERATION_ARGLIST_PROXY_IMPL_XH,    // Proxy impl arg list generation
       // in client/server  header
@@ -142,7 +141,7 @@ public:
       TAO_ROOT_SI,
       TAO_ROOT_SS,
       TAO_ROOT_TIE_SH,
-      TAO_ROOT_TIE_SS,
+      TAO_ROOT_TIE_SI,
       TAO_ROOT_IH,
       TAO_ROOT_IS,
       TAO_ROOT_ANY_OP_CH,
@@ -257,6 +256,9 @@ public:
   int start_server_inline (const char *fname);
   // Set the server inline stream.
 
+  int start_server_template_inline (const char *fname);
+  // Set the server template inline stream.
+
   int start_server_skeletons (const char *fname);
   // Set the server skeletons stream.
 
@@ -294,6 +296,9 @@ public:
   int end_server_template_header (void);
   // Put a last #endif in the server template header.
 
+  int end_server_template_inline (void);
+  // Put a last #endif in the server template header.
+
   int end_server_template_skeletons (void);
   // Put a last #endif in the server skeletons.
 
@@ -441,6 +446,9 @@ private:
   TAO_OutStream *server_inline_;
   // Server side inline file.
 
+  TAO_OutStream *server_template_inline_;
+  // Server side template inline file.
+
   TAO_OutStream *anyop_header_;
   // Anyop header file.
 
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index fce714cc974..dde2fa8ece3 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -83,7 +83,6 @@ public:
   bool srv_skel_gen (void);
   bool impl_skel_gen (void);
   bool srv_inline_gen (void);
-  bool tie_skel_gen (void);
   bool cli_hdr_any_op_gen (void);
   bool cli_stub_any_op_gen (void);
   bool cli_hdr_cdr_op_gen (void);
@@ -129,7 +128,6 @@ public:
   void srv_skel_gen (bool);
   void impl_skel_gen (bool);
   void srv_inline_gen (bool);
-  void tie_skel_gen (bool);
   void cli_hdr_any_op_gen (bool);
   void cli_stub_any_op_gen (bool);
   void cli_hdr_cdr_op_gen (bool);
@@ -185,7 +183,6 @@ private:
   bool srv_skel_gen_;
   bool impl_skel_gen_;
   bool srv_inline_gen_;
-  bool tie_skel_gen_;
   bool cli_hdr_any_op_gen_;
   bool cli_stub_any_op_gen_;
   bool cli_hdr_cdr_op_gen_;
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 4149c88c881..1c70d2cec26 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -98,6 +98,9 @@ public:
   static const char *be_get_server_inline_fname (
       bool base_name_only = 0
     );
+  static const char *be_get_server_template_inline_fname (
+      bool base_name_only = 0
+    );
   static const char *be_get_anyop_source_fname (
       bool base_name_only = 0
     );
@@ -130,6 +133,8 @@ public:
     );
   static const char *be_get_server_inline (UTL_String *idl_file_name,
                                            bool base_name_only = 0);
+  static const char *be_get_server_template_inline (UTL_String *idl_file_name,
+                                                    bool base_name_only = 0);
   static const char *be_get_anyop_header (UTL_String *idl_file_name,
                                           bool base_name_only = 0);
   static const char *be_get_anyop_source (UTL_String *idl_file_name,
@@ -320,6 +325,12 @@ public:
   const char* server_inline_ending (void) const;
   // Get the server_inline_ending.
 
+  void server_template_inline_ending (const char* s);
+  //  Set the server_template_inline_ending.
+
+  const char* server_template_inline_ending (void) const;
+  // Get the server_template_inline_ending.
+
   void anyop_header_ending (const char* s);
   // Set the anyop_header_ending.
 
@@ -329,12 +340,6 @@ public:
   bool use_clonable_in_args (void) const;
   // Get the clonable_in_args setting.
 
-  bool gen_template_export (void) const;
-  // Get the gen_seq_template_export_ member.
-
-  void gen_template_export (bool val);
-  // Set the gen_seq_template_export_ member.
-
   const char* anyop_header_ending (void) const;
   // Get the anyop_header_ending.
 
@@ -424,6 +429,12 @@ public:
   bool gen_direct_collocation (void) const;
   // Check if we want to generate Direct collocation stubs.
 
+  void exception_support (bool);
+  // Set real C++ exception support.
+
+  bool exception_support (void) const;
+  // Check if real C++ exception support is enabled.
+
   void use_raw_throw (bool);
   // Set replacement of 'ACE_THROW_SPEC' with 'throw'.
 
@@ -650,6 +661,9 @@ private:
   // Server's inline file name ending. Default is "S.i".
   char* server_inline_ending_;
 
+  // Server's template inline file name ending. Default is "S_T.i".
+  char* server_template_inline_ending_;
+
   // Anyop header file name ending. Default is "A.h".
   char* anyop_hdr_ending_;
 
@@ -698,6 +712,9 @@ private:
   bool gen_direct_collocation_;
   // are we generating Direct collocated stubs?
 
+  bool exception_support_;
+  // do we support real C++ exceptions (strict mapping) for stubs/skeletons?
+
   bool use_raw_throw_;
   // Another possible option if the above is TRUE.
 
@@ -785,10 +802,6 @@ private:
 
   bool use_clonable_in_args_;
   // Use in_clonable_arg_val instead of in_arg_val?
-
-  bool gen_template_export_;
-  // Generate explicit export for Visual Studio bug workaround,
-  // needed only in TAO basic sequence *C.h files.
 };
 
 #endif /* _BE_GLOBAL_H */
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index 5e1084712e2..450d1c1a970 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -71,6 +71,30 @@ extern const TAO_UNINDENT be_uidt;
 extern const TAO_UNINDENT be_uidt_nl;
 
 // A structure to inform TAO_OutStream's << operator to
+// conditionally output a newline and some form of "ACE_ENV_*".
+struct TAO_ENV_ARG
+{
+  TAO_ENV_ARG (bool with_defaults = false,
+               bool single = false,
+               bool arg = false,
+               bool not_used = false);
+
+  bool with_defaults_;
+  bool single_;
+  bool arg_;
+  bool not_used_;
+};
+
+extern const TAO_ENV_ARG env_decl;
+extern const TAO_ENV_ARG env_dflts;
+extern const TAO_ENV_ARG env_sngl;
+extern const TAO_ENV_ARG env_sngl_dflts;
+extern const TAO_ENV_ARG env_not;
+extern const TAO_ENV_ARG env_sngl_not;
+extern const TAO_ENV_ARG env_arg;
+extern const TAO_ENV_ARG env_sngl_arg;
+
+// A structure to inform TAO_OutStream's << operator to
 // conditionally output a newline and some form of "ACE_CHECK".
 struct TAO_ACE_CHECK
 {
@@ -81,6 +105,23 @@ struct TAO_ACE_CHECK
   bool do_return_;
 };
 
+// A dummy structure to inform TAO_OutStream's << operator to
+// conditionally output a newline and "ACE_TRY_CHECK".
+struct TAO_ACE_TRY_CHECK
+{
+  TAO_ACE_TRY_CHECK (void);
+};
+
+// A structure to inform TAO_OutStream's << operator to
+// conditionally output a newline and "ACE_ENDTRY.
+struct TAO_ACE_ENDTRY
+{
+  TAO_ACE_ENDTRY (void);
+};
+
+extern const TAO_ACE_TRY_CHECK ace_try_check;
+extern const TAO_ACE_ENDTRY ace_endtry;
+
 class TAO_OutStream
 {
   // =TITLE
@@ -195,6 +236,18 @@ public:
   TAO_OutStream &operator<< (const TAO_INDENT& i);
   TAO_OutStream &operator<< (const TAO_UNINDENT& i);
 
+  TAO_OutStream &operator<< (const TAO_ENV_ARG& i);
+  // Conditional and generic output for all forms of "ACE_ENV_*".
+
+  TAO_OutStream &operator<< (const TAO_ACE_CHECK& i);
+  // Conditional and generic output for all forms of "ACE_CHECK".
+
+  TAO_OutStream &operator<< (const TAO_ACE_TRY_CHECK& i);
+  // Conditional and generic output for all forms of "ACE_ENV_*".
+
+  TAO_OutStream &operator<< (const TAO_ACE_ENDTRY& i);
+  // Conditional and generic output for all forms of "ACE_CHECK".
+
   // The following will be provided by specialized classes
 
   TAO_OutStream &operator<< (Identifier *id);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index 926331cabf7..996495375c7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -39,7 +39,7 @@
 #include "be_visitor_interface/cdr_op_ch.h"
 #include "be_visitor_interface/cdr_op_cs.h"
 #include "be_visitor_interface/tie_sh.h"
-#include "be_visitor_interface/tie_ss.h"
+#include "be_visitor_interface/tie_si.h"
 #include "be_visitor_interface/ami_interface_ch.h"
 #include "be_visitor_interface/smart_proxy_ch.h"
 #include "be_visitor_interface/smart_proxy_cs.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h
new file mode 100644
index 00000000000..b097b77be1a
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h
@@ -0,0 +1,55 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_si.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides the code generation for TIE classes
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_TIE_SI_H_
+#define _BE_INTERFACE_TIE_SI_H_
+
+class be_visitor_interface_tie_si : public be_visitor_interface
+{
+  //
+  // = TITLE
+  //   be_visitor_interface_tie_si
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server inline for operations
+  //   of the TIE class
+  //
+  //
+public:
+  be_visitor_interface_tie_si (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_interface_tie_si (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
+
+  virtual int visit_component (be_component *node);
+  // set the right context and make a visitor
+
+  static int method_helper (be_interface *,
+                            be_interface *,
+                            TAO_OutStream *os);
+  // helper method to generate method declaration in the TIE classes.
+};
+
+#endif /* _BE_INTERFACE_TIE_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
deleted file mode 100644
index 9f6c28b733a..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    tie_ss.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Interface node.
-//    This one provides the code generation for TIE classes
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_INTERFACE_TIE_SS_H_
-#define _BE_INTERFACE_TIE_SS_H_
-
-class be_visitor_interface_tie_ss : public be_visitor_interface
-{
-  //
-  // = TITLE
-  //   be_visitor_interface_tie_ss
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server skeleton for operations
-  //   of the TIE class
-  //
-  //
-public:
-  be_visitor_interface_tie_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface_tie_ss (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // set the right context and make a visitor
-
-  virtual int visit_component (be_component *node);
-  // set the right context and make a visitor
-
-  static int method_helper (be_interface *,
-                            be_interface *,
-                            TAO_OutStream *os);
-  // helper method to generate method declaration in the TIE classes.
-};
-
-#endif /* _BE_INTERFACE_TIE_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
index 3ac422ee3a1..729617814ea 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h
@@ -33,7 +33,7 @@
 #include "be_visitor_operation/operation_ss.h"
 #include "be_visitor_operation/operation_is.h"
 #include "be_visitor_operation/tie_sh.h"
-#include "be_visitor_operation/tie_ss.h"
+#include "be_visitor_operation/tie_si.h"
 #include "be_visitor_operation/arglist.h"
 #include "be_visitor_operation/rettype.h"
 #include "be_visitor_operation/rettype_return_cs.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
index ed29e1d0dbf..062923f54cd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
@@ -61,7 +61,16 @@ public:
   virtual int gen_throw_spec (be_operation *node);
   // generate the throw specification
 
-  virtual int gen_raise_exception (const char *exception_name,
+  virtual int gen_environment_decl (int argument_emitted,
+                                    be_operation *node);
+  // generate the ACE_ENV_ARG declaration, needs to know if there was
+  // at least one argument emitted to deal with all the commas.
+
+  virtual const char *gen_environment_var (void);
+  // generate the environment variable declaration
+
+  virtual int gen_raise_exception (be_type *return_type,
+                                   const char *exception_name,
                                    const char *exception_arguments);
   // helper that generates code for raising an exception
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h
new file mode 100644
index 00000000000..e38012009a7
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h
@@ -0,0 +1,50 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_si.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations for the TIE class inside
+//    the server inline
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_TIE_SI_H_
+#define _BE_VISITOR_OPERATION_TIE_SI_H_
+
+// ***********************************************************************
+// Operation visitor for operation declaration inside the TIE class
+// ***********************************************************************
+
+class be_visitor_operation_tie_si : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_operation_tie_ss
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the operaton inside a TIE class
+  //
+  //
+public:
+  be_visitor_operation_tie_si (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_tie_si (void);
+  // destructor
+
+  virtual int visit_operation (be_operation *node);
+  // set the right context and make a visitor
+};
+
+#endif /* _BE_VISITOR_OPERATION_TIE_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
deleted file mode 100644
index 20e055a6a14..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    tie_ss.h
-//
-// = DESCRIPTION
-//    Visitor for generating code for IDL operations for the TIE class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_OPERATION_TIE_SS_H_
-#define _BE_VISITOR_OPERATION_TIE_SS_H_
-
-// ***********************************************************************
-// Operation visitor for operation declaration inside the TIE class
-// ***********************************************************************
-
-class be_visitor_operation_tie_ss : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_tie_ss
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the operaton inside a TIE class
-  //
-  //
-public:
-  be_visitor_operation_tie_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_tie_ss (void);
-  // destructor
-
-  virtual int visit_operation (be_operation *node);
-  // set the right context and make a visitor
-};
-
-#endif /* _BE_VISITOR_OPERATION_TIE_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_template_export.h b/TAO/TAO_IDL/be_include/be_visitor_template_export.h
deleted file mode 100644
index 1f74232c376..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_template_export.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// $Id$
-//
-
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_template_export.h
-//
-// = DESCRIPTION
-//    This visitor generates an explicit export of a sequence's
-//    template base class. It is conditionally launched by a
-//    command line option and is motivated by a bug in Visual
-//    Studio C++ (.NET 2002, .NET 2003, and Express 2005), documented in
-//    http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
-
-#ifndef TAO_BE_VISITOR_TEMPLATE_EXPORT_H
-#define TAO_BE_VISITOR_TEMPLATE_EXPORT_H
-
-#include "be_visitor_scope.h"
-
-class AST_Interface;
-
-class be_visitor_template_export : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_template_export
-  //
-  // = DESCRIPTION
-  //   Generates sequence template base class export instantiation.
-  //
-public:
-  be_visitor_template_export (be_visitor_context *ctx);
-
-  virtual ~be_visitor_template_export (void);
-
-  virtual int visit_root (be_root *node);
-
-  virtual int visit_module (be_module *node);
-
-  virtual int visit_typedef (be_typedef *node);
-
-  virtual int visit_sequence (be_sequence *node);
-};
-
-
-#endif // TAO_BE_VISITOR_TEMPLATE_EXPORT_H
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 297b6225517..bd95dc82e02 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -1308,6 +1308,8 @@ DRV_pre_proc (const char *myfile)
       throw FE_Bailout ();
     }
 
+#if !defined (ACE_WIN32) || defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
+
   if (ACE_OS::unlink (t_file) == -1)
     {
       ACE_ERROR ((LM_ERROR,
@@ -1318,6 +1320,7 @@ DRV_pre_proc (const char *myfile)
       idl_global->set_err_count (idl_global->err_count () + 1);
       throw FE_Bailout ();
     }
+#endif /* ACE_HAS_WINNT4 && ACE_HAS_WINNT4 != 0 */
 
   if (idl_global->compile_flags () & IDL_CF_ONLY_PREPROC)
     {
diff --git a/TAO/TAO_IDL/fe/fe_declarator.cpp b/TAO/TAO_IDL/fe/fe_declarator.cpp
index e468dccd100..d2cd1dc777d 100644
--- a/TAO/TAO_IDL/fe/fe_declarator.cpp
+++ b/TAO/TAO_IDL/fe/fe_declarator.cpp
@@ -78,9 +78,9 @@ ACE_RCSID (fe,
 
 FE_Declarator::FE_Declarator (UTL_ScopedName *n,
                               DeclaratorType dt,
-                              AST_Decl *cp)
+			                        AST_Decl *cp)
  : pd_complex_part (cp),
-   pd_decl_type (dt)
+	 pd_decl_type (dt)
 {
   this->pd_name = n;
 }
@@ -103,7 +103,7 @@ FE_Declarator::compose (AST_Decl *d)
         }
     }
 
-  AST_Array  *arr = 0;
+  AST_Array	*arr = 0;
   AST_Type *ct = 0;
 
   ct = AST_Type::narrow_from_decl (d);
@@ -118,6 +118,9 @@ FE_Declarator::compose (AST_Decl *d)
   // not have a different prefix from the place of declaration.
   if (!ct->is_defined ())
     {
+      char *current_prefix = 0;
+      idl_global->pragma_prefixes ().top (current_prefix);
+
       const char *original_prefix = d->prefix ();
       AST_Decl *scope = d;
 
@@ -126,7 +129,7 @@ FE_Declarator::compose (AST_Decl *d)
         {
           scope = ScopeAsDecl (scope->defined_in ());
 
-          // Are we at global scope?
+          // Are we at global scope.8
           if (scope == 0)
             {
               break;
@@ -141,14 +144,6 @@ FE_Declarator::compose (AST_Decl *d)
           d->prefix (const_cast<char *> (original_prefix));
         }
 
-      // (JP) This could give a bogus error, since typeprefix can
-      // appear any time after the corresponding declaration.
-      // The right way to do this is with a separate traversal
-      // after the entire AST is built.
-      /*
-      char *current_prefix = 0;
-      idl_global->pragma_prefixes ().top (current_prefix);
-
       if (current_prefix != 0
           && ACE_OS::strcmp (current_prefix, d->prefix ()) != 0)
         {
@@ -157,7 +152,6 @@ FE_Declarator::compose (AST_Decl *d)
 
           return 0;
         }
-      */
     }
 
   if (this->pd_decl_type == FD_simple || this->pd_complex_part == 0)
@@ -168,17 +162,17 @@ FE_Declarator::compose (AST_Decl *d)
   if (this->pd_complex_part->node_type () == AST_Decl::NT_array)
     {
       arr = AST_Array::narrow_from_decl (this->pd_complex_part);
-
+      
       // The base type of an array isn't set until after the array
       // has been created, so the check below gets done at this point.
-      arr->set_base_type (ct);
+      arr->set_base_type (ct);      
       AST_Decl::NodeType nt = ct->unaliased_type ()->node_type ();
-
+      
       if (nt == AST_Decl::NT_string || nt == AST_Decl::NT_wstring)
         {
           idl_global->string_member_seen_ = true;
         }
-
+        
       return arr;
     }
 
diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp
index cea2130e68d..98333812e98 100644
--- a/TAO/TAO_IDL/fe/fe_lookup.cpp
+++ b/TAO/TAO_IDL/fe/fe_lookup.cpp
@@ -56,7 +56,7 @@ TAO_IDL_CPP_Keyword_Table::hash (const char *str, unsigned int len)
   return len + asso_values[(int) str[1]] + asso_values[(int) str[0]] + asso_values[(int) str[len - 1]];
 }
 
-const TAO_IDL_CPP_Keyword_Entry *
+const struct TAO_IDL_CPP_Keyword_Entry *
 TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
 {
   enum
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 598d764391b..07a4ee9d2c2 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -212,22 +212,22 @@ oneway          return IDL_ONEWAY;
     }
   else
     {
-      yylval.strval = ACE::strnew (ace_yytext);
+      yylval.strval = ACE:strnew (ace_yytext);
     }
 
   return IDENTIFIER;
 }
 
-("-"[ \t]*)?(([0-9]+"."[0-9]*)|("."[0-9]+))([eE][+-]?[0-9]+)?[lLfF]?      {
+"-"?(([0-9]+"."[0-9]*)|("."[0-9]+))([eE][+-]?[0-9]+)?[lLfF]?      {
                   yylval.dval = idl_atof(ace_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
-("-"[ \t]*)?[0-9]+[eE][+-]?[0-9]+[lLfF]?  {
+"-"?[0-9]+[eE][+-]?[0-9]+[lLfF]?  {
                   yylval.dval = idl_atof(ace_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
 
-"-"[ \t]*[1-9][0-9]* {
+"-"[1-9][0-9]*  {
                   yylval.ival = idl_atoi(ace_yytext, 10);
                   return IDL_INTEGER_LITERAL;
                 }
@@ -235,15 +235,15 @@ oneway          return IDL_ONEWAY;
                   yylval.uival = idl_atoui(ace_yytext, 10);
                   return IDL_UINTEGER_LITERAL;
                 }
-"-"[ \t]*0[xX][a-fA-F0-9]+ {
+"-"0[xX][a-fA-F0-9]+ {
                   yylval.ival = idl_atoi(ace_yytext, 16);
                   return IDL_INTEGER_LITERAL;
                 }
-0[xX][a-fA-F0-9]+ {
+0[xX][a-fA-F0-9]+    {
                   yylval.uival = idl_atoui(ace_yytext, 16);
                   return IDL_UINTEGER_LITERAL;
                 }
-"-"[ \t]*0[0-7]* {
+"-"0[0-7]*      {
                   yylval.ival = idl_atoi(ace_yytext, 8);
                   return IDL_INTEGER_LITERAL;
                 }
@@ -563,30 +563,14 @@ idl_store_pragma (char *buf)
         {
           unsigned long depth = idl_global->scopes ().depth ();
 
-          // We replace the prefix only if there is a prefix already
-          // associated with this file, otherwise we add the prefix.
-          char *ext_id = idl_global->filename ()->get_string ();
-          char *int_id = 0;
-          int status = idl_global->file_prefixes ().find (ext_id,
-                                                          int_id);
-
-          if (status == 0)
+          // At global scope, we always replace the prefix. For all
+          // other scopes, we replace only if there is a prefix already
+          // associated with that scope, otherwise we add the prefix.
+          if (depth == 1 || idl_global->scopes ().top ()->has_prefix ())
             {
-              if (ACE_OS::strcmp (int_id, "") != 0)
-                {
-                  char *trash = 0;
-                  idl_global->pragma_prefixes ().pop (trash);
-                  delete [] trash;
-                }
-              else if (depth == 1)
-                {
-                  // Remove the default "" and bind the new prefix.
-                  (void) idl_global->file_prefixes ().unbind (ext_id);
-                  ext_id = ACE::strnew (ext_id);
-                  int_id = ACE::strnew (new_prefix);
-                  (void) idl_global->file_prefixes ().bind (ext_id,
-                                                            int_id);
-                }
+              char *trash = 0;
+              idl_global->pragma_prefixes ().pop (trash);
+              delete [] trash;
             }
 
           UTL_Scope *top_scope = idl_global->scopes ().top ();
@@ -599,24 +583,19 @@ idl_store_pragma (char *buf)
 
           idl_global->pragma_prefixes ().push (new_prefix);
 
-          if (depth == 1)
-            {
-              idl_global->root ()->prefix (new_prefix);
-            }
-                
           if (idl_global->in_main_file ())
             {
+              idl_global->root ()->prefix (new_prefix);
               idl_global->root ()->set_imported (false);
               top_scope->has_prefix (true);
             }
 
-          if (status != 0)
-            {
-              ext_id = ACE::strnew (ext_id);
-              int_id = ACE::strnew (new_prefix);
-              (void) idl_global->file_prefixes ().bind (ext_id,
-                                                        int_id);
-            }
+          ACE_CString ext_id;
+          ext_id.set (idl_global->filename ()->get_string (),
+                      0);
+          char *int_id = ACE::strnew (new_prefix);
+          (void) idl_global->file_prefixes ().rebind (ext_id,
+                                                      int_id);
         }
     }
   else if (ACE_OS::strncmp (buf + 8, "version", 7) == 0)
@@ -635,15 +614,6 @@ idl_store_pragma (char *buf)
           number = ACE_OS::strchr (tmp, '\t');
         }
 
-      // Most likely this means there is only a version number
-      // without an identifier to apply it to.
-      if (number == 0)
-        {
-          const char *msg = "no identifier or scoped name";
-          idl_global->err ()->version_syntax_error (msg);
-          return;
-        }
-
       while (*number == ' ' || *number == '\t')
         {
           ++number;
@@ -746,12 +716,7 @@ static long
 idl_atoi(char *s, long b)
 {
   long    r = 0;
-
-  // Skip over the dash and possibly spaces after the dash
-  while (*s == '-' || *s == ' ' || *s == '\t')
-    {
-      s++;
-    }
+  s++;
 
   if (b == 8 && *s == '0')
     {
@@ -838,12 +803,7 @@ idl_atof (char *s)
   if (*s == '-')
     {
       neg = 1;
-      
-      // Skip over the dash and possibly spaces after the dash
-      while (*s == '-' || *s == ' ' || *s == '\t')
-        {
-          s++;
-        }
+      s++;
     }
 
   while (*s >= '0' && *s <= '9')
@@ -1121,10 +1081,10 @@ idl_find_node (char *s)
   if (d == 0)
     {
       idl_global->err ()->lookup_error (node);
+      node->destroy ();
+      delete node;
+      node = 0;
     }
 
-  node->destroy ();
-  delete node;
-  node = 0;
   return d;
 }
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 2fa29d706dd..139048eb2be 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -1026,33 +1026,23 @@ value_box_decl
                 }
 
               if (tp == 0)
-                {
-                  // The <type_spec> given is a valid type
+                { // The <type_spec> given is a valid type
                   idl_global->err ()->not_a_type ($2);
                 }
+              else if (tp->node_type() == AST_Decl::NT_valuetype)
+                { // valuetype is not allowed as <type_spec> for boxed value
+                  idl_global->err ()->error0 (
+                      UTL_Error::EIDL_ILLEGAL_BOXED_TYPE
+                    );
+                }
               else
                 {
-                  AST_Decl::NodeType nt = tp->node_type ();
-                  
-                  if (nt == AST_Decl::NT_valuetype
-                      || nt == AST_Decl::NT_eventtype)
-                    {
-                      // valuetype is not allowed as <type_spec>
-                      // for boxed value
-                      idl_global->err ()->error0 (
-                          UTL_Error::EIDL_ILLEGAL_BOXED_TYPE
-                        );
-                    }
-                  else
-                    {
-                      /*
-                      * Add the valuebox to its definition scope
-                      */
-                      AST_ValueBox *vb =
-                        idl_global->gen ()->create_valuebox (&n,
-                                                             tp);
-                      (void) s->fe_add_valuebox (vb);
-                    }
+                  /*
+                  * Add the valuebox to its definition scope
+                  */
+                  AST_ValueBox *vb = idl_global->gen ()->create_valuebox (&n,
+                                                                          tp);
+                  (void) s->fe_add_valuebox (vb);
                 }
             }
               
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 43423a53333..58b9b5fbbd1 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -1,4 +1,4 @@
-/* A lexical scanner generated by flex */
+/* A lexical scanner generated by flex  */
 
 /* Scanner skeleton version:
  * $Id$
@@ -284,69 +284,69 @@ 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[559] =
+static tao_yyconst short int tao_yy_accept[558] =
     {   0,
       101,  101,  105,  103,  101,  102,  102,  103,  103,  103,
       103,  103,   76,   72,  103,  103,  103,   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,  101,  103,  102,  101,    0,   77,    0,    0,
-        0,    0,    0,   75,   71,   69,  100,    0,   69,   76,
-        0,    0,    0,   72,   67,   65,   66,   68,   68,    0,
-        0,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+        0,    0,   75,   71,   69,  100,    0,   69,   76,    0,
+        0,    0,   72,   67,   65,   66,   68,   68,    0,    0,
        68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-       68,   68,   68,   62,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   62,   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,   68,  101,
-        0,    0,   95,    0,    0,    0,    0,    0,    0,    0,
-       77,    0,    0,    0,   79,    0,   79,    0,    0,   75,
-        0,   71,    0,   69,    0,   99,   99,   69,    0,   70,
-       74,   68,    0,   78,    0,    0,    0,   68,   68,   68,
-        1,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,  101,    0,
+        0,   95,    0,    0,    0,    0,    0,    0,    0,   77,
+        0,    0,    0,   79,    0,   79,    0,    0,   75,    0,
+       71,    0,   69,    0,   99,   99,   69,    0,   70,   74,
+       68,    0,   78,    0,    0,    0,   68,   68,   68,    1,
+       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,   68,   68,   68,   68,   68,
-       68,   63,   68,   68,   68,   68,   68,   68,   68,   68,
+       63,   68,   68,   68,   68,   68,   68,   68,   68,   68,
 
        68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-       68,   68,    0,    0,    0,    0,    0,    0,    0,    0,
-       82,   80,    0,    0,   73,    0,   69,   70,   68,   78,
-        0,    0,    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,   68,   68,   68,   68,   68,
+       68,    0,    0,    0,    0,    0,    0,    0,    0,   82,
+       80,    0,    0,   73,    0,   69,   70,   68,   78,    0,
+        0,    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,   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,    0,   80,    0,   81,
-        0,   60,    0,    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,
-       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,   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,
-       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,   68,   68,   68,   68,   57,   68,   31,   68,
+       68,    0,    0,    0,    0,    0,    0,    0,   96,    0,
+
+        0,    0,    0,    0,    0,    0,   80,    0,   81,    0,
+       60,    0,    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,   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,
+       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,   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] =
@@ -391,143 +391,143 @@ static tao_yyconst int tao_yy_meta[60] =
         7,    8,    7,    8,    9,    8,    7,    8,    7
     } ;
 
-static tao_yyconst short int tao_yy_base[587] =
+static tao_yyconst short int tao_yy_base[586] =
     {   0,
-        0,   58, 1102, 1103,   59, 1103, 1103,   56, 1067,   66,
-       58,   57,   71,   77, 1083, 1081, 1078,    0, 1075,   61,
-     1060, 1066,   40, 1045,   63,   57,   55,   74, 1054, 1043,
-       52, 1042,   72, 1055,   60,   67,   89,   84,   25,   77,
-       96,   95,  135,  147, 1068,  131,  137,  151,  120, 1080,
-      150,  164,  158,  170,  186,  215, 1103,  156,  190,  199,
-      220,  206,    0,  233, 1103, 1103, 1103,    0, 1060,  141,
-     1052, 1041, 1052, 1030, 1023, 1027, 1031, 1026, 1043,  107,
-     1024, 1036, 1020, 1031, 1018, 1033, 1034, 1033,  133, 1020,
-     1014, 1020, 1016,  158,  151, 1017, 1026, 1017, 1008, 1007,
-
-     1021, 1005,  146, 1022, 1014, 1021,  116, 1006, 1002, 1003,
-     1009,  996, 1000,  184, 1010, 1002, 1004, 1004,  991,  251,
-        0,  178, 1103, 1038,  259, 1000, 1004,  998,  988, 1020,
-      263,  237,  244,  270, 1103, 1030, 1029,  252, 1028,  267,
-        0,  274,  285, 1103,  289, 1103,  299,    0,  293,  300,
-        0, 1005,  271,  292,  297, 1026,  262,  994, 1008,  977,
-        0,  978,  983,  989,  975,  976,  198,  971,  989,  987,
-      968,  974,  972,  980,  964,  979,  977,  980,  962,  974,
-      963,  956,  971,  974,  967,  972,  951,  951,  961,  964,
-      945,    0,  274,  945,  954,  946,  960,  942,  944,  943,
-
-      279,  944,  939,  944,  952,  941,  946,  935,  932,  948,
-      950,  932,  977,  976,  935,  941,  931,  943,  351,  317,
-     1103, 1103,  321,  969,    0,  323,  333, 1103,  952,  357,
-      969,  327,  362,    0, 1103,    0,  937,    0,  921,  929,
-      932,    0,    0,  921,  287,  930,  919,  912,  920,  912,
-        0,  910,  913,  913,  922,  922,  905,  923,    0,  905,
-      902,  903,  908,    0,  912,  906,  908,  894,  895,  913,
-      912,  911,  902,  901,  904,  893,  902,  905,  885,  890,
-      900,  887,  898,  897,  307,  885,  891,    0,  892,    0,
-      878,  886,  922,  366,  888,  878,  886,  883,  877, 1103,
-
-      318,  395,  879,  883,  877,  867,  368, 1103,  910, 1103,
-      909,    0,  374,  411,  908,  861,  879,  877,  877,  863,
-        0,  863,  851,  861,  861,  867,    0,  851,  850,  851,
-      850,    0,    0,  858,  846,    0,  859,    0,  859,  858,
-      846,  856,    0,  835,  841,  838,  853,  291,  837,  841,
-      840,  844,    0,  845,  831,  832,  841,  847,  842,  842,
-      827,    0,  830,  823,    0,  828, 1103,  416,  373,  821,
-      390,  827,  867,  866,  825,  831,  821,  833,  379,  438,
-     1103,  859,    0,  829,  810,  816,  824,  823,  807,    0,
-      806,    0,  800,  815,  798,    0,  803,    0,  820,  693,
-
-        0,  699,    0,    0,  670,  661,  658,    0,  654,    0,
-      634,  631,  613,    0,    0,  611,    0,  610,  622,    0,
-      621,  619,  597,  613,  465, 1103,  480,  419,  381,  488,
-      503,  612,  627,  438,  586,  570,  573,  552,  511,  584,
-      525,  519,    0,  524,  518,    0,    0,  520,  490,    0,
-      498,  495,    0,  492,  485,    0,  475,  484,  463,  477,
-      461,  446,  457,    0,  447,  428,  415,    0,  538,  435,
-     1103,  468,  494,  508, 1103,  458,  388, 1103,  553,  410,
-      390,  561,  381,  423,  416,    0,  375,  353,    0,  364,
-      334,  328,  324,    0,  304,    0,  273,    0,    0,  265,
-
-        0,  251,  203,    0,  202,  517, 1103,  541,  227,  557,
-      561,  581, 1103,  585,  577,  453,  589,  605,  608,  191,
-        0,    0,    0,    0,    0,    0,  160,    0,    0,  150,
-      134,    0,  605, 1103,  611,  613,  627, 1103,  632,  634,
-      140,  138,  486,    0,   75,    0,  636, 1103,  638,   69,
-      640,  642,    0, 1103,  646, 1103,  648, 1103,  669,  678,
-      683,  690,  698,  707,  712,  718,  727,  733,  735,  739,
-      748,  754,  756,  758,  761,  767,  773,  779,  785,  791,
-      800,  809,  818,  827,  836,  845
+        0,   58, 1094, 1095,   59, 1095, 1095,   56, 1059,   54,
+       57,   65,   68,   73, 1075, 1073, 1070,    0, 1067,   69,
+     1052, 1058,   45, 1037,   56,   37,   48,   67, 1046, 1035,
+       61, 1034,   65, 1047,   79,   63,   82,   83,   71,   71,
+       93,   92,  134,  144, 1060,  130,   97,  148,  129, 1072,
+      147,  152,  158,  184,  210, 1095,  148,  161,  197,  203,
+      229,    0,  239, 1095, 1095, 1095,    0, 1052,  151, 1044,
+     1033, 1044, 1022, 1015, 1019, 1023, 1018, 1035,  116, 1016,
+     1028, 1012, 1023, 1010, 1025, 1026, 1025,  123, 1012, 1006,
+     1012, 1008,  129,  155, 1009, 1018, 1009, 1000,  999, 1013,
+
+      997,  146, 1014, 1006, 1013,  150,  998,  994,  995, 1001,
+      988,  992,  167, 1002,  994,  996,  996,  983,  226,    0,
+      192, 1095, 1030,  243,  992,  996,  990,  980, 1012,  260,
+      173,  180,  246, 1095, 1022, 1021,  259, 1020,  267,    0,
+      272,  261, 1095,  286, 1095,  289,    0,  254,  287,    0,
+      997,  196,  292,  284, 1018,  277,  986, 1000,  969,    0,
+      970,  975,  981,  967,  968,  251,  963,  981,  979,  960,
+      966,  964,  972,  956,  971,  969,  972,  954,  966,  955,
+      948,  963,  966,  959,  964,  943,  943,  953,  956,  937,
+        0,  253,  937,  946,  938,  952,  934,  936,  935,  186,
+
+      936,  931,  936,  944,  933,  938,  927,  924,  940,  942,
+      924,  969,  968,  927,  933,  923,  935,  338,  302, 1095,
+     1095,  307,  961,    0,  309,  330, 1095,  944,  324,  961,
+      314,  352,    0, 1095,    0,  929,    0,  913,  921,  924,
+        0,    0,  913,  276,  922,  911,  904,  912,  904,    0,
+      902,  905,  905,  914,  914,  897,  915,    0,  897,  894,
+      895,  900,    0,  904,  898,  900,  886,  887,  905,  904,
+      903,  894,  893,  896,  885,  894,  897,  877,  882,  892,
+      879,  890,  889,  318,  877,  883,    0,  884,    0,  870,
+      878,  914,  359,  880,  870,  878,  875,  869, 1095,  289,
+
+      386,  871,  875,  869,  859,  331, 1095,  902, 1095,  901,
+        0,  379,  408,  900,  853,  871,  869,  869,  855,    0,
+      855,  843,  853,  853,  859,    0,  843,  842,  843,  842,
+        0,    0,  850,  838,    0,  851,    0,  851,  850,  838,
+      848,    0,  827,  833,  830,  845,  169,  829,  833,  832,
+      836,    0,  837,  823,  824,  833,  839,  834,  834,  819,
+        0,  822,  815,    0,  820, 1095,  394,  345,  813,  390,
+      819,  859,  858,  817,  823,  813,  825,  343,  435, 1095,
+      851,    0,  821,  802,  808,  816,  815,  799,    0,  798,
+        0,  792,  807,  790,    0,  687,    0,  704,  670,    0,
+
+      648,    0,    0,  632,  651,  635,    0,  620,    0,  614,
+      621,  603,    0,    0,  601,    0,  600,  613,    0,  613,
+      611,  589,  606,  462, 1095,  477,  408,  367,  423,  497,
+      602,  629,  413,  590,  579,  575,  553,  505,  581,  534,
+      521,    0,  526,  520,    0,    0,  509,  509,    0,  493,
+      494,    0,  485,  477,    0,  464,  465,  436,  455,  451,
+      436,  450,    0,  444,  425,  412,    0,  532,  432, 1095,
+      465,  484,  504, 1095,  455,  369, 1095,  547,  377,  402,
+      555,  407,  369,  433,    0,  401,  373,    0,  387,  373,
+      367,  380,    0,  348,    0,  330,    0,    0,  320,    0,
+
+      324,  295,    0,  295,  493, 1095,  512,  322,  535,  551,
+      562, 1095,  577,  581,  450,  585,  601,  581,  283,    0,
+        0,    0,    0,    0,    0,  254,    0,    0,  147,  130,
+        0,  601, 1095,  605,  609,  607, 1095,  615,  617,  150,
+      127,  521,    0,   55,    0,  628, 1095,  630,   61,  636,
+      638,    0, 1095,  640, 1095,  642, 1095,  663,  672,  677,
+      684,  692,  701,  706,  712,  721,  727,  729,  733,  742,
+      748,  750,  752,  755,  761,  767,  773,  779,  785,  794,
+      803,  812,  821,  830,  839
     } ;
 
-static tao_yyconst short int tao_yy_def[587] =
+static tao_yyconst short int tao_yy_def[586] =
     {   0,
-      558,    1,  558,  558,  558,  558,  558,  559,  560,  558,
-      558,  558,  558,  558,  558,  558,  558,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  558,  558,  558,  558,  559,  558,  562,  558,
-      563,  558,  558,  558,  558,  558,  558,  564,   56,  558,
-      558,  558,  565,  558,  558,  558,  558,  561,  561,  566,
-      567,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  558,
-       44,   44,  558,  122,  558,  558,  558,  558,  558,  558,
-      558,  559,  559,  559,  558,  558,  558,  558,  568,  558,
-      569,  558,  558,  558,  564,  558,  564,   59,  558,  558,
-      565,  561,  566,  558,  570,  558,  558,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  571,  558,  558,  558,  558,  558,  558,  559,
-      558,  558,  558,  572,  569,  558,  558,  558,  561,  558,
-      558,  566,  566,  573,  558,  574,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  571,  558,  558,  558,  558,  558,  219,  558,
-
-      219,  558,  558,  558,  558,  558,  559,  558,  558,  558,
-      558,  561,  566,  566,  575,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  558,  558,  558,  558,
-      558,  558,  576,  558,  558,  558,  558,  558,  566,  314,
-      558,  577,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  558,  558,  558,  578,  558,  558,
-      558,  558,  576,  558,  558,  558,  558,  558,  314,  579,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  558,  578,
-      558,  578,  580,  558,  558,  581,  558,  558,  558,  558,
-      558,  558,  558,  566,  558,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-
-      561,  561,  561,  561,  561,  580,  558,  580,  581,  558,
-      582,  558,  558,  558,  583,  558,  558,  558,  558,  558,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  582,  558,  582,  558,  583,  558,  583,  584,
-      585,  558,  558,  561,  561,  561,  584,  558,  584,  585,
-      558,  586,  561,  558,  586,  558,  586,    0,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558
+      557,    1,  557,  557,  557,  557,  557,  558,  559,  557,
+      557,  557,  557,  557,  557,  557,  557,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  557,  557,  557,  557,  558,  557,  561,  557,
+      562,  557,  557,  557,  557,  557,  563,   55,  557,  557,
+      557,  564,  557,  557,  557,  557,  560,  560,  565,  566,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  557,   44,
+       44,  557,  121,  557,  557,  557,  557,  557,  557,  557,
+      558,  558,  558,  557,  557,  557,  557,  567,  557,  568,
+      557,  557,  557,  563,  557,  563,   58,  557,  557,  564,
+      560,  565,  557,  569,  557,  557,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  570,  557,  557,  557,  557,  557,  557,  558,  557,
+      557,  557,  571,  568,  557,  557,  557,  560,  557,  557,
+      565,  565,  572,  557,  573,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  570,  557,  557,  557,  557,  557,  218,  557,  218,
+
+      557,  557,  557,  557,  557,  558,  557,  557,  557,  557,
+      560,  565,  565,  574,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  557,  557,  557,  557,  557,
+      557,  575,  557,  557,  557,  557,  557,  565,  313,  557,
+      576,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  557,  557,  557,  577,  557,  557,  557,
+      557,  575,  557,  557,  557,  557,  557,  313,  578,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  557,  577,  557,
+      577,  579,  557,  557,  580,  557,  557,  557,  557,  557,
+      557,  557,  565,  557,  560,  560,  560,  560,  560,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+
+      560,  560,  560,  560,  579,  557,  579,  580,  557,  581,
+      557,  557,  557,  582,  557,  557,  557,  557,  557,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+      560,  581,  557,  581,  557,  582,  557,  582,  583,  584,
+      557,  557,  560,  560,  560,  583,  557,  583,  584,  557,
+      585,  560,  557,  585,  557,  585,    0,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557
     } ;
 
-static tao_yyconst short int tao_yy_nxt[1163] =
+static tao_yyconst short int tao_yy_nxt[1155] =
     {   0,
         4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
        10,   11,   12,   13,   14,   14,   15,   16,    4,   17,
@@ -535,131 +535,130 @@ static tao_yyconst short int tao_yy_nxt[1163] =
        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,   57,   70,   52,   71,   58,
-       52,   56,   56,   56,  551,   74,  112,   53,   45,   54,
-       55,   55,   59,  113,   60,   60,   61,   75,   59,   49,
-       64,   64,   64,   76,   62,   82,  100,   78,   93,   94,
-
-       62,   84,   85,   63,   79,   83,   96,  101,   88,   62,
-       86,   80,   87,  553,  102,   62,   89,   81,  103,   90,
-       97,  104,  107,  105,  114,  108,   98,  106,   63,  115,
-      116,  118,   46,  134,  134,   46,  120,  109,  110,  120,
-      111,  121,   48,  541,  117,  551,  154,  119,  122,  123,
-      123,  124,  131,  166,  167,  131,  132,  137,  146,  147,
-      125,  125,  125,  138,  138,   52,  198,  123,   52,  199,
-       49,   56,   56,   56,  155,   53,  147,   54,   55,   55,
-      176,   59,  139,  140,  140,   61,  126,  184,  193,  127,
-      177,  546,  128,   62,  194,  545,  129,   59,  185,  142,
-
-      142,  142,  141,  148,  148,  148,  182,  139,   62,   62,
-       59,  183,   60,   60,   61,  149,  149,  558,  544,  150,
-      150,  150,   62,  558,   62,  543,  206,  141,   56,   56,
-       56,   59,  510,   61,   61,   61,  207,   62,  143,  144,
-      532,  144,   48,   62,   59,  531,   64,   64,   64,   48,
-      245,  246,  120,  143,  144,  120,   62,  121,   62,  222,
-      144,  123,  123,  214,  131,  223,  223,  131,  132,  235,
-       49,   62,  125,  125,  125,   48,  154,   49,   59,  123,
-      140,  140,   61,  220,  220,   59,  530,  142,  142,  142,
-       62,  146,  147,  230,  226,  226,  230,   62,  227,  227,
-
-      227,  146,  147,   49,  155,   62,  150,  150,  150,  147,
-      233,  233,   62,  150,  150,  150,  236,  529,  231,  147,
-      271,  280,   48,  373,  228,  528,  228,  408,  308,  272,
-      307,  307,  154,  281,  309,  309,  227,  227,  227,  228,
-      321,  322,  527,  409,  359,  228,  227,  227,  227,  360,
-       49,  234,  299,  300,  300,  301,  361,  144,  230,  144,
-      155,  230,  526,  558,  302,  302,  302,  154,  367,  367,
-      368,  300,  144,   48,  428,  313,  313,  428,  144,  154,
-      525,  524,  473,  231,  154,  473,  367,  379,  379,  511,
-      303,  430,  511,  304,  430,  155,  305,  300,  300,  374,
-
-      306,   49,  523,  431,  431,  431,  522,  155,  302,  302,
-      302,  515,  155,  521,  515,  300,  154,  425,  426,  426,
-      425,  471,  472,  381,  380,  380,  380,  520,  154,  427,
-      427,  427,  380,  380,  380,  380,  426,  471,  472,  472,
-      478,  478,  479,  516,  155,  380,  380,  380,  380,  380,
-      380,  439,  439,  439,  540,  472,  155,  540,  478,  439,
-      439,  439,  439,  510,  505,  504,  425,  426,  426,  425,
-      471,  472,  439,  439,  439,  439,  439,  439,  469,  469,
-      469,  425,  426,  426,  425,  426,  503,  552,  472,  430,
-      552,  502,  430,  427,  427,  427,  507,  508,  501,  500,
-
-      426,  431,  431,  431,  474,  475,  475,  474,  476,  474,
-      475,  475,  474,  476,  508,  499,  431,  431,  431,  507,
-      508,  498,  497,  475,  484,  484,  484,  496,  475,  495,
-      494,  493,  484,  484,  484,  484,  492,  508,  491,  425,
-      426,  426,  425,  507,  508,  484,  484,  484,  484,  484,
-      484,  469,  469,  469,  512,  513,  513,  512,  426,  475,
-      475,  508,  517,  534,  535,  518,  514,  514,  514,  490,
-      489,  488,  487,  513,  519,  519,  519,  475,  486,  538,
-      539,  535,  512,  513,  513,  512,  512,  513,  513,  512,
-      517,  381,  483,  518,  536,  536,  536,  539,  514,  514,
-
-      514,  513,  519,  519,  519,  513,  517,  534,  535,  518,
-      541,  482,  542,  534,  535,  513,  513,  481,  519,  519,
-      519,  519,  519,  519,  480,  535,  536,  536,  536,  538,
-      539,  535,  434,  513,  538,  539,  548,  549,  548,  549,
-      548,  549,  554,  554,  556,  557,  477,  539,  556,  557,
-      556,  557,  539,  468,  549,  467,  549,  466,  549,  465,
-      554,  464,  557,  463,  462,  461,  557,  460,  557,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   50,  459,
-       50,   50,   50,   50,   50,   50,   50,   68,   68,   68,
-       68,   68,  133,  133,  133,  458,  457,  133,  136,  456,
-
-      136,  136,  136,  136,  136,  136,  136,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  151,  151,  153,  153,
-      153,  153,  153,  153,  153,  153,  153,  156,  455,  156,
-      156,  156,  156,  156,  156,  156,  224,  224,  224,  225,
-      225,  232,  232,  232,  454,  453,  232,  232,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  311,  311,  311,
-      314,  314,  315,  315,  382,  382,  382,  433,  433,  433,
-      433,  433,  433,  433,  433,  433,  440,  440,  440,  470,
-      470,  470,  470,  470,  470,  470,  470,  470,  485,  485,
-      485,  506,  506,  506,  506,  506,  506,  506,  506,  506,
-
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  547,  547,  547,
-      547,  547,  547,  547,  547,  547,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  452,  451,  450,  449,  448,  447,
-      446,  445,  444,  443,  442,  441,  381,  438,  437,  436,
-      435,  373,  434,  432,  429,  424,  423,  422,  421,  420,
-      419,  418,  417,  416,  415,  414,  413,  412,  411,  410,
-      407,  406,  405,  404,  403,  402,  401,  400,  399,  398,
-
-      397,  396,  395,  394,  393,  392,  391,  390,  389,  388,
-      387,  386,  385,  384,  383,  381,  310,  308,  378,  377,
-      376,  375,  558,  372,  371,  370,  369,  294,  366,  365,
-      364,  363,  362,  358,  357,  356,  355,  354,  353,  352,
-      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,  320,
-      319,  318,  317,  316,   70,  312,  310,  298,  297,  296,
-      295,  213,  294,  292,  291,  290,  289,  288,  287,  286,
-      285,  284,  283,  282,  279,  278,  277,  276,  275,  274,
-
-      273,  270,  269,  268,  267,  266,  265,  264,  263,  262,
-      261,  260,  259,  258,  257,  256,  255,  254,  253,  252,
-      251,  250,  249,  248,  247,  244,  243,  242,  241,  240,
-      239,  238,  237,  235,  229,  221,  221,  221,  219,  218,
-      217,  216,  215,  213,  212,  211,  210,  209,  208,  205,
-      204,  203,  202,  201,  200,  197,  196,  195,  192,  191,
-      190,  189,  188,  187,  186,  181,  180,  179,  178,  175,
-      174,  173,  172,  171,  170,  169,  168,  165,  164,  163,
-      162,  161,  160,  159,  158,  157,  152,  135,  130,   99,
-       95,   92,   91,   77,   73,   72,   69,   67,   66,   65,
-
-       51,  558,    3,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558
+       46,   48,   43,   46,   44,   52,  550,   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,  552,   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,
+      105,  106,  111,  114,  107,   62,  100,  115,  117,  112,
+       49,   46,  540,  101,   46,  119,  108,  109,  119,  110,
+      120,  116,  133,  133,  118,  121,  122,  122,  123,  130,
+      145,  146,  130,  131,  136,  550,  153,  124,  124,  124,
+      137,  137,  165,  166,  122,   55,   55,   55,  146,   58,
+      175,  139,  139,   60,  147,  147,  147,  181,   48,  138,
+      176,   61,  182,  125,  154,   48,  126,  545,  192,  127,
+      140,  183,  544,  128,  193,   58,   61,  141,  141,  141,
+
+      197,  153,  184,  198,  138,  407,   49,   61,   58,  205,
+       59,   59,   60,   49,   58,  140,   60,   60,   60,  206,
+       61,  408,   61,   55,   55,   55,   61,  119,  279,  154,
+      119,  557,  120,  142,  143,   61,  143,  557,  148,  148,
+      280,   61,  149,  149,  149,  122,  122,  213,  142,  143,
+       58,   48,   63,   63,   63,  143,  124,  124,  124,  219,
+      219,  130,   61,  122,  130,  131,  221,  149,  149,  149,
+      225,  225,  222,  222,  226,  226,  226,   61,   58,   49,
+      139,  139,   60,   58,  234,  141,  141,  141,  145,  146,
+       61,  145,  146,  229,  372,   61,  229,  232,  232,  270,
+
+      149,  149,  149,  244,  245,   61,  146,   48,  271,  146,
+       61,  227,  543,  227,  307,  306,  306,  542,  230,  153,
+      308,  308,  226,  226,  226,  229,  227,  509,  229,  320,
+      321,  235,  227,  531,  557,   49,   48,  530,  233,  298,
+      299,  299,  300,  226,  226,  226,  427,  154,  153,  427,
+      230,  301,  301,  301,  143,  358,  143,  153,  299,  529,
+      359,  366,  366,  367,   49,  312,  312,  360,  472,  143,
+      510,  472,  528,  510,  153,  143,  154,  302,  514,  366,
+      303,  514,  527,  304,  153,  154,  526,  305,  299,  299,
+      373,  429,  378,  378,  429,  424,  425,  425,  424,  301,
+
+      301,  301,  154,  430,  430,  430,  299,  426,  426,  426,
+      470,  471,  154,  153,  425,  477,  477,  478,  525,  524,
+      523,  379,  379,  379,  429,  522,  521,  429,  471,  379,
+      379,  379,  379,  477,  470,  471,  430,  430,  430,  520,
+      380,  154,  379,  379,  379,  379,  379,  379,  438,  438,
+      438,  539,  471,  519,  539,  515,  438,  438,  438,  438,
+      509,  504,  503,  424,  425,  425,  424,  470,  471,  438,
+      438,  438,  438,  438,  438,  468,  468,  468,  424,  425,
+      425,  424,  425,  502,  501,  471,  506,  507,  500,  499,
+      426,  426,  426,  498,  497,  506,  507,  425,  473,  474,
+
+      474,  473,  475,  496,  507,  473,  474,  474,  473,  475,
+      430,  430,  430,  507,  506,  507,  495,  474,  483,  483,
+      483,  494,  551,  493,  474,  551,  483,  483,  483,  483,
+      492,  491,  507,  424,  425,  425,  424,  474,  474,  483,
+      483,  483,  483,  483,  483,  468,  468,  468,  511,  512,
+      512,  511,  425,  533,  534,  474,  516,  490,  489,  517,
+      513,  513,  513,  511,  512,  512,  511,  512,  518,  518,
+      518,  534,  488,  487,  486,  535,  535,  535,  511,  512,
+      512,  511,  512,  537,  538,  541,  516,  485,  380,  517,
+      513,  513,  513,  482,  518,  518,  518,  512,  518,  518,
+
+      518,  538,  516,  533,  534,  517,  540,  533,  534,  537,
+      538,  512,  512,  481,  518,  518,  518,  537,  538,  547,
+      548,  534,  535,  535,  535,  534,  480,  538,  479,  512,
+      547,  548,  547,  548,  433,  538,  476,  548,  553,  553,
+      555,  556,  555,  556,  555,  556,  467,  466,  548,  465,
+      548,  464,  463,  462,  461,  460,  553,  459,  556,  458,
+      556,  457,  556,   47,   47,   47,   47,   47,   47,   47,
+       47,   47,   50,  456,   50,   50,   50,   50,   50,   50,
+       50,   67,   67,   67,   67,   67,  132,  132,  132,  455,
+      454,  132,  135,  453,  135,  135,  135,  135,  135,  135,
+
+      135,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+      150,  150,  152,  152,  152,  152,  152,  152,  152,  152,
+      152,  155,  452,  155,  155,  155,  155,  155,  155,  155,
+      223,  223,  223,  224,  224,  231,  231,  231,  451,  450,
+      231,  231,  292,  292,  292,  292,  292,  292,  292,  292,
+      292,  310,  310,  310,  313,  313,  314,  314,  381,  381,
+      381,  432,  432,  432,  432,  432,  432,  432,  432,  432,
+      439,  439,  439,  469,  469,  469,  469,  469,  469,  469,
+      469,  469,  484,  484,  484,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  508,  508,  508,  508,  508,  508,
+
+      508,  508,  508,  532,  532,  532,  532,  532,  532,  532,
+      532,  532,  536,  536,  536,  536,  536,  536,  536,  536,
+      536,  546,  546,  546,  546,  546,  546,  546,  546,  546,
+      549,  549,  549,  549,  549,  549,  549,  549,  549,  554,
+      554,  554,  554,  554,  554,  554,  554,  554,  449,  448,
+      447,  446,  445,  444,  443,  442,  441,  440,  380,  437,
+      436,  435,  434,  372,  433,  431,  428,  423,  422,  421,
+      420,  419,  418,  417,  416,  415,  414,  413,  412,  411,
+      410,  409,  406,  405,  404,  403,  402,  401,  400,  399,
+      398,  397,  396,  395,  394,  393,  392,  391,  390,  389,
+
+      388,  387,  386,  385,  384,  383,  382,  380,  309,  307,
+      377,  376,  375,  374,  557,  371,  370,  369,  368,  293,
+      365,  364,  363,  362,  361,  357,  356,  355,  354,  353,
+      352,  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,  319,  318,  317,  316,  315,   69,  311,  309,  297,
+      296,  295,  294,  212,  293,  291,  290,  289,  288,  287,
+      286,  285,  284,  283,  282,  281,  278,  277,  276,  275,
+      274,  273,  272,  269,  268,  267,  266,  265,  264,  263,
+
+      262,  261,  260,  259,  258,  257,  256,  255,  254,  253,
+      252,  251,  250,  249,  248,  247,  246,  243,  242,  241,
+      240,  239,  238,  237,  236,  234,  228,  220,  220,  220,
+      218,  217,  216,  215,  214,  212,  211,  210,  209,  208,
+      207,  204,  203,  202,  201,  200,  199,  196,  195,  194,
+      191,  190,  189,  188,  187,  186,  185,  180,  179,  178,
+      177,  174,  173,  172,  171,  170,  169,  168,  167,  164,
+      163,  162,  161,  160,  159,  158,  157,  156,  151,  134,
+      129,   98,   94,   91,   90,   76,   72,   71,   68,   66,
+       65,   64,   51,  557,    3,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557
     } ;
 
-static tao_yyconst short int tao_yy_chk[1163] =
+static tao_yyconst short int tao_yy_chk[1155] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -667,128 +666,127 @@ static tao_yyconst short int tao_yy_chk[1163] =
         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,   12,   20,   10,   20,   12,
-       10,   11,   11,   11,  550,   23,   39,   10,    2,   10,
-       10,   10,   13,   39,   13,   13,   13,   23,   14,    8,
-       14,   14,   14,   23,   13,   26,   35,   25,   31,   31,
-
-       14,   27,   27,   13,   25,   26,   33,   35,   28,   13,
-       27,   25,   27,  545,   35,   14,   28,   25,   36,   28,
-       33,   36,   38,   37,   40,   38,   33,   37,   13,   40,
-       41,   42,   46,   49,   49,   46,   43,   38,   38,   43,
-       38,   43,   47,  542,   41,  541,   70,   42,   44,   44,
-       44,   44,   48,   80,   80,   48,   48,   51,   58,   58,
-       44,   44,   44,   51,   51,   52,  107,   44,   52,  107,
-       47,   53,   53,   53,   70,   52,   58,   52,   52,   52,
-       89,   54,   51,   54,   54,   54,   44,   95,  103,   44,
-       89,  531,   44,   54,  103,  530,   44,   55,   95,   55,
-
-       55,   55,   54,   59,   59,   59,   94,   51,   54,   55,
-       60,   94,   60,   60,   60,   62,   62,  122,  527,   62,
-       62,   62,   60,  122,   55,  520,  114,   54,   56,   56,
-       56,   61,  509,   61,   61,   61,  114,   60,   56,   56,
-      505,   56,  132,   61,   64,  503,   64,   64,   64,  133,
-      167,  167,  120,   56,   56,  120,   64,  120,   61,  138,
-       56,  125,  125,  125,  131,  138,  138,  131,  131,  157,
-      132,   64,  125,  125,  125,  134,  153,  133,  140,  125,
-      140,  140,  140,  134,  134,  142,  502,  142,  142,  142,
-      140,  145,  145,  154,  143,  143,  154,  142,  143,  143,
-
-      143,  147,  147,  134,  153,  140,  149,  149,  149,  145,
-      155,  155,  142,  150,  150,  150,  157,  500,  154,  147,
-      193,  201,  220,  301,  150,  497,  150,  348,  223,  193,
-      220,  220,  232,  201,  223,  223,  226,  226,  226,  150,
-      245,  245,  495,  348,  285,  150,  227,  227,  227,  285,
-      220,  155,  219,  219,  219,  219,  285,  227,  230,  227,
-      232,  230,  493,  301,  219,  219,  219,  233,  294,  294,
-      294,  219,  227,  307,  369,  233,  233,  369,  227,  313,
-      492,  491,  429,  230,  379,  429,  294,  313,  313,  477,
-      219,  371,  477,  219,  371,  233,  219,  302,  302,  302,
-
-      219,  307,  490,  371,  371,  371,  488,  313,  302,  302,
-      302,  480,  379,  487,  480,  302,  314,  368,  368,  368,
-      368,  428,  428,  485,  314,  314,  314,  483,  484,  368,
-      368,  368,  314,  314,  314,  314,  368,  470,  470,  428,
-      434,  434,  434,  481,  314,  314,  314,  314,  314,  314,
-      314,  380,  380,  380,  516,  470,  484,  516,  434,  380,
-      380,  380,  380,  476,  467,  466,  425,  425,  425,  425,
-      472,  472,  380,  380,  380,  380,  380,  380,  425,  425,
-      425,  427,  427,  427,  427,  425,  465,  543,  472,  430,
-      543,  463,  430,  427,  427,  427,  473,  473,  462,  461,
-
-      427,  430,  430,  430,  431,  431,  431,  431,  431,  474,
-      474,  474,  474,  474,  473,  460,  431,  431,  431,  506,
-      506,  459,  458,  431,  439,  439,  439,  457,  474,  455,
-      454,  452,  439,  439,  439,  439,  451,  506,  449,  469,
-      469,  469,  469,  508,  508,  439,  439,  439,  439,  439,
-      439,  469,  469,  469,  479,  479,  479,  479,  469,  510,
-      510,  508,  482,  511,  511,  482,  479,  479,  479,  448,
-      445,  444,  442,  479,  482,  482,  482,  510,  441,  515,
-      515,  511,  512,  512,  512,  512,  514,  514,  514,  514,
-      517,  440,  438,  517,  512,  512,  512,  515,  514,  514,
-
-      514,  512,  517,  517,  517,  514,  518,  533,  533,  518,
-      518,  437,  519,  535,  535,  536,  536,  436,  518,  518,
-      518,  519,  519,  519,  435,  533,  536,  536,  536,  537,
-      537,  535,  433,  536,  539,  539,  540,  540,  547,  547,
-      549,  549,  551,  551,  552,  552,  432,  537,  555,  555,
-      557,  557,  539,  424,  540,  423,  547,  422,  549,  421,
-      551,  419,  552,  418,  416,  413,  555,  412,  557,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  560,  411,
-      560,  560,  560,  560,  560,  560,  560,  561,  561,  561,
-      561,  561,  562,  562,  562,  409,  407,  562,  563,  406,
-
-      563,  563,  563,  563,  563,  563,  563,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  565,  565,  566,  566,
-      566,  566,  566,  566,  566,  566,  566,  567,  405,  567,
-      567,  567,  567,  567,  567,  567,  568,  568,  568,  569,
-      569,  570,  570,  570,  402,  400,  570,  570,  571,  571,
-      571,  571,  571,  571,  571,  571,  571,  572,  572,  572,
-      573,  573,  574,  574,  575,  575,  575,  576,  576,  576,
-      576,  576,  576,  576,  576,  576,  577,  577,  577,  578,
-      578,  578,  578,  578,  578,  578,  578,  578,  579,  579,
-      579,  580,  580,  580,  580,  580,  580,  580,  580,  580,
-
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  582,
-      582,  582,  582,  582,  582,  582,  582,  582,  583,  583,
-      583,  583,  583,  583,  583,  583,  583,  584,  584,  584,
-      584,  584,  584,  584,  584,  584,  585,  585,  585,  585,
-      585,  585,  585,  585,  585,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  399,  397,  395,  394,  393,  391,
-      389,  388,  387,  386,  385,  384,  382,  378,  377,  376,
-      375,  374,  373,  372,  370,  366,  364,  363,  361,  360,
-      359,  358,  357,  356,  355,  354,  352,  351,  350,  349,
-      347,  346,  345,  344,  342,  341,  340,  339,  337,  335,
-
-      334,  331,  330,  329,  328,  326,  325,  324,  323,  322,
-      320,  319,  318,  317,  316,  315,  311,  309,  306,  305,
-      304,  303,  299,  298,  297,  296,  295,  293,  292,  291,
-      289,  287,  286,  284,  283,  282,  281,  280,  279,  278,
-      277,  276,  275,  274,  273,  272,  271,  270,  269,  268,
-      267,  266,  265,  263,  262,  261,  260,  258,  257,  256,
-      255,  254,  253,  252,  250,  249,  248,  247,  246,  244,
-      241,  240,  239,  237,  231,  229,  224,  218,  217,  216,
-      215,  214,  213,  212,  211,  210,  209,  208,  207,  206,
-      205,  204,  203,  202,  200,  199,  198,  197,  196,  195,
-
-      194,  191,  190,  189,  188,  187,  186,  185,  184,  183,
-      182,  181,  180,  179,  178,  177,  176,  175,  174,  173,
-      172,  171,  170,  169,  168,  166,  165,  164,  163,  162,
-      160,  159,  158,  156,  152,  139,  137,  136,  130,  129,
-      128,  127,  126,  124,  119,  118,  117,  116,  115,  113,
-      112,  111,  110,  109,  108,  106,  105,  104,  102,  101,
-      100,   99,   98,   97,   96,   93,   92,   91,   90,   88,
-       87,   86,   85,   84,   83,   82,   81,   79,   78,   77,
-       76,   75,   74,   73,   72,   71,   69,   50,   45,   34,
-       32,   30,   29,   24,   22,   21,   19,   17,   16,   15,
-
-        9,    3,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558
+        5,    8,    2,    5,    2,   10,  549,   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,  544,   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,
+       37,   38,   39,   40,   38,   13,   35,   41,   42,   39,
+       47,   46,  541,   35,   46,   43,   38,   38,   43,   38,
+       43,   41,   49,   49,   42,   44,   44,   44,   44,   48,
+       57,   57,   48,   48,   51,  540,   69,   44,   44,   44,
+       51,   51,   79,   79,   44,   52,   52,   52,   57,   53,
+       88,   53,   53,   53,   58,   58,   58,   93,  131,   51,
+       88,   53,   93,   44,   69,  132,   44,  530,  102,   44,
+       53,   94,  529,   44,  102,   54,   53,   54,   54,   54,
+
+      106,  152,   94,  106,   51,  347,  131,   54,   59,  113,
+       59,   59,   59,  132,   60,   53,   60,   60,   60,  113,
+       59,  347,   54,   55,   55,   55,   60,  119,  200,  152,
+      119,  121,  119,   55,   55,   59,   55,  121,   61,   61,
+      200,   60,   61,   61,   61,  124,  124,  124,   55,   55,
+       63,  133,   63,   63,   63,   55,  124,  124,  124,  133,
+      133,  130,   63,  124,  130,  130,  137,  148,  148,  148,
+      142,  142,  137,  137,  142,  142,  142,   63,  139,  133,
+      139,  139,  139,  141,  156,  141,  141,  141,  144,  144,
+      139,  146,  146,  153,  300,  141,  153,  154,  154,  192,
+
+      149,  149,  149,  166,  166,  139,  144,  219,  192,  146,
+      141,  149,  526,  149,  222,  219,  219,  519,  153,  231,
+      222,  222,  225,  225,  225,  229,  149,  508,  229,  244,
+      244,  156,  149,  504,  300,  219,  306,  502,  154,  218,
+      218,  218,  218,  226,  226,  226,  368,  231,  378,  368,
+      229,  218,  218,  218,  226,  284,  226,  232,  218,  501,
+      284,  293,  293,  293,  306,  232,  232,  284,  428,  226,
+      476,  428,  499,  476,  483,  226,  378,  218,  479,  293,
+      218,  479,  496,  218,  312,  232,  494,  218,  301,  301,
+      301,  370,  312,  312,  370,  367,  367,  367,  367,  301,
+
+      301,  301,  483,  370,  370,  370,  301,  367,  367,  367,
+      427,  427,  312,  313,  367,  433,  433,  433,  492,  491,
+      490,  313,  313,  313,  429,  489,  487,  429,  427,  313,
+      313,  313,  313,  433,  469,  469,  429,  429,  429,  486,
+      484,  313,  313,  313,  313,  313,  313,  313,  379,  379,
+      379,  515,  469,  482,  515,  480,  379,  379,  379,  379,
+      475,  466,  465,  424,  424,  424,  424,  471,  471,  379,
+      379,  379,  379,  379,  379,  424,  424,  424,  426,  426,
+      426,  426,  424,  464,  462,  471,  472,  472,  461,  460,
+      426,  426,  426,  459,  458,  505,  505,  426,  430,  430,
+
+      430,  430,  430,  457,  472,  473,  473,  473,  473,  473,
+      430,  430,  430,  505,  507,  507,  456,  430,  438,  438,
+      438,  454,  542,  453,  473,  542,  438,  438,  438,  438,
+      451,  450,  507,  468,  468,  468,  468,  509,  509,  438,
+      438,  438,  438,  438,  438,  468,  468,  468,  478,  478,
+      478,  478,  468,  510,  510,  509,  481,  448,  447,  481,
+      478,  478,  478,  511,  511,  511,  511,  478,  481,  481,
+      481,  510,  444,  443,  441,  511,  511,  511,  513,  513,
+      513,  513,  511,  514,  514,  518,  516,  440,  439,  516,
+      513,  513,  513,  437,  518,  518,  518,  513,  516,  516,
+
+      516,  514,  517,  532,  532,  517,  517,  534,  534,  536,
+      536,  535,  535,  436,  517,  517,  517,  538,  538,  539,
+      539,  532,  535,  535,  535,  534,  435,  536,  434,  535,
+      546,  546,  548,  548,  432,  538,  431,  539,  550,  550,
+      551,  551,  554,  554,  556,  556,  423,  422,  546,  421,
+      548,  420,  418,  417,  415,  412,  550,  411,  551,  410,
+      554,  408,  556,  558,  558,  558,  558,  558,  558,  558,
+      558,  558,  559,  406,  559,  559,  559,  559,  559,  559,
+      559,  560,  560,  560,  560,  560,  561,  561,  561,  405,
+      404,  561,  562,  401,  562,  562,  562,  562,  562,  562,
+
+      562,  563,  563,  563,  563,  563,  563,  563,  563,  563,
+      564,  564,  565,  565,  565,  565,  565,  565,  565,  565,
+      565,  566,  399,  566,  566,  566,  566,  566,  566,  566,
+      567,  567,  567,  568,  568,  569,  569,  569,  398,  396,
+      569,  569,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  571,  571,  571,  572,  572,  573,  573,  574,  574,
+      574,  575,  575,  575,  575,  575,  575,  575,  575,  575,
+      576,  576,  576,  577,  577,  577,  577,  577,  577,  577,
+      577,  577,  578,  578,  578,  579,  579,  579,  579,  579,
+      579,  579,  579,  579,  580,  580,  580,  580,  580,  580,
+
+      580,  580,  580,  581,  581,  581,  581,  581,  581,  581,
+      581,  581,  582,  582,  582,  582,  582,  582,  582,  582,
+      582,  583,  583,  583,  583,  583,  583,  583,  583,  583,
+      584,  584,  584,  584,  584,  584,  584,  584,  584,  585,
+      585,  585,  585,  585,  585,  585,  585,  585,  394,  393,
+      392,  390,  388,  387,  386,  385,  384,  383,  381,  377,
+      376,  375,  374,  373,  372,  371,  369,  365,  363,  362,
+      360,  359,  358,  357,  356,  355,  354,  353,  351,  350,
+      349,  348,  346,  345,  344,  343,  341,  340,  339,  338,
+      336,  334,  333,  330,  329,  328,  327,  325,  324,  323,
+
+      322,  321,  319,  318,  317,  316,  315,  314,  310,  308,
+      305,  304,  303,  302,  298,  297,  296,  295,  294,  292,
+      291,  290,  288,  286,  285,  283,  282,  281,  280,  279,
+      278,  277,  276,  275,  274,  273,  272,  271,  270,  269,
+      268,  267,  266,  265,  264,  262,  261,  260,  259,  257,
+      256,  255,  254,  253,  252,  251,  249,  248,  247,  246,
+      245,  243,  240,  239,  238,  236,  230,  228,  223,  217,
+      216,  215,  214,  213,  212,  211,  210,  209,  208,  207,
+      206,  205,  204,  203,  202,  201,  199,  198,  197,  196,
+      195,  194,  193,  190,  189,  188,  187,  186,  185,  184,
+
+      183,  182,  181,  180,  179,  178,  177,  176,  175,  174,
+      173,  172,  171,  170,  169,  168,  167,  165,  164,  163,
+      162,  161,  159,  158,  157,  155,  151,  138,  136,  135,
+      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,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557
     } ;
 
 static tao_yy_state_type tao_yy_last_accepting_state;
@@ -808,7 +806,7 @@ static char *tao_yy_last_accepting_cpos;
 char tao_yytext[TAO_YYLMAX];
 char *tao_yytext_ptr;
 #define INITIAL 0
-/*  $Id$
+/*  idl.ll,v 1.98 2005/07/07 19:55:08 gmaxey Exp
 
 COPYRIGHT
 
@@ -1117,13 +1115,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 >= 559 )
+                                if ( tao_yy_current_state >= 558 )
                                         tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
                                 }
                         tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
                         ++tao_yy_cp;
                         }
-                while ( tao_yy_base[tao_yy_current_state] != 1103 );
+                while ( tao_yy_base[tao_yy_current_state] != 1095 );
 
 tao_yy_find_action:
                 tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -1980,7 +1978,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 >= 559 )
+                        if ( tao_yy_current_state >= 558 )
                                 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];
@@ -2015,11 +2013,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 >= 559 )
+                if ( tao_yy_current_state >= 558 )
                         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 == 558);
+        tao_yy_is_jam = (tao_yy_current_state == 557);
 
         return tao_yy_is_jam ? 0 : tao_yy_current_state;
         }
@@ -2768,30 +2766,14 @@ idl_store_pragma (char *buf)
         {
           unsigned long depth = idl_global->scopes ().depth ();
 
-          // We replace the prefix only if there is a prefix already
-          // associated with this file, otherwise we add the prefix.
-          char *ext_id = idl_global->filename ()->get_string ();
-          char *int_id = 0;
-          int status = idl_global->file_prefixes ().find (ext_id,
-                                                          int_id);
-
-          if (status == 0)
+          // At global scope, we always replace the prefix. For all
+          // other scopes, we replace only if there is a prefix already
+          // associated with that scope, otherwise we add the prefix.
+          if (depth == 1 || idl_global->scopes ().top ()->has_prefix ())
             {
-              if (ACE_OS::strcmp (int_id, "") != 0)
-                {
-                  char *trash = 0;
-                  idl_global->pragma_prefixes ().pop (trash);
-                  delete [] trash;
-                }
-              else if (depth == 1)
-                {
-                  // Remove the default "" and bind the new prefix.
-                  (void) idl_global->file_prefixes ().unbind (ext_id);
-                  ext_id = ACE::strnew (ext_id);
-                  int_id = ACE::strnew (new_prefix);
-                  (void) idl_global->file_prefixes ().bind (ext_id,
-                                                            int_id);
-                }
+              char *trash = 0;
+              idl_global->pragma_prefixes ().pop (trash);
+              delete [] trash;
             }
 
           UTL_Scope *top_scope = idl_global->scopes ().top ();
@@ -2804,17 +2786,18 @@ idl_store_pragma (char *buf)
 
           idl_global->pragma_prefixes ().push (new_prefix);
 
-          if (depth == 1)
-            {
-              idl_global->root ()->prefix (new_prefix);
-            }
-                
           if (idl_global->in_main_file ())
             {
+              idl_global->root ()->prefix (new_prefix);
               idl_global->root ()->set_imported (false);
               top_scope->has_prefix (true);
             }
 
+          char *ext_id = idl_global->filename ()->get_string ();
+          char *int_id = 0;
+          int status = idl_global->file_prefixes ().find (ext_id,
+                                                          int_id);
+
           if (status != 0)
             {
               ext_id = ACE::strnew (ext_id);
@@ -2840,15 +2823,6 @@ idl_store_pragma (char *buf)
           number = ACE_OS::strchr (tmp, '\t');
         }
 
-      // Most likely this means there is only a version number
-      // without an identifier to apply it to.
-      if (number == 0)
-        {
-          const char *msg = "no identifier or scoped name";
-          idl_global->err ()->version_syntax_error (msg);
-          return;
-        }
-
       while (*number == ' ' || *number == '\t')
         {
           ++number;
@@ -2951,12 +2925,7 @@ static long
 idl_atoi(char *s, long b)
 {
   long    r = 0;
-
-  // Skip over the dash and possibly spaces after the dash
-  while (*s == '-' || *s == ' ' || *s == '\t')
-    {
-      s++;
-    }
+  s++;
 
   if (b == 8 && *s == '0')
     {
@@ -3043,12 +3012,7 @@ idl_atof (char *s)
   if (*s == '-')
     {
       neg = 1;
-
-      // Skip over the dash and possibly spaces after the dash
-      while (*s == '-' || *s == ' ' || *s == '\t')
-        {
-          s++;
-        }
+      s++;
     }
 
   while (*s >= '0' && *s <= '9')
@@ -3319,8 +3283,8 @@ idl_find_node (char *s)
 
   if (node != 0)
     {
-      d = idl_global->scopes ().top_non_null ()->lookup_by_name (node,
-                                                                 true);
+      d =
+        idl_global->scopes ().top_non_null ()->lookup_by_name (node, true);
     }
 
   if (d == 0)
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
index cc361764657..82b0b590534 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
@@ -1,13 +1,24 @@
---- lex.yy.cpp.orig	2006-11-30 07:19:39.000000000 -0600
-+++ lex.yy.cpp	2006-11-30 07:18:28.000000000 -0600
-@@ -1602,42 +1602,42 @@
+--- lex.yy.cpp.orig	2005-07-07 11:05:08.066403000 -0700
++++ lex.yy.cpp	2005-07-07 10:51:41.804932200 -0700
+@@ -1134,7 +1134,7 @@
+ TAO_YY_DECL
+         {
+         register tao_yy_state_type tao_yy_current_state;
+-        register char *tao_yy_cp, *tao_yy_bp;
++        register char *tao_yy_cp = 0, *tao_yy_bp = 0;
+         register int tao_yy_act;
+ 
+ 
+@@ -1664,42 +1664,42 @@
                    idl_global->set_lineno(idl_global->lineno() + 1);
                    idl_store_pragma(ace_tao_yytext);
                  }
 -        TAO_YY_BREAK
 +        break;
  case 87:
+ /* rule 87 can match eol */
  case 88:
+ /* rule 88 can match eol */
  TAO_YY_RULE_SETUP
  {/* ignore file */
                    idl_global->set_lineno(idl_global->lineno() + 1);
@@ -15,7 +26,9 @@
 -        TAO_YY_BREAK
 +        break;
  case 89:
+ /* rule 89 can match eol */
  case 90:
+ /* rule 90 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_parse_line_and_file(ace_tao_yytext);
@@ -23,7 +36,9 @@
 -        TAO_YY_BREAK
 +        break;
  case 91:
+ /* rule 91 can match eol */
  case 92:
+ /* rule 92 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_parse_line_and_file(ace_tao_yytext);
@@ -31,7 +46,9 @@
 -        TAO_YY_BREAK
 +        break;
  case 93:
+ /* rule 93 can match eol */
  case 94:
+ /* rule 94 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_parse_line_and_file(ace_tao_yytext);
@@ -39,7 +56,9 @@
 -        TAO_YY_BREAK
 +        break;
  case 95:
+ /* rule 95 can match eol */
  case 96:
+ /* rule 96 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_parse_line_and_file(ace_tao_yytext);
@@ -47,15 +66,18 @@
 -        TAO_YY_BREAK
 +        break;
  case 97:
+ /* rule 97 can match eol */
  case 98:
+ /* rule 98 can match eol */
  TAO_YY_RULE_SETUP
-@@ -1645,14 +1645,14 @@
+ {
                    /* ignore cpp ident */
                    idl_global->set_lineno(idl_global->lineno() + 1);
                  }
 -        TAO_YY_BREAK
 +        break;
  case 99:
+ /* rule 99 can match eol */
  TAO_YY_RULE_SETUP
  {
                    /* ignore comments */
@@ -66,7 +88,16 @@
  case 100:
  TAO_YY_RULE_SETUP
  {
-@@ -1669,17 +1669,17 @@
+                   for(;;) {
+                     char c = tao_yyinput();
+                     if (c == '*') {
+                       char next = tao_yyinput();
+                       if (next == '/')
+                         break;
+                       else
+                         tao_yyunput(c, 0);
+                       if (c == '\n')
+                         idl_global->set_lineno(idl_global->lineno() + 1);
                      }
                    }
                  }
@@ -78,6 +109,7 @@
 -        TAO_YY_BREAK
 +        break;
  case 102:
+ /* rule 102 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_global->set_lineno(idl_global->lineno() + 1);
@@ -87,12 +119,3 @@
  case 103:
  TAO_YY_RULE_SETUP
  return ace_tao_yytext [0];
-@@ -1687,7 +1687,7 @@
- case 104:
- TAO_YY_RULE_SETUP
- TAO_YY_ECHO;
--        TAO_YY_BREAK
-+        break;
- case TAO_YY_STATE_EOF(INITIAL):
-         tao_yyterminate();
- 
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 0b58b9b6047..60469041f98 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -2891,33 +2891,23 @@ tao_yyreduce:
                 }
 
               if (tp == 0)
-                {
-                  // The <type_spec> given is a valid type
+                { // The <type_spec> given is a valid type
                   idl_global->err ()->not_a_type (tao_yyvsp[0].dcval);
                 }
+              else if (tp->node_type() == AST_Decl::NT_valuetype)
+                { // valuetype is not allowed as <type_spec> for boxed value
+                  idl_global->err ()->error0 (
+                      UTL_Error::EIDL_ILLEGAL_BOXED_TYPE
+                    );
+                }
               else
                 {
-                  AST_Decl::NodeType nt = tp->node_type ();
-                  
-                  if (nt == AST_Decl::NT_valuetype
-                      || nt == AST_Decl::NT_eventtype)
-                    {
-                      // valuetype is not allowed as <type_spec>
-                      // for boxed value
-                      idl_global->err ()->error0 (
-                          UTL_Error::EIDL_ILLEGAL_BOXED_TYPE
-                        );
-                    }
-                  else
-                    {
-                      /*
-                      * Add the valuebox to its definition scope
-                      */
-                      AST_ValueBox *vb =
-                        idl_global->gen ()->create_valuebox (&n,
-                                                             tp);
-                      (void) s->fe_add_valuebox (vb);
-                    }
+                  /*
+                  * Add the valuebox to its definition scope
+                  */
+                  AST_ValueBox *vb = idl_global->gen ()->create_valuebox (&n,
+                                                                          tp);
+                  (void) s->fe_add_valuebox (vb);
                 }
             }
 
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index c4f0bd7afe5..75425f06ac1 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -289,8 +289,7 @@ public:
 
 protected:
   // These are not private because they're used by
-  // be_predefined_type' constructor and can be called
-  // from be_decl.
+  // be_predefined_type' constructor.
 
   char *repoID_;
   // Repository ID.
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index f1b717bda81..e7a6138fbbe 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -200,9 +200,6 @@ public:
   // Report an illegal #pragma version.
   void version_number_error (char *n);
 
-  // Report an illegal #pragma version syntax
-  void version_syntax_error (const char *msg);
-
   // Repost an attempt to reset the version.
   void version_reset_error (void);
 
@@ -340,7 +337,7 @@ public:
   // Improper use of -Sm option.
   void ignore_idl3_error (AST_Decl *d);
 
-  // Valuetype violates a spec-defined constraint on a
+  // Valuetype violates a spec-defined constraint on a 
   // valuetype used as a primary key.
   void illegal_primary_key (AST_Decl *d);
 };
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 5af3fb1eb94..5266fc86a1c 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(TAO_IDL_EXE) : aceexe, install, tao_output, crosscompile {
+project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
   exename      = tao_idl
   libs        += TAO_IDL_BE TAO_IDL_FE
   install      = $(ACE_ROOT)/bin
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 1b7eeb85dd2..f412e4c0d09 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -72,7 +72,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_string.h"
 #include "global_extern.h"
 #include "nr_extern.h"
-#include "fe_extern.h"
 #include "ast_interface.h"
 #include "ast_enum.h"
 #include "ast_union.h"
@@ -113,7 +112,7 @@ error_string (UTL_Error::ErrorCode c)
     case UTL_Error::EIDL_PREFIX_CONFLICT:
       return "prefix at declaration differs from prefix at definition or use, ";
     case UTL_Error::EIDL_ILLEGAL_VERSION:
-      return "illegal #pragma version, ";
+      return "illegal version number, ";
     case UTL_Error::EIDL_VERSION_RESET:
       return "version already set by #pragma version or #pragma id, ";
     case UTL_Error::EIDL_ID_RESET:
@@ -631,11 +630,7 @@ UTL_Error::syntax_error (IDL_GlobalData::ParseState ps)
   ACE_ERROR ((LM_ERROR,
               "%s\n",
               parse_state_to_error_message (ps)));
-
-  // Better to bail here than to increment the error count and
-  // try to avoid further bogus error messages and crashes
-  // that may arise.
-  throw FE_Bailout ();
+  idl_global->set_err_count (idl_global->err_count () + 1);
 }
 
 void
@@ -811,18 +806,6 @@ UTL_Error::version_number_error (char *n)
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
 
-void
-UTL_Error::version_syntax_error (const char *msg)
-{
-  idl_error_header (EIDL_ILLEGAL_VERSION,
-                    idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
-  ACE_ERROR ((LM_ERROR,
-              "%s\n",
-              msg));
-  idl_global->set_err_count (idl_global->err_count () + 1);
-}
-
 // Report an attempt to set the version a second time.
 void
 UTL_Error::version_reset_error (void)
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index dbb5f016cdd..7fdb80ce9f0 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -1157,7 +1157,9 @@ IDL_GlobalData::update_prefix (char *filename)
   ACE_CString tmp ("", 0, 0);
   char *main_filename = this->pd_main_filename->get_string ();
 
+//  ACE_CString ext_id (filename);
   char *prefix = 0;
+
   int status = this->file_prefixes_.find (filename, prefix);
 
   if (status == 0)
@@ -1187,20 +1189,9 @@ IDL_GlobalData::update_prefix (char *filename)
     {
       if (!this->pd_in_main_file)
         {
-          status =
-            this->file_prefixes_.find (this->pd_filename->get_string (),
-                                       prefix);
-          
-          // This function is called just before we transition to a
-          // new file at global scope. If there is a non-null prefix
-          // stored in the table under our not-yet-changed filename,
-          // pop it.
-          if (status == 0 && ACE_OS::strcmp (prefix, "") != 0)
-            {
-              char *trash = 0;
-              this->pragma_prefixes_.pop (trash);
-              delete [] trash;
-            }
+          char *trash = 0;
+          this->pragma_prefixes_.pop (trash);
+          delete [] trash;
         }
     }
   else
@@ -1547,7 +1538,7 @@ IDL_GlobalData::fini (void)
       delete this->pd_root;
       this->pd_root = 0;
     }
-
+    
   delete this->pd_err;
   this->pd_err = 0;
   delete this->pd_gen;
@@ -1630,7 +1621,7 @@ IDL_GlobalData::create_uses_multiple_stuff (
 
   if (d == 0)
     {
-      // This would happen if we haven't included Components.idl.
+      // This would happen if we haven't included Componennts.idl.
       idl_global->err ()->lookup_error (&scoped_name);
       return;
     }
@@ -1804,7 +1795,7 @@ IDL_GlobalData::add_dcps_data_key (const char* id, const char* key)
 {
   // Search the map for the type.
   DCPS_Data_Type_Info* newinfo = 0;
-
+  
   if (this->dcps_type_info_map_.find (id, newinfo) == 0)
     {
        // Add the new key field to the type.
@@ -1816,7 +1807,7 @@ IDL_GlobalData::add_dcps_data_key (const char* id, const char* key)
       ACE_ERROR((LM_ERROR,
                  ACE_TEXT ("missing previous #pragma DCPS_DATA_TYPE\n")));
     }
-
+    
   return false;
 }
 
diff --git a/TAO/VERSION b/TAO/VERSION
index 4dfedb1b686..253715b8064 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.5.4, released Mon Nov 20 08:16:34 2006.
+This is TAO version 1.5.3, released Thu Oct 05 00:35:37 2006.
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-users@cs.wustl.edu), using the
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 18e2e4491e2..39d65bf0b4a 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -11,7 +11,7 @@ dnl
 dnl Note that this macro removes the newline output by the M4
 dnl "esyscmd" built-in.  Unless you understand what you're doing,
 dnl particularly with M4, do not modify this macro definition.
-define([TAO_VERSION], patsubst(esyscmd(grep TAO_VERSION tao/Version.h | sed 's/.*\" *\(.*\)\".*/\1/'), [
+define([TAO_VERSION], patsubst(esyscmd(grep TAO_VERSION tao/Version.h | sed 's/.*\"\(.*\)\".*/\1/'), [
 ]))dnl remove newline ending every `esyscmd' answer
 
 AC_INIT([TAO],
@@ -170,9 +170,6 @@ AM_CONDITIONAL(BUILD_EC_TYPED_EVENTS, true)
 AM_CONDITIONAL(BUILD_WFMO, false)
 AM_CONDITIONAL(BUILD_WINNT, false)
 AM_CONDITIONAL(BUILD_WXWINDOWS, false)
-AM_CONDITIONAL(BUILD_STL, false)
-AM_CONDITIONAL(BUILD_BOOST, false)
-AM_CONDITIONAL(BUILD_JAVA, false)
 
 ACE_ENABLE_ACEXML
 ACE_ENABLE_SSL
@@ -180,8 +177,6 @@ ACE_ENABLE_FL_REACTOR
 ACE_ENABLE_QT_REACTOR
 ACE_ENABLE_TK_REACTOR
 ACE_ENABLE_XT_REACTOR
-ACE_PATH_ZZIP
-ACE_PATH_ZLIB
 
 TAO_ENABLE_EXAMPLES
 TAO_ENABLE_TESTS
@@ -205,7 +200,6 @@ AC_CONFIG_FILES([
   docs/tutorials/Quoter/Makefile
   docs/tutorials/Quoter/Naming_Service/Makefile
   docs/tutorials/Quoter/On_Demand_Activation/Makefile
-  docs/tutorials/Quoter/RTCORBA/Makefile
   docs/tutorials/Quoter/RT_Event_Service/Makefile
   docs/tutorials/Quoter/Simple/Client/Makefile
   docs/tutorials/Quoter/Simple/Impl-Repo/Makefile
@@ -259,13 +253,6 @@ if test $tao_build_examples = yes; then
     examples/Advanced/ch_3/Makefile
     examples/Buffered_AMI/Makefile
     examples/Buffered_Oneways/Makefile
-    examples/CSD_Strategy/Makefile
-    examples/CSD_Strategy/ThreadPool/Makefile
-    examples/CSD_Strategy/ThreadPool2/Makefile
-    examples/CSD_Strategy/ThreadPool3/Makefile
-    examples/CSD_Strategy/ThreadPool4/Makefile
-    examples/CSD_Strategy/ThreadPool5/Makefile
-    examples/CSD_Strategy/ThreadPool6/Makefile
     examples/Callback_Quoter/Makefile
     examples/Content_Server/AMI_Iterator/Makefile
     examples/Content_Server/AMI_Observer/Makefile
@@ -460,12 +447,9 @@ if test $tao_build_tests = yes; then
     orbsvcs/tests/Bug_2287_Regression/Makefile
     orbsvcs/tests/Bug_2316_Regression/Makefile
     orbsvcs/tests/Bug_2377_Regression/Makefile
-    orbsvcs/tests/Bug_2615_Regression/Makefile
-    orbsvcs/tests/Bug_2709_Regression/Makefile
     orbsvcs/tests/Concurrency/Makefile
     orbsvcs/tests/CosEvent/Basic/Makefile
     orbsvcs/tests/CosEvent/Makefile
-    orbsvcs/tests/CosEvent/Timeout/Makefile
     orbsvcs/tests/CosEvent/lib/Makefile
     orbsvcs/tests/EC_Custom_Marshal/Makefile
     orbsvcs/tests/EC_MT_Mcast/Makefile
@@ -477,12 +461,9 @@ if test $tao_build_tests = yes; then
     orbsvcs/tests/Event/Mcast/Common/Makefile
     orbsvcs/tests/Event/Mcast/Complex/Makefile
     orbsvcs/tests/Event/Mcast/Makefile
-    orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile
     orbsvcs/tests/Event/Mcast/Simple/Makefile
     orbsvcs/tests/Event/Mcast/Two_Way/Makefile
     orbsvcs/tests/Event/Performance/Makefile
-    orbsvcs/tests/Event/ThreadFlags/Makefile
-    orbsvcs/tests/Event/UDP/Makefile
     orbsvcs/tests/Event/lib/Makefile
     orbsvcs/tests/FT_App/Makefile
     orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile
@@ -496,7 +477,6 @@ if test $tao_build_tests = yes; then
     orbsvcs/tests/HTIOP/Makefile
     orbsvcs/tests/IOR_MCast/Makefile
     orbsvcs/tests/ImplRepo/Makefile
-    orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile
     orbsvcs/tests/ImplRepo/NameService/Makefile
     orbsvcs/tests/ImplRepo/scale/Makefile
     orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
@@ -559,310 +539,6 @@ if test $tao_build_tests = yes; then
     orbsvcs/tests/Trading/Makefile
     orbsvcs/tests/ior_corbaname/Makefile
     orbsvcs/tests/tests_svc_loader/Makefile
-    orbsvcs/tests/unit/Makefile
-    orbsvcs/tests/unit/Trading/Makefile
-    orbsvcs/tests/unit/Trading/Interpreter/Makefile
-    tests/AMH_Exceptions/Makefile
-    tests/AMH_Oneway/Makefile
-    tests/AMI/Makefile
-    tests/AMI_Buffering/Makefile
-    tests/AMI_Timeouts/Makefile
-    tests/Abstract_Interface/Makefile
-    tests/Any/Makefile
-    tests/Any/Recursive/Makefile
-    tests/BiDirectional/Makefile
-    tests/BiDirectional_DelayedUpcall/Makefile
-    tests/BiDirectional_MultipleORB/Makefile
-    tests/BiDirectional_NestedUpcall/Makefile
-    tests/Big_AMI/Makefile
-    tests/Big_Oneways/Makefile
-    tests/Big_Reply/Makefile
-    tests/Big_Request_Muxing/Makefile
-    tests/Big_Twoways/Makefile
-    tests/Blocking_Sync_None/Makefile
-    tests/Bug_1020_Basic_Regression/Makefile
-    tests/Bug_1020_Regression/Makefile
-    tests/Bug_1254_Regression/Makefile
-    tests/Bug_1269_Regression/Makefile
-    tests/Bug_1270_Regression/Makefile
-    tests/Bug_1330_Regression/Makefile
-    tests/Bug_1361_Regression/Makefile
-    tests/Bug_1476_Regression/Makefile
-    tests/Bug_1476_Test/Makefile
-    tests/Bug_1482_Regression/Makefile
-    tests/Bug_1495_Regression/Makefile
-    tests/Bug_1535_Regression/Makefile
-    tests/Bug_1551_Regression/Makefile
-    tests/Bug_1568_Regression/Makefile
-    tests/Bug_1627_Regression/Makefile
-    tests/Bug_1635_Regression/Makefile
-    tests/Bug_1636_Regression/Makefile
-    tests/Bug_1639_Regression/Makefile
-    tests/Bug_1670_Regression/Makefile
-    tests/Bug_1676_Regression/Makefile
-    tests/Bug_1693_Test/Makefile
-    tests/Bug_1812_Regression/Makefile
-    tests/Bug_1813_Regression/Makefile
-    tests/Bug_1869_Regression/Makefile
-    tests/Bug_1904_Regression/Makefile
-    tests/Bug_2084_Regression/Makefile
-    tests/Bug_2119_Regression/Makefile
-    tests/Bug_2122_Regression/Makefile
-    tests/Bug_2124_Regression/Makefile
-    tests/Bug_2126_Regression/Makefile
-    tests/Bug_2134_Regression/Makefile
-    tests/Bug_2144_Regression/Makefile
-    tests/Bug_2174_Regression/Makefile
-    tests/Bug_2183_Regression/Makefile
-    tests/Bug_2186_Regression/Makefile
-    tests/Bug_2188_Regression/Makefile
-    tests/Bug_2201_Regression/Makefile
-    tests/Bug_2222_Regression/Makefile
-    tests/Bug_2234_Regression/Makefile
-    tests/Bug_2289_Regression/Makefile
-    tests/Bug_2319_Regression/Makefile
-    tests/Bug_2328_Regression/Makefile
-    tests/Bug_2345_Regression/Makefile
-    tests/Bug_2349_Regression/Makefile
-    tests/Bug_2375_Regression/Makefile
-    tests/Bug_2399_Regression/Makefile
-    tests/Bug_2417_Regression/Makefile
-    tests/Bug_2419_Regression/Makefile
-    tests/Bug_2424_Regression/Makefile
-    tests/Bug_2429_Regression/Makefile
-    tests/Bug_2494_Regression/Makefile
-    tests/Bug_2503_Regression/Makefile
-    tests/Bug_2542_Regression/Makefile
-    tests/Bug_2543_Regression/Makefile
-    tests/Bug_2549_Regression/Makefile
-    tests/Bug_2560_Regression/Makefile
-    tests/Bug_2593_Regression/Makefile
-    tests/Bug_2595_Regression/Makefile
-    tests/Bug_2654_Regression/Makefile
-    tests/Bug_2669_Regression/Makefile
-    tests/Bug_2683_Regression/Makefile
-    tests/Bug_2702_Regression/Makefile
-    tests/CDR/Makefile
-    tests/COIOP/Makefile
-    tests/CSD_Strategy_Tests/Broken/Makefile
-    tests/CSD_Strategy_Tests/Makefile
-    tests/CSD_Strategy_Tests/TP_Common/Makefile
-    tests/CSD_Strategy_Tests/TP_Foo_A/Makefile
-    tests/CSD_Strategy_Tests/TP_Foo_B/Makefile
-    tests/CSD_Strategy_Tests/TP_Foo_C/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_1/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_2/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_3/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_4/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_Static/Makefile
-    tests/Cache_Growth_Test/Makefile
-    tests/CallbackTest/Makefile
-    tests/Client_Leaks/Makefile
-    tests/CodeSets/Makefile
-    tests/CodeSets/libs/IBM1047_ISO8859/Makefile
-    tests/CodeSets/libs/Makefile
-    tests/CodeSets/libs/UCS4_UTF16/Makefile
-    tests/CodeSets/simple/Makefile
-    tests/Codec/Makefile
-    tests/Collocation/Makefile
-    tests/CollocationLockup/Makefile
-    tests/Collocation_Exception_Test/Makefile
-    tests/Collocation_Oneway_Tests/Makefile
-    tests/Collocation_Opportunities/Makefile
-    tests/Collocation_Tests/Makefile
-    tests/Compression/Makefile
-    tests/Connect_Strategy_Test/Makefile
-    tests/Connection_Failure/Makefile
-    tests/Connection_Purging/Makefile
-    tests/Connection_Timeout/Makefile
-    tests/Crash_On_Write/Makefile
-    tests/Crashed_Callback/Makefile
-    tests/DII_Collocation_Tests/Makefile
-    tests/DII_Collocation_Tests/oneway/Makefile
-    tests/DII_Collocation_Tests/twoway/Makefile
-    tests/DLL_ORB/Makefile
-    tests/DSI_Gateway/Makefile
-    tests/DynAny_Test/Makefile
-    tests/Explicit_Event_Loop/Makefile
-    tests/Exposed_Policies/Makefile
-    tests/FL_Cube/Makefile
-    tests/Faults/Makefile
-    tests/File_IO/Makefile
-    tests/Forwarding/Makefile
-    tests/GIOP_Fragments/Java_Big_Reply/Makefile
-    tests/GIOP_Fragments/Java_Big_Request/Makefile
-    tests/GIOP_Fragments/Makefile
-    tests/GIOP_Fragments/PMB_With_Fragments/Makefile
-    tests/Hang_Shutdown/Makefile
-    tests/Hello/Makefile
-    tests/ICMG_Any_Bug/Makefile
-    tests/IDL_Test/Makefile
-    tests/IORManipulation/Makefile
-    tests/IOR_Endpoint_Hostnames/Makefile
-    tests/IPV6/Makefile
-    tests/InterOp-Naming/Makefile
-    tests/Leader_Followers/Makefile
-    tests/LongUpcalls/Makefile
-    tests/MProfile/Makefile
-    tests/MProfile_Connection_Timeout/Makefile
-    tests/MProfile_Forwarding/Makefile
-    tests/MT_BiDir/Makefile
-    tests/MT_Client/Makefile
-    tests/MT_Server/Makefile
-    tests/MT_Timeout/Makefile
-    tests/Makefile
-    tests/Multiple/Makefile
-    tests/Multiple_Inheritance/Makefile
-    tests/Muxed_GIOP_Versions/Makefile
-    tests/Muxing/Makefile
-    tests/Native_Exceptions/Makefile
-    tests/NestedUpcall/MT_Client_Test/Makefile
-    tests/NestedUpcall/Makefile
-    tests/NestedUpcall/Simple/Makefile
-    tests/NestedUpcall/Triangle_Test/Makefile
-    tests/Nested_Event_Loop/Makefile
-    tests/Nested_Upcall_Crash/Makefile
-    tests/No_Server_MT_Connect_Test/Makefile
-    tests/OBV/Any/Makefile
-    tests/OBV/Collocated/Forward/Makefile
-    tests/OBV/Collocated/Makefile
-    tests/OBV/Factory/Makefile
-    tests/OBV/Forward/Makefile
-    tests/OBV/Makefile
-    tests/OBV/Simple/Makefile
-    tests/OBV/TC_Alignment/Makefile
-    tests/OBV/Truncatable/Makefile
-    tests/OBV/ValueBox/Makefile
-    tests/ORB_Local_Config/Bug_1459/Makefile
-    tests/ORB_Local_Config/Bug_2612/Makefile
-    tests/ORB_Local_Config/Bunch/Makefile
-    tests/ORB_Local_Config/Makefile
-    tests/ORB_Local_Config/Separation/Makefile
-    tests/ORB_Local_Config/Service_Dependency/Makefile
-    tests/ORB_Local_Config/Shared/Makefile
-    tests/ORB_Local_Config/Simple/Makefile
-    tests/ORB_Local_Config/Two_DLL_ORB/Makefile
-    tests/ORB_destroy/Makefile
-    tests/ORB_init/Makefile
-    tests/ORB_init/Portspan/Makefile
-    tests/ORB_shutdown/Makefile
-    tests/ORT/Makefile
-    tests/Object_Loader/Makefile
-    tests/Objref_Sequence_Test/Makefile
-    tests/OctetSeq/Makefile
-    tests/Ondemand_Write/Makefile
-    tests/Oneway_Buffering/Makefile
-    tests/Oneway_Timeouts/Makefile
-    tests/Oneways_Invoking_Twoways/Makefile
-    tests/Optimized_Connection/Makefile
-    tests/POA/Bug_2511_Regression/Makefile
-    tests/POA/Current/Makefile
-    tests/POA/Deactivate_Object/Makefile
-    tests/POA/Default_Servant/Makefile
-    tests/POA/EndpointPolicy/Makefile
-    tests/POA/Etherealization/Makefile
-    tests/POA/Excessive_Object_Deactivations/Makefile
-    tests/POA/Identity/Makefile
-    tests/POA/MT_Servant_Locator/Makefile
-    tests/POA/Makefile
-    tests/POA/Nested_Non_Servant_Upcalls/Makefile
-    tests/POA/Non_Servant_Upcalls/Makefile
-    tests/POA/Object_Reactivation/Makefile
-    tests/POA/POAManagerFactory/Makefile
-    tests/POA/POA_Destruction/Makefile
-    tests/POA/Persistent_ID/Makefile
-    tests/POA/Policies/Makefile
-    tests/POA/Reference_Counting/Makefile
-    tests/POA/Single_Threaded_POA/Makefile
-    tests/POA/wait_for_completion/Makefile
-    tests/Parallel_Connect_Strategy/Makefile
-    tests/Param_Test/Makefile
-    tests/Permanent_Forward/Makefile
-    tests/Policies/Makefile
-    tests/Portable_Interceptors/AMI/Makefile
-    tests/Portable_Interceptors/AdvSlot/Makefile
-    tests/Portable_Interceptors/AdvSlotDblCpy/Makefile
-    tests/Portable_Interceptors/AdvSlotExt/Makefile
-    tests/Portable_Interceptors/Benchmark/Makefile
-    tests/Portable_Interceptors/Bug_1559/Makefile
-    tests/Portable_Interceptors/Bug_2088/Makefile
-    tests/Portable_Interceptors/Bug_2510_Regression/Makefile
-    tests/Portable_Interceptors/Collocated/Dynamic/Makefile
-    tests/Portable_Interceptors/Collocated/Makefile
-    tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile
-    tests/Portable_Interceptors/Dynamic/Makefile
-    tests/Portable_Interceptors/ForwardRequest/Makefile
-    tests/Portable_Interceptors/IORInterceptor/Makefile
-    tests/Portable_Interceptors/Makefile
-    tests/Portable_Interceptors/ORB_Shutdown/Makefile
-    tests/Portable_Interceptors/PICurrent/Makefile
-    tests/Portable_Interceptors/PolicyFactory/Makefile
-    tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile
-    tests/Portable_Interceptors/Processing_Mode_Policy/Makefile
-    tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile
-    tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile
-    tests/Portable_Interceptors/Redirection/Makefile
-    tests/Portable_Interceptors/Register_Initial_References/Makefile
-    tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile
-    tests/Portable_Interceptors/Service_Context_Manipulation/Makefile
-    tests/Portable_Interceptors/Slot/Makefile
-    tests/QtTests/Makefile
-    tests/Queued_Message_Test/Makefile
-    tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile
-    tests/RTCORBA/Banded_Connections/Makefile
-    tests/RTCORBA/Client_Propagated/Makefile
-    tests/RTCORBA/Client_Protocol/Makefile
-    tests/RTCORBA/Collocation/Makefile
-    tests/RTCORBA/Destroy_Thread_Pool/Makefile
-    tests/RTCORBA/Diffserv/Makefile
-    tests/RTCORBA/Dynamic_Thread_Pool/Makefile
-    tests/RTCORBA/Explicit_Binding/Makefile
-    tests/RTCORBA/Linear_Priority/Makefile
-    tests/RTCORBA/MT_Client_Protocol_Priority/Makefile
-    tests/RTCORBA/Makefile
-    tests/RTCORBA/ORB_init/Makefile
-    tests/RTCORBA/Persistent_IOR/Makefile
-    tests/RTCORBA/Policies/Makefile
-    tests/RTCORBA/Policy_Combinations/Makefile
-    tests/RTCORBA/Priority_Inversion_With_Bands/Makefile
-    tests/RTCORBA/Private_Connection/Makefile
-    tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile
-    tests/RTCORBA/RTMutex/Makefile
-    tests/RTCORBA/Server_Declared/Makefile
-    tests/RTCORBA/Server_Protocol/Makefile
-    tests/RTCORBA/Thread_Pool/Makefile
-    tests/RTScheduling/Current/Makefile
-    tests/RTScheduling/DT_Spawn/Makefile
-    tests/RTScheduling/Makefile
-    tests/RTScheduling/Scheduling_Interceptor/Makefile
-    tests/RTScheduling/Thread_Cancel/Makefile
-    tests/RTScheduling/VoidData/Makefile
-    tests/Reliable_Oneways/Makefile
-    tests/Sequence_Unit_Tests/Makefile
-    tests/Servant_To_Reference_Test/Makefile
-    tests/Server_Connection_Purging/Makefile
-    tests/Server_Leaks/Makefile
-    tests/Server_Port_Zero/Makefile
-    tests/Single_Read/Makefile
-    tests/Smart_Proxies/Benchmark/Makefile
-    tests/Smart_Proxies/Collocation/Makefile
-    tests/Smart_Proxies/Makefile
-    tests/Smart_Proxies/On_Demand/Makefile
-    tests/Smart_Proxies/Policy/Makefile
-    tests/Smart_Proxies/dtor/Makefile
-    tests/Stack_Recursion/Makefile
-    tests/Strategies/Makefile
-    tests/Timed_Buffered_Oneways/Makefile
-    tests/Timeout/Makefile
-    tests/TransportCurrent/Framework/Makefile
-    tests/TransportCurrent/IIOP/Makefile
-    tests/TransportCurrent/Makefile
-    tests/TransportCurrent/lib/Makefile
-    tests/Two_Objects/Makefile
-    tests/Typedef_String_Array/Makefile
-    tests/UNKNOWN_Exception/Makefile
-    tests/Xt_Stopwatch/Makefile
   ])
 fi
 
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html
index cde897c4245..881f8e4804f 100644
--- a/TAO/docs/ORBEndpoint.html
+++ b/TAO/docs/ORBEndpoint.html
@@ -345,31 +345,6 @@
             that should be put into generated IORs.
             </TD>
         </TR>
-        <TR>
-          <TD>
-            <CODE>reuse_addr</CODE>
-          </TD>
-          <TD>
-            <CODE>TAO 1.4.8</CODE>
-          </TD>
-          <TD>
-            Available in IIOP & SSLIOP the <CODE>reuse_addr</CODE> option allows one to
-            set the SO_REUSEADDR socket option on an endpoint. Doing so bypasses
-	    the TCP TIME_WAIT and can be used to open an endpoint
-	    on a port still in TIME_WAIT state. Use caution using this option. Its not
-	    recommended for the general use-case. Setting
-	    SO_REUSEADDR has been observed to cause unexpected side-effects on some
-	    platforms (e.g. Solaris 5.7 x86 allows programs run as same or different
-	    users to bind to the same port when SO_REUSEADDR is set by all users).
-            <P>
-            The format for <CODE>ORBEndpoint</CODE> with the
-            <CODE>reuse_addr</CODE> option is:
-            <BLOCKQUOTE>
-              <CODE>-ORBEndpoint iiop://[</CODE><I>local_hostname</I><CODE>]:</CODE><I
->port</I><CODE>/reuse_addr=[0|1]</CODE>
-            </BLOCKQUOTE>
-            </TD>
-        </TR>
       </TABLE>
 
     <P>
@@ -594,7 +569,6 @@
       <LI><CODE>-ORBEndpoint diop://1.1@:1234</CODE>
     </UL>
 
-    <hr>
     <P>
     <h2><A NAME="SSLIOP">SSLIOP Endpoints</A></h2>
     TAO's SSLIOP pluggable protocol facilitates CORBA request
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 4046ebd5ede..b69858a70a4 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -251,12 +251,6 @@ named <code>"svc.conf"</code> in the current directory. </td>
 passed to the Service Configurator. You can pass multiple of these
 options on the same command-line. </td>
       </tr>
-      <tr>
-     <td><code>-ORBServiceConfigLoggerKey</CODE> <em>logger key</em></t
-     <TD>Set the logger key in the <code>ACE_Service_Config</code>
-      framework.  Equivalent to the <code>-k</code> option on the ACE
-      service configurator class.
-     </td>
     </tbody>
   </table>
   </p>
@@ -1165,16 +1159,6 @@ the ORB uses. The default reactor is the ACE_TP_Reactor.
               <td>Use the <code>ACE_TP_Reactor</code>, a select based
 thread-pool reactor which is the default.</td>
             </tr>
-            <tr>
-              <td><code>dev_poll</code></td>
-              <td>Use the <code>ACE_Dev_Poll_Reactor</code>, a
-              <code>/dev/poll</code> or Linux <code>sys_epoll()</code>
-              based thread-pool reactor.  It is intended to be a
-              highly scalable replacement for the
-              <code>select()</code> based reactors.  The
-              ACE_Dev_Poll_Reactor is currently only supported on
-              HP-UX, Solaris and Linux.</td>
-            </tr>
           </tbody>
         </table>
         </td>
diff --git a/TAO/docs/Security/Download.html b/TAO/docs/Security/Download.html
index 72b8595cd68..18071bab60a 100644
--- a/TAO/docs/Security/Download.html
+++ b/TAO/docs/Security/Download.html
@@ -73,7 +73,7 @@ function MM_nbGroup(event, grpName) { //v3.0
     by the BXA from this US site.</p>
   <h3>TAO CORBA Security Service Software</h3>
   <ul>
-    <li><a href="http://download.dre.vanderbilt.edu"> TAO: The ACE
+    <li><a href="http://deuce.doc.wustl.edu/Download.html"> TAO: The ACE
       ORB</a> (TAO's CORBA Security Service is now shipped with the main TAO distribution)</li>
   </ul>
   <h3>Cryptographic Software</h3>
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 7f761398266..c63d65f02d2 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -373,7 +373,7 @@ also receives other options that are specific to it.<p>
     <td><tt>include_guard=</tt><i>define</i></td>
 
     <td>The compiler will generate code the define in the C.h file to prevent
-        users from including the generated C.h file. Useful for regenerating
+        users from including the generated C.h file. Useful for regenerating 
         the pidl files in the archive.</td>
   </tr>
 
@@ -592,6 +592,13 @@ also receives other options that are specific to it.<p>
     <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>&nbsp;</td>
+  </tr>
+
   <tr><a name="t">
     <td><tt>-t</tt></td>
 
@@ -642,7 +649,9 @@ also receives other options that are specific to it.<p>
 
   <tr><a name="Ge flag">
     <td><tt>-Ge </tt><i>flag</i></td>
-    <td>If the
+    <td>If the value of the flag is 0, operations generated from application IDL will
+        use native C++ exceptions. If the value of the flag is 1, such operations 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). This flag value will also disable
@@ -653,9 +662,7 @@ also receives other options that are specific to it.<p>
         generated code, but they now expand to nothing and are no longer maintained.
         Soon they will be removed altogether, and at that point, no throw, throw spec,
         or environment macros will be generated by the IDL compiler, regardless of the
-        value of the -Ge flag.
-        As of TAO 1.5.5 support for emulated exceptions has been removed from
-	the IDL compiler.</td>
+        value of the -Ge flag.</td>
   </tr>
 
   <tr><a name="Gp">
@@ -705,15 +712,6 @@ also receives other options that are specific to it.<p>
     or a valuetype never are - neither case is affected by this option.</td>
   </tr>
 
-  <tr><a name="Gse">
-    <td><tt>-Gse</tt></td>
-
-    <td>Generate explicit export of sequence's template base class</td>
-    <td>Occasionally needed as a workaround for a bug in Visual Studio
-        (.NET 2002, .NET 2003 and Express 2005) where the template
-        instantiation used for the base class isn't automatically exported</td>
-  </tr>
-
   <tr>
     <td><tt>-GI</tt></td>
 
@@ -880,8 +878,8 @@ also receives other options that are specific to it.<p>
     <td><tt>-Sorb</tt></td>
 
     <td>Suppress generation of the ORB.h include.</td>
-    <td>This option is useful when regenerating pidl files in the core
-  TAO libs to prevent cyclic includes;</td>
+    <td>This option is usefull when regenerating pidl files in the core
+	TAO libs to prevent cyclic includes;</td>
   </tr>
 
 </table> <P>
diff --git a/TAO/docs/dynany/index.html b/TAO/docs/dynany/index.html
index b49065a51fa..213d70799e6 100644
--- a/TAO/docs/dynany/index.html
+++ b/TAO/docs/dynany/index.html
@@ -23,7 +23,7 @@
 
 Point of contact: <a href="mailto: parsons@cs.wustl.edu">Jeff Parsons</a>
 
-<p>Last Update: November 28, 2006 </p>
+<p>Last Update: June 11, 2001 </p>
 </center>
 
 
@@ -81,7 +81,13 @@ Point of contact: <a href="mailto: parsons@cs.wustl.edu">Jeff Parsons</a>
 <ul>
 
   <li><p>Implementation of dynamic any classes for value types, boxed value
-         types.
+         types, and fixed types, as these types themselves are implemented
+         in TAO (value types are partially implemented, but the implementation
+         does not include Any insertion/extraction operators or type codes).
+  </p></li>
+
+  <li><p>Implementation of get and insert operations for abstract interfaces,
+         when abstract interfaces themselves are implemented in TAO.
   </p></li>
 
 </ul>
@@ -111,15 +117,5 @@ Point of contact: <a href="mailto: parsons@cs.wustl.edu">Jeff Parsons</a>
   <li><p>Expansion of existing dynamic any tests to included the added functionality.
   </p></li>
 
-  <li><p>Implementation of spec defined insert_*_seq() and get_*_seq(),
-         which are defined for all basic IDL types, and 
-         implemententation of get_abstract() and insert_abstract().
-  </p></li>
-
-  <li><p>Dynamic Any source code has been refactored to make more use
-         of C++ templates, made possible by the dropping of ACE+TAO
-         support for C++ compilers with poor template support.
-  </p></li>
-
 </ul>
 
diff --git a/TAO/docs/ec_options.html b/TAO/docs/ec_options.html
index efceece9965..382ea349b64 100644
--- a/TAO/docs/ec_options.html
+++ b/TAO/docs/ec_options.html
@@ -97,9 +97,11 @@ struct RtecEventData
       <code>$TAO_ROOT/orbsvcs/orbsvcs/Event/EC_Null_Factory.h</code>
       and <code>$TAO_ROOT/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h</code>
       for details.
-    </ul>
+</ul>
+    The
+      table below describes all of the options (and values) supported by
+      these factories.
     </P>
-
 <h3>Special Topic: Queue Configuration</h3>
     <p>
       In certain configurations such as <em>mt</em> and <em>tpc</em>,
@@ -163,10 +165,6 @@ static EC_QueueFullSimpleActions "[wait | discard]"
 #    (see below) to specify that object's service configurator tag.
 </PRE>
 
-    <p>
-    The
-      table below describes all of the options (and values) supported by
-      these factories. 
     <P>All the event service factory options start with
       <CODE>-EC</CODE></P>
 
@@ -208,27 +206,6 @@ static EC_QueueFullSimpleActions "[wait | discard]"
             <b>Does not apply to the <em>tpc</em> factory.</b>
           </TD>
         </TR>
-        <!-- <TR NAME="ECDispatchingThreadFlags"> -->
-        <TR>
-          <td><code>-ECDispatchingThreadFlags</code>
-            <em>thread_flags</em><b>:</b><em>thread_priority</em>
-            </td>
-          <td>
-            Provide flags and priority used for creation of
-            dispatching threads.<br>
-            <em>thread_flags</em> is a set of
-            <code>THR_</code> flags separated by the vertical bar
-            ('|'), e.g.,
-            <code>THR_BOUND|THR_NEW_LWP|THR_SCOPE_SYSTEM</code>.
-            <br>
-            <em>thread_priority</em> is a numeric value indicating the
-            desired priority at which the thread should be created.
-            No range checking is performed on the value prior to
-            passing to the thread creation function.  Also note that
-            priorities are platform-specific, so a valid value for a
-            given set of flags on one platform may not work with the
-            same flags on another platform.
-          </tr>
 
         <!-- <TR  NAME="ECQueueFullServiceObject"> -->
         <tr>
diff --git a/TAO/docs/libraries.html b/TAO/docs/libraries.html
index 7c03e93e967..7119f953b6a 100644
--- a/TAO/docs/libraries.html
+++ b/TAO/docs/libraries.html
@@ -28,7 +28,7 @@ straightforward way to get the features you need.
 <H3> List of Libraries </H3>
 
 Here we outline the list of libraries in TAO core with the list of <a
-href="../../MPC/docs/README"> MPC </a> projects that can be used by the
+href="../../MPC/README"> MPC </a> projects that can be used by the
 application to get all the required libraries linked into the
 application.  The library names in table below are the ones created on
 UNIX based systems.  Windows systems have a slightly different naming
@@ -103,7 +103,7 @@ and the dependencies outlined below are the same. <P>
    <td>Support for the TAO-specific Endpoint Policy. This is used
     to set up constraints on endpoints placed in IORs. The endpoint
     policy is applied to a POAManager via the POAManagerFactory and
-    affects all POAs associated with that manager. Examples of use
+    affects all POAs associated with that mananger. Examples of use
     are in $TAO_ROOT/tests/POA/EndpointPolicy. Applications have to
     <code> #include "tao/EndpointPolicy/EndpointPolicy.h" </code> to
     get the right symbols.</td>
@@ -181,18 +181,18 @@ and the dependencies outlined below are the same. <P>
    </tr>
    <tr align=left>
    <th>libTAO_PI.so</th>
-   <td>Support for Portable Interceptors. This library is automagically
+   <td>Support for Portalbe Interceptors. This library is automagically
     loaded by
     the ORB when the application uses the PolicyFactory or ORBInitializer
     . Just linking this library should be sufficient to
     get all the features that are required to write applications
-    using portable interceptors. </td>
+    using portable intercetpros. </td>
    <td>pi.mpb</td>
    </tr>
    <tr align=left>
    <th>libTAO_PortableServer.so</th>
    <td>Support for POA. This library is automagically loaded by
-    the ORB when the application calls resolve_initial_references
+    the ORB when the application calls resolve_intial_references
     ("RootPOA"); Just linking this library should be sufficient to
     get all the features that are required to write powerful
     servers. </td>
@@ -272,45 +272,6 @@ and the dependencies outlined below are the same. <P>
    </td>
    <td>csd_threadpool.mpb</td>
    </tr>
-   <tr align=left>
-   <th>libTAO_TC.so</th>
-   <td>Support for TAO::Transport::Current - a generic fremework for aplications that 
-   need access to statistical information about the currently used Transport. See <a 
-   href="transport_current/index.html"> Transport::Current</a>. 
-   This library can be loaded statically or dynamically. Applications are required to
-    <code> #include "tao/TransportCurrent/Transport_Current.h"
-    </code> for static loading.
-   </td>
-   <td>tc.mpb</td>
-   </tr>
-   <tr align=left>
-   <th>libTAO_TC_IIOP.so</th>
-   <td>Support for TAO::Transport::IIOP::Current - an IIOP-specific plug-in for 
-   Transport::Current. See <a href="transport_current/index.html"> Transport::Current</a>.
-   This library can be loaded statically or dynamically. 
-   Applications are required to <code> #include "tao/TransportCurrent/IIOP_Transport_Current.h"
-    </code> for static loading. Depends on libTAO_TC.so.
-   </td>
-   <td>tc_iiop.mpb</td>
-   </tr>
-   <tr align=left>
-   <th>libTAO_Compression.so</th>
-   <td>Support for Compression. This library can
-    be loaded statically or dynamically. Applications are required to
-    <code> #include "tao/Compression/Compression.h"
-    </code> for static loading.
-   </td>
-   <td>compression.mpb</td>
-   </tr>
-   <tr align=left>
-   <th>libTAO_ZlibCompressor.so</th>
-   <td>Support for Zlib Compression. This library can
-    be loaded statically or dynamically. Applications are required to
-    <code> #include "tao/Compression/zlib/ZlibCompressor.h"
-    </code> for static loading.
-   </td>
-   <td>zlibcompressor.mpb</td>
-   </tr>
 </tr>
 </table>
 
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 0fc2730415e..a177128c052 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -189,15 +189,15 @@ Notification Service
 <b>CCM Related</b>
 <br><BR>
 <li>
-<a href="../../../CIAO/docs/releasenotes/index.html">CORBA Component Model (CIAO)</a></li>
+<a href="../../CIAO/docs/releasenotes/index.html">CORBA Component Model (CIAO)</a></li>
 <li>
-<a href="../../../CIAO/docs/releasenotes/dance.html">Deployment and
+<a href="../../CIAO/docs/releasenotes/dance.html">Deployment and
     Configuration Engine (DAnCE)</a></li>
 <li>
-<a href="../../../CIAO/CIDLC/README.html">Component Implementation
+<a href="../../CIAO/CIDLC/README.html">Component Implementation
 Definition Language Compiler (CIDLC)</a></li>
 <li>
-<a href="../../../CIAO/docs/static_ciao_contents.html">Static Configuration
+<a href="../../CIAO/docs/static_ciao_contents.html">Static Configuration
     Support for Real-Time Platforms</a></li>
 </ul>
 </td>
@@ -285,7 +285,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 November 13, 2006.)
+<p>Current status: (As of May 4, 2006.)
 <ul>
 <li>
 Generated code closely follows the C++ Mapping specified in the latest
@@ -659,7 +659,7 @@ in a directory different from that where the other generated files are
 created.</li>
 
 <li>
-Generation of explicit template instantiations has been completely
+Generation of explicit template instantiations has been completely 
 removed, it is no longer available via the command line option -GT.</li>
 
 <li>
@@ -673,19 +673,6 @@ Added new command line option -oS to specify output directory for
 all skeleton files, including TIE class files, if generated. Overrides
 -o option value, if any.</li>
 
-<li>
-Uninlined all generated TIE class code, since inlining could potentially
-cause a problem for RTTI.</li>
-
-<li>
-Added new command line option <tt>-Gse</tt> that causes generation of
-an explicit export of each sequence's template base class. This is
-occasionally necessary as a workaround for a bug in Visual Studio
-(.NET 2002, .NET 2003 and Express 2005) where the template instantiation
-used for the base class isn't automatically exported. See
-<a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;309801">
-KB 309801</a> for more info</li>
-
 </ul>
 
 <h4>
@@ -708,9 +695,7 @@ have been found. One is to change the declaration of foo to be
 <p>and this has been done in all cases we could find in the IDL compiler
 source code. Another way to avoid the problem is to change the Release
 project Optimization setting to 'Minimize Size'. Reportedly the problem
-has been fixed in MSVC version 7.0.
-
-</ul>
+has been fixed in MSVC version 7.0.</ul>
 
 <h4>
 Future work:</h4>
@@ -1455,7 +1440,7 @@ Point of contact: <a href="mailto:pradeep@cs.wustl.edu">Pradeep Gore</a>
 <br>The different command line and service configurator options used
 for configuring the CORBA event services are located <A
 href="../cec_options.html"> here</a>. This implementation is based on
-the Real Time Event service.
+the Real Time Event service. 
 <h3>
 Features in this release:</h3>
 
@@ -1544,18 +1529,18 @@ Notify_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/Notify_Logging_Serv
 RTEvent_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/RTEvent_Logging_Service</tt></li></ul>
 
 <li>
-Each service registers with the Naming Service as
-"BasicLogFactory", "EventLogFactory", "NotifyLogFactory" and
+Each service registers with the Naming Service as 
+"BasicLogFactory", "EventLogFactory", "NotifyLogFactory" and 
 "RTEventLogFactory" respectively.</li>
 
 <li>
-Each service registers with the Interoperable Naming Service as
-"BasicLogService", "EventLogService", "NotifyLogService" and
+Each service registers with the Interoperable Naming Service as 
+"BasicLogService", "EventLogService", "NotifyLogService" and 
 "RTEventLogService" respectively.</li>
 
 <li>
-The Log Service uses a dynamically loaded "plug-in" Strategy for storing and
-querying log records.  The default Strategy stores Log records in memory and
+The Log Service uses a dynamically loaded "plug-in" Strategy for storing and 
+querying log records.  The default Strategy stores Log records in memory and 
 supports the Extended Trader Constraint Language (ETCL) Query Language.</li>
 
 <li>
@@ -2375,7 +2360,7 @@ Current Status:</h4>
 <p>A concrete CSD Strategy implementation has also been added to serve as a "reference implementation".  This is being called the CSD Thread Pool Strategy (TP_Strategy).  The TP_Strategy provides a means to decouple the threads (ORB threads) that receive requests from the underlying transport from the thread that will ultimately dispatch the request to the target servant object.  The TP_Strategy implements a "request queue" as the integral part of the mechanism that allows an ORB thread to "hand-off" a request to one of the TP_Strategy object's worker threads.  The TP_Strategy reference implementation is provided as an example of how concrete CSD Strategy could be implemented.
 <p>Two approaches are supported for applying CSD strategy to an application.
 <ol>
-<li>Explicitly calling CSD interfaces.
+<li>Explicitly calling CSD interfaces. 
 <p>Here is an example application code showing how a TP_Strategy object can be created and applied to a POA:
 
 <pre>
@@ -2392,7 +2377,7 @@ Current Status:</h4>
   csd_strategy->set_servant_serialization (false);
 
   // Tell the strategy to apply itself to the poa.
-  if (csd_strategy->apply_to(poa.in()) == false)
+  if (csd_strategy->apply_to(poa.in()) == false) 
     {
       ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to the poa.\n"));
       return -1;
@@ -2400,7 +2385,7 @@ Current Status:</h4>
 </pre>
 <li>Service Configurator
 
- <p>The format of the CSD specific parameters for creating the TP_Strategy service object is:
+ <p>The format of the CSD specific parameters for creating the TP_Strategy service object is:          
  <pre>-CSDtp &lt;poa_name&gt;:&lt;csd_thread_number&gt;:[OFF]</pre>
 
  <p>The last portion of the parameter is the servant serialization flag. It's only needed when the servant serialization needs be turned off, otherwise the servant serialization is always on. When servant serialization is on (the default), the TP_Strategy will serialize requests to any particular servant.  Requests to different servant objects can occur in parallel, but requests to any particular servant will be dispatched serially (ie, one at a time).
@@ -2408,8 +2393,8 @@ Current Status:</h4>
  <p>Here is an example of the svc.conf file.
 
  <pre>
-  dynamic TAO_CSD_TP_Strategy_Factory Service_Object *
-  TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
+  dynamic TAO_CSD_TP_Strategy_Factory Service_Object * 
+	TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
  </pre>
 </ol>
 </ul>
@@ -2463,16 +2448,16 @@ online</a>.<P>
 Point of contact: <a href="mailto:mcorino@remedy.nl">Martin Corino</a>, Remedy IT.
 
 
-<p>TAO has support for IPv6 for IIOP under Windows and Linux.
+<p>TAO has support for IPv6 for IIOP under Windows and Linux. 
 To use this, add <code>ipv6</code> to your <code>default.features</code>
 file and regenerate all makefiles. When using the automated tests, add IPV6
 to the configs.
 <p>
 Finished work:
-<li>Added IPv6 support to all IIOP related classes (parsers, connectors,
+<li>Added IPv6 support to all IIOP related classes (parsers, connectors, 
   acceptors)</li>
 <li>Added IPv6 support to corbaloc and mcast URL parsers.</li>
-<li>Implemented IPv6 support in the TAO_IOR_MCast utility class from TAO Svc
+<li>Implemented IPv6 support in the TAO_IOR_MCast utility class from TAO Svc 
   Utils</li>
 <p>
 
@@ -2480,7 +2465,7 @@ The following gotchas are known:
 <li>In a localhost situation connecting a server listening at the IPv6 ANY address
   has the following problems:
 On Linux this does not work when the client tries to connect to a
-    LinkLocal address of one the local NICs,
+    LinkLocal address of one the local NICs, 
 on Windows this only works (locally) by using the 'localhost' address (either
     IPv4 or IPv6)
 </li>
@@ -2493,8 +2478,8 @@ on Windows this only works (locally) by using the 'localhost' address (either
 
 <p>
 Future work:
-<li>IPv6 support for other protocols/strategies than IIOP (i.e. SHMIOP, UIOP,
-  SCIOP, SSLIOP etc.; for this we excluded some regression tests in IPv6 builds for this
+<li>IPv6 support for other protocols/strategies than IIOP (i.e. SHMIOP, UIOP, 
+  SCIOP, SSLIOP etc.; for this we excluded some regression tests in IPv6 builds for this 
   reason)</li>
 
 <li>IPv4 runtime dependencies in various CORBA services (f.i. Event service)
diff --git a/TAO/docs/transport_current/index.html b/TAO/docs/transport_current/index.html
deleted file mode 100644
index 40067cbdc35..00000000000
--- a/TAO/docs/transport_current/index.html
+++ /dev/null
@@ -1,488 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-
-<!-- $Id:$ -->
-
-<HTML>
-<HEAD>
-<TITLE>Using the TAO::Transport::Current Feature</TITLE>
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="transport_current.css">
-
-</HEAD>
-
-<BODY TEXT = "#000000" LINK="#000fff" VLINK="#ff0f0f" BGCOLOR="#ffffff">
-
-<P>
-
-<H1 ALIGN="CENTER">Using the TAO::Transport::Current Feature</H1>
-
-
-<P ALIGN="CENTER">
-Object Computing Inc.<BR>
-St.Louis, Missouri
-</P>
-
-<P ALIGN="CENTER">
-<SMALL><STRONG>
-<A HREF="mailto:iliyan@ociweb.com">Iliyan Jeliazkov</A>
-<A HREF="mailto:mesnier_p@ociweb.com">Phil Mesnier</A>
- and <A HREF="mailto:<john_c@ociweb.com">Ciju John</A>
-</STRONG></SMALL>
-</P>
-
-<HR>
-
-<P>
-<H3>Scope and Context</H3><P>
-
-<P>In TAO, it is just too hard to obtain statistical or pretty much any operational information about the network transport which the ORB is using. While this is a direct corollary of the CORBA's design paradigm which mandates hiding all this hairy stuff behind non-transparent abstractions, it also precludes effective ORB and network monitoring.
-</P>
-
-<P>
-The Transport::Current feature intends to fill this gap by defining a 
-framework for developing a wide range of solutions to this problem. It also provides a basic implementation for the most common case - the IIOP transport.
-</P>
-
-<P>
-By definition, transport-specific information is available in
-contexts where the ORB has selected a Transport:</P>
-
-<UL>
-  <LI>Within Client-side interception points;</LI>
-  <LI>Within Server-side interception points;</LI>
-  <LI>Inside a Servant up-call</LI>
-</UL>
-
-<P>
-The implementation is based on a generic service-oriented
-framework, implementing the TAO::Transport::Current interface. It is
-an optional service, which can be dynamically loaded. This service makes 
-the Transport::Current interface available through
-orb->resolve_initial_references() . The basic idea is that whenever a Transport is 
-chosen by the ORB, the Transport::Current (or a derivative) will have access 
-to that instance and be able to provide some useful information.
-</P>
-
-<BR><HR>
-
-
-<P>
-<H3>
-Programmer's Reference
-</H3>
-
-<P>
-Consider the following IDL interface, describing a Factory for
-producing TAO::Transport::Traits instance, which represents
-transport-specific data.
-</P>
-
-<PRE>
-#include <IOP.pidl>
-#include <TimeBase.pidl>
-
-module TAO
-{
-  /// A type used to represent counters
-  typedef unsigned long long CounterT;
-
-  module Transport
-  {
-    /// Used to signal that a call was made within improper invocation
-    /// context.  Also, this exception is thrown if no Transport has
-    /// been selected for the current thread, for example in a
-    /// collocated invocation.
-
-    exception NoContext
-    {
-    };
-
-    // The primary interface, providing access to Transport
-    // information, available to the current thread.
-
-    local interface Current
-    {
-      /// Transport ID, unique within the process.
-      readonly attribute long id raises (NoContext);
-
-      /// Bytes sent/received through the transport.
-      readonly attribute CounterT bytes_sent raises (NoContext);
-      readonly attribute CounterT bytes_received raises (NoContext);
-
-      /// Messages (requests and replies) sent/received using the current
-      /// protocol.
-      readonly attribute CounterT messages_sent raises (NoContext);
-      readonly attribute CounterT messages_received raises (NoContext);
-
-      /// The absolute time (miliseconds) since the transport has been
-      /// open.
-      readonly attribute TimeBase::TimeT open_since raises (NoContext);
-    };
-  };
-};
-</PRE>
-
-<P>
-As an example of a specialized Transport::Current is the Transport::IIOP::Current, which derives from Transport::Current and has an interface, described in the following IDL:
-</P>
-
-<PRE>
-#include "TC.idl"
-
-/// Provide a forward reference for the SSLIOP::Current
-module SSLIOP
-{
-  interface Current;
-};
-
-
-module TAO
-{
-  module Transport
-  {
-    module IIOP
-    {
-      // The primary interface, providing access to IIOP-specific
-      // transport information, if it is indeed an IIOP (-like) transport
-      // that has been selected.
-
-      local interface Current : TAO::Transport::Current
-      {
-        /// Remote host
-        readonly attribute string remote_host raises (NoContext);
-
-        /// Remote port Using long (signed) type to better accomodate
-        /// the Java mapping, which has no support for unsigned values
-        readonly attribute long remote_port raises (NoContext);
-
-        /// Local host
-        readonly attribute string local_host raises (NoContext);
-
-        /// Local port
-        readonly attribute long local_port raises (NoContext);
-
-        /// If this is a "secure" transport, this method will give you
-        /// the corresponding SSLIOP::Current
-        readonly attribute ::SSLIOP::Current ssliop_current raises (NoContext);
-      };
-    };
-  };
-};
-</PRE>
-
-
-<P>
-<H3>
-User's Guide
-</H3>
-
-<P>
-The TAO::Transport::Current can be used as a base interface for a more specialized TAO::Transport::X::Current. It is not required, however that a more specialized Current inherits from it.
-</P>
-
-<P>
-Typical, generic usage is shown in the
-$TAO_ROOT/orbsvcs/tests/Transport_Current/Framework test:
-</P>
-
-<PRE>
-...
-  // Get the Current object.                                                                                               
-  ::CORBA::Object_var tcobject =
-    orb->resolve_initial_references ("TAO::Transport::Current"
-                                      ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
-
-  ::TAO::Transport::Current_var tc =
-      ::TAO::Transport::Current::_narrow (tcobject.in ()
-                                      ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
-
-  if (CORBA::is_nil (tc.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) client - ERROR: Could not resolve ")
-                  ACE_TEXT ("TAO::Transport::Current object.\n")));
-
-      ACE_TRY_THROW (CORBA::INTERNAL ());
-    }
-...
-</PRE>
-
-<P>
-Another example is available from the $TAO_ROOT/orbsvcs/tests/Transport_Current/IIOP test. This fragment shows how to obtain transport-specific information:
-</P>
-
-<PRE>
-...
-   // Get the specific Current object.
-  CORBA::Object_var tcobject =
-    orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current")
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-
-  Transport::IIOP::Current_var tc =
-    Transport::IIOP::Current::_narrow (tcobject.in ()
-                                       ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
-
-  if (CORBA::is_nil (tc.in ()))
-      ACE_TRY_THROW (CORBA::INTERNAL ());
-
-  ::CORBA::String_var rhost (tc->remote_host (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_TRY_CHECK;
-
-  ::CORBA::String_var lhost (tc->local_host (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_TRY_CHECK;
-
-  ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-...
-</PRE>
-
-
-
-<P>
-<H3>
-Configuration, Bootstrap, Initialization and Operation
-</H3>
-
-<P>
-To use the Transport Current features the framework must be loaded
-through the Service Configuration framework. For example, using
-something like this:
-</P>
-
-<PRE>
-dynamic TAO_Transport_Current_Loader Service_Object * libTAO_Transport_Current.so:_make_TAO_Transport_Current_Loader() ""
-</PRE>
-
-<P>
-The Transport_Current_Loader service uses an ORB initializer to register the "TAO::Transport::Current" name in a way that allows it to be resolved via orb->resolve_initial_references(). The implementation is the TAO::Transport::Current_Impl class.
-</P>
-
-<P>
-A transport-specific Traits_Factory objects are loaded like this:
-</P>
-
-<PRE>
-...
-dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() ""
-...
-</PRE>
-
-<P>
-Note that any number of transport-specific Current interfaces may be available at any one time.
-</P>
-
-<P>
-Whenever a Transport::Current method is invoked, a pointer to the currently selected Transport instance must be accessible through Thread Specific Storage (TSS). For each thread, this is managed by modifying the TAO classes, instances of which are created on the stack during request/response processing.
-</P>
-
-<P>
-<H3>
-Implementation and Required Changes
-</H3>
-
-<P>
-The primary implementation is predicated upon usage of thread specific
-storage (TSS) and the guarantees C++ provides for calling the
-constructor and the destructor of automatic (stack-based)
-objects. Some existing objects, used in TAO will have to be modified
-and the necessary changes, both for client and the server side are
-detailed below.
-</P>
-
-<H4>
-Client Side: Sending Requests or Replies
-</H4>
-
-
-<P>
-The Profile_Transport_Resolver instance contains the reference to the
-Transport, which is the TAO implementation structure that is needed to extract 
-any protocol-specific information. An
-instance of Profile_Transport_Resolver lives on the stack, starting
-inside a call to Invocation_Adapter::invoke_remote_i(), or
-LocateRequest_Invocation_Adapter::invoke(). In the case of collocated
-invocations no such object is created.
-</P>
-
-<P>
-It is then passed around the calls that follow, except for the calls
-to the following Invocation_Base methods: send_request_interception(),
-receive_other_interception(), receive_reply_interception(),
-handle_any_exception(), handle_all_exception();
-</P>
-
-<P>
-Note that these in turn call the client-side interception points and
-that is where information about the transport will be needed. In order
-to make the transport information accessible inside those methods, we
-changed Profile_Transport_Resolver and the TAO_ServerRequest classes to
- incorporate an additional member:
-</P>
-
-<PRE>
-...
-TAO::Transport_Selection_Guard transport_;
-...
-</PRE>
-
-
-<P>
-This guard automatically keeps track of the currenty selected Transport from within its constructor and destructor. The rest of the TC framework  makes sure this pointer is stored in a thread-specific storage, by adding an additional member to TSS_Resources:
-</P>
-
-<PRE>
-...
-TAO::Transport_Selection_Guard* tsg_;
-...
-</PRE>
-
-<P>
-The idea is to keep a pointer to the last guard on the current thread. Each guard keeps a pointer to the previous, effectively creating a stack of transport selection guards. The stack structure ensures both that the selection/deselection of a Transport will be correctly handled. It also ensures that, in case the current thread temporarily changes the Transport, the previous “current� transport will be preserved, no matter how many times such change occurs. A good example for this is a nested up-call scenario.
-</P>
-
-<P>
-Inside an interceptor, one can use the methods from Transport Current to obtain information on the currently selected transport. The implementation simply looks up the TAO_Transport pointer via TSS_Resources::tsg_ and obtains the requested data.
-</P>
-
-
-
-<H4>
-Server Side: Request Processing
-</H4>
-
-
-<P>
-On the server side, the TAO_ServerRequest instance already has a
-Transport pointer. The TAO_ServerRequest lives on the stack, starting
-its life inside a call to TAO_GIOP_Message_Base::process_request().
-</P>
-
-<P>
-Similarly to the client-side, we changed the TAO_ServerRequest
-to add a field:
-</P>
-
-<PRE>
-...
-TAO::Transport_Selection_Guard transport_;
-...
-</PRE>
-
-<P>
-Operation is similar to the client-side case. In the collocated case there may not be a 
-transport available, so the TSS slot will be null.
-</P>
-
-<P>
-Inside an interceptor then, one can use an RIR-resolved
-TransportCurrent to create a specialization of TransportInfo, based on
-the kind of Transport used. Then they would _downcast() it to the
-specific type.
-</P>
-
-<H3>
-Structural and Footprint Impact
-</H3>
-
-<P>
-As the IIOP implementation of the Transport Current functionality requires additional 
-data to be kept about the Transport, we added a new field to TAO_Transport:
-</P>
-
-<PRE>
-...
-  /// Transport statistics
-  TAO::Transport::Stats* stats_
-...
-</PRE>
-
-<P>
-TAO::Transport::Stats is a simple structure, which keeps track of useful statistical 
-information about how a transport is used:
-</P>
-
-<PRE>
-...
-    class TAO_Export Stats
-    {
-    public:
-      Stats ();
-
-      void messages_sent (size_t message_length);
-      CORBA::LongLong messages_sent (void) const;
-      CORBA::LongLong bytes_sent (void) const;
-
-      void messages_received (size_t message_length);
-      CORBA::LongLong messages_received (void) const;
-      CORBA::LongLong bytes_received (void) const;
-
-      void opened_since (const ACE_Time_Value& tv);
-      const ACE_Time_Value& opened_since (void) const;
-
-    private:
-      CORBA::LongLong messages_rcvd_; // 32bits not enough (?)
-      CORBA::LongLong messages_sent_; // 32bits not enough (?)
-
-      ACE_Basic_Stats bytes_rcvd_;
-      ACE_Basic_Stats bytes_sent_;
-
-      ACE_Time_Value  opened_since_;
-    };
-...
-</PRE>
-
-<P>
-To gather the statistics the TAO_Transport::send_message_shared() and TAO_Transport::process_parsed_messages() must be modified. These are non-virtual methods and are being called as part of request and reply processing regardless of what the most derived Transport type is. This property ensures that any specific Transport will have access to these statistics.
-</P>
-
-<H3>
-Performance Impact
-</H3>
-
-<P>
-As the implementation of the Transport Current functionality
-necessitates some additional processing on the critical path of an
-invocation, we are expecting a performance impact when the
-functionality is being used. 
-</P>
-
-<P>
-It is possible at build time, to
-disable the functionality, so that applications only incur the penalty
-if they require it. The ORB, by default will not support the Transport Current functionality. 
-Use the following #define (in your config.h file) to enable it:
-</P>
-
-<PRE>
-#define TAO_HAS_TRANSPORT_CURRENT 1
-</PRE>
-
-<H3>
-Example Code
-</H3>
-
-<P>
-Look at $TAO_ROOT/orbsvcs/tests/Transport_Current for code which illustrates and tests this feature.
-</P>
-</BODY>
-</HTML>
diff --git a/TAO/docs/transport_current/transport_current.css b/TAO/docs/transport_current/transport_current.css
deleted file mode 100644
index 1993b851311..00000000000
--- a/TAO/docs/transport_current/transport_current.css
+++ /dev/null
@@ -1,31 +0,0 @@
-
-/* Century Schoolbook font is very similar to Computer Modern Math: cmmi */
-.MATH    { font-family: "Century Schoolbook", serif; }
-.MATH I  { font-family: "Century Schoolbook", serif; font-shape: italic }
-.BOLDMATH { font-family: "Century Schoolbook", serif; font-weight: bold }
-
-/* implement both fixed-size and relative sizes */
-SMALL.XTINY		{ font-size : xx-small }
-SMALL.TINY		{ font-size : x-small  }
-SMALL.SCRIPTSIZE	{ font-size : smaller  }
-SMALL.FOOTNOTESIZE	{ font-size : small    }
-SMALL.SMALL		{  }
-BIG.LARGE		{  }
-BIG.XLARGE		{ font-size : large    }
-BIG.XXLARGE		{ font-size : x-large  }
-BIG.HUGE		{ font-size : larger   }
-BIG.XHUGE		{ font-size : xx-large }
-
-/* heading styles */
-H1		{  }
-H2		{  }
-H3		{  }
-H4		{  }
-H5		{  }
-
-/* mathematics styles */
-DIV.displaymath		{ }	/* math displays */
-TD.eqno			{ }	/* equation-number cells */
-
-
-/* document-specific styles come next */
diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile.am b/TAO/docs/tutorials/Quoter/AMI/Makefile.am
index 8b2c868579f..06b7f62661a 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/AMI/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   QuoterC.cpp \
@@ -47,10 +46,10 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Quoter.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
index 8230799791a..b19033fbef3 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
+++ b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami {
   custom_only = 1
 }
 
-project(*client) : taoexe, portableserver, ami  {
+project(*client) : taoexe, portableserver, ami, exceptions  {
   after += *idl
   source_files {
     client.cpp
@@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, ami  {
   }
 }
 
-project(*server) : taoserver, ami {
+project(*server) : taoserver, ami, exceptions {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
index 59ec0863011..6636df72e21 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
@@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Quoter_Event_Service_Idl.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   QuoterC.cpp \
   QuoterC.h \
@@ -45,14 +43,14 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Quoter.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Quoter_Event_Service_Client.am
 
 if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -80,11 +78,13 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_EXCEPTIONS
 
 ## Makefile.Quoter_Event_Service_Server.am
 
 if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -115,6 +115,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
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 9d9eb79afc7..a98f1720c63 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
@@ -8,7 +8,7 @@ project(*idl) : taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*client) : orbsvcsexe, portableserver, event, event_skel, naming {
+project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions {
   after += *idl
   source_files {
     client.cpp
@@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, event, event_skel, naming {
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, event, event_skel, naming {
+project(*server) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/docs/tutorials/Quoter/Makefile.am b/TAO/docs/tutorials/Quoter/Makefile.am
index 83aa0ad74b0..9a0053b5806 100644
--- a/TAO/docs/tutorials/Quoter/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Makefile.am
@@ -12,7 +12,6 @@ SUBDIRS = \
         AMI \
         Event_Service \
         On_Demand_Activation \
-        RTCORBA \
         RT_Event_Service \
         idl \
         Simple \
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
index 28cb1412d21..797e2569292 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : orbsvcsexe, portableserver, naming  {
+project(*client) : orbsvcsexe, portableserver, naming, exceptions  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
@@ -15,7 +15,7 @@ project(*client) : orbsvcsexe, portableserver, naming  {
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, naming {
+project(*server) : orbsvcsexe, portableserver, naming, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
index 4f278eeebf3..29035de8f99 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   QuoterC.cpp \
@@ -47,10 +46,10 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Quoter.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -59,6 +58,7 @@ endif BUILD_AMI
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -88,6 +88,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
@@ -97,6 +98,7 @@ endif BUILD_AMI
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -130,6 +132,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
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 d68df58bb9b..650bdc9d832 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
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami {
   custom_only = 1
 }
 
-project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client) : taoexe, portableserver, naming, ami, minimum_corba, exceptions  {
   after += *idl
   source_files {
     client.cpp
@@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, av
   }
 }
 
-project(*server) : taoserver, naming, ami, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server) : taoserver, naming, ami, minimum_corba, exceptions {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am b/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am
deleted file mode 100644
index 4b87d4e87ec..00000000000
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am
+++ /dev/null
@@ -1,249 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-noinst_PROGRAMS =
-BUILT_SOURCES =
-
-## Makefile.RTCORBA_Quoter_Common.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES += \
-  DistributorC.cpp \
-  DistributorC.h \
-  DistributorC.inl \
-  DistributorS.inl
-
-CLEANFILES += \
-  Distributor-stamp \
-  DistributorC.cpp \
-  DistributorC.h \
-  DistributorC.inl \
-  DistributorS.inl
-
-DistributorC.cpp DistributorC.h DistributorC.inl DistributorS.inl: Distributor-stamp
-
-Distributor-stamp: $(srcdir)/Distributor.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Distributor.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  BrokerC.cpp \
-  BrokerC.h \
-  BrokerC.inl \
-  BrokerS.inl
-
-CLEANFILES += \
-  Broker-stamp \
-  BrokerC.cpp \
-  BrokerC.h \
-  BrokerC.inl \
-  BrokerS.inl
-
-BrokerC.cpp BrokerC.h BrokerC.inl BrokerS.inl: Broker-stamp
-
-Broker-stamp: $(srcdir)/Broker.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Broker.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CommonC.cpp \
-  CommonC.h \
-  CommonC.inl \
-  CommonS.h \
-  CommonS.inl
-
-CLEANFILES += \
-  Common-stamp \
-  CommonC.cpp \
-  CommonC.h \
-  CommonC.inl \
-  CommonS.h \
-  CommonS.inl
-
-CommonC.cpp CommonC.h CommonC.inl CommonS.h CommonS.inl: Common-stamp
-
-Common-stamp: $(srcdir)/Common.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Common.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libRTCORBA_Quoter_Common.la
-
-libRTCORBA_Quoter_Common_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DRTCORBA_QUOTER_COMMON_BUILD_DLL
-
-libRTCORBA_Quoter_Common_la_SOURCES = \
-  BrokerC.cpp \
-  CommonC.cpp \
-  DistributorC.cpp \
-  Stock_PriorityMapping.cpp
-
-noinst_HEADERS = \
-  Broker.idl \
-  BrokerC.h \
-  BrokerC.inl \
-  BrokerS.inl \
-  Common.idl \
-  CommonC.h \
-  CommonC.inl \
-  CommonS.h \
-  CommonS.inl \
-  Distributor.idl \
-  DistributorC.h \
-  DistributorC.inl \
-  DistributorS.inl \
-  Stock_PriorityMapping.h
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Quoter_Admin.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if BUILD_STL
-
-noinst_PROGRAMS += Admin
-
-Admin_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Admin_SOURCES = \
-  Admin.cpp
-
-Admin_LDADD = \
-  libRTCORBA_Quoter_Common.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_STL
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Quoter_Broker.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if BUILD_STL
-
-noinst_PROGRAMS += Broker
-
-Broker_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Broker_SOURCES = \
-  Broker.cpp \
-  BrokerS.cpp \
-  Broker_i.cpp \
-  CommonS.cpp \
-  StockNameConsumer_i.cpp \
-  BrokerS.h \
-  Broker_i.h \
-  StockNameConsumer_i.h \
-  Stock_Database.h
-
-Broker_LDADD = \
-  libRTCORBA_Quoter_Common.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_STL
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Quoter_Distributor.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if BUILD_STL
-
-noinst_PROGRAMS += Distributor
-
-Distributor_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Distributor_SOURCES = \
-  CommonS.cpp \
-  Distributor.cpp \
-  DistributorS.cpp \
-  Distributor_i.cpp \
-  DistributorS.h \
-  Distributor_i.h \
-  Stock_Database.h
-
-Distributor_LDADD = \
-  libRTCORBA_Quoter_Common.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_STL
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
index 8fe636bcd96..2e5698c1c71 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
 
 // local headers
 #include "StockNameConsumer_i.h"
@@ -24,7 +23,7 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna
        i < the_stockname->names ().length ();
        ++i)
     {
-      if (ACE_OS::strcmp (this->stock_name_,
+      if (ACE_OS::strcmp (this->stock_name_, 
                           the_stockname->names ()[i]) == 0)
         {
           // Get the quoter for the connection from the <context_>.
@@ -32,7 +31,7 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna
                       "*** message: getting the quoter connection\n"));
           Stock::StockQuoter_var quoter =
             this->context_.get_connection_quoter_info ();
-
+          
           try
             {
               // Request more information from the StockQuoter.
@@ -40,10 +39,10 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna
                           "*** message: requesting the stock info from the quoter\n"));
               Stock::StockInfo_var stock_info =
                 quoter->get_stock_info (the_stockname->names()[i]);
-
+              
               // Display the current value of the stock.
               ACE_DEBUG ((LM_DEBUG,
-                          "Current value of %s is $%d\n",
+                          "Current value of %s is $%d\n", 
                           stock_info->name.in (),
                           stock_info->last));
             }
@@ -60,14 +59,14 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna
 }
 
 
-::Stock::Cookie *
+::Stock::Cookie * 
 Stock_StockNameConsumer_i::cookie ()
   throw (::CORBA::SystemException)
 {
   return this->cookie_.in ();
 }
 
-void
+void 
 Stock_StockNameConsumer_i::cookie (::Stock::Cookie *cookie)
   throw (::CORBA::SystemException)
 {
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
index f18f6763052..5fcd5c51cc1 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
@@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Quoter_RT_Event_Service_Idl.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   QuoterC.cpp \
   QuoterC.h \
@@ -45,16 +43,16 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Quoter.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Quoter_RT_Event_Service_Client.am
 
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -87,6 +85,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
@@ -96,6 +95,7 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -131,6 +131,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
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 9fce32b5ba3..15cb6b2be5b 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
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions {
   after += *idl
   source_files {
     client.cpp
@@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_mini
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
index 39350e69199..d1f999594f1 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taoexe, portableserver {
+project : taoexe, portableserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
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 d66ed413d6e..e15b2b37572 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
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver, rtevent, naming  {
+project(*client) : taoexe, portableserver, rtevent, naming, exceptions  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
@@ -15,7 +15,7 @@ project(*client) : taoexe, portableserver, rtevent, naming  {
   }
 }
 
-project(*server) : taoserver, rtevent, naming, iortable {
+project(*server) : taoserver, rtevent, naming, iortable, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
index 02535fa4295..b66ca814609 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Quoter_Simple_ImprovedServer.am
 
 if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = server
 
@@ -42,6 +43,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
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 67da7604b8e..fda3b450dd6 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,5 @@
 // $Id$
-project : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project : taoserver, minimum_corba, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
index 5685980514b..c8c3a2ad4ae 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver {
+project(*client) : taoexe, portableserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
@@ -15,7 +15,7 @@ project(*client) : taoexe, portableserver {
   }
 }
 
-project(*server) : taoserver, avoids_corba_e_micro {
+project(*server) : taoserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
index 5cbce4fb41e..dc8789b784c 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taoserver {
+project : taoserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile.am b/TAO/docs/tutorials/Quoter/idl/Makefile.am
index 8e882c13c78..5670be7df9e 100644
--- a/TAO/docs/tutorials/Quoter/idl/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/idl/Makefile.am
@@ -13,14 +13,11 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Quoter_Idl_Lib.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   QuoterC.cpp \
   QuoterC.h \
@@ -29,7 +26,8 @@ BUILT_SOURCES = \
   QuoterS.h \
   QuoterS.inl \
   QuoterS_T.cpp \
-  QuoterS_T.h
+  QuoterS_T.h \
+  QuoterS_T.inl
 
 CLEANFILES = \
   Quoter-stamp \
@@ -40,9 +38,10 @@ CLEANFILES = \
   QuoterS.h \
   QuoterS.inl \
   QuoterS_T.cpp \
-  QuoterS_T.h
+  QuoterS_T.h \
+  QuoterS_T.inl
 
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h: Quoter-stamp
+QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
 
 Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h -GT $(srcdir)/Quoter.idl
@@ -67,11 +66,11 @@ noinst_HEADERS = \
   QuoterC.inl \
   QuoterS.h \
   QuoterS.inl \
+  QuoterS_T.cpp \
   QuoterS_T.h \
+  QuoterS_T.inl \
   quoter_common_export.h
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html
index 26c6fc4b8ca..d910ceafd98 100644
--- a/TAO/docs/tutorials/Quoter/index.html
+++ b/TAO/docs/tutorials/Quoter/index.html
@@ -42,7 +42,7 @@
     files for which links are provided.  If you choose to build and
     run the example, however, use the files which are part of
     the TAO source you <A
-    HREF="http://download.dre.vanderbilt.edu">download</a>. You can
+    HREF="http://deuce.doc.wustl.edu/Download.html">download</a>. You can
     find those source files in <CODE>$TAO_ROOT/docs/tutorials/Quoter</CODE>,
     where there's also a Makefile to build them with. Downloading the files
     individually from these links may result in source that does not build
diff --git a/TAO/examples/AMH/Sink_Server/Makefile.am b/TAO/examples/AMH/Sink_Server/Makefile.am
index 87c43abe6f1..001a8972f23 100644
--- a/TAO/examples/AMH/Sink_Server/Makefile.am
+++ b/TAO/examples/AMH/Sink_Server/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
 ## Makefile.Sink_Server_IDL.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -46,16 +45,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Sink_Server_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -83,13 +82,13 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Sink_Server_Mt_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += mt_server
 
@@ -124,13 +123,13 @@ mt_server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Sink_Server_St_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += st_server
 
@@ -163,7 +162,7 @@ st_server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/examples/AMI/FL_Callback/.cvsignore b/TAO/examples/AMI/FL_Callback/.cvsignore
new file mode 100644
index 00000000000..3a6a218885f
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/.cvsignore
@@ -0,0 +1,2 @@
+peer
+progress
diff --git a/TAO/examples/AMI/FL_Callback/Makefile.am b/TAO/examples/AMI/FL_Callback/Makefile.am
index 5626b5c582d..6639157e369 100644
--- a/TAO/examples/AMI/FL_Callback/Makefile.am
+++ b/TAO/examples/AMI/FL_Callback/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   testC.cpp \
@@ -47,10 +46,10 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -58,7 +57,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += peer
 
@@ -86,7 +85,7 @@ peer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -95,7 +94,6 @@ endif BUILD_AMI
 if BUILD_ACE_FLREACTOR
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_FL
 if BUILD_GL
 if BUILD_TAO_FLRESOURCE
@@ -137,7 +135,6 @@ endif BUILD_X11
 endif BUILD_TAO_FLRESOURCE
 endif BUILD_GL
 endif BUILD_FL
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 endif BUILD_ACE_FLREACTOR
diff --git a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
index 16f24c89b7e..2e2cc5507a3 100644
--- a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
+++ b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl) : taoclient {
+project(*idl) : taoclient, exceptions {
   IDL_Files {
     time.idl
   }
   custom_only = 1
 }
 
-project(*client) : taoclient, anytypecode {
+project(*client) : taoclient, anytypecode, exceptions {
   after += *idl
   requires += corba_messaging
   source_files {
@@ -19,7 +19,7 @@ project(*client) : taoclient, anytypecode {
   }
 }
 
-project(*server) : taoserver {
+project(*server) : taoserver, exceptions {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/examples/Advanced/ch_3/Makefile.am b/TAO/examples/Advanced/ch_3/Makefile.am
index 9a5724b48b9..d3aa395818f 100644
--- a/TAO/examples/Advanced/ch_3/Makefile.am
+++ b/TAO/examples/Advanced/ch_3/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -45,6 +45,7 @@ time-stamp: $(srcdir)/time.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/time.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   time.idl
 
diff --git a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
index 607fdfdc9c4..f27685e74cf 100644
--- a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
+++ b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver {
+project(*client) : taoexe, portableserver, exceptions {
   requires += dummy_label
   source_files {
     client.cpp
   }
 }
 
-project(*server) : taoserver {
+project(*server) : taoserver, exceptions {
   requires += dummy_label
   source_files {
     server.cpp
diff --git a/TAO/examples/Buffered_AMI/Makefile.am b/TAO/examples/Buffered_AMI/Makefile.am
index 132ff2d6b77..9f6e90c81c3 100644
--- a/TAO/examples/Buffered_AMI/Makefile.am
+++ b/TAO/examples/Buffered_AMI/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   testC.cpp \
@@ -47,10 +46,10 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -58,7 +57,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += client
 
@@ -84,7 +82,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -92,7 +89,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += server
 
@@ -119,7 +115,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/examples/Buffered_Oneways/Makefile.am b/TAO/examples/Buffered_Oneways/Makefile.am
index c6747b35f73..823fa4bf48b 100644
--- a/TAO/examples/Buffered_Oneways/Makefile.am
+++ b/TAO/examples/Buffered_Oneways/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.Buffered_Oneways_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += client
 
@@ -74,13 +74,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Buffered_Oneways_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += server
 
@@ -107,7 +105,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc b/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
index f3b5e903ecf..ee5b527e7c6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
@@ -1,39 +1,25 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Foo.idl
-  }
-  custom_only = 1
-}
-
-project(*Server) : csd_threadpool, taoserver, pi, avoids_corba_e_micro {
+project(*Server) : csd_threadpool, taoserver, pi {
   exename = server_main
-  after += *idl
 
   Source_Files {
-    FooC.cpp
-    FooS.cpp
     Foo_i.cpp
     ServerApp.cpp
     server_main.cpp
     OrbShutdownTask.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoexe, anytypecode {
   exename = client_main
-  after += *idl
+  after += *Server
 
   Source_Files {
     FooC.cpp
     ClientApp.cpp
     client_main.cpp
   }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am
index 391bf5abc26..099b8e11e3c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am
@@ -13,12 +13,10 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
-## Makefile.CSD_Test_ThreadPool_Idl.am
+## Makefile.CSD_Test_ThreadPool_Server.am
 
 BUILT_SOURCES = \
   FooC.cpp \
@@ -40,43 +38,10 @@ CLEANFILES = \
 FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_Test_ThreadPool_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
+noinst_PROGRAMS = server_main
 
 server_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -91,6 +56,10 @@ server_main_SOURCES = \
   OrbShutdownTask.cpp \
   ServerApp.cpp \
   server_main.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl \
   Foo_i.h \
   OrbShutdownTask.h \
   ServerApp.h
@@ -105,8 +74,51 @@ server_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
+## Makefile.CSD_Test_ThreadPool_Client.am
+
+BUILT_SOURCES += \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+CLEANFILES += \
+  Foo-stamp \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp
+
+Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
+	@touch $@
+
+noinst_PROGRAMS += client_main
+
+client_main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+client_main_SOURCES = \
+  ClientApp.cpp \
+  FooC.cpp \
+  client_main.cpp \
+  ClientApp.h \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+client_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
index fe1ed1fbc77..d21cced480b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
@@ -1,39 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Foo.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): csd_threadpool, taoserver, pi, avoids_corba_e_micro {
+project(*Server): csd_threadpool, taoserver, pi {
   exename = server_main
-  after += *idl
 
   Source_Files {
-    FooS.cpp
-    FooC.cpp
     Foo_i.cpp
     FooServantList.cpp
     ServerApp.cpp
     server_main.cpp
     OrbShutdownTask.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoexe, anytypecode {
   exename = client_main
-  after += *idl
+  after += *Server
 
   Source_Files {
     FooC.cpp
     ClientApp.cpp
     client_main.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
index 0ceadb0995d..89d9d992a92 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
@@ -13,12 +13,10 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
-## Makefile.CSD_Test_ThreadPool2_Idl.am
+## Makefile.CSD_Test_ThreadPool2_Server.am
 
 BUILT_SOURCES = \
   FooC.cpp \
@@ -40,43 +38,10 @@ CLEANFILES = \
 FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool2_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_Test_ThreadPool2_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
+noinst_PROGRAMS = server_main
 
 server_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -92,6 +57,10 @@ server_main_SOURCES = \
   OrbShutdownTask.cpp \
   ServerApp.cpp \
   server_main.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl \
   FooServantList.h \
   Foo_i.h \
   OrbShutdownTask.h \
@@ -107,8 +76,51 @@ server_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
+## Makefile.CSD_Test_ThreadPool2_Client.am
+
+BUILT_SOURCES += \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+CLEANFILES += \
+  Foo-stamp \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp
+
+Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
+	@touch $@
+
+noinst_PROGRAMS += client_main
+
+client_main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+client_main_SOURCES = \
+  ClientApp.cpp \
+  FooC.cpp \
+  client_main.cpp \
+  ClientApp.h \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+client_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
index 9a330589bd5..bf1561ed050 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
@@ -1,39 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Foo.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): csd_threadpool, taoserver, pi, avoids_corba_e_micro {
+project(*Server): csd_threadpool, taoserver, pi {
   exename = server_main
-  after += *idl
 
   Source_Files {
-    FooS.cpp
-    FooC.cpp
     Foo_i.cpp
     OrbTask.cpp
     ServerApp.cpp
     server_main.cpp
     OrbShutdownTask.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoexe, anytypecode {
   exename = client_main
-  after += *idl
+  after += *Server
 
   Source_Files {
     FooC.cpp
     ClientApp.cpp
     client_main.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am
index 44daa4549a9..92426403bee 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am
@@ -13,12 +13,10 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
-## Makefile.CSD_Test_ThreadPool3_Idl.am
+## Makefile.CSD_Test_ThreadPool3_Server.am
 
 BUILT_SOURCES = \
   FooC.cpp \
@@ -40,43 +38,10 @@ CLEANFILES = \
 FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool3_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_Test_ThreadPool3_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
+noinst_PROGRAMS = server_main
 
 server_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -92,6 +57,10 @@ server_main_SOURCES = \
   OrbTask.cpp \
   ServerApp.cpp \
   server_main.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl \
   Foo_i.h \
   OrbShutdownTask.h \
   OrbTask.h \
@@ -107,8 +76,51 @@ server_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
+## Makefile.CSD_Test_ThreadPool3_Client.am
+
+BUILT_SOURCES += \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+CLEANFILES += \
+  Foo-stamp \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp
+
+Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
+	@touch $@
+
+noinst_PROGRAMS += client_main
+
+client_main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+client_main_SOURCES = \
+  ClientApp.cpp \
+  FooC.cpp \
+  client_main.cpp \
+  ClientApp.h \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+client_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc b/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
index 905491e3204..f0c15486469 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): csd_threadpool, messaging, taoserver, pi, avoids_corba_e_micro {
+project(*Server): csd_threadpool, messaging, taoserver, pi {
   exename = server_main
 
   Source_Files {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am
index 2b58efae0e3..35d1e464c99 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 CLEANFILES =
@@ -22,31 +22,6 @@ BUILT_SOURCES =
 ## Makefile.CSD_Test_ThreadPool4_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
 
 BUILT_SOURCES += \
   CallbackC.cpp \
@@ -71,6 +46,29 @@ Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl
 	@touch $@
 
+BUILT_SOURCES += \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.cpp \
+  FooS.h \
+  FooS.inl
+
+CLEANFILES += \
+  Foo-stamp \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.cpp \
+  FooS.h \
+  FooS.inl
+
+FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
+
+Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
+	@touch $@
+
 noinst_PROGRAMS = server_main
 
 server_main_CPPFLAGS = \
@@ -116,8 +114,6 @@ server_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc b/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
index aad69c6586d..983089c4247 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
@@ -1,17 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Callback.idl
-    Foo.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): csd_threadpool, taoserver, pi, avoids_corba_e_micro {
+project(*Server): csd_threadpool, taoserver, pi {
   exename = server_main
-  after += *idl
 
   Source_Files {
     server_main.cpp
@@ -27,13 +18,11 @@ project(*Server): csd_threadpool, taoserver, pi, avoids_corba_e_micro {
     OrbTask.cpp
     OrbShutdownTask.cpp
   }
-  IDL_Files {
-  }
 }
 
-project(*Client): csd_threadpool, taoserver, pi, avoids_corba_e_micro {
+project(*Client): csd_threadpool, taoserver, pi {
   exename = client_main
-  after += *idl
+  after += *Server
 
   Source_Files {
     client_main.cpp
@@ -44,6 +33,5 @@ project(*Client): csd_threadpool, taoserver, pi, avoids_corba_e_micro {
     ClientTask.cpp
     ClientApp.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am
index 39ab69e625d..70eafaeb97b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am
@@ -13,12 +13,10 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
-## Makefile.CSD_Test_ThreadPool5_Idl.am
+## Makefile.CSD_Test_ThreadPool5_Server.am
 
 BUILT_SOURCES = \
   CallbackC.cpp \
@@ -40,7 +38,7 @@ CLEANFILES = \
 CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp
 
 Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Callback.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -63,39 +61,47 @@ CLEANFILES += \
 FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_HEADERS = \
-  Callback.idl \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool5_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
+noinst_PROGRAMS = server_main
 
-client_main_CPPFLAGS = \
+server_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_main_SOURCES = \
+server_main_SOURCES = \
   CallbackC.cpp \
   CallbackS.cpp \
   Callback_i.cpp \
-  ClientApp.cpp \
   ClientTask.cpp \
   FooC.cpp \
-  client_main.cpp \
+  FooS.cpp \
+  FooServantList.cpp \
+  Foo_i.cpp \
+  OrbShutdownTask.cpp \
+  OrbTask.cpp \
+  ServerApp.cpp \
+  server_main.cpp \
+  CallbackC.h \
+  CallbackC.inl \
+  CallbackS.h \
+  CallbackS.inl \
   Callback_i.h \
-  ClientApp.h \
-  ClientTask.h
+  ClientTask.h \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl \
+  FooServantList.h \
+  Foo_i.h \
+  OrbShutdownTask.h \
+  OrbTask.h \
+  ServerApp.h
 
-client_main_LDADD = \
+server_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
   $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
@@ -105,44 +111,81 @@ client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
+## Makefile.CSD_Test_ThreadPool5_Client.am
 
-## Makefile.CSD_Test_ThreadPool5_Server.am
+BUILT_SOURCES += \
+  CallbackC.cpp \
+  CallbackC.h \
+  CallbackC.inl \
+  CallbackS.cpp \
+  CallbackS.h \
+  CallbackS.inl
+
+CLEANFILES += \
+  Callback-stamp \
+  CallbackC.cpp \
+  CallbackC.h \
+  CallbackC.inl \
+  CallbackS.cpp \
+  CallbackS.h \
+  CallbackS.inl
 
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
+CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp
 
-noinst_PROGRAMS += server_main
+Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl
+	@touch $@
 
-server_main_CPPFLAGS = \
+BUILT_SOURCES += \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+CLEANFILES += \
+  Foo-stamp \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp
+
+Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
+	@touch $@
+
+noinst_PROGRAMS += client_main
+
+client_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_main_SOURCES = \
+client_main_SOURCES = \
   CallbackC.cpp \
   CallbackS.cpp \
   Callback_i.cpp \
+  ClientApp.cpp \
   ClientTask.cpp \
   FooC.cpp \
-  FooS.cpp \
-  FooServantList.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
+  client_main.cpp \
+  CallbackC.h \
+  CallbackC.inl \
+  CallbackS.h \
+  CallbackS.inl \
   Callback_i.h \
+  ClientApp.h \
   ClientTask.h \
-  FooServantList.h \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServerApp.h
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
 
-server_main_LDADD = \
+client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
   $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
@@ -152,9 +195,6 @@ server_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
index 20122bafaea..a17937ed47a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
@@ -1,40 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags += -GT
-
-  IDL_Files {
-    Foo.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): csd_threadpool, taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, pi {
+project(*Server): csd_threadpool, taoserver, minimum_corba, pi {
   exename = server_main
-  after += *idl
+  idlflags += -GT
 
   Source_Files {
-    FooS.cpp
-    FooC.cpp
     Foo_i.cpp
     ServerApp.cpp
     server_main.cpp
     OrbShutdownTask.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoexe, anytypecode {
   exename = client_main
-  after += *idl
+  after += *Server
 
   Source_Files {
     FooC.cpp
     ClientApp.cpp
     client_main.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
index 4a18890a672..9abf5027c19 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
@@ -13,14 +13,18 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
-## Makefile.CSD_Test_ThreadPool6_Idl.am
+## Makefile.CSD_Test_ThreadPool6_Server.am
+
+if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
@@ -28,9 +32,10 @@ BUILT_SOURCES = \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
-  FooS_T.h
+  FooS_T.h \
+  FooS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   Foo-stamp \
   FooC.cpp \
   FooC.h \
@@ -39,47 +44,15 @@ CLEANFILES = \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
-  FooS_T.h
+  FooS_T.h \
+  FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GT $(srcdir)/Foo.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GT $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool6_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_Test_ThreadPool6_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
 noinst_PROGRAMS += server_main
 
 server_main_CPPFLAGS = \
@@ -95,6 +68,12 @@ server_main_SOURCES = \
   OrbShutdownTask.cpp \
   ServerApp.cpp \
   server_main.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl \
+  FooS_T.h \
+  FooS_T.inl \
   Foo_i.h \
   OrbShutdownTask.h \
   ServerApp.h
@@ -109,8 +88,53 @@ server_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+
+## Makefile.CSD_Test_ThreadPool6_Client.am
+
+BUILT_SOURCES += \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+CLEANFILES += \
+  Foo-stamp \
+  FooC.cpp \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp
+
+Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
+	@touch $@
+
+noinst_PROGRAMS += client_main
+
+client_main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+client_main_SOURCES = \
+  ClientApp.cpp \
+  FooC.cpp \
+  client_main.cpp \
+  ClientApp.h \
+  FooC.h \
+  FooC.inl \
+  FooS.h \
+  FooS.inl
+
+client_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index 01387043653..6f8864086d4 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -9,7 +9,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(Callback_Quoter notifier): namingexe, utils, avoids_corba_e_micro {
+project(Callback_Quoter notifier): namingexe, utils {
   after += *IDL
   Source_Files {
     Notifier_i.cpp
diff --git a/TAO/examples/Callback_Quoter/Makefile.am b/TAO/examples/Callback_Quoter/Makefile.am
index 0aeaac91981..b43f75b062d 100644
--- a/TAO/examples/Callback_Quoter/Makefile.am
+++ b/TAO/examples/Callback_Quoter/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Callback_Quoter_IDL.am
 
 BUILT_SOURCES = \
@@ -66,15 +64,14 @@ Notifier-stamp: $(srcdir)/Notifier.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Notifier.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Consumer.idl \
   Notifier.idl
 
 ## Makefile.Callback_Quoter_consumer.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += consumer
+noinst_PROGRAMS = consumer
 
 consumer_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -105,12 +102,8 @@ consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Callback_Quoter_notifier.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += notifier
 
 notifier_CPPFLAGS = \
@@ -141,12 +134,8 @@ notifier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Callback_Quoter_supplier.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += supplier
 
 supplier_CPPFLAGS = \
@@ -176,8 +165,6 @@ supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index 95aa978da82..5f3f76cb9ba 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -36,12 +36,12 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
   if (offset >= this->file_size_)
     return false;  // Applications shouldn't throw system exceptions.
 
-  ACE_OFF_T real_offset =
+  off_t real_offset =
     ACE_OS::lseek (this->file_io_.get_handle (),
-                   static_cast <ACE_OFF_T> (offset),
+                   offset,
                    SEEK_SET);
 
-  if (real_offset == static_cast<ACE_OFF_T> (-1))
+  if (real_offset == (off_t) -1)
     // Invalid supplied offset?
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
index aef1c5571a5..72f7efebfa0 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
+++ b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   Web_ServerC.cpp \
@@ -47,10 +46,10 @@ Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Web_Server.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Web_Server.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -58,7 +57,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -90,7 +88,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -98,7 +95,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
@@ -132,7 +128,6 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Makefile.am b/TAO/examples/Content_Server/AMI_Observer/Makefile.am
index 3f9dfc031ee..78bb5860c28 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Makefile.am
+++ b/TAO/examples/Content_Server/AMI_Observer/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   Push_Web_ServerC.cpp \
@@ -47,10 +46,10 @@ Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Push_Web_Server.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Push_Web_Server.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -58,7 +57,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -92,7 +90,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -100,7 +97,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
@@ -134,7 +130,6 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 4ca7e00bedb..d5bab7f1ef8 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -43,12 +43,12 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
   if (offset >= this->file_size_)
     return 0;  // Applications shouldn't throw system exceptions.
 
-  ACE_OFF_T real_offset =
+  off_t real_offset =
     ACE_OS::lseek (this->file_io_.get_handle (),
-                   static_cast<ACE_OFF_T> (offset),
+                   offset,
                    SEEK_SET);
 
-  if (real_offset == static_cast<ACE_OFF_T> (-1))
+  if (real_offset == (off_t) -1)
     {
       // Invalid supplied offset?
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
index 8a387cef39f..2fbd736dec8 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
+++ b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,12 @@ Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Web_Server.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Web_Server.idl
 
 ## Makefile.SMI_Iterator_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -74,11 +74,9 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.SMI_Iterator_Server.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
@@ -108,7 +106,6 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index 28102fc21de..43cb7b7ec2f 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*notifier): namingexe, utils, avoids_corba_e_micro {
+project(*notifier): namingexe, utils {
   after += *IDL
   Source_Files {
     Event_Comm_i.cpp
diff --git a/TAO/examples/Event_Comm/Makefile.am b/TAO/examples/Event_Comm/Makefile.am
index ebd33962f9b..c362f197012 100644
--- a/TAO/examples/Event_Comm/Makefile.am
+++ b/TAO/examples/Event_Comm/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Event_Comm_IDL.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ Event_Comm-stamp: $(srcdir)/Event_Comm.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Event_Comm.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Event_Comm.idl
 
 ## Makefile.Event_Comm_Consumer.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += consumer
+noinst_PROGRAMS = consumer
 
 consumer_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -78,12 +75,8 @@ consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Event_Comm_Notifier.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += notifier
 
 notifier_CPPFLAGS = \
@@ -114,12 +107,8 @@ notifier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Event_Comm_Supplier.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += supplier
 
 supplier_CPPFLAGS = \
@@ -149,8 +138,6 @@ supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am
index be097aeacb9..daa38b4c0e5 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 SUBDIRS = \
@@ -27,102 +27,131 @@ BUILT_SOURCES =
 
 ## Makefile.Kokyu_DSRT_Schedulers.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 BUILT_SOURCES += \
+  EDF_SchedulingC.cpp \
+  EDF_SchedulingC.h \
+  EDF_SchedulingC.inl \
+  EDF_SchedulingS.inl \
+  EDF_SchedulingS_T.cpp \
+  EDF_SchedulingS_T.h \
+  EDF_SchedulingS_T.inl
+
+CLEANFILES += \
+  EDF_Scheduling-stamp \
+  EDF_SchedulingC.cpp \
+  EDF_SchedulingC.h \
+  EDF_SchedulingC.inl \
+  EDF_SchedulingS.inl \
+  EDF_SchedulingS_T.cpp \
+  EDF_SchedulingS_T.h \
+  EDF_SchedulingS_T.inl
+
+EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.inl EDF_SchedulingS_T.cpp EDF_SchedulingS_T.h EDF_SchedulingS_T.inl: EDF_Scheduling-stamp
+
+EDF_Scheduling-stamp: $(srcdir)/EDF_Scheduling.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/EDF_Scheduling.idl
+	@touch $@
+
+BUILT_SOURCES += \
   FP_SchedulingC.cpp \
   FP_SchedulingC.h \
   FP_SchedulingC.inl \
-  FP_SchedulingS.inl
+  FP_SchedulingS.inl \
+  FP_SchedulingS_T.cpp \
+  FP_SchedulingS_T.h \
+  FP_SchedulingS_T.inl
 
 CLEANFILES += \
   FP_Scheduling-stamp \
   FP_SchedulingC.cpp \
   FP_SchedulingC.h \
   FP_SchedulingC.inl \
-  FP_SchedulingS.inl
+  FP_SchedulingS.inl \
+  FP_SchedulingS_T.cpp \
+  FP_SchedulingS_T.h \
+  FP_SchedulingS_T.inl
 
-FP_SchedulingC.cpp FP_SchedulingC.h FP_SchedulingC.inl FP_SchedulingS.inl: FP_Scheduling-stamp
+FP_SchedulingC.cpp FP_SchedulingC.h FP_SchedulingC.inl FP_SchedulingS.inl FP_SchedulingS_T.cpp FP_SchedulingS_T.h FP_SchedulingS_T.inl: FP_Scheduling-stamp
 
 FP_Scheduling-stamp: $(srcdir)/FP_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/FP_Scheduling.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  MIF_SchedulingC.cpp \
-  MIF_SchedulingC.h \
-  MIF_SchedulingC.inl \
-  MIF_SchedulingS.inl
-
-CLEANFILES += \
-  MIF_Scheduling-stamp \
-  MIF_SchedulingC.cpp \
-  MIF_SchedulingC.h \
-  MIF_SchedulingC.inl \
-  MIF_SchedulingS.inl
-
-MIF_SchedulingC.cpp MIF_SchedulingC.h MIF_SchedulingC.inl MIF_SchedulingS.inl: MIF_Scheduling-stamp
-
-MIF_Scheduling-stamp: $(srcdir)/MIF_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MIF_Scheduling.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/FP_Scheduling.idl
 	@touch $@
 
 BUILT_SOURCES += \
   Kokyu_qosC.cpp \
   Kokyu_qosC.h \
   Kokyu_qosC.inl \
-  Kokyu_qosS.inl
+  Kokyu_qosS.inl \
+  Kokyu_qosS_T.cpp \
+  Kokyu_qosS_T.h \
+  Kokyu_qosS_T.inl
 
 CLEANFILES += \
   Kokyu_qos-stamp \
   Kokyu_qosC.cpp \
   Kokyu_qosC.h \
   Kokyu_qosC.inl \
-  Kokyu_qosS.inl
+  Kokyu_qosS.inl \
+  Kokyu_qosS_T.cpp \
+  Kokyu_qosS_T.h \
+  Kokyu_qosS_T.inl
 
-Kokyu_qosC.cpp Kokyu_qosC.h Kokyu_qosC.inl Kokyu_qosS.inl: Kokyu_qos-stamp
+Kokyu_qosC.cpp Kokyu_qosC.h Kokyu_qosC.inl Kokyu_qosS.inl Kokyu_qosS_T.cpp Kokyu_qosS_T.h Kokyu_qosS_T.inl: Kokyu_qos-stamp
 
 Kokyu_qos-stamp: $(srcdir)/Kokyu_qos.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/Kokyu_qos.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/Kokyu_qos.idl
+	@touch $@
+
+BUILT_SOURCES += \
+  MIF_SchedulingC.cpp \
+  MIF_SchedulingC.h \
+  MIF_SchedulingC.inl \
+  MIF_SchedulingS.inl \
+  MIF_SchedulingS_T.cpp \
+  MIF_SchedulingS_T.h \
+  MIF_SchedulingS_T.inl
+
+CLEANFILES += \
+  MIF_Scheduling-stamp \
+  MIF_SchedulingC.cpp \
+  MIF_SchedulingC.h \
+  MIF_SchedulingC.inl \
+  MIF_SchedulingS.inl \
+  MIF_SchedulingS_T.cpp \
+  MIF_SchedulingS_T.h \
+  MIF_SchedulingS_T.inl
+
+MIF_SchedulingC.cpp MIF_SchedulingC.h MIF_SchedulingC.inl MIF_SchedulingS.inl MIF_SchedulingS_T.cpp MIF_SchedulingS_T.h MIF_SchedulingS_T.inl: MIF_Scheduling-stamp
+
+MIF_Scheduling-stamp: $(srcdir)/MIF_Scheduling.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MIF_Scheduling.idl
 	@touch $@
 
 BUILT_SOURCES += \
   MUF_SchedulingC.cpp \
   MUF_SchedulingC.h \
   MUF_SchedulingC.inl \
-  MUF_SchedulingS.inl
+  MUF_SchedulingS.inl \
+  MUF_SchedulingS_T.cpp \
+  MUF_SchedulingS_T.h \
+  MUF_SchedulingS_T.inl
 
 CLEANFILES += \
   MUF_Scheduling-stamp \
   MUF_SchedulingC.cpp \
   MUF_SchedulingC.h \
   MUF_SchedulingC.inl \
-  MUF_SchedulingS.inl
+  MUF_SchedulingS.inl \
+  MUF_SchedulingS_T.cpp \
+  MUF_SchedulingS_T.h \
+  MUF_SchedulingS_T.inl
 
-MUF_SchedulingC.cpp MUF_SchedulingC.h MUF_SchedulingC.inl MUF_SchedulingS.inl: MUF_Scheduling-stamp
+MUF_SchedulingC.cpp MUF_SchedulingC.h MUF_SchedulingC.inl MUF_SchedulingS.inl MUF_SchedulingS_T.cpp MUF_SchedulingS_T.h MUF_SchedulingS_T.inl: MUF_Scheduling-stamp
 
 MUF_Scheduling-stamp: $(srcdir)/MUF_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MUF_Scheduling.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  EDF_SchedulingC.cpp \
-  EDF_SchedulingC.h \
-  EDF_SchedulingC.inl \
-  EDF_SchedulingS.inl
-
-CLEANFILES += \
-  EDF_Scheduling-stamp \
-  EDF_SchedulingC.cpp \
-  EDF_SchedulingC.h \
-  EDF_SchedulingC.inl \
-  EDF_SchedulingS.inl
-
-EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.inl: EDF_Scheduling-stamp
-
-EDF_Scheduling-stamp: $(srcdir)/EDF_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/EDF_Scheduling.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MUF_Scheduling.idl
 	@touch $@
 
 noinst_LTLIBRARIES = libKokyu_DSRT_Schedulers.la
@@ -154,32 +183,46 @@ noinst_HEADERS = \
   EDF_SchedulingC.h \
   EDF_SchedulingC.inl \
   EDF_SchedulingS.inl \
+  EDF_SchedulingS_T.cpp \
+  EDF_SchedulingS_T.h \
+  EDF_SchedulingS_T.inl \
   FP_Scheduler.h \
   FP_Scheduling.idl \
   FP_SchedulingC.h \
   FP_SchedulingC.inl \
   FP_SchedulingS.inl \
+  FP_SchedulingS_T.cpp \
+  FP_SchedulingS_T.h \
+  FP_SchedulingS_T.inl \
   Kokyu_dsrt_schedulers_export.h \
   Kokyu_qos.idl \
   Kokyu_qosC.h \
   Kokyu_qosC.inl \
   Kokyu_qosS.inl \
+  Kokyu_qosS_T.cpp \
+  Kokyu_qosS_T.h \
+  Kokyu_qosS_T.inl \
   MIF_Scheduler.h \
   MIF_Scheduling.idl \
   MIF_SchedulingC.h \
   MIF_SchedulingC.inl \
   MIF_SchedulingS.inl \
+  MIF_SchedulingS_T.cpp \
+  MIF_SchedulingS_T.h \
+  MIF_SchedulingS_T.inl \
   MUF_Scheduler.h \
   MUF_Scheduling.idl \
   MUF_SchedulingC.h \
   MUF_SchedulingC.inl \
   MUF_SchedulingS.inl \
+  MUF_SchedulingS_T.cpp \
+  MUF_SchedulingS_T.h \
+  MUF_SchedulingS_T.inl \
   Task_Stats.h \
   Task_Stats.inl \
   utils.h
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
index 291739d2c3b..88fb5944eaf 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,12 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.fp_client.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 noinst_PROGRAMS += fp_client
@@ -82,11 +82,9 @@ fp_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Makefile.fp_server.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 noinst_PROGRAMS += fp_server
@@ -122,7 +120,6 @@ fp_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
index 6a16acce3c4..64e4ad8dc81 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,12 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.mif_example_client.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 noinst_PROGRAMS += mif_client
@@ -82,11 +82,9 @@ mif_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Makefile.mif_example_server.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 noinst_PROGRAMS += mif_server
@@ -122,7 +120,6 @@ mif_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
index 0a687f715cc..bbe4466978d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,12 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.muf_client.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 noinst_PROGRAMS += muf_client
@@ -85,11 +85,9 @@ muf_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Makefile.muf_server.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 noinst_PROGRAMS += muf_server
@@ -125,7 +123,6 @@ muf_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Load_Balancing/Makefile.am b/TAO/examples/Load_Balancing/Makefile.am
index fc082b4f709..39143502800 100644
--- a/TAO/examples/Load_Balancing/Makefile.am
+++ b/TAO/examples/Load_Balancing/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -66,13 +66,13 @@ Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Load_Balancer.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Identity.idl \
   Load_Balancer.idl
 
 ## Makefile.Load_Balancing_Balancer.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 if !BUILD_REPO
 
@@ -103,11 +103,9 @@ load_balancer_LDADD = \
 
 endif !BUILD_REPO
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Load_Balancing_Server.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_REPO
 
 noinst_PROGRAMS += server
@@ -137,11 +135,9 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_REPO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Load_Balancing_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_REPO
 
 noinst_PROGRAMS += client
@@ -168,7 +164,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_REPO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Load_Balancing_persistent/Identity.idl b/TAO/examples/Load_Balancing_persistent/Identity.idl
index f16f5e410eb..f16f5e410eb 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Identity.idl
+++ b/TAO/examples/Load_Balancing_persistent/Identity.idl
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 0ffc8625639..0ffc8625639 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
index 94565ef6278..94565ef6278 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index 772a2092ada..772a2092ada 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
index 36cdc386f62..36cdc386f62 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
index 5c8d6b0b57d..5c8d6b0b57d 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h
index 3712d79c9f1..3712d79c9f1 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer.idl b/TAO/examples/Load_Balancing_persistent/Load_Balancer.idl
index 5b7cfa3b61a..5b7cfa3b61a 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer.idl
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer.idl
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index f5d171a3b4f..f5d171a3b4f 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 119c2ccb0e0..119c2ccb0e0 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index ec94198bcc1..ec94198bcc1 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
index 0ea8c460e6d..0ea8c460e6d 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 1eed96e354b..746dfa9c23a 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -9,7 +9,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*balancer): taoexe, utils, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*balancer): taoexe, utils, portableserver, minimum_corba {
   avoids += repo ace_for_tao
   exename = load_balancer
   after += *IDL
@@ -25,7 +25,7 @@ project(*balancer): taoexe, utils, portableserver, avoids_minimum_corba, avoids_
   }
 }
 
-project(*server): taoserver, utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server): taoserver, utils, minimum_corba {
   avoids += repo
   exename = server
   after += *IDL
@@ -42,7 +42,7 @@ project(*server): taoserver, utils, avoids_minimum_corba, avoids_corba_e_compact
   }
 }
 
-project(*client): taoclient, utils, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): taoclient, utils, portableserver, minimum_corba {
   avoids += repo
   exename = client
   after += *IDL
diff --git a/TAO/examples/Load_Balancing_persistent/Makefile.am b/TAO/examples/Load_Balancing_persistent/Makefile.am
index a70e0c49c71..f0f70c2e5a0 100644
--- a/TAO/examples/Load_Balancing_persistent/Makefile.am
+++ b/TAO/examples/Load_Balancing_persistent/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -66,14 +66,15 @@ Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Load_Balancer.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Identity.idl \
   Load_Balancer.idl
 
 ## Makefile.Load_Balancing_Persistent_Balancer.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 if !BUILD_REPO
 
 noinst_PROGRAMS += load_balancer
@@ -102,12 +103,12 @@ load_balancer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_REPO
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Load_Balancing_Persistent_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 if !BUILD_REPO
 
 noinst_PROGRAMS += client
@@ -134,11 +135,11 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_REPO
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.Load_Balancing_Persistent_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 if !BUILD_REPO
 
 noinst_PROGRAMS += server
@@ -168,7 +169,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_REPO
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Load_Balancing_persistent/README b/TAO/examples/Load_Balancing_persistent/README
index df36a00bb81..df36a00bb81 100644..100755
--- a/TAO/examples/Load_Balancing_persistent/README
+++ b/TAO/examples/Load_Balancing_persistent/README
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index 481a22e5c21..afd58b15f05 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*Service): namingexe, utils, avoids_corba_e_micro {
+project(*Service): namingexe, utils {
   after += *IDL
   Source_Files {
     Logger_i.cpp
diff --git a/TAO/examples/Logging/Makefile.am b/TAO/examples/Logging/Makefile.am
index b0918f2ea0c..e1364b58ef0 100644
--- a/TAO/examples/Logging/Makefile.am
+++ b/TAO/examples/Logging/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Logging_IDL.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ Logger-stamp: $(srcdir)/Logger.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Logger.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Logger.idl
 
 ## Makefile.Logging_Service.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Logging_Service
+noinst_PROGRAMS = Logging_Service
 
 Logging_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -79,12 +76,8 @@ Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Logging_Test.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += Logging_Test
 
 Logging_Test_CPPFLAGS = \
@@ -112,8 +105,6 @@ Logging_Test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Makefile.am b/TAO/examples/Makefile.am
index 0c060c8f495..d018c52d276 100644
--- a/TAO/examples/Makefile.am
+++ b/TAO/examples/Makefile.am
@@ -14,7 +14,6 @@ SUBDIRS = \
         Advanced \
         Buffered_AMI \
         Buffered_Oneways \
-        CSD_Strategy \
         Callback_Quoter \
         Content_Server \
         Event_Comm \
@@ -34,5 +33,5 @@ SUBDIRS = \
         ior_corbaloc \
         mfc
 
-# SUBDIRS += \
-# 	RTScheduling
+#	CSD_Strategy
+#	RTScheduling
diff --git a/TAO/examples/OBV/Typed_Events/Makefile.am b/TAO/examples/OBV/Typed_Events/Makefile.am
index bd482fdf39b..783713a39b9 100644
--- a/TAO/examples/OBV/Typed_Events/Makefile.am
+++ b/TAO/examples/OBV/Typed_Events/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -40,15 +40,16 @@ CLEANFILES = \
 Event_TypesC.cpp Event_TypesC.h Event_TypesC.inl Event_TypesS.cpp Event_TypesS.h Event_TypesS.inl: Event_Types-stamp
 
 Event_Types-stamp: $(srcdir)/Event_Types.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/Event_Types.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Event_Types.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Event_Types.idl
 
 ## Makefile.Typed_Events_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -79,11 +80,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.Typed_Events_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -114,7 +115,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index d8866966fca..82cd71b5df0 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -2,14 +2,13 @@
 // $Id$
 
 project(*IDL): taoidldefaults {
-  idlflags -= -St
   IDL_Files {
     Event_Types.idl
   }
   custom_only = 1
 }
 
-project(*server): taoserver, utils, valuetype, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server): taoserver, utils, valuetype, minimum_corba {
   exename = server
   after += *IDL
   Source_Files {
@@ -24,7 +23,7 @@ project(*server): taoserver, utils, valuetype, avoids_minimum_corba, avoids_corb
   }
 }
 
-project(*client): taoserver, utils, valuetype, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): taoserver, utils, valuetype, minimum_corba {
   exename = client
   after += *IDL
   Source_Files {
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile.am b/TAO/examples/POA/Adapter_Activator/Makefile.am
index de4a427b28f..d65122b0690 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile.am
+++ b/TAO/examples/POA/Adapter_Activator/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.POA_Adapter_Activator_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = server
 
@@ -38,7 +38,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index eeb6bebec4e..7b4048912d9 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoserver, minimum_corba {
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
 
diff --git a/TAO/examples/POA/DSI/Makefile.am b/TAO/examples/POA/DSI/Makefile.am
index 4aa9389ef7e..4e949a08ed5 100644
--- a/TAO/examples/POA/DSI/Makefile.am
+++ b/TAO/examples/POA/DSI/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Database.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Database.idl
 
 ## Makefile.POA_DSI_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -74,13 +75,13 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.POA_DSI_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -108,7 +109,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
index e866b93a919..508a5b3f898 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -6,7 +6,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*Client) : taoclient, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Client) : taoclient, messaging, minimum_corba {
   after += *IDL
   source_files {
     DatabaseC.cpp
@@ -16,7 +16,7 @@ project(*Client) : taoclient, messaging, avoids_minimum_corba, avoids_corba_e_co
   }
 }
 
-project(*Server) : taoserver, messaging, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server) : taoserver, messaging, dynamicinterface, minimum_corba {
   after += *IDL
   source_files {
     Database_i.cpp
diff --git a/TAO/examples/POA/Default_Servant/Makefile.am b/TAO/examples/POA/Default_Servant/Makefile.am
index 9a43d473ca0..89363c66f1c 100644
--- a/TAO/examples/POA/Default_Servant/Makefile.am
+++ b/TAO/examples/POA/Default_Servant/Makefile.am
@@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.POA_Default_Servant_IDL.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   FileC.cpp \
   FileC.h \
@@ -45,14 +43,13 @@ File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/File.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   File.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.POA_Default_Servant_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -72,11 +69,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.POA_Default_Servant_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -99,7 +96,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index b48685f3af7..55d3216ddfb 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*Client) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Client) : taoclient, anytypecode, minimum_corba {
   after += *IDL
   source_files {
     FileC.cpp
@@ -18,7 +18,7 @@ project(*Client) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_
   }
 }
 
-project(*Server) : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server) : taoserver, minimum_corba {
   after += *IDL
   source_files {
     File_i.cpp
diff --git a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am
index 6418d4a8979..ea05d7984b0 100644
--- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am
@@ -16,7 +16,6 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Alt_Resource.am
 
-if BUILD_EXCEPTIONS
 if BUILD_WFMO
 
 noinst_LTLIBRARIES = libAlt_Resource_Factory.la
@@ -36,7 +35,6 @@ noinst_HEADERS = \
   Resource_Factory.h
 
 endif BUILD_WFMO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile.am b/TAO/examples/POA/Explicit_Activation/Makefile.am
index 64426f3824d..e95bac97658 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile.am
+++ b/TAO/examples/POA/Explicit_Activation/Makefile.am
@@ -20,7 +20,7 @@ SUBDIRS = \
 
 ## Makefile.POA_Explicit_Activation_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = server
 
@@ -42,7 +42,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index 117b2ce33da..60b77c13641 100644
--- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoexe, portableserver, minimum_corba {
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
 
    specific (automake) {
      includes += $(srcdir)/../Generic_Servant
-   }
+   } 
    includes += ../Generic_Servant
 
    Source_Files {
diff --git a/TAO/examples/POA/FindPOA/Makefile.am b/TAO/examples/POA/FindPOA/Makefile.am
index 2e62250678d..be8760ad264 100644
--- a/TAO/examples/POA/FindPOA/Makefile.am
+++ b/TAO/examples/POA/FindPOA/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.POA_FindPOA.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = FindPOA
 
@@ -35,7 +35,7 @@ FindPOA_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
index 82b289cf4b2..be326877b8b 100644
--- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project: taoserver, minimum_corba {
   exename = FindPOA
 }
 
diff --git a/TAO/examples/POA/Forwarding/Makefile.am b/TAO/examples/POA/Forwarding/Makefile.am
index 688dfce1338..ebf175db309 100644
--- a/TAO/examples/POA/Forwarding/Makefile.am
+++ b/TAO/examples/POA/Forwarding/Makefile.am
@@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.POA_Forwarding_IDL.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   testC.cpp \
   testC.h \
@@ -45,14 +43,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.POA_Forwarding_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -73,11 +70,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.POA_Forwarding_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -102,7 +99,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
index 1ef382e5f9d..758ca27605f 100644
--- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
@@ -8,7 +8,7 @@ project(*IDL) : taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*Client) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Client) : taoclient, anytypecode, minimum_corba {
   after += *IDL
   source_files {
     client.cpp
@@ -18,7 +18,7 @@ project(*Client) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_
   }
 }
 
-project(*Server) : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server) : taoserver, minimum_corba {
   after += *IDL
   source_files {
     test_i.cpp
diff --git a/TAO/examples/POA/Generic_Servant/Makefile.am b/TAO/examples/POA/Generic_Servant/Makefile.am
index fe173975d57..4d82b4af0b7 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile.am
+++ b/TAO/examples/POA/Generic_Servant/Makefile.am
@@ -13,13 +13,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.POA_Generic_Servant_Lib.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   testC.cpp \
@@ -66,12 +66,12 @@ noinst_HEADERS = \
   testS.inl \
   test_i.h
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.POA_Generic_Servant_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = client
 
@@ -93,8 +93,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
index b864d913f4d..3c249a12a2e 100644
--- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
+++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*lib): taolib_with_idl, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*lib): taolib_with_idl, portableserver, 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 +8,7 @@ project(*lib): taolib_with_idl, portableserver, avoids_minimum_corba, avoids_cor
   }
 }
 
-project(*client): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): taoexe, portableserver, minimum_corba {
   avoids += ace_for_tao
   after  += *lib
   libs   += Generic_Servant
diff --git a/TAO/examples/POA/Loader/Makefile.am b/TAO/examples/POA/Loader/Makefile.am
index fb675280511..8fe08c1419f 100644
--- a/TAO/examples/POA/Loader/Makefile.am
+++ b/TAO/examples/POA/Loader/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.POA_Loader_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = server
 
@@ -41,7 +41,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc
index fe5d10539dc..72bcf90edb6 100644
--- a/TAO/examples/POA/Loader/POA_Loader.mpc
+++ b/TAO/examples/POA/Loader/POA_Loader.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoserver, minimum_corba {
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index 2628f42f52a..72bf969c798 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -47,7 +47,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
   void *symbol = this->dll_.symbol (factory_function);
-  intptr_t function = reinterpret_cast<intptr_t> (symbol);
+  long function = reinterpret_cast<long> (symbol);
 
   servant_supplier_ =
     reinterpret_cast<SERVANT_FACTORY> (function);
@@ -55,7 +55,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
   // Obtain the symbol for the function which will destroy the
   // servant.
   symbol = this->dll_.symbol (garbage_collection_function);
-  function = reinterpret_cast<intptr_t> (symbol);
+  function = reinterpret_cast<long> (symbol);
   servant_garbage_collector_ =
     reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function);
 }
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index 014b276b6ed..3850c8743ce 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -49,7 +49,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
   // to long first.
   //
   void *symbol = this->dll_.symbol (factory_function);
-  intptr_t function = reinterpret_cast<intptr_t> (symbol);
+  long function = reinterpret_cast<long> (symbol);
 
   servant_supplier_ =
     reinterpret_cast<SERVANT_FACTORY> (function);
@@ -57,7 +57,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
   // Obtain the symbol for the function which will destroy the
   // servant.
   symbol = this->dll_.symbol (garbage_collection_function);
-  function = reinterpret_cast<intptr_t> (symbol);
+  function = reinterpret_cast<long> (symbol);
 
   servant_garbage_collector_ =
     reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function);
diff --git a/TAO/examples/POA/NewPOA/Makefile.am b/TAO/examples/POA/NewPOA/Makefile.am
index f1ff572e71f..4c013aa8649 100644
--- a/TAO/examples/POA/NewPOA/Makefile.am
+++ b/TAO/examples/POA/NewPOA/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.POA_NewPOA.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = NewPOA
 
@@ -35,7 +35,7 @@ NewPOA_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
index 637cf6131ee..8cb1ef1dc40 100644
--- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
+++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
@@ -1,4 +1,4 @@
 //$Id$
-project : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project : taoserver, minimum_corba {
   exename = NewPOA
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile.am b/TAO/examples/POA/On_Demand_Activation/Makefile.am
index 425616ec409..87903538300 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile.am
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.POA_On_Demand_Activation_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = server
 
@@ -42,7 +42,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
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 0e0cc5e6d44..7b2742cdd86 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,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoexe, portableserver, minimum_corba {
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile.am b/TAO/examples/POA/On_Demand_Loading/Makefile.am
index 3f8c10eb082..0867d2d51ea 100644
--- a/TAO/examples/POA/On_Demand_Loading/Makefile.am
+++ b/TAO/examples/POA/On_Demand_Loading/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.POA_On_Demand_Loading_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = server
 
@@ -43,7 +43,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
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 74a034c6f99..843c856715b 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,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoexe, portableserver, minimum_corba {
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
index 7928d3143f9..ee712b7df80 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -81,7 +81,7 @@ ServantManager_i::obtain_servant (const char *str,
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
   void *symbol = dll->symbol (create_symbol_.c_str ());
-  intptr_t function = reinterpret_cast<intptr_t> (symbol);
+  long function = reinterpret_cast<long> (symbol);
 
   SERVANT_FACTORY servant_creator =
     reinterpret_cast<SERVANT_FACTORY> (function);
diff --git a/TAO/examples/POA/POA_BiDir/Makefile.am b/TAO/examples/POA/POA_BiDir/Makefile.am
index 34a34b595b1..36820860827 100644
--- a/TAO/examples/POA/POA_BiDir/Makefile.am
+++ b/TAO/examples/POA/POA_BiDir/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.POA_BiDir.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = POA_BiDir
 
@@ -38,7 +38,7 @@ POA_BiDir_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
index 214c90a98d3..ecb5e5fea43 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoserver, bidir_giop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project: taoserver, bidir_giop, minimum_corba {
   exename = POA_BiDir
 }
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
index 827110dbc6e..c639802ca9f 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
+++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Reference_Counted_Servant_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = server
 
@@ -38,7 +38,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
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 117b2ce33da..71264867f12 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,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoexe, portableserver, minimum_corba {
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
 
diff --git a/TAO/examples/POA/RootPOA/Makefile.am b/TAO/examples/POA/RootPOA/Makefile.am
index e9988e682df..4916916d912 100644
--- a/TAO/examples/POA/RootPOA/Makefile.am
+++ b/TAO/examples/POA/RootPOA/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.RootPOA_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = RootPOA
 
 RootPOA_CPPFLAGS = \
@@ -35,8 +32,6 @@ RootPOA_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/POA/TIE/Makefile.am b/TAO/examples/POA/TIE/Makefile.am
index eccd53e5fae..48b5269e9f9 100644
--- a/TAO/examples/POA/TIE/Makefile.am
+++ b/TAO/examples/POA/TIE/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -28,7 +28,8 @@ BUILT_SOURCES = \
   testS.h \
   testS.inl \
   testS_T.cpp \
-  testS_T.h
+  testS_T.h \
+  testS_T.inl
 
 CLEANFILES = \
   test-stamp \
@@ -39,21 +40,23 @@ CLEANFILES = \
   testS.h \
   testS.inl \
   testS_T.cpp \
-  testS_T.h
+  testS_T.h \
+  testS_T.inl
 
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h: test-stamp
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GT $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.POA_TIE_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -73,12 +76,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.POA_TIE_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -101,7 +104,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc
index d252530897f..e3213c6fb17 100644
--- a/TAO/examples/POA/TIE/POA_TIE.mpc
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -9,7 +9,7 @@ project(*IDL) : taoidldefaults {
   custom_only = 1
 }
 
-project(*Client) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Client) : taoclient, anytypecode, minimum_corba {
   after += *IDL
   avoids += ace_for_tao
   source_files {
@@ -20,7 +20,7 @@ project(*Client) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_
   }
 }
 
-project(*Server) : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server) : taoserver, minimum_corba {
   after += *IDL
   source_files {
     test_i.cpp
diff --git a/TAO/examples/Persistent_Grid/Makefile.am b/TAO/examples/Persistent_Grid/Makefile.am
index ec180c44c95..94a259562bd 100644
--- a/TAO/examples/Persistent_Grid/Makefile.am
+++ b/TAO/examples/Persistent_Grid/Makefile.am
@@ -13,10 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
 
 ## Makefile.Persistent_Grid_IDL.am
 
@@ -43,14 +42,13 @@ Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Grid.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Grid.idl
 
 ## Makefile.Persistent_Grid_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -75,12 +73,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Persistent_Grid_Persistent_Client.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += persistent_client
 
 persistent_client_CPPFLAGS = \
@@ -105,11 +99,9 @@ persistent_client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Persistent_Grid_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -137,7 +129,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index 3905b5e4b51..ee446f09b4c 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -8,8 +8,9 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): taoserver, utils, avoids_corba_e_micro, avoids_ace_for_tao {
+project(*server): taoserver, utils {
   after += *IDL
+  avoids += ace_for_tao
   Source_Files {
     Grid_i.cpp
     Simple_util.cpp
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
index 2f93ff5421e..4c296c2067d 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
+++ b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
@@ -11,7 +11,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): taoserver, strategies, avoids_corba_e_micro {
+project(*server): taoserver, strategies {
   exename = server
   after += *IDL
 
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am
index e51094a88e9..d95ae421691 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,13 @@ UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp -Sd $(srcdir)/UDP.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   UDP.idl
 
 ## Makefile.Basic_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -74,11 +75,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Basic_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -104,7 +105,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am
index 9c460d47827..d7e6378ffe8 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,13 @@ UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sd -Sp $(srcdir)/UDP.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   UDP.idl
 
 ## Makefile.Performance_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -74,11 +75,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Performance_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -102,7 +103,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
index e07a01de648..1ecc26f0279 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
+++ b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
@@ -11,7 +11,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): taoserver, strategies, avoids_corba_e_micro {
+project(*server): taoserver, strategies {
   exename = server
   after += *IDL
   Source_Files {
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
index f3f043456ab..c1dcffd04f4 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp -Sd $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.SimplePerformance_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -70,11 +71,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.SimplePerformance_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -98,7 +99,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Quoter/Makefile.am b/TAO/examples/Quoter/Makefile.am
index c5277398324..0085dd9be4e 100644
--- a/TAO/examples/Quoter/Makefile.am
+++ b/TAO/examples/Quoter/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,13 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Quoter.idl
 
 ## Makefile.Quoter_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -73,11 +74,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.Quoter_Factory_Finder.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Factory_Finder
 
@@ -108,11 +109,11 @@ Factory_Finder_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.Quoter_Generic_Factory.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Generic_Factory
 
@@ -143,11 +144,11 @@ Generic_Factory_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.Quoter_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -178,7 +179,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index 49d1da0a283..a5ed3d19def 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): namingexe, lifecycle, avoids_minimum_corba, utils, avoids_corba_e_micro {
+project(*server): namingexe, lifecycle, minimum_corba, utils {
   after += *IDL
   Source_Files {
     server.cpp
@@ -20,7 +20,7 @@ project(*server): namingexe, lifecycle, avoids_minimum_corba, utils, avoids_corb
   }
 }
 
-project(*client): namingexe, lifecycle, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): namingexe, lifecycle, minimum_corba {
   after += *IDL
   Source_Files {
     client.cpp
@@ -30,7 +30,7 @@ project(*client): namingexe, lifecycle, avoids_minimum_corba, avoids_corba_e_com
   }
 }
 
-project(*Factory Finder): namingexe, lifecycle, avoids_minimum_corba, utils {
+project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils {
   after += *IDL
   Source_Files {
     Factory_Finder.cpp
@@ -42,7 +42,7 @@ project(*Factory Finder): namingexe, lifecycle, avoids_minimum_corba, utils {
   }
 }
 
-project(*Generic Factory): namingexe, lifecycle, avoids_minimum_corba, utils {
+project(*Generic Factory): namingexe, lifecycle, minimum_corba, utils {
   after += *IDL
   Source_Files {
     Generic_Factory.cpp
diff --git a/TAO/examples/RTCORBA/Activity/Job.idl b/TAO/examples/RTCORBA/Activity/Job.idl
index 67c6efa531b..67c6efa531b 100644..100755
--- a/TAO/examples/RTCORBA/Activity/Job.idl
+++ b/TAO/examples/RTCORBA/Activity/Job.idl
diff --git a/TAO/examples/RTCORBA/Activity/Makefile.am b/TAO/examples/RTCORBA/Activity/Makefile.am
index a5eb07857f2..4b1f24cf431 100644
--- a/TAO/examples/RTCORBA/Activity/Makefile.am
+++ b/TAO/examples/RTCORBA/Activity/Makefile.am
@@ -13,13 +13,12 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.Activity.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 BUILT_SOURCES = \
@@ -28,7 +27,10 @@ BUILT_SOURCES = \
   JobC.inl \
   JobS.cpp \
   JobS.h \
-  JobS.inl
+  JobS.inl \
+  JobS_T.cpp \
+  JobS_T.h \
+  JobS_T.inl
 
 CLEANFILES = \
   Job-stamp \
@@ -37,12 +39,15 @@ CLEANFILES = \
   JobC.inl \
   JobS.cpp \
   JobS.h \
-  JobS.inl
+  JobS.inl \
+  JobS_T.cpp \
+  JobS_T.h \
+  JobS_T.inl
 
-JobC.cpp JobC.h JobC.inl JobS.cpp JobS.h JobS.inl: Job-stamp
+JobC.cpp JobC.h JobC.inl JobS.cpp JobS.h JobS.inl JobS_T.cpp JobS_T.h JobS_T.inl: Job-stamp
 
 Job-stamp: $(srcdir)/Job.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Job.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Job.idl
 	@touch $@
 
 noinst_PROGRAMS = activity
@@ -72,6 +77,8 @@ activity_SOURCES = \
   JobC.inl \
   JobS.h \
   JobS.inl \
+  JobS_T.h \
+  JobS_T.inl \
   Job_i.h \
   POA_Holder.h \
   Periodic_Task.h \
@@ -91,7 +98,6 @@ activity_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/RTCORBA/Activity/README b/TAO/examples/RTCORBA/Activity/README
index 32264d094e1..32264d094e1 100644..100755
--- a/TAO/examples/RTCORBA/Activity/README
+++ b/TAO/examples/RTCORBA/Activity/README
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index a0ae68a61ce..4a7db7dd4ab 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -2,14 +2,12 @@
 
 #include "DT_Creator.h"
 #include "Thread_Task.h"
+#include "tao/ORB_Core.h"
 #include "Task_Stats.h"
+#include "ace/High_Res_Timer.h"
 #include "DT_Creator.h"
-
-#include "tao/ORB_Core.h"
 #include "tao/RTScheduling/Current.h"
 
-#include "ace/High_Res_Timer.h"
-
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter;
 
 int
@@ -23,7 +21,6 @@ DT_Creator::dt_task_init (ACE_Arg_Shifter& arg_shifter)
   char *job_name = 0;
   int dist = 0;
   const ACE_TCHAR* current_arg = 0;
-
   if (arg_shifter.cur_arg_strncasecmp ("-Importance") == 0)
     {
       arg_shifter.consume_arg ();
@@ -31,44 +28,38 @@ DT_Creator::dt_task_init (ACE_Arg_Shifter& arg_shifter)
       importance = ACE_OS::atoi (current_arg);
       arg_shifter.consume_arg ();
     }
-
   if ((current_arg = arg_shifter.get_the_parameter ("-Start_Time")))
     {
       start_time = ACE_OS::atoi (current_arg);
       arg_shifter.consume_arg ();
     }
-
   if ((current_arg = arg_shifter.get_the_parameter ("-Iter")))
     {
       iter = ACE_OS::atoi (current_arg);
       arg_shifter.consume_arg ();
     }
-
   if ((current_arg = arg_shifter.get_the_parameter ("-Load")))
     {
       load = ACE_OS::atoi (current_arg);
       arg_shifter.consume_arg ();
     }
-
   if ((current_arg = arg_shifter.get_the_parameter ("-JobName")))
     {
       job_name = (char *)current_arg;
       dist = 1;
       arg_shifter.consume_arg ();
     }
-
   dt_list_ [dt_index++] = this->create_thr_task (importance,
-             start_time,
-             load,
-             iter,
-             dist,
-             job_name);
-
+						 start_time,
+						 load,
+						 iter,
+						 dist,
+						 job_name);
   return 0;
+
 }
 
 int log_index = 0;
-
 int
 DT_Creator::init (int argc, char *argv [])
 {
@@ -90,18 +81,18 @@ DT_Creator::init (int argc, char *argv [])
   int job_count = 0;
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-GuidSeed")))
+	if ((current_arg = arg_shifter.get_the_parameter ("-GuidSeed")))
         {
-          guid_counter = (long) ACE_OS::atoi (current_arg);
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-DT_Count")))
-        {
-          dt_count_ = ACE_OS::atoi (current_arg);
+	  guid_counter = (long) ACE_OS::atoi (current_arg);
+	  arg_shifter.consume_arg ();
+	}
+	else if ((current_arg = arg_shifter.get_the_parameter ("-DT_Count")))
+	  {
+	    dt_count_ = ACE_OS::atoi (current_arg);
           ACE_NEW_RETURN (dt_list_, Thread_Task*[dt_count_], -1);
-          active_dt_count_ = dt_count_;
+	  active_dt_count_ = dt_count_;
           arg_shifter.consume_arg ();
-        }
+	  }
       else if ((current_arg = arg_shifter.get_the_parameter ("-POA_Count")))
         {
           poa_count_ = ACE_OS::atoi (current_arg);
@@ -111,17 +102,17 @@ DT_Creator::init (int argc, char *argv [])
       else if ((current_arg = arg_shifter.get_the_parameter ("-JOB_Count")))
         {
           job_count_ = ACE_OS::atoi (current_arg);
-          active_job_count_ = job_count_;
-          ACE_NEW_RETURN (job_list_, Job_i*[job_count_], -1);
+	  active_job_count_ = job_count_;
+	  ACE_NEW_RETURN (job_list_, Job_i*[job_count_], -1);
           arg_shifter.consume_arg ();
         }
       else if (arg_shifter.cur_arg_strncasecmp ("-DT_Task") == 0)
-        {
+	{
           arg_shifter.consume_arg ();
-          dt_task_init (arg_shifter);
-        }
+	  dt_task_init (arg_shifter);
+	}
       else if (arg_shifter.cur_arg_strncasecmp ("-POA") == 0)
-        {
+	{
           arg_shifter.consume_arg ();
 
           ACE_NEW_RETURN (this->poa_list_[poa_count], POA_Holder (), -1);
@@ -131,37 +122,33 @@ DT_Creator::init (int argc, char *argv [])
               delete this->poa_list_[poa_count];
               return -1;
             }
-          else
-            {
-              poa_count++;
-            }
-        }
+	  else
+	    poa_count++;
+	}
       else if (arg_shifter.cur_arg_strncasecmp ("-Job") == 0)
-        {
+	{
           arg_shifter.consume_arg ();
 
           ACE_NEW_RETURN (this->job_list_[job_count], Job_i (this), -1);
 
           if (this->job_list_[job_count]->init (arg_shifter) == -1)
-            {
-              delete this->job_list_[job_count];
-              return -1;
-            }
-          else
-            {
-              job_count++;
-            }
-        }
+	    {
+	      delete this->job_list_[job_count];
+	      return -1;
+	    }
+	  else 
+	    job_count++;
+	}
       else if ((current_arg = arg_shifter.get_the_parameter ("-OutFile")))
-        {
-          file_name_ = CORBA::string_dup (current_arg);
-          arg_shifter.consume_arg ();
-        }
+	{
+	  file_name_ = CORBA::string_dup (current_arg);
+	  arg_shifter.consume_arg ();
+	}
       else if ((current_arg = arg_shifter.get_the_parameter ("-LogFile")))
-        {
-          log_file_name_ = CORBA::string_dup (current_arg);
-          arg_shifter.consume_arg ();
-        }
+	{
+	  log_file_name_ = CORBA::string_dup (current_arg);
+	  arg_shifter.consume_arg ();
+	}
       else
         {
           arg_shifter.ignore_arg ();
@@ -186,7 +173,7 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
         CORBA::string_dup ("Synch");
 
       synch_context = this->naming_->bind_new_context (name
-                   ACE_ENV_ARG_PARAMETER);
+						       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -208,7 +195,7 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
 
       CORBA::Object_var object =
         this->naming_->resolve (name
-        ACE_ENV_ARG_PARAMETER);
+				ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       synch_context = CosNaming::NamingContext::_narrow (object.in ());
@@ -227,19 +214,19 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
     CORBA::string_dup (synch_name.c_str ());
 
   ACE_DEBUG ((LM_DEBUG,
-        "Synch Name %s\n",
-        synch_name.c_str ()));
-
+	      "Synch Name %s\n",
+	      synch_name.c_str ()));
+  
   ACE_NEW (synch_,
-     Synch_i);
-
+	   Synch_i);
+  
   Synch_var synch = synch_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Register the synch object with the Synch context.
   synch_context->rebind (name,
-       synch.in ()
-       ACE_ENV_ARG_PARAMETER);
+			 synch.in ()
+			 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
@@ -250,12 +237,12 @@ DT_Creator::activate_root_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var object =
     orb_->resolve_initial_references ("RootPOA"
-              ACE_ENV_ARG_PARAMETER);
+				      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   root_poa_ =
     PortableServer::POA::_narrow (object.in ()
-          ACE_ENV_ARG_PARAMETER);
+				  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::POAManager_var poa_manager =
@@ -273,25 +260,25 @@ DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "DT_Creator::activate_poa_list\n"));
+		"DT_Creator::activate_poa_list\n"));
 
   if (poa_count_ > 0)
     {
       CORBA::Object_var object =
-  orb_->resolve_initial_references ("RTORB"
-            ACE_ENV_ARG_PARAMETER);
+	orb_->resolve_initial_references ("RTORB"
+					  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->rt_orb_ =
-  RTCORBA::RTORB::_narrow (object.in ()
-         ACE_ENV_ARG_PARAMETER);
+	RTCORBA::RTORB::_narrow (object.in ()
+				 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
   for (int i = 0; i < poa_count_; ++i)
     {
       poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in ()
-            ACE_ENV_ARG_PARAMETER);
+			      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -302,7 +289,7 @@ DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "DT_Creator::activate_job_list\n"));
+		"DT_Creator::activate_job_list\n"));
 
   Job_i* job;
 
@@ -362,8 +349,8 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "Activating schedule, task count = %d\n",
-    dt_count_));
+		"Activating schedule, task count = %d\n",
+		dt_count_));
 
   Thread_Task* task;
 
@@ -372,60 +359,60 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
       task = dt_list_[i];
 
       if (task->dist ())
-  {
-    // resolve the object from the naming service
-    CosNaming::Name name (1);
-    name.length (1);
-    name[0].id = CORBA::string_dup (task->job ());
-
-    CORBA::Object_var obj =
-      this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    Job_var job = Job::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    //    if (TAO_debug_level > 0)
-    // {
-        // Check that the object is configured with some
-        // PriorityModelPolicy.
-        CORBA::Policy_var policy =
-    job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                   ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (CORBA::is_nil (priority_policy.in ()))
-    ACE_DEBUG ((LM_DEBUG,
-          "ERROR: Priority Model Policy not exposed!\n"));
-        else
-    {
+	{
+	  // resolve the object from the naming service
+	  CosNaming::Name name (1);
+	  name.length (1);
+	  name[0].id = CORBA::string_dup (task->job ());
+
+	  CORBA::Object_var obj =
+	    this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+
+	  Job_var job = Job::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+
+	  //	  if (TAO_debug_level > 0)
+	  // {
+	      // Check that the object is configured with some
+	      // PriorityModelPolicy.
+	      CORBA::Policy_var policy =
+		job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
+				  ACE_ENV_ARG_PARAMETER);
+	      ACE_CHECK;
+
+	      RTCORBA::PriorityModelPolicy_var priority_policy =
+		RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
+						       ACE_ENV_ARG_PARAMETER);
+	      ACE_CHECK;
+
+	      if (CORBA::is_nil (priority_policy.in ()))
+		ACE_DEBUG ((LM_DEBUG,
+			    "ERROR: Priority Model Policy not exposed!\n"));
+	      else
+		{
                   /*
-      RTCORBA::PriorityModel priority_model =
-        priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (priority_model == RTCORBA::CLIENT_PROPAGATED)
-        ACE_DEBUG ((LM_DEBUG,
-        "%s priority_model = RTCORBA::CLIENT_PROPAGATED\n", task->job ()));
-      else
-        ACE_DEBUG ((LM_DEBUG,
-        "%s priority_model = RTCORBA::SERVER_DECLARED\n", task->job ()));
-      */
-    }
-        //} /*  if (TAO_debug_level > 0) */
-
-    task->job (job.in ());
-  }
+		  RTCORBA::PriorityModel priority_model =
+		    priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
+		  ACE_CHECK;
+
+		  if (priority_model == RTCORBA::CLIENT_PROPAGATED)
+		    ACE_DEBUG ((LM_DEBUG,
+				"%s priority_model = RTCORBA::CLIENT_PROPAGATED\n", task->job ()));
+		  else
+		    ACE_DEBUG ((LM_DEBUG,
+				"%s priority_model = RTCORBA::SERVER_DECLARED\n", task->job ()));
+		  */
+		}
+	      //} /*  if (TAO_debug_level > 0) */
+
+	  task->job (job.in ());
+	}
     }
   if (TAO_debug_level > 0 && dt_count_ > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "Activated schedule, task count = %d\n",
-    dt_count_));
+		"Activated schedule, task count = %d\n",
+		dt_count_));
 
 }
 
@@ -455,7 +442,7 @@ DT_Creator::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
-            ACE_ENV_ARG_DECL)
+					  ACE_ENV_ARG_DECL)
 {
   current_ = RTScheduling::Current::_duplicate (current);
 
@@ -467,24 +454,24 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
 
   ACE_DEBUG ((LM_DEBUG,
               "Waiting to Synch\n"));
-
+  
   while (!this->synch ()->synched ())
     {
       this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
   CORBA::Policy_var sched_param;
   sched_param = CORBA::Policy::_duplicate (this->sched_param (100));
   const char * name = 0;
   current_->begin_scheduling_segment (name,
-              sched_param.in (),
-              sched_param.in ()
-              ACE_ENV_ARG_PARAMETER);
+				      sched_param.in (),
+				      sched_param.in ()
+				      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW (base_time_,
-     ACE_Time_Value (*(this->synch ()->base_time ())));
+	   ACE_Time_Value (*(this->synch ()->base_time ())));
 
   for (int i = 0; i < this->dt_count_; i++)
     {
@@ -494,9 +481,9 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
 
       char buf [BUFSIZ];
       ACE_OS::sprintf (buf, "elapsed time = %d\n now = %d\n base_time_ = %d\n",
-           (int) elapsed_time.sec (),
-           (int) now.sec (),
-           (int) base_time_->sec());
+		       (int) elapsed_time.sec (),
+		       (int) now.sec (),
+		       (int) base_time_->sec());
 
       log [log_index++] = ACE_OS::strdup (buf) ;
 
@@ -504,21 +491,21 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
       ACE_Thread::self (curr_thr);
 
       if (dt_list_ [i]->start_time () != 0 && (elapsed_time.sec () < dt_list_[i]->start_time ()))
-  {
-    int suspension_time = dt_list_[i]->start_time () - elapsed_time.sec ();
-    ACE_OS::sprintf (buf,"suspension_tome = %d\n",
-         suspension_time);
-    log [log_index++] = ACE_OS::strdup (buf);
-    yield (suspension_time,
-     dt_list_[i]);
-  }
+	{
+	  int suspension_time = dt_list_[i]->start_time () - elapsed_time.sec ();
+	  ACE_OS::sprintf (buf,"suspension_tome = %d\n",
+			   suspension_time);
+	  log [log_index++] = ACE_OS::strdup (buf);
+	  yield (suspension_time,
+		 dt_list_[i]);
+	}
 
       sched_param = CORBA::Policy::_duplicate (this->sched_param (dt_list_ [i]->importance ()));
       dt_list_ [i]->activate_task (current,
-           sched_param.in (),
-           flags,
-           base_time_
-           ACE_ENV_ARG_PARAMETER);
+				   sched_param.in (),
+				   flags,
+				   base_time_
+				   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
     }
@@ -526,7 +513,7 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
   this->wait ();
 
   current_->end_scheduling_segment (name
-            ACE_ENV_ARG_PARAMETER);
+				    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->check_ifexit ();
@@ -566,9 +553,9 @@ DT_Creator::check_ifexit (void)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "Checking exit status Job# = %d DT# = %d\n",
-    active_job_count_,
-    active_dt_count_));
+		"Checking exit status Job# = %d DT# = %d\n",
+		active_job_count_,
+		active_dt_count_));
 
   static int shutdown = 0;
 
@@ -577,47 +564,47 @@ DT_Creator::check_ifexit (void)
 
     if (!shutdown)
       {
-  // All tasks have finished and all jobs have been shutdown.
-  if (active_dt_count_ == 0 && active_job_count_ == 0)
-    {
-
-      ACE_DEBUG ((LM_DEBUG, "Shutdown in progress ...\n"));
-
-      /*
-      for (int i = 0; i < dt_count_; i++)
-        {
-    dt_list_[i]->dump_stats ();
-        }
-
-      for (int i = 0; i < job_count_; i ++)
-        {
-    job_list_[i]->dump_stats ();
-        }
-      */
-      TASK_STATS::instance ()->dump_samples (file_name_,
-               "#Schedule Output",
-               ACE_High_Res_Timer::global_scale_factor ());
-
-      shutdown = 1;
-
-      FILE* log_file = ACE_OS::fopen (log_file_name_, "w");
-
-      if (log_file != NULL)
-        {
-    // first dump what the caller has to say.
-    ACE_OS::fprintf (log_file, "Log File\n");
-
-    for (int i = 0; i < log_index; i++)
-      {
-        ACE_OS::fprintf (log_file, "%s\n", log [i]);
-      }
-
-    ACE_OS::fclose (log_file);
-        }
-      ACE_DEBUG ((LM_DEBUG,
-      "Log File Ready\n"));
-
-    }
+	// All tasks have finished and all jobs have been shutdown.
+	if (active_dt_count_ == 0 && active_job_count_ == 0)
+	  {
+
+	    ACE_DEBUG ((LM_DEBUG, "Shutdown in progress ...\n"));
+
+	    /*
+	    for (int i = 0; i < dt_count_; i++)
+	      {
+		dt_list_[i]->dump_stats ();
+	      }
+
+	    for (int i = 0; i < job_count_; i ++)
+	      {
+		job_list_[i]->dump_stats ();
+	      }
+	    */
+	    TASK_STATS::instance ()->dump_samples (file_name_,
+						   "#Schedule Output",
+						   ACE_High_Res_Timer::global_scale_factor ());
+
+	    shutdown = 1;
+
+	    FILE* log_file = ACE_OS::fopen (log_file_name_, "w");
+
+	    if (log_file != NULL)
+	      {
+		// first dump what the caller has to say.
+		ACE_OS::fprintf (log_file, "Log File\n");
+
+		for (int i = 0; i < log_index; i++)
+		  {
+		    ACE_OS::fprintf (log_file, "%s\n", log [i]);
+		  }
+
+		ACE_OS::fclose (log_file);
+	      }
+	    ACE_DEBUG ((LM_DEBUG,
+			"Log File Ready\n"));
+
+	  }
       }
   }
 }
diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h
index 106f4221307..b461ab298b2 100644
--- a/TAO/examples/RTScheduling/DT_Creator.h
+++ b/TAO/examples/RTScheduling/DT_Creator.h
@@ -1,28 +1,25 @@
 //$Id$
-
 #ifndef DT_CREATOR_H
 #define DT_CREATOR_H
 
-#include "POA_Holder.h"
-#include "Job_i.h"
-#include "Synch_i.h"
-#include "rtschedtestlib_export.h"
-
-#include "tao/RTScheduling/RTScheduler.h"
 #include "orbsvcs/CosNamingC.h"
-
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
+#include "tao/RTScheduling/RTScheduler.h"
 #include "ace/Arg_Shifter.h"
+#include "POA_Holder.h"
+#include "Job_i.h"
+#include "Synch_i.h"
 
 class Thread_Task;
 class Task;
 
+
 typedef Thread_Task **DT_LIST;
 typedef POA_Holder **POA_LIST;
 typedef Job_i **JOB_LIST;
 
-class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
+class DT_Creator : public ACE_Service_Object
 {
  public:
   DT_Creator (void);
@@ -34,27 +31,27 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
   int dt_task_init (ACE_Arg_Shifter& arg_shifter);
 
   virtual void create_distributable_threads (RTScheduling::Current_ptr  current
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+					     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void activate_poa_list (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   void activate_job_list (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   void activate_schedule (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   virtual void yield (int suspend_time,
-          Thread_Task* task) = 0;
+		      Thread_Task* task) = 0;
 
   virtual void wait (void) = 0;
 
   virtual CORBA::Policy_ptr sched_param (int importance) = 0;
-
+  
   virtual Thread_Task* create_thr_task (int importance,
-          int start_time,
-          int load,
-          int iter,
-          int dist,
-          char *job_name) = 0;
+					int start_time,
+					int load,
+					int iter,
+					int dist,
+					char *job_name) = 0;
   //  virtual Task* task (void) = 0;
-
+  
   /// Resolve the naming service.
   int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -70,21 +67,21 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
   void orb (CORBA::ORB_ptr);
   CORBA::ORB_ptr orb (void);
 
-  ACE_Time_Value* base_time (void);
-  void base_time (ACE_Time_Value*);
+  ACE_Time_Value* base_time (void);  
+  void base_time (ACE_Time_Value*);  
 
-  ACE_hrtime_t base_hr_time (void);
+  ACE_hrtime_t base_hr_time (void);  
 
   virtual int total_load (void) = 0;
 
-  RTScheduling::Current_ptr current (void);
+  RTScheduling::Current_ptr current (void); 
 
   Synch_i* synch (void);
 
   void register_synch_obj (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   int activate_root_poa (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
+  
  protected:
 
 
@@ -103,7 +100,7 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
   int active_job_count_;
   char** log;
   ACE_Time_Value* base_time_;
-  RTScheduling::Current_var current_;
+  RTScheduling::Current_var current_; 
   /// RT ORB
   RTCORBA::RTORB_var rt_orb_;
   /// Reference to the root poa.
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
index b6dfd750067..b5da788d9fe 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
@@ -10,39 +10,37 @@ FP_DT_Creator::FP_DT_Creator (void)
 
 }
 
-Thread_Task*
+Thread_Task* 
 FP_DT_Creator::create_thr_task (int importance,
-                                int start_time,
-                                int load,
-                                int iter,
-                                int dist,
-                                char *job_name)
+				int start_time,
+				int load,
+				int iter,
+				int dist,
+				char *job_name)
 {
-  FP_Task* task = 0;
-  ACE_NEW_RETURN (task,
-                  FP_Task (importance,
-                           start_time,
-                           load,
-                           iter,
-                           dist,
-                           job_name,
-                           this),
-                  0);
+  FP_Task* task;
+  ACE_NEW_RETURN (task, 
+		  FP_Task (importance,
+			   start_time,
+			   load,
+			   iter,
+			   dist,
+			   job_name,
+			   this),
+			   0);
   return task;
 }
 
 CORBA::Policy_ptr
 FP_DT_Creator::sched_param (int importance)
 {
-  return
-    DT_TEST::instance ()->scheduler ()->create_segment_scheduling_parameter (
-                                          importance);
+  return DT_TEST::instance ()->scheduler ()->create_segment_scheduling_parameter (importance);
 }
 
 
 void
 FP_DT_Creator::yield (int suspend_time,
-          Thread_Task*)
+		      Thread_Task*)
 {
   ACE_OS::sleep (suspend_time);
 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
index 8bbb5376d50..34a2fbb7e08 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
@@ -15,14 +15,14 @@ public:
 
   //virtual Task* task (void);
   virtual Thread_Task* create_thr_task (int importance,
-                                        int start_time,
-                                        int load,
-                                        int iter,
-                                        int dist,
-                                        char *job_name);
-
+					int start_time,
+					int load,
+					int iter,
+					int dist,
+					char *job_name);
+  
   virtual void yield (int suspend_time,
-                      Thread_Task* task);
+		      Thread_Task* task);
 
   virtual void wait (void);
   virtual int total_load (void);
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
index a40849650ca..59aef8feb37 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
@@ -1,37 +1,49 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Starter): portableserver, namingexe {
+project(*Starter): namingexe, rtscheduling_server {
   after += MIF_Scheduler_Starter
-  libs += RTSchedSynch
+  idlflags += -o ..
 
+  IDL_Files {
+    ../Synch.idl
+  }
   Source_Files {
     ../Starter.cpp
+    ../Synch_i.cpp
+    ../SynchC.cpp
+    ../SynchS.cpp
   }
 
   exename = Starter
 }
 
 project(*test) : namingexe, rtscheduling_server {
-  after += *Starter RTSchedTestLib
-  libs += RTSchedTestLib Job RTSchedSynch
+  after += *Starter
 
-  idlflags += -SS -St -o ..
+  idlflags += -o ..
 
   IDL_Files {
+    ../Synch.idl
+    ../Job.idl
     ../FP_Scheduling.idl
   }
-
   Source_Files {
     test.cpp
     FP_DT_Creator.cpp
     FP_Task.cpp
     FP_Scheduler.cpp
     ../FP_SchedulingC.cpp
-  }
-
-  Header_Files {
-    fp_dt_creator_export.h
+    ../Thread_Task.cpp
+    ../DT_Creator.cpp
+    ../Job_i.cpp
+    ../POA_Holder.cpp
+    ../Task_Stats.cpp
+    ../Synch_i.cpp
+    ../SynchC.cpp
+    ../SynchS.cpp
+    ../JobC.cpp
+    ../JobS.cpp
   }
 
   exename = test
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
index f4a69d7bf83..9c4bfd8dda7 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
@@ -13,14 +13,45 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
 ## Makefile.Fixed_Priority_Scheduler_Starter.am
 
-if BUILD_EXCEPTIONS
+if BUILD_RT_CORBA
+
+BUILT_SOURCES += \
+  ../SynchC.cpp \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.cpp \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.cpp \
+  ../SynchS_T.h \
+  ../SynchS_T.inl
+
+CLEANFILES += \
+  ../Synch-stamp \
+  ../SynchC.cpp \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.cpp \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.cpp \
+  ../SynchS_T.h \
+  ../SynchS_T.inl
+
+../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp
+
+../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl
+	@touch $@
 
 noinst_PROGRAMS += Starter
 
@@ -34,38 +65,120 @@ Starter_CPPFLAGS = \
 
 Starter_SOURCES = \
   ../Starter.cpp \
-  ../Starter.h
+  ../SynchC.cpp \
+  ../SynchS.cpp \
+  ../Synch_i.cpp \
+  ../Starter.h \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.h \
+  ../SynchS_T.inl \
+  ../Synch_i.h
 
 Starter_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif BUILD_RT_CORBA
 
 ## Makefile.Fixed_Priority_Scheduler_Test.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
+  ../SynchC.cpp \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.cpp \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.cpp \
+  ../SynchS_T.h \
+  ../SynchS_T.inl
+
+CLEANFILES += \
+  ../Synch-stamp \
+  ../SynchC.cpp \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.cpp \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.cpp \
+  ../SynchS_T.h \
+  ../SynchS_T.inl
+
+../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp
+
+../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl
+	@touch $@
+
+BUILT_SOURCES += \
+  ../JobC.cpp \
+  ../JobC.h \
+  ../JobC.inl \
+  ../JobS.cpp \
+  ../JobS.h \
+  ../JobS.inl \
+  ../JobS_T.cpp \
+  ../JobS_T.h \
+  ../JobS_T.inl
+
+CLEANFILES += \
+  ../Job-stamp \
+  ../JobC.cpp \
+  ../JobC.h \
+  ../JobC.inl \
+  ../JobS.cpp \
+  ../JobS.h \
+  ../JobS.inl \
+  ../JobS_T.cpp \
+  ../JobS_T.h \
+  ../JobS_T.inl
+
+../JobC.cpp ../JobC.h ../JobC.inl ../JobS.cpp ../JobS.h ../JobS.inl ../JobS_T.cpp ../JobS_T.h ../JobS_T.inl: Job-stamp
+
+../Job-stamp: $(srcdir)/../Job.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Job.idl
+	@touch $@
+
+BUILT_SOURCES += \
   ../FP_SchedulingC.cpp \
   ../FP_SchedulingC.h \
-  ../FP_SchedulingC.inl
+  ../FP_SchedulingC.inl \
+  ../FP_SchedulingS.h \
+  ../FP_SchedulingS.inl \
+  ../FP_SchedulingS_T.cpp \
+  ../FP_SchedulingS_T.h \
+  ../FP_SchedulingS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   ../FP_Scheduling-stamp \
   ../FP_SchedulingC.cpp \
   ../FP_SchedulingC.h \
-  ../FP_SchedulingC.inl
+  ../FP_SchedulingC.inl \
+  ../FP_SchedulingS.h \
+  ../FP_SchedulingS.inl \
+  ../FP_SchedulingS_T.cpp \
+  ../FP_SchedulingS_T.h \
+  ../FP_SchedulingS_T.inl
 
-../FP_SchedulingC.cpp ../FP_SchedulingC.h ../FP_SchedulingC.inl: ../FP_Scheduling-stamp
+../FP_SchedulingC.cpp ../FP_SchedulingC.h ../FP_SchedulingC.inl ../FP_SchedulingS.h ../FP_SchedulingS.inl ../FP_SchedulingS_T.cpp ../FP_SchedulingS_T.h ../FP_SchedulingS_T.inl: FP_Scheduling-stamp
 
 ../FP_Scheduling-stamp: $(srcdir)/../FP_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -SS -St -o .. $(srcdir)/../FP_Scheduling.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../FP_Scheduling.idl
 	@touch $@
 
 noinst_PROGRAMS += test
@@ -79,23 +192,52 @@ test_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 test_SOURCES = \
+  ../DT_Creator.cpp \
   ../FP_SchedulingC.cpp \
+  ../JobC.cpp \
+  ../JobS.cpp \
+  ../Job_i.cpp \
+  ../POA_Holder.cpp \
+  ../SynchC.cpp \
+  ../SynchS.cpp \
+  ../Synch_i.cpp \
+  ../Task_Stats.cpp \
+  ../Thread_Task.cpp \
   FP_DT_Creator.cpp \
   FP_Scheduler.cpp \
   FP_Task.cpp \
   test.cpp \
+  ../DT_Creator.h \
   ../FP_SchedulingC.h \
   ../FP_SchedulingC.inl \
+  ../FP_SchedulingS.h \
+  ../FP_SchedulingS.inl \
+  ../FP_SchedulingS_T.h \
+  ../FP_SchedulingS_T.inl \
+  ../JobC.h \
+  ../JobC.inl \
+  ../JobS.h \
+  ../JobS.inl \
+  ../JobS_T.h \
+  ../JobS_T.inl \
+  ../Job_i.h \
+  ../POA_Holder.h \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.h \
+  ../SynchS_T.inl \
+  ../Synch_i.h \
+  ../Task_Stats.h \
+  ../Task_Stats.inl \
+  ../Thread_Task.h \
   FP_DT_Creator.h \
   FP_Scheduler.h \
   FP_Task.h \
-  fp_dt_creator_export.h \
   test.h
 
 test_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libRTSchedTestLib.la \
-  $(top_builddir)/examples/RTScheduling/libJob.la \
-  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
@@ -109,7 +251,6 @@ test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/RTScheduling/Job.mpc b/TAO/examples/RTScheduling/Job.mpc
deleted file mode 100644
index 103df7d95ce..00000000000
--- a/TAO/examples/RTScheduling/Job.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(Job): portableserver {
-  idlflags += -St \
-              -Wb,export_macro=JOB_Export \
-              -Wb,export_include=job_export.h
-  after += RTSchedSynch
-  libs += RTSchedSynch
-  dynamicflags += JOB_BUILD_DLL
-
-  IDL_Files {
-    Job.idl
-  }
-
-  Source_Files {
-    JobC.cpp
-    JobS.cpp
-  }
-
-  Header_Files {
-    JobC.h
-    JobS.h
-    job_export.h
-  }
-
-  Inline_Files {
-    JobC.inl
-    JobS.inl
-  }
-}
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index 00a5c022d0e..6179d1dac37 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -1,12 +1,10 @@
 //$Id$
-
 #include "Job_i.h"
-#include "DT_Creator.h"
-#include "Task_Stats.h"
 
 #include "tao/debug.h"
-
 #include "ace/Arg_Shifter.h"
+#include "DT_Creator.h"
+#include "Task_Stats.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Countdown_Time.h"
@@ -52,27 +50,27 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter)
 
 void
 Job_i::work (CORBA::ULong work,
-       CORBA::Short importance
-       ACE_ENV_ARG_DECL)
+	     CORBA::Short importance
+	     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static CORBA::ULong prime_number = 9619;
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "test_i::method: %d units of work\n",
-    work));
+		"test_i::method: %d units of work\n",
+		work));
 
   if (guid_ == 0)
     ACE_OS::memcpy (&guid_,
-        dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
-        sizeof (dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length ()));
+		    dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
+		    sizeof (dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length ()));
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "%t Guid is %d, Importance is %d\n",
-    guid_,
-    importance));
+		"%t Guid is %d, Importance is %d\n",
+		guid_,
+		importance));
 
   char msg [BUFSIZ];
   ACE_OS::sprintf (msg,
@@ -93,12 +91,12 @@ Job_i::work (CORBA::ULong work,
       ACE_Countdown_Time count_down (&count_down_time);
 
       while (count_down_time > ACE_Time_Value::zero)
-        {
-          ACE::is_prime (prime_number,
-            2,
-            prime_number / 2);
-          count_down.update ();
-        }
+	      {
+	        ACE::is_prime (prime_number,
+			      2,
+			      prime_number / 2);
+	        count_down.update ();
+	      }
 
       run_time = ACE_OS::gettimeofday () - *(dt_creator_->base_time ());
       TASK_STATS::instance ()->sample (run_time.sec (), guid_);
@@ -107,16 +105,16 @@ Job_i::work (CORBA::ULong work,
       sched_param = CORBA::Policy::_duplicate (dt_creator_->sched_param (importance));
       const char * name = 0;
       dt_creator_->current ()->update_scheduling_segment (name,
-                sched_param.in (),
-                sched_param.in ()
-                ACE_ENV_ARG_PARAMETER);
+							  sched_param.in (),
+							  sched_param.in ()
+							  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 Job_i::post_work (int /*guid*/,
-      int /*importance*/)
+		  int /*importance*/)
 {
 }
 
@@ -145,8 +143,8 @@ Job_i::dump_stats (void)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "File name %s\n",
-    fname));
+		"File name %s\n",
+		fname));
 
 
   char msg [BUFSIZ];
@@ -156,6 +154,6 @@ Job_i::dump_stats (void)
                    guid_);
 
   task_stats_->dump_samples (fname,
-           msg,
-           ACE_High_Res_Timer::global_scale_factor ());
+			     msg,
+			     ACE_High_Res_Timer::global_scale_factor ());
 }
diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h
index 219c5908f33..acf9febe00c 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -15,8 +15,6 @@
 
 #include "JobS.h"
 #include "Task_Stats.h"
-#include "rtschedtestlib_export.h"
-
 #include "ace/SString.h"
 #include "ace/Arg_Shifter.h"
 
@@ -28,7 +26,7 @@ class DT_Creator;
  * @brief Implements a Job that performs some cpu bound work.
  *
  */
-class RTSCHEDTESTLIB_Export Job_i : public POA_Job
+class Job_i : public POA_Job
 {
  public:
   /// Constructor
@@ -45,14 +43,14 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job
 
   /// = inteface Job method implementation.
   virtual void work (CORBA::ULong work,
-         CORBA::Short importance
-         ACE_ENV_ARG_DECL)
+		     CORBA::Short importance
+		     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual void post_work (int guid,
-        int importance);
+			  int importance);
 
   void dump_stats (void);
 
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
index c388b0f58d6..6453b197ce6 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
@@ -3,16 +3,14 @@
 #ifndef MIF_SCHEDULER_H
 #define MIF_SCHEDULER_H
 
-#include "../MIF_SchedulingC.h"
-
 #include "tao/orbconf.h"
 #include "tao/LocalObject.h"
+#include "ace/Synch_Traits.h"
 #include "tao/RTScheduling/RTScheduler.h"
-
+#include "../MIF_SchedulingC.h"
 #include "ace/Message_Queue.h"
 #include "ace/Null_Condition.h"
 #include "ace/Condition_Thread_Mutex.h"
-#include "ace/Synch_Traits.h"
 
 class DT : public ACE_Message_Block
 {
@@ -76,96 +74,96 @@ public TAO_Local_RefCounted_Object
   void incr_thr_count (void);
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
-               const char * name,
-               CORBA::Policy_ptr sched_param,
-               CORBA::Policy_ptr implicit_sched_param
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+					     const char * name,
+					     CORBA::Policy_ptr sched_param,
+					     CORBA::Policy_ptr implicit_sched_param
+					     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
-            const char * name,
-            CORBA::Policy_ptr sched_param,
-            CORBA::Policy_ptr implicit_sched_param
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+						const char * name,
+						CORBA::Policy_ptr sched_param,
+						CORBA::Policy_ptr implicit_sched_param
+						ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid,
-            const char * name,
-            CORBA::Policy_ptr sched_param,
-            CORBA::Policy_ptr implicit_sched_param
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+					  const char * name,
+					  CORBA::Policy_ptr sched_param,
+					  CORBA::Policy_ptr implicit_sched_param
+					  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-               const char * name
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+				       const char * name
+				       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                const char * name,
-                CORBA::Policy_ptr outer_sched_param
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+					      const char * name,
+					      CORBA::Policy_ptr outer_sched_param
+					      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+			     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+		     PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
-        RTScheduling::Current::IdType_out guid,
-        CORBA::String_out name,
-        CORBA::Policy_out sched_param,
-        CORBA::Policy_out implicit_sched_param
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+				RTScheduling::Current::IdType_out guid,
+				CORBA::String_out name,
+				CORBA::Policy_out sched_param,
+				CORBA::Policy_out implicit_sched_param
+				ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+		     PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+			   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+			       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+		     PortableInterceptor::ForwardRequest));
 
   virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+			   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+		     PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+			  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+		     PortableInterceptor::ForwardRequest));
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+			      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+				  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+		     PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+			      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+		     PortableInterceptor::ForwardRequest));
 
   virtual void cancel (const RTScheduling::Current::IdType & guid
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+		       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+				    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
@@ -175,14 +173,14 @@ public TAO_Local_RefCounted_Object
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                     CORBA::Policy_ptr scheduling_parameter
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+								     CORBA::Policy_ptr scheduling_parameter
+								     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
-           const char * name,
-           CORBA::Policy_ptr scheduling_parameter
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+					 const char * name,
+					 CORBA::Policy_ptr scheduling_parameter
+					 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
index b5bcda01605..1e6daba4900 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
@@ -1,23 +1,30 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Starter): portableserver, namingexe {
-  after += RTSchedSynch
-  libs += RTSchedSynch
+project(*Starter): namingexe, rtscheduling_server {
+  idlflags += -o ..
+
+  IDL_Files {
+    ../Synch.idl
+  }
 
   Source_Files {
     ../Starter.cpp
+    ../Synch_i.cpp
+    ../SynchC.cpp
+    ../SynchS.cpp
   }
 
   exename = Starter
 }
 
 project(*test) : namingexe, rtscheduling_server {
-  after += *Starter RTSchedTestLib
-  libs += RTSchedTestLib Job RTSchedSynch
-  idlflags += -SS -St -o ..
+  after += *Starter
+  idlflags += -o ..
 
   IDL_Files {
+    ../Synch.idl
+    ../Job.idl
     ../MIF_Scheduling.idl
   }
 
@@ -27,10 +34,16 @@ project(*test) : namingexe, rtscheduling_server {
     MIF_Task.cpp
     MIF_Scheduler.cpp
     ../MIF_SchedulingC.cpp
-  }
-
-  Header_Files {
-    mif_dt_creator_export.h
+    ../Thread_Task.cpp
+    ../DT_Creator.cpp
+    ../JobC.cpp
+    ../JobS.cpp
+    ../Job_i.cpp
+    ../POA_Holder.cpp
+    ../Task_Stats.cpp
+    ../SynchC.cpp
+    ../SynchS.cpp
+    ../Synch_i.cpp
   }
 
   exename = test
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
index d504fd941f5..bfb170e19b2 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
@@ -1,18 +1,16 @@
 //$Id$
-
 #include "MIF_Task.h"
 #include "test.h"
-
 #include "ace/OS_NS_errno.h"
 #include "ace/Countdown_Time.h"
 
 MIF_Task::MIF_Task (int importance,
-        int start_time,
-        int load,
-        int iter,
-        int dist,
-        char *job_name,
-        DT_Creator *dt_creator)
+		    int start_time,
+		    int load,
+		    int iter,
+		    int dist,
+		    char *job_name,
+		    DT_Creator *dt_creator)
 {
   this->load_ = load;
   this->iter_ = iter;
@@ -47,16 +45,16 @@ MIF_Task::post_activate (void)
 
 int
 MIF_Task::activate_task (RTScheduling::Current_ptr current,
-       CORBA::Policy_ptr sched_param,
-       long flags,
-       ACE_Time_Value* base_time
-       ACE_ENV_ARG_DECL)
+			 CORBA::Policy_ptr sched_param,
+			 long flags,
+			 ACE_Time_Value* base_time
+			 ACE_ENV_ARG_DECL)
 {
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "Thread_Task::activate %d\n",
-    importance_));
+		"Thread_Task::activate %d\n",
+		importance_));
 
   char msg [BUFSIZ];
   ACE_OS::sprintf (msg, "Thread_Task::activate task\n");
@@ -65,7 +63,7 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current,
   base_time_ = base_time;
 
   current_ = RTScheduling::Current::_narrow (current
-               ACE_ENV_ARG_PARAMETER);
+					     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   sched_param_ = CORBA::Policy::_duplicate (sched_param);
@@ -73,12 +71,12 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current,
   pre_activate ();
 
   if (this->activate (flags,
-          1) == -1)
+		      1) == -1)
     {
       if (ACE_OS::last_error () == EPERM)
-  ACE_ERROR_RETURN ((LM_ERROR,
-         ACE_TEXT ("Insufficient privilege to run this test.\n")),
-        -1);
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   ACE_TEXT ("Insufficient privilege to run this test.\n")),
+			  -1);
     }
 
   post_activate ();
@@ -171,8 +169,8 @@ MIF_Task::perform_task (void)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "Thread %d\n",
-    this->count_));
+		"Thread %d\n",
+		this->count_));
 
   if (dist_)
     job_->shutdown ();
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am
index bb81c19e0bc..3be128d444b 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am
@@ -13,14 +13,45 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
 ## Makefile.MIF_Scheduler_Starter.am
 
-if BUILD_EXCEPTIONS
+if BUILD_RT_CORBA
+
+BUILT_SOURCES += \
+  ../SynchC.cpp \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.cpp \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.cpp \
+  ../SynchS_T.h \
+  ../SynchS_T.inl
+
+CLEANFILES += \
+  ../Synch-stamp \
+  ../SynchC.cpp \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.cpp \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.cpp \
+  ../SynchS_T.h \
+  ../SynchS_T.inl
+
+../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp
+
+../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl
+	@touch $@
 
 noinst_PROGRAMS += Starter
 
@@ -34,38 +65,120 @@ Starter_CPPFLAGS = \
 
 Starter_SOURCES = \
   ../Starter.cpp \
-  ../Starter.h
+  ../SynchC.cpp \
+  ../SynchS.cpp \
+  ../Synch_i.cpp \
+  ../Starter.h \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.h \
+  ../SynchS_T.inl \
+  ../Synch_i.h
 
 Starter_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif BUILD_RT_CORBA
 
 ## Makefile.MIF_Scheduler_Test.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
+  ../SynchC.cpp \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.cpp \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.cpp \
+  ../SynchS_T.h \
+  ../SynchS_T.inl
+
+CLEANFILES += \
+  ../Synch-stamp \
+  ../SynchC.cpp \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.cpp \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.cpp \
+  ../SynchS_T.h \
+  ../SynchS_T.inl
+
+../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp
+
+../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl
+	@touch $@
+
+BUILT_SOURCES += \
+  ../JobC.cpp \
+  ../JobC.h \
+  ../JobC.inl \
+  ../JobS.cpp \
+  ../JobS.h \
+  ../JobS.inl \
+  ../JobS_T.cpp \
+  ../JobS_T.h \
+  ../JobS_T.inl
+
+CLEANFILES += \
+  ../Job-stamp \
+  ../JobC.cpp \
+  ../JobC.h \
+  ../JobC.inl \
+  ../JobS.cpp \
+  ../JobS.h \
+  ../JobS.inl \
+  ../JobS_T.cpp \
+  ../JobS_T.h \
+  ../JobS_T.inl
+
+../JobC.cpp ../JobC.h ../JobC.inl ../JobS.cpp ../JobS.h ../JobS.inl ../JobS_T.cpp ../JobS_T.h ../JobS_T.inl: Job-stamp
+
+../Job-stamp: $(srcdir)/../Job.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Job.idl
+	@touch $@
+
+BUILT_SOURCES += \
   ../MIF_SchedulingC.cpp \
   ../MIF_SchedulingC.h \
-  ../MIF_SchedulingC.inl
+  ../MIF_SchedulingC.inl \
+  ../MIF_SchedulingS.h \
+  ../MIF_SchedulingS.inl \
+  ../MIF_SchedulingS_T.cpp \
+  ../MIF_SchedulingS_T.h \
+  ../MIF_SchedulingS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   ../MIF_Scheduling-stamp \
   ../MIF_SchedulingC.cpp \
   ../MIF_SchedulingC.h \
-  ../MIF_SchedulingC.inl
+  ../MIF_SchedulingC.inl \
+  ../MIF_SchedulingS.h \
+  ../MIF_SchedulingS.inl \
+  ../MIF_SchedulingS_T.cpp \
+  ../MIF_SchedulingS_T.h \
+  ../MIF_SchedulingS_T.inl
 
-../MIF_SchedulingC.cpp ../MIF_SchedulingC.h ../MIF_SchedulingC.inl: ../MIF_Scheduling-stamp
+../MIF_SchedulingC.cpp ../MIF_SchedulingC.h ../MIF_SchedulingC.inl ../MIF_SchedulingS.h ../MIF_SchedulingS.inl ../MIF_SchedulingS_T.cpp ../MIF_SchedulingS_T.h ../MIF_SchedulingS_T.inl: MIF_Scheduling-stamp
 
 ../MIF_Scheduling-stamp: $(srcdir)/../MIF_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -SS -St -o .. $(srcdir)/../MIF_Scheduling.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../MIF_Scheduling.idl
 	@touch $@
 
 noinst_PROGRAMS += test
@@ -79,23 +192,52 @@ test_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 test_SOURCES = \
+  ../DT_Creator.cpp \
+  ../JobC.cpp \
+  ../JobS.cpp \
+  ../Job_i.cpp \
   ../MIF_SchedulingC.cpp \
+  ../POA_Holder.cpp \
+  ../SynchC.cpp \
+  ../SynchS.cpp \
+  ../Synch_i.cpp \
+  ../Task_Stats.cpp \
+  ../Thread_Task.cpp \
   MIF_DT_Creator.cpp \
   MIF_Scheduler.cpp \
   MIF_Task.cpp \
   test.cpp \
+  ../DT_Creator.h \
+  ../JobC.h \
+  ../JobC.inl \
+  ../JobS.h \
+  ../JobS.inl \
+  ../JobS_T.h \
+  ../JobS_T.inl \
+  ../Job_i.h \
   ../MIF_SchedulingC.h \
   ../MIF_SchedulingC.inl \
+  ../MIF_SchedulingS.h \
+  ../MIF_SchedulingS.inl \
+  ../MIF_SchedulingS_T.h \
+  ../MIF_SchedulingS_T.inl \
+  ../POA_Holder.h \
+  ../SynchC.h \
+  ../SynchC.inl \
+  ../SynchS.h \
+  ../SynchS.inl \
+  ../SynchS_T.h \
+  ../SynchS_T.inl \
+  ../Synch_i.h \
+  ../Task_Stats.h \
+  ../Task_Stats.inl \
+  ../Thread_Task.h \
   MIF_DT_Creator.h \
   MIF_Scheduler.h \
   MIF_Task.h \
-  mif_dt_creator_export.h \
   test.h
 
 test_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libRTSchedTestLib.la \
-  $(top_builddir)/examples/RTScheduling/libJob.la \
-  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
@@ -109,7 +251,6 @@ test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index f290a52e718..8ef6d268b8d 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -1,14 +1,13 @@
 //$Id$
 
 #include "test.h"
-#include "../Thread_Task.h"
-#include "../Task_Stats.h"
-#include "../Synch_i.h"
-
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "tao/ORB_Core.h"
-
 #include "ace/Arg_Shifter.h"
+//#include "MIF_DT_Creator.h"
+#include "../Thread_Task.h"
+#include "../Task_Stats.h"
+#include "../Synch_i.h"
 
 DT_Test::DT_Test (void)
 {
@@ -16,33 +15,33 @@ DT_Test::DT_Test (void)
 
 int
 DT_Test::init (int argc, char *argv []
-         ACE_ENV_ARG_DECL)
+	       ACE_ENV_ARG_DECL)
 {
   orb_ = CORBA::ORB_init (argc,
-        argv,
-        ""
-        ACE_ENV_ARG_PARAMETER);
+			  argv,
+			  ""
+			  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   dt_creator_->orb (orb_.in ());
 
   CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager"
-                   ACE_ENV_ARG_PARAMETER);
+								   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
-                    ACE_ENV_ARG_PARAMETER);
+									  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
   ACE_NEW_RETURN (scheduler_,
-      MIF_Scheduler (orb_.in ()), -1);
+		  MIF_Scheduler (orb_.in ()), -1);
 
   manager->rtscheduler (scheduler_);
 
   CORBA::Object_var object =
     orb_->resolve_initial_references ("RTScheduler_Current"
-              ACE_ENV_ARG_PARAMETER);
+				      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   current_  =
@@ -54,10 +53,10 @@ DT_Test::init (int argc, char *argv []
 
 void
 DT_Test::run (int argc, char* argv []
-        ACE_ENV_ARG_DECL)
+			  ACE_ENV_ARG_DECL)
 {
   init (argc,argv
-  ACE_ENV_ARG_PARAMETER);
+	ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TASK_STATS::instance ()->init (this->dt_creator_->total_load ());
@@ -80,16 +79,16 @@ DT_Test::run (int argc, char* argv []
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-        "Registered Synch Object\n"));
+	      "Registered Synch Object\n"));
 
   dt_creator_->create_distributable_threads (current_.in ()
-               ACE_ENV_ARG_PARAMETER);
+					     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   orb_->destroy ();
 
   ACE_DEBUG ((LM_DEBUG,
-        "Test Terminating......\n"));
+	      "Test Terminating......\n"));
 }
 
 
@@ -117,12 +116,12 @@ long flags;
     orb_->orb_core ()->orb_params ()->sched_policy ();
 
   if (this->activate (flags,
-          1) == -1)
+		      1) == -1)
     {
       if (ACE_OS::last_error () == EPERM)
-  ACE_ERROR_RETURN ((LM_ERROR,
-         ACE_TEXT ("Insufficient privilege to run this test.\n")),
-        -1);
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   ACE_TEXT ("Insufficient privilege to run this test.\n")),
+			  -1);
     }
   return 0;
 }
@@ -133,7 +132,7 @@ DT_Test::svc (void)
   ACE_TRY_NEW_ENV
     {
       dt_creator_->create_distributable_threads (current_.in ()
-             ACE_ENV_ARG_PARAMETER);
+						 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -162,10 +161,10 @@ main (int argc, char* argv [])
     {
       ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_MIF_DT_Creator);
 
-    ACE_DEBUG ((LM_DEBUG,
-         "%t\n"));
+	  ACE_DEBUG ((LM_DEBUG,
+				 "%t\n"));
       DT_TEST::instance ()->run (argc, argv
-         ACE_ENV_ARG_PARAMETER);
+				 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
index 273b9df8813..c1a90de91d9 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
@@ -1,28 +1,29 @@
 //$Id$
 #ifndef TEST_H
 #define TEST_H
+#include /**/ "ace/pre.h"
 
-#include "MIF_Scheduler.h"
-#include "MIF_DT_Creator.h"
 
+#include "MIF_Scheduler.h"
 #include "ace/Sched_Params.h"
 #include "tao/ORB_Core.h"
 #include "ace/Synch.h"
 #include "ace/Task.h"
+#include "MIF_DT_Creator.h"
 
 class Task_Stats;
 
 class DT_Test //:public ACE_Task <ACE_SYNCH>
 {
  public:
-
+  
   DT_Test (void);
-
+  
   int init (int argc, char *argv []
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+	    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void run (int argc, char *argv []
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void run (int argc, char *argv [] 
+	  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void dt_creator (MIF_DT_Creator* dt_creator);
 
@@ -30,7 +31,7 @@ class DT_Test //:public ACE_Task <ACE_SYNCH>
 
   int activate_task (void);
 
-  RTScheduling::Current_ptr current (void);
+  RTScheduling::Current_ptr current (void); 
 
 /*   protected: */
 /*   /// task svc */
@@ -45,11 +46,12 @@ class DT_Test //:public ACE_Task <ACE_SYNCH>
   CORBA::ORB_var orb_;
   int max_priority_;
   int min_priority_;
-  RTScheduling::Current_var current_;
+  RTScheduling::Current_var current_; 
   MIF_DT_Creator* dt_creator_;
   MIF_Scheduler* scheduler_;
 };
 
 typedef ACE_Singleton <DT_Test, TAO_SYNCH_MUTEX> DT_TEST;
 
+#include /**/ "ace/post.h"
 #endif /*TEST_H*/
diff --git a/TAO/examples/RTScheduling/Makefile.am b/TAO/examples/RTScheduling/Makefile.am
index fc81b907e1d..c907e515a5a 100644
--- a/TAO/examples/RTScheduling/Makefile.am
+++ b/TAO/examples/RTScheduling/Makefile.am
@@ -8,165 +8,7 @@
 ## MPC Command:
 ## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
 SUBDIRS = \
-        . \
         MIF_Scheduler \
         Fixed_Priority_Scheduler
 
-noinst_LTLIBRARIES =
-CLEANFILES =
-BUILT_SOURCES =
-noinst_HEADERS =
-
-## Makefile.RTSchedSynch.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  SynchC.cpp \
-  SynchC.h \
-  SynchC.inl \
-  SynchS.cpp \
-  SynchS.h \
-  SynchS.inl
-
-CLEANFILES += \
-  Synch-stamp \
-  SynchC.cpp \
-  SynchC.h \
-  SynchC.inl \
-  SynchS.cpp \
-  SynchS.h \
-  SynchS.inl
-
-SynchC.cpp SynchC.h SynchC.inl SynchS.cpp SynchS.h SynchS.inl: Synch-stamp
-
-Synch-stamp: $(srcdir)/Synch.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -St -Wb,export_macro=SYNCH_Export -Wb,export_include=synch_export.h $(srcdir)/Synch.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libRTSchedSynch.la
-
-libRTSchedSynch_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DSYNCH_BUILD_DLL
-
-libRTSchedSynch_la_SOURCES = \
-  SynchC.cpp \
-  SynchS.cpp \
-  Synch_i.cpp
-
-noinst_HEADERS += \
-  Synch.idl \
-  SynchC.h \
-  SynchC.inl \
-  SynchS.h \
-  SynchS.inl \
-  Synch_i.h \
-  synch_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Job.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  JobC.cpp \
-  JobC.h \
-  JobC.inl \
-  JobS.cpp \
-  JobS.h \
-  JobS.inl
-
-CLEANFILES += \
-  Job-stamp \
-  JobC.cpp \
-  JobC.h \
-  JobC.inl \
-  JobS.cpp \
-  JobS.h \
-  JobS.inl
-
-JobC.cpp JobC.h JobC.inl JobS.cpp JobS.h JobS.inl: Job-stamp
-
-Job-stamp: $(srcdir)/Job.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -St -Wb,export_macro=JOB_Export -Wb,export_include=job_export.h $(srcdir)/Job.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libJob.la
-
-libJob_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DJOB_BUILD_DLL
-
-libJob_la_SOURCES = \
-  JobC.cpp \
-  JobS.cpp
-
-noinst_HEADERS += \
-  Job.idl \
-  JobC.h \
-  JobC.inl \
-  JobS.h \
-  JobS.inl \
-  job_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTSchedTestLib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_LTLIBRARIES += libRTSchedTestLib.la
-
-libRTSchedTestLib_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DRTSCHEDTESTLIB_BUILD_DLL
-
-libRTSchedTestLib_la_SOURCES = \
-  DT_Creator.cpp \
-  Job_i.cpp \
-  POA_Holder.cpp \
-  Task_Stats.cpp \
-  Thread_Task.cpp
-
-noinst_HEADERS += \
-  DT_Creator.h \
-  Job_i.h \
-  POA_Holder.h \
-  Task_Stats.h \
-  Task_Stats.inl \
-  Thread_Task.h \
-  rtschedtestlib_export.h
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index 605979bb28f..3013a8769f7 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -1,11 +1,8 @@
 //$Id$
-
 #include "POA_Holder.h"
-
-#include "tao/debug.h"
-
 #include "ace/Arg_Shifter.h"
 #include "ace/Log_Msg.h"
+#include "tao/debug.h"
 
 POA_Holder::POA_Holder (void)
   :priority_model_ (RTCORBA::CLIENT_PROPAGATED),
@@ -18,7 +15,7 @@ int
 POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
 {
   ACE_DEBUG ((LM_DEBUG,
-        "Init POA\n"));
+	      "Init POA\n"));
 
   const ACE_TCHAR *current_arg = 0;
 
@@ -69,35 +66,35 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
                               lanes_[l_index].lane_priority, lanes_[l_index].static_threads, lanes_[l_index].dynamic_threads));
                   l_index++;
                 }
-        else
+	      else
                 break;
             } /* while -- lane values */
 
         } /* if -Lanes */
       else if (arg_shifter.cur_arg_strncasecmp ("-ThreadPool") == 0)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-          "Thread Pool\n"));
-
-    arg_shifter.consume_arg ();
-    thread_pool_ = 1;
-    // read priority
-    tp_static_threads_ = ACE_OS::atoi (arg_shifter.get_current ());
-    arg_shifter.consume_arg ();
-
-    tp_dynamic_threads_ = ACE_OS::atoi (arg_shifter.get_current ());
-    arg_shifter.consume_arg ();
-
-    tp_priority_ = ACE_OS::atoi (arg_shifter.get_current ());
-    arg_shifter.consume_arg ();
-    ACE_DEBUG ((LM_DEBUG,
-          "Thread Pool Initialized\n"));
-
-  }
+	{
+	  ACE_DEBUG ((LM_DEBUG,
+		      "Thread Pool\n"));
+
+	  arg_shifter.consume_arg ();
+	  thread_pool_ = 1;
+	  // read priority
+	  tp_static_threads_ = ACE_OS::atoi (arg_shifter.get_current ());
+	  arg_shifter.consume_arg ();
+	  
+	  tp_dynamic_threads_ = ACE_OS::atoi (arg_shifter.get_current ());
+	  arg_shifter.consume_arg ();
+
+	  tp_priority_ = ACE_OS::atoi (arg_shifter.get_current ());
+	  arg_shifter.consume_arg ();
+	  ACE_DEBUG ((LM_DEBUG,
+		      "Thread Pool Initialized\n"));
+
+	}
       else if ((current_arg = arg_shifter.get_the_parameter ("-Bands")))
         {
-    ACE_DEBUG ((LM_DEBUG,
-          "Initializing Bands\n"));
+	  ACE_DEBUG ((LM_DEBUG,
+		      "Initializing Bands\n"));
 
           int bandcount = ACE_OS::atoi (current_arg);
           bands_.length (bandcount);
@@ -127,20 +124,20 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
               else
                 break;
             } /* while -- Band values */
-    ACE_DEBUG ((LM_DEBUG,
-          "Bands Initialized\n"));
+	  ACE_DEBUG ((LM_DEBUG,
+		      "Bands Initialized\n"));
 
         } /* if -Bands */
       else // something else is showing up ...
         {
-    ACE_DEBUG ((LM_DEBUG,
-          "Finish Init POA\n"));
-
+	  ACE_DEBUG ((LM_DEBUG,
+		      "Finish Init POA\n"));
+  
           return 0;
         }
     }
   ACE_DEBUG ((LM_DEBUG,
-        "Finish Init POA\n"));
+	      "Finish Init POA\n"));
   return 0;
 }
 
@@ -186,8 +183,8 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
       ACE_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
-      "Activated Lanes\n"));
-
+		  "Activated Lanes\n"));
+      
     }
 
   if (thread_pool_)
@@ -196,7 +193,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
       CORBA::Boolean allow_request_buffering = 0;
       CORBA::ULong max_buffered_requests = 0;
       CORBA::ULong max_request_buffer_size = 0;
-
+      
       RTCORBA::ThreadpoolId threadpool_id_1 =
         rt_orb->create_threadpool (stacksize,
                                    tp_static_threads_,
@@ -210,13 +207,13 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
 
 
       thread_pool_policy = rt_orb->create_threadpool_policy (threadpool_id_1
-                   ACE_ENV_ARG_PARAMETER);
+							     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
-      "Activated thread pool\n"));
-
-
+		  "Activated thread pool\n"));
+      
+      
     }
 
   if (bands_.length () != 0)
@@ -227,8 +224,8 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
                                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       ACE_DEBUG ((LM_DEBUG,
-      "Activated Bands\n"));
-
+		  "Activated Bands\n"));
+      
     }
 
   CORBA::PolicyList poa_policy_list;
@@ -236,70 +233,70 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
   if (lanes_.length () == 0 && bands_.length () == 0)
     {
       if (thread_pool_)
-  {
-    poa_policy_list.length (2);
-    poa_policy_list[0] = priority_model_policy;
-    poa_policy_list[1] = thread_pool_policy;
-  }
-      else
-  {
-    poa_policy_list.length (1);
-    poa_policy_list[0] = priority_model_policy;
-  }
+	{
+	  poa_policy_list.length (2);
+	  poa_policy_list[0] = priority_model_policy;
+	  poa_policy_list[1] = thread_pool_policy;
+	}
+      else 
+	{
+	  poa_policy_list.length (1);
+	  poa_policy_list[0] = priority_model_policy;
+	}
     }
   else if (lanes_.length () != 0 && bands_.length () == 0)
     {
       if (thread_pool_)
-  {
-    poa_policy_list.length (3);
-    poa_policy_list[0] = priority_model_policy;
-    poa_policy_list[1] = lanes_policy;
-    poa_policy_list[2] = thread_pool_policy;
-  }
-      else
-  {
-    poa_policy_list.length (2);
-    poa_policy_list[0] = priority_model_policy;
-    poa_policy_list[1] = lanes_policy;
-  }
+	{
+	  poa_policy_list.length (3);
+	  poa_policy_list[0] = priority_model_policy;
+	  poa_policy_list[1] = lanes_policy;
+	  poa_policy_list[2] = thread_pool_policy;
+	}
+      else 
+	{
+	  poa_policy_list.length (2);
+	  poa_policy_list[0] = priority_model_policy;
+	  poa_policy_list[1] = lanes_policy;
+	}
     }
   else if (lanes_.length () == 0 && bands_.length () != 0)
     {
       if (thread_pool_)
-  {
-    poa_policy_list.length (3);
-    poa_policy_list[0] = priority_model_policy;
-    poa_policy_list[1] = bands_policy;
-    poa_policy_list[2] = thread_pool_policy;
-  }
+	{
+	  poa_policy_list.length (3);
+	  poa_policy_list[0] = priority_model_policy;
+	  poa_policy_list[1] = bands_policy;
+	  poa_policy_list[2] = thread_pool_policy;
+	}
       else
-  {
-    poa_policy_list.length (2);
-    poa_policy_list[0] = priority_model_policy;
-    poa_policy_list[1] = bands_policy;
-  }
+	{
+	  poa_policy_list.length (2);
+	  poa_policy_list[0] = priority_model_policy;
+	  poa_policy_list[1] = bands_policy;
+	}
     }
   else
     {
       if (thread_pool_)
-  {
-    poa_policy_list.length (4);
-    poa_policy_list[0] = priority_model_policy;
-    poa_policy_list[1] = lanes_policy;
-    poa_policy_list[2] = bands_policy;
-    poa_policy_list[3] = thread_pool_policy;
-  }
+	{
+	  poa_policy_list.length (4);
+	  poa_policy_list[0] = priority_model_policy;
+	  poa_policy_list[1] = lanes_policy;
+	  poa_policy_list[2] = bands_policy;
+	  poa_policy_list[3] = thread_pool_policy;
+	}
       else
-  {
-    poa_policy_list.length (3);
-    poa_policy_list[0] = priority_model_policy;
-    poa_policy_list[1] = lanes_policy;
-    poa_policy_list[2] = bands_policy;
-  }
+	{
+	  poa_policy_list.length (3);
+	  poa_policy_list[0] = priority_model_policy;
+	  poa_policy_list[1] = lanes_policy;
+	  poa_policy_list[2] = bands_policy;
+	}
     }
 
   ACE_DEBUG ((LM_DEBUG,
-        "Initialized POA Policy\n"));
+	      "Initialized POA Policy\n"));
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "creating POA %s\n", POA_name_.c_str ()));
diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h
index a42d3335894..92a15b22ea4 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -15,11 +15,9 @@
 #ifndef POA_HOLDER_H
 #define POA_HOLDER_H
 
-#include "rtschedtestlib_export.h"
-
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/PortableServer/PortableServer.h"
-
+//#include "activity_export.h"
 #include "ace/SString.h"
 #include "ace/Arg_Shifter.h"
 
@@ -29,7 +27,7 @@
  * @brief An options holder for parameters to creating a poa.
  *
  */
-class RTSCHEDTESTLIB_Export POA_Holder
+class POA_Holder
 {
 public:
   /// Constructor
diff --git a/TAO/examples/RTScheduling/RTSchedTestLib.mpc b/TAO/examples/RTScheduling/RTSchedTestLib.mpc
deleted file mode 100644
index 4bf01bd1303..00000000000
--- a/TAO/examples/RTScheduling/RTSchedTestLib.mpc
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(RTSchedTestLib): naming, rtscheduling_server {
-  after += Job
-  libs += Job RTSchedSynch
-  dynamicflags += RTSCHEDTESTLIB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Job_i.cpp
-    DT_Creator.cpp
-    Thread_Task.cpp
-    POA_Holder.cpp
-    Task_Stats.cpp
-  }
-
-  Header_Files {
-    DT_Creator.h
-    Thread_Task.h
-    POA_Holder.h
-    Task_Stats.h
-    Job_i.h
-    rtschedtestlib_export.h
-  }
-
-  Inline_Files {
-    Task_Stats.inl
-  }
-}
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 8cd648b1cf3..3e0b46bca7d 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -1,16 +1,16 @@
 //$Id$
 
 #include "Starter.h"
-
 #include "ace/OS_NS_sys_time.h"
 
+
 Starter::Starter (CORBA::ORB_ptr orb)
 {
   // Initialize the naming service
   if (this->naming_client_.init (orb) != 0)
     ACE_ERROR ((LM_ERROR,
-    " (%P|%t) Unable to initialize "
-    "the TAO_Naming_Client. \n"));
+		" (%P|%t) Unable to initialize "
+		"the TAO_Naming_Client. \n"));
 }
 
 void
@@ -46,7 +46,7 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var object =
     this->naming_client_->resolve (name
-           ACE_ENV_ARG_PARAMETER);
+				   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->synch_context_ =
@@ -59,14 +59,14 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL)
 
   // Get the list of synchs registered for this sender.
   this->synch_context_->list (chunk,
-            binding_list,
-            iterator
-            ACE_ENV_ARG_PARAMETER);
+			      binding_list,
+			      iterator
+			      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Add the receivers found in the bindinglist to the <receivers>.
   this->add_to_synchs (binding_list
-           ACE_ENV_ARG_PARAMETER);
+		       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (iterator.in ()))
@@ -82,7 +82,7 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL)
           ACE_CHECK;
 
           this->add_to_synchs (binding_list
-             ACE_ENV_ARG_PARAMETER);
+			       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -92,7 +92,7 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 Starter::add_to_synchs (CosNaming::BindingList &binding_list
-      ACE_ENV_ARG_DECL)
+			ACE_ENV_ARG_DECL)
 {
   ACE_Time_Value base_time = ACE_OS::gettimeofday ();
   for (CORBA::ULong i = 0;
@@ -104,8 +104,8 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list
         binding_list [i].binding_name [0].id.in ();
 
       ACE_DEBUG ((LM_DEBUG,
-      "Synch Name %s\n",
-      synch_name.c_str ()));
+		  "Synch Name %s\n",
+		  synch_name.c_str ()));
 
       CosNaming::Name name (1);
       name.length (1);
@@ -116,7 +116,7 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list
       // context.
       CORBA::Object_var obj =
         this->synch_context_->resolve (name
-               ACE_ENV_ARG_PARAMETER);
+				       ACE_ENV_ARG_PARAMETER);
 
       Synch_var synch_obj =
         Synch::_narrow (obj.in ());
@@ -126,7 +126,7 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list
 
 //        // Add this receiver to the receiver map.
 //        this->synchs_.bind (synch_name,
-//          synch_obj);
+//  			  synch_obj);
     }
 }
 
@@ -137,9 +137,9 @@ main (int argc, char** argv)
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
-              argv,
-              ""
-              ACE_ENV_ARG_PARAMETER);
+					    argv,
+					    ""
+					    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Starter starter (orb.in ());
diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h
index 13c7a0d0c80..7a77efe0117 100644
--- a/TAO/examples/RTScheduling/Starter.h
+++ b/TAO/examples/RTScheduling/Starter.h
@@ -2,11 +2,9 @@
 #ifndef STARTER_H
 #define STARTER_H
 
-#include "SynchC.h"
-
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/Naming/Naming_Server.h"
-
+#include "SynchC.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 
@@ -21,14 +19,16 @@ class Starter
   void fire (void);
 
   typedef ACE_Hash_Map_Manager <ACE_CString,
-                                Synch_var,
-                                ACE_Null_Mutex> Synchs;
+    Synch_var,
+    ACE_Null_Mutex> Synchs;
+
 
  private:
   void resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   void add_to_synchs (CosNaming::BindingList &binding_list
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+		      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   /// A naming context.
   CosNaming::NamingContext_var synch_context_;
diff --git a/TAO/examples/RTScheduling/Synch.mpc b/TAO/examples/RTScheduling/Synch.mpc
deleted file mode 100644
index fa1e1c488a9..00000000000
--- a/TAO/examples/RTScheduling/Synch.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(RTSchedSynch): portableserver {
-  idlflags += -St \
-              -Wb,export_macro=SYNCH_Export \
-              -Wb,export_include=synch_export.h
-  dynamicflags += SYNCH_BUILD_DLL
-
-  IDL_Files {
-    Synch.idl
-  }
-
-  Source_Files {
-    SynchC.cpp
-    SynchS.cpp
-    Synch_i.cpp
-  }
-
-  Header_Files {
-    SynchC.h
-    SynchS.h
-    synch_export.h
-    Synch_i.h
-  }
-
-  Inline_Files {
-    SynchC.inl
-    SynchS.inl
-  }
-}
diff --git a/TAO/examples/RTScheduling/Synch_i.h b/TAO/examples/RTScheduling/Synch_i.h
index e0307668200..9a262536c97 100644
--- a/TAO/examples/RTScheduling/Synch_i.h
+++ b/TAO/examples/RTScheduling/Synch_i.h
@@ -5,7 +5,7 @@
 
 #include "SynchS.h"
 
-class SYNCH_Export Synch_i : public POA_Synch
+class Synch_i : public POA_Synch
 {
  public:
 
diff --git a/TAO/examples/RTScheduling/Task_Stats.h b/TAO/examples/RTScheduling/Task_Stats.h
index 62f6614cf81..b32f1041bfc 100644
--- a/TAO/examples/RTScheduling/Task_Stats.h
+++ b/TAO/examples/RTScheduling/Task_Stats.h
@@ -13,13 +13,10 @@
 #ifndef TASK_STATS_H
 #define TASK_STATS_H
 
-#include "rtschedtestlib_export.h"
-
-#include "tao/orbconf.h"
-#include "tao/debug.h"
-
 #include "ace/OS_NS_time.h"
 #include "ace/Singleton.h"
+#include "tao/orbconf.h"
+#include "tao/debug.h"
 
 /**
  * @class Base_Time
@@ -27,7 +24,7 @@
  * @brief maintains readings recorded by tasks.
  *
  */
-class RTSCHEDTESTLIB_Export Base_Time
+class Base_Time
 {
  public:
   Base_Time (void);
@@ -42,7 +39,7 @@ typedef ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX> BASE_TIME;
  * @brief maintains readings recorded by tasks.
  *
  */
-class RTSCHEDTESTLIB_Export Task_Stats
+class Task_Stats
 {
  public:
   /// Constructor
diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp
index ded158b93b0..e7c3997f565 100644
--- a/TAO/examples/RTScheduling/Thread_Task.cpp
+++ b/TAO/examples/RTScheduling/Thread_Task.cpp
@@ -1,13 +1,10 @@
 //$Id$
 
 #include "Thread_Task.h"
-#include "DT_Creator.h"
+#include "ace/Atomic_Op.h"
 #include "Task_Stats.h"
-
 #include "tao/ORB_Core.h"
-
 #include "ace/High_Res_Timer.h"
-#include "ace/Atomic_Op.h"
 
 Thread_Task::Thread_Task (void)
  : start_time_ (0),
@@ -29,11 +26,9 @@ Thread_Task::svc (void)
   ACE_TRY_NEW_ENV
     {
       if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Thread_Task::svc %d\n",
-                      importance_));
-        }
+        ACE_DEBUG ((LM_DEBUG,
+                    "Thread_Task::svc %d\n",
+                    importance_));
 
       const char * name = 0;
       CORBA::Policy_var implicit_sched_param = CORBA::Policy::_duplicate (sched_param_.in ());;
@@ -122,8 +117,8 @@ Thread_Task::dump_stats (void)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "File name %s\n",
-    fname));
+		"File name %s\n",
+		fname));
 
   char msg [BUFSIZ];
   ACE_OS::sprintf (msg,
@@ -132,6 +127,6 @@ Thread_Task::dump_stats (void)
                    count_);
 
   task_stats_->dump_samples (fname,
-                             msg,
-                             ACE_High_Res_Timer::global_scale_factor ());
+			     msg,
+			     ACE_High_Res_Timer::global_scale_factor ());
 }
diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h
index 0af6dda5a1a..2ee0486a4e3 100644
--- a/TAO/examples/RTScheduling/Thread_Task.h
+++ b/TAO/examples/RTScheduling/Thread_Task.h
@@ -2,34 +2,33 @@
 #ifndef THREAD_TASK_H
 #define THREAD_TASK_H
 
-#include "JobC.h"
-#include "rtschedtestlib_export.h"
-
 #include "tao/RTScheduling/RTScheduler.h"
+//#include "FP_Scheduler.h"
 #include "ace/Task.h"
+#include "DT_Creator.h"
 
 class Task_Stats;
 class DT_Creator;
 
-class RTSCHEDTESTLIB_Export Thread_Task : public ACE_Task <ACE_SYNCH>
+class Thread_Task : public ACE_Task <ACE_SYNCH>
 {
  public:
 
 /*    Thread_Task (int importance, */
-/*           int start_time, */
-/*           int load, */
-/*           DT_Creator *dt_creator); */
+/*  	       int start_time, */
+/*  	       int load, */
+/*  	       DT_Creator *dt_creator); */
 
   Thread_Task (void);
 
   virtual int activate_task (RTScheduling::Current_ptr current,
-                             CORBA::Policy_ptr sched_param,
-                             long flags,
-                             ACE_Time_Value* base_time
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
-
+			     CORBA::Policy_ptr sched_param,
+			     long flags,
+			     ACE_Time_Value* base_time
+			     ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+  
   virtual int perform_task (void);
-
+  
   int importance (void);
 
   int start_time (void);
@@ -37,7 +36,7 @@ class RTSCHEDTESTLIB_Export Thread_Task : public ACE_Task <ACE_SYNCH>
   /// = Job get/set
   /// Returns the name of the Job exec'ed by this Task.
   const char* job (void);
-
+  
   /// Sets the Job to exec.
   void job (Job_ptr job);
 
diff --git a/TAO/examples/RTScheduling/job_export.h b/TAO/examples/RTScheduling/job_export.h
deleted file mode 100644
index ce66aa0fdbb..00000000000
--- a/TAO/examples/RTScheduling/job_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SYNCH
-// ------------------------------
-#ifndef JOB_EXPORT_H
-#define JOB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (JOB_HAS_DLL)
-#  define JOB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && JOB_HAS_DLL */
-
-#if !defined (JOB_HAS_DLL)
-#  define JOB_HAS_DLL 1
-#endif /* ! JOB_HAS_DLL */
-
-#if defined (JOB_HAS_DLL) && (JOB_HAS_DLL == 1)
-#  if defined (JOB_BUILD_DLL)
-#    define JOB_Export ACE_Proper_Export_Flag
-#    define JOB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define JOB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* JOB_BUILD_DLL */
-#    define JOB_Export ACE_Proper_Import_Flag
-#    define JOB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define JOB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* JOB_BUILD_DLL */
-#else /* JOB_HAS_DLL == 1 */
-#  define JOB_Export
-#  define JOB_SINGLETON_DECLARATION(T)
-#  define JOB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* JOB_HAS_DLL == 1 */
-
-// Set JOB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (JOB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define JOB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define JOB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !JOB_NTRACE */
-
-#if (JOB_NTRACE == 1)
-#  define JOB_TRACE(X)
-#else /* (JOB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define JOB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (JOB_NTRACE == 1) */
-
-#endif /* JOB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/examples/RTScheduling/rtschedtestlib_export.h b/TAO/examples/RTScheduling/rtschedtestlib_export.h
deleted file mode 100644
index f0af7a1a282..00000000000
--- a/TAO/examples/RTScheduling/rtschedtestlib_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SYNCH
-// ------------------------------
-#ifndef RTSCHEDTESTLIB_EXPORT_H
-#define RTSCHEDTESTLIB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (RTSCHEDTESTLIB_HAS_DLL)
-#  define RTSCHEDTESTLIB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && RTSCHEDTESTLIB_HAS_DLL */
-
-#if !defined (RTSCHEDTESTLIB_HAS_DLL)
-#  define RTSCHEDTESTLIB_HAS_DLL 1
-#endif /* ! RTSCHEDTESTLIB_HAS_DLL */
-
-#if defined (RTSCHEDTESTLIB_HAS_DLL) && (RTSCHEDTESTLIB_HAS_DLL == 1)
-#  if defined (RTSCHEDTESTLIB_BUILD_DLL)
-#    define RTSCHEDTESTLIB_Export ACE_Proper_Export_Flag
-#    define RTSCHEDTESTLIB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RTSCHEDTESTLIB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RTSCHEDTESTLIB_BUILD_DLL */
-#    define RTSCHEDTESTLIB_Export ACE_Proper_Import_Flag
-#    define RTSCHEDTESTLIB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RTSCHEDTESTLIB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RTSCHEDTESTLIB_BUILD_DLL */
-#else /* RTSCHEDTESTLIB_HAS_DLL == 1 */
-#  define RTSCHEDTESTLIB_Export
-#  define RTSCHEDTESTLIB_SINGLETON_DECLARATION(T)
-#  define RTSCHEDTESTLIB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RTSCHEDTESTLIB_HAS_DLL == 1 */
-
-// Set RTSCHEDTESTLIB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RTSCHEDTESTLIB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RTSCHEDTESTLIB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RTSCHEDTESTLIB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RTSCHEDTESTLIB_NTRACE */
-
-#if (RTSCHEDTESTLIB_NTRACE == 1)
-#  define RTSCHEDTESTLIB_TRACE(X)
-#else /* (RTSCHEDTESTLIB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RTSCHEDTESTLIB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RTSCHEDTESTLIB_NTRACE == 1) */
-
-#endif /* RTSCHEDTESTLIB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/examples/RTScheduling/synch_export.h b/TAO/examples/RTScheduling/synch_export.h
deleted file mode 100644
index eed7a51efcc..00000000000
--- a/TAO/examples/RTScheduling/synch_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SYNCH
-// ------------------------------
-#ifndef SYNCH_EXPORT_H
-#define SYNCH_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SYNCH_HAS_DLL)
-#  define SYNCH_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SYNCH_HAS_DLL */
-
-#if !defined (SYNCH_HAS_DLL)
-#  define SYNCH_HAS_DLL 1
-#endif /* ! SYNCH_HAS_DLL */
-
-#if defined (SYNCH_HAS_DLL) && (SYNCH_HAS_DLL == 1)
-#  if defined (SYNCH_BUILD_DLL)
-#    define SYNCH_Export ACE_Proper_Export_Flag
-#    define SYNCH_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SYNCH_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SYNCH_BUILD_DLL */
-#    define SYNCH_Export ACE_Proper_Import_Flag
-#    define SYNCH_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SYNCH_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SYNCH_BUILD_DLL */
-#else /* SYNCH_HAS_DLL == 1 */
-#  define SYNCH_Export
-#  define SYNCH_SINGLETON_DECLARATION(T)
-#  define SYNCH_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SYNCH_HAS_DLL == 1 */
-
-// Set SYNCH_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SYNCH_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SYNCH_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SYNCH_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SYNCH_NTRACE */
-
-#if (SYNCH_NTRACE == 1)
-#  define SYNCH_TRACE(X)
-#else /* (SYNCH_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SYNCH_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SYNCH_NTRACE == 1) */
-
-#endif /* SYNCH_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/examples/Simple/bank/Makefile.am b/TAO/examples/Simple/bank/Makefile.am
index 27145d85523..f18809908cf 100644
--- a/TAO/examples/Simple/bank/Makefile.am
+++ b/TAO/examples/Simple/bank/Makefile.am
@@ -13,15 +13,11 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.bank_IDL.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   BankC.cpp \
   BankC.h \
@@ -45,16 +41,13 @@ Bank-stamp: $(srcdir)/Bank.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Bank.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Bank.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.bank_client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -83,12 +76,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.bank_server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -121,8 +110,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index a8fc2264d0b..df8debec262 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*server): namingexe, iortable, utils, avoids_corba_e_micro {
+project(*server): namingexe, iortable, utils {
   exename = server
   after += *IDL
   Source_Files {
diff --git a/TAO/examples/Simple/chat/Makefile.am b/TAO/examples/Simple/chat/Makefile.am
index e252a1a34cd..1a569319962 100644
--- a/TAO/examples/Simple/chat/Makefile.am
+++ b/TAO/examples/Simple/chat/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.chat_IDL.am
 
 BUILT_SOURCES = \
@@ -66,15 +64,14 @@ Broadcaster-stamp: $(srcdir)/Broadcaster.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Broadcaster.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Broadcaster.idl \
   Receiver.idl
 
 ## Makefile.chat_client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -101,12 +98,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.chat_server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -135,8 +128,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Simple/echo/Makefile.am b/TAO/examples/Simple/echo/Makefile.am
index 2e3254c5965..f712ee97a2c 100644
--- a/TAO/examples/Simple/echo/Makefile.am
+++ b/TAO/examples/Simple/echo/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.echo_IDL.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ Echo-stamp: $(srcdir)/Echo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Echo.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Echo.idl
 
 ## Makefile.echo_client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -79,12 +76,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.echo_server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -115,8 +108,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc
index 8cf5cd00295..bf60819c91b 100644
--- a/TAO/examples/Simple/echo/echo.mpc
+++ b/TAO/examples/Simple/echo/echo.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): namingexe, iortable, utils, avoids_corba_e_micro {
+project(*server): namingexe, iortable, utils {
   exename = server
   after += *IDL
   Source_Files {
diff --git a/TAO/examples/Simple/grid/Makefile.am b/TAO/examples/Simple/grid/Makefile.am
index 933149def5c..3e50df86814 100644
--- a/TAO/examples/Simple/grid/Makefile.am
+++ b/TAO/examples/Simple/grid/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.grid_IDL.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Grid.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Grid.idl
 
 ## Makefile.grid_client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -79,12 +76,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.grid_server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -115,8 +108,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index fea24a387e9..2bdacb54e58 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): namingexe, iortable, utils, avoids_corba_e_micro {
+project(*server): namingexe, iortable, utils {
   exename = server
   after += *IDL
   Source_Files {
diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am
index cc87d004136..b31689cf4fa 100644
--- a/TAO/examples/Simple/time-date/Makefile.am
+++ b/TAO/examples/Simple/time-date/Makefile.am
@@ -13,15 +13,11 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Simple_Time_Date_Lib.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   Time_DateC.cpp \
   Time_DateC.h \
@@ -63,7 +59,6 @@ libTime_Date_la_SOURCES = \
 
 noinst_HEADERS = \
   Alt_Resource_Factory.h \
-  Time_Date.h \
   Time_Date.idl \
   Time_DateC.h \
   Time_DateC.inl \
@@ -71,13 +66,9 @@ noinst_HEADERS = \
   Time_DateS.inl \
   Time_Date_i.h
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Simple_Time_Date_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -92,9 +83,6 @@ client_SOURCES = \
   client.cpp \
   Time_Date_Client_i.h
 
-client_LDFLAGS = \
-  -L.
-
 client_LDADD = \
   libTime_Date.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -104,12 +92,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Simple_Time_Date_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -127,8 +111,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Simple/time-date/svc.conf.xml b/TAO/examples/Simple/time-date/svc.conf.xml
index 70390a8d042..2d9c7fed9eb 100644
--- a/TAO/examples/Simple/time-date/svc.conf.xml
+++ b/TAO/examples/Simple/time-date/svc.conf.xml
@@ -5,14 +5,14 @@
  <!--  Define a special Reactor for single-threaded configurations.  Refer -->
  <!--  to README for details.   -->
  <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="Time_Date" init="_make_My_Resource_Factory"/>
+   <initializer path="./Time_Date" init="_make_My_Resource_Factory"/>
  </dynamic>
  <!--  Dynamically configure the ORB into the application process. -->
  <dynamic id="ORB" type="Service_Object">
-   <initializer path="Time_Date" init="_make_DLL_ORB" params="dummy"/>
+   <initializer path="./Time_Date" init="_make_DLL_ORB" params="dummy"/>
  </dynamic>
  <!--  Once the ORB is configured, dynamically configure the Time_Date service. -->
  <dynamic id="Time_Date_Servant" type="Service_Object">
-   <initializer path="Time_Date" init="_make_Time_Date_Servant" params="dummy -n ORB -o ior"/>
+   <initializer path="./Time_Date" init="_make_Time_Date_Servant" params="dummy -n ORB -o ior"/>
  </dynamic>
 </ACE_Svc_Conf>
diff --git a/TAO/examples/Simple/time/Makefile.am b/TAO/examples/Simple/time/Makefile.am
index 9da0d4b9423..4fb39bc1b33 100644
--- a/TAO/examples/Simple/time/Makefile.am
+++ b/TAO/examples/Simple/time/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.time_IDL.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ Time-stamp: $(srcdir)/Time.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Time.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Time.idl
 
 ## Makefile.time_client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -79,12 +76,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.time_server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -115,8 +108,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc
index e48f95033bc..91288d3e8b4 100644
--- a/TAO/examples/Simple/time/time.mpc
+++ b/TAO/examples/Simple/time/time.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): namingexe, iortable, utils, avoids_corba_e_micro {
+project(*server): namingexe, iortable, utils {
   exename = server
   after += *IDL
   Source_Files {
diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile.am b/TAO/examples/Simulator/Event_Supplier/Makefile.am
index 2cf702e1ad4..9b1fa8e053e 100644
--- a/TAO/examples/Simulator/Event_Supplier/Makefile.am
+++ b/TAO/examples/Simulator/Event_Supplier/Makefile.am
@@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Event_Supplier_IDL.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   ./NavWeapC.cpp \
   ./NavWeapC.h \
@@ -46,15 +44,13 @@ CLEANFILES = \
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/../NavWeap.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   ../NavWeap.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Event_Supplier_DualEC_Sup.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += DualEC_Sup
@@ -93,13 +89,11 @@ DualEC_Sup_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Supplier_Event_Con.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += Event_Con
 
@@ -131,13 +125,11 @@ Event_Con_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Supplier_Event_Sup.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += Event_Sup
 
@@ -172,13 +164,11 @@ Event_Sup_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Supplier_Logging_Sup.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += Logging_Sup
 
@@ -213,7 +203,6 @@ Logging_Sup_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/examples/TypeCode_Creation/Makefile.am b/TAO/examples/TypeCode_Creation/Makefile.am
index 2ed25509c34..1cc00cc8c4e 100644
--- a/TAO/examples/TypeCode_Creation/Makefile.am
+++ b/TAO/examples/TypeCode_Creation/Makefile.am
@@ -13,13 +13,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.TypeCode_Creation_Test.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   testC.cpp \
@@ -65,7 +65,7 @@ create_tc_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
index 6cdef42a6a3..1bdbc4e848d 100644
--- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
+++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (TypeCode_Creation_Test) : taoclient, typecodefactory {
+project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client, minimum_corba {
   exename  = create_tc
   Source_Files {
     testC.cpp
diff --git a/TAO/examples/ior_corbaloc/Makefile.am b/TAO/examples/ior_corbaloc/Makefile.am
index 13645fa2108..493db46035e 100644
--- a/TAO/examples/ior_corbaloc/Makefile.am
+++ b/TAO/examples/ior_corbaloc/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.ior_corbaloc_IDL.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ corbaloc-stamp: $(srcdir)/corbaloc.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/corbaloc.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   corbaloc.idl
 
 ## Makefile.ior_corbaloc_client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -72,12 +69,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.ior_corbaloc_corbaname_client.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += corbaname_client
 
 corbaname_client_CPPFLAGS = \
@@ -96,12 +89,8 @@ corbaname_client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.ior_corbaloc_server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -126,8 +115,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/mfc/Makefile.am b/TAO/examples/mfc/Makefile.am
index b2706331f31..8de3c02a69d 100644
--- a/TAO/examples/mfc/Makefile.am
+++ b/TAO/examples/mfc/Makefile.am
@@ -13,20 +13,20 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.MFC_client.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   w32_testC.cpp \
   w32_testC.h \
   w32_testC.inl \
   w32_testS.h \
-  w32_testS.inl
+  w32_testS.inl \
+  w32_testS_T.cpp \
+  w32_testS_T.h \
+  w32_testS_T.inl
 
 CLEANFILES = \
   w32_test-stamp \
@@ -34,12 +34,15 @@ CLEANFILES = \
   w32_testC.h \
   w32_testC.inl \
   w32_testS.h \
-  w32_testS.inl
+  w32_testS.inl \
+  w32_testS_T.cpp \
+  w32_testS_T.h \
+  w32_testS_T.inl
 
-w32_testC.cpp w32_testC.h w32_testC.inl w32_testS.h w32_testS.inl: w32_test-stamp
+w32_testC.cpp w32_testC.h w32_testC.inl w32_testS.h w32_testS.inl w32_testS_T.cpp w32_testS_T.h w32_testS_T.inl: w32_test-stamp
 
 w32_test-stamp: $(srcdir)/w32_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,pch_include=StdAfx.h $(srcdir)/w32_test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,pch_include=StdAfx.h $(srcdir)/w32_test.idl
 	@touch $@
 
 noinst_PROGRAMS = client
@@ -58,7 +61,9 @@ client_SOURCES = \
   w32_testC.h \
   w32_testC.inl \
   w32_testS.h \
-  w32_testS.inl
+  w32_testS.inl \
+  w32_testS_T.h \
+  w32_testS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -67,8 +72,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/interop-tests/wchar/Makefile.am b/TAO/interop-tests/wchar/Makefile.am
index cf9b92c5a38..27d5313153f 100644
--- a/TAO/interop-tests/wchar/Makefile.am
+++ b/TAO/interop-tests/wchar/Makefile.am
@@ -13,15 +13,11 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.interop_wchar_IDL.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   interop_wcharC.cpp \
   interop_wcharC.h \
@@ -45,16 +41,13 @@ interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/interop_wchar.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   interop_wchar.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Interop_Wchar_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -73,12 +66,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Interop_Wchar_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -102,8 +91,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/Concurrency_Service/.cvsignore b/TAO/orbsvcs/Concurrency_Service/.cvsignore
new file mode 100644
index 00000000000..60c35ef084d
--- /dev/null
+++ b/TAO/orbsvcs/Concurrency_Service/.cvsignore
@@ -0,0 +1 @@
+Concurrency_Service
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index f7c0d690ac5..f18e0fc5ba6 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, install, concurrency_serv, naming, utils {
+project : orbsvcsexe, core, concurrency_serv, naming, utils {
   exename  = Concurrency_Service
 }
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
index 0114d113f00..b0aae6c44ac 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile.am
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Concurrency_Service.am
 
-if BUILD_EXCEPTIONS
-
 bin_PROGRAMS = Concurrency_Service
 
 Concurrency_Service_CPPFLAGS = \
@@ -45,8 +42,6 @@ Concurrency_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/CosEvent_Service/.cvsignore b/TAO/orbsvcs/CosEvent_Service/.cvsignore
new file mode 100644
index 00000000000..a9304243e61
--- /dev/null
+++ b/TAO/orbsvcs/CosEvent_Service/.cvsignore
@@ -0,0 +1 @@
+CosEvent_Service
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index 89d4a75f8a0..90263aae047 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, install, naming, event_serv, svc_utils, iortable, messaging_optional, portableserver {
+project : orbsvcsexe, core, naming, event_serv, svc_utils, iortable, messaging_optional, portableserver {
   exename  = CosEvent_Service
 }
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am
index 6737aa7475b..fe84d063565 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.am
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am
@@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.CosEvent_Service.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS = CosEvent_Service
 
@@ -51,7 +51,7 @@ CosEvent_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/Dump_Schedule/.cvsignore b/TAO/orbsvcs/Dump_Schedule/.cvsignore
new file mode 100644
index 00000000000..fb2c130a840
--- /dev/null
+++ b/TAO/orbsvcs/Dump_Schedule/.cvsignore
@@ -0,0 +1 @@
+Dump_Schedule
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
index f608137338d..2468639a7a3 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, install, rtsched, naming, svc_utils, iortable, portableserver {
+project : orbsvcsexe, core, rtsched, naming, svc_utils, iortable, portableserver {
   exename  = Dump_Schedule
 }
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am
index c2aad327503..c286f12f251 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile.am
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Dump_Schedule.am
 
-if BUILD_EXCEPTIONS
-
 bin_PROGRAMS = Dump_Schedule
 
 Dump_Schedule_CPPFLAGS = \
@@ -41,8 +38,6 @@ Dump_Schedule_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/Event_Service/.cvsignore b/TAO/orbsvcs/Event_Service/.cvsignore
new file mode 100644
index 00000000000..0d4b7f11eb3
--- /dev/null
+++ b/TAO/orbsvcs/Event_Service/.cvsignore
@@ -0,0 +1 @@
+Event_Service
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.mpc b/TAO/orbsvcs/Event_Service/Event_Service.mpc
index 37f43462a3e..00fc51207c2 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.mpc
+++ b/TAO/orbsvcs/Event_Service/Event_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, install, rtevent_serv, rtschedevent, bidir_giop {
+project : orbsvcsexe, core, rtevent_serv, rtschedevent, bidir_giop {
   exename  = Event_Service
 }
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
index 25223b729bd..f5f934274fe 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Event_Service.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 bin_PROGRAMS = Event_Service
@@ -53,7 +52,6 @@ Event_Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/.cvsignore b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/.cvsignore
new file mode 100644
index 00000000000..27d8be5f25e
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/.cvsignore
@@ -0,0 +1 @@
+ftrt_eventservice
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
index e3f70a14015..c5bdcdfdd92 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
@@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.FTRT_Event_Service.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = ftrt_eventservice
 
@@ -61,8 +61,8 @@ ftrt_eventservice_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/.cvsignore b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/.cvsignore
new file mode 100644
index 00000000000..9b9f57c4751
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/.cvsignore
@@ -0,0 +1 @@
+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 8d6a8b7cb19..8c78feec083 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
@@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = ftrtec_factory_service
 
@@ -60,9 +60,9 @@ ftrtec_factory_service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/.cvsignore b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/.cvsignore
new file mode 100644
index 00000000000..e9561cf105c
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/.cvsignore
@@ -0,0 +1 @@
+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 9edc7551222..e7e12326fdc 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
@@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = ftrtec_gateway_service
 
@@ -59,9 +59,9 @@ ftrtec_gateway_service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/.cvsignore b/TAO/orbsvcs/FT_ReplicationManager/.cvsignore
new file mode 100644
index 00000000000..0443905ee6a
--- /dev/null
+++ b/TAO/orbsvcs/FT_ReplicationManager/.cvsignore
@@ -0,0 +1 @@
+FT_ReplicationManager
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index 03fc838db47..03fc838db47 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
index 0901c34e63b..0901c34e63b 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
index bd2d2d8d059..bd2d2d8d059 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
index 253421fe577..253421fe577 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 5a08f15d6d9..5a08f15d6d9 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 4ba96cdee31..4ba96cdee31 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
index 3f101f27dea..3f101f27dea 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index fe174448fb2..fe174448fb2 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index 2e98f977c0c..c34f71456b1 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Lib): orbsvcslib, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Lib): orbsvcslib, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, minimum_corba {
   sharedname   = TAO_ReplicationManagerLib
   dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL
 
@@ -11,7 +11,7 @@ project(*Lib): orbsvcslib, conv_lib, fault_tolerance, notification_skel, ftorb,
   }
 }
 
-project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb, install {
+project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb, core {
   exename  = FT_ReplicationManager
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index 4606008727c..4606008727c 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
index 6b2e263ee85..6b2e263ee85 100644..100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
index a633d22b229..1f7d9f4e065 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
+++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
@@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libTAO_ReplicationManagerLib.la
 
@@ -46,9 +46,9 @@ noinst_HEADERS = \
   FT_FaultConsumer.h \
   FT_FaultEventDescriptor.h
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -56,9 +56,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS = FT_ReplicationManager
 
@@ -104,9 +104,9 @@ FT_ReplicationManager_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/Fault_Detector/.cvsignore b/TAO/orbsvcs/Fault_Detector/.cvsignore
new file mode 100644
index 00000000000..3d60edd3d48
--- /dev/null
+++ b/TAO/orbsvcs/Fault_Detector/.cvsignore
@@ -0,0 +1 @@
+Fault_Detector
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
index f547f4efa48..b88d38ae6f2 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : taoserver, orbsvcsexe, install, fault_tolerance {
+project : taoserver, orbsvcsexe, core, fault_tolerance {
   exename  = Fault_Detector
   Source_Files {
     Fault_Detector_i.cpp
diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am
index 2250699135b..a0033227cea 100644
--- a/TAO/orbsvcs/Fault_Detector/Makefile.am
+++ b/TAO/orbsvcs/Fault_Detector/Makefile.am
@@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS = Fault_Detector
 
@@ -60,9 +60,9 @@ Fault_Detector_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/Fault_Notifier/.cvsignore b/TAO/orbsvcs/Fault_Notifier/.cvsignore
new file mode 100644
index 00000000000..346d74c2dcd
--- /dev/null
+++ b/TAO/orbsvcs/Fault_Notifier/.cvsignore
@@ -0,0 +1,5 @@
+*.dsp
+*.dsw
+Debug
+Fault_Notifier
+Release
diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
index e1691d14996..071207bca3a 100644
--- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
+++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : taoserver, orbsvcsexe, install, fault_tolerance, notification_serv {
+project : taoserver, orbsvcsexe, core, fault_tolerance, notification_serv {
   exename  = Fault_Notifier
   Source_Files {
     FT_Notifier_i.cpp
diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am
index f1a60459f6a..23e094d7a5b 100644
--- a/TAO/orbsvcs/Fault_Notifier/Makefile.am
+++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am
@@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS = Fault_Notifier
 
@@ -64,9 +64,9 @@ Fault_Notifier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/IFR_Service/.cvsignore b/TAO/orbsvcs/IFR_Service/.cvsignore
new file mode 100644
index 00000000000..6a5a929a01d
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/.cvsignore
@@ -0,0 +1,2 @@
+IFR_Service
+tao_ifr
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index d6947d62727..505afb05051 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -4,7 +4,7 @@
 #include "IFR_Service.h"
 #include "tao/Environment.h"
 
-ACE_RCSID (IFR_Service,
+ACE_RCSID (IFR_Service, 
            IFR_Server,
            "$Id$")
 
@@ -19,7 +19,7 @@ main (int argc, char *argv[])
       int status = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (status != 0)
+      if (status == -1)
         {
           return 1;
         }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index cf0d1c13b3c..327ecfa4ae2 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -40,7 +40,7 @@ IFR_Service::init (int argc,
       result = this->my_ifr_server_.init_with_orb (argc,
                                                    argv,
                                                    this->orb_.in ());
-      if (result != 0)
+      if (result == -1)
         {
           return result;
         }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index 9947f8e688e..719169d1594 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -3,7 +3,7 @@
 
 // The ifrservice base project inherits from minimum_corba, so it's no longer
 // necessary to add minimum_corba to 'avoids' here.
-project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client, crosscompile {
+project(IFR_Service) : orbsvcsexe, core, ifrservice, ifr_client, imr_client, crosscompile {
   exename = IFR_Service
 
   IDL_Files {
@@ -16,7 +16,7 @@ project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client,
 }
 
 
-project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, minimum_corba {
   after       += TAO_IDL_FE
   sharedname   = TAO_IFR_BE
   libs        += TAO_IDL_FE
@@ -42,7 +42,7 @@ project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, avoids_minimum
 }
 
 
-project(TAO_IFR_EXE) : aceexe, install, ifr_client, crosscompile, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, minimum_corba {
   after          += TAO_IFR_BE TAO_IDL_FE
   exename         = tao_ifr
   libs           += TAO_IFR_BE TAO TAO_IDL_FE
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am
index 6e818040b1d..af35aebcf86 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.am
+++ b/TAO/orbsvcs/IFR_Service/Makefile.am
@@ -17,8 +17,8 @@ bin_PROGRAMS =
 
 ## Makefile.IFR_Service.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += IFR_Service
 
@@ -50,12 +50,12 @@ IFR_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.TAO_IFR_BE.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libTAO_IFR_BE.la
 
@@ -91,11 +91,11 @@ noinst_HEADERS = \
   ifr_removing_visitor.h \
   ifr_visitor.h
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.TAO_IFR_EXE.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += tao_ifr
 
@@ -107,7 +107,6 @@ tao_ifr_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs/IFR_Service \
   -I$(TAO_ROOT)/TAO_IDL/include \
   -I$(TAO_ROOT)/TAO_IDL/fe \
-  -I$TAO_ROOT \
   -DTAO_IDL_INCLUDE_DIR="\"$(includedir)/tao\""
 
 tao_ifr_SOURCES = \
@@ -124,7 +123,7 @@ tao_ifr_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/ImplRepo_Service/.cvsignore b/TAO/orbsvcs/ImplRepo_Service/.cvsignore
new file mode 100644
index 00000000000..114bf08db80
--- /dev/null
+++ b/TAO/orbsvcs/ImplRepo_Service/.cvsignore
@@ -0,0 +1,3 @@
+ImR_Activator
+ImplRepo_Service
+tao_imr
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index c8a6e8e8534..24d5c6e2a0c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -45,7 +45,7 @@ project(ImR_Locator_IDL) : orbsvcslib, conv_lib, valuetype, portableserver, imr_
   }
 }
 
-project(ImR_Activator) : orbsvcslib, conv_lib, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, valuetype, portableserver, imr_client, messaging, pi, codecfactory {
+project(ImR_Activator) : orbsvcslib, conv_lib, acexml, minimum_corba, valuetype, portableserver, imr_client, messaging, pi, codecfactory {
   sharedname   = TAO_ImR_Activator
   dynamicflags = ACTIVATOR_BUILD_DLL
   after       += ImR_Activator_IDL ImR_Locator_IDL
@@ -65,7 +65,7 @@ project(ImR_Activator) : orbsvcslib, conv_lib, acexml, avoids_minimum_corba, avo
   }
 }
 
-project(ImR_Locator) : orbsvcslib, conv_lib, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iortable, portableserver, messaging, svc_utils, acexml, imr_client {
+project(ImR_Locator) : orbsvcslib, conv_lib, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml, imr_client {
   sharedname   = TAO_ImR_Locator
   dynamicflags = LOCATOR_BUILD_DLL
   after       += ImR_Locator_IDL ImR_Activator_IDL
@@ -92,7 +92,7 @@ project(ImR_Locator) : orbsvcslib, conv_lib, avoids_minimum_corba, avoids_corba_
   }
 }
 
-project(ImR_Locator_Service) : orbsvcsexe, install_bin, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iortable, messaging, acexml ,svc_utils, pi_server, imr_client {
+project(ImR_Locator_Service) : orbsvcsexe, install_bin, minimum_corba, iortable, messaging, acexml ,svc_utils, pi_server, imr_client {
   exename  = ImplRepo_Service
   after   += ImR_Locator ImR_Activator_IDL ImR_Locator_IDL
   libs    += TAO_ImR_Locator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL
@@ -117,7 +117,7 @@ project(ImR_Locator_Service) : orbsvcsexe, install_bin, avoids_minimum_corba, av
 }
 
 
-project(ImR_Activator_Service) : orbsvcsexe, install_bin, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, messaging, svc_utils, imr_client {
+project(ImR_Activator_Service) : orbsvcsexe, install_bin, acexml, minimum_corba, messaging, svc_utils, imr_client {
   exename  = ImR_Activator
   after   += ImR_Activator ImR_Activator_IDL ImR_Locator_IDL
   libs    += TAO_ImR_Activator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL
@@ -130,7 +130,7 @@ project(ImR_Activator_Service) : orbsvcsexe, install_bin, acexml, avoids_minimum
 }
 
 
-project(tao_imr) : orbsvcsexe, install_bin, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, portableserver, imr_client {
+project(tao_imr) : orbsvcsexe, install_bin, minimum_corba, portableserver, imr_client {
   exename  = tao_imr
   install  = $(ACE_ROOT)/bin
   Source_Files {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
index b684a36f75e..166dacc12a0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
@@ -13,43 +13,43 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_LTLIBRARIES =
-CLEANFILES =
-BUILT_SOURCES =
 bin_PROGRAMS =
-noinst_HEADERS =
 
 ## Makefile.ImR_Activator_IDL.am
 
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   ImR_ActivatorC.cpp \
   ImR_ActivatorC.h \
   ImR_ActivatorC.inl \
   ImR_ActivatorS.cpp \
   ImR_ActivatorS.h \
-  ImR_ActivatorS.inl
+  ImR_ActivatorS.inl \
+  ImR_ActivatorS_T.cpp \
+  ImR_ActivatorS_T.h \
+  ImR_ActivatorS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   ImR_Activator-stamp \
   ImR_ActivatorC.cpp \
   ImR_ActivatorC.h \
   ImR_ActivatorC.inl \
   ImR_ActivatorS.cpp \
   ImR_ActivatorS.h \
-  ImR_ActivatorS.inl
+  ImR_ActivatorS.inl \
+  ImR_ActivatorS_T.cpp \
+  ImR_ActivatorS_T.h \
+  ImR_ActivatorS_T.inl
 
-ImR_ActivatorC.cpp ImR_ActivatorC.h ImR_ActivatorC.inl ImR_ActivatorS.cpp ImR_ActivatorS.h ImR_ActivatorS.inl: ImR_Activator-stamp
+ImR_ActivatorC.cpp ImR_ActivatorC.h ImR_ActivatorC.inl ImR_ActivatorS.cpp ImR_ActivatorS.h ImR_ActivatorS.inl ImR_ActivatorS_T.cpp ImR_ActivatorS_T.h ImR_ActivatorS_T.inl: ImR_Activator-stamp
 
 ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl
 	@touch $@
 
-noinst_LTLIBRARIES += libTAO_ImR_Activator_IDL.la
+noinst_LTLIBRARIES = libTAO_ImR_Activator_IDL.la
 
 libTAO_ImR_Activator_IDL_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -64,20 +64,20 @@ libTAO_ImR_Activator_IDL_la_SOURCES = \
   ImR_ActivatorC.cpp \
   ImR_ActivatorS.cpp
 
-noinst_HEADERS += \
+noinst_HEADERS = \
   ImR_Activator.idl \
   ImR_ActivatorC.h \
   ImR_ActivatorC.inl \
   ImR_ActivatorS.h \
   ImR_ActivatorS.inl \
+  ImR_ActivatorS_T.cpp \
+  ImR_ActivatorS_T.h \
+  ImR_ActivatorS_T.inl \
   activator_idl_export.h
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.ImR_Locator_IDL.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES += \
   ImR_LocatorC.cpp \
@@ -85,7 +85,10 @@ BUILT_SOURCES += \
   ImR_LocatorC.inl \
   ImR_LocatorS.cpp \
   ImR_LocatorS.h \
-  ImR_LocatorS.inl
+  ImR_LocatorS.inl \
+  ImR_LocatorS_T.cpp \
+  ImR_LocatorS_T.h \
+  ImR_LocatorS_T.inl
 
 CLEANFILES += \
   ImR_Locator-stamp \
@@ -94,12 +97,15 @@ CLEANFILES += \
   ImR_LocatorC.inl \
   ImR_LocatorS.cpp \
   ImR_LocatorS.h \
-  ImR_LocatorS.inl
+  ImR_LocatorS.inl \
+  ImR_LocatorS_T.cpp \
+  ImR_LocatorS_T.h \
+  ImR_LocatorS_T.inl
 
-ImR_LocatorC.cpp ImR_LocatorC.h ImR_LocatorC.inl ImR_LocatorS.cpp ImR_LocatorS.h ImR_LocatorS.inl: ImR_Locator-stamp
+ImR_LocatorC.cpp ImR_LocatorC.h ImR_LocatorC.inl ImR_LocatorS.cpp ImR_LocatorS.h ImR_LocatorS.inl ImR_LocatorS_T.cpp ImR_LocatorS_T.h ImR_LocatorS_T.inl: ImR_Locator-stamp
 
 ImR_Locator-stamp: $(srcdir)/ImR_Locator.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -108,7 +114,10 @@ BUILT_SOURCES += \
   AsyncStartupWaiterC.inl \
   AsyncStartupWaiterS.cpp \
   AsyncStartupWaiterS.h \
-  AsyncStartupWaiterS.inl
+  AsyncStartupWaiterS.inl \
+  AsyncStartupWaiterS_T.cpp \
+  AsyncStartupWaiterS_T.h \
+  AsyncStartupWaiterS_T.inl
 
 CLEANFILES += \
   AsyncStartupWaiter-stamp \
@@ -117,12 +126,15 @@ CLEANFILES += \
   AsyncStartupWaiterC.inl \
   AsyncStartupWaiterS.cpp \
   AsyncStartupWaiterS.h \
-  AsyncStartupWaiterS.inl
+  AsyncStartupWaiterS.inl \
+  AsyncStartupWaiterS_T.cpp \
+  AsyncStartupWaiterS_T.h \
+  AsyncStartupWaiterS_T.inl
 
-AsyncStartupWaiterC.cpp AsyncStartupWaiterC.h AsyncStartupWaiterC.inl AsyncStartupWaiterS.cpp AsyncStartupWaiterS.h AsyncStartupWaiterS.inl: AsyncStartupWaiter-stamp
+AsyncStartupWaiterC.cpp AsyncStartupWaiterC.h AsyncStartupWaiterC.inl AsyncStartupWaiterS.cpp AsyncStartupWaiterS.h AsyncStartupWaiterS.inl AsyncStartupWaiterS_T.cpp AsyncStartupWaiterS_T.h AsyncStartupWaiterS_T.inl: AsyncStartupWaiter-stamp
 
 AsyncStartupWaiter-stamp: $(srcdir)/AsyncStartupWaiter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl
 	@touch $@
 
 noinst_LTLIBRARIES += libTAO_ImR_Locator_IDL.la
@@ -148,22 +160,27 @@ noinst_HEADERS += \
   AsyncStartupWaiterC.inl \
   AsyncStartupWaiterS.h \
   AsyncStartupWaiterS.inl \
+  AsyncStartupWaiterS_T.cpp \
+  AsyncStartupWaiterS_T.h \
+  AsyncStartupWaiterS_T.inl \
   ImR_Locator.idl \
   ImR_LocatorC.h \
   ImR_LocatorC.inl \
   ImR_LocatorS.h \
   ImR_LocatorS.inl \
+  ImR_LocatorS_T.cpp \
+  ImR_LocatorS_T.h \
+  ImR_LocatorS_T.inl \
   locator_idl_export.h
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.ImR_Activator.am
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES += libTAO_ImR_Activator.la
 
@@ -177,37 +194,19 @@ libTAO_ImR_Activator_la_CPPFLAGS = \
   -I$(ACE_ROOT)/ACEXML/common \
   -DACTIVATOR_BUILD_DLL
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_ImR_Activator_la_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 libTAO_ImR_Activator_la_SOURCES = \
   Activator_Loader.cpp \
   Activator_Options.cpp \
   ImR_Activator_i.cpp
 
-libTAO_ImR_Activator_la_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_ImR_Activator_la_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 noinst_HEADERS += \
   Activator_Loader.h \
   Activator_Options.h \
   ImR_Activator_i.h \
   activator_export.h
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
@@ -215,8 +214,8 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += ImR_Activator
 
@@ -229,29 +228,11 @@ ImR_Activator_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImR_Activator_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 ImR_Activator_SOURCES = \
   Activator_NT_Service.cpp \
   ImR_Activator.cpp \
   Activator_NT_Service.h
 
-ImR_Activator_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImR_Activator_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 ImR_Activator_LDADD = \
   libTAO_ImR_Activator.la \
   libTAO_ImR_Activator_IDL.la \
@@ -269,16 +250,8 @@ ImR_Activator_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImR_Activator_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
@@ -286,8 +259,8 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES += libTAO_ImR_Locator.la
 
@@ -301,14 +274,6 @@ libTAO_ImR_Locator_la_CPPFLAGS = \
   -I$(ACE_ROOT)/ACEXML/common \
   -DLOCATOR_BUILD_DLL
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_ImR_Locator_la_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 libTAO_ImR_Locator_la_SOURCES = \
   Activator_Info.cpp \
   Adapter_Activator.cpp \
@@ -323,16 +288,6 @@ libTAO_ImR_Locator_la_SOURCES = \
   Locator_XMLHandler.cpp \
   Server_Info.cpp
 
-libTAO_ImR_Locator_la_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_ImR_Locator_la_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 noinst_HEADERS += \
   Activator_Info.h \
   Adapter_Activator.h \
@@ -349,8 +304,8 @@ noinst_HEADERS += \
   locator_export.h \
   utils.h
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
@@ -358,8 +313,8 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += ImplRepo_Service
 
@@ -372,29 +327,11 @@ ImplRepo_Service_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImplRepo_Service_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 ImplRepo_Service_SOURCES = \
   ImR_Locator.cpp \
   Locator_NT_Service.cpp \
   Locator_NT_Service.h
 
-ImplRepo_Service_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImplRepo_Service_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 ImplRepo_Service_LDADD = \
   libTAO_ImR_Locator.la \
   libTAO_ImR_Activator_IDL.la \
@@ -414,22 +351,14 @@ ImplRepo_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImplRepo_Service_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
 ## Makefile.tao_imr.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += tao_imr
 
@@ -451,7 +380,7 @@ tao_imr_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/LifeCycle_Service/.cvsignore b/TAO/orbsvcs/LifeCycle_Service/.cvsignore
new file mode 100644
index 00000000000..ae8684a2f43
--- /dev/null
+++ b/TAO/orbsvcs/LifeCycle_Service/.cvsignore
@@ -0,0 +1 @@
+LifeCycle_Service
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 38d32a04cc9..6c8727c5070 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, lifecycle, naming, trading_serv, avoids_minimum_corba, utils {
+project : orbsvcsexe, lifecycle, naming, trading_serv, minimum_corba, utils {
   exename  = LifeCycle_Service
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
index 128cf5a28eb..1a997b187d7 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.LifeCycle_Service.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = LifeCycle_Service
 
@@ -46,7 +46,6 @@ LifeCycle_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \
@@ -56,7 +55,7 @@ LifeCycle_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/LoadBalancer/.cvsignore b/TAO/orbsvcs/LoadBalancer/.cvsignore
new file mode 100644
index 00000000000..11ebf643a83
--- /dev/null
+++ b/TAO/orbsvcs/LoadBalancer/.cvsignore
@@ -0,0 +1,2 @@
+LoadManager
+LoadMonitor
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
index 2308fcc514c..2574a799cfd 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
@@ -3,7 +3,7 @@
 // $Id$
 
 
-project(LoadManager): namingexe, portableserver, install, iortable, iormanip, loadbalancing {
+project(LoadManager): namingexe, portableserver, core, iortable, iormanip, loadbalancing {
   exename  = LoadManager
   requires += ami interceptors
   Source_Files {
@@ -12,7 +12,7 @@ project(LoadManager): namingexe, portableserver, install, iortable, iormanip, lo
   }
 }
 
-project(LoadMonitor): namingexe, portableserver, install, loadbalancing {
+project(LoadMonitor): namingexe, portableserver, core, loadbalancing {
   requires += ami interceptors
   exename  = LoadMonitor
   Source_Files {
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am
index d3634c76188..4956f9d2aa2 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.am
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.am
@@ -19,8 +19,8 @@ bin_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += LoadManager
 
@@ -55,8 +55,8 @@ LoadManager_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -64,8 +64,8 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += LoadMonitor
 
@@ -103,8 +103,8 @@ LoadMonitor_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.cvsignore b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.cvsignore
new file mode 100644
index 00000000000..3ff0e6fc5e4
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.cvsignore
@@ -0,0 +1 @@
+Basic_Logging_Service
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index 54f2829e160..e782bb204f7 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -14,7 +14,7 @@ Basic_Logging_Service::Basic_Logging_Service (void)
   : service_name_ ("BasicLogFactory"),
     ior_file_name_ (0),
     pid_file_name_ (0),
-    bind_to_naming_service_ (true),
+    bind_to_naming_service_ (1),
     nthreads_ (0)
 {
   // No-Op.
@@ -26,8 +26,8 @@ Basic_Logging_Service::~Basic_Logging_Service (void)
 }
 
 void
-Basic_Logging_Service::init_ORB (int& argc, char *argv []
-                                 ACE_ENV_ARG_DECL)
+Basic_Logging_Service::init_ORB  (int& argc, char *argv []
+                                  ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
@@ -35,7 +35,7 @@ Basic_Logging_Service::init_ORB (int& argc, char *argv []
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var poa_object =
+  CORBA::Object_var poa_object  =
     this->orb_->resolve_initial_references("RootPOA"
                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -64,23 +64,23 @@ Basic_Logging_Service::parse_args (int argc, char *argv[])
       switch (opt)
         {
         case 'n':
-          this->service_name_ = get_opt.opt_arg ();
+          service_name_ = get_opt.opt_arg();
           break;
 
         case 'o':
-          this->ior_file_name_ = get_opt.opt_arg ();
+          ior_file_name_ = get_opt.opt_arg();
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.opt_arg ();
+          pid_file_name_ = get_opt.opt_arg();
           break;
 
         case 't':
-          this->nthreads_ = ACE_OS::atoi (get_opt.opt_arg ());
+          nthreads_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'x':
-          this->bind_to_naming_service_ = false;
+          bind_to_naming_service_ = 0;
           break;
 
         case '?':
@@ -104,7 +104,7 @@ Basic_Logging_Service::parse_args (int argc, char *argv[])
 int
 Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
-  // initialize the ORB.
+  // initalize the ORB.
   this->init_ORB (argc, argv
                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -113,6 +113,7 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
     return -1;
 
   // Activate the basic log factory
+  // CORBA::Object_var obj =
   DsLogAdmin::BasicLogFactory_var obj =
     this->basic_log_factory_.activate (this->orb_.in (),
                                        this->poa_.in ()
@@ -139,24 +140,23 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
       ACE_CHECK_RETURN (-1);
     }
 
-  if (this->ior_file_name_ != 0)
+  if (ior_file_name_ != 0)
     {
-      FILE* iorf = ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w"));
-      if (iorf == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Cannot open output file for writing IOR: %s",
-                             this->ior_file_name_),
-                            -1);
-        }
+      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w"));
+      if (iorf == 0) {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_file_name_),
+                          -1);
+      }
 
       ACE_OS::fprintf (iorf, "%s\n", ior.in ());
       ACE_OS::fclose (iorf);
     }
 
-  if (this->pid_file_name_ != 0)
+  if (pid_file_name_ != 0)
     {
-      FILE* pidf = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
+      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w"));
       if (pidf != 0)
         {
           ACE_OS::fprintf (pidf,
@@ -166,12 +166,15 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
         }
     }
 
-  if (this->bind_to_naming_service_)
+  if (bind_to_naming_service_)
     {
       // Resolve the naming service.
       this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
+      // Register the Basic Log Factory.
+      ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
+
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
@@ -222,7 +225,7 @@ Basic_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Basic_Logging_Service::svc (void)
+Basic_Logging_Service::svc ()
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -242,18 +245,32 @@ Basic_Logging_Service::svc (void)
 void
 Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->bind_to_naming_service_)
+  // @@ JTC - factory object isn't activated on root poa.
+#if 0
+  // Deactivate.
+  PortableServer::ObjectId_var oid =
+    this->poa_->servant_to_id (&this->basic_log_factory_
+                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Deactivate from the poa.
+  this->poa_->deactivate_object (oid.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+#endif
+
+  if (bind_to_naming_service_)
     {
+      // Unbind from the naming service.
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->unbind (name
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 
-  // shutdown the ORB.
+  // Shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
     this->orb_->shutdown ();
 }
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
index 91af3e22296..57066ebf020 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
@@ -87,7 +87,7 @@ protected:
   const char* pid_file_name_;
   // The name of the file where we output the process id.
 
-  bool bind_to_naming_service_;
+  int bind_to_naming_service_;
   // If true, bind to naming service
 
   int nthreads_;
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 96b23dc90ff..3a63ffedf79 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,5 @@
 // $Id$
 
-project: namingexe, iortable, install, dslogadmin_serv, valuetype {
+project: namingexe, iortable, core, dslogadmin_serv, valuetype {
   exename   = Basic_Logging_Service
 }
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
index 9ce456829f5..1d5584d36e0 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Basic_Logging_Service.am
 
-if BUILD_EXCEPTIONS
-
 bin_PROGRAMS = Basic_Logging_Service
 
 Basic_Logging_Service_CPPFLAGS = \
@@ -34,6 +31,7 @@ Basic_Logging_Service_SOURCES = \
   Basic_Logging_Service.h
 
 Basic_Logging_Service_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
@@ -41,7 +39,6 @@ Basic_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
@@ -51,8 +48,6 @@ Basic_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.cvsignore b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.cvsignore
new file mode 100644
index 00000000000..31e33cd2684
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.cvsignore
@@ -0,0 +1 @@
+Event_Logging_Service
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index 6020302f152..be47a102d7c 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -15,7 +15,7 @@ Event_Logging_Service::Event_Logging_Service (void)
   : service_name_ ("EventLogFactory"),
     ior_file_name_ (0),
     pid_file_name_ (0),
-    bind_to_naming_service_ (true),
+    bind_to_naming_service_ (1),
     nthreads_ (0)
 {
   // No-Op.
@@ -27,8 +27,8 @@ Event_Logging_Service::~Event_Logging_Service (void)
 }
 
 void
-Event_Logging_Service::init_ORB (int& argc, char *argv []
-				 ACE_ENV_ARG_DECL)
+Event_Logging_Service::init_ORB  (int& argc, char *argv []
+                                  ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
@@ -36,7 +36,7 @@ Event_Logging_Service::init_ORB (int& argc, char *argv []
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var poa_object =
+  CORBA::Object_var poa_object  =
     this->orb_->resolve_initial_references("RootPOA"
                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -65,23 +65,23 @@ Event_Logging_Service::parse_args (int argc, char *argv[])
       switch (opt)
         {
         case 'n':
-          this->service_name_ = get_opt.opt_arg ();
+          service_name_ = get_opt.opt_arg();
           break;
 
         case 'o':
-          this->ior_file_name_ = get_opt.opt_arg ();
+          ior_file_name_ = get_opt.opt_arg();
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.opt_arg ();
+          pid_file_name_ = get_opt.opt_arg();
           break;
 
         case 't':
-          this->nthreads_ = ACE_OS::atoi (get_opt.opt_arg ());
+          nthreads_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'x':
-          this->bind_to_naming_service_ = false;
+          bind_to_naming_service_ = 0;
           break;
 
         case '?':
@@ -105,7 +105,7 @@ Event_Logging_Service::parse_args (int argc, char *argv[])
 int
 Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
-  // initialize the ORB.
+  // initalize the ORB.
   this->init_ORB (argc, argv
                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -118,6 +118,7 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
                     TAO_EventLogFactory_i (),
                     CORBA::NO_MEMORY ());
 
+  // CORBA::Object_var obj =
   DsEventLogAdmin::EventLogFactory_var obj =
     this->event_log_factory_->activate (this->orb_.in (),
                                         this->poa_.in ()
@@ -144,23 +145,23 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
       ACE_CHECK_RETURN (-1);
     }
 
-  if (this->ior_file_name_ != 0)
+  if (ior_file_name_ != 0)
     {
-      FILE* iorf = ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w"));
-      if (iorf == 0)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "Cannot open output file for writing IOR: %s",
-			     this->ior_file_name_),
-			    -1);
-	}
+      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w"));
+      if (iorf == 0) {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_file_name_),
+                          -1);
+      }
+
       ACE_OS::fprintf (iorf, "%s\n", ior.in ());
       ACE_OS::fclose (iorf);
     }
 
-  if (this->pid_file_name_ != 0)
+  if (pid_file_name_ != 0)
     {
-      FILE* pidf = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
+      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w"));
       if (pidf != 0)
         {
           ACE_OS::fprintf (pidf,
@@ -170,13 +171,15 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
         }
     }
 
-  if (this->bind_to_naming_service_)
+  if (bind_to_naming_service_)
     {
       // Resolve the naming service.
       this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       // Register the Event Log Factory.
+      ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
+
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
@@ -247,15 +250,29 @@ Event_Logging_Service::svc (void)
 void
 Event_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->bind_to_naming_service_)
+  // @@ JTC - factory object isn't activated on root poa.
+#if 0
+  // Deactivate.
+  PortableServer::ObjectId_var oid =
+    this->poa_->servant_to_id (this->event_log_factory_
+                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // deactivate from the poa.
+  this->poa_->deactivate_object (oid.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+#endif
+
+  if (bind_to_naming_service_)
     {
+      // Unbind from the naming service.
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->unbind (name
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 
   // shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
index 36be03ed34d..de98deb20f9 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
@@ -88,7 +88,7 @@ protected:
   const char* pid_file_name_;
   // The name of the file where we output the process id.
 
-  bool bind_to_naming_service_;
+  int bind_to_naming_service_;
   // If true, bind to naming service
 
   int nthreads_;
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 acd7db3bb72..cd3075b21d8 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,5 @@
 // $Id$
 
-project: namingexe, iortable, install, dseventlogadmin_serv, valuetype {
+project: namingexe, iortable, core, dseventlogadmin_serv, valuetype {
   exename   = Event_Logging_Service
 }
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
index 496279e6e66..fcc727eb83c 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
@@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Event_Logging_Service.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS = Event_Logging_Service
 
@@ -41,6 +41,7 @@ Event_Logging_Service_LDADD = \
   $(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)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
@@ -48,7 +49,6 @@ Event_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
@@ -62,7 +62,7 @@ Event_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
index 4977a7bac72..4977a7bac72 100644..100755
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.cvsignore b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.cvsignore
new file mode 100644
index 00000000000..bf00697bc77
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.cvsignore
@@ -0,0 +1 @@
+Notify_Logging_Service
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
index b4bf6750025..42c6388bae0 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Notify_Logging_Service.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS = Notify_Logging_Service
 
@@ -35,6 +35,7 @@ Notify_Logging_Service_SOURCES = \
   Notify_Logging_Service.h
 
 Notify_Logging_Service_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
@@ -44,7 +45,6 @@ Notify_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \
@@ -62,7 +62,7 @@ Notify_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 00f6f2e038d..fd898bddc31 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -16,7 +16,7 @@ Notify_Logging_Service::Notify_Logging_Service (void)
   : service_name_ (NOTIFY_KEY),
     ior_file_name_ (0),
     pid_file_name_ (0),
-    bind_to_naming_service_ (true),
+    bind_to_naming_service_ (1),
     nthreads_ (0)
 {
   // No-Op.
@@ -45,18 +45,18 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
       return -1;
     }
 
-  CORBA::Object_var poa_object =
+  CORBA::Object_var poa_obj  =
     this->orb_->resolve_initial_references("RootPOA"
                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  if (CORBA::is_nil (poa_object.in ()))
+  if (CORBA::is_nil (poa_obj.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to resolve the RootPOA.\n"),
                       -1);
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
+    PortableServer::POA::_narrow (poa_obj.in ()
                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -73,7 +73,7 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
 int
 Notify_Logging_Service::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t::x"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -81,23 +81,23 @@ Notify_Logging_Service::parse_args (int argc, char *argv[])
       switch (opt)
         {
         case 'n':
-          this->service_name_ = get_opt.opt_arg ();
+          service_name_ = get_opt.opt_arg();
           break;
 
         case 'o':
-          this->ior_file_name_ = get_opt.opt_arg ();
+          ior_file_name_ = get_opt.opt_arg();
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.opt_arg ();
+          pid_file_name_ = get_opt.opt_arg();
           break;
 
         case 't':
-          this->nthreads_ = ACE_OS::atoi (get_opt.opt_arg ());
+          nthreads_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'x':
-          this->bind_to_naming_service_ = false;
+          bind_to_naming_service_ = 0;
           break;
 
         case '?':
@@ -107,7 +107,6 @@ Notify_Logging_Service::parse_args (int argc, char *argv[])
                       "-n service_name "
                       "-o ior_file_name "
                       "-p pid_file_name "
-                      "-t threads "
                       "-x [disable naming service bind] "
                       "\n",
                       argv[0]));
@@ -122,7 +121,7 @@ int
 Notify_Logging_Service::init (int argc, char *argv[]
                           ACE_ENV_ARG_DECL)
 {
-  // initialize the ORB.
+  // initalize the ORB.
   if (this->init_ORB (argc, argv
                       ACE_ENV_ARG_PARAMETER) != 0)
     return -1;
@@ -168,14 +167,14 @@ Notify_Logging_Service::init (int argc, char *argv[]
       ACE_CHECK_RETURN (-1);
     }
 
-  if (this->ior_file_name_ != 0)
+  if (ior_file_name_ != 0)
     {
-      FILE* iorf = ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w"));
+      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w"));
       if (iorf == 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Cannot open output file for writing IOR: %s",
-                             this->ior_file_name_),
+                             ior_file_name_),
                             -1);
         }
 
@@ -183,9 +182,9 @@ Notify_Logging_Service::init (int argc, char *argv[]
       ACE_OS::fclose (iorf);
     }
 
-  if (this->pid_file_name_ != 0)
+  if (pid_file_name_ != 0)
     {
-      FILE* pidf = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
+      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w"));
       if (pidf != 0)
         {
           ACE_OS::fprintf (pidf,
@@ -195,15 +194,19 @@ Notify_Logging_Service::init (int argc, char *argv[]
         }
     }
 
-  if (this->bind_to_naming_service_)
+  if (bind_to_naming_service_)
     {
       // Resolve the naming service.
-      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+      resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
+      // Register the Factory
+      ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
+
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
+      ACE_CHECK_RETURN (-1);
 
       this->naming_->rebind (name,
                              obj.in ()
@@ -228,7 +231,7 @@ Notify_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 
   this->naming_ =
     CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -251,7 +254,7 @@ Notify_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Notify_Logging_Service::svc (void)
+Notify_Logging_Service::svc ()
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -271,11 +274,26 @@ Notify_Logging_Service::svc (void)
 void
 Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->bind_to_naming_service_)
+  // @@ JTC - factory object isn't activated on root poa.
+#if 0
+  // Deactivate.
+  PortableServer::ObjectId_var oid =
+    this->poa_->reference_to_id (this->notify_log_factory_.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // deactivate from the poa.
+  this->poa_->deactivate_object (oid.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+#endif
+
+  if (bind_to_naming_service_)
     {
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
+      ACE_CHECK;
 
       this->naming_->unbind (name
                              ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
index ed1202bcd9b..c6d5f3a459b 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
@@ -98,7 +98,7 @@ protected:
   const char* pid_file_name_;
   // The name of the file where we output the process id.
 
-  bool bind_to_naming_service_;
+  int bind_to_naming_service_;
   // If true, bind to naming service
 
   int nthreads_;
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 262cc2a4339..3990281b3e6 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, iortable, install, dsnotifylogadmin_serv, valuetype {
+project: namingexe, iortable, core, dsnotifylogadmin_serv, valuetype {
   exename   = Notify_Logging_Service
 }
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
index 282768d11e9..282768d11e9 100644..100755
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.cvsignore b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.cvsignore
new file mode 100644
index 00000000000..b2ce1a35634
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.cvsignore
@@ -0,0 +1 @@
+RTEvent_Logging_Service
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
index 7ddb772b880..bc87d82f809 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RTEvent_Logging_Service.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 bin_PROGRAMS = RTEvent_Logging_Service
@@ -31,7 +30,6 @@ RTEvent_Logging_Service_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 RTEvent_Logging_Service_SOURCES = \
-  RTEvent_Logging_Server.cpp \
   RTEvent_Logging_Service.cpp \
   RTEvent_Logging_Service.h
 
@@ -62,7 +60,6 @@ RTEvent_Logging_Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README
index 9f49da0c078..9f49da0c078 100644..100755
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
deleted file mode 100644
index 5b3ba58a51d..00000000000
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "RTEvent_Logging_Service.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "ace/OS_main.h"
-
-#include "orbsvcs/Shutdown_Utilities.h"
-#include "tao/debug.h"
-
-ACE_RCSID (RTEvent_Logging_Service,
-           RTEvent_Logging_Server,
-           "$Id$")
-
-
-class Logging_Svc_Shutdown
-  : public Shutdown_Functor
-{
-public:
-  Logging_Svc_Shutdown (RTEvent_Logging_Service& svc);
-
-  void operator() (int which_signal);
-
-private:
-  RTEvent_Logging_Service&        svc_;
-};
-
-Logging_Svc_Shutdown::Logging_Svc_Shutdown (RTEvent_Logging_Service& svc)
-  : svc_ (svc)
-{
-}
-
-void
-Logging_Svc_Shutdown::operator() (int which_signal)
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "RTEvent_Logging_Service: shutting down on signal %d\n",
-                which_signal));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  (void) this->svc_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// Driver function for the RTEvent_Logging_Service
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  TAO_EC_Default_Factory::init_svcs ();
-
-  RTEvent_Logging_Service service;
-
-  Logging_Svc_Shutdown killer (service);
-  Service_Shutdown kill_contractor (killer);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      int rc;
-
-      rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (rc == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Failed to initialize the Telecom Log Service.\n"),
-                          1);
-
-      rc = service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (rc == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Failed to start the Telecom Log Service.\n"),
-                          1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start the Telecom Log Service.\n");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index fa49a6952ed..02dce835e2e 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -1,269 +1,341 @@
 #include "RTEvent_Logging_Service.h"
-#include "tao/IORTable/IORTable.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_unistd.h"
+#include "ace/Auto_Ptr.h"
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "tao/IORTable/IORTable.h"
+#include "ace/OS_main.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID (RTEvent_Logging_Service,
            RTEvent_Logging_Service,
            "$Id$")
 
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  TAO_EC_Default_Factory::init_svcs ();
+
+  RTEvent_Logging_Service event_service;
+  return event_service.run (argc, argv);
+}
+
+// ****************************************************************
 
 RTEvent_Logging_Service::RTEvent_Logging_Service (void)
-  : service_name_ ("RTEventLogFactory"),
+  : sched_impl_ (0),
+    // ec_impl_ (0),
+    service_name_ (0),
     ior_file_name_ (0),
     pid_file_name_ (0),
-    bind_to_naming_service_ (true),
-    nthreads_ (0)
+    global_scheduler_ (0),
+    rtevent_log_factory_name_ ("RTEventLogFactory"),
+    child_poa_name_ ("RTEventLog_ChildPOA"),
+    factory_servant_ (0)
 {
-  // No-Op.
 }
 
 RTEvent_Logging_Service::~RTEvent_Logging_Service (void)
 {
-  // No-Op.
+  //delete this->ec_impl_;
+  //this->ec_impl_ = 0;
+  //delete this->sched_impl_;
+  //this->sched_impl_ = 0;
 }
 
-void
-RTEvent_Logging_Service::init_ORB (int& argc, char *argv[]
-                                   ACE_ENV_ARG_DECL)
+int
+RTEvent_Logging_Service::run (int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
+  ACE_TRY_NEW_ENV
+    {
+      // Initialize ORB.
+      this->orb_ =
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
+      if (this->parse_args (argc, argv) == -1)
+        return 1;
 
-int
-RTEvent_Logging_Service::parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x"));
-  int opt;
+      ACE_NEW_RETURN (factory_servant_,
+                      TAO_RTEventLogFactory_i (),
+                      -1);
 
-  while ((opt = get_opt ()) != EOF)
-    {
-      switch (opt)
-        {
-        case 'n':
-          this->service_name_ = get_opt.opt_arg ();
-          break;
+      CORBA::Object_var poa_object =
+        this->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);
 
-        case 'o':
-          this->ior_file_name_ = get_opt.opt_arg ();
-          break;
+      this->root_poa_ =
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-        case 'p':
-          this->pid_file_name_ = get_opt.opt_arg ();
-          break;
+      PortableServer::POAManager_var poa_manager =
+        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-        case 't':
-          this->nthreads_ = ACE_OS::atoi (get_opt.opt_arg ());
-          break;
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-        case 'x':
-          this->bind_to_naming_service_ = false;
-          break;
+      CORBA::Object_var naming_obj =
+        this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-        case '?':
-        default:
-          ACE_DEBUG ((LM_DEBUG,
-                      "Usage: %s "
-                      "-n service_name "
-                      "-o ior_file_name "
-                      "-p pid_file_name "
-                      "-t threads "
-                      "-x [disable naming service bind] "
-                      "\n",
-                      argv[0]));
-          return -1;
+      if (CORBA::is_nil (naming_obj.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the Naming Service.\n"),
+                          1);
+
+      CosNaming::NamingContext_var context =
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+//    Alternative way to get NamingContext.
+/*      if (naming_client_.init (orb_.in ()) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%P|%t) Unable to initialize "
+                           "the TAO_Naming_Client. \n"),
+                          1);
+
+      CosNaming::NamingContext_var context =
+        naming_client_.get_context ();
+*/
+
+      RtecScheduler::Scheduler_var scheduler;
+      // This is the name we (potentially) register the Scheduling
+      // Service in the Naming Service.
+
+      CosNaming::Name schedule_name (1);
+      schedule_name.length (1);
+      schedule_name[0].id = CORBA::string_dup ("ScheduleService");
+
+
+      if (1) // this->event_service_type_ == ES_OLD_REACTIVE
+             // || this->event_service_type_ == ES_OLD_MT)
+        {
+          // We must find the scheduler object reference...
+
+          if (this->global_scheduler_ == 0)
+            {
+              ACE_NEW_RETURN (this->sched_impl_,
+                              ACE_Config_Scheduler,
+                              1);
+
+              scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              // Register the servant with the Naming Context....
+              context->rebind (schedule_name, scheduler.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+
+              ACE_TRY_CHECK;
+            }
+          else
+          {
+              CORBA::Object_var tmp =
+                context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
+                                                             ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
         }
-    }
 
-  return 0;
-}
 
-int
-RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  // initialize the ORB.
-  this->init_ORB (argc, argv
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (this->parse_args (argc, argv) == -1)
-    return -1;
-
-  // Activate the rtevent log factory
-  ACE_NEW_THROW_EX (this->rtevent_log_factory_,
-                    TAO_RTEventLogFactory_i (),
-                    CORBA::NO_MEMORY ());
-
-  if (this->rtevent_log_factory_->init (orb_.in (),
-                                        poa_.in ()
-                                        ACE_ENV_ARG_PARAMETER) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) Unable to initialize "
-                         "the factory. \n"),
-                        -1);
-    }
 
-  RTEventLogAdmin::EventLogFactory_var obj =
-    this->rtevent_log_factory_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+/*
+      TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
+                                            root_poa.in ());
+      TAO_EC_Event_Channel* ec;
+      ACE_NEW_RETURN (ec,
+                      TAO_EC_Event_Channel (attr),
+                      1);
+      this->ec_impl_ = ec;
+      ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+*/
+      // Notice that we activate *this* object with the POA, but we
+      // forward all the requests to the underlying EC
+      // implementation.
+/*
+      RtecEventChannelAdmin::EventChannel_var ec =
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-  CORBA::String_var ior =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+      CORBA::String_var str =
+        this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-  if (true)
-    {
-      CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
 
-      IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in ());
-      ACE_CHECK_RETURN (-1);
+      ACE_DEBUG ((LM_DEBUG,
+                  "The EC IOR is <%s>\n", str.in ()));
 
-      adapter->bind("RTEventLogService", ior.in ());
-      ACE_CHECK_RETURN (-1);
-    }
+      CosNaming::Name channel_name (1);
+      channel_name.length (1);
+      channel_name[0].id = CORBA::string_dup (this->service_name_);
+      naming_context->rebind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+*/
+
+      if (factory_servant_->init (orb_.in (),
+                                  root_poa_.in ()
+                                 ACE_ENV_ARG_PARAMETER) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%P|%t) Unable to initialize "
+                           "the factory. \n"),
+                          1);
+
+      // activate the factory in the root poa.
+      factory_ = factory_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-  if (this->ior_file_name_ != 0)
-    {
-      FILE* iorf = ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w"));
-      if (iorf == 0)
+      // Give the ownership to the POA.
+      factory_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+      ACE_TRY_CHECK;
+      CORBA::String_var
+        ior = orb_->object_to_string (factory_.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (true)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Cannot open output file for writing IOR: %s",
-                             this->ior_file_name_),
-                            -1);
+          CORBA::Object_var table_object =
+          this->orb_->resolve_initial_references ("IORTable"
+                                                  ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+
+          IORTable::Table_var adapter =
+            IORTable::Table::_narrow (table_object.in ());
+          ACE_CHECK_RETURN (-1);
+
+          adapter->bind("RTEventLogService", ior.in ());
+          ACE_CHECK_RETURN (-1);
         }
-      ACE_OS::fprintf (iorf, "%s\n", ior.in ());
-      ACE_OS::fclose (iorf);
-    }
 
-  if (this->pid_file_name_ != 0)
-    {
-      FILE* pidf = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
-      if (pidf != 0)
+      if (this->ior_file_name_ != 0)
         {
-          ACE_OS::fprintf (pidf,
-                           "%ld\n",
-                           static_cast<long> (ACE_OS::getpid ()));
-          ACE_OS::fclose (pidf);
+          FILE *output_file= ACE_OS::fopen (this->ior_file_name_, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               this->ior_file_name_),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
         }
-    }
 
-  if (this->bind_to_naming_service_)
-    {
-      // Resolve the naming service.
-      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      if (this->pid_file_name_ != 0)
+        {
+          FILE *pidf = fopen (this->pid_file_name_, "w");
+          if (pidf != 0)
+            {
+              ACE_OS::fprintf (pidf,
+                               "%ld\n",
+                               static_cast<long> (ACE_OS::getpid ()));
+              ACE_OS::fclose (pidf);
+            }
+        }
 
       CosNaming::Name name (1);
       name.length (1);
-      name[0].id = CORBA::string_dup (this->service_name_);
+      name[0].id = CORBA::string_dup (rtevent_log_factory_name_);
+      context->rebind (name,
+                              factory_.in ()
+                              ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-      this->naming_->rebind (name,
-                             obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-  return 0;
-}
+      context->unbind (name ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-void
-RTEvent_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Need to check return value for errors.
-  if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
-
-  this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
+      if (!CORBA::is_nil (scheduler.in ()))
+        {
+          context->unbind (schedule_name ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
 
-int
-RTEvent_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->nthreads_ > 0)
+    }
+  ACE_CATCHANY
     {
-      if (this->activate ((THR_NEW_LWP | THR_JOINABLE), this->nthreads_) != 0)
-        return -1;
-
-      this->thr_mgr ()->wait ();
-      return 0;
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC");
     }
+  ACE_ENDTRY;
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-RTEvent_Logging_Service::svc (void)
+RTEvent_Logging_Service::parse_args (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
+  // default values...
+  this->service_name_ = "EventService";
 
-  return 0;
-}
+  ACE_Get_Opt get_opt (argc, argv, "n:o:p:s:");
+  int opt;
 
-void
-RTEvent_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->bind_to_naming_service_)
+  while ((opt = get_opt ()) != EOF)
     {
-      CosNaming::Name name (1);
-      name.length (1);
-      name[0].id = CORBA::string_dup (this->service_name_);
+      switch (opt)
+        {
+        case 'n':
+          this->service_name_ = get_opt.opt_arg ();
+          break;
+
+        case 'o':
+          this->ior_file_name_ = get_opt.opt_arg ();
+          break;
+
+        case 'p':
+          this->pid_file_name_ = get_opt.opt_arg ();
+          break;
+
+        case 's':
+          // It could be just a flag (i.e. no "global" or "local"
+          // argument, but this is consistent with the EC_Multiple
+          // test and also allows for a runtime scheduling service.
+
+          if (ACE_OS::strcasecmp (get_opt.opt_arg (), "global") == 0)
+            {
+              this->global_scheduler_ = 1;
+            }
+          else if (ACE_OS::strcasecmp (get_opt.opt_arg (), "local") == 0)
+            {
+              this->global_scheduler_ = 0;
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "Unknown scheduling type <%s> "
+                          "defaulting to local\n",
+                          get_opt.opt_arg ()));
+              this->global_scheduler_ = 0;
+            }
+          break;
 
-      this->naming_->unbind (name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        case '?':
+        default:
+          ACE_DEBUG ((LM_DEBUG,
+                      "Usage: %s "
+                      "-n service_name "
+                      "-o ior_file_name "
+                      "-p pid_file_name "
+                      "-s <global|local> "
+                      "\n",
+                      argv[0]));
+          return -1;
+        }
     }
 
-  // shutdown the ORB.
-  if (!CORBA::is_nil (this->orb_.in ()))
-    this->orb_->shutdown ();
+  return 0;
 }
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 535fea9fbe0..629155423b4 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
@@ -17,80 +17,68 @@
 #ifndef RTEVENT_LOGGING_SERVICE_H
 #define RTEVENT_LOGGING_SERVICE_H
 
-#include "ace/Task.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecSchedulerS.h"
+
+#include "orbsvcs/RTEventLogAdminS.h"
+
 #include "orbsvcs/Log/RTEventLogFactory_i.h"
 
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/Naming/Naming_Client.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class RTEvent_Logging_Service
-  : public ACE_Task_Base
 {
-  // = TITLE
-  //   RTEvent_Logging_Service
-  //
-  // = DESCRIPTION
-  //   Implementation of the Telecom Log Service
-
 public:
-  // = Initialization and termination methods.
   RTEvent_Logging_Service (void);
-  // Constructor.
-  
   virtual ~RTEvent_Logging_Service (void);
-  // Destructor.
-
-  int init (int argc, char* argv[]);
-  // Initializes the Telecom Log Service.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
-    // Run the Telecom Log Service.
-  // Returns 0 on success, -1 on error.
-
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
-  // Shutdown the Telecom Log Service.
-  // Returns 0 on success, -1 on error.
-
-protected:
-  void init_ORB (int& argc, char *argv []
-		 ACE_ENV_ARG_DECL);
-  // initializes the ORB.
+  int run (int argc, char* argv[]);
+  // Run the event service.
 
+private:
   int parse_args (int argc, char* argv[]);
   // parse the command line args
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
-  // Resolve the naming service.
-
-  int svc ();
-  // Run worker threads.
-
 private:
-  // = Data members
-  TAO_RTEventLogFactory_i *rtevent_log_factory_;
-  // The RTEvent Log Factory.
-
-  CORBA::ORB_var orb_;
-  // The ORB that we use.
-
-  PortableServer::POA_var poa_;
-  // Reference to the root poa.
-
-  CosNaming::NamingContext_var naming_;
-  // A naming context.
+  POA_RtecScheduler::Scheduler *sched_impl_;
+  // The Scheduler implementation.
 
   const char* service_name_;
   // The name we use to bind with the NameService
 
   const char* ior_file_name_;
-  // The name of the file were we output the factory IOR.
+  // The name of the file were we output the Event_Service IOR.
 
   const char* pid_file_name_;
   // The name of a file where the process stores its pid
 
-  bool bind_to_naming_service_;
-  // If true, bind to naming service
-	
-  int nthreads_;
-  // Number of worker threads.
+  int global_scheduler_;
+  // Should we use a global scheduler or a local one?
+
+  const char* rtevent_log_factory_name_;
+  // The name of the factory registered with the naming service.
+
+  const char* child_poa_name_;
+  // The name of the Child POA.
+
+  TAO_RTEventLogFactory_i *factory_servant_;
+  // The factory servant.
+
+  CORBA::ORB_var orb_;
+  // The ORB that we use.
+
+  PortableServer::POA_var root_poa_;
+  // Reference to the root poa.
+
+  RTEventLogAdmin::EventLogFactory_var factory_;
+  // The corba object after activation.
+
+  TAO_Naming_Client naming_client_;
 };
 
 #endif /* RTEVENT_LOGGING_SERVICE_H */
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 c52ca82d501..199315c55a2 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,5 @@
 // $Id$
 
-project: namingexe, iortable, install, rteventlogadmin_serv, valuetype {
+project: namingexe, iortable, core, rteventlogadmin_serv, valuetype {
   exename   = RTEvent_Logging_Service
 }
diff --git a/TAO/orbsvcs/Naming_Service/.cvsignore b/TAO/orbsvcs/Naming_Service/.cvsignore
new file mode 100644
index 00000000000..c089bb234b3
--- /dev/null
+++ b/TAO/orbsvcs/Naming_Service/.cvsignore
@@ -0,0 +1,2 @@
+NT_Naming_Service
+Naming_Service
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
index 6f2a041e59d..dc236ad3e21 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -17,7 +17,6 @@ bin_PROGRAMS =
 
 ## Makefile.NT_Naming_Service.am
 
-if BUILD_EXCEPTIONS
 if BUILD_WINNT
 if !BUILD_ACE_FOR_TAO
 
@@ -55,11 +54,9 @@ NT_Naming_Service_LDADD = \
 
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_WINNT
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Naming_Service.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 bin_PROGRAMS += Naming_Service
@@ -94,7 +91,6 @@ Naming_Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index 9bf8b75dc88..9382d787a92 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, install, naming_serv, imr_client {
+project : orbsvcsexe, core, naming_serv, imr_client {
   exename  = Naming_Service
   Source_Files {
     Naming_Server.cpp
@@ -9,7 +9,7 @@ project : orbsvcsexe, install, naming_serv, imr_client {
   }
 }
 
-project(NT_Naming_Service) : orbsvcsexe, install, naming_serv {
+project(NT_Naming_Service) : orbsvcsexe, core, naming_serv {
   requires += winnt
   exename  = NT_Naming_Service
   Source_Files {
diff --git a/TAO/orbsvcs/Notify_Service/.cvsignore b/TAO/orbsvcs/Notify_Service/.cvsignore
new file mode 100644
index 00000000000..3de70f7f49a
--- /dev/null
+++ b/TAO/orbsvcs/Notify_Service/.cvsignore
@@ -0,0 +1,2 @@
+NT_Notify_Service
+Notify_Service
diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am
index 0be14c12f78..c7da6212cb3 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile.am
+++ b/TAO/orbsvcs/Notify_Service/Makefile.am
@@ -17,9 +17,9 @@ bin_PROGRAMS =
 
 ## Makefile.NT_Notify_Service.am
 
-if BUILD_EXCEPTIONS
 if BUILD_WINNT
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += NT_Notify_Service
 
@@ -56,13 +56,13 @@ NT_Notify_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_WINNT
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Notify_Service.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += Notify_Service
 
@@ -97,7 +97,7 @@ Notify_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index ed5898ccb63..e7d95c4dd99 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -24,7 +24,6 @@ TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
 , notify_channel_name_ (NOTIFY_CHANNEL_NAME)
 , register_event_channel_ (0)
 , nthreads_ (1)
-, separate_dispatching_orb_ (false)
 {
   // No-Op.
 }
@@ -74,22 +73,6 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []
 }
 
 int
-TAO_Notify_Service_Driver::init_dispatching_ORB (int& argc, ACE_TCHAR *argv []
-                              ACE_ENV_ARG_DECL)
-{
-  // Copy command line parameter.
-  ACE_Argv_Type_Converter command_line(argc, argv);
-
-  this->dispatching_orb_ = CORBA::ORB_init (command_line.get_argc(),
-                                command_line.get_ASCII_argv(),
-                                "dispatcher"
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
 TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
                                  ACE_ENV_ARG_DECL)
 {
@@ -114,22 +97,8 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
       return -1;
     }
 
-  if (this->separate_dispatching_orb_)
-    {
-      if (this->init_dispatching_ORB (argc, argv
-                                      ACE_ENV_ARG_PARAMETER) != 0)
-        {
-          return -1;
-        }
-
-      this->notify_service_->init_service2 (this->orb_.in (), this->dispatching_orb_.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
-  else
-    {
-      this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
+  this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
 
   if (this->nthreads_ > 0) // we have chosen to run in a thread pool.
     {
@@ -334,12 +303,6 @@ TAO_Notify_Service_Driver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
     this->orb_->shutdown ();
-
-  /// Release all the _vars as the ORB is gone now.
-  notify_factory_._retn ();
-  orb_._retn ();
-  poa_._retn ();
-  naming_._retn ();
 }
 
 int
@@ -355,30 +318,6 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
           this->notify_factory_name_.set (ACE_TEXT_ALWAYS_CHAR(current_arg));
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-UseSeparateDispatchingORB")) == 0)
-        {
-      current_arg = arg_shifter.get_the_parameter
-                            (ACE_TEXT("-UseSeparateDispatchingORB"));
-      if (current_arg != 0 &&
-          (ACE_OS::strcmp(ACE_TEXT ("0"), current_arg) == 0 ||
-           ACE_OS::strcmp(ACE_TEXT ("1"), current_arg) == 0))
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Using separate dispatching ORB\n")));
-          this->separate_dispatching_orb_ =
-                        static_cast<bool> (ACE_OS::atoi(current_arg));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("WARNING: Unrecognized ")
-                      ACE_TEXT ("argument (%s) to ")
-                      ACE_TEXT ("-UseSeparateDispatchingORB.\n"),
-                      (current_arg == 0 ? ACE_TEXT ("''") : current_arg)));
-        }
-      if (current_arg != 0)
-        arg_shifter.consume_arg ();
-        }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Boot")) == 0)
         {
           this->bootstrap_ = 1;
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index ddf7203b146..a32e6747b2a 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -90,9 +90,6 @@ protected:
   int init_ORB (int& argc, ACE_TCHAR *argv []
                 ACE_ENV_ARG_DECL);
   // initialize the ORB.
-  int init_dispatching_ORB (int& argc, ACE_TCHAR *argv []
-                ACE_ENV_ARG_DECL);
-  // initialize the dispatching ORB.
 
   TAO_Notify_Service* notify_service_;
 
@@ -132,9 +129,6 @@ protected:
   CORBA::ORB_var orb_;
   // The ORB that we use.
 
-  CORBA::ORB_var dispatching_orb_;
-  // separate dispatching orb if needed.
-
   PortableServer::POA_var poa_;
   // Reference to the root poa.
 
@@ -146,9 +140,6 @@ protected:
 
   int nthreads_;
   // Number of worker threads.
-
-  bool separate_dispatching_orb_;
-  // indicate that a separate ORB is used for dispatching events.
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 3c4aab00044..409614e0600 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : valuetype, orbsvcsexe, install, notification_serv, naming, iortable {
+project : valuetype, orbsvcsexe, core, notification_serv, naming, iortable {
   exename  = Notify_Service
   Source_Files {
     Notify_Server.cpp
@@ -12,7 +12,7 @@ project : valuetype, orbsvcsexe, install, notification_serv, naming, iortable {
   }
 }
 
-project(NT_Notify_Service) : valuetype, orbsvcsexe, install, notification_serv, naming, iortable {
+project(NT_Notify_Service) : valuetype, orbsvcsexe, core, notification_serv, naming, iortable {
   avoids += ace_for_tao
   requires += winnt
   exename  = NT_Notify_Service
diff --git a/TAO/orbsvcs/Notify_Service/README b/TAO/orbsvcs/Notify_Service/README
index 3dc06134774..b83e208ac12 100644
--- a/TAO/orbsvcs/Notify_Service/README
+++ b/TAO/orbsvcs/Notify_Service/README
@@ -46,14 +46,9 @@ Command line arguments:
                               Naming Service.
                               The default is "NotifyEventChannel".
 
-"-ORBRunThreads nthreads"   : Number of threads to run the
+"-ORBRunThreads"            : Number of threads to run the
                               ORB::run method.
 
-"-UseSeparateDispatchingORB 1|0"
-                            : Indicates whether the service should create and
-                              and use a separate ORB dedicated to dispatching of
-                              events.
-
 !! The -Notify_TPReactor option is deprecated!! use the -ORBRunThreads
 option instead.
 
@@ -90,7 +85,7 @@ if you are using the "-NameSvc" options.
 
    $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service -o naming.ior
 
-   and the Notify_Service as
+   and the CosEvent_Service as
 
    $ Notify_Service -ORBInitRef NameService=file://naming.ior
 
@@ -118,8 +113,7 @@ The svc.conf options:
 
 The "Notify_Default_Event_Manager_Objects_Factory" service object accepts the following options:
 
-"-DispatchingThreads [thread_count]" : Enables MT dispatching with the specified number
-                                       of threads.
+"-DispatchingThreads [thread_count]" : How many threads for MT dispatching.
 
 "-ListenerThreads"                   : How many threads for listener filter evaluation.
 
diff --git a/TAO/orbsvcs/Scheduling_Service/.cvsignore b/TAO/orbsvcs/Scheduling_Service/.cvsignore
new file mode 100644
index 00000000000..2239af45a8c
--- /dev/null
+++ b/TAO/orbsvcs/Scheduling_Service/.cvsignore
@@ -0,0 +1 @@
+Scheduling_Service
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am
index 45042fd7326..bb32c5e219f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile.am
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Scheduling_Service.am
 
-if BUILD_EXCEPTIONS
-
 bin_PROGRAMS = Scheduling_Service
 
 Scheduling_Service_CPPFLAGS = \
@@ -45,8 +42,6 @@ Scheduling_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
index a6fd23697f3..d960fa1d23f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, install, rtsched, naming, svc_utils, iortable, portableserver, utils {
+project : orbsvcsexe, core, rtsched, naming, svc_utils, iortable, portableserver, utils {
   exename  = Scheduling_Service
 }
diff --git a/TAO/orbsvcs/TAO_Service/.cvsignore b/TAO/orbsvcs/TAO_Service/.cvsignore
new file mode 100644
index 00000000000..2b0613ab8bd
--- /dev/null
+++ b/TAO/orbsvcs/TAO_Service/.cvsignore
@@ -0,0 +1 @@
+TAO_Service
diff --git a/TAO/orbsvcs/TAO_Service/Makefile.am b/TAO/orbsvcs/TAO_Service/Makefile.am
index 2542a4b66ca..22bb2e9a651 100644
--- a/TAO/orbsvcs/TAO_Service/Makefile.am
+++ b/TAO/orbsvcs/TAO_Service/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.TAO_Service.am
 
-if BUILD_EXCEPTIONS
-
 bin_PROGRAMS = TAO_Service
 
 TAO_Service_CPPFLAGS = \
@@ -33,8 +30,6 @@ TAO_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.mpc b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc
index cec3858e522..51b0f4deb3e 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.mpc
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : taoexe, install {
+project : taoexe, core {
   exename = TAO_Service
 }
diff --git a/TAO/orbsvcs/Time_Service/.cvsignore b/TAO/orbsvcs/Time_Service/.cvsignore
new file mode 100644
index 00000000000..8c4ee3c5b18
--- /dev/null
+++ b/TAO/orbsvcs/Time_Service/.cvsignore
@@ -0,0 +1,2 @@
+Time_Service_Clerk
+Time_Service_Server
diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am
index e02048202f8..474b5debdad 100644
--- a/TAO/orbsvcs/Time_Service/Makefile.am
+++ b/TAO/orbsvcs/Time_Service/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-bin_PROGRAMS =
-
 ## Makefile.Time_Service_Clerk.am
 
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += Time_Service_Clerk
+bin_PROGRAMS = Time_Service_Clerk
 
 Time_Service_Clerk_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -46,12 +42,8 @@ Time_Service_Clerk_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Time_Service_Server.am
 
-if BUILD_EXCEPTIONS
-
 bin_PROGRAMS += Time_Service_Server
 
 Time_Service_Server_CPPFLAGS = \
@@ -79,8 +71,6 @@ Time_Service_Server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc
index dcec01b69cb..b7342a0a223 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, install, time, naming, utils, avoids_corba_e_micro {
+project(Time_Service_Server) : orbsvcsexe, core, time, naming, utils {
   exename  = Time_Service_Server
   Source_Files {
     Server_i.cpp
@@ -9,7 +9,7 @@ project(Time_Service_Server) : orbsvcsexe, install, time, naming, utils, avoids_
   }
 }
 
-project(Time_Service_Clerk) : orbsvcsexe, install, time, naming, utils, avoids_corba_e_micro {
+project(Time_Service_Clerk) : orbsvcsexe, core, time, naming, utils {
   exename  = Time_Service_Clerk
   Source_Files {
     Clerk_i.cpp
diff --git a/TAO/orbsvcs/Trading_Service/.cvsignore b/TAO/orbsvcs/Trading_Service/.cvsignore
new file mode 100644
index 00000000000..6306e1e35ed
--- /dev/null
+++ b/TAO/orbsvcs/Trading_Service/.cvsignore
@@ -0,0 +1 @@
+Trading_Service
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
index 9ee7edd0fd5..611a96415c7 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile.am
+++ b/TAO/orbsvcs/Trading_Service/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Trading_Service.am
 
-if BUILD_EXCEPTIONS
-
 bin_PROGRAMS = Trading_Service
 
 Trading_Service_CPPFLAGS = \
@@ -38,7 +35,6 @@ Trading_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -50,8 +46,6 @@ Trading_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
index 2cc06e3d3df..0e44f51f0b6 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, utils, install, naming, trading_serv {
+project : orbsvcsexe, utils, core, naming, trading_serv {
   exename  = Trading_Service
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
index 0e9793186e5..9eeb947e9d0 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
@@ -13,22 +13,23 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.CosEC_Factory_Idl.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   CosEventChannelFactoryC.cpp \
   CosEventChannelFactoryC.h \
   CosEventChannelFactoryC.inl \
   CosEventChannelFactoryS.cpp \
   CosEventChannelFactoryS.h \
-  CosEventChannelFactoryS.inl
+  CosEventChannelFactoryS.inl \
+  CosEventChannelFactoryS_T.cpp \
+  CosEventChannelFactoryS_T.h \
+  CosEventChannelFactoryS_T.inl
 
 CLEANFILES = \
   CosEventChannelFactory-stamp \
@@ -37,22 +38,24 @@ CLEANFILES = \
   CosEventChannelFactoryC.inl \
   CosEventChannelFactoryS.cpp \
   CosEventChannelFactoryS.h \
-  CosEventChannelFactoryS.inl
+  CosEventChannelFactoryS.inl \
+  CosEventChannelFactoryS_T.cpp \
+  CosEventChannelFactoryS_T.h \
+  CosEventChannelFactoryS_T.inl
 
-CosEventChannelFactoryC.cpp CosEventChannelFactoryC.h CosEventChannelFactoryC.inl CosEventChannelFactoryS.cpp CosEventChannelFactoryS.h CosEventChannelFactoryS.inl: CosEventChannelFactory-stamp
+CosEventChannelFactoryC.cpp CosEventChannelFactoryC.h CosEventChannelFactoryC.inl CosEventChannelFactoryS.cpp CosEventChannelFactoryS.h CosEventChannelFactoryS.inl CosEventChannelFactoryS_T.cpp CosEventChannelFactoryS_T.h CosEventChannelFactoryS_T.inl: CosEventChannelFactory-stamp
 
 CosEventChannelFactory-stamp: $(srcdir)/CosEventChannelFactory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/CosEventChannelFactory.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/CosEventChannelFactory.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   CosEventChannelFactory.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.CosEC_Factory_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += FactoryClient
 
@@ -80,12 +83,12 @@ FactoryClient_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.CosEC_Factory_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += FactoryServer
 
@@ -124,7 +127,7 @@ FactoryServer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
index 2d756fe5425..74f7f1dd02d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
@@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.CosEC_RtEC_Based_bin.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = RtEC_Based_CosEC
 
@@ -36,16 +36,6 @@ RtEC_Based_CosEC_SOURCES = \
   RtEC_Based_CosEC.cpp \
   RtEC_Based_CosEC.h
 
-../lib:
-	mkdir -p ../lib
-
-
-RtEC_Based_CosEC_DEPENDENCIES = \
- ../lib
-
-RtEC_Based_CosEC_LDFLAGS = \
-  -L../lib
-
 RtEC_Based_CosEC_LDADD = \
   $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -64,8 +54,8 @@ RtEC_Based_CosEC_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
index 935d64c4837..fd3d67b82b3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
@@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.CosEC_RtEC_Based_lib.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libCosEC_RtEC_Based.la
 
@@ -49,8 +49,8 @@ noinst_HEADERS = \
   SupplierAdmin_i.h \
   rtec_cosec_export.h
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
index e61cf6c675a..cd377c8edb7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
@@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.CosEC_RtEC_Based_Tests_Basic_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Basic
 
@@ -40,16 +40,6 @@ Basic_SOURCES = \
   Consumer.h \
   Supplier.h
 
-../../lib:
-	mkdir -p ../../lib
-
-
-Basic_DEPENDENCIES = \
- ../../lib
-
-Basic_LDFLAGS = \
-  -L../../lib
-
 Basic_LDADD = \
   $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
@@ -69,8 +59,8 @@ Basic_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
index 072640800d8..40a10fb6254 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
@@ -18,8 +18,8 @@ noinst_PROGRAMS =
 ## Makefile.CosEC_RtEC_Based_Mult_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Consumer
 
@@ -39,16 +39,6 @@ Consumer_SOURCES = \
   Consumer.h \
   Multiple.h
 
-../../lib:
-	mkdir -p ../../lib
-
-
-Consumer_DEPENDENCIES = \
- ../../lib
-
-Consumer_LDFLAGS = \
-  -L../../lib
-
 Consumer_LDADD = \
   $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -68,15 +58,15 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.CosEC_RtEC_Based_Mult_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Supplier
 
@@ -96,16 +86,6 @@ Supplier_SOURCES = \
   Multiple.h \
   Supplier.h
 
-../../lib:
-	mkdir -p ../../lib
-
-
-Supplier_DEPENDENCIES = \
- ../../lib
-
-Supplier_LDFLAGS = \
-  -L../../lib
-
 Supplier_LDADD = \
   $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -125,8 +105,8 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
index 56b28bf2e51..9938d9c430d 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
@@ -17,7 +17,7 @@ noinst_PROGRAMS =
 
 ## Makefile.CosEC_Simple_Consumer.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Consumer
 
@@ -42,12 +42,12 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.CosEC_Simple_Service.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Service
 
@@ -82,12 +82,12 @@ Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.CosEC_Simple_Supplier.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Supplier
 
@@ -112,7 +112,7 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
index 9ab1cfe138a..615cd3440e0 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -21,7 +21,7 @@ noinst_PROGRAMS =
 ## Makefile.CosEC_TypedSimple_Consumer.am
 
 if BUILD_EC_TYPED_EVENTS
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   CountryC.cpp \
@@ -29,7 +29,10 @@ BUILT_SOURCES = \
   CountryC.inl \
   CountryS.cpp \
   CountryS.h \
-  CountryS.inl
+  CountryS.inl \
+  CountryS_T.cpp \
+  CountryS_T.h \
+  CountryS_T.inl
 
 CLEANFILES = \
   Country-stamp \
@@ -38,12 +41,15 @@ CLEANFILES = \
   CountryC.inl \
   CountryS.cpp \
   CountryS.h \
-  CountryS.inl
+  CountryS.inl \
+  CountryS_T.cpp \
+  CountryS_T.h \
+  CountryS_T.inl
 
-CountryC.cpp CountryC.h CountryC.inl CountryS.cpp CountryS.h CountryS.inl: Country-stamp
+CountryC.cpp CountryC.h CountryC.inl CountryS.cpp CountryS.h CountryS.inl CountryS_T.cpp CountryS_T.h CountryS_T.inl: Country-stamp
 
 Country-stamp: $(srcdir)/Country.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Country.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Country.idl
 	@touch $@
 
 noinst_PROGRAMS += Consumer
@@ -66,6 +72,8 @@ Consumer_SOURCES = \
   CountryC.inl \
   CountryS.h \
   CountryS.inl \
+  CountryS_T.h \
+  CountryS_T.inl \
   Country_i.h
 
 Consumer_LDADD = \
@@ -77,13 +85,13 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_EC_TYPED_EVENTS
 
 ## Makefile.CosEC_TypedSimple_Supplier.am
 
 if BUILD_EC_TYPED_EVENTS
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Supplier
 
@@ -110,7 +118,7 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_EC_TYPED_EVENTS
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
index decfce958f0..a25dd5aeef2 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,6 +43,7 @@ RolyPoly-stamp: $(srcdir)/RolyPoly.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/RolyPoly.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   RolyPoly.idl
 
@@ -53,6 +54,7 @@ if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -97,6 +99,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_EXCEPTIONS
@@ -111,6 +114,7 @@ if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if BUILD_THREADS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -158,6 +162,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
 endif BUILD_INTERCEPTORS
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index a1b0b0af1c0..210009bf339 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -392,7 +392,7 @@ ReplicaController::send_reply (
 
     // Crash point 1.
     //
-    if (crash_point == 1 && ftr->retention_id > 2) ACE_OS::exit (1);
+    if (crash_point == 1 && ftr->retention_id > 2) exit (1);
 
     try
     {
@@ -429,7 +429,7 @@ ReplicaController::send_reply (
 
   // Crash point 2.
   //
-  if (crash_point == 2 && ftr->retention_id > 2) ACE_OS::exit (1);
+  if (crash_point == 2 && ftr->retention_id > 2) exit (1);
 }
 
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
index ab009dea00a..dea14f4a82c 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
@@ -21,7 +21,7 @@ project(*Server): orbsvcsexe, fault_tolerance, tmcast, pi_server, interceptors {
   }
 }
 
-project(*Client): taoclient, fault_tolerance {
+project(*Client): taoclient, fault_tolerance, exceptions {
   after += *idl
   Source_Files {
     RolyPolyC.cpp
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
index 6d983bf61b7..11a89093d9b 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
@@ -7,7 +7,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*Manager): orbsvcsexe, portableserver {
+project(*Manager): orbsvcsexe, portableserver, exceptions {
   after += *IDL
   Source_Files {
     manager_main.cpp
@@ -25,7 +25,7 @@ project(*Manager): orbsvcsexe, portableserver {
   }
 }
 
-project(*Server): orbsvcsexe, portableserver, iortable, avoids_corba_e_micro {
+project(*Server): orbsvcsexe, portableserver, iortable, exceptions {
   after += *IDL
   Source_Files {
     server_main.cpp
@@ -39,7 +39,7 @@ project(*Server): orbsvcsexe, portableserver, iortable, avoids_corba_e_micro {
   }
 }
 
-project(*Client): orbsvcsexe {
+project(*Client): orbsvcsexe, exceptions {
   after += *IDL
   Source_Files {
     client_main.cpp
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
index 56fdf9143a4..967ebae0a58 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -66,6 +66,7 @@ Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Manager.idl \
   Messenger.idl
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
index 0baee887ae0..fc8803905f7 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
@@ -7,7 +7,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project : orbsvcsexe, portableserver {
+project : orbsvcsexe, portableserver, exceptions {
   exename   = combined_service
   after += *IDL
   source_files {
@@ -19,7 +19,7 @@ project : orbsvcsexe, portableserver {
   }
 }
 
-project(*Controller) : orbsvcsexe {
+project(*Controller) : orbsvcsexe, exceptions {
   exename   = controller
   after += *IDL
   source_files {
@@ -31,7 +31,7 @@ project(*Controller) : orbsvcsexe {
 }
 
 // A client that uses corba to test out basic imr functionality
-project(*Test) : orbsvcsexe {
+project(*Test) : orbsvcsexe, exceptions {
   after += *IDL
   source_files {
     test.cpp
@@ -42,7 +42,7 @@ project(*Test) : orbsvcsexe {
 }
 
 // A server to use with the imr
-project(*TestServer) : orbsvcsexe, portableserver, iortable, avoids_corba_e_micro {
+project(*TestServer) : orbsvcsexe, portableserver, iortable, exceptions {
   after += *IDL
   // The gnuace specific portion is to prevent invalid object files from
   // IDL generated files being compiled simultaneously with parallel builds.
@@ -60,7 +60,7 @@ project(*TestServer) : orbsvcsexe, portableserver, iortable, avoids_corba_e_micr
 
 // Another simple server that can be loaded dynamically into the
 // combined_service.
-project(*DynamicServer) : taolib, portableserver, iortable, avoids_corba_e_micro {
+project(*DynamicServer) : taolib, portableserver, iortable, exceptions {
   dynamicflags = DYNSERVER_BUILD_DLL
   sharedname   = DynServer
   after += *IDL
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
index 998733f9cde..88a88d3093b 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -66,6 +66,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   service_config.idl \
   test.idl
diff --git a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
index ad432a5bcd8..3797e1cd0af 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
+++ b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
@@ -6,7 +6,7 @@ project(*idl) : taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*Server): taoexe, loadbalancing, pi_server {
+project(*Server): taoexe, loadbalancing, pi_server, exceptions {
   avoids += ace_for_tao
   after  += *idl
   Source_Files {
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
index e050f499b81..b4b3d851ccb 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
+++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
@@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.LoadBalancing_Idl.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -45,14 +43,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.LoadBalancing_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -77,7 +74,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.LoadBalancing_Server.am
 
@@ -85,6 +82,7 @@ if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -128,6 +126,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile.am b/TAO/orbsvcs/examples/Log/Basic/Makefile.am
index 92993ed47be..9d3b10cddcc 100644
--- a/TAO/orbsvcs/examples/Log/Basic/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Basic/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Log_Basic_Client.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -40,8 +37,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/examples/Log/Event/Makefile.am b/TAO/orbsvcs/examples/Log/Event/Makefile.am
index 6831d46ad68..5fad8b3b991 100644
--- a/TAO/orbsvcs/examples/Log/Event/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Event/Makefile.am
@@ -17,7 +17,7 @@ noinst_PROGRAMS =
 
 ## Makefile.Log_Event_Consumer.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Event_Consumer
 
@@ -45,11 +45,11 @@ Event_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.Log_Event_Supplier.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Event_Supplier
 
@@ -77,7 +77,7 @@ Event_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/Log/Event/run_test.pl b/TAO/orbsvcs/examples/Log/Event/run_test.pl
index d3dde9786cb..7b6f56957aa 100755
--- a/TAO/orbsvcs/examples/Log/Event/run_test.pl
+++ b/TAO/orbsvcs/examples/Log/Event/run_test.pl
@@ -49,7 +49,7 @@ print STDERR "Starting Supplier\n";
 $supplier->Spawn ();
 
 
-$supplier->WaitKill (10);
+$supplier->WaitKill (5);
 
 $consumer->Kill ();
 
diff --git a/TAO/orbsvcs/examples/Log/Notify/Makefile.am b/TAO/orbsvcs/examples/Log/Notify/Makefile.am
index 8b017bd306b..46d235ac030 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Notify/Makefile.am
@@ -17,7 +17,7 @@ noinst_PROGRAMS =
 
 ## Makefile.Log_Notify_Consumer.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Notify_Consumer
 
@@ -48,11 +48,11 @@ Notify_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.Log_Notify_Supplier.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Notify_Supplier
 
@@ -83,7 +83,7 @@ Notify_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/Log/Notify/run_test.pl b/TAO/orbsvcs/examples/Log/Notify/run_test.pl
index 21b91a1f8db..a2809b7cf73 100755
--- a/TAO/orbsvcs/examples/Log/Notify/run_test.pl
+++ b/TAO/orbsvcs/examples/Log/Notify/run_test.pl
@@ -49,7 +49,7 @@ print STDERR "Starting Supplier\n";
 $supplier->Spawn ();
 
 
-$supplier->WaitKill (10);
+$supplier->WaitKill (5);
 
 $consumer->Kill ();
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
index 1ce694a3599..0c83282a06d 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Log_RTEvent_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += RTEvent_Consumer
 
@@ -50,13 +49,11 @@ RTEvent_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Log_RTEvent_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += RTEvent_Supplier
 
@@ -88,7 +85,6 @@ RTEvent_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl b/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl
index 7ed19029904..3caf2a63534 100755
--- a/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl
+++ b/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl
@@ -49,7 +49,7 @@ print STDERR "Starting Supplier\n";
 $supplier->Spawn ();
 
 
-$supplier->WaitKill (10);
+$supplier->WaitKill (5);
 
 $consumer->Kill ();
 
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
index 935c00917ea..ae1c7216075 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
@@ -16,9 +16,9 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Agent.am
 
-if BUILD_EXCEPTIONS
 if BUILD_THREADS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = agent
 
@@ -42,7 +42,6 @@ agent_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -55,9 +54,9 @@ agent_LDADD = \
   $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
index c9e9ededc1a..30fdd5a97a3 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
@@ -16,9 +16,9 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Gate.am
 
-if BUILD_EXCEPTIONS
 if BUILD_THREADS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libGate.la
 
@@ -40,9 +40,9 @@ noinst_HEADERS = \
   Export.h \
   Gate.h
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
index 9cdce38bb28..dc08a9bae17 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
@@ -16,9 +16,9 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.SpaceCraft.am
 
-if BUILD_EXCEPTIONS
 if BUILD_THREADS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = craft
 
@@ -42,7 +42,6 @@ craft_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -55,9 +54,9 @@ craft_LDADD = \
   $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
index 3a59bc4caa5..f7fb9130144 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Notify_Filter.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = main
 
@@ -45,7 +45,7 @@ main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
index 6ad63f1659c..3115e27c5f6 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
@@ -18,8 +18,8 @@ noinst_PROGRAMS =
 ## Makefile.Notify_Lanes_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Consumer
 
@@ -53,10 +53,10 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -68,14 +68,14 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Notify_Lanes_Supplier.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Supplier
 
@@ -103,7 +103,6 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
@@ -118,8 +117,8 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
index 2bbe52a4288..147604e0274 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Supplier): rtcorba, rtnotify, avoids_minimum_corba, naming {
+project(*Supplier): rtcorba, rtnotify, minimum_corba, naming {
   exename = Supplier
   Source_Files {
     Supplier.cpp
@@ -11,7 +11,7 @@ project(*Supplier): rtcorba, rtnotify, avoids_minimum_corba, naming {
   }
 }
 
-project(*Consumer): notifytest, rtcorba, rtnotify, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Consumer): notifytest, rtcorba, rtnotify, minimum_corba {
   exename = Consumer
   Source_Files {
     Consumer.cpp
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
index 835ab5316c6..fcbd47a2d9c 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Notify_Subscribe.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Subscribe
 
@@ -45,7 +45,7 @@ Subscribe_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
index da737f5f444..39521d11a30 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, notification, notification_skel, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project : orbsvcsexe, notification, notification_skel, naming, minimum_corba {
   exename = Subscribe
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
index 39bee752b42..130c85fa5b5 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
@@ -18,8 +18,8 @@ noinst_PROGRAMS =
 ## Makefile.Notify_ThreadPool_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Consumer
 
@@ -50,6 +50,7 @@ Consumer_LDADD = \
   $(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_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
@@ -57,7 +58,6 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
@@ -69,15 +69,15 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Notify_ThreadPool_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Supplier
 
@@ -108,6 +108,7 @@ Supplier_LDADD = \
   $(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_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
@@ -115,7 +116,6 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
@@ -127,8 +127,8 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
index 9aa7f67ee15..ed469821a28 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Supplier): rtnotify, notifytest, rtportableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba {
   exename = Supplier
   Source_Files {
     Supplier.cpp
@@ -9,7 +9,7 @@ project(*Supplier): rtnotify, notifytest, rtportableserver, avoids_minimum_corba
   }
 }
 
-project(*Consumer): rtnotify, notifytest, rtportableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Consumer): rtnotify, notifytest, rtportableserver, minimum_corba {
   exename = Consumer
   Source_Files {
     Consumer.cpp
diff --git a/TAO/orbsvcs/examples/ORT/Makefile.am b/TAO/orbsvcs/examples/ORT/Makefile.am
index b1de243f585..03e2618d646 100644
--- a/TAO/orbsvcs/examples/ORT/Makefile.am
+++ b/TAO/orbsvcs/examples/ORT/Makefile.am
@@ -13,14 +13,18 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
 ## Makefile.ORT_Idl.am
 
-BUILT_SOURCES = \
+if !BUILD_MINIMUM_CORBA
+
+BUILT_SOURCES += \
   GatewayC.cpp \
   GatewayC.h \
   GatewayC.inl \
@@ -28,7 +32,7 @@ BUILT_SOURCES = \
   GatewayS.h \
   GatewayS.inl
 
-CLEANFILES = \
+CLEANFILES += \
   Gateway-stamp \
   GatewayC.cpp \
   GatewayC.h \
@@ -89,48 +93,18 @@ sum_server-stamp: $(srcdir)/sum_server.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/sum_server.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Gateway.idl \
   ObjectReferenceFactory.idl \
   sum_server.idl
 
-## Makefile.ORT_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-client_SOURCES = \
-  client.cpp \
-  sum_serverC.cpp \
-  Gateway_ObjRef_Factory.h \
-  Gateway_i.h \
-  Object_Factory_i.h \
-  Server_IORInterceptor.h \
-  Server_IORInterceptor_ORBInitializer.h \
-  sum_server_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.ORT_Gateway.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += gateway_server
 
@@ -161,13 +135,13 @@ gateway_server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.ORT_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -206,9 +180,42 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
+## Makefile.ORT_Client.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+client_SOURCES = \
+  client.cpp \
+  sum_serverC.cpp \
+  Gateway_ObjRef_Factory.h \
+  Gateway_i.h \
+  Object_Factory_i.h \
+  Server_IORInterceptor.h \
+  Server_IORInterceptor_ORBInitializer.h \
+  sum_server_i.h
+
+client_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc
index 406b4148ddd..82fc927aab8 100644
--- a/TAO/orbsvcs/examples/ORT/ORT.mpc
+++ b/TAO/orbsvcs/examples/ORT/ORT.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*idl): taoidldefaults, minimum_corba {
   idl_files {
     Gateway.idl
     ObjectReferenceFactory.idl
@@ -9,7 +9,7 @@ project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avo
   custom_only = 1
 }
 
-project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba {
   after += *idl
 
   source_files {
@@ -23,9 +23,9 @@ project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, avoids_minimum_cor
   }
 }
 
-project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, avoids_minimum_corba, iorinterceptor, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iorinterceptor {
   exename   = server
-  after += *idl
+  after    += *Gateway
   source_files {
     server.cpp
     GatewayC.cpp
@@ -41,8 +41,8 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, avoids_minimum_corb
   }
 }
 
-project(*Client) : orbsvcsexe, event, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client) : orbsvcsexe, event, minimum_corba {
+  after += *Idl *Server
   source_files {
     client.cpp
     sum_serverC.cpp
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
index d8d324ba722..73c1ace16cb 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.RtEC_IIOPGateway.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Gateway
@@ -51,13 +50,11 @@ Gateway_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RtEC_IIOPGateway_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += Consumer
 
@@ -87,13 +84,11 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RtEC_IIOPGateway_EC.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += EC
@@ -126,13 +121,11 @@ EC_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RtEC_IIOPGateway_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += Supplier
 
@@ -162,7 +155,6 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
index 195a3b0239a..f2e00e44bc0 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RtECKokyu.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = Service
@@ -57,7 +56,6 @@ Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
index e13f9e380cc..48805140016 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RtEC_MCast.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = MCast
@@ -56,7 +55,6 @@ MCast_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
index 7c89f896172..84401da731f 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RtEC_Schedule.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = Service
@@ -55,7 +54,6 @@ Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
index 72a249d8995..d9066e3eddc 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.RtEC_Simple_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += Consumer
 
@@ -48,13 +47,11 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RtEC_Simple_Service.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Service
@@ -88,13 +85,11 @@ Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RtEC_Simple_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += Supplier
 
@@ -124,7 +119,6 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
index c27788dd1e5..a3e19081ec6 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
+++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Security_Send_File_Idl.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.Security_Send_File_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -70,12 +67,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Security_Send_File_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -98,8 +91,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index f528a23427d..1a2b0bdadab 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(AV) : orbsvcslib, install, property_serv, naming, qos, tao_versioning_idl_defaults {
+project(AV) : orbsvcslib, core, property_serv, naming, qos, tao_versioning_idl_defaults {
   avoids       += ace_for_tao
   sharedname    = TAO_AV
   idlflags     += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 690e0e4a4ac..99fab62e680 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosConcurrency_IDL): orbsvcslib, install, tao_versioning_idl_defaults {
+project(CosConcurrency_IDL): orbsvcslib, core, tao_versioning_idl_defaults {
   custom_only = 1
   idlflags   += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h
 
@@ -10,7 +10,7 @@ project(CosConcurrency_IDL): orbsvcslib, install, tao_versioning_idl_defaults {
   }
 }
 
-project(CosConcurrency) : orbsvcslib, install {
+project(CosConcurrency) : orbsvcslib, core {
   sharedname   = TAO_CosConcurrency
   dynamicflags = TAO_CONCURRENCY_BUILD_DLL
   tagchecks   += Concurrency
@@ -44,7 +44,7 @@ project(CosConcurrency) : orbsvcslib, install {
   }
 }
 
-project(CosConcurrency_Skel): orbsvcslib, install, concurrency, portableserver {
+project(CosConcurrency_Skel): orbsvcslib, core, concurrency, portableserver {
   sharedname   = TAO_CosConcurrency_Skel
   dynamicflags = TAO_CONCURRENCY_SKEL_BUILD_DLL
   tagchecks   += Concurrency
@@ -74,7 +74,7 @@ project(CosConcurrency_Skel): orbsvcslib, install, concurrency, portableserver {
   }
 }
 
-project(CosConcurrency_Serv) : orbsvcslib, install, concurrency_skel, avoids_corba_e_micro {
+project(CosConcurrency_Serv) : orbsvcslib, core, concurrency_skel {
   sharedname   = TAO_CosConcurrency_Serv
   dynamicflags = TAO_CONCURRENCY_SERV_BUILD_DLL
   tagchecks   += Concurrency
@@ -87,9 +87,6 @@ project(CosConcurrency_Serv) : orbsvcslib, install, concurrency_skel, avoids_cor
   }
 
   Header_Files {
-    // We want all the headers in the Concurrency subdirectory, except
-    // concurrency_export.h and concurrency_skel_export.h, since those
-    // are bundled in the stub and skeleton projects.
     Concurrency
     ^Concurrency/concurrency_export.h
     ^Concurrency/concurrency_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index ec8682e31c2..c3666a5ddfe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,8 +1,8 @@
 // $Id$
 
-project (CosEvent_IDL) : orbsvcslib, install, avoids_minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults {
+project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults {
   custom_only = 1
-  idlflags   += -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
+  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
 
   IDL_Files {
     CosEventComm.idl
@@ -10,7 +10,7 @@ project (CosEvent_IDL) : orbsvcslib, install, avoids_minimum_corba, ec_typed_eve
   }
 }
 
-project (CosEvent) : orbsvcslib, install, avoids_minimum_corba, ec_typed_events {
+project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
   sharedname   = TAO_CosEvent
   dynamicflags = TAO_EVENT_BUILD_DLL
   tagchecks   += CosEvent
@@ -49,7 +49,7 @@ project (CosEvent) : orbsvcslib, install, avoids_minimum_corba, ec_typed_events
 }
 
 
-project (CosEvent_Skel) : orbsvcslib, install, avoids_minimum_corba, event, portableserver, ec_typed_events_skel {
+project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver, ec_typed_events_skel {
   sharedname   = TAO_CosEvent_Skel
   dynamicflags = TAO_EVENT_SKEL_BUILD_DLL
   tagchecks   += CosEvent
@@ -73,6 +73,8 @@ project (CosEvent_Skel) : orbsvcslib, install, avoids_minimum_corba, event, port
   Inline_Files {
     CosEventCommS.inl
     CosEventChannelAdminS.inl
+    CosEventCommS_T.inl
+    CosEventChannelAdminS_T.inl
   }
 
   Template_Files {
@@ -86,7 +88,7 @@ project (CosEvent_Skel) : orbsvcslib, install, avoids_minimum_corba, event, port
 }
 
 
-project (CosEvent_Serv) : orbsvcslib, install, avoids_minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils {
+project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils {
   sharedname   = TAO_CosEvent_Serv
   dynamicflags = TAO_EVENT_SERV_BUILD_DLL
   tagchecks   += CosEvent
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index ee6811da2ea..e6ceedced03 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosLifeCycle) : orbsvcslib, install, naming, portableserver, tao_versioning_idl_defaults {
+project(CosLifeCycle) : orbsvcslib, core, naming, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_CosLifeCycle
   idlflags    += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h
   dynamicflags = TAO_LIFECYCLE_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index b32a579fde1..7ea375e45af 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, install, naming, iormanip, portablegroup, ami, avoids_minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults {
+project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults {
   sharedname   = TAO_CosLoadBalancing
   idlflags    += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h
   dynamicflags = TAO_LOADBALANCING_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index e32aef742de..991012a2a9f 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNaming_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
+project(CosNaming_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
   custom_only =	1
   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
 
@@ -10,7 +10,7 @@ project(CosNaming_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
   }
 }
 
-project(CosNaming) : orbsvcslib, install {
+project(CosNaming) : orbsvcslib, core {
   sharedname   = TAO_CosNaming
   dynamicflags = TAO_NAMING_BUILD_DLL
   tagchecks   += Naming
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
index 8e95a22a71e..02f81cd7b59 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(CosNaming_Serv) : orbsvcslib, install, naming_skel, messaging_optional, svc_utils, iortable {
+project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging_optional, svc_utils, iortable {
   avoids      += ace_for_tao  // Requires MMAP_Memory_Pool
   sharedname   = TAO_CosNaming_Serv
   dynamicflags = TAO_NAMING_SERV_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
index 352d59af2ec..c5859a1c573 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNaming_Skel) : orbsvcslib, install, naming, portableserver {
+project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver {
   sharedname   = TAO_CosNaming_Skel
   dynamicflags = TAO_NAMING_SKEL_BUILD_DLL
   tagchecks   += Naming
@@ -15,14 +15,17 @@ project(CosNaming_Skel) : orbsvcslib, install, naming, portableserver {
 
   Header_Files {
     CosNamingS.h
+    CosNamingS_T.h
     Naming/naming_skel_export.h
   }
 
   Inline_Files {
     CosNamingS.inl
+    CosNamingS_T.inl
   }
 
   Template_Files {
+    CosNamingS_T.cpp
   }
 
   Pkgconfig_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 0a13c0f5c4d..87fab05f21c 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNotification_IDL) : orbsvcslib, install, event, tao_versioning_idl_defaults {
+project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defaults {
   custom_only = 1
   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
 
@@ -15,7 +15,7 @@ project(CosNotification_IDL) : orbsvcslib, install, event, tao_versioning_idl_de
   }
 }
 
-project(CosNotification) : orbsvcslib, install, event {
+project(CosNotification) : orbsvcslib, core, event {
   sharedname   = TAO_CosNotification
   dynamicflags = TAO_NOTIFY_BUILD_DLL
   tagchecks   += Notify
@@ -67,7 +67,7 @@ project(CosNotification) : orbsvcslib, install, event {
 }
 
 
-project(CosNotification_Skel) : orbsvcslib, install, notification, event_skel, portableserver {
+project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, portableserver {
   sharedname   = TAO_CosNotification_Skel
   dynamicflags = TAO_NOTIFY_SKEL_BUILD_DLL
   tagchecks   += Notify
@@ -91,6 +91,14 @@ project(CosNotification_Skel) : orbsvcslib, install, notification, event_skel, p
     CosNotifyChannelAdminS.h
     NotifyExtS.h
     Event_ForwarderS.h
+
+    CosNotificationS_T.h
+    CosNotifyCommS_T.h
+    CosNotifyFilterS_T.h
+    CosNotifyChannelAdminS_T.h
+    NotifyExtS_T.h
+    Event_ForwarderS_T.h
+
     Notify/notify_skel_export.h
   }
 
@@ -101,9 +109,22 @@ project(CosNotification_Skel) : orbsvcslib, install, notification, event_skel, p
     CosNotifyChannelAdminS.inl
     NotifyExtS.inl
     Event_ForwarderS.inl
+
+    CosNotificationS_T.inl
+    CosNotifyCommS_T.inl
+    CosNotifyFilterS_T.inl
+    CosNotifyChannelAdminS_T.inl
+    NotifyExtS_T.inl
+    Event_ForwarderS_T.inl
   }
 
   Template_Files {
+    CosNotificationS_T.cpp
+    CosNotifyCommS_T.cpp
+    CosNotifyFilterS_T.cpp
+    CosNotifyChannelAdminS_T.cpp
+    NotifyExtS_T.cpp
+    Event_ForwarderS_T.cpp
   }
 
   Pkgconfig_Files {
@@ -111,7 +132,7 @@ project(CosNotification_Skel) : orbsvcslib, install, notification, event_skel, p
   }
 }
 
-project(CosNotification_Serv) : orbsvcslib, svc_utils, install, notification_skel, dynamicany, etcl{
+project(CosNotification_Serv) : orbsvcslib, svc_utils, core, notification_skel, dynamicany, etcl{
   sharedname   = TAO_CosNotification_Serv
   dynamicflags = TAO_NOTIFY_SERV_BUILD_DLL
   tagchecks   += Notify
@@ -223,7 +244,7 @@ project(CosNotification_Serv) : orbsvcslib, svc_utils, install, notification_ske
 
 }
 
-project(CosNotification_Persist) : notification_serv, install, acexml {
+project(CosNotification_Persist) : notification_serv, core, acexml {
   sharedname   = TAO_CosNotification_Persist
   dynamicflags = TAO_NOTIFY_PERSIST_BUILD_DLL
 
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index 2336c808224..cc73a0a5fc8 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosProperty_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
+project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
   custom_only = 1
   idlflags   += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h
 
@@ -13,7 +13,7 @@ project(CosProperty_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
   }
 }
 
-project(CosProperty) : orbsvcslib, install {
+project(CosProperty) : orbsvcslib, core {
   sharedname   = TAO_CosProperty
   dynamicflags = TAO_PROPERTY_BUILD_DLL
   tagchecks   += Property
@@ -50,7 +50,7 @@ project(CosProperty) : orbsvcslib, install {
   }
 }
 
-project(CosProperty_Skel) : orbsvcslib, install, property, portableserver {
+project(CosProperty_Skel) : orbsvcslib, core, property, portableserver {
   sharedname   = TAO_CosProperty_Skel
   dynamicflags = TAO_PROPERTY_SKEL_BUILD_DLL
   tagchecks   += Property
@@ -65,16 +65,22 @@ project(CosProperty_Skel) : orbsvcslib, install, property, portableserver {
 
   Header_Files {
     CosPropertyS.h
+    CosPropertyS_T.h
     CosPropertyServiceS.h
+    CosPropertyServiceS_T.h
     Property/property_skel_export.h
   }
 
   Inline_Files {
     CosPropertyS.inl
+    CosPropertyS_T.inl
     CosPropertyServiceS.inl
+    CosPropertyServiceS_T.inl
   }
 
   Template_Files {
+    CosPropertyS_T.cpp
+    CosPropertyServiceS_T.cpp
   }
 
   Pkgconfig_Files {
@@ -82,7 +88,7 @@ project(CosProperty_Skel) : orbsvcslib, install, property, portableserver {
   }
 }
 
-project(CosProperty_Serv) : orbsvcslib, install, property_skel {
+project(CosProperty_Serv) : orbsvcslib, core, property_skel {
   sharedname   = TAO_CosProperty_Serv
   dynamicflags = TAO_PROPERTY_SERV_BUILD_DLL
   tagchecks   += Property
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index c871bbc5268..417a1c0d6ff 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTime) : orbsvcslib, svc_utils, install, portableserver, tao_versioning_idl_defaults {
+project(CosTime) : orbsvcslib, svc_utils, core, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_CosTime
   idlflags    += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h
   dynamicflags = TAO_TIME_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.idl b/TAO/orbsvcs/orbsvcs/CosTrading.idl
index 4f544d12cca..c93ca6bef72 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.idl
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.idl
@@ -16,14 +16,12 @@
 #ifndef TAO_TRADING_IDL
 #define TAO_TRADING_IDL
 
-#include "tao/StringSeq.pidl"
-
 #pragma prefix "omg.org"
 
 module CosTrading
 {
   // forward references to our interfaces
-
+  
   interface Lookup;
   interface Register;
   interface Link;
@@ -31,15 +29,15 @@ module CosTrading
   interface Admin;
   interface OfferIterator;
   interface OfferIdIterator;
-
-  // type definitions used in more than one interface
+  
+  // type definitions used in more than one interface  
   typedef string Istring;
   typedef Object TypeRepository;
-
+  
   typedef Istring PropertyName;
   typedef sequence<PropertyName> PropertyNameSeq;
   typedef any PropertyValue;
-
+  
   struct Property
   {
     PropertyName name;
@@ -53,25 +51,25 @@ module CosTrading
     PropertySeq properties;
   };
   typedef sequence<Offer> OfferSeq;
-
+  
   typedef string OfferId;
   typedef sequence<OfferId> OfferIdSeq;
-
+  
   typedef Istring ServiceTypeName;  // similar structure to IR::Identifier
-
+  
   typedef Istring Constraint;
-
+  
   enum FollowOption
   {
     local_only,
     if_no_local,
     always
   };
-
+  
   typedef Istring LinkName;
   typedef sequence<LinkName> LinkNameSeq;
   typedef LinkNameSeq TraderName;
-
+  
   typedef string PolicyName;  // policy names restricted to Latin1
   typedef sequence<PolicyName> PolicyNameSeq;
   typedef any PolicyValue;
@@ -82,23 +80,23 @@ module CosTrading
     PolicyValue value;
   };
   typedef sequence<Policy> PolicySeq;
-
+  
   // exceptions used in more than one interface
-
+  
   exception UnknownMaxLeft {};
-
+  
   exception NotImplemented {};
-
+  
   exception IllegalServiceType
     {
       ServiceTypeName type;
     };
-
+    
   exception UnknownServiceType
     {
       ServiceTypeName type;
     };
-
+      
    exception IllegalPropertyName
      {
        PropertyName name;
@@ -153,9 +151,9 @@ module CosTrading
      };
 
      // the interfaces
-
+     
    interface TraderComponents
-     {
+     {       
        readonly attribute Lookup lookup_if;
        readonly attribute Register register_if;
        readonly attribute Link link_if;
@@ -164,7 +162,7 @@ module CosTrading
      };
 
    interface SupportAttributes
-     {
+     {       
        readonly attribute boolean supports_modifiable_properties;
        readonly attribute boolean supports_dynamic_properties;
        readonly attribute boolean supports_proxy_offers;
@@ -194,9 +192,9 @@ module CosTrading
    interface Lookup:TraderComponents,SupportAttributes,ImportAttributes
      {
        typedef Istring Preference;
-
+       
        enum HowManyProps { none, some, all };
-
+       
        union SpecifiedProps switch ( HowManyProps )
          {
          case some: PropertyNameSeq prop_names;
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 4029634dff8..ef436ac2479 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTrading_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
+project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
   custom_only = 1
   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
 
@@ -13,7 +13,7 @@ project(CosTrading_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
 }
 
 
-project(CosTrading) : orbsvcslib, install {
+project(CosTrading) : orbsvcslib, core {
   sharedname   = TAO_CosTrading
   dynamicflags = TAO_TRADING_BUILD_DLL
   tagchecks   += Trader
@@ -55,7 +55,7 @@ project(CosTrading) : orbsvcslib, install {
 }
 
 
-project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver {
+project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
   sharedname   = TAO_CosTrading_Skel
   dynamicflags = TAO_TRADING_SKEL_BUILD_DLL
   tagchecks   += Trader
@@ -73,6 +73,11 @@ project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver {
     CosTradingS.h
     CosTradingReposS.h
     CosTradingDynamicS.h
+
+    CosTradingS_T.h
+    CosTradingReposS_T.h
+    CosTradingDynamicS_T.h
+
     Trader/trading_skel_export.h
   }
 
@@ -80,9 +85,16 @@ project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver {
     CosTradingS.inl
     CosTradingReposS.inl
     CosTradingDynamicS.inl
+
+    CosTradingS_T.inl
+    CosTradingReposS_T.inl
+    CosTradingDynamicS_T.inl
   }
 
   Template_Files {
+    CosTradingS_T.cpp
+    CosTradingReposS_T.cpp
+    CosTradingDynamicS_T.cpp
   }
 
   Pkgconfig_Files {
@@ -91,7 +103,7 @@ project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver {
 }
 
 
-project(CosTrading_Serv) : orbsvcslib, install, trading_skel, dynamicany, svc_utils, utils, iortable {
+project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils, iortable {
   sharedname   = TAO_CosTrading_Serv
   dynamicflags = TAO_TRADING_SERV_BUILD_DLL
   tagchecks   += Trader
@@ -118,59 +130,4 @@ project(CosTrading_Serv) : orbsvcslib, install, trading_skel, dynamicany, svc_ut
   Pkgconfig_Files {
     TAO_CosTrading_Serv.pc.in
   }
-
-  verbatim(gnuace, local) {
-    Trader/Constraint_l.cpp: Trader/constraint.l
-    "	@echo 'INFORMATION: Potentially outdated $@'"
-    "	@echo '             either touch(1) the file or explicitly'"
-    "	@echo '             generate it using:'"                    
-    "	@echo '    make -f GNUmakefile.CosTrading_Serv Constraint_l'"
-
-    .PHONY: Constraint_l
-    Constraint_l:
-    "	echo '#define YY_NO_UNPUT' > Trader/Constraint_l.cpp"
-    "	$(LEX) -L -t Trader/constraint.l | \\"
-    "	sed -e 's/ NULL/ 0/g' \\"
-    "	    -e 's/int offset /size_t offset /g' \\"
-    "	    -e 's/isatty/ACE_OS::isatty/g' \\"
-    "	    -e 's/YY_BREAK break;/YY_BREAK ACE_NOTREACHED (break;)/g' \\"
-    "	    -e 's/ECHO/TAO_TRADER_ECHO/' \\"
-    "	    -e 's/\\$$Hea''der.*\\$$/$$I''d$$/' \\"
-    "	    -e 's@#include <stdio\.h>@#include \"ace/os_include/os_stdio.h\"@' \\"
-    "	    -e 's@#include <unistd\.h>@#include \"ace/OS_NS_unistd.h\"@' \\"
-    "	    -e '/#include </d' \\"  
-    "	>> Trader/Constraint_l.cpp"
-    "	(cd Trader; patch < Constraint_l.cpp.diff)"
-
-    Trader/Constraint_y.cpp: Trader/constraint.y
-    "	@echo 'INFORMATION: Potentially outdated $@'"
-    "	@echo '             either touch(1) the file or explicitly'"
-    "	@echo '             generate it using:'"                    
-    "	@echo '    make -f GNUmakefile.CosTrading_Serv Constraint_y'"
-
-    .PHONY: Constraint_y
-    Constraint_y:
-    "	yacc -l -d Trader/constraint.y"
-    "	sed -e 's/	/        /g' \\"
-    "	    -e 's/int newsize, i/size_t newsize, i/g' \\"
-    "	    -e 's/static  *int  *yygrowstack();/ /g' \\"
-    "	    -e 's/  *$$\/\/g' \\"
-    "	    -e 's/\|\| defined(__GNUC__)/|| defined(__GNUC__) || defined (WIN32) || defined (__HP_aCC)/g' \\"
-    "	    -e 's/memcpy/ACE_OS::memcpy/g' \\"
-    "	    -e 's/getenv/ACE_OS::getenv/g' \\"
-    "	    -e 's/free/ACE_OS::free/g' \\"
-    "	    -e 's/malloc/ACE_OS::malloc/g' \\"
-    "	    -e 's/realloc/ACE_OS::realloc/g' < y.tab.c > Trader/Constraint_y.cpp"
-    "	echo TAO_END_VERSIONED_NAMESPACE_DECL >> Trader/Constraint_y.cpp"
-    "	echo '\/\/ $$I''d$$' > Trader/Constraint_Tokens.h"
-    "	echo '' >> Trader/Constraint_Tokens.h"
-    "	echo '#ifndef CONSTRAINT_TOKEN_H' >> Trader/Constraint_Tokens.h"
-    "	echo '#define CONSTRAINT_TOKEN_H' >> Trader/Constraint_Tokens.h"
-    "	echo '#include /**/ \"ace/pre.h\"' >> Trader/Constraint_Tokens.h"
-    "	echo '' >> Trader/Constraint_Tokens.h"
-    "	cat y.tab.h >> Trader/Constraint_Tokens.h"
-    "	echo '#include /**/ \"ace/post.h\"' >> Trader/Constraint_Tokens.h"
-    "	echo '#endif /* CONSTRAINT_TOKEN_H */' >> Trader/Constraint_Tokens.h"
-    "	$(RM) y.tab.h y.tab.c"
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 992fef36252..4322406dedc 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsEventLogAdmin_IDL) : orbsvcslib, install, dslogadmin, event, tao_versioning_idl_defaults {
+project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event, tao_versioning_idl_defaults {
   custom_only = 1
   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
 
@@ -10,7 +10,7 @@ project(DsEventLogAdmin_IDL) : orbsvcslib, install, dslogadmin, event, tao_versi
   }
 }
 
-project(DsEventLogAdmin) : orbsvcslib, install, dslogadmin, event {
+project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
   sharedname   = TAO_DsEventLogAdmin
   dynamicflags = TAO_EVENTLOG_BUILD_DLL
   tagchecks   += EventLog
@@ -45,7 +45,7 @@ project(DsEventLogAdmin) : orbsvcslib, install, dslogadmin, event {
   }
 }
 
-project(DsEventLogAdmin_Skel) : orbsvcslib, install, dseventlogadmin, dslogadmin_skel, event_skel, portableserver {
+project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_skel, event_skel, portableserver {
   sharedname   = TAO_DsEventLogAdmin_Skel
   dynamicflags = TAO_EVENTLOG_SKEL_BUILD_DLL
   tagchecks   += EventLog
@@ -59,14 +59,17 @@ project(DsEventLogAdmin_Skel) : orbsvcslib, install, dseventlogadmin, dslogadmin
 
   Header_Files {
     DsEventLogAdminS.h
+    DsEventLogAdminS_T.h
     Log/eventlog_skel_export.h
   }
 
   Inline_Files {
     DsEventLogAdminS.inl
+    DsEventLogAdminS_T.inl
   }
 
   Template_Files {
+    DsEventLogAdminS_T.cpp
   }
 
   Pkgconfig_Files {
@@ -74,7 +77,7 @@ project(DsEventLogAdmin_Skel) : orbsvcslib, install, dseventlogadmin, dslogadmin
   }
 }
 
-project(DsEventLogAdmin_Serv) : orbsvcslib, install, dseventlogadmin_skel, dslogadmin_serv, event_serv {
+project(DsEventLogAdmin_Serv) : orbsvcslib, core, dseventlogadmin_skel, dslogadmin_serv, event_serv {
   sharedname   = TAO_DsEventLogAdmin_Serv
   dynamicflags = TAO_EVENTLOG_SERV_BUILD_DLL
   tagchecks   += EventLog
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index 7f66ce8e9ad..d0d9a4dea5e 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsLogAdmin_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
+project(DsLogAdmin_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
   custom_only = 1
   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
 
@@ -11,7 +11,7 @@ project(DsLogAdmin_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
   }
 }
 
-project(DsLogAdmin) : orbsvcslib, install {
+project(DsLogAdmin) : orbsvcslib, core {
   sharedname   = TAO_DsLogAdmin
   dynamicflags = TAO_LOG_BUILD_DLL
   tagchecks   += Log
@@ -50,7 +50,7 @@ project(DsLogAdmin) : orbsvcslib, install {
 }
 
 
-project(DsLogAdmin_Skel) : orbsvcslib, install, dslogadmin, portableserver {
+project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver {
   sharedname   = TAO_DsLogAdmin_Skel
   dynamicflags = TAO_LOG_SKEL_BUILD_DLL
   tagchecks   += Log
@@ -66,15 +66,24 @@ project(DsLogAdmin_Skel) : orbsvcslib, install, dslogadmin, portableserver {
   Header_Files {
     DsLogAdminS.h
     DsLogNotificationS.h
+
+    DsLogAdminS_T.h
+    DsLogNotificationS_T.h
+
     Log/log_skel_export.h
   }
 
   Inline_Files {
     DsLogAdminS.inl
     DsLogNotificationS.inl
+
+    DsLogAdminS_T.inl
+    DsLogNotificationS_T.inl
   }
 
   Template_Files {
+    DsLogAdminS_T.cpp
+    DsLogNotificationS_T.cpp
   }
 
   Pkgconfig_Files {
@@ -83,7 +92,7 @@ project(DsLogAdmin_Skel) : orbsvcslib, install, dslogadmin, portableserver {
 }
 
 
-project(DsLogAdmin_Serv) : orbsvcslib, install, dslogadmin_skel, dynamicany, etcl, utils, svc_utils {
+project(DsLogAdmin_Serv) : orbsvcslib, core, dslogadmin_skel, dynamicany, etcl, utils, svc_utils {
   sharedname   = TAO_DsLogAdmin_Serv
   dynamicflags = TAO_LOG_SERV_BUILD_DLL
   tagchecks   += Log
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index 12102e9bfd9..bf66701ee09 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsNotifyLogAdmin_IDL) : orbsvcslib, install, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults {
+project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults {
   custom_only = 1
   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
 
@@ -10,7 +10,7 @@ project(DsNotifyLogAdmin_IDL) : orbsvcslib, install, dslogadmin, dseventlogadmin
   }
 }
 
-project(DsNotifyLogAdmin) : orbsvcslib, install, dslogadmin, dseventlogadmin, event, notification {
+project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification {
   sharedname   = TAO_DsNotifyLogAdmin
   dynamicflags = TAO_NOTIFYLOG_BUILD_DLL
   tagchecks   += Log
@@ -46,7 +46,7 @@ project(DsNotifyLogAdmin) : orbsvcslib, install, dslogadmin, dseventlogadmin, ev
 }
 
 
-project(DsNotifyLogAdmin_Skel) : orbsvcslib, install, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver {
+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
   tagchecks   += Log
@@ -60,14 +60,17 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, install, dsnotifylogadmin, dseventl
 
   Header_Files {
     DsNotifyLogAdminS.h
+    DsNotifyLogAdminS_T.h
     Log/notifylog_skel_export.h
   }
 
   Inline_Files {
     DsNotifyLogAdminS.inl
+    DsNotifyLogAdminS_T.inl
   }   
 
   Template_Files {
+    DsNotifyLogAdminS_T.cpp
   }
 
   Pkgconfig_Files {
@@ -76,7 +79,7 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, install, dsnotifylogadmin, dseventl
 }
 
 
-project(DsNotifyLogAdmin_Serv) : orbsvcslib, install, dsnotifylogadmin_skel, dslogadmin_serv {
+project(DsNotifyLogAdmin_Serv) : orbsvcslib, core, dsnotifylogadmin_skel, dslogadmin_serv {
   sharedname   = TAO_DsNotifyLogAdmin_Serv
   dynamicflags = TAO_NOTIFYLOG_SERV_BUILD_DLL
   tagchecks   += Log
diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc
index 3925f2dc20a..f7cfd1c9367 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL.mpc
+++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(ETCL) : orbsvcslib, install {
+project(ETCL) : orbsvcslib, core {
   sharedname   = TAO_ETCL
   dynamicflags = TAO_ETCL_BUILD_DLL
   tagchecks   += Notify
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index 03c5ff717fc..31e779720b7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -585,7 +585,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
     }
 
   // Validate.
-  size_t const data_bytes_received =
+  size_t data_bytes_received =
     bytes_received - TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE;
 
   if (this->request_size < this->fragment_size
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index ad228dbf538..3579aaec4f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -18,7 +18,6 @@
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_Reactive_ConsumerControl.h"
 #include "orbsvcs/Event/EC_Reactive_SupplierControl.h"
-#include "orbsvcs/Event/EC_Thread_Flags.h"
 
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
@@ -98,39 +97,6 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatchingThreadFlags")) == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          // Need to be in the form of <flags>:<priority>
-          if (arg_shifter.is_parameter_next ())
-            {
-              const ACE_TCHAR* s = arg_shifter.get_current ();
-              // need to parse the flags...ugh
-              ACE_TCHAR* opt = ACE_OS::strdup (s);
-
-              ACE_TCHAR* aux;
-              ACE_TCHAR* flags = ACE_OS::strtok_r (opt, ACE_TEXT_CHAR_TO_TCHAR(":"), &aux);
-
-              TAO_EC_Thread_Flags tf(ACE_TEXT_ALWAYS_CHAR (flags)); // parse and set up
-              this->dispatching_threads_flags_ = tf.flags ();
-
-              ACE_TCHAR* arg = ACE_OS::strtok_r (0, ACE_TEXT_CHAR_TO_TCHAR(":"), &aux);
-              if (arg)
-                {
-                  long prio = ACE_OS::strtol (arg, 0, 0);
-
-                  this->dispatching_threads_priority_ = prio;
-                }
-              else
-                {
-                  // Should we set the default priority?
-                  this->dispatching_threads_priority_ = tf.default_priority ();
-                }
-              ACE_OS::free (opt);
-              arg_shifter.consume_arg ();
-            }
-        }
 
       else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatchingThreads")) == 0)
         {
@@ -542,7 +508,7 @@ TAO_EC_Default_Factory::find_service_object (const char* wanted,
     return so;
 
   ACE_ERROR ((LM_ERROR,
-              "EC (%P|%t) EC_Default_Factory::find_service_object "
+              "EC (%P|%t) EC_Default_Factory::create_dispatching "
               "unable to find queue full service object '%s'; "
               "using '%s' instead\n",
               wanted,
@@ -553,7 +519,7 @@ TAO_EC_Default_Factory::find_service_object (const char* wanted,
     return so;
 
   ACE_ERROR ((LM_ERROR,
-              "EC (%P|%t) EC_Default_Factory::find_service_object "
+              "EC (%P|%t) EC_Default_Factory::create_dispatching "
                       "unable find default queue full service object '%s'; "
                       "aborting.\n",
                       fallback));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 7828d1c65a0..291954518b3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -156,12 +156,13 @@ protected:
   int consumer_lock_;
   int supplier_lock_;
 
-  /// Flags used by thread-based dispatching strategies.
-  int dispatching_threads_;     //! number of threads; may be ignored depending on strategy; default: TAO_EC_DEFAULT_DISPATCHING_THREADS
-  int dispatching_threads_flags_; //! flags for thread creation; default: TAO_EC_DEFAULT_DISPATCHING_THREADS_FLAGS
-  int dispatching_threads_priority_; //! dispatching thread priority; default: TAO_EC_DEFAULT_DISPATCHING_THREADS_PRIORITY
-  int dispatching_threads_force_active_; //! create threads with innocuous default values if creation with requested values fails
-  ACE_CString queue_full_service_object_name_; //! name of ACE_Service_Object which should be invoked when output queue becomes full
+  /// The MT dispatching priority has several arguments that could be
+  /// controlled here...
+  int dispatching_threads_;
+  int dispatching_threads_flags_;
+  int dispatching_threads_priority_;
+  int dispatching_threads_force_active_;
+  ACE_CString queue_full_service_object_name_;
   TAO_EC_Queue_Full_Service_Object* find_service_object (const char* wanted,
                                                          const char* fallback);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 1a5cebd8ecd..0612521f408 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -7,13 +7,6 @@ ACE_RCSID(Event, EC_Factory, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTEvent_Serv_Export unsigned short TAO_EC_debug_level;
-
-TAO_EC_Factory::TAO_EC_Factory (void)
-{
-  TAO_EC_debug_level = 0;
-}
-
 TAO_EC_Factory::~TAO_EC_Factory (void)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index 7f4070e8d5d..a3cd903d4f4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -69,7 +69,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Factory : public ACE_Service_Object
 {
 public:
   /// destructor...
-  TAO_EC_Factory (void);
   virtual ~TAO_EC_Factory (void);
 
   /// Create and destroy the dispatching module.
@@ -163,8 +162,6 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*) = 0;
 };
 
-TAO_RTEvent_Serv_Export extern unsigned short TAO_EC_debug_level;
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index f6bcde8d4cf..1b06a04dca7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -13,18 +13,10 @@ ACE_RCSID(Event, EC_TPC_Dispatching, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern unsigned long TAO_EC_TPC_debug_level;
-
-TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (int nthreads,
-                                                int thread_creation_flags,
-                                                int thread_priority,
-                                                int force_activate,
-                                                TAO_EC_Queue_Full_Service_Object* so)
-  : nthreads_(nthreads)
-  , thread_creation_flags_ (thread_creation_flags)
-  , thread_priority_ (thread_priority)
-  , force_activate_ (force_activate)
-  , consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
+extern unsigned long EC_TPC_debug_level;
+
+TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (TAO_EC_Queue_Full_Service_Object* so)
+  : consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
   , queue_full_service_object_(so)
 {
   ACE_ASSERT (this->queue_full_service_object_ != 0);
@@ -48,20 +40,20 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer
   RtecEventComm::PushConsumer_var pc =
     RtecEventComm::PushConsumer::_duplicate(consumer);
 
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@)\n", pc.in()));
 
   TAO_EC_Dispatching_Task* dtask =
     new TAO_EC_TPC_Dispatching_Task (&this->thread_manager_,
                                      this->queue_full_service_object_);
 
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@): new task %@\n", pc.in(), dtask));
 
-  if ((dtask->activate (this->thread_creation_flags_,
+  if ((dtask->activate (TAO_EC_DEFAULT_DISPATCHING_THREADS_FLAGS,
                        1, // we only want one thread to dispatch to a consumer
                        1, // magic number??
-                        this->thread_priority_)) == -1)
+                        TAO_EC_DEFAULT_DISPATCHING_THREADS_PRIORITY)) == -1)
     {
       ACE_DEBUG ((LM_WARNING,
                   "EC (%P|%t): TPC_Dispatching::add_consumer unable to activate"
@@ -184,7 +176,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                     TAO_EC_QOS_Info&
                                     ACE_ENV_ARG_DECL)
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer));
 
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index d507f3f5c1d..b8c7ea49cd3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -39,11 +39,7 @@ class TAO_EC_Event_Channel_Base;
 class TAO_RTEvent_Serv_Export TAO_EC_TPC_Dispatching : public TAO_EC_Dispatching
 {
 public:
-  TAO_EC_TPC_Dispatching (int nthreads,
-                          int thread_creation_flags,
-                          int thread_priority,
-                          int force_activate,
-                          TAO_EC_Queue_Full_Service_Object* so);
+  TAO_EC_TPC_Dispatching (TAO_EC_Queue_Full_Service_Object* so);
   ~TAO_EC_TPC_Dispatching ();
 
   // = The EC_Dispatching methods.
@@ -67,20 +63,6 @@ private:
   // Use our own thread manager
   ACE_Thread_Manager thread_manager_;
 
-  /// The number of active tasks
-  int nthreads_;
-
-  /// The flags (THR_BOUND, THR_NEW_LWP, etc.) used to create the
-  /// dispatching threads.
-  int thread_creation_flags_;
-
-  /// The priority of the dispatching threads.
-  int thread_priority_;
-
-  /// If activation at the requested priority fails then we fallback on
-  /// the defaults for thread activation.
-  int force_activate_;
-
   typedef ACE_Hash_Map_Manager_Ex<RtecEventComm::PushConsumer_ptr,TAO_EC_Dispatching_Task*,ACE_Pointer_Hash<RtecEventComm::PushConsumer_ptr>,ACE_Equal_To<RtecEventComm::PushConsumer_ptr>,ACE_Null_Mutex> MAPTYPE;
 
   // Tweak the default size of this map by #defining
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index 4125e94efc7..c8e822ed5b9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -16,11 +16,11 @@ ACE_RCSID(Event, EC_TPC_Factory, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-unsigned long TAO_EC_TPC_debug_level;
+unsigned long EC_TPC_debug_level;
 
 TAO_EC_TPC_Factory::TAO_EC_TPC_Factory (void)
 {
-  TAO_EC_TPC_debug_level = 0;
+  EC_TPC_debug_level = 0;
 }
 
 TAO_EC_TPC_Factory::~TAO_EC_TPC_Factory (void)
@@ -63,7 +63,7 @@ TAO_EC_TPC_Factory::init (int argc, char* argv[])
       if (ACE_OS::strcasecmp (arg, "-ECTPCDebug") == 0)
         {
           arg_shifter.consume_arg ();
-          ++TAO_EC_TPC_debug_level;
+          ++EC_TPC_debug_level;
         }
       else
         {
@@ -80,25 +80,21 @@ TAO_EC_TPC_Factory::init (int argc, char* argv[])
 TAO_EC_Dispatching*
 TAO_EC_TPC_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_dispatching\n"));
 
   TAO_EC_Queue_Full_Service_Object* so =
     this->find_service_object (this->queue_full_service_object_name_.fast_rep(),
                                TAO_EC_DEFAULT_QUEUE_FULL_SERVICE_OBJECT_NAME);
  
-  return new TAO_EC_TPC_Dispatching (this->dispatching_threads_,
-                                     this->dispatching_threads_flags_,
-                                     this->dispatching_threads_priority_,
-                                     this->dispatching_threads_force_active_,
-                                     so);
+  return new TAO_EC_TPC_Dispatching (so);
 }
 
 
 TAO_EC_ProxyPushSupplier*
 TAO_EC_TPC_Factory::create_proxy_push_supplier (TAO_EC_Event_Channel_Base *ec)
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_supplier\n"));
   return new TAO_EC_TPC_ProxyPushSupplier (ec, this->consumer_validate_connection_);
 }
@@ -107,7 +103,7 @@ TAO_EC_TPC_Factory::create_proxy_push_supplier (TAO_EC_Event_Channel_Base *ec)
 TAO_EC_ProxyPushConsumer*
 TAO_EC_TPC_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel_Base *ec)
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_consumer\n"));
   return new TAO_EC_TPC_ProxyPushConsumer (ec);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
index 333290f7357..c65e5be61cc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
@@ -56,7 +56,7 @@ public:
       create_proxy_push_consumer (TAO_EC_Event_Channel_Base*);
 };
 
-extern unsigned long TAO_EC_TPC_debug_level;
+extern unsigned long EC_TPC_debug_level;
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index a5b23525b1e..6a7cc347cb1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(Event, EC_TPC_ProxyConsumer, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern unsigned long TAO_EC_TPC_debug_level;
+extern unsigned long EC_TPC_debug_level;
 
 TAO_EC_TPC_ProxyPushConsumer::TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec)
 : TAO_EC_Default_ProxyPushConsumer (ec)
@@ -31,7 +31,7 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
   // dispatch map in here?  I'm not sure...  But, if I do, then I need
   // to fact that "remove" code out of just the
   // disconnect_push_consumer.
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "RTEC (%P|%t): inside ~TAO_EC_TPC_ProxyPushConsumer (%x)\n", this));
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 756de632952..651346bb32a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -13,7 +13,7 @@ ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern unsigned long TAO_EC_TPC_debug_level;
+extern unsigned long EC_TPC_debug_level;
 
 TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void)
 {
@@ -24,7 +24,7 @@ void
 TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n",
 				this,
 				this->refcount_,
@@ -39,7 +39,7 @@ TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL
   BASECLASS::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): leave EC_TPC_ProxySupplier::disconnect_push_supplier (%@)\n", this));
 }
 
@@ -63,7 +63,7 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
   BASECLASS::connect_push_consumer (push_consumer, qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n",
               this, this->refcount_, this->consumer_.in()));
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
index 6e5b54fb0a3..6a31a5fc0d1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
@@ -4,13 +4,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern unsigned long TAO_EC_TPC_debug_level;
+extern unsigned long EC_TPC_debug_level;
 
 ACE_INLINE
 TAO_EC_TPC_ProxyPushSupplier::TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* ec, int validate_connection)
 : TAO_EC_Default_ProxyPushSupplier (ec, validate_connection)
 {
-  if (TAO_EC_TPC_debug_level > 0)        
+  if (EC_TPC_debug_level > 0)        
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this));
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
deleted file mode 100644
index 98a8e5f7ae5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// $Id$
-
-#include "orbsvcs/Event/EC_Thread_Flags.h"
-
-#include "ace/OS_NS_Thread.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/Log_Msg.h"
-#include "ace/Sched_Params.h"
-
-ACE_RCSID(Event, EC_Thread_Flags , "$Id$")
-
-#define TETFSF(flag)  { #flag, flag }
-TAO_EC_Thread_Flags::Supported_Flag TAO_EC_Thread_Flags::supported_flags_[] = {
-#if defined (ACE_HAS_THREADS)
-    TETFSF(THR_CANCEL_DISABLE),
-    TETFSF(THR_CANCEL_ENABLE),
-    TETFSF(THR_CANCEL_DEFERRED),
-    TETFSF(THR_CANCEL_ASYNCHRONOUS),
-    TETFSF(THR_BOUND),
-    TETFSF(THR_NEW_LWP),
-    TETFSF(THR_DETACHED),
-    TETFSF(THR_SUSPENDED),
-    TETFSF(THR_DAEMON),
-    TETFSF(THR_JOINABLE),
-    TETFSF(THR_SCHED_FIFO),
-    TETFSF(THR_SCHED_RR),
-    TETFSF(THR_SCHED_DEFAULT),
-    TETFSF(THR_EXPLICIT_SCHED),
-    TETFSF(THR_SCOPE_SYSTEM),
-    TETFSF(THR_SCOPE_PROCESS)
-#endif /* ACE_HAS_THREADS */
-  };
-#undef TETFSF
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_EC_Thread_Flags::~TAO_EC_Thread_Flags ()
-{
-}
-
-void
-TAO_EC_Thread_Flags::parse_symbols (const char* syms)
-{
-  // PRE: we assume nothing other than that syms is valid
-  // POST:
-  // 1. flags_ is bitwise-OR of all flags
-  // 2. sched_ is THR_SCHED_*, or THR_SCHED_DEFAULT if not specified
-  // 3. scope_ is THR_SCOPE_*, or THR_SCOPE_PROCESS if not specified
-
-  // NOTE: I'm not sure if #2 and #3 are consistent with what happens
-  // in ACE_Task::activate.  I really need to double-check that, and
-  // make sure that they are consistent.
-
-  flags_ = scope_ = sched_ = 0; // zero out everything
-
-  // short-circuit on the trivial case
-  if (syms == 0 || *syms == '\0')
-    return;
-
-  static size_t num_flags = sizeof(supported_flags_)/sizeof(Supported_Flag);
-  char* s = ACE_OS_String::strdup (syms); // need a mutable string
-  if (s == 0)
-    return;
-
-  const char* SEPARATORS = " |"; // this should probably be at class level
-  char* ptr = 0;
-  char* tok = ACE_OS_String::strtok_r (s, SEPARATORS, &ptr);
-  while (tok != 0)
-    {
-      // This would allow for easy accomodation of flags that
-      // aren't currently supported, but is it a good idea?
-
-      if (tok[0] >= '0' && tok[0] <= '9') // Numeric, so just accept it!
-        {
-          // parse it as a long straight to the flags
- 
-          // If somebody specifies the scheduler this way, then they
-          // lose range checking on the priority.  Bummer, but those
-          // are the breaks.
-          this->flags_ |= ACE_OS_String::strtol (tok, 0, 0);
-        }
-      else
-        {
-          int found = 0;
-          for (size_t i = 0; !found && i < num_flags; ++i)
-            {
-              if (ACE_OS_String::strcasecmp (tok, supported_flags_[i].n) == 0)
-                {
-                  this->flags_ |= supported_flags_[i].v;
-
-                  // Can't use a switch for this b/c for some
-                  // platforms the THR_* constants end up with
-                  // the same values, and compiles get upset.
-                  long &sf = supported_flags_[i].v;
-                  if (sf == THR_SCHED_FIFO ||
-                      sf == THR_SCHED_RR ||
-                      sf == THR_SCHED_DEFAULT)
-                    {
-                      this->sched_ = supported_flags_[i].v;
-                    }
-                  else if (sf == THR_SCOPE_SYSTEM ||
-                           sf == THR_SCOPE_PROCESS)
-                    {
-                      this->scope_ = supported_flags_[i].v;
-                    }
-                  found = 1;
-                }
-            }
-          if (!found)
-            {
-              // Ideally this would call some sort of on-error function...
-              // but, it doesn't.
-              ACE_ERROR ((LM_ERROR,
-                          "RTEC (%P|%t) unable to parse %s as a thread flag - skipping\n",
-                          tok));
-            }
-        }
-      tok = ACE_OS_String::strtok_r (0, SEPARATORS, &ptr);
-    }
-
-  ACE_OS::free (s); // clean up after ourselves
-}
-
-long
-TAO_EC_Thread_Flags::default_priority () const
-{
-  long priority = ACE_DEFAULT_THREAD_PRIORITY;
-
-  // use the implementation
-  if (this->sched() == 0)
-    return priority;
-
-  priority =
-    ACE_Sched_Params::priority_min (this->sched()) +
-    ACE_Sched_Params::priority_max (this->sched()) / 2;
-  priority = ACE_Sched_Params::next_priority (this->sched(), priority);
-
-  return priority;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
deleted file mode 100644
index ad80bc38f68..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- C++ -*- */
-/**
- *  @file   EC_Thread_Flags.h
- *
- *  $Id$
- *
- *  @author Chris Cleeland <cleeland@ociweb.com>
- *
- *  Encapsulate flags that can be used for creating threads.
- */
-
-#ifndef TAO_EC_THREAD_FLAGS_H
-#define TAO_EC_THREAD_FLAGS_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "tao/orbconf.h"
-#include /**/ "tao/Versioned_Namespace.h"
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/*!
-  \class TAO_EC_Thread_Flags
-
-  \brief Parse thread flags from string to a long.
- 
-  Encapsulate flags used for creating threads with \a
-  ACE_OS::thr_create and \a ACE_Task::activate.
-
-  \note On platforms that do not support the thread schedulers, the
-  ACE OS adaptation layer preserves the symbols for THR_SCHED_*, but
-  defines them as zero.  Thus, on such platforms, setting a scheduler
-  in the flags, then inquiring for the scheduler type will yield the
-  same result as an unknown or unset scheduler.
-
-  \bugs This should really be part of ACE or ACE_OS, and maybe someday
-  it will, but right now it's not.
-
-*/
-class TAO_RTEvent_Serv_Export TAO_EC_Thread_Flags
-{
-public:
-  TAO_EC_Thread_Flags () { }
-  /*! \brief See \a operator=() */
-  TAO_EC_Thread_Flags (const char* symbolic_flags)
-    { this->parse_symbols(symbolic_flags); }
-  ~TAO_EC_Thread_Flags ();
-
-  // Default Copy CTOR is fine.
-
-  /*!
-    \brief Assign a new set of symbolic flags, setting \a flags, \a scope, and \a sched as possible.
-
-    The flags can be symbolic, separated by the vertical bar ('|').
-    In case a platform supports a creation flag not available
-    symbolically, the user can specify a numeric value any place a
-    symbol could be used.
-
-    \sa TAO_EC_Thread_Flags::supported_flags
-
-    \note The \a sched value only gets set if the scheduler is specified using symbols.
-  */
-  const TAO_EC_Thread_Flags& operator= (const char* symbolic_flags)
-    { this->parse_symbols(symbolic_flags); return *this; }
-
-  /*!
-    \brief Returns numeric equivalent of the thread flags suitable for passing to ACE_Task::activate.
-  */
-  long flags() const { return this->flags_; }
-
-  /*!
-    \brief Returns value of THR_SCOPE_* used, or zero if unknown.
-  */
-  long scope() const { return this->scope_; }
- 
-  /*!
-    \brief Returns value of THR_SCHED_* used, or zero if unknown.
-  */
-  long sched() const { return this->sched_; }
-
-  /// Synonym for flags(), i.e., syntactic sugar.
-  operator long () const { return this->flags(); }
-
-  /*!
-    \brief Return an acceptable default priority for the scheduler returned by sched().
-    \return the priority, or ACE_DEFAULT_THREAD_PRIORITY if the scheduler is unknown.
-  */
-  long default_priority () const;
- 
-
-
-  struct Supported_Flag
-  {
-    const char* n; /// Flag name, e.g., THR_NEW_LWP
-    long        v; /// Flag value, i.e., actual symbol
-  };
-
-  // TETFSF == TAO_EC_THREAD_FLAGS_SUPPORTED_FLAGS
-  static Supported_Flag supported_flags_[];
-
-protected:
-  long flags_; /// Value of all flags OR'd together
-  long scope_; /// Value of THR_SCOPE_*
-  long sched_; /// Value of THR_SCHED_*
-
-  void parse_symbols (const char* syms);
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* TAO_EC_THREAD_FLAGS_H */
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index 86b2c625c91..8254fb8f2de 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTORB_Utils) : orbsvcslib, install, iormanip, portableserver, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults {
+project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, minimum_corba, tao_versioning_idl_defaults {
   sharedname   = TAO_FTORB_Utils
   idlflags    += -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL
@@ -29,7 +29,7 @@ project(FTORB_Utils) : orbsvcslib, install, iormanip, portableserver, portablegr
   }
 }
 
-project(FT_ClientORB) : orbsvcslib, ftorbutils, install, messaging, portablegroup, interceptors {
+project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup, interceptors {
   avoids      += ace_for_tao      // Requires ace/UUID
   sharedname   = TAO_FT_ClientORB
   dynamicflags = TAO_FT_CLIENTORB_BUILD_DLL
@@ -61,7 +61,7 @@ project(FT_ClientORB) : orbsvcslib, ftorbutils, install, messaging, portablegrou
   }
 }
 
-project(FT_ServerORB) : orbsvcslib, ftorbutils, install, messaging, portablegroup, pi_server, pi, interceptors {
+project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup, pi_server, pi, interceptors {
   sharedname   = TAO_FT_ServerORB
   dynamicflags = TAO_FT_SERVERORB_BUILD_DLL
   tagchecks   += FT_ServerORB
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index daa3912edbd..0b6911d2473 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FaultTolerance): orbsvcslib, install, pi, pi_server, notification, ftorb, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults {
+project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, minimum_corba, tao_versioning_idl_defaults {
   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
   dynamicflags = TAO_FT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
index c0383c99cbc..c0383c99cbc 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 852e1c2c97b..852e1c2c97b 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
index 7ee620338b9..7ee620338b9 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 638639dfb10..638639dfb10 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index a1bbf81174e..a1bbf81174e 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
index 637356ff8ec..637356ff8ec 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
index 7adfd628330..7adfd628330 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
index c6b8c863e6f..c6b8c863e6f 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 77b99f3035a..77b99f3035a 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index 0e2711ed429..0e2711ed429 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index e1c8fcea33b..e1c8fcea33b 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
index 2ae22af9f48..2ae22af9f48 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 6019cdc8f70..6019cdc8f70 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
index 21dfaed4af7..21dfaed4af7 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
index be4448486c8..be4448486c8 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
index 7c57a64a2c2..7c57a64a2c2 100644..100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 36813b33d7d..88dedebea60 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -37,40 +37,6 @@ TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks (void)
   delete this->profile_lock_;
 }
 
-CORBA::Boolean 
-TAO_FT_Service_Callbacks::select_profile (const TAO_MProfile &mprofile,
-    TAO_Profile *&pfile)
-{  
-  CORBA::ULong sz =
-    mprofile.size ();
-
-  // Iterate through the list in a circular fashion. Stop one before
-  // the list instead of trying the same thing again.
-  for (CORBA::ULong i = 0;
-       i != sz;
-       ++i)
-    {
-      const TAO_Profile *curr_pfile = mprofile.get_profile (i);
-
-      IOP::TaggedComponent tagged_component;
-      tagged_component.tag = IOP::TAG_FT_PRIMARY;
-
-      // Get the tagged component from the  profile
-      const TAO_Tagged_Components &pfile_tagged =
-        curr_pfile->tagged_components ();
-
-      // Search for the TaggedComponent that we want
-      if (pfile_tagged.get_component (tagged_component) == 1)
-      {
-        // We have found a primary IOR
-        pfile = const_cast<TAO_Profile *>(curr_pfile);
-        return true;
-      }
-    }
-
-  return false;
-}
-
 CORBA::Boolean
 TAO_FT_Service_Callbacks::object_is_nil (CORBA::Object_ptr obj)
 {
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index b2f0403176f..b8f0b2a4d1f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -49,11 +49,6 @@ public:
   /// Dtor
   virtual ~TAO_FT_Service_Callbacks (void);
 
-  /// Select the profile from MProfile as the needs of the services
-  /// may be. Return the profile in <pfile>
-  virtual CORBA::Boolean select_profile (const TAO_MProfile &mprofile,
-                                         TAO_Profile *&pfile);
-
   /// Check whether <obj> is nil or not. FT spec suggests some
   /// extensions for a CORBA::is_nil () operation.
   virtual CORBA::Boolean object_is_nil (CORBA::Object_ptr obj);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index 13af9f27f08..b510974a944 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (FtRtEvent) : orbsvcslib, install, ftorbutils, rtevent_serv, naming, avoids_minimum_corba, pi_server, tao_versioning_idl_defaults {
+project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server, tao_versioning_idl_defaults {
   sharedname   = TAO_FtRtEvent
   idlflags    += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
   dynamicflags = TAO_FTRTEVENT_BUILD_DLL
@@ -36,7 +36,7 @@ project (FtRtEvent) : orbsvcslib, install, ftorbutils, rtevent_serv, naming, avo
   }
 }
 
-project (FTRT_ClientORB) :  messaging, orbsvcslib, pi, install {
+project (FTRT_ClientORB) :  messaging, orbsvcslib, pi, core {
   sharedname   = TAO_FTRT_ClientORB
   dynamicflags = TAO_FTRT_BUILD_DLL
   tagchecks   += FTRT_ClientORB
@@ -57,7 +57,7 @@ project (FTRT_ClientORB) :  messaging, orbsvcslib, pi, install {
   }
 }
 
-project (FTRT_EventChannel) :  orbsvcslib, install, ftrtevent, rtevent_serv, utils, pi_server, corba_messaging {
+project (FTRT_EventChannel) :  orbsvcslib, core, ftrtevent, rtevent_serv, utils, pi_server, corba_messaging {
   sharedname   = TAO_FTRT_EventChannel
   dynamicflags = TAO_FTRTEC_BUILD_DLL
   tagchecks   += FTRT_EventChannel
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP.mpc b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
index 3b4e12273a7..eeaa015661a 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project : htbp, orbsvcslib, install, tao_versioning_idl_defaults {
+project : htbp, orbsvcslib, core, tao_versioning_idl_defaults {
   sharedname   = TAO_HTIOP
   idlflags    += -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS
   dynamicflags = HTIOP_BUILD_DLL
@@ -15,7 +15,7 @@ project : htbp, orbsvcslib, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -Gp -Gd -Sa -Sorb \
+    idlflags += -Sci -Gp -Gd -Ge 1 -Sa -Sorb \
                 -o HTIOP
     idlflags -= -St
     HTIOP/htiop_endpoints.pidl
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index 5a749e78051..94eb2b878b7 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -76,9 +76,6 @@ TAO::HTIOP::Connection_Handler::open_handler (void *v)
 int
 TAO::HTIOP::Connection_Handler::open (void*)
 {
-  if (this->shared_open() == -1)
-    return -1;
-
   if (this->transport ()->wait_strategy ()->non_blocking ())
     {
       if (this->peer ().enable (ACE_NONBLOCK) == -1)
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl
index 6af510591a8..91ec7acef3a 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl
@@ -15,7 +15,7 @@
  * is:
  *
  *      tao_idl
- *           -Gp -Gd -Sc -Sa -DCORBA3 -Sci \
+ *           -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3 -Sci \
  *           -Wb,export_macro=HTIOP_Export \
  *           -Wb,export_include="HTIOP_Export.h" \
  *           -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc
index a6ec0fa90ff..e0c158052da 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -1,31 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
-project(IFRService) : orbsvcslib, install, typecodefactory, svc_utils, iortable {
+project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, minimum_corba {
   avoids      += ace_for_tao    // Requires ace/Configuration
   sharedname   = TAO_IFRService
   dynamicflags = TAO_IFRSERVICE_BUILD_DLL
+  tagchecks   += IFRService
 
   IDL_Files {
   }
 
-  Source_Files {
-    IFRService/*_i.cpp
-    IFRService/*S.cpp
-    IFRService/IFR_Service_Loader.cpp
-    IFRService/IFR_Service_Utils.cpp
-    IFRService/Options.cpp
-  }
-
-  Header_Files {
-    IFRService/*.h
+  Source_Files(ORBSVCS_COMPONENTS) {
+    IFRService {
+      IFRService
+    }
   }
 
   Template_Files {
-    IFRService/IFR_BaseS_T.cpp
-    IFRService/IFR_BasicS_T.cpp
-    IFRService/IFR_ComponentsS_T.cpp
-    IFRService/IFR_ExtendedS_T.cpp
-    IFRService/IFR_Service_Utils_T.cpp
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index fd81da7b806..a5e914dcf87 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -80,19 +80,19 @@ TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb,
                                        ACE_ENV_ARG_DECL_NOT_USED)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  int result;
+
   // Initializes the IFR_Service Service. Returns -1
   // on an error.
-  int result = this->ifr_server_.init_with_orb (argc,
-                                                argv,
-                                                orb);
-  if (result != 0)
+  result = this->ifr_server_.init_with_orb (argc,
+                                            argv,
+                                            orb);
+  if (result == -1)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (0,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::Object::_nil ());
+      return CORBA::Object::_nil ();
     }
 
-  return CORBA::Object::_nil ();
+  return 0;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 879525de273..492f0aaad44 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -401,10 +401,11 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
 int
 TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL)
 {
-#if defined (ACE_HAS_IP_MULTICAST)
   // Get reactor instance from TAO.
   ACE_Reactor *reactor = this->orb_->orb_core ()->reactor ();
 
+#if defined (ACE_HAS_IP_MULTICAST)
+
   // See if the -ORBMulticastDiscoveryEndpoint option was specified.
   ACE_CString mde (
       TAO_ORB_Core_instance ()->orb_params ()->mcast_discovery_endpoint ()
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
index 64e07b77dbc..26f71866bfd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
@@ -73,13 +73,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
                            " [-l]"
                            " [-m] <0|1>"
                            " [-p]"
-                           " [-b] <persistence_file>\n\n"
-                           "  -o  <filename> Output service IOR to <filename>\n"
-                           "  -r  Persist contents in the win32 registry\n"
-                           "  -l  Enable locking (off by default)\n"
-                           "  -m  <0|1> Enable multicast discovery of this service\n"
-                           "  -p  Persist contents using a memory mapped file\n"
-                           "  -b  <filename> Used with the file persistence option. Specifies the storage file name.\n"
+                           " [-b] <persistence_file>"
                             "\n",
                            argv [0]),
                           1);
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index 0cf09c84c7b..233143bb12f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -10,7 +10,6 @@ ACE_RCSID (Log,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Hash_Iterator_i::TAO_Hash_Iterator_i (
-  PortableServer::POA_ptr poa,
   ACE_Reactor* reactor,
   TAO_Hash_LogRecordStore* recordstore,
   TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter,
@@ -18,7 +17,7 @@ TAO_Hash_Iterator_i::TAO_Hash_Iterator_i (
   CORBA::ULong start,
   const char *constraint,
   CORBA::ULong max_rec_list_len)
-  : TAO_Iterator_i(poa, reactor),
+  : TAO_Iterator_i(reactor),
     recordstore_ (recordstore),
     iter_ (iter),
     iter_end_ (iter_end),
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
index 245eb9c98cd..375735a43ce 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
@@ -47,8 +47,7 @@ public:
   // = Initialization and Termination methods.
 
   /// Constructor.
-  TAO_Hash_Iterator_i (PortableServer::POA_ptr poa,
-		       ACE_Reactor* reactor,
+  TAO_Hash_Iterator_i (ACE_Reactor* reactor,
 		       TAO_Hash_LogRecordStore* recordstore,
                        TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter,
                        TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter_end,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index aa90c47cea0..be3c8479585 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -71,12 +71,14 @@ TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore (
     log_poa->the_POAManager ();
 
   this->iterator_poa_ =
-	log_poa->create_POA(buf, poa_manager.in(), policies);
+	log_poa->create_POA(buf, PortableServer::POAManager::_nil(), policies);
 }
 
 TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore (void)
 {
+  ACE_DEBUG((LM_DEBUG, "TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore ()\n"));
   this->iterator_poa_->destroy (1, 0);
+  ACE_DEBUG((LM_DEBUG, "TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore ()\n"));
 }
 
 int
@@ -439,8 +441,7 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint,
       // Create an iterator to pass out.
       TAO_Hash_Iterator_i *iter_query = 0;
       ACE_NEW_THROW_EX (iter_query,
-                        TAO_Hash_Iterator_i (this->iterator_poa_.in (),
-					     this->reactor_,
+                        TAO_Hash_Iterator_i (this->reactor_,
 					     this,
                                              iter,
                                              iter_end,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 139e85e262c..d26dc48d882 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -11,10 +11,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_Time_Value
 TAO_Iterator_i::timeout_(60 * 60);
 
-TAO_Iterator_i::TAO_Iterator_i (PortableServer::POA_ptr poa,
-				ACE_Reactor* reactor)
-  : poa_ (PortableServer::POA::_duplicate (poa)),
-    reactor_ (reactor)
+TAO_Iterator_i::TAO_Iterator_i (ACE_Reactor* reactor)
+  : reactor_ (reactor)
 {
    if (this->timeout_ != ACE_Time_Value::zero) 
      {
@@ -38,14 +36,19 @@ void
 TAO_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  PortableServer::POA_ptr poa = 
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Goodbye cruel world...
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in ()
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   return;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 84042063697..acfa7b89f63 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -52,7 +52,7 @@ public:
   // = Initialization and Termination methods.
 
   /// Constructor.
-  TAO_Iterator_i (PortableServer::POA_ptr poa, ACE_Reactor* reactor);
+  TAO_Iterator_i (ACE_Reactor* reactor);
 
   /// Destructor.
   virtual ~TAO_Iterator_i (void);
@@ -69,9 +69,6 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  /// POA
-  PortableServer::POA_var poa_;
-
   /// Reactor
   ACE_Reactor* reactor_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
index a5f60cf3c05..5f7c64cd724 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -4,7 +4,7 @@ ACE_RCSID (Log,
            LogActivator,
            "$Id$")
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0)
 #include "orbsvcs/Log/LogMgr_i.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -39,7 +39,7 @@ TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid,
 
 
 void
-TAO_LogActivator::etherealize (const PortableServer::ObjectId&,
+TAO_LogActivator::etherealize (const PortableServer::ObjectId&, 
 			       PortableServer::POA_ptr,
 			       PortableServer::Servant servant,
 			       CORBA::Boolean,
@@ -47,7 +47,7 @@ TAO_LogActivator::etherealize (const PortableServer::ObjectId&,
 			       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (!remaining_activations)
+  if (!remaining_activations) 
    {
      delete servant;
    }
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
index d39364a5661..c25f466b0ed 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
@@ -16,7 +16,7 @@
 
 #include "orbsvcs/DsLogAdminC.h"
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0)
 
 #include "orbsvcs/Log/log_serv_export.h"
 
@@ -31,7 +31,7 @@ class TAO_LogMgr_i;
 /// @class TAO_LogActivator
 /// @brief Log Servant Activator
 ///
-/// A servant activator to create Log servants.  Permits servants to
+/// A servant activator to create Log servants.  Permits servants to 
 /// be "lazily" created on demand.  This allows persistent logging
 /// strategies to avoid creating servants for each log when the
 /// service is started.
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 199e5154fa8..23bb04d2ea1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -70,7 +70,7 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
 					       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
     policies.length(4);
     policies[2] =
       this->poa_->create_servant_retention_policy (PortableServer::RETAIN
@@ -90,7 +90,7 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
     ACE_CHECK;
   }
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
   PortableServer::ServantActivator* servant_activator = 0;
 
   ACE_NEW_THROW_EX (servant_activator,
@@ -142,11 +142,8 @@ TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id
 					      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
-  // Use _unchecked_narrow() because this may be called from a servant
-  // activator's incarnate() method.  A plain _narrow() will result in
-  // infinate recursion.
   DsLogAdmin::Log_var log =
-    DsLogAdmin::Log::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::Log::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   return log._retn();
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 22ea9a17b82..9d8fe567d40 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -9,7 +9,6 @@
 #include "tao/DynamicAny/DynUnion_i.h"
 #include "tao/DynamicAny/DynEnum_i.h"
 #include "tao/DynamicAny/DynAnyFactory.h"
-#include "tao/DynamicAny/DynAnyUtils_T.h"
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -209,19 +208,15 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
                 }
 
                 DynamicAny::DynAny_var dyn_any =
-                  TAO::MakeDynAnyUtils<const CORBA::Any &>::make_dyn_any_t (
-                    disc_tc.in (),
-                    disc_any
-                    ACE_ENV_ARG_PARAMETER);
+                  TAO_DynAnyFactory::make_dyn_any (disc_any
+                                                   ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
-                
                 dyn_union.set_discriminator (dyn_any.in ()
                                              ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
                 DynamicAny::DynAny_var u_member =
                   dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
-                
                 this->current_member_ =
                   u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 4cbbd3b86b2..263ef5d7ebc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -45,9 +45,13 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb,
 void
 TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL)
 {
+#if 0
+  // @@ Calling create_log_reference () here leads to an infinate loop.
+  // When this is fixed, this can be enabled.
   this->log_ =
     logmgr_i_.create_log_reference (this->logid_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+#endif
 
   this->recordstore_ =
     logmgr_i_.get_log_record_store (this->logid_ ACE_ENV_ARG_PARAMETER);
@@ -185,6 +189,16 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
 
   if (notifier_)
     {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
       notifier_->quality_of_service_value_change (this->log_.in (),
                                                   this->logid_,
                                                   old_qos.in (),
@@ -244,6 +258,16 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
 
   if (notifier_)
     {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
       notifier_->max_record_life_value_change (this->log_.in (),
                                                this->logid_,
                                                old_life,
@@ -309,6 +333,16 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
 
   if (notifier_)
     {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
       notifier_->max_log_size_value_change (this->log_.in (),
 					    this->logid_,
 					    old_size,
@@ -410,6 +444,16 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
 
   if (notifier_)
     {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
       notifier_->log_full_action_value_change (this->log_.in (),
                                                this->logid_,
                                                old_action,
@@ -481,6 +525,16 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
 
   if (notifier_)
     {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
       notifier_->administrative_state_change (this->log_.in (),
                                               this->logid_,
                                               state
@@ -534,6 +588,16 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
 
   if (notifier_)
     {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
       notifier_->forwarding_state_change (this->log_.in (),
                                           this->logid_,
                                           state
@@ -604,6 +668,16 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
 
   if (notifier_)
     {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
       if (interval.start != old_interval.start)
         {
           notifier_->start_time_value_change (this->log_.in (),
@@ -726,6 +800,16 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
 
   if (notifier_)
     {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
       notifier_->capacity_alarm_threshold_value_change (this->log_.in (),
                                                         this->logid_,
                                                         old_threshs.in (),
@@ -807,6 +891,16 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
 
   if (notifier_)
     {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
       notifier_->week_mask_value_change (this->log_.in (),
                                          this->logid_,
                                          old_masks.in (),
@@ -1340,6 +1434,16 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
 		 ? DsLogNotification::critical
 		 : DsLogNotification::minor);
 
+	      // @@ Calling create_log_reference () in the ctor or in ::init()
+	      // leads to an infinate loop.  This should be removed when that
+	      // is fixed.
+	      if (CORBA::is_nil (this->log_.in ()))
+		{
+		  this->log_ = logmgr_i_.create_log_reference (this->logid_
+							       ACE_ENV_ARG_PARAMETER);
+		  ACE_CHECK;
+		}
+		  
               notifier_->threshold_alarm (
                 this->log_.in (),
                 logid_,
@@ -1394,8 +1498,8 @@ TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
 	  ACE_CHECK;
 
 	  const CORBA::UShort percent =
-	    static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) /
-					 (double) ACE_UINT64_DBLCAST_ADAPTER (max_size));
+	    static_cast<CORBA::UShort> ((((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) /
+					 (double) ACE_UINT64_DBLCAST_ADAPTER (max_size)));
 
 	  this->current_threshold_ = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index e27afebe9c7..21bfca9d7c9 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
+## ..\bin\mwc.pl -type automake -noreldefs TAO.mwc
 
 includedir = @includedir@/orbsvcs
 pkgconfigdir = @libdir@/pkgconfig
@@ -16,51 +16,48 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-lib_LTLIBRARIES =
-pkgconfig_DATA =
-CLEANFILES =
-BUILT_SOURCES =
 
 ## Makefile.CosNaming_IDL.am
 
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   CosNamingC.cpp \
   CosNamingC.h \
   CosNamingC.inl \
   CosNamingS.cpp \
   CosNamingS.h \
-  CosNamingS.inl
+  CosNamingS.inl \
+  CosNamingS_T.cpp \
+  CosNamingS_T.h \
+  CosNamingS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   CosNaming-stamp \
   CosNamingC.cpp \
   CosNamingC.h \
   CosNamingC.inl \
   CosNamingS.cpp \
   CosNamingS.h \
-  CosNamingS.inl
+  CosNamingS.inl \
+  CosNamingS_T.cpp \
+  CosNamingS_T.h \
+  CosNamingS_T.inl
 
-CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNamingS.inl: CosNaming-stamp
+CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNamingS.inl CosNamingS_T.cpp CosNamingS_T.h CosNamingS_T.inl: CosNaming-stamp
 
 CosNaming-stamp: $(srcdir)/CosNaming.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS = \
   CosNaming.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.CosNaming.am
 
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosNaming.la
+lib_LTLIBRARIES = libTAO_CosNaming.la
 
 libTAO_CosNaming_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -76,7 +73,7 @@ libTAO_CosNaming_la_SOURCES = \
   Naming/Naming_Client.cpp
 
 libTAO_CosNaming_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosNaming_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -89,16 +86,14 @@ nobase_include_HEADERS += \
   Naming/Naming_Client.h \
   Naming/naming_export.h
 
-pkgconfig_DATA += \
+pkgconfig_DATA = \
   TAO_CosNaming.pc
 
 CLEANFILES += \
   TAO_CosNaming.pc
 
 TAO_CosNaming.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming.pc.in
 
 EXTRA_DIST = \
   CosNaming.rc \
@@ -107,15 +102,16 @@ EXTRA_DIST = \
 
 ## Makefile.CosProperty_IDL.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   CosPropertyC.cpp \
   CosPropertyC.h \
   CosPropertyC.inl \
   CosPropertyS.cpp \
   CosPropertyS.h \
-  CosPropertyS.inl
+  CosPropertyS.inl \
+  CosPropertyS_T.cpp \
+  CosPropertyS_T.h \
+  CosPropertyS_T.inl
 
 CLEANFILES += \
   CosProperty-stamp \
@@ -124,13 +120,16 @@ CLEANFILES += \
   CosPropertyC.inl \
   CosPropertyS.cpp \
   CosPropertyS.h \
-  CosPropertyS.inl
+  CosPropertyS.inl \
+  CosPropertyS_T.cpp \
+  CosPropertyS_T.h \
+  CosPropertyS_T.inl
 
-CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosPropertyS.inl: CosProperty-stamp
+CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosPropertyS.inl CosPropertyS_T.cpp CosPropertyS_T.h CosPropertyS_T.inl: CosProperty-stamp
 
 CosProperty-stamp: $(srcdir)/CosProperty.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   CosPropertyServiceC.cpp \
@@ -138,7 +137,10 @@ BUILT_SOURCES += \
   CosPropertyServiceC.inl \
   CosPropertyServiceS.cpp \
   CosPropertyServiceS.h \
-  CosPropertyServiceS.inl
+  CosPropertyServiceS.inl \
+  CosPropertyServiceS_T.cpp \
+  CosPropertyServiceS_T.h \
+  CosPropertyServiceS_T.inl
 
 CLEANFILES += \
   CosPropertyService-stamp \
@@ -147,24 +149,24 @@ CLEANFILES += \
   CosPropertyServiceC.inl \
   CosPropertyServiceS.cpp \
   CosPropertyServiceS.h \
-  CosPropertyServiceS.inl
+  CosPropertyServiceS.inl \
+  CosPropertyServiceS_T.cpp \
+  CosPropertyServiceS_T.h \
+  CosPropertyServiceS_T.inl
 
-CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropertyServiceS.cpp CosPropertyServiceS.h CosPropertyServiceS.inl: CosPropertyService-stamp
+CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropertyServiceS.cpp CosPropertyServiceS.h CosPropertyServiceS.inl CosPropertyServiceS_T.cpp CosPropertyServiceS_T.h CosPropertyServiceS_T.inl: CosPropertyService-stamp
 
 CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS += \
   CosProperty.idl \
   CosPropertyService.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.CosProperty.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosProperty.la
 
 libTAO_CosProperty_la_CPPFLAGS = \
@@ -181,7 +183,7 @@ libTAO_CosProperty_la_SOURCES = \
   CosPropertyServiceC.cpp
 
 libTAO_CosProperty_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosProperty_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -202,9 +204,7 @@ CLEANFILES += \
   TAO_CosProperty.pc
 
 TAO_CosProperty.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosProperty.pc.in
 
 EXTRA_DIST += \
   TAO_CosProperty.pc.in
@@ -212,8 +212,6 @@ EXTRA_DIST += \
 
 ## Makefile.CosProperty_Skel.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosProperty_Skel.la
 
 libTAO_CosProperty_Skel_la_CPPFLAGS = \
@@ -230,7 +228,7 @@ libTAO_CosProperty_Skel_la_SOURCES = \
   CosPropertyServiceS.cpp
 
 libTAO_CosProperty_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosProperty_Skel_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -242,8 +240,14 @@ libTAO_CosProperty_Skel_la_LIBADD = \
 nobase_include_HEADERS += \
   CosPropertyS.h \
   CosPropertyS.inl \
+  CosPropertyS_T.cpp \
+  CosPropertyS_T.h \
+  CosPropertyS_T.inl \
   CosPropertyServiceS.h \
   CosPropertyServiceS.inl \
+  CosPropertyServiceS_T.cpp \
+  CosPropertyServiceS_T.h \
+  CosPropertyServiceS_T.inl \
   Property/property_skel_export.h
 
 pkgconfig_DATA += \
@@ -253,9 +257,7 @@ CLEANFILES += \
   TAO_CosProperty_Skel.pc
 
 TAO_CosProperty_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosProperty_Skel.pc.in
 
 EXTRA_DIST += \
   TAO_CosProperty_Skel.pc.in
@@ -263,8 +265,6 @@ EXTRA_DIST += \
 
 ## Makefile.CosProperty_Serv.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosProperty_Serv.la
 
 libTAO_CosProperty_Serv_la_CPPFLAGS = \
@@ -280,7 +280,7 @@ libTAO_CosProperty_Serv_la_SOURCES = \
   Property/CosPropertyService_i.cpp
 
 libTAO_CosProperty_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosProperty_Serv_la_LIBADD = \
   libTAO_CosProperty_Skel.la \
@@ -301,9 +301,7 @@ CLEANFILES += \
   TAO_CosProperty_Serv.pc
 
 TAO_CosProperty_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosProperty_Serv.pc.in
 
 EXTRA_DIST += \
   TAO_CosProperty_Serv.pc.in
@@ -311,7 +309,6 @@ EXTRA_DIST += \
 
 ## Makefile.AV.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES += \
@@ -320,7 +317,9 @@ BUILT_SOURCES += \
   AVStreamsC.inl \
   AVStreamsS.cpp \
   AVStreamsS.h \
-  AVStreamsS.inl
+  AVStreamsS.inl \
+  AVStreamsS_T.cpp \
+  AVStreamsS_T.inl
 
 CLEANFILES += \
   AVStreams-stamp \
@@ -329,13 +328,15 @@ CLEANFILES += \
   AVStreamsC.inl \
   AVStreamsS.cpp \
   AVStreamsS.h \
-  AVStreamsS.inl
+  AVStreamsS.inl \
+  AVStreamsS_T.cpp \
+  AVStreamsS_T.inl
 
-AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreamsS.inl: AVStreams-stamp
+AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreamsS.inl AVStreamsS_T.cpp AVStreamsS_T.inl: AVStreams-stamp
 
 AVStreams-stamp: $(srcdir)/AVStreams.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   Null_MediaCtrlC.cpp \
@@ -343,7 +344,9 @@ BUILT_SOURCES += \
   Null_MediaCtrlC.inl \
   Null_MediaCtrlS.cpp \
   Null_MediaCtrlS.h \
-  Null_MediaCtrlS.inl
+  Null_MediaCtrlS.inl \
+  Null_MediaCtrlS_T.cpp \
+  Null_MediaCtrlS_T.inl
 
 CLEANFILES += \
   Null_MediaCtrl-stamp \
@@ -352,13 +355,15 @@ CLEANFILES += \
   Null_MediaCtrlC.inl \
   Null_MediaCtrlS.cpp \
   Null_MediaCtrlS.h \
-  Null_MediaCtrlS.inl
+  Null_MediaCtrlS.inl \
+  Null_MediaCtrlS_T.cpp \
+  Null_MediaCtrlS_T.inl
 
-Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Null_MediaCtrlS.h Null_MediaCtrlS.inl: Null_MediaCtrl-stamp
+Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Null_MediaCtrlS.h Null_MediaCtrlS.inl Null_MediaCtrlS_T.cpp Null_MediaCtrlS_T.inl: Null_MediaCtrl-stamp
 
 Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   sfpC.cpp \
@@ -366,7 +371,9 @@ BUILT_SOURCES += \
   sfpC.inl \
   sfpS.cpp \
   sfpS.h \
-  sfpS.inl
+  sfpS.inl \
+  sfpS_T.cpp \
+  sfpS_T.inl
 
 CLEANFILES += \
   sfp-stamp \
@@ -375,13 +382,15 @@ CLEANFILES += \
   sfpC.inl \
   sfpS.cpp \
   sfpS.h \
-  sfpS.inl
+  sfpS.inl \
+  sfpS_T.cpp \
+  sfpS_T.inl
 
-sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl: sfp-stamp
+sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl sfpS_T.cpp sfpS_T.inl: sfp-stamp
 
 sfp-stamp: $(srcdir)/sfp.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_AV.la
 
@@ -424,7 +433,7 @@ libTAO_AV_la_SOURCES = \
   sfpS.cpp
 
 libTAO_AV_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_AV_la_LIBADD = \
   libTAO_CosNaming.la \
@@ -478,19 +487,24 @@ nobase_include_HEADERS += \
   AVStreamsC.inl \
   AVStreamsS.h \
   AVStreamsS.inl \
+  AVStreamsS_T.cpp \
+  AVStreamsS_T.inl \
   Null_MediaCtrl.idl \
   Null_MediaCtrlC.h \
   Null_MediaCtrlC.inl \
   Null_MediaCtrlS.h \
   Null_MediaCtrlS.inl \
+  Null_MediaCtrlS_T.cpp \
+  Null_MediaCtrlS_T.inl \
   sfp.idl \
   sfpC.h \
   sfpC.inl \
   sfpS.h \
-  sfpS.inl
+  sfpS.inl \
+  sfpS_T.cpp \
+  sfpS_T.inl
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 EXTRA_DIST += \
   AV.rc
@@ -498,15 +512,16 @@ EXTRA_DIST += \
 
 ## Makefile.CosConcurrency_IDL.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   CosConcurrencyControlC.cpp \
   CosConcurrencyControlC.h \
   CosConcurrencyControlC.inl \
   CosConcurrencyControlS.cpp \
   CosConcurrencyControlS.h \
-  CosConcurrencyControlS.inl
+  CosConcurrencyControlS.inl \
+  CosConcurrencyControlS_T.cpp \
+  CosConcurrencyControlS_T.h \
+  CosConcurrencyControlS_T.inl
 
 CLEANFILES += \
   CosConcurrencyControl-stamp \
@@ -515,23 +530,23 @@ CLEANFILES += \
   CosConcurrencyControlC.inl \
   CosConcurrencyControlS.cpp \
   CosConcurrencyControlS.h \
-  CosConcurrencyControlS.inl
+  CosConcurrencyControlS.inl \
+  CosConcurrencyControlS_T.cpp \
+  CosConcurrencyControlS_T.h \
+  CosConcurrencyControlS_T.inl
 
-CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS.inl: CosConcurrencyControl-stamp
+CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS.inl CosConcurrencyControlS_T.cpp CosConcurrencyControlS_T.h CosConcurrencyControlS_T.inl: CosConcurrencyControl-stamp
 
 CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS += \
   CosConcurrencyControl.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.CosConcurrency.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosConcurrency.la
 
 libTAO_CosConcurrency_la_CPPFLAGS = \
@@ -547,7 +562,7 @@ libTAO_CosConcurrency_la_SOURCES = \
   CosConcurrencyControlC.cpp
 
 libTAO_CosConcurrency_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosConcurrency_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -566,9 +581,7 @@ CLEANFILES += \
   TAO_CosConcurrency.pc
 
 TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosConcurrency.pc.in
 
 EXTRA_DIST += \
   TAO_CosConcurrency.pc.in
@@ -576,8 +589,6 @@ EXTRA_DIST += \
 
 ## Makefile.CosConcurrency_Skel.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosConcurrency_Skel.la
 
 libTAO_CosConcurrency_Skel_la_CPPFLAGS = \
@@ -593,7 +604,7 @@ libTAO_CosConcurrency_Skel_la_SOURCES = \
   CosConcurrencyControlS.cpp
 
 libTAO_CosConcurrency_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosConcurrency_Skel_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -614,9 +625,7 @@ CLEANFILES += \
   TAO_CosConcurrency_Skel.pc
 
 TAO_CosConcurrency_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosConcurrency_Skel.pc.in
 
 EXTRA_DIST += \
   TAO_CosConcurrency_Skel.pc.in
@@ -624,8 +633,6 @@ EXTRA_DIST += \
 
 ## Makefile.CosConcurrency_Serv.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosConcurrency_Serv.la
 
 libTAO_CosConcurrency_Serv_la_CPPFLAGS = \
@@ -645,7 +652,7 @@ libTAO_CosConcurrency_Serv_la_SOURCES = \
   Concurrency/Concurrency_Utils.cpp
 
 libTAO_CosConcurrency_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosConcurrency_Serv_la_LIBADD = \
   libTAO_CosConcurrency_Skel.la \
@@ -670,9 +677,7 @@ CLEANFILES += \
   TAO_CosConcurrency_Serv.pc
 
 TAO_CosConcurrency_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosConcurrency_Serv.pc.in
 
 EXTRA_DIST += \
   TAO_CosConcurrency_Serv.pc.in
@@ -680,7 +685,7 @@ EXTRA_DIST += \
 
 ## Makefile.CosEvent_IDL.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   CosTypedEventCommC.cpp \
@@ -690,7 +695,8 @@ BUILT_SOURCES += \
   CosTypedEventCommS.h \
   CosTypedEventCommS.inl \
   CosTypedEventCommS_T.cpp \
-  CosTypedEventCommS_T.h
+  CosTypedEventCommS_T.h \
+  CosTypedEventCommS_T.inl
 
 CLEANFILES += \
   CosTypedEventComm-stamp \
@@ -701,13 +707,14 @@ CLEANFILES += \
   CosTypedEventCommS.h \
   CosTypedEventCommS.inl \
   CosTypedEventCommS_T.cpp \
-  CosTypedEventCommS_T.h
+  CosTypedEventCommS_T.h \
+  CosTypedEventCommS_T.inl
 
-CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommC.inl CosTypedEventCommS.cpp CosTypedEventCommS.h CosTypedEventCommS.inl CosTypedEventCommS_T.cpp CosTypedEventCommS_T.h: CosTypedEventComm-stamp
+CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommC.inl CosTypedEventCommS.cpp CosTypedEventCommS.h CosTypedEventCommS.inl CosTypedEventCommS_T.cpp CosTypedEventCommS_T.h CosTypedEventCommS_T.inl: CosTypedEventComm-stamp
 
 CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl
-	@touch $@
+	@touch "$@"
 
 BUILT_SOURCES += \
   CosTypedEventChannelAdminC.cpp \
@@ -717,7 +724,8 @@ BUILT_SOURCES += \
   CosTypedEventChannelAdminS.h \
   CosTypedEventChannelAdminS.inl \
   CosTypedEventChannelAdminS_T.cpp \
-  CosTypedEventChannelAdminS_T.h
+  CosTypedEventChannelAdminS_T.h \
+  CosTypedEventChannelAdminS_T.inl
 
 CLEANFILES += \
   CosTypedEventChannelAdmin-stamp \
@@ -728,13 +736,14 @@ CLEANFILES += \
   CosTypedEventChannelAdminS.h \
   CosTypedEventChannelAdminS.inl \
   CosTypedEventChannelAdminS_T.cpp \
-  CosTypedEventChannelAdminS_T.h
+  CosTypedEventChannelAdminS_T.h \
+  CosTypedEventChannelAdminS_T.inl
 
-CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminS_T.h: CosTypedEventChannelAdmin-stamp
+CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminS_T.h CosTypedEventChannelAdminS_T.inl: CosTypedEventChannelAdmin-stamp
 
 CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl
-	@touch $@
+	@touch "$@"
 
 BUILT_SOURCES += \
   CosEventCommC.cpp \
@@ -744,7 +753,8 @@ BUILT_SOURCES += \
   CosEventCommS.h \
   CosEventCommS.inl \
   CosEventCommS_T.cpp \
-  CosEventCommS_T.h
+  CosEventCommS_T.h \
+  CosEventCommS_T.inl
 
 CLEANFILES += \
   CosEventComm-stamp \
@@ -755,13 +765,14 @@ CLEANFILES += \
   CosEventCommS.h \
   CosEventCommS.inl \
   CosEventCommS_T.cpp \
-  CosEventCommS_T.h
+  CosEventCommS_T.h \
+  CosEventCommS_T.inl
 
-CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCommS.h CosEventCommS.inl CosEventCommS_T.cpp CosEventCommS_T.h: CosEventComm-stamp
+CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCommS.h CosEventCommS.inl CosEventCommS_T.cpp CosEventCommS_T.h CosEventCommS_T.inl: CosEventComm-stamp
 
 CosEventComm-stamp: $(srcdir)/CosEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   CosEventChannelAdminC.cpp \
@@ -771,7 +782,8 @@ BUILT_SOURCES += \
   CosEventChannelAdminS.h \
   CosEventChannelAdminS.inl \
   CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS_T.h
+  CosEventChannelAdminS_T.h \
+  CosEventChannelAdminS_T.inl
 
 CLEANFILES += \
   CosEventChannelAdmin-stamp \
@@ -782,13 +794,15 @@ CLEANFILES += \
   CosEventChannelAdminS.h \
   CosEventChannelAdminS.inl \
   CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS_T.h
+  CosEventChannelAdminS_T.h \
+  CosEventChannelAdminS_T.inl
 
-CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosEventChannelAdminS.cpp CosEventChannelAdminS.h CosEventChannelAdminS.inl CosEventChannelAdminS_T.cpp CosEventChannelAdminS_T.h: CosEventChannelAdmin-stamp
+CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosEventChannelAdminS.cpp CosEventChannelAdminS.h CosEventChannelAdminS.inl CosEventChannelAdminS_T.cpp CosEventChannelAdminS_T.h CosEventChannelAdminS_T.inl: CosEventChannelAdmin-stamp
 
 CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS += \
   CosEventChannelAdmin.idl \
@@ -796,11 +810,11 @@ nobase_include_HEADERS += \
   CosTypedEventChannelAdmin.idl \
   CosTypedEventComm.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.CosEvent.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_CosEvent.la
 
@@ -821,7 +835,7 @@ libTAO_CosEvent_la_SOURCES = \
   CosTypedEventCommC.cpp
 
 libTAO_CosEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosEvent_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -846,9 +860,9 @@ CLEANFILES += \
   TAO_CosEvent.pc
 
 TAO_CosEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosEvent.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosEvent.rc \
@@ -857,15 +871,15 @@ EXTRA_DIST += \
 
 ## Makefile.Svc_Utils.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   TimeBaseC.cpp \
   TimeBaseC.h \
   TimeBaseC.inl \
   TimeBaseS.cpp \
   TimeBaseS.h \
-  TimeBaseS.inl
+  TimeBaseS.inl \
+  TimeBaseS_T.cpp \
+  TimeBaseS_T.inl
 
 CLEANFILES += \
   TimeBase-stamp \
@@ -874,13 +888,15 @@ CLEANFILES += \
   TimeBaseC.inl \
   TimeBaseS.cpp \
   TimeBaseS.h \
-  TimeBaseS.inl
+  TimeBaseS.inl \
+  TimeBaseS_T.cpp \
+  TimeBaseS_T.inl
 
-TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl: TimeBase-stamp
+TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl TimeBaseS_T.cpp TimeBaseS_T.inl: TimeBase-stamp
 
 TimeBase-stamp: $(srcdir)/TimeBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   RtecBaseC.cpp \
@@ -888,7 +904,9 @@ BUILT_SOURCES += \
   RtecBaseC.inl \
   RtecBaseS.cpp \
   RtecBaseS.h \
-  RtecBaseS.inl
+  RtecBaseS.inl \
+  RtecBaseS_T.cpp \
+  RtecBaseS_T.inl
 
 CLEANFILES += \
   RtecBase-stamp \
@@ -897,13 +915,15 @@ CLEANFILES += \
   RtecBaseC.inl \
   RtecBaseS.cpp \
   RtecBaseS.h \
-  RtecBaseS.inl
+  RtecBaseS.inl \
+  RtecBaseS_T.cpp \
+  RtecBaseS_T.inl
 
-RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl: RtecBase-stamp
+RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl RtecBaseS_T.cpp RtecBaseS_T.inl: RtecBase-stamp
 
 RtecBase-stamp: $(srcdir)/RtecBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_Svc_Utils.la
 
@@ -926,7 +946,7 @@ libTAO_Svc_Utils_la_SOURCES = \
   Time_Utilities.cpp
 
 libTAO_Svc_Utils_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_Svc_Utils_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -941,12 +961,16 @@ nobase_include_HEADERS += \
   RtecBaseC.inl \
   RtecBaseS.h \
   RtecBaseS.inl \
+  RtecBaseS_T.cpp \
+  RtecBaseS_T.inl \
   Shutdown_Utilities.h \
   TimeBase.idl \
   TimeBaseC.h \
   TimeBaseC.inl \
   TimeBaseS.h \
   TimeBaseS.inl \
+  TimeBaseS_T.cpp \
+  TimeBaseS_T.inl \
   Time_Utilities.h \
   Time_Utilities.inl \
   svc_utils_export.h
@@ -958,9 +982,7 @@ CLEANFILES += \
   TAO_Svc_Utils.pc
 
 TAO_Svc_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_Svc_Utils.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_Svc_Utils.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_Svc_Utils.pc.in
 
 EXTRA_DIST += \
   Svc_Utils.rc \
@@ -969,7 +991,7 @@ EXTRA_DIST += \
 
 ## Makefile.CosEvent_Skel.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_CosEvent_Skel.la
 
@@ -990,7 +1012,7 @@ libTAO_CosEvent_Skel_la_SOURCES = \
   CosTypedEventCommS.cpp
 
 libTAO_CosEvent_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosEvent_Skel_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -1005,18 +1027,22 @@ nobase_include_HEADERS += \
   CosEventChannelAdminS.inl \
   CosEventChannelAdminS_T.cpp \
   CosEventChannelAdminS_T.h \
+  CosEventChannelAdminS_T.inl \
   CosEventCommS.h \
   CosEventCommS.inl \
   CosEventCommS_T.cpp \
   CosEventCommS_T.h \
+  CosEventCommS_T.inl \
   CosTypedEventChannelAdminS.h \
   CosTypedEventChannelAdminS.inl \
   CosTypedEventChannelAdminS_T.cpp \
   CosTypedEventChannelAdminS_T.h \
+  CosTypedEventChannelAdminS_T.inl \
   CosTypedEventCommS.h \
   CosTypedEventCommS.inl \
   CosTypedEventCommS_T.cpp \
-  CosTypedEventCommS_T.h
+  CosTypedEventCommS_T.h \
+  CosTypedEventCommS_T.inl
 
 pkgconfig_DATA += \
   TAO_CosEvent_Skel.pc
@@ -1025,9 +1051,9 @@ CLEANFILES += \
   TAO_CosEvent_Skel.pc
 
 TAO_CosEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent_Skel.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosEvent_Skel.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosEvent_Skel.rc \
@@ -1037,7 +1063,7 @@ EXTRA_DIST += \
 ## Makefile.CosEvent_Serv.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_CosEvent_Serv.la
 
@@ -1079,7 +1105,7 @@ libTAO_CosEvent_Serv_la_SOURCES = \
   CosEvent/CEC_TypedSupplierAdmin.cpp
 
 libTAO_CosEvent_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosEvent_Serv_la_LIBADD = \
   libTAO_Svc_Utils.la \
@@ -1151,9 +1177,9 @@ CLEANFILES += \
   TAO_CosEvent_Serv.pc
 
 TAO_CosEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent_Serv.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosEvent_Serv.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -1163,15 +1189,16 @@ EXTRA_DIST += \
 
 ## Makefile.CosLifeCycle.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   CosLifeCycleC.cpp \
   CosLifeCycleC.h \
   CosLifeCycleC.inl \
   CosLifeCycleS.cpp \
   CosLifeCycleS.h \
-  CosLifeCycleS.inl
+  CosLifeCycleS.inl \
+  CosLifeCycleS_T.cpp \
+  CosLifeCycleS_T.h \
+  CosLifeCycleS_T.inl
 
 CLEANFILES += \
   CosLifeCycle-stamp \
@@ -1180,13 +1207,16 @@ CLEANFILES += \
   CosLifeCycleC.inl \
   CosLifeCycleS.cpp \
   CosLifeCycleS.h \
-  CosLifeCycleS.inl
+  CosLifeCycleS.inl \
+  CosLifeCycleS_T.cpp \
+  CosLifeCycleS_T.h \
+  CosLifeCycleS_T.inl
 
-CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCycleS.h CosLifeCycleS.inl: CosLifeCycle-stamp
+CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCycleS.h CosLifeCycleS.inl CosLifeCycleS_T.cpp CosLifeCycleS_T.h CosLifeCycleS_T.inl: CosLifeCycle-stamp
 
 CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   LifeCycleServiceC.cpp \
@@ -1194,7 +1224,10 @@ BUILT_SOURCES += \
   LifeCycleServiceC.inl \
   LifeCycleServiceS.cpp \
   LifeCycleServiceS.h \
-  LifeCycleServiceS.inl
+  LifeCycleServiceS.inl \
+  LifeCycleServiceS_T.cpp \
+  LifeCycleServiceS_T.h \
+  LifeCycleServiceS_T.inl
 
 CLEANFILES += \
   LifeCycleService-stamp \
@@ -1203,13 +1236,16 @@ CLEANFILES += \
   LifeCycleServiceC.inl \
   LifeCycleServiceS.cpp \
   LifeCycleServiceS.h \
-  LifeCycleServiceS.inl
+  LifeCycleServiceS.inl \
+  LifeCycleServiceS_T.cpp \
+  LifeCycleServiceS_T.h \
+  LifeCycleServiceS_T.inl
 
-LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleServiceS.cpp LifeCycleServiceS.h LifeCycleServiceS.inl: LifeCycleService-stamp
+LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleServiceS.cpp LifeCycleServiceS.h LifeCycleServiceS.inl LifeCycleServiceS_T.cpp LifeCycleServiceS_T.h LifeCycleServiceS_T.inl: LifeCycleService-stamp
 
 LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_CosLifeCycle.la
 
@@ -1229,7 +1265,7 @@ libTAO_CosLifeCycle_la_SOURCES = \
   LifeCycleServiceS.cpp
 
 libTAO_CosLifeCycle_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosLifeCycle_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -1244,11 +1280,17 @@ nobase_include_HEADERS += \
   CosLifeCycleC.inl \
   CosLifeCycleS.h \
   CosLifeCycleS.inl \
+  CosLifeCycleS_T.cpp \
+  CosLifeCycleS_T.h \
+  CosLifeCycleS_T.inl \
   LifeCycleService.idl \
   LifeCycleServiceC.h \
   LifeCycleServiceC.inl \
   LifeCycleServiceS.h \
-  LifeCycleServiceS.inl
+  LifeCycleServiceS.inl \
+  LifeCycleServiceS_T.cpp \
+  LifeCycleServiceS_T.h \
+  LifeCycleServiceS_T.inl
 
 pkgconfig_DATA += \
   TAO_CosLifeCycle.pc
@@ -1257,9 +1299,7 @@ CLEANFILES += \
   TAO_CosLifeCycle.pc
 
 TAO_CosLifeCycle.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosLifeCycle.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosLifeCycle.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosLifeCycle.pc.in
 
 EXTRA_DIST += \
   CosLifeCycle.rc \
@@ -1269,7 +1309,7 @@ EXTRA_DIST += \
 ## Makefile.PortableGroup.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   miopC.cpp \
@@ -1277,7 +1317,9 @@ BUILT_SOURCES += \
   miopC.inl \
   miopS.cpp \
   miopS.h \
-  miopS.inl
+  miopS.inl \
+  miopS_T.cpp \
+  miopS_T.inl
 
 CLEANFILES += \
   miop-stamp \
@@ -1286,32 +1328,36 @@ CLEANFILES += \
   miopC.inl \
   miopS.cpp \
   miopS.h \
-  miopS.inl
+  miopS.inl \
+  miopS_T.cpp \
+  miopS_T.inl
 
-miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl: miop-stamp
+miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl miopS_T.cpp miopS_T.inl: miop-stamp
 
 miop-stamp: $(srcdir)/miop.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableGroup_Simple_DSC.cpp \
   PortableGroup_Simple_DSC.h \
   PortableGroup_Simple_DSC.inl \
-  PortableGroup_Simple_DSS.inl
+  PortableGroup_Simple_DSS.inl \
+  PortableGroup_Simple_DSS_T.inl
 
 CLEANFILES += \
   PortableGroup_Simple_DS-stamp \
   PortableGroup_Simple_DSC.cpp \
   PortableGroup_Simple_DSC.h \
   PortableGroup_Simple_DSC.inl \
-  PortableGroup_Simple_DSS.inl
+  PortableGroup_Simple_DSS.inl \
+  PortableGroup_Simple_DSS_T.inl
 
-PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl: PortableGroup_Simple_DS-stamp
+PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl: PortableGroup_Simple_DS-stamp
 
 PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableGroupC.cpp \
@@ -1319,7 +1365,9 @@ BUILT_SOURCES += \
   PortableGroupC.inl \
   PortableGroupS.cpp \
   PortableGroupS.h \
-  PortableGroupS.inl
+  PortableGroupS.inl \
+  PortableGroupS_T.cpp \
+  PortableGroupS_T.inl
 
 CLEANFILES += \
   PortableGroup-stamp \
@@ -1328,13 +1376,15 @@ CLEANFILES += \
   PortableGroupC.inl \
   PortableGroupS.cpp \
   PortableGroupS.h \
-  PortableGroupS.inl
+  PortableGroupS.inl \
+  PortableGroupS_T.cpp \
+  PortableGroupS_T.inl
 
-PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp PortableGroupS.h PortableGroupS.inl: PortableGroup-stamp
+PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp PortableGroupS.h PortableGroupS.inl PortableGroupS_T.cpp PortableGroupS_T.inl: PortableGroup-stamp
 
 PortableGroup-stamp: $(srcdir)/PortableGroup.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_PortableGroup.la
 
@@ -1392,7 +1442,7 @@ libTAO_PortableGroup_la_SOURCES = \
   miopS.cpp
 
 libTAO_PortableGroup_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_PortableGroup_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -1455,15 +1505,20 @@ nobase_include_HEADERS += \
   PortableGroupC.inl \
   PortableGroupS.h \
   PortableGroupS.inl \
+  PortableGroupS_T.cpp \
+  PortableGroupS_T.inl \
   PortableGroup_Simple_DS.idl \
   PortableGroup_Simple_DSC.h \
   PortableGroup_Simple_DSC.inl \
   PortableGroup_Simple_DSS.inl \
+  PortableGroup_Simple_DSS_T.inl \
   miop.idl \
   miopC.h \
   miopC.inl \
   miopS.h \
-  miopS.inl
+  miopS.inl \
+  miopS_T.cpp \
+  miopS_T.inl
 
 pkgconfig_DATA += \
   TAO_PortableGroup.pc
@@ -1472,9 +1527,9 @@ CLEANFILES += \
   TAO_PortableGroup.pc
 
 TAO_PortableGroup.pc: ${top_builddir}/config.status ${srcdir}/TAO_PortableGroup.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_PortableGroup.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_PortableGroup.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -1486,7 +1541,7 @@ EXTRA_DIST += \
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   CosLoadBalancingC.cpp \
@@ -1494,7 +1549,10 @@ BUILT_SOURCES += \
   CosLoadBalancingC.inl \
   CosLoadBalancingS.cpp \
   CosLoadBalancingS.h \
-  CosLoadBalancingS.inl
+  CosLoadBalancingS.inl \
+  CosLoadBalancingS_T.cpp \
+  CosLoadBalancingS_T.h \
+  CosLoadBalancingS_T.inl
 
 CLEANFILES += \
   CosLoadBalancing-stamp \
@@ -1503,20 +1561,25 @@ CLEANFILES += \
   CosLoadBalancingC.inl \
   CosLoadBalancingS.cpp \
   CosLoadBalancingS.h \
-  CosLoadBalancingS.inl
+  CosLoadBalancingS.inl \
+  CosLoadBalancingS_T.cpp \
+  CosLoadBalancingS_T.h \
+  CosLoadBalancingS_T.inl
 
-CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancingS.cpp CosLoadBalancingS.h CosLoadBalancingS.inl: CosLoadBalancing-stamp
+CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancingS.cpp CosLoadBalancingS.h CosLoadBalancingS.inl CosLoadBalancingS_T.cpp CosLoadBalancingS_T.h CosLoadBalancingS_T.inl: CosLoadBalancing-stamp
 
 CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   LB_ORTC.cpp \
   LB_ORTC.h \
   LB_ORTC.inl \
   LB_ORTS.h \
-  LB_ORTS.inl
+  LB_ORTS.inl \
+  LB_ORTS_T.h \
+  LB_ORTS_T.inl
 
 CLEANFILES += \
   LB_ORT-stamp \
@@ -1524,13 +1587,15 @@ CLEANFILES += \
   LB_ORTC.h \
   LB_ORTC.inl \
   LB_ORTS.h \
-  LB_ORTS.inl
+  LB_ORTS.inl \
+  LB_ORTS_T.h \
+  LB_ORTS_T.inl
 
-LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl: LB_ORT-stamp
+LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl LB_ORTS_T.h LB_ORTS_T.inl: LB_ORT-stamp
 
 LB_ORT-stamp: $(srcdir)/LB_ORT.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_CosLoadBalancing.la
 
@@ -1570,7 +1635,7 @@ libTAO_CosLoadBalancing_la_SOURCES = \
   LoadBalancing/LB_ServerRequestInterceptor.cpp
 
 libTAO_CosLoadBalancing_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosLoadBalancing_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
@@ -1594,11 +1659,16 @@ nobase_include_HEADERS += \
   CosLoadBalancingC.inl \
   CosLoadBalancingS.h \
   CosLoadBalancingS.inl \
+  CosLoadBalancingS_T.cpp \
+  CosLoadBalancingS_T.h \
+  CosLoadBalancingS_T.inl \
   LB_ORT.idl \
   LB_ORTC.h \
   LB_ORTC.inl \
   LB_ORTS.h \
   LB_ORTS.inl \
+  LB_ORTS_T.h \
+  LB_ORTS_T.inl \
   LoadBalancing/LB_CPU_Load_Average_Monitor.h \
   LoadBalancing/LB_CPU_Utilization_Monitor.h \
   LoadBalancing/LB_ClientComponent.h \
@@ -1632,9 +1702,9 @@ CLEANFILES += \
   TAO_CosLoadBalancing.pc
 
 TAO_CosLoadBalancing.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosLoadBalancing.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosLoadBalancing.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosLoadBalancing.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -1645,8 +1715,6 @@ EXTRA_DIST += \
 
 ## Makefile.CosNaming_Skel.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosNaming_Skel.la
 
 libTAO_CosNaming_Skel_la_CPPFLAGS = \
@@ -1662,7 +1730,7 @@ libTAO_CosNaming_Skel_la_SOURCES = \
   CosNamingS.cpp
 
 libTAO_CosNaming_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosNaming_Skel_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -1674,6 +1742,9 @@ libTAO_CosNaming_Skel_la_LIBADD = \
 nobase_include_HEADERS += \
   CosNamingS.h \
   CosNamingS.inl \
+  CosNamingS_T.cpp \
+  CosNamingS_T.h \
+  CosNamingS_T.inl \
   Naming/naming_skel_export.h
 
 pkgconfig_DATA += \
@@ -1683,9 +1754,7 @@ CLEANFILES += \
   TAO_CosNaming_Skel.pc
 
 TAO_CosNaming_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming_Skel.pc.in
 
 EXTRA_DIST += \
   CosNaming_Skel.rc \
@@ -1694,7 +1763,6 @@ EXTRA_DIST += \
 
 ## Makefile.CosNaming_Serv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_CosNaming_Serv.la
@@ -1724,7 +1792,7 @@ libTAO_CosNaming_Serv_la_SOURCES = \
   Naming/Transient_Naming_Context.cpp
 
 libTAO_CosNaming_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosNaming_Serv_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
@@ -1765,10 +1833,9 @@ CLEANFILES += \
   TAO_CosNaming_Serv.pc
 
 TAO_CosNaming_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Serv.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming_Serv.pc.in
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 EXTRA_DIST += \
   CosNaming_Serv.rc \
@@ -1777,7 +1844,7 @@ EXTRA_DIST += \
 
 ## Makefile.CosNotification_IDL.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   CosNotificationC.cpp \
@@ -1785,7 +1852,10 @@ BUILT_SOURCES += \
   CosNotificationC.inl \
   CosNotificationS.cpp \
   CosNotificationS.h \
-  CosNotificationS.inl
+  CosNotificationS.inl \
+  CosNotificationS_T.cpp \
+  CosNotificationS_T.h \
+  CosNotificationS_T.inl
 
 CLEANFILES += \
   CosNotification-stamp \
@@ -1794,13 +1864,16 @@ CLEANFILES += \
   CosNotificationC.inl \
   CosNotificationS.cpp \
   CosNotificationS.h \
-  CosNotificationS.inl
+  CosNotificationS.inl \
+  CosNotificationS_T.cpp \
+  CosNotificationS_T.h \
+  CosNotificationS_T.inl
 
-CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cpp CosNotificationS.h CosNotificationS.inl: CosNotification-stamp
+CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cpp CosNotificationS.h CosNotificationS.inl CosNotificationS_T.cpp CosNotificationS_T.h CosNotificationS_T.inl: CosNotification-stamp
 
 CosNotification-stamp: $(srcdir)/CosNotification.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   CosNotifyCommC.cpp \
@@ -1808,7 +1881,10 @@ BUILT_SOURCES += \
   CosNotifyCommC.inl \
   CosNotifyCommS.cpp \
   CosNotifyCommS.h \
-  CosNotifyCommS.inl
+  CosNotifyCommS.inl \
+  CosNotifyCommS_T.cpp \
+  CosNotifyCommS_T.h \
+  CosNotifyCommS_T.inl
 
 CLEANFILES += \
   CosNotifyComm-stamp \
@@ -1817,13 +1893,16 @@ CLEANFILES += \
   CosNotifyCommC.inl \
   CosNotifyCommS.cpp \
   CosNotifyCommS.h \
-  CosNotifyCommS.inl
+  CosNotifyCommS.inl \
+  CosNotifyCommS_T.cpp \
+  CosNotifyCommS_T.h \
+  CosNotifyCommS_T.inl
 
-CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNotifyCommS.h CosNotifyCommS.inl: CosNotifyComm-stamp
+CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNotifyCommS.h CosNotifyCommS.inl CosNotifyCommS_T.cpp CosNotifyCommS_T.h CosNotifyCommS_T.inl: CosNotifyComm-stamp
 
 CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   CosNotifyFilterC.cpp \
@@ -1831,7 +1910,10 @@ BUILT_SOURCES += \
   CosNotifyFilterC.inl \
   CosNotifyFilterS.cpp \
   CosNotifyFilterS.h \
-  CosNotifyFilterS.inl
+  CosNotifyFilterS.inl \
+  CosNotifyFilterS_T.cpp \
+  CosNotifyFilterS_T.h \
+  CosNotifyFilterS_T.inl
 
 CLEANFILES += \
   CosNotifyFilter-stamp \
@@ -1840,13 +1922,16 @@ CLEANFILES += \
   CosNotifyFilterC.inl \
   CosNotifyFilterS.cpp \
   CosNotifyFilterS.h \
-  CosNotifyFilterS.inl
+  CosNotifyFilterS.inl \
+  CosNotifyFilterS_T.cpp \
+  CosNotifyFilterS_T.h \
+  CosNotifyFilterS_T.inl
 
-CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cpp CosNotifyFilterS.h CosNotifyFilterS.inl: CosNotifyFilter-stamp
+CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cpp CosNotifyFilterS.h CosNotifyFilterS.inl CosNotifyFilterS_T.cpp CosNotifyFilterS_T.h CosNotifyFilterS_T.inl: CosNotifyFilter-stamp
 
 CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   CosNotifyChannelAdminC.cpp \
@@ -1854,7 +1939,10 @@ BUILT_SOURCES += \
   CosNotifyChannelAdminC.inl \
   CosNotifyChannelAdminS.cpp \
   CosNotifyChannelAdminS.h \
-  CosNotifyChannelAdminS.inl
+  CosNotifyChannelAdminS.inl \
+  CosNotifyChannelAdminS_T.cpp \
+  CosNotifyChannelAdminS_T.h \
+  CosNotifyChannelAdminS_T.inl
 
 CLEANFILES += \
   CosNotifyChannelAdmin-stamp \
@@ -1863,13 +1951,16 @@ CLEANFILES += \
   CosNotifyChannelAdminC.inl \
   CosNotifyChannelAdminS.cpp \
   CosNotifyChannelAdminS.h \
-  CosNotifyChannelAdminS.inl
+  CosNotifyChannelAdminS.inl \
+  CosNotifyChannelAdminS_T.cpp \
+  CosNotifyChannelAdminS_T.h \
+  CosNotifyChannelAdminS_T.inl
 
-CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.cpp CosNotifyChannelAdminS.h CosNotifyChannelAdminS.inl: CosNotifyChannelAdmin-stamp
+CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.cpp CosNotifyChannelAdminS.h CosNotifyChannelAdminS.inl CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminS_T.h CosNotifyChannelAdminS_T.inl: CosNotifyChannelAdmin-stamp
 
 CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   NotifyExtC.cpp \
@@ -1877,7 +1968,10 @@ BUILT_SOURCES += \
   NotifyExtC.inl \
   NotifyExtS.cpp \
   NotifyExtS.h \
-  NotifyExtS.inl
+  NotifyExtS.inl \
+  NotifyExtS_T.cpp \
+  NotifyExtS_T.h \
+  NotifyExtS_T.inl
 
 CLEANFILES += \
   NotifyExt-stamp \
@@ -1886,13 +1980,16 @@ CLEANFILES += \
   NotifyExtC.inl \
   NotifyExtS.cpp \
   NotifyExtS.h \
-  NotifyExtS.inl
+  NotifyExtS.inl \
+  NotifyExtS_T.cpp \
+  NotifyExtS_T.h \
+  NotifyExtS_T.inl
 
-NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExtS.inl: NotifyExt-stamp
+NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExtS.inl NotifyExtS_T.cpp NotifyExtS_T.h NotifyExtS_T.inl: NotifyExt-stamp
 
 NotifyExt-stamp: $(srcdir)/NotifyExt.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   Event_ForwarderC.cpp \
@@ -1900,7 +1997,10 @@ BUILT_SOURCES += \
   Event_ForwarderC.inl \
   Event_ForwarderS.cpp \
   Event_ForwarderS.h \
-  Event_ForwarderS.inl
+  Event_ForwarderS.inl \
+  Event_ForwarderS_T.cpp \
+  Event_ForwarderS_T.h \
+  Event_ForwarderS_T.inl
 
 CLEANFILES += \
   Event_Forwarder-stamp \
@@ -1909,13 +2009,17 @@ CLEANFILES += \
   Event_ForwarderC.inl \
   Event_ForwarderS.cpp \
   Event_ForwarderS.h \
-  Event_ForwarderS.inl
+  Event_ForwarderS.inl \
+  Event_ForwarderS_T.cpp \
+  Event_ForwarderS_T.h \
+  Event_ForwarderS_T.inl
 
-Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cpp Event_ForwarderS.h Event_ForwarderS.inl: Event_Forwarder-stamp
+Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cpp Event_ForwarderS.h Event_ForwarderS.inl Event_ForwarderS_T.cpp Event_ForwarderS_T.h Event_ForwarderS_T.inl: Event_Forwarder-stamp
 
 Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS += \
   CosNotification.idl \
@@ -1925,11 +2029,11 @@ nobase_include_HEADERS += \
   Event_Forwarder.idl \
   NotifyExt.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.CosNotification.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_CosNotification.la
 
@@ -1953,7 +2057,7 @@ libTAO_CosNotification_la_SOURCES = \
   NotifyExtC.cpp
 
 libTAO_CosNotification_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosNotification_la_LIBADD = \
   libTAO_CosEvent.la \
@@ -1984,9 +2088,9 @@ CLEANFILES += \
   TAO_CosNotification.pc
 
 TAO_CosNotification.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNotification.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosNotification.rc \
@@ -1995,8 +2099,6 @@ EXTRA_DIST += \
 
 ## Makefile.ETCL.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_ETCL.la
 
 libTAO_ETCL_la_CPPFLAGS = \
@@ -2015,7 +2117,7 @@ libTAO_ETCL_la_SOURCES = \
   ETCL/ETCL_y.cpp
 
 libTAO_ETCL_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_ETCL_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -2037,9 +2139,7 @@ CLEANFILES += \
   TAO_ETCL.pc
 
 TAO_ETCL.pc: ${top_builddir}/config.status ${srcdir}/TAO_ETCL.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_ETCL.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_ETCL.pc.in
 
 EXTRA_DIST += \
   ETCL.rc \
@@ -2048,7 +2148,7 @@ EXTRA_DIST += \
 
 ## Makefile.CosNotification_Skel.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_CosNotification_Skel.la
 
@@ -2071,7 +2171,7 @@ libTAO_CosNotification_Skel_la_SOURCES = \
   NotifyExtS.cpp
 
 libTAO_CosNotification_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosNotification_Skel_la_LIBADD = \
   libTAO_CosEvent_Skel.la \
@@ -2085,17 +2185,35 @@ libTAO_CosNotification_Skel_la_LIBADD = \
 nobase_include_HEADERS += \
   CosNotificationS.h \
   CosNotificationS.inl \
+  CosNotificationS_T.cpp \
+  CosNotificationS_T.h \
+  CosNotificationS_T.inl \
   CosNotifyChannelAdminS.h \
   CosNotifyChannelAdminS.inl \
+  CosNotifyChannelAdminS_T.cpp \
+  CosNotifyChannelAdminS_T.h \
+  CosNotifyChannelAdminS_T.inl \
   CosNotifyCommS.h \
   CosNotifyCommS.inl \
+  CosNotifyCommS_T.cpp \
+  CosNotifyCommS_T.h \
+  CosNotifyCommS_T.inl \
   CosNotifyFilterS.h \
   CosNotifyFilterS.inl \
+  CosNotifyFilterS_T.cpp \
+  CosNotifyFilterS_T.h \
+  CosNotifyFilterS_T.inl \
   Event_ForwarderS.h \
   Event_ForwarderS.inl \
+  Event_ForwarderS_T.cpp \
+  Event_ForwarderS_T.h \
+  Event_ForwarderS_T.inl \
   Notify/notify_skel_export.h \
   NotifyExtS.h \
-  NotifyExtS.inl
+  NotifyExtS.inl \
+  NotifyExtS_T.cpp \
+  NotifyExtS_T.h \
+  NotifyExtS_T.inl
 
 pkgconfig_DATA += \
   TAO_CosNotification_Skel.pc
@@ -2104,9 +2222,9 @@ CLEANFILES += \
   TAO_CosNotification_Skel.pc
 
 TAO_CosNotification_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification_Skel.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNotification_Skel.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosNotification_Skel.rc \
@@ -2115,7 +2233,7 @@ EXTRA_DIST += \
 
 ## Makefile.CosNotification_Serv.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_CosNotification_Serv.la
 
@@ -2214,12 +2332,11 @@ libTAO_CosNotification_Serv_la_SOURCES = \
   Notify/Worker_Task.cpp
 
 libTAO_CosNotification_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosNotification_Serv_la_LIBADD = \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   libTAO_CosNotification_Skel.la \
   libTAO_CosEvent_Skel.la \
   libTAO_CosNotification.la \
@@ -2346,9 +2463,9 @@ CLEANFILES += \
   TAO_CosNotification_Serv.pc
 
 TAO_CosNotification_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification_Serv.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNotification_Serv.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosNotification_Serv.rc \
@@ -2358,8 +2475,8 @@ EXTRA_DIST += \
 ## Makefile.CosNotification_Persist.am
 
 if BUILD_ACEXML
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_CosNotification_Persist.la
 
@@ -2374,36 +2491,19 @@ libTAO_CosNotification_Persist_la_CPPFLAGS = \
   -DTAO_HAS_TYPED_EVENT_CHANNEL \
   -DTAO_NOTIFY_PERSIST_BUILD_DLL
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_CosNotification_Persist_la_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 libTAO_CosNotification_Persist_la_SOURCES = \
   Notify/XML_Loader.cpp \
   Notify/XML_Saver.cpp \
   Notify/XML_Topology_Factory.cpp
 
 libTAO_CosNotification_Persist_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_CosNotification_Persist_la_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosNotification_Persist_la_LIBADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   libTAO_ETCL.la \
   libTAO_CosNotification_Skel.la \
   libTAO_CosEvent_Skel.la \
@@ -2415,35 +2515,26 @@ libTAO_CosNotification_Persist_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_CosNotification_Persist_la_LIBADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
 nobase_include_HEADERS += \
   Notify/XML_Loader.h \
   Notify/XML_Saver.h \
   Notify/XML_Topology_Factory.h \
   Notify/notify_persist_export.h
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_ACEXML
 
 ## Makefile.CosTime.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   TimeServiceC.cpp \
   TimeServiceC.h \
   TimeServiceC.inl \
   TimeServiceS.cpp \
   TimeServiceS.h \
-  TimeServiceS.inl
+  TimeServiceS.inl \
+  TimeServiceS_T.cpp
 
 CLEANFILES += \
   TimeService-stamp \
@@ -2452,13 +2543,14 @@ CLEANFILES += \
   TimeServiceC.inl \
   TimeServiceS.cpp \
   TimeServiceS.h \
-  TimeServiceS.inl
+  TimeServiceS.inl \
+  TimeServiceS_T.cpp
 
-TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS.inl: TimeService-stamp
+TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS.inl TimeServiceS_T.cpp: TimeService-stamp
 
 TimeService-stamp: $(srcdir)/TimeService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_CosTime.la
 
@@ -2481,7 +2573,7 @@ libTAO_CosTime_la_SOURCES = \
   TimeServiceS.cpp
 
 libTAO_CosTime_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosTime_la_LIBADD = \
   libTAO_Svc_Utils.la \
@@ -2501,7 +2593,8 @@ nobase_include_HEADERS += \
   TimeServiceC.h \
   TimeServiceC.inl \
   TimeServiceS.h \
-  TimeServiceS.inl
+  TimeServiceS.inl \
+  TimeServiceS_T.cpp
 
 pkgconfig_DATA += \
   TAO_CosTime.pc
@@ -2510,9 +2603,7 @@ CLEANFILES += \
   TAO_CosTime.pc
 
 TAO_CosTime.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTime.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTime.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTime.pc.in
 
 EXTRA_DIST += \
   CosTime.rc \
@@ -2521,15 +2612,16 @@ EXTRA_DIST += \
 
 ## Makefile.CosTrading_IDL.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   CosTradingC.cpp \
   CosTradingC.h \
   CosTradingC.inl \
   CosTradingS.cpp \
   CosTradingS.h \
-  CosTradingS.inl
+  CosTradingS.inl \
+  CosTradingS_T.cpp \
+  CosTradingS_T.h \
+  CosTradingS_T.inl
 
 CLEANFILES += \
   CosTrading-stamp \
@@ -2538,13 +2630,16 @@ CLEANFILES += \
   CosTradingC.inl \
   CosTradingS.cpp \
   CosTradingS.h \
-  CosTradingS.inl
+  CosTradingS.inl \
+  CosTradingS_T.cpp \
+  CosTradingS_T.h \
+  CosTradingS_T.inl
 
-CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosTradingS.inl: CosTrading-stamp
+CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosTradingS.inl CosTradingS_T.cpp CosTradingS_T.h CosTradingS_T.inl: CosTrading-stamp
 
 CosTrading-stamp: $(srcdir)/CosTrading.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   CosTradingReposC.cpp \
@@ -2552,7 +2647,10 @@ BUILT_SOURCES += \
   CosTradingReposC.inl \
   CosTradingReposS.cpp \
   CosTradingReposS.h \
-  CosTradingReposS.inl
+  CosTradingReposS.inl \
+  CosTradingReposS_T.cpp \
+  CosTradingReposS_T.h \
+  CosTradingReposS_T.inl
 
 CLEANFILES += \
   CosTradingRepos-stamp \
@@ -2561,13 +2659,16 @@ CLEANFILES += \
   CosTradingReposC.inl \
   CosTradingReposS.cpp \
   CosTradingReposS.h \
-  CosTradingReposS.inl
+  CosTradingReposS.inl \
+  CosTradingReposS_T.cpp \
+  CosTradingReposS_T.h \
+  CosTradingReposS_T.inl
 
-CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cpp CosTradingReposS.h CosTradingReposS.inl: CosTradingRepos-stamp
+CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cpp CosTradingReposS.h CosTradingReposS.inl CosTradingReposS_T.cpp CosTradingReposS_T.h CosTradingReposS_T.inl: CosTradingRepos-stamp
 
 CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   CosTradingDynamicC.cpp \
@@ -2575,7 +2676,10 @@ BUILT_SOURCES += \
   CosTradingDynamicC.inl \
   CosTradingDynamicS.cpp \
   CosTradingDynamicS.h \
-  CosTradingDynamicS.inl
+  CosTradingDynamicS.inl \
+  CosTradingDynamicS_T.cpp \
+  CosTradingDynamicS_T.h \
+  CosTradingDynamicS_T.inl
 
 CLEANFILES += \
   CosTradingDynamic-stamp \
@@ -2584,25 +2688,25 @@ CLEANFILES += \
   CosTradingDynamicC.inl \
   CosTradingDynamicS.cpp \
   CosTradingDynamicS.h \
-  CosTradingDynamicS.inl
+  CosTradingDynamicS.inl \
+  CosTradingDynamicS_T.cpp \
+  CosTradingDynamicS_T.h \
+  CosTradingDynamicS_T.inl
 
-CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDynamicS.cpp CosTradingDynamicS.h CosTradingDynamicS.inl: CosTradingDynamic-stamp
+CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDynamicS.cpp CosTradingDynamicS.h CosTradingDynamicS.inl CosTradingDynamicS_T.cpp CosTradingDynamicS_T.h CosTradingDynamicS_T.inl: CosTradingDynamic-stamp
 
 CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS += \
   CosTrading.idl \
   CosTradingDynamic.idl \
   CosTradingRepos.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.CosTrading.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosTrading.la
 
 libTAO_CosTrading_la_CPPFLAGS = \
@@ -2620,7 +2724,7 @@ libTAO_CosTrading_la_SOURCES = \
   CosTradingReposC.cpp
 
 libTAO_CosTrading_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosTrading_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -2643,9 +2747,7 @@ CLEANFILES += \
   TAO_CosTrading.pc
 
 TAO_CosTrading.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTrading.pc.in
 
 EXTRA_DIST += \
   CosTrading.rc \
@@ -2654,8 +2756,6 @@ EXTRA_DIST += \
 
 ## Makefile.CosTrading_Skel.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosTrading_Skel.la
 
 libTAO_CosTrading_Skel_la_CPPFLAGS = \
@@ -2673,7 +2773,7 @@ libTAO_CosTrading_Skel_la_SOURCES = \
   CosTradingS.cpp
 
 libTAO_CosTrading_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosTrading_Skel_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -2685,10 +2785,19 @@ libTAO_CosTrading_Skel_la_LIBADD = \
 nobase_include_HEADERS += \
   CosTradingDynamicS.h \
   CosTradingDynamicS.inl \
+  CosTradingDynamicS_T.cpp \
+  CosTradingDynamicS_T.h \
+  CosTradingDynamicS_T.inl \
   CosTradingReposS.h \
   CosTradingReposS.inl \
+  CosTradingReposS_T.cpp \
+  CosTradingReposS_T.h \
+  CosTradingReposS_T.inl \
   CosTradingS.h \
   CosTradingS.inl \
+  CosTradingS_T.cpp \
+  CosTradingS_T.h \
+  CosTradingS_T.inl \
   Trader/trading_skel_export.h
 
 pkgconfig_DATA += \
@@ -2698,9 +2807,7 @@ CLEANFILES += \
   TAO_CosTrading_Skel.pc
 
 TAO_CosTrading_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTrading_Skel.pc.in
 
 EXTRA_DIST += \
   CosTrading_Skel.rc \
@@ -2709,8 +2816,6 @@ EXTRA_DIST += \
 
 ## Makefile.CosTrading_Serv.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_CosTrading_Serv.la
 
 libTAO_CosTrading_Serv_la_CPPFLAGS = \
@@ -2740,7 +2845,7 @@ libTAO_CosTrading_Serv_la_SOURCES = \
   Trader/Trading_Loader.cpp
 
 libTAO_CosTrading_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CosTrading_Serv_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
@@ -2749,7 +2854,6 @@ libTAO_CosTrading_Serv_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   libTAO_CosTrading_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   libTAO_CosTrading.la \
@@ -2783,9 +2887,7 @@ CLEANFILES += \
   TAO_CosTrading_Serv.pc
 
 TAO_CosTrading_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTrading_Serv.pc.in
 
 EXTRA_DIST += \
   CosTrading_Serv.rc \
@@ -2794,15 +2896,16 @@ EXTRA_DIST += \
 
 ## Makefile.DsLogAdmin_IDL.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   DsLogAdminC.cpp \
   DsLogAdminC.h \
   DsLogAdminC.inl \
   DsLogAdminS.cpp \
   DsLogAdminS.h \
-  DsLogAdminS.inl
+  DsLogAdminS.inl \
+  DsLogAdminS_T.cpp \
+  DsLogAdminS_T.h \
+  DsLogAdminS_T.inl
 
 CLEANFILES += \
   DsLogAdmin-stamp \
@@ -2811,13 +2914,16 @@ CLEANFILES += \
   DsLogAdminC.inl \
   DsLogAdminS.cpp \
   DsLogAdminS.h \
-  DsLogAdminS.inl
+  DsLogAdminS.inl \
+  DsLogAdminS_T.cpp \
+  DsLogAdminS_T.h \
+  DsLogAdminS_T.inl
 
-DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLogAdminS.inl: DsLogAdmin-stamp
+DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLogAdminS.inl DsLogAdminS_T.cpp DsLogAdminS_T.h DsLogAdminS_T.inl: DsLogAdmin-stamp
 
 DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   DsLogNotificationC.cpp \
@@ -2825,7 +2931,10 @@ BUILT_SOURCES += \
   DsLogNotificationC.inl \
   DsLogNotificationS.cpp \
   DsLogNotificationS.h \
-  DsLogNotificationS.inl
+  DsLogNotificationS.inl \
+  DsLogNotificationS_T.cpp \
+  DsLogNotificationS_T.h \
+  DsLogNotificationS_T.inl
 
 CLEANFILES += \
   DsLogNotification-stamp \
@@ -2834,24 +2943,24 @@ CLEANFILES += \
   DsLogNotificationC.inl \
   DsLogNotificationS.cpp \
   DsLogNotificationS.h \
-  DsLogNotificationS.inl
+  DsLogNotificationS.inl \
+  DsLogNotificationS_T.cpp \
+  DsLogNotificationS_T.h \
+  DsLogNotificationS_T.inl
 
-DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotificationS.cpp DsLogNotificationS.h DsLogNotificationS.inl: DsLogNotification-stamp
+DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotificationS.cpp DsLogNotificationS.h DsLogNotificationS.inl DsLogNotificationS_T.cpp DsLogNotificationS_T.h DsLogNotificationS_T.inl: DsLogNotification-stamp
 
 DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS += \
   DsLogAdmin.idl \
   DsLogNotification.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.DsLogAdmin.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_DsLogAdmin.la
 
 libTAO_DsLogAdmin_la_CPPFLAGS = \
@@ -2868,7 +2977,7 @@ libTAO_DsLogAdmin_la_SOURCES = \
   DsLogNotificationC.cpp
 
 libTAO_DsLogAdmin_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DsLogAdmin_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -2889,9 +2998,7 @@ CLEANFILES += \
   TAO_DsLogAdmin.pc
 
 TAO_DsLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsLogAdmin.pc.in
 
 EXTRA_DIST += \
   DsLogAdmin.rc \
@@ -2900,7 +3007,7 @@ EXTRA_DIST += \
 
 ## Makefile.DsEventLogAdmin_IDL.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   DsEventLogAdminC.cpp \
@@ -2908,7 +3015,10 @@ BUILT_SOURCES += \
   DsEventLogAdminC.inl \
   DsEventLogAdminS.cpp \
   DsEventLogAdminS.h \
-  DsEventLogAdminS.inl
+  DsEventLogAdminS.inl \
+  DsEventLogAdminS_T.cpp \
+  DsEventLogAdminS_T.h \
+  DsEventLogAdminS_T.inl
 
 CLEANFILES += \
   DsEventLogAdmin-stamp \
@@ -2917,22 +3027,26 @@ CLEANFILES += \
   DsEventLogAdminC.inl \
   DsEventLogAdminS.cpp \
   DsEventLogAdminS.h \
-  DsEventLogAdminS.inl
+  DsEventLogAdminS.inl \
+  DsEventLogAdminS_T.cpp \
+  DsEventLogAdminS_T.h \
+  DsEventLogAdminS_T.inl
 
-DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cpp DsEventLogAdminS.h DsEventLogAdminS.inl: DsEventLogAdmin-stamp
+DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cpp DsEventLogAdminS.h DsEventLogAdminS.inl DsEventLogAdminS_T.cpp DsEventLogAdminS_T.h DsEventLogAdminS_T.inl: DsEventLogAdmin-stamp
 
 DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS += \
   DsEventLogAdmin.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.DsEventLogAdmin.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_DsEventLogAdmin.la
 
@@ -2950,7 +3064,7 @@ libTAO_DsEventLogAdmin_la_SOURCES = \
   DsEventLogAdminC.cpp
 
 libTAO_DsEventLogAdmin_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DsEventLogAdmin_la_LIBADD = \
   libTAO_CosEvent.la \
@@ -2971,9 +3085,9 @@ CLEANFILES += \
   TAO_DsEventLogAdmin.pc
 
 TAO_DsEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsEventLogAdmin.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   DsEventLogAdmin.rc \
@@ -2982,8 +3096,6 @@ EXTRA_DIST += \
 
 ## Makefile.DsLogAdmin_Skel.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_DsLogAdmin_Skel.la
 
 libTAO_DsLogAdmin_Skel_la_CPPFLAGS = \
@@ -3000,7 +3112,7 @@ libTAO_DsLogAdmin_Skel_la_SOURCES = \
   DsLogNotificationS.cpp
 
 libTAO_DsLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DsLogAdmin_Skel_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -3012,8 +3124,14 @@ libTAO_DsLogAdmin_Skel_la_LIBADD = \
 nobase_include_HEADERS += \
   DsLogAdminS.h \
   DsLogAdminS.inl \
+  DsLogAdminS_T.cpp \
+  DsLogAdminS_T.h \
+  DsLogAdminS_T.inl \
   DsLogNotificationS.h \
   DsLogNotificationS.inl \
+  DsLogNotificationS_T.cpp \
+  DsLogNotificationS_T.h \
+  DsLogNotificationS_T.inl \
   Log/log_skel_export.h
 
 pkgconfig_DATA += \
@@ -3023,9 +3141,7 @@ CLEANFILES += \
   TAO_DsLogAdmin_Skel.pc
 
 TAO_DsLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsLogAdmin_Skel.pc.in
 
 EXTRA_DIST += \
   TAO_DsLogAdmin_Skel.pc.in
@@ -3033,8 +3149,6 @@ EXTRA_DIST += \
 
 ## Makefile.DsLogAdmin_Serv.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_DsLogAdmin_Serv.la
 
 libTAO_DsLogAdmin_Serv_la_CPPFLAGS = \
@@ -3065,7 +3179,7 @@ libTAO_DsLogAdmin_Serv_la_SOURCES = \
   Log/Log_i.cpp
 
 libTAO_DsLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DsLogAdmin_Serv_la_LIBADD = \
   libTAO_Svc_Utils.la \
@@ -3074,7 +3188,6 @@ libTAO_DsLogAdmin_Serv_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   libTAO_DsLogAdmin_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   libTAO_DsLogAdmin.la \
@@ -3110,9 +3223,7 @@ CLEANFILES += \
   TAO_DsLogAdmin_Serv.pc
 
 TAO_DsLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsLogAdmin_Serv.pc.in
 
 EXTRA_DIST += \
   TAO_DsLogAdmin_Serv.pc.in
@@ -3120,7 +3231,7 @@ EXTRA_DIST += \
 
 ## Makefile.DsEventLogAdmin_Skel.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Skel.la
 
@@ -3138,7 +3249,7 @@ libTAO_DsEventLogAdmin_Skel_la_SOURCES = \
   DsEventLogAdminS.cpp
 
 libTAO_DsEventLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DsEventLogAdmin_Skel_la_LIBADD = \
   libTAO_CosEvent_Skel.la \
@@ -3154,6 +3265,9 @@ libTAO_DsEventLogAdmin_Skel_la_LIBADD = \
 nobase_include_HEADERS += \
   DsEventLogAdminS.h \
   DsEventLogAdminS.inl \
+  DsEventLogAdminS_T.cpp \
+  DsEventLogAdminS_T.h \
+  DsEventLogAdminS_T.inl \
   Log/eventlog_skel_export.h
 
 pkgconfig_DATA += \
@@ -3163,9 +3277,9 @@ CLEANFILES += \
   TAO_DsEventLogAdmin_Skel.pc
 
 TAO_DsEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   TAO_DsEventLogAdmin_Skel.pc.in
@@ -3174,7 +3288,7 @@ EXTRA_DIST += \
 ## Makefile.DsEventLogAdmin_Serv.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Serv.la
 
@@ -3195,7 +3309,7 @@ libTAO_DsEventLogAdmin_Serv_la_SOURCES = \
   Log/EventLog_i.cpp
 
 libTAO_DsEventLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DsEventLogAdmin_Serv_la_LIBADD = \
   libTAO_CosEvent_Serv.la \
@@ -3203,6 +3317,7 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \
   $(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 \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
@@ -3210,7 +3325,6 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \
   libTAO_Svc_Utils.la \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   libTAO_DsEventLogAdmin_Skel.la \
   libTAO_CosEvent_Skel.la \
   libTAO_DsLogAdmin_Skel.la \
@@ -3236,9 +3350,9 @@ CLEANFILES += \
   TAO_DsEventLogAdmin_Serv.pc
 
 TAO_DsEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -3247,7 +3361,7 @@ EXTRA_DIST += \
 
 ## Makefile.DsNotifyLogAdmin_IDL.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   DsNotifyLogAdminC.cpp \
@@ -3255,7 +3369,10 @@ BUILT_SOURCES += \
   DsNotifyLogAdminC.inl \
   DsNotifyLogAdminS.cpp \
   DsNotifyLogAdminS.h \
-  DsNotifyLogAdminS.inl
+  DsNotifyLogAdminS.inl \
+  DsNotifyLogAdminS_T.cpp \
+  DsNotifyLogAdminS_T.h \
+  DsNotifyLogAdminS_T.inl
 
 CLEANFILES += \
   DsNotifyLogAdmin-stamp \
@@ -3264,22 +3381,26 @@ CLEANFILES += \
   DsNotifyLogAdminC.inl \
   DsNotifyLogAdminS.cpp \
   DsNotifyLogAdminS.h \
-  DsNotifyLogAdminS.inl
+  DsNotifyLogAdminS.inl \
+  DsNotifyLogAdminS_T.cpp \
+  DsNotifyLogAdminS_T.h \
+  DsNotifyLogAdminS_T.inl
 
-DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.cpp DsNotifyLogAdminS.h DsNotifyLogAdminS.inl: DsNotifyLogAdmin-stamp
+DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.cpp DsNotifyLogAdminS.h DsNotifyLogAdminS.inl DsNotifyLogAdminS_T.cpp DsNotifyLogAdminS_T.h DsNotifyLogAdminS_T.inl: DsNotifyLogAdmin-stamp
 
 DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS += \
   DsNotifyLogAdmin.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.DsNotifyLogAdmin.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin.la
 
@@ -3297,7 +3418,7 @@ libTAO_DsNotifyLogAdmin_la_SOURCES = \
   DsNotifyLogAdminC.cpp
 
 libTAO_DsNotifyLogAdmin_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DsNotifyLogAdmin_la_LIBADD = \
   libTAO_CosNotification.la \
@@ -3320,9 +3441,9 @@ CLEANFILES += \
   TAO_DsNotifyLogAdmin.pc
 
 TAO_DsNotifyLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsNotifyLogAdmin.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   DsNotifyLogAdmin.rc \
@@ -3331,7 +3452,7 @@ EXTRA_DIST += \
 
 ## Makefile.DsNotifyLogAdmin_Skel.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Skel.la
 
@@ -3349,7 +3470,7 @@ libTAO_DsNotifyLogAdmin_Skel_la_SOURCES = \
   DsNotifyLogAdminS.cpp
 
 libTAO_DsNotifyLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \
   libTAO_CosNotification_Skel.la \
@@ -3369,6 +3490,9 @@ libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \
 nobase_include_HEADERS += \
   DsNotifyLogAdminS.h \
   DsNotifyLogAdminS.inl \
+  DsNotifyLogAdminS_T.cpp \
+  DsNotifyLogAdminS_T.h \
+  DsNotifyLogAdminS_T.inl \
   Log/notifylog_skel_export.h
 
 pkgconfig_DATA += \
@@ -3378,9 +3502,9 @@ CLEANFILES += \
   TAO_DsNotifyLogAdmin_Skel.pc
 
 TAO_DsNotifyLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   TAO_DsNotifyLogAdmin_Skel.pc.in
@@ -3388,7 +3512,7 @@ EXTRA_DIST += \
 
 ## Makefile.DsNotifyLogAdmin_Serv.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Serv.la
 
@@ -3409,7 +3533,7 @@ libTAO_DsNotifyLogAdmin_Serv_la_SOURCES = \
   Log/NotifyLog_i.cpp
 
 libTAO_DsNotifyLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \
   libTAO_DsLogAdmin_Serv.la \
@@ -3419,7 +3543,6 @@ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \
   libTAO_Svc_Utils.la \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   libTAO_DsNotifyLogAdmin_Skel.la \
   libTAO_CosNotification_Skel.la \
   libTAO_DsEventLogAdmin_Skel.la \
@@ -3449,18 +3572,69 @@ CLEANFILES += \
   TAO_DsNotifyLogAdmin_Serv.pc
 
 TAO_DsNotifyLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   TAO_DsNotifyLogAdmin_Serv.pc.in
 
 
+## Makefile.ESF.am
+
+
+nobase_include_HEADERS += \
+  ESF/ESF_Busy_Lock.cpp \
+  ESF/ESF_Busy_Lock.h \
+  ESF/ESF_Busy_Lock.inl\
+  ESF/ESF_Copy_On_Read.cpp \
+  ESF/ESF_Copy_On_Read.h \
+  ESF/ESF_Copy_On_Write.cpp \
+  ESF/ESF_Copy_On_Write.h \
+  ESF/ESF_Copy_On_Write.inl\
+  ESF/ESF_Defaults.h \
+  ESF/ESF_Delayed_Changes.cpp \
+  ESF/ESF_Delayed_Changes.h \
+  ESF/ESF_Delayed_Changes.inl\
+  ESF/ESF_Delayed_Command.cpp \
+  ESF/ESF_Delayed_Command.h \
+  ESF/ESF_Delayed_Command.inl\
+  ESF/ESF_Immediate_Changes.cpp \
+  ESF/ESF_Immediate_Changes.h \
+  ESF/ESF_Immediate_Changes.inl\
+  ESF/ESF_Peer_Admin.cpp \
+  ESF/ESF_Peer_Admin.h \
+  ESF/ESF_Peer_Workers.cpp \
+  ESF/ESF_Peer_Workers.h \
+  ESF/ESF_Peer_Workers.inl\
+  ESF/ESF_Proxy_Admin.cpp \
+  ESF/ESF_Proxy_Admin.h \
+  ESF/ESF_Proxy_Admin.inl\
+  ESF/ESF_Proxy_Collection.cpp \
+  ESF/ESF_Proxy_Collection.h \
+  ESF/ESF_Proxy_List.cpp \
+  ESF/ESF_Proxy_List.h \
+  ESF/ESF_Proxy_List.inl\
+  ESF/ESF_Proxy_RB_Tree.cpp \
+  ESF/ESF_Proxy_RB_Tree.h \
+  ESF/ESF_Proxy_RB_Tree.inl\
+  ESF/ESF_Proxy_RefCount_Guard.cpp \
+  ESF/ESF_Proxy_RefCount_Guard.h \
+  ESF/ESF_Proxy_RefCount_Guard.inl\
+  ESF/ESF_RefCount_Guard.cpp \
+  ESF/ESF_RefCount_Guard.h \
+  ESF/ESF_RefCount_Guard.inl\
+  ESF/ESF_Shutdown_Proxy.cpp \
+  ESF/ESF_Shutdown_Proxy.h \
+  ESF/ESF_Shutdown_Proxy.inl\
+  ESF/ESF_Worker.cpp \
+  ESF/ESF_Worker.h \
+  ESF/esf_export.h
+
 ## Makefile.FTORB_Utils.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   FT_CORBA_ORBC.cpp \
@@ -3468,7 +3642,10 @@ BUILT_SOURCES += \
   FT_CORBA_ORBC.inl \
   FT_CORBA_ORBS.cpp \
   FT_CORBA_ORBS.h \
-  FT_CORBA_ORBS.inl
+  FT_CORBA_ORBS.inl \
+  FT_CORBA_ORBS_T.cpp \
+  FT_CORBA_ORBS_T.h \
+  FT_CORBA_ORBS_T.inl
 
 CLEANFILES += \
   FT_CORBA_ORB-stamp \
@@ -3477,13 +3654,16 @@ CLEANFILES += \
   FT_CORBA_ORBC.inl \
   FT_CORBA_ORBS.cpp \
   FT_CORBA_ORBS.h \
-  FT_CORBA_ORBS.inl
+  FT_CORBA_ORBS.inl \
+  FT_CORBA_ORBS_T.cpp \
+  FT_CORBA_ORBS_T.h \
+  FT_CORBA_ORBS_T.inl
 
-FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_ORBS.h FT_CORBA_ORBS.inl: FT_CORBA_ORB-stamp
+FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_ORBS.h FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.cpp FT_CORBA_ORBS_T.h FT_CORBA_ORBS_T.inl: FT_CORBA_ORB-stamp
 
 FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_FTORB_Utils.la
 
@@ -3502,7 +3682,7 @@ libTAO_FTORB_Utils_la_SOURCES = \
   FaultTolerance/FT_IOGR_Property.cpp
 
 libTAO_FTORB_Utils_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_FTORB_Utils_la_LIBADD = \
   libTAO_PortableGroup.la \
@@ -3518,12 +3698,14 @@ libTAO_FTORB_Utils_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.cpp \
   FT_CORBA_ORB.idl \
   FT_CORBA_ORBC.h \
   FT_CORBA_ORBC.inl \
   FT_CORBA_ORBS.h \
   FT_CORBA_ORBS.inl \
+  FT_CORBA_ORBS_T.cpp \
+  FT_CORBA_ORBS_T.h \
+  FT_CORBA_ORBS_T.inl \
   FaultTolerance/FT_IOGR_Property.h \
   FaultTolerance/FT_IOGR_Property.inl \
   FaultTolerance/FT_ORB_Utils_export.h
@@ -3535,9 +3717,9 @@ CLEANFILES += \
   TAO_FTORB_Utils.pc
 
 TAO_FTORB_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_FTORB_Utils.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_FTORB_Utils.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_FTORB_Utils.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -3547,7 +3729,6 @@ EXTRA_DIST += \
 ## Makefile.FTRT_ClientORB.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 lib_LTLIBRARIES += libTAO_FTRT_ClientORB.la
 
@@ -3566,7 +3747,7 @@ libTAO_FTRT_ClientORB_la_SOURCES = \
   FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
 
 libTAO_FTRT_ClientORB_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_FTRT_ClientORB_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -3583,13 +3764,10 @@ nobase_include_HEADERS += \
   FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \
   FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTEvent.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   RtecDefaultEventDataC.cpp \
   RtecDefaultEventDataC.h \
@@ -3606,8 +3784,8 @@ CLEANFILES += \
 RtecDefaultEventDataC.cpp RtecDefaultEventDataC.h RtecDefaultEventDataC.inl RtecDefaultEventDataS_T.cpp: RtecDefaultEventData-stamp
 
 RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   RtecEventCommC.cpp \
@@ -3625,8 +3803,8 @@ CLEANFILES += \
 RtecEventCommC.cpp RtecEventCommC.h RtecEventCommC.inl RtecEventCommS_T.cpp: RtecEventComm-stamp
 
 RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   RtecEventChannelAdminC.cpp \
@@ -3644,8 +3822,8 @@ CLEANFILES += \
 RtecEventChannelAdminC.cpp RtecEventChannelAdminC.h RtecEventChannelAdminC.inl RtecEventChannelAdminS_T.cpp: RtecEventChannelAdmin-stamp
 
 RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   RtecUDPAdminC.cpp \
@@ -3663,8 +3841,8 @@ CLEANFILES += \
 RtecUDPAdminC.cpp RtecUDPAdminC.h RtecUDPAdminC.inl RtecUDPAdminS_T.cpp: RtecUDPAdmin-stamp
 
 RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_RTEvent.la
 
@@ -3685,7 +3863,7 @@ libTAO_RTEvent_la_SOURCES = \
   RtecUDPAdminC.cpp
 
 libTAO_RTEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTEvent_la_LIBADD = \
   libTAO_Svc_Utils.la \
@@ -3719,9 +3897,7 @@ CLEANFILES += \
   TAO_RTEvent.pc
 
 TAO_RTEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEvent.pc.in
 
 EXTRA_DIST += \
   RTEvent.rc \
@@ -3731,7 +3907,6 @@ EXTRA_DIST += \
 ## Makefile.RTEvent_Skel.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 lib_LTLIBRARIES += libTAO_RTEvent_Skel.la
 
@@ -3751,7 +3926,7 @@ libTAO_RTEvent_Skel_la_SOURCES = \
   RtecUDPAdminS.cpp
 
 libTAO_RTEvent_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTEvent_Skel_la_LIBADD = \
   libTAO_RTEvent.la \
@@ -3783,9 +3958,8 @@ CLEANFILES += \
   TAO_RTEvent_Skel.pc
 
 TAO_RTEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Skel.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEvent_Skel.pc.in
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -3796,7 +3970,6 @@ EXTRA_DIST += \
 ## Makefile.RTEvent_Serv.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTEvent_Serv.la
@@ -3876,7 +4049,6 @@ libTAO_RTEvent_Serv_la_SOURCES = \
   Event/EC_TPC_Factory.cpp \
   Event/EC_TPC_ProxyConsumer.cpp \
   Event/EC_TPC_ProxySupplier.cpp \
-  Event/EC_Thread_Flags.cpp \
   Event/EC_Timeout_Filter.cpp \
   Event/EC_Timeout_Generator.cpp \
   Event/EC_Trivial_Supplier_Filter.cpp \
@@ -3884,7 +4056,7 @@ libTAO_RTEvent_Serv_la_SOURCES = \
   Event/EC_UDP_Admin.cpp
 
 libTAO_RTEvent_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTEvent_Serv_la_LIBADD = \
   libTAO_RTEvent_Skel.la \
@@ -4004,7 +4176,6 @@ nobase_include_HEADERS += \
   Event/EC_TPC_ProxyConsumer.h \
   Event/EC_TPC_ProxySupplier.h \
   Event/EC_TPC_ProxySupplier.inl \
-  Event/EC_Thread_Flags.h \
   Event/EC_Timeout_Filter.h \
   Event/EC_Timeout_Filter.inl \
   Event/EC_Timeout_Generator.h \
@@ -4020,10 +4191,9 @@ CLEANFILES += \
   TAO_RTEvent_Serv.pc
 
 TAO_RTEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Serv.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEvent_Serv.pc.in
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -4034,8 +4204,8 @@ EXTRA_DIST += \
 ## Makefile.FtRtEvent.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   FTRTC.cpp \
@@ -4043,7 +4213,10 @@ BUILT_SOURCES += \
   FTRTC.inl \
   FTRTS.cpp \
   FTRTS.h \
-  FTRTS.inl
+  FTRTS.inl \
+  FTRTS_T.cpp \
+  FTRTS_T.h \
+  FTRTS_T.inl
 
 CLEANFILES += \
   FTRT-stamp \
@@ -4052,13 +4225,16 @@ CLEANFILES += \
   FTRTC.inl \
   FTRTS.cpp \
   FTRTS.h \
-  FTRTS.inl
+  FTRTS.inl \
+  FTRTS_T.cpp \
+  FTRTS_T.h \
+  FTRTS_T.inl
 
-FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl: FTRT-stamp
+FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl FTRTS_T.cpp FTRTS_T.h FTRTS_T.inl: FTRT-stamp
 
 FTRT-stamp: $(srcdir)/FTRT.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   FtRtecEventCommC.cpp \
@@ -4066,7 +4242,10 @@ BUILT_SOURCES += \
   FtRtecEventCommC.inl \
   FtRtecEventCommS.cpp \
   FtRtecEventCommS.h \
-  FtRtecEventCommS.inl
+  FtRtecEventCommS.inl \
+  FtRtecEventCommS_T.cpp \
+  FtRtecEventCommS_T.h \
+  FtRtecEventCommS_T.inl
 
 CLEANFILES += \
   FtRtecEventComm-stamp \
@@ -4075,13 +4254,16 @@ CLEANFILES += \
   FtRtecEventCommC.inl \
   FtRtecEventCommS.cpp \
   FtRtecEventCommS.h \
-  FtRtecEventCommS.inl
+  FtRtecEventCommS.inl \
+  FtRtecEventCommS_T.cpp \
+  FtRtecEventCommS_T.h \
+  FtRtecEventCommS_T.inl
 
-FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cpp FtRtecEventCommS.h FtRtecEventCommS.inl: FtRtecEventComm-stamp
+FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cpp FtRtecEventCommS.h FtRtecEventCommS.inl FtRtecEventCommS_T.cpp FtRtecEventCommS_T.h FtRtecEventCommS_T.inl: FtRtecEventComm-stamp
 
 FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   FTRT_GroupManagerC.cpp \
@@ -4089,7 +4271,10 @@ BUILT_SOURCES += \
   FTRT_GroupManagerC.inl \
   FTRT_GroupManagerS.cpp \
   FTRT_GroupManagerS.h \
-  FTRT_GroupManagerS.inl
+  FTRT_GroupManagerS.inl \
+  FTRT_GroupManagerS_T.cpp \
+  FTRT_GroupManagerS_T.h \
+  FTRT_GroupManagerS_T.inl
 
 CLEANFILES += \
   FTRT_GroupManager-stamp \
@@ -4098,13 +4283,16 @@ CLEANFILES += \
   FTRT_GroupManagerC.inl \
   FTRT_GroupManagerS.cpp \
   FTRT_GroupManagerS.h \
-  FTRT_GroupManagerS.inl
+  FTRT_GroupManagerS.inl \
+  FTRT_GroupManagerS_T.cpp \
+  FTRT_GroupManagerS_T.h \
+  FTRT_GroupManagerS_T.inl
 
-FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.cpp FTRT_GroupManagerS.h FTRT_GroupManagerS.inl: FTRT_GroupManager-stamp
+FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.cpp FTRT_GroupManagerS.h FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.cpp FTRT_GroupManagerS_T.h FTRT_GroupManagerS_T.inl: FTRT_GroupManager-stamp
 
 FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   FtRtecEventChannelAdminC.cpp \
@@ -4112,7 +4300,10 @@ BUILT_SOURCES += \
   FtRtecEventChannelAdminC.inl \
   FtRtecEventChannelAdminS.cpp \
   FtRtecEventChannelAdminS.h \
-  FtRtecEventChannelAdminS.inl
+  FtRtecEventChannelAdminS.inl \
+  FtRtecEventChannelAdminS_T.cpp \
+  FtRtecEventChannelAdminS_T.h \
+  FtRtecEventChannelAdminS_T.inl
 
 CLEANFILES += \
   FtRtecEventChannelAdmin-stamp \
@@ -4121,13 +4312,16 @@ CLEANFILES += \
   FtRtecEventChannelAdminC.inl \
   FtRtecEventChannelAdminS.cpp \
   FtRtecEventChannelAdminS.h \
-  FtRtecEventChannelAdminS.inl
+  FtRtecEventChannelAdminS.inl \
+  FtRtecEventChannelAdminS_T.cpp \
+  FtRtecEventChannelAdminS_T.h \
+  FtRtecEventChannelAdminS_T.inl
 
-FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS.inl: FtRtecEventChannelAdmin-stamp
+FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminS_T.h FtRtecEventChannelAdminS_T.inl: FtRtecEventChannelAdmin-stamp
 
 FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_FtRtEvent.la
 
@@ -4155,7 +4349,7 @@ libTAO_FtRtEvent_la_SOURCES = \
   FtRtecEventCommS.cpp
 
 libTAO_FtRtEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_FtRtEvent_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
@@ -4182,11 +4376,17 @@ nobase_include_HEADERS += \
   FTRTC.inl \
   FTRTS.h \
   FTRTS.inl \
+  FTRTS_T.cpp \
+  FTRTS_T.h \
+  FTRTS_T.inl \
   FTRT_GroupManager.idl \
   FTRT_GroupManagerC.h \
   FTRT_GroupManagerC.inl \
   FTRT_GroupManagerS.h \
   FTRT_GroupManagerS.inl \
+  FTRT_GroupManagerS_T.cpp \
+  FTRT_GroupManagerS_T.h \
+  FTRT_GroupManagerS_T.inl \
   FtRtEvent/Utils/FTEC_Gateway.h \
   FtRtEvent/Utils/FTEC_Gateway.inl \
   FtRtEvent/Utils/Log.h \
@@ -4200,21 +4400,27 @@ nobase_include_HEADERS += \
   FtRtecEventChannelAdminC.inl \
   FtRtecEventChannelAdminS.h \
   FtRtecEventChannelAdminS.inl \
+  FtRtecEventChannelAdminS_T.cpp \
+  FtRtecEventChannelAdminS_T.h \
+  FtRtecEventChannelAdminS_T.inl \
   FtRtecEventComm.idl \
   FtRtecEventCommC.h \
   FtRtecEventCommC.inl \
   FtRtecEventCommS.h \
-  FtRtecEventCommS.inl
+  FtRtecEventCommS.inl \
+  FtRtecEventCommS_T.cpp \
+  FtRtecEventCommS_T.h \
+  FtRtecEventCommS_T.inl
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.FTRT_EventChannel.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la
 
@@ -4264,7 +4470,7 @@ libTAO_FTRT_EventChannel_la_SOURCES = \
   FtRtEvent/EventChannel/replace_key.cpp
 
 libTAO_FTRT_EventChannel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_FTRT_EventChannel_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -4330,17 +4536,17 @@ nobase_include_HEADERS += \
   FtRtEvent/EventChannel/create_persistent_poa.h \
   FtRtEvent/EventChannel/ftrtec_export.h
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.FT_ClientORB.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_FT_ClientORB.la
 
@@ -4364,7 +4570,7 @@ libTAO_FT_ClientORB_la_SOURCES = \
   FaultTolerance/FT_Service_Callbacks.cpp
 
 libTAO_FT_ClientORB_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_FT_ClientORB_la_LIBADD = \
   libTAO_FTORB_Utils.la \
@@ -4398,11 +4604,11 @@ CLEANFILES += \
   TAO_FT_ClientORB.pc
 
 TAO_FT_ClientORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ClientORB.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ClientORB.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_FT_ClientORB.pc.in
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -4413,8 +4619,8 @@ EXTRA_DIST += \
 ## Makefile.FT_ServerORB.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_FT_ServerORB.la
 
@@ -4435,7 +4641,7 @@ libTAO_FT_ServerORB_la_SOURCES = \
   FaultTolerance/FT_ServerService_Activate.cpp
 
 libTAO_FT_ServerORB_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_FT_ServerORB_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
@@ -4467,10 +4673,10 @@ CLEANFILES += \
   TAO_FT_ServerORB.pc
 
 TAO_FT_ServerORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ServerORB.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ServerORB.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_FT_ServerORB.pc.in
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -4481,9 +4687,9 @@ EXTRA_DIST += \
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   FT_CORBAC.cpp \
@@ -4491,7 +4697,9 @@ BUILT_SOURCES += \
   FT_CORBAC.inl \
   FT_CORBAS.cpp \
   FT_CORBAS.h \
-  FT_CORBAS.inl
+  FT_CORBAS.inl \
+  FT_CORBAS_T.cpp \
+  FT_CORBAS_T.inl
 
 CLEANFILES += \
   FT_CORBA-stamp \
@@ -4500,13 +4708,15 @@ CLEANFILES += \
   FT_CORBAC.inl \
   FT_CORBAS.cpp \
   FT_CORBAS.h \
-  FT_CORBAS.inl
+  FT_CORBAS.inl \
+  FT_CORBAS_T.cpp \
+  FT_CORBAS_T.inl
 
-FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl: FT_CORBA-stamp
+FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl FT_CORBAS_T.cpp FT_CORBAS_T.inl: FT_CORBA-stamp
 
 FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   FT_ReplicaC.cpp \
@@ -4514,7 +4724,9 @@ BUILT_SOURCES += \
   FT_ReplicaC.inl \
   FT_ReplicaS.cpp \
   FT_ReplicaS.h \
-  FT_ReplicaS.inl
+  FT_ReplicaS.inl \
+  FT_ReplicaS_T.cpp \
+  FT_ReplicaS_T.inl
 
 CLEANFILES += \
   FT_Replica-stamp \
@@ -4523,13 +4735,15 @@ CLEANFILES += \
   FT_ReplicaC.inl \
   FT_ReplicaS.cpp \
   FT_ReplicaS.h \
-  FT_ReplicaS.inl
+  FT_ReplicaS.inl \
+  FT_ReplicaS_T.cpp \
+  FT_ReplicaS_T.inl
 
-FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_ReplicaS.inl: FT_Replica-stamp
+FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_ReplicaS.inl FT_ReplicaS_T.cpp FT_ReplicaS_T.inl: FT_Replica-stamp
 
 FT_Replica-stamp: $(srcdir)/FT_Replica.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   FT_NotifierC.cpp \
@@ -4537,7 +4751,9 @@ BUILT_SOURCES += \
   FT_NotifierC.inl \
   FT_NotifierS.cpp \
   FT_NotifierS.h \
-  FT_NotifierS.inl
+  FT_NotifierS.inl \
+  FT_NotifierS_T.cpp \
+  FT_NotifierS_T.inl
 
 CLEANFILES += \
   FT_Notifier-stamp \
@@ -4546,13 +4762,15 @@ CLEANFILES += \
   FT_NotifierC.inl \
   FT_NotifierS.cpp \
   FT_NotifierS.h \
-  FT_NotifierS.inl
+  FT_NotifierS.inl \
+  FT_NotifierS_T.cpp \
+  FT_NotifierS_T.inl
 
-FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_NotifierS.inl: FT_Notifier-stamp
+FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_NotifierS.inl FT_NotifierS_T.cpp FT_NotifierS_T.inl: FT_Notifier-stamp
 
 FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   FT_FaultDetectorFactoryC.cpp \
@@ -4560,7 +4778,9 @@ BUILT_SOURCES += \
   FT_FaultDetectorFactoryC.inl \
   FT_FaultDetectorFactoryS.cpp \
   FT_FaultDetectorFactoryS.h \
-  FT_FaultDetectorFactoryS.inl
+  FT_FaultDetectorFactoryS.inl \
+  FT_FaultDetectorFactoryS_T.cpp \
+  FT_FaultDetectorFactoryS_T.inl
 
 CLEANFILES += \
   FT_FaultDetectorFactory-stamp \
@@ -4569,13 +4789,15 @@ CLEANFILES += \
   FT_FaultDetectorFactoryC.inl \
   FT_FaultDetectorFactoryS.cpp \
   FT_FaultDetectorFactoryS.h \
-  FT_FaultDetectorFactoryS.inl
+  FT_FaultDetectorFactoryS.inl \
+  FT_FaultDetectorFactoryS_T.cpp \
+  FT_FaultDetectorFactoryS_T.inl
 
-FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS.inl: FT_FaultDetectorFactory-stamp
+FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryS_T.inl: FT_FaultDetectorFactory-stamp
 
 FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   FT_ReplicationManagerC.cpp \
@@ -4583,7 +4805,9 @@ BUILT_SOURCES += \
   FT_ReplicationManagerC.inl \
   FT_ReplicationManagerS.cpp \
   FT_ReplicationManagerS.h \
-  FT_ReplicationManagerS.inl
+  FT_ReplicationManagerS.inl \
+  FT_ReplicationManagerS_T.cpp \
+  FT_ReplicationManagerS_T.inl
 
 CLEANFILES += \
   FT_ReplicationManager-stamp \
@@ -4592,13 +4816,15 @@ CLEANFILES += \
   FT_ReplicationManagerC.inl \
   FT_ReplicationManagerS.cpp \
   FT_ReplicationManagerS.h \
-  FT_ReplicationManagerS.inl
+  FT_ReplicationManagerS.inl \
+  FT_ReplicationManagerS_T.cpp \
+  FT_ReplicationManagerS_T.inl
 
-FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.cpp FT_ReplicationManagerS.h FT_ReplicationManagerS.inl: FT_ReplicationManager-stamp
+FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.cpp FT_ReplicationManagerS.h FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.cpp FT_ReplicationManagerS_T.inl: FT_ReplicationManager-stamp
 
 FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_FaultTolerance.la
 
@@ -4625,7 +4851,7 @@ libTAO_FaultTolerance_la_SOURCES = \
   FT_ReplicationManagerS.cpp
 
 libTAO_FaultTolerance_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_FaultTolerance_la_LIBADD = \
   libTAO_FT_ServerORB.la \
@@ -4652,26 +4878,36 @@ nobase_include_HEADERS += \
   FT_CORBAC.inl \
   FT_CORBAS.h \
   FT_CORBAS.inl \
+  FT_CORBAS_T.cpp \
+  FT_CORBAS_T.inl \
   FT_FaultDetectorFactory.idl \
   FT_FaultDetectorFactoryC.h \
   FT_FaultDetectorFactoryC.inl \
   FT_FaultDetectorFactoryS.h \
   FT_FaultDetectorFactoryS.inl \
+  FT_FaultDetectorFactoryS_T.cpp \
+  FT_FaultDetectorFactoryS_T.inl \
   FT_Notifier.idl \
   FT_NotifierC.h \
   FT_NotifierC.inl \
   FT_NotifierS.h \
   FT_NotifierS.inl \
+  FT_NotifierS_T.cpp \
+  FT_NotifierS_T.inl \
   FT_Replica.idl \
   FT_ReplicaC.h \
   FT_ReplicaC.inl \
   FT_ReplicaS.h \
   FT_ReplicaS.inl \
+  FT_ReplicaS_T.cpp \
+  FT_ReplicaS_T.inl \
   FT_ReplicationManager.idl \
   FT_ReplicationManagerC.h \
   FT_ReplicationManagerC.inl \
   FT_ReplicationManagerS.h \
   FT_ReplicationManagerS.inl \
+  FT_ReplicationManagerS_T.cpp \
+  FT_ReplicationManagerS_T.inl \
   FaultTolerance/fault_tol_export.h
 
 pkgconfig_DATA += \
@@ -4681,11 +4917,11 @@ CLEANFILES += \
   TAO_FaultTolerance.pc
 
 TAO_FaultTolerance.pc: ${top_builddir}/config.status ${srcdir}/TAO_FaultTolerance.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_FaultTolerance.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_FaultTolerance.pc.in
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -4696,7 +4932,6 @@ EXTRA_DIST += \
 
 ## Makefile.HTIOP.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES += \
@@ -4715,8 +4950,8 @@ CLEANFILES += \
 HTIOPC.cpp HTIOPC.h HTIOPC.inl HTIOPS.h: HTIOP-stamp
 
 HTIOP-stamp: $(srcdir)/HTIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS $(srcdir)/HTIOP.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS $(srcdir)/HTIOP.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   HTIOP/htiop_endpointsC.cpp \
@@ -4732,8 +4967,8 @@ CLEANFILES += \
 HTIOP/htiop_endpointsC.cpp HTIOP/htiop_endpointsC.h HTIOP/htiop_endpointsS.h: HTIOP/htiop_endpoints-stamp
 
 HTIOP/htiop_endpoints-stamp: $(srcdir)/HTIOP/htiop_endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS -Sci -Gp -Gd -Sa -Sorb -o HTIOP $(srcdir)/HTIOP/htiop_endpoints.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o HTIOP $(srcdir)/HTIOP/htiop_endpoints.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_HTIOP.la
 
@@ -4762,7 +4997,7 @@ libTAO_HTIOP_la_SOURCES = \
   HTIOPC.cpp
 
 libTAO_HTIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_HTIOP_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -4771,7 +5006,6 @@ libTAO_HTIOP_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.cpp \
   HTIOP.idl \
   HTIOP/HTIOP_Acceptor.h \
   HTIOP/HTIOP_Acceptor.inl \
@@ -4793,12 +5027,11 @@ nobase_include_HEADERS += \
   HTIOPS.h
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.IFRService.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_IFRService.la
 
@@ -4870,7 +5103,7 @@ libTAO_IFRService_la_SOURCES = \
   IFRService/WstringDef_i.cpp
 
 libTAO_IFRService_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_IFRService_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
@@ -4913,28 +5146,18 @@ nobase_include_HEADERS += \
   IFRService/IFR_BaseS.h \
   IFRService/IFR_BaseS.inl \
   IFRService/IFR_BaseS_T.cpp \
-  IFRService/IFR_BaseS_T.h \
-  IFRService/IFR_BaseS_T.inl \
   IFRService/IFR_BasicS.h \
   IFRService/IFR_BasicS.inl \
   IFRService/IFR_BasicS_T.cpp \
-  IFRService/IFR_BasicS_T.h \
-  IFRService/IFR_BasicS_T.inl \
   IFRService/IFR_ComponentsS.h \
   IFRService/IFR_ComponentsS.inl \
   IFRService/IFR_ComponentsS_T.cpp \
-  IFRService/IFR_ComponentsS_T.h \
-  IFRService/IFR_ComponentsS_T.inl \
   IFRService/IFR_ExtendedS.h \
   IFRService/IFR_ExtendedS.inl \
   IFRService/IFR_ExtendedS_T.cpp \
-  IFRService/IFR_ExtendedS_T.h \
-  IFRService/IFR_ExtendedS_T.inl \
   IFRService/IFR_Service_Loader.h \
   IFRService/IFR_Service_Utils.h \
   IFRService/IFR_Service_Utils_T.cpp \
-  IFRService/IFR_Service_Utils_T.h \
-  IFRService/IFR_macro.h \
   IFRService/IRObject_i.h \
   IFRService/InterfaceAttrExtension_i.h \
   IFRService/InterfaceDef_i.h \
@@ -4957,12 +5180,10 @@ nobase_include_HEADERS += \
   IFRService/ValueBoxDef_i.h \
   IFRService/ValueDef_i.h \
   IFRService/ValueMemberDef_i.h \
-  IFRService/WstringDef_i.h \
-  IFRService/concrete_classes.h \
-  IFRService/ifr_service_export.h
+  IFRService/WstringDef_i.h
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 EXTRA_DIST += \
   IFRService.rc
@@ -4971,7 +5192,6 @@ EXTRA_DIST += \
 ## Makefile.RTCORBAEvent.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
 
@@ -4991,7 +5211,7 @@ libTAO_RTCORBAEvent_la_SOURCES = \
   Event/EC_RTCORBA_Factory.cpp
 
 libTAO_RTCORBAEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTCORBAEvent_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
@@ -5015,13 +5235,11 @@ nobase_include_HEADERS += \
 
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTEventLogAdmin_IDL.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES += \
   RTEventLogAdminC.cpp \
@@ -5029,7 +5247,10 @@ BUILT_SOURCES += \
   RTEventLogAdminC.inl \
   RTEventLogAdminS.cpp \
   RTEventLogAdminS.h \
-  RTEventLogAdminS.inl
+  RTEventLogAdminS.inl \
+  RTEventLogAdminS_T.cpp \
+  RTEventLogAdminS_T.h \
+  RTEventLogAdminS_T.inl
 
 CLEANFILES += \
   RTEventLogAdmin-stamp \
@@ -5038,24 +5259,26 @@ CLEANFILES += \
   RTEventLogAdminC.inl \
   RTEventLogAdminS.cpp \
   RTEventLogAdminS.h \
-  RTEventLogAdminS.inl
+  RTEventLogAdminS.inl \
+  RTEventLogAdminS_T.cpp \
+  RTEventLogAdminS_T.h \
+  RTEventLogAdminS_T.inl
 
-RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl: RTEventLogAdmin-stamp
+RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl RTEventLogAdminS_T.cpp RTEventLogAdminS_T.h RTEventLogAdminS_T.inl: RTEventLogAdmin-stamp
 
 RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl
+	@touch "$@"
+
 
 nobase_include_HEADERS += \
   RTEventLogAdmin.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTEventLogAdmin.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la
 
@@ -5072,7 +5295,7 @@ libTAO_RTEventLogAdmin_la_SOURCES = \
   RTEventLogAdminC.cpp
 
 libTAO_RTEventLogAdmin_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTEventLogAdmin_la_LIBADD = \
   libTAO_RTEvent.la \
@@ -5099,9 +5322,8 @@ CLEANFILES += \
   TAO_RTEventLogAdmin.pc
 
 TAO_RTEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEventLogAdmin.pc.in
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -5110,15 +5332,16 @@ EXTRA_DIST += \
 
 ## Makefile.RTSched.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   RtecSchedulerC.cpp \
   RtecSchedulerC.h \
   RtecSchedulerC.inl \
   RtecSchedulerS.cpp \
   RtecSchedulerS.h \
-  RtecSchedulerS.inl
+  RtecSchedulerS.inl \
+  RtecSchedulerS_T.cpp \
+  RtecSchedulerS_T.h \
+  RtecSchedulerS_T.inl
 
 CLEANFILES += \
   RtecScheduler-stamp \
@@ -5127,13 +5350,16 @@ CLEANFILES += \
   RtecSchedulerC.inl \
   RtecSchedulerS.cpp \
   RtecSchedulerS.h \
-  RtecSchedulerS.inl
+  RtecSchedulerS.inl \
+  RtecSchedulerS_T.cpp \
+  RtecSchedulerS_T.h \
+  RtecSchedulerS_T.inl
 
-RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerS.inl: RtecScheduler-stamp
+RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerS.inl RtecSchedulerS_T.cpp RtecSchedulerS_T.h RtecSchedulerS_T.inl: RtecScheduler-stamp
 
 RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_RTSched.la
 
@@ -5161,7 +5387,7 @@ libTAO_RTSched_la_SOURCES = \
   Scheduler_Utilities.cpp
 
 libTAO_RTSched_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTSched_la_LIBADD = \
   libTAO_Svc_Utils.la \
@@ -5177,6 +5403,9 @@ nobase_include_HEADERS += \
   RtecSchedulerC.inl \
   RtecSchedulerS.h \
   RtecSchedulerS.inl \
+  RtecSchedulerS_T.cpp \
+  RtecSchedulerS_T.h \
+  RtecSchedulerS_T.inl \
   Runtime_Scheduler.h \
   Sched/Config_Scheduler.h \
   Sched/DynSched.h \
@@ -5193,8 +5422,6 @@ nobase_include_HEADERS += \
   Scheduler_Utilities.h \
   Scheduler_Utilities.inl
 
-endif BUILD_EXCEPTIONS
-
 EXTRA_DIST += \
   RTSched.rc
 
@@ -5202,7 +5429,6 @@ EXTRA_DIST += \
 ## Makefile.RTEventLogAdmin_Skel.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Skel.la
 
@@ -5219,7 +5445,7 @@ libTAO_RTEventLogAdmin_Skel_la_SOURCES = \
   RTEventLogAdminS.cpp
 
 libTAO_RTEventLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTEventLogAdmin_Skel_la_LIBADD = \
   libTAO_RTEvent_Skel.la \
@@ -5240,7 +5466,10 @@ libTAO_RTEventLogAdmin_Skel_la_LIBADD = \
 nobase_include_HEADERS += \
   Log/rteventlog_skel_export.h \
   RTEventLogAdminS.h \
-  RTEventLogAdminS.inl
+  RTEventLogAdminS.inl \
+  RTEventLogAdminS_T.cpp \
+  RTEventLogAdminS_T.h \
+  RTEventLogAdminS_T.inl
 
 pkgconfig_DATA += \
   TAO_RTEventLogAdmin_Skel.pc
@@ -5249,9 +5478,8 @@ CLEANFILES += \
   TAO_RTEventLogAdmin_Skel.pc
 
 TAO_RTEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -5261,7 +5489,6 @@ EXTRA_DIST += \
 ## Makefile.RTEventLogAdmin_Serv.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Serv.la
@@ -5282,7 +5509,7 @@ libTAO_RTEventLogAdmin_Serv_la_SOURCES = \
   Log/RTEventLog_i.cpp
 
 libTAO_RTEventLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTEventLogAdmin_Serv_la_LIBADD = \
   libTAO_RTSched.la \
@@ -5322,10 +5549,9 @@ CLEANFILES += \
   TAO_RTEventLogAdmin_Serv.pc
 
 TAO_RTEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -5335,7 +5561,6 @@ EXTRA_DIST += \
 ## Makefile.RTKokyuEvent.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTKokyuEvent.la
@@ -5358,7 +5583,7 @@ libTAO_RTKokyuEvent_la_SOURCES = \
   Event/EC_Kokyu_Scheduling.cpp
 
 libTAO_RTKokyuEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTKokyuEvent_la_LIBADD = \
   $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
@@ -5389,13 +5614,11 @@ nobase_include_HEADERS += \
   Event/EC_Kokyu_Scheduling.inl
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTSchedEvent.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTSchedEvent.la
@@ -5418,7 +5641,7 @@ libTAO_RTSchedEvent_la_SOURCES = \
   Event/EC_Sched_Filter_Builder.cpp
 
 libTAO_RTSchedEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTSchedEvent_la_LIBADD = \
   libTAO_RTSched.la \
@@ -5448,7 +5671,6 @@ nobase_include_HEADERS += \
   Event/EC_Sched_Filter_Builder.inl
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -5457,8 +5679,8 @@ EXTRA_DIST += \
 
 ## Makefile.RT_Notification.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_RT_Notification.la
 
@@ -5481,12 +5703,11 @@ libTAO_RT_Notification_la_SOURCES = \
   Notify/Structured/RT_StructuredProxyPushSupplier.cpp
 
 libTAO_RT_Notification_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RT_Notification_la_LIBADD = \
   libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   libTAO_ETCL.la \
   libTAO_CosNotification_Skel.la \
   libTAO_CosEvent_Skel.la \
@@ -5510,8 +5731,8 @@ nobase_include_HEADERS += \
   Notify/RT_Properties.inl \
   Notify/Structured/RT_StructuredProxyPushSupplier.h
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 EXTRA_DIST += \
   RT_Notification.rc
@@ -5520,65 +5741,70 @@ EXTRA_DIST += \
 ## Makefile.Security.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 
 BUILT_SOURCES += \
   CSIC.cpp \
   CSIC.h \
   CSIC.inl \
-  CSIS.inl
+  CSIS.inl \
+  CSIS_T.inl
 
 CLEANFILES += \
   CSI-stamp \
   CSIC.cpp \
   CSIC.h \
   CSIC.inl \
-  CSIS.inl
+  CSIS.inl \
+  CSIS_T.inl
 
-CSIC.cpp CSIC.h CSIC.inl CSIS.inl: CSI-stamp
+CSIC.cpp CSIC.h CSIC.inl CSIS.inl CSIS_T.inl: CSI-stamp
 
 CSI-stamp: $(srcdir)/CSI.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   CSIIOPC.cpp \
   CSIIOPC.h \
   CSIIOPC.inl \
-  CSIIOPS.inl
+  CSIIOPS.inl \
+  CSIIOPS_T.inl
 
 CLEANFILES += \
   CSIIOP-stamp \
   CSIIOPC.cpp \
   CSIIOPC.h \
   CSIIOPC.inl \
-  CSIIOPS.inl
+  CSIIOPS.inl \
+  CSIIOPS_T.inl
 
-CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl: CSIIOP-stamp
+CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl: CSIIOP-stamp
 
 CSIIOP-stamp: $(srcdir)/CSIIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   GSSUPC.cpp \
   GSSUPC.h \
   GSSUPC.inl \
-  GSSUPS.inl
+  GSSUPS.inl \
+  GSSUPS_T.inl
 
 CLEANFILES += \
   GSSUP-stamp \
   GSSUPC.cpp \
   GSSUPC.h \
   GSSUPC.inl \
-  GSSUPS.inl
+  GSSUPS.inl \
+  GSSUPS_T.inl
 
-GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl: GSSUP-stamp
+GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl GSSUPS_T.inl: GSSUP-stamp
 
 GSSUP-stamp: $(srcdir)/GSSUP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   SecurityC.cpp \
@@ -5586,7 +5812,9 @@ BUILT_SOURCES += \
   SecurityC.inl \
   SecurityS.cpp \
   SecurityS.h \
-  SecurityS.inl
+  SecurityS.inl \
+  SecurityS_T.cpp \
+  SecurityS_T.inl
 
 CLEANFILES += \
   Security-stamp \
@@ -5595,13 +5823,15 @@ CLEANFILES += \
   SecurityC.inl \
   SecurityS.cpp \
   SecurityS.h \
-  SecurityS.inl
+  SecurityS.inl \
+  SecurityS_T.cpp \
+  SecurityS_T.inl
 
-SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl: Security-stamp
+SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl SecurityS_T.cpp SecurityS_T.inl: Security-stamp
 
 Security-stamp: $(srcdir)/Security.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   SecurityLevel1C.cpp \
@@ -5609,7 +5839,9 @@ BUILT_SOURCES += \
   SecurityLevel1C.inl \
   SecurityLevel1S.cpp \
   SecurityLevel1S.h \
-  SecurityLevel1S.inl
+  SecurityLevel1S.inl \
+  SecurityLevel1S_T.cpp \
+  SecurityLevel1S_T.inl
 
 CLEANFILES += \
   SecurityLevel1-stamp \
@@ -5618,13 +5850,15 @@ CLEANFILES += \
   SecurityLevel1C.inl \
   SecurityLevel1S.cpp \
   SecurityLevel1S.h \
-  SecurityLevel1S.inl
+  SecurityLevel1S.inl \
+  SecurityLevel1S_T.cpp \
+  SecurityLevel1S_T.inl
 
-SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp SecurityLevel1S.h SecurityLevel1S.inl: SecurityLevel1-stamp
+SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp SecurityLevel1S.h SecurityLevel1S.inl SecurityLevel1S_T.cpp SecurityLevel1S_T.inl: SecurityLevel1-stamp
 
 SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   SecurityLevel2C.cpp \
@@ -5632,7 +5866,9 @@ BUILT_SOURCES += \
   SecurityLevel2C.inl \
   SecurityLevel2S.cpp \
   SecurityLevel2S.h \
-  SecurityLevel2S.inl
+  SecurityLevel2S.inl \
+  SecurityLevel2S_T.cpp \
+  SecurityLevel2S_T.inl
 
 CLEANFILES += \
   SecurityLevel2-stamp \
@@ -5641,32 +5877,36 @@ CLEANFILES += \
   SecurityLevel2C.inl \
   SecurityLevel2S.cpp \
   SecurityLevel2S.h \
-  SecurityLevel2S.inl
+  SecurityLevel2S.inl \
+  SecurityLevel2S_T.cpp \
+  SecurityLevel2S_T.inl
 
-SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp SecurityLevel2S.h SecurityLevel2S.inl: SecurityLevel2-stamp
+SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp SecurityLevel2S.h SecurityLevel2S.inl SecurityLevel2S_T.cpp SecurityLevel2S_T.inl: SecurityLevel2-stamp
 
 SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   SecurityLevel3C.cpp \
   SecurityLevel3C.h \
   SecurityLevel3C.inl \
-  SecurityLevel3S.inl
+  SecurityLevel3S.inl \
+  SecurityLevel3S_T.inl
 
 CLEANFILES += \
   SecurityLevel3-stamp \
   SecurityLevel3C.cpp \
   SecurityLevel3C.h \
   SecurityLevel3C.inl \
-  SecurityLevel3S.inl
+  SecurityLevel3S.inl \
+  SecurityLevel3S_T.inl
 
-SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl: SecurityLevel3-stamp
+SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl: SecurityLevel3-stamp
 
 SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_Security.la
 
@@ -5707,7 +5947,7 @@ libTAO_Security_la_SOURCES = \
   SecurityS.cpp
 
 libTAO_Security_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_Security_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
@@ -5726,11 +5966,14 @@ nobase_include_HEADERS += \
   CSIIOPC.h \
   CSIIOPC.inl \
   CSIIOPS.inl \
+  CSIIOPS_T.inl \
   CSIS.inl \
+  CSIS_T.inl \
   GSSUP.idl \
   GSSUPC.h \
   GSSUPC.inl \
   GSSUPS.inl \
+  GSSUPS_T.inl \
   Security.idl \
   Security/CSI_Utils.h \
   Security/SL2_EstablishTrustPolicy.h \
@@ -5757,20 +6000,26 @@ nobase_include_HEADERS += \
   SecurityLevel1C.inl \
   SecurityLevel1S.h \
   SecurityLevel1S.inl \
+  SecurityLevel1S_T.cpp \
+  SecurityLevel1S_T.inl \
   SecurityLevel2.idl \
   SecurityLevel2C.h \
   SecurityLevel2C.inl \
   SecurityLevel2S.h \
   SecurityLevel2S.inl \
+  SecurityLevel2S_T.cpp \
+  SecurityLevel2S_T.inl \
   SecurityLevel3.idl \
   SecurityLevel3C.h \
   SecurityLevel3C.inl \
   SecurityLevel3S.inl \
+  SecurityLevel3S_T.inl \
   SecurityS.h \
-  SecurityS.inl
+  SecurityS.inl \
+  SecurityS_T.cpp \
+  SecurityS_T.inl
 
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -5780,9 +6029,9 @@ EXTRA_DIST += \
 ## Makefile.SSLIOP.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES += \
   SSLIOPC.cpp \
@@ -5800,8 +6049,8 @@ CLEANFILES += \
 SSLIOPC.cpp SSLIOPC.h SSLIOPC.inl SSLIOPS.h: SSLIOP-stamp
 
 SSLIOP-stamp: $(srcdir)/SSLIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS $(srcdir)/SSLIOP.idl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS $(srcdir)/SSLIOP.idl
+	@touch "$@"
 
 BUILT_SOURCES += \
   SSLIOP/ssl_endpointsC.cpp \
@@ -5817,8 +6066,8 @@ CLEANFILES += \
 SSLIOP/ssl_endpointsC.cpp SSLIOP/ssl_endpointsC.h SSLIOP/ssl_endpointsS.h: SSLIOP/ssl_endpoints-stamp
 
 SSLIOP/ssl_endpoints-stamp: $(srcdir)/SSLIOP/ssl_endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS -Sci -Gp -Gd -Sa -Sorb -o SSLIOP $(srcdir)/SSLIOP/ssl_endpoints.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o SSLIOP $(srcdir)/SSLIOP/ssl_endpoints.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_SSLIOP.la
 
@@ -5863,7 +6112,7 @@ libTAO_SSLIOP_la_SOURCES = \
   SSLIOPC.cpp
 
 libTAO_SSLIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @ACE_TLS_LDFLAGS@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @ACE_TLS_LDFLAGS@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_SSLIOP_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
@@ -5879,7 +6128,6 @@ libTAO_SSLIOP_la_LIBADD = \
   @ACE_TLS_LIBS@
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.cpp \
   SSLIOP.idl \
   SSLIOP/IIOP_SSL_Acceptor.h \
   SSLIOP/IIOP_SSL_Connection_Handler.h \
@@ -5920,9 +6168,9 @@ nobase_include_HEADERS += \
   SSLIOPC.inl \
   SSLIOPS.h
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 3c20b3b646f..5ea0c3bbc03 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -43,7 +43,7 @@ TAO_Naming_Server::TAO_Naming_Server (void)
     base_address_ (TAO_NAMING_BASE_ADDR),
     multicast_ (0),
     use_storable_context_ (0),
-    use_servant_activator_ (false),
+    use_servant_activator_ (0),
     servant_activator_ (0),
     use_redundancy_(0),
     round_trip_timeout_ (0),
@@ -73,7 +73,7 @@ TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb,
     base_address_ (TAO_NAMING_BASE_ADDR),
     multicast_ (0),
     use_storable_context_ (use_storable_context),
-    use_servant_activator_ (false),
+    use_servant_activator_ (0),
     servant_activator_ (0),
     use_redundancy_(0),
     round_trip_timeout_ (0),
@@ -321,7 +321,7 @@ TAO_Naming_Server::init_with_orb (int argc,
 #if (TAO_HAS_MINIMUM_POA == 0)
       if (this->use_storable_context_)
         {
-          this->use_servant_activator_ = true;
+          this->use_servant_activator_ = 1;
         }
 
       if (this->use_servant_activator_) {
@@ -344,7 +344,7 @@ TAO_Naming_Server::init_with_orb (int argc,
                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
       if (this->use_servant_activator_)
         {
           // Request Processing Policy
@@ -477,7 +477,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
               return -1;
             }
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
           if (this->use_servant_activator_)
             {
               ACE_NEW_THROW_EX (this->servant_activator_,
@@ -654,7 +654,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
   ACE_UNUSED_ARG (enable_multicast);
 #endif /* ACE_HAS_IP_MULTICAST */
 
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0  
       if (use_round_trip_timeout == 1)
       {
         TimeBase::TimeT roundTripTimeoutVal = round_trip_timeout;
@@ -759,7 +759,7 @@ TAO_Naming_Server::operator-> (void) const
 
 TAO_Naming_Server::~TAO_Naming_Server (void)
 {
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
   if (this->use_servant_activator_)
     delete this->servant_activator_;
 #endif /* TAO_HAS_MINIMUM_POA */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index cef31e28bff..b2bb63bf6cf 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -14,7 +14,7 @@
 
 #include "orbsvcs/Naming/Storable_Naming_Context_Activator.h"
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0)
 #include "orbsvcs/Naming/Naming_Context_Interface.h"
 #include "orbsvcs/Naming/Storable_Naming_Context.h"
 #include "orbsvcs/Naming/Storable.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
index 9583e094808..d8799fd1137 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -23,7 +23,7 @@
 #include "tao/PortableServer/ServantActivatorC.h"
 #include "tao/LocalObject.h"
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0)
 
 #include "orbsvcs/Naming/naming_serv_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index 920eb001c33..8048c1dcaa5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -7,8 +7,6 @@ ACE_RCSID (Notify,
            "$Id$")
 
 #include "ace/Bound_Ptr.h"
-#include "tao/Stub.h" // For debug messages printing out ORBid.
-#include "tao/ORB_Core.h"
 #include "orbsvcs/CosEventCommC.h"
 #include "orbsvcs/Notify/Event.h"
 #include "orbsvcs/Notify/Properties.h"
@@ -37,60 +35,14 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
     ACE_THROW (CORBA::BAD_PARAM());
   }
 
+  this->push_consumer_ = CosEventComm::PushConsumer::_duplicate (push_consumer);
+
   ACE_TRY
-  {
-    if (!TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb ())
-      {
-        this->push_consumer_ = CosEventComm::PushConsumer::_duplicate (push_consumer);
-
-        this->publish_ =
-          CosNotifyComm::NotifyPublish::_narrow (push_consumer ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    else
-      {
-        // "Port" consumer's object reference from receiving ORB to dispatching ORB.
-        CORBA::String_var temp =
-          TAO_Notify_PROPERTIES::instance()->orb()->object_to_string(push_consumer);
-
-        CORBA::Object_var obj =
-          TAO_Notify_PROPERTIES::instance()->dispatching_orb()->string_to_object(temp.in());
-
-        CosEventComm::PushConsumer_var new_cos_comm_pc =
-          CosEventComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        this->push_consumer_ = 
-          CosEventComm::PushConsumer::_duplicate (new_cos_comm_pc.in());
-
-        //
-        // Note that here we do an _unchecked_narrow() in order to avoid
-        // making a call on the consumer b/c the consumer may not have activated
-        // its POA just yet.  That means that before we use this reference the first
-        // time, we'll actually need to call _is_a() on it, i.e., the equivalent
-        // of an _narrow().  At the time of this writing, the only use of
-        // this->publish_ is in TAO_NS_Consumer::dispatch_updates_i (the superclass).
-        // If any other use is made of this data member, then the code to validate
-        // the actual type of the target object must be refactored.
-        this->publish_ = 
-          CosNotifyComm::NotifyPublish::_unchecked_narrow (obj.in()
-                                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-
-        //--cj verify dispatching ORB
-        if (TAO_debug_level >= 10)
-          {
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) Any push init dispatching ORB id is %s.\n",
-                        obj->_stubobj()->orb_core()->orbid()));
-          }
-        //--cj end
-      }
-  }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Got a TRANSIENT in NS_PushConsumer::init");
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_PushConsumer %@\n", this));
+      this->publish_ =
+        CosNotifyComm::NotifyPublish::_narrow (push_consumer
+                                               ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -109,13 +61,6 @@ TAO_Notify_PushConsumer::release (void)
 void
 TAO_Notify_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
 {
-  //--cj verify dispatching ORB
-  if (TAO_debug_level >= 10) {
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Any push dispatching ORB id is %s.\n",
-                this->push_consumer_->_stubobj()->orb_core()->orbid()));
-  }
-  //--cj end
-
   this->push_consumer_->push (payload ACE_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 96a7d9ef8a7..7b19b418ebc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_Notify_Consumer::TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy)
 : proxy_ (proxy)
 , is_suspended_ (0)
-, have_not_yet_verified_publish_ (true)
 , pacing_ (proxy->qos_properties_.pacing_interval ())
 , max_batch_size_ (CosNotification::MaximumBatchSize, 0)
 , timer_id_ (-1)
@@ -684,14 +683,7 @@ void
 TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
                                          ACE_ENV_ARG_DECL)
 {
-  if (this->have_not_yet_verified_publish_)
-    {
-      this->have_not_yet_verified_publish_ = false; // no need to check again
-      if (! this->publish_->_is_a ("IDL:omg.org/CosNotifyComm/NotifyPublish:1.0"
-                                   ACE_ENV_ARG_PARAMETER))
-        this->publish_ = CosNotifyComm::NotifyPublish::_nil();
-    }
-  if (! CORBA::is_nil (this->publish_.in ()))
+  if (!CORBA::is_nil (this->publish_.in ()))
     this->publish_->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 89058b6492e..43b591b51e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -165,7 +165,6 @@ protected:
 
   /// Interface that accepts offer_changes
   CosNotifyComm::NotifyPublish_var publish_;
-  bool have_not_yet_verified_publish_;
 
   /// The Pacing Interval
   const TAO_Notify_Property_Time & pacing_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 3e095e32f73..2128c1852a4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -110,30 +110,6 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[])
           task_per_proxy = 1;
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-UseSeparateDispatchingORB")) == 0)
-        {
-          current_arg = arg_shifter.get_the_parameter
-                                (ACE_TEXT("-UseSeparateDispatchingORB"));
-          if (current_arg != 0 &&
-              (ACE_OS::strcmp(ACE_TEXT ("0"), current_arg) == 0 ||
-               ACE_OS::strcmp(ACE_TEXT ("1"), current_arg) == 0))
-            {
-              properties->separate_dispatching_orb (
-                            static_cast<bool> (ACE_OS::atoi(current_arg)));
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("Using separate Dispatching ORB\n")));
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t) WARNING: Unrecognized ")
-                          ACE_TEXT ("argument (%s).  Ignoring invalid ")
-                          ACE_TEXT ("-UseSeparateDispatchingORB usage.\n"),
-                          (current_arg == 0 ? ACE_TEXT ("''") : current_arg)));
-            }
-          if (current_arg != 0)
-            arg_shifter.consume_arg ();
-        }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-AllowReconnect")) == 0)
       {
         arg_shifter.consume_arg ();
@@ -222,36 +198,7 @@ TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "Loading the Cos Notification Service...\n"));
 
-  if (TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb())
-    {
-      // got here by way of svc.conf. no second orb supplied so create one
-      if (NULL == TAO_Notify_PROPERTIES::instance()->dispatching_orb())
-        {
-          ACE_DEBUG ((LM_DEBUG, "No dispatching orb supplied. Creating default one.\n"));
-
-          int argc = 0;
-          char *argv0 = 0;
-          char **argv = &argv0;  // ansi requires argv be null terminated.
-          CORBA::ORB_var dispatcher = CORBA::ORB_init (argc, argv,
-                                                       "default_dispatcher" ACE_ENV_ARG_PARAMETER);
-          //ACE_CHECK_RETURN (-1);
-
-          TAO_Notify_PROPERTIES::instance()->dispatching_orb(dispatcher.in());
-        }
-
-      this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb() ACE_ENV_ARG_PARAMETER);
-
-    }
-  else
-    {
-      this->init_i (orb ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-void
-TAO_CosNotify_Service::init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL)
-{
-  this->init_i2 (orb, dispatching_orb ACE_ENV_ARG_PARAMETER);
+  this->init_i (orb ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -270,57 +217,22 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  // Set the properties
-  TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
+  /// Set the properties
+    TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
 
-  properties->orb (orb);
-  properties->default_poa (default_poa.in ());
+    properties->orb (orb);
+    properties->default_poa (default_poa.in ());
 
-  // Init the factory
-  this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
-  ACE_ASSERT( this->factory_.get() != 0 );
-  TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get());
+    // Init the factory
+    this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER));
+    ACE_CHECK;
+    ACE_ASSERT( this->factory_.get() != 0 );
+    TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get());
 
-  this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
-  ACE_ASSERT( this->builder_.get() != 0 );
-  TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get());
-}
-
-void
-TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL)
-{
-  // Obtain the Root POA
-  CORBA::Object_var object  =
-    orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (object.in ()))
-    ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n"));
-
-  PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Set the properties
-  TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
-
-  properties->orb (orb);
-  properties->dispatching_orb (dispatching_orb);
-  properties->separate_dispatching_orb (true);
-
-  properties->default_poa (default_poa.in ());
-
-  // Init the factory and builder
-  this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
-  ACE_ASSERT( this->factory_.get() != 0 );
-  TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get());
-
-  this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
-  ACE_ASSERT( this->builder_.get() != 0 );
-  TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get());
+    this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER));
+    ACE_CHECK;
+    ACE_ASSERT( this->builder_.get() != 0 );
+    TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get());
 }
 
 TAO_Notify_Factory*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index c3e2e8ebd47..cc91e77d372 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -51,9 +51,6 @@ public:
 
   virtual int fini (void);
 
-  /// separate dispatching orb Init
-  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL);
-
   /// Create the Channel Factory.
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL);
 
@@ -63,8 +60,6 @@ public:
 protected:
   /// Init the data members
   virtual void init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
-  /// Init the data members separate dispatching orb
-  virtual void init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index d04426c397a..f342c7e93f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -3,16 +3,13 @@
 #include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/ETCL/ETCL_y.h"
-
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/DynamicAny/DynArray_i.h"
 #include "tao/DynamicAny/DynSequence_i.h"
 #include "tao/DynamicAny/DynStruct_i.h"
 #include "tao/DynamicAny/DynUnion_i.h"
 #include "tao/DynamicAny/DynEnum_i.h"
 #include "tao/DynamicAny/DynAnyFactory.h"
-#include "tao/DynamicAny/DynAnyUtils_T.h"
-
-#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -270,10 +267,8 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
           }
 
           DynamicAny::DynAny_var dyn_any =
-            TAO::MakeDynAnyUtils<const CORBA::Any &>::make_dyn_any_t (
-              disc_tc.in (),
-              disc_any
-              ACE_ENV_ARG_PARAMETER);
+            TAO_DynAnyFactory::make_dyn_any (disc_any
+            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           dyn_union.set_discriminator (dyn_any.in ()
             ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 8d781c1929e..0137934dd22 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -87,13 +87,7 @@ TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char*
   ACE_CHECK;
 
   if (DEBUG_LEVEL > 0)
-    {
-      CORBA::String_var the_name = this->poa_->the_name (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Created POA : %s\n", the_name.in ()));
-    }
-
+    ACE_DEBUG ((LM_DEBUG, "Created POA : %s\n", this->poa_->the_name ()));
   /*
   // Destroy the policies
   for (CORBA::ULong index = 0; index < policy_list.length (); ++index)
@@ -140,13 +134,7 @@ TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& i
   id = this->id_factory_.id ();
 
   if (DEBUG_LEVEL > 0)
-    {
-      CORBA::String_var the_name = this->poa_->the_name (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      ACE_DEBUG ((LM_DEBUG, "Activating object with id = %d in  POA : %s\n", id, the_name.in ()));
-    }
+    ACE_DEBUG ((LM_DEBUG, "Activating object with id = %d in  POA : %s\n", id, this->poa_->the_name ()));
 
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
@@ -166,12 +154,7 @@ CORBA::Object_ptr
 TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL)
 {
   if (DEBUG_LEVEL > 0)
-    {
-      CORBA::String_var the_name = this->poa_->the_name (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-      ACE_DEBUG ((LM_DEBUG, "Activating object with existing id = %d in  POA : %s\n", id, the_name.in ()));
-    }
+    ACE_DEBUG ((LM_DEBUG, "Activating object with existing id = %d in  POA : %s\n", id, this->poa_->the_name ()));
   this->id_factory_.set_last_used (id);
 
   // Convert CORBA::Long to ObjectId
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index cf63ccb0be1..798f24fb7f1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -17,11 +17,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_Notify_Properties::TAO_Notify_Properties (void)
   : factory_ (0)
   , builder_ (0)
-  , orb_(0)
-  , dispatching_orb_ (0)
   , asynch_updates_ (0)
   , allow_reconnect_ (false)
-  , separate_dispatching_orb_ (false)
   , updates_ (1)
 {
   // In case no conf. file is specified, the EC will default to reactive concurrency.
@@ -40,13 +37,8 @@ TAO_Notify_Properties::~TAO_Notify_Properties ()
 {
 }
 
-TAO_Notify_Properties *
-TAO_Notify_Properties::instance (void)
-{
-  // Hide the template instantiation to prevent multiple instances
-  // from being created.
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template class TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex> *TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex>::singleton_;
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 
-  return
-    TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>::instance ();
-}
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 98e38df5705..7ab3ec74637 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -46,9 +46,6 @@ public:
   /// Destructor
   ~TAO_Notify_Properties ();
 
-  /// Return a singleton instance of this class.
-  static TAO_Notify_Properties * instance (void);
-
   // = Property Accessors
   TAO_Notify_Factory* factory (void);
   void factory (TAO_Notify_Factory* factory);
@@ -58,8 +55,6 @@ public:
 
   CORBA::ORB_ptr orb (void);
   void orb (CORBA::ORB_ptr orb);
-  CORBA::ORB_ptr dispatching_orb (void);
-  void dispatching_orb (CORBA::ORB_ptr dispatching_orb);
 
   PortableServer::POA_ptr default_poa (void);
   void default_poa (PortableServer::POA_ptr default_poa);
@@ -73,8 +68,6 @@ public:
   // Turn on/off update messages.
   CORBA::Boolean updates (void);
   void updates (CORBA::Boolean updates);
-  bool separate_dispatching_orb (void);
-  void separate_dispatching_orb (bool b);
 
   // The QoS Property that must be applied to each newly created Event Channel
   const CosNotification::QoSProperties& default_event_channel_qos_properties (void);
@@ -116,9 +109,6 @@ protected:
   /// ORB
   CORBA::ORB_var orb_;
 
-  /// dispatching orb
-  CORBA::ORB_var dispatching_orb_;
-
   // POA
   PortableServer::POA_var default_poa_;
 
@@ -128,9 +118,6 @@ protected:
   /// True if clients can reconnect to proxies.
   bool allow_reconnect_;
 
-  /// True is separate dispatching orb
-  bool separate_dispatching_orb_;
-
   /// True if updates are enabled (default).
   CORBA::Boolean updates_;
 
@@ -153,10 +140,9 @@ protected:
   CosNotification::QoSProperties pc_qos_;
 };
 
-/**
- * @todo Remove this legacy TAO_Notify_Properties typedef.
- */
-typedef TAO_Notify_Properties TAO_Notify_PROPERTIES;
+TAO_NOTIFY_SERV_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYNCH_MUTEX)
+
+typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES;
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
index e48c65afbed..c53e7087f8e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
@@ -34,24 +34,12 @@ TAO_Notify_Properties::orb (void)
   return CORBA::ORB::_duplicate (orb_.in ());
 }
 
-ACE_INLINE CORBA::ORB_ptr
-TAO_Notify_Properties::dispatching_orb (void)
-{
-  return CORBA::ORB::_duplicate (dispatching_orb_.in ());
-}
-
 ACE_INLINE void
 TAO_Notify_Properties::orb (CORBA::ORB_ptr orb)
 {
   orb_ = CORBA::ORB::_duplicate (orb);
 }
 
-ACE_INLINE void
-TAO_Notify_Properties::dispatching_orb (CORBA::ORB_ptr dispatching_orb)
-{
-  dispatching_orb_ = CORBA::ORB::_duplicate (dispatching_orb);
-}
-
 ACE_INLINE PortableServer::POA_ptr
 TAO_Notify_Properties::default_poa (void)
 {
@@ -88,18 +76,6 @@ TAO_Notify_Properties::allow_reconnect (bool b)
   this->allow_reconnect_ = b;
 }
 
-ACE_INLINE bool
-TAO_Notify_Properties::separate_dispatching_orb (void)
-{
-  return this->separate_dispatching_orb_;
-}
-
-ACE_INLINE void
-TAO_Notify_Properties::separate_dispatching_orb (bool b)
-{
-  this->separate_dispatching_orb_ = b;
-}
-
 ACE_INLINE CORBA::Boolean
 TAO_Notify_Properties::updates (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
index 20131d3e299..6a5aff084e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "tao/TAO_Singleton.h"
 #include "orbsvcs/Notify/RT_Properties.h"
 
 #if ! defined (__ACE_INLINE__)
@@ -20,14 +19,4 @@ TAO_Notify_RT_Properties::~TAO_Notify_RT_Properties ()
 {
 }
 
-TAO_Notify_RT_Properties *
-TAO_Notify_RT_Properties::instance (void)
-{
-  // Hide the template instantiation to prevent multiple instances
-  // from being created.
-
-  return
-    TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX>::instance ();
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
index 0dadf2b1533..124f8757145 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
@@ -18,6 +18,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Singleton.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -30,14 +31,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_RT_Notify_Export TAO_Notify_RT_Properties
 {
+  friend class TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX>;
+
 public:
   /// Constuctor
   TAO_Notify_RT_Properties (void);
 
   /// Destructor
   ~TAO_Notify_RT_Properties ();
-  /// Return singleton instance of this class.
-  static TAO_Notify_RT_Properties * instance (void);
 
   RTCORBA::RTORB_ptr rt_orb (void);
   void rt_orb (RTCORBA::RTORB_ptr rt_orb);
@@ -53,10 +54,9 @@ protected:
   RTCORBA::Current_var current_;
 };
 
-/**
- * @todo Remove this legacy TAO_Notify_RT_Properties typedef.
- */
-typedef TAO_Notify_RT_Properties TAO_Notify_RT_PROPERTIES;
+TAO_RT_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX)
+
+typedef TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX> TAO_Notify_RT_PROPERTIES;
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 222e4a5172d..19f972cd0cc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -6,8 +6,6 @@ ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$")
 
 #include "ace/Reactor.h"
 #include "tao/debug.h"
-#include "tao/Stub.h" // For debug messages printing out ORBid.
-#include "tao/ORB_Core.h"
 #include "orbsvcs/Notify/QoSProperties.h"
 #include "orbsvcs/Notify/ProxySupplier.h"
 #include "orbsvcs/Notify/Worker_Task.h"
@@ -44,49 +42,8 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p
     ACE_THROW (CORBA::BAD_PARAM());
   }
 
-  if (!TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb ())
-    {
-      this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (push_consumer);
-      this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer);
-    }
-  else
-    {
-      // "Port" consumer's object reference from receiving ORB to dispatching ORB.
-      CORBA::String_var temp =
-        TAO_Notify_PROPERTIES::instance()->orb()->object_to_string(push_consumer);
-
-      CORBA::Object_var obj =
-        TAO_Notify_PROPERTIES::instance()->dispatching_orb()->string_to_object(temp.in());
-
-      ACE_TRY
-        {
-          CosNotifyComm::SequencePushConsumer_var new_push_consumer =  
-            CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in());
-          ACE_TRY_CHECK;
-
-          this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (new_push_consumer.in());
-          this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (new_push_consumer.in());
-
-          //--cj verify dispatching ORB
-          if (TAO_debug_level >= 10)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) Sequence push init dispatching ORB id is %s.\n",
-                          obj->_stubobj()->orb_core()->orbid()));
-            }
-          //--cj end
-        }
-      ACE_CATCH (CORBA::TRANSIENT, ex)
-        {
-          ACE_PRINT_EXCEPTION (ex, "Got a TRANSIENT in NS_SequencePushConsumer::init");
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_SequencePushConsumer %@\n", this));
-        }
-      ACE_CATCHANY
-        {
-          // _narrow failed
-        }
-      ACE_ENDTRY;
-    }
+  this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (push_consumer);
+  this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer);
 }
 
 void
@@ -302,13 +259,6 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::StructuredEvent& /
 void
 TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_batch ACE_ENV_ARG_DECL)
 {
-  //--cj verify dispatching ORB
-  if (TAO_debug_level >= 10) {
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sequence push dispatching ORB id is %s.\n",
-                this->push_consumer_->_stubobj()->orb_core()->orbid()));
-  }
-  //--cj end
-
   this->push_consumer_->push_structured_events (event_batch ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index 2876d6b16d9..6fdfd47f2ab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -64,9 +64,6 @@ public:
   /// Init the service.
   virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) = 0;
 
-  /// Init the service with separate dispatching orb.
-  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL) = 0;
-
   /// Create the Channel Factory.
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (
       PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 7739b12b707..feb1b56c29c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -3,11 +3,9 @@
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$")
 
-#include "ace/Bound_Ptr.h"
-#include "tao/Stub.h" // For debug messages printing out ORBid.
-#include "tao/ORB_Core.h"
 #include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/Notify/Event.h"
+#include "ace/Bound_Ptr.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -31,48 +29,10 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p
     ACE_THROW (CORBA::BAD_PARAM());
   }
 
-  if (!TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb ())
-    {
-      this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (push_consumer);
-      this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer);
-    }
-  else
-    {
-      // "Port" consumer's object reference from receiving ORB to dispatching ORB.
-      CORBA::String_var temp =
-        TAO_Notify_PROPERTIES::instance()->orb()->object_to_string(push_consumer);
-
-      CORBA::Object_var obj =
-        TAO_Notify_PROPERTIES::instance()->dispatching_orb()->string_to_object(temp.in());
-
-      ACE_TRY
-        {
-          CosNotifyComm::StructuredPushConsumer_var new_push_consumer =  
-            CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (new_push_consumer.in());
-          this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (new_push_consumer.in());
-          //--cj verify dispatching ORB
-          if (TAO_debug_level >= 10)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) Structured push init dispatching ORB id is %s.\n",
-                          obj->_stubobj()->orb_core()->orbid()));
-          }
-          //--cj end
-        }
-      ACE_CATCH (CORBA::TRANSIENT, ex)
-        {
-          ACE_PRINT_EXCEPTION (ex, "Got a TRANSIENT in NS_StructuredPushConsumer::init");
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_StructuredPushConsumer %@\n", this));
-        }
-      ACE_CATCHANY
-        {
-          // _narrow failed
-        }
-      ACE_ENDTRY;
-    }
+  this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (push_consumer);
+
+  this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer);
+
 }
 
 void
@@ -95,15 +55,7 @@ TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event ACE_ENV_ARG_DEC
 void
 TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
 {
-  //--cj verify dispatching ORB
-  if (TAO_debug_level >= 10) {
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Structured push dispatching ORB id is %s.\n",
-                this->push_consumer_->_stubobj()->orb_core()->orbid()));
-  }
-  //--cj end
-
   this->push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 /// Push a batch of events to this consumer.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index 13db06d87ae..2c63bc2bff5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(PortableGroup) : orbsvcslib, install, naming, iormanip, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_versioning_idl_defaults {
+project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba, tao_versioning_idl_defaults {
   sharedname   = TAO_PortableGroup
   idlflags    += -Wb,export_macro=TAO_PortableGroup_Export \
                  -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 721359a0343..804e235f797 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -1,9 +1,11 @@
 #include "orbsvcs/PortableGroup/GOA.h"
 
+
 ACE_RCSID (PortableGroup,
            GOA,
            "$Id$")
 
+
 #include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
 #include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
index 8c1166bdea2..92ffc461d20 100644
--- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTCORBAEvent) : orbsvcslib, install, rtevent_serv, rtportableserver {
+project(RTCORBAEvent) : orbsvcslib, core, rtevent_serv, rtportableserver {
   sharedname   = TAO_RTCORBAEvent
   dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL
   tagchecks   += RTCORBAEvent
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
index 94148b2c927..0350cf8953f 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTCosScheduling) : orbsvcslib, install, rtportableserver, interceptors, codecfactory, tao_versioning_idl_defaults {
+project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors, codecfactory, tao_versioning_idl_defaults {
   sharedname    = TAO_RTCosScheduling
   idlflags     += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h
   dynamicflags += TAO_RTCOSSCHEDULING_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index 1ca50aee3ce..f1dd98291a5 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEvent) : orbsvcslib, install, svc_utils, tao_versioning_idl_defaults {
+project(RTEvent) : orbsvcslib, core, svc_utils, tao_versioning_idl_defaults {
   sharedname   = TAO_RTEvent
-  idlflags    += -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h
+  idlflags    += -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h
   dynamicflags = TAO_RTEVENT_BUILD_DLL
   tagchecks   += RTEvent
 
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index e53de9dcf45..5ecee5826dd 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEventLogAdmin_IDL) : orbsvcslib, install, dslogadmin, rtevent, tao_versioning_idl_defaults {
+project(RTEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, rtevent, tao_versioning_idl_defaults {
   custom_only = 1
   idlflags   += -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h
 
@@ -10,7 +10,7 @@ project(RTEventLogAdmin_IDL) : orbsvcslib, install, dslogadmin, rtevent, tao_ver
   }
 }
 
-project(RTEventLogAdmin) : orbsvcslib, install, dslogadmin, rtevent {
+project(RTEventLogAdmin) : orbsvcslib, core, dslogadmin, rtevent {
   sharedname   = TAO_RTEventLogAdmin
   dynamicflags = TAO_RTEVENTLOG_BUILD_DLL
   tagchecks   += RTEventLog
@@ -44,7 +44,7 @@ project(RTEventLogAdmin) : orbsvcslib, install, dslogadmin, rtevent {
   }
 }
 
-project(RTEventLogAdmin_Skel) : orbsvcslib, install, rteventlogadmin, dslogadmin_skel, rtevent_skel, portableserver {
+project(RTEventLogAdmin_Skel) : orbsvcslib, core, rteventlogadmin, dslogadmin_skel, rtevent_skel, portableserver {
   sharedname   = TAO_RTEventLogAdmin_Skel
   dynamicflags = TAO_RTEVENTLOG_SKEL_BUILD_DLL
   tagchecks   += RTEventLog
@@ -58,14 +58,17 @@ project(RTEventLogAdmin_Skel) : orbsvcslib, install, rteventlogadmin, dslogadmin
 
   Header_Files {
     RTEventLogAdminS.h
+    RTEventLogAdminS_T.h
     Log/rteventlog_skel_export.h
   }
 
   Inline_Files {
     RTEventLogAdminS.inl
+    RTEventLogAdminS_T.inl
   }
 
   Template_Files {
+    RTEventLogAdminS_T.cpp
   }
 
   Pkgconfig_Files {
@@ -73,7 +76,7 @@ project(RTEventLogAdmin_Skel) : orbsvcslib, install, rteventlogadmin, dslogadmin
   }
 }
 
-project(RTEventLogAdmin_Serv) : orbsvcslib, install, rteventlogadmin_skel, dslogadmin_serv, rtevent_serv, rtsched {
+project(RTEventLogAdmin_Serv) : orbsvcslib, core, rteventlogadmin_skel, dslogadmin_serv, rtevent_serv, rtsched {
   sharedname   = TAO_RTEventLogAdmin_Serv
   dynamicflags = TAO_RTEVENTLOG_SERV_BUILD_DLL
   tagchecks   += RTEventLog
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
index 4d7959ca5ff..1e9797263d9 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEvent_Serv) : orbsvcslib, install, rtevent_skel, svc_utils, messaging {
+project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging {
   avoids      += ace_for_tao  // Requires ACE_crc32
   sharedname   = TAO_RTEvent_Serv
   dynamicflags = TAO_RTEVENT_SERV_BUILD_DLL
@@ -81,7 +81,6 @@ project(RTEvent_Serv) : orbsvcslib, install, rtevent_skel, svc_utils, messaging
     Event/EC_TPC_Factory.cpp
     Event/EC_TPC_ProxyConsumer.cpp
     Event/EC_TPC_ProxySupplier.cpp
-    Event/EC_Thread_Flags.cpp
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
index 8f1b053b55a..6a8bb6d38b6 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEvent_Skel) : orbsvcslib, install, rtevent, portableserver {
+project(RTEvent_Skel) : orbsvcslib, core, rtevent, portableserver {
   sharedname   = TAO_RTEvent_Skel
   dynamicflags = TAO_RTEVENT_SKEL_BUILD_DLL
   tagchecks   += RTEvent
diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
index 0466e207845..e56df1c1027 100644
--- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTKokyuEvent) : orbsvcslib, install, rtevent_serv, rtsched, kokyu {
+project(RTKokyuEvent) : orbsvcslib, core, rtevent_serv, rtsched, kokyu {
   sharedname   = TAO_RTKokyuEvent
   dynamicflags = TAO_RTKOKYUEVENT_BUILD_DLL
   tagchecks   += RTKokyuEvent
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index ac57c4acf29..4659069665c 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTSched) : orbsvcslib, install, naming, portableserver, svc_utils, tao_versioning_idl_defaults {
+project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils, tao_versioning_idl_defaults {
   sharedname   = TAO_RTSched
   idlflags    += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h
   dynamicflags = TAO_RTSCHED_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
index 0d27ece1fb1..e23e9e8e73f 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTSchedEvent) : orbsvcslib, install, rtevent_serv, rtsched {
+project(RTSchedEvent) : orbsvcslib, core, rtevent_serv, rtsched {
   sharedname   = TAO_RTSchedEvent
   dynamicflags = TAO_RTSCHEDEVENT_BUILD_DLL
   tagchecks   += RTSchedEvent
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
index e52a5621176..f43b2825357 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RT_Notification) : orbsvcslib, install, rtcorba, notification_serv, tao_versioning_idl_defaults {
+project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv, tao_versioning_idl_defaults {
   sharedname   = TAO_RT_Notification
   idlflags    += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h
   dynamicflags = TAO_RT_NOTIFY_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index d503a35ee0b..e59134bce9b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(SSLIOP) : orbsvcslib, install, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults {
+project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults {
   sharedname   = TAO_SSLIOP
   idlflags    += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS
   dynamicflags = TAO_SSLIOP_BUILD_DLL
@@ -21,7 +21,7 @@ project(SSLIOP) : orbsvcslib, install, security, ssl, pi_server, interceptors, t
   }
 
   IDL_Files {
-    idlflags += -Sci -Gp -Gd -Sa -Sorb \
+    idlflags += -Sci -Gp -Gd -Ge 1 -Sa -Sorb \
                 -o SSLIOP
     idlflags -= -St
     SSLIOP/ssl_endpoints.pidl
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 8ddb0ade83d..8dd22d19cc0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -82,9 +82,6 @@ TAO::SSLIOP::Connection_Handler::open_handler (void *v)
 int
 TAO::SSLIOP::Connection_Handler::open (void *)
 {
-  if (this->shared_open() == -1)
-    return -1;
-
   TAO_IIOP_Protocol_Properties protocol_properties;
 
   // Initialize values from ORB params.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 3a518859b10..849b5df814c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -57,6 +57,11 @@ namespace TAO
       Connection_Handler (ACE_Thread_Manager* t = 0);
 
       /// Constructor.
+      /**
+       * @param arg Parameter is used by the Acceptor to pass the
+       *        protocol configuration properties for this
+       *        connection.
+       */
       Connection_Handler (TAO_ORB_Core *orb_core,
                           CORBA::Boolean flag);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 0b99b5e4a03..32174c6b252 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -635,9 +635,9 @@ TAO::SSLIOP::Connector::ssliop_connect (
       this->active_connect_strategy_->synch_options (max_wait_time,
                                                      synch_options);
 
-      // The code used to set the timeout to zero, with the intent of
+      // The code used to set the timeout to zero, with the intent of 
       // polling the reactor for connection completion. However, the side-effect
-      // was to cause the connection to timeout immediately.
+      // was to cause the connection to timeout immediately. 
 
       // We obtain the transport in the <svc_handler> variable.  As we
       // know now that the connection is not available in Cache we can
@@ -705,16 +705,9 @@ TAO::SSLIOP::Connector::ssliop_connect (
           return 0;
         }
 
-      // fix for bug 2654
-      if (svc_handler->keep_waiting ())
+      if (transport->connection_handler ()->keep_waiting ()) 
         {
-          svc_handler->connection_pending ();
-        }
-
-      // fix for bug 2654
-      if (svc_handler->error_detected ())
-        {
-          svc_handler->cancel_pending_connection ();
+          svc_handler->add_reference ();
         }
 
       // At this point, the connection has be successfully connected.
@@ -748,14 +741,6 @@ TAO::SSLIOP::Connector::ssliop_connect (
           return 0;
         }
 
-      // fix for bug 2654
-      if (svc_handler->error_detected ())
-        {
-          svc_handler->cancel_pending_connection ();
-          transport->purge_entry();
-          return 0;
-        }
-
       if (transport->is_connected () &&
           transport->wait_strategy ()->register_handler () != 0)
         {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
index 38cd13aa8b5..8c43b8a5b68 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@dre,vanderbilt.edu>
  */
 //=============================================================================
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index eacb3f95893..704db51dc53 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -74,8 +74,8 @@ namespace TAO
       virtual TAO_Endpoint *next (void);
       virtual int addr_to_string (char *buffer, size_t length);
 
-      /// Return true if this endpoint is equivalent to @a
-      /// other_endpoint The relationship is defined as equivalency of
+      /// Return true if this endpoint is equivalent to @param
+      /// other_endpoint. The relationship is defined as equivalency of
       /// their qop, hostname and ssl ports (if non-zero).
       /// Two endpoints may be equivalent even if their iiop counterparts are
       /// not. In fact, there are cases (as with the LPL processing)
@@ -111,7 +111,6 @@ namespace TAO
 
       /// Mutator to our IIOP counterpart.
       /**
-       * @param endpoint The new endpoint
        * @param destroy If set to @c true, the TAO::SSLIOP::Endpoint
        *                object retains ownership of the given
        *                TAO_IIOP_Endpoint.
diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc
index 49df28927b9..fb03dc6acc9 100644
--- a/TAO/orbsvcs/orbsvcs/Security.mpc
+++ b/TAO/orbsvcs/orbsvcs/Security.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Security) : orbsvcslib, corba_messaging, install, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults {
+project(Security) : orbsvcslib, corba_messaging, core, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults {
   sharedname   = TAO_Security
   idlflags    += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h
   dynamicflags = TAO_SECURITY_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
index 018e6daf69b..58a1162f82e 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
@@ -21,8 +21,6 @@
 
 #include "tao/Policy.pidl"
 #include "tao/TimeBase.pidl"
-#include "tao/StringSeq.pidl"
-#include "tao/WStringSeq.pidl"
 
 #pragma prefix "adiron.com"
 
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
index aeb32deef58..6d3f2ea5626 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Svc_Utils) : orbsvcslib, install, portableserver, tao_versioning_idl_defaults {
+project(Svc_Utils) : orbsvcslib, core, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_Svc_Utils
   idlflags    += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h
   dynamicflags = TAO_SVC_UTILS_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 90b01c53853..d7e3826625e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -2,7 +2,6 @@
 
 #include "orbsvcs/Trader/Constraint_Interpreter.h"
 #include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
-#include "orbsvcs/Trader/Constraint_Tokens.h"
 
 ACE_RCSID (Trader,
            Constraint_Interpreter,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 5507d9ed689..dd5ddc1e92b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -2,7 +2,6 @@
 
 #include "orbsvcs/Trader/Constraint_Nodes.h"
 #include "orbsvcs/Trader/Constraint_Visitors.h"
-#include "orbsvcs/Trader/Constraint_Tokens.h"
 
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_string.h"
@@ -278,23 +277,12 @@ TAO_Property_Constraint::accept (TAO_Constraint_Visitor* visitor)
   return visitor->visit_property (this);
 }
 
-TAO_Expression_Type
-TAO_Property_Constraint::expr_type (void) const
-{
-  return TAO_IDENT;
-}
-
 const char*
 TAO_Property_Constraint::name (void) const
 {
   return name_;
 }
 
-TAO_Literal_Constraint::TAO_Literal_Constraint (void)
-  : type_ (TAO_UNKNOWN)
-{
-}
-
 TAO_Literal_Constraint::
 TAO_Literal_Constraint (const TAO_Literal_Constraint& lit)
   : TAO_Constraint (lit)
@@ -333,7 +321,7 @@ TAO_Literal_Constraint (CORBA::Any* any)
         {
           CORBA::Short sh;
           any_ref >>= sh;
-          this->op_.integer_ = static_cast<CORBA::LongLong> (sh);
+          this->op_.integer_ = (CORBA::Long) sh;
         }
       else
         any_ref >>= this->op_.integer_;
@@ -344,7 +332,7 @@ TAO_Literal_Constraint (CORBA::Any* any)
         {
           CORBA::UShort sh;
           any_ref >>= sh;
-          this->op_.uinteger_ = static_cast<CORBA::ULongLong> (sh);
+          this->op_.uinteger_ = (CORBA::ULong) sh;
         }
       else
         any_ref >>= this->op_.uinteger_;
@@ -377,13 +365,13 @@ TAO_Literal_Constraint (CORBA::Any* any)
     }
 }
 
-TAO_Literal_Constraint::TAO_Literal_Constraint (CORBA::ULongLong uinteger)
+TAO_Literal_Constraint::TAO_Literal_Constraint (CORBA::ULong uinteger)
   : type_ (TAO_UNSIGNED)
 {
   this->op_.uinteger_ = uinteger;
 }
 
-TAO_Literal_Constraint::TAO_Literal_Constraint (CORBA::LongLong integer)
+TAO_Literal_Constraint::TAO_Literal_Constraint (CORBA::Long integer)
   : type_ (TAO_SIGNED)
 {
   this->op_.integer_ = integer;
@@ -430,52 +418,52 @@ TAO_Literal_Constraint::operator CORBA::Boolean (void) const
   return (this->type_ == TAO_BOOLEAN) ? this->op_.bool_ : 0;
 }
 
-TAO_Literal_Constraint::operator CORBA::ULongLong (void) const
+TAO_Literal_Constraint::operator CORBA::ULong (void) const
 {
-  CORBA::ULongLong return_value = 0;
+  CORBA::ULong return_value = (CORBA::ULong)0;
 
   if (this->type_ == TAO_UNSIGNED)
     return_value = this->op_.uinteger_;
   else if (this->type_ == TAO_SIGNED)
     return_value =
-      (this->op_.integer_ > 0) ?
-        static_cast<CORBA::ULongLong> (this->op_.integer_) : 0;
+      (this->op_.integer_ > 0) ? (CORBA::ULong) this->op_.integer_ : 0;
   else if (this->type_ == TAO_DOUBLE)
     return_value =
       (this->op_.double_ > 0) ?
-      ((this->op_.double_ > ACE_UINT64_MAX) ?
-       ACE_UINT64_MAX :
-       static_cast<CORBA::ULongLong> (this->op_.double_)) : 0;
+      ((this->op_.double_ > ACE_UINT32_MAX) ?
+       ACE_UINT32_MAX :
+       (CORBA::ULong) this->op_.double_)
+      : 0;
 
   return return_value;
 }
 
-TAO_Literal_Constraint::operator CORBA::LongLong (void) const
+TAO_Literal_Constraint::operator CORBA::Long (void) const
 {
-  CORBA::LongLong return_value = 0;
+  CORBA::Long return_value = (CORBA::Long)0;
 
   if (this->type_ == TAO_SIGNED)
     return_value = this->op_.integer_;
   else if (this->type_ == TAO_UNSIGNED)
     return_value =
-      (this->op_.uinteger_ > static_cast<CORBA::ULongLong> (ACE_INT64_MAX)) ?
-      ACE_INT64_MAX : static_cast<CORBA::LongLong> (this->op_.uinteger_);
+      (this->op_.uinteger_ > (CORBA::ULong) ACE_INT32_MAX) ?
+      ACE_INT32_MAX : (CORBA::Long) this->op_.uinteger_;
   else if (this->type_ == TAO_DOUBLE)
     return_value  =
       (this->op_.double_ > 0) ?
-      ((this->op_.double_ > ACE_INT64_MAX) ?
-       ACE_INT64_MAX :
-       static_cast<CORBA::LongLong> (this->op_.double_)) :
-    ((this->op_.double_ < ACE_INT64_MIN) ?
-     ACE_INT64_MIN :
-     static_cast<CORBA::LongLong> (this->op_.double_));
+      ((this->op_.double_ > ACE_INT32_MAX) ?
+       ACE_INT32_MAX :
+       (CORBA::Long) this->op_.double_) :
+    ((this->op_.double_ < ACE_INT32_MIN) ?
+     ACE_INT32_MIN :
+     (CORBA::Long) this->op_.double_);
 
   return return_value;
 }
 
 TAO_Literal_Constraint::operator CORBA::Double (void) const
 {
-  CORBA::Double return_value = 0.0;
+  CORBA::Double return_value = (CORBA::Double)0.0;
 
   if (this->type_ == TAO_DOUBLE)
     return_value = this->op_.double_;
@@ -520,12 +508,10 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
     {
     case CORBA::tk_ushort:
     case CORBA::tk_ulong:
-    case CORBA::tk_ulonglong:
       return_value = TAO_UNSIGNED;
       break;
     case CORBA::tk_long:
     case CORBA::tk_short:
-    case CORBA::tk_longlong:
       return_value = TAO_SIGNED;
       break;
     case CORBA::tk_boolean:
@@ -586,12 +572,10 @@ operator== (const TAO_Literal_Constraint& left,
       return_value = (CORBA::Double) left == (CORBA::Double) right;
       break;
     case TAO_SIGNED:
-      return_value = static_cast<CORBA::LongLong> (left) ==
-                     static_cast<CORBA::LongLong> (right);
+      return_value = (CORBA::Long) left == (CORBA::Long) right;
       break;
     case TAO_UNSIGNED:
-      return_value = static_cast<CORBA::ULongLong> (left) ==
-                     static_cast<CORBA::ULongLong> (right);
+      return_value = (CORBA::ULong) left == (CORBA::ULong) right;
       break;
     case TAO_BOOLEAN:
       return_value = (CORBA::Boolean) left == (CORBA::Boolean) right;
@@ -619,12 +603,10 @@ operator!= (const TAO_Literal_Constraint& left,
       return_value = (CORBA::Double) left != (CORBA::Double) right;
       break;
     case TAO_SIGNED:
-      return_value = static_cast<CORBA::LongLong> (left) !=
-                     static_cast<CORBA::LongLong> (right);
+      return_value = (CORBA::Long) left != (CORBA::Long) right;
       break;
     case TAO_UNSIGNED:
-      return_value = static_cast<CORBA::ULongLong> (left) !=
-                     static_cast<CORBA::ULongLong> (right);
+      return_value = (CORBA::ULong) left != (CORBA::ULong) right;
       break;
     case TAO_BOOLEAN:
       return_value = (CORBA::Boolean) left != (CORBA::Boolean) right;
@@ -651,12 +633,10 @@ operator< (const TAO_Literal_Constraint& left,
       return_value = (CORBA::Double) left < (CORBA::Double) right;
       break;
     case TAO_SIGNED:
-      return_value = static_cast<CORBA::LongLong> (left) <
-                     static_cast<CORBA::LongLong> (right);
+      return_value = (CORBA::Long) left < (CORBA::Long) right;
       break;
     case TAO_UNSIGNED:
-      return_value = static_cast<CORBA::ULongLong> (left) <
-                     static_cast<CORBA::ULongLong> (right);
+      return_value = (CORBA::ULong) left < (CORBA::ULong) right;
       break;
     case TAO_BOOLEAN:
       return_value = (CORBA::Boolean) left < (CORBA::Boolean) right;
@@ -683,12 +663,10 @@ operator<= (const TAO_Literal_Constraint& left,
       return_value = (CORBA::Double) left <= (CORBA::Double) right;
       break;
     case TAO_SIGNED:
-      return_value = static_cast<CORBA::LongLong> (left) <=
-                     static_cast<CORBA::LongLong> (right);
+      return_value = (CORBA::Long) left <= (CORBA::Long) right;
       break;
     case TAO_UNSIGNED:
-      return_value = static_cast<CORBA::ULongLong> (left) <=
-                     static_cast<CORBA::ULongLong> (right);
+      return_value = (CORBA::ULong) left <= (CORBA::ULong) right;
       break;
     }
 
@@ -712,12 +690,10 @@ operator> (const TAO_Literal_Constraint& left,
       return_value = (CORBA::Double) left > (CORBA::Double) right;
       break;
     case TAO_SIGNED:
-      return_value = static_cast<CORBA::LongLong> (left) >
-                     static_cast<CORBA::LongLong> (right);
+      return_value = (CORBA::Long) left > (CORBA::Long) right;
       break;
     case TAO_UNSIGNED:
-      return_value = static_cast<CORBA::ULongLong> (left) >
-                     static_cast<CORBA::ULongLong> (right);
+      return_value = (CORBA::ULong) left > (CORBA::ULong) right;
       break;
     }
 
@@ -741,12 +717,10 @@ operator>= (const TAO_Literal_Constraint& left,
       return_value = (CORBA::Double) left >= (CORBA::Double) right;
       break;
     case TAO_SIGNED:
-      return_value = static_cast<CORBA::LongLong> (left) >=
-                     static_cast<CORBA::LongLong> (right);
+      return_value = (CORBA::Long) left >= (CORBA::Long) right;
       break;
     case TAO_UNSIGNED:
-      return_value = static_cast<CORBA::ULongLong> (left) >=
-                     static_cast<CORBA::ULongLong> (right);
+      return_value = (CORBA::ULong) left >= (CORBA::ULong) right;
       break;
     }
 
@@ -785,22 +759,20 @@ operator+ (const TAO_Literal_Constraint& left,
     case TAO_DOUBLE:
       {
         CORBA::Double result = (CORBA::Double) left + (CORBA::Double) right;
-        return TAO_Literal_Constraint (result);
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-        CORBA::LongLong result = static_cast<CORBA::LongLong> (left) +
-                                 static_cast<CORBA::LongLong> (right);
-        return TAO_Literal_Constraint (result);
+        CORBA::Long result = (CORBA::Long) left + (CORBA::Long) right;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-        CORBA::ULongLong result = static_cast<CORBA::ULongLong> (left) +
-                                  static_cast<CORBA::ULongLong> (right);
-        return TAO_Literal_Constraint (result);
+        CORBA::ULong result = (CORBA::ULong) left + (CORBA::ULong) right;
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
-      return TAO_Literal_Constraint (static_cast<CORBA::LongLong> (0));
+      return TAO_Literal_Constraint ((CORBA::Long)0);
     }
 }
 
@@ -816,22 +788,20 @@ operator- (const TAO_Literal_Constraint& left,
     case TAO_DOUBLE:
       {
         CORBA::Double result = (CORBA::Double) left - (CORBA::Double) right;
-        return TAO_Literal_Constraint (result);
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-        CORBA::LongLong result = static_cast<CORBA::LongLong> (left) -
-                                 static_cast<CORBA::LongLong> (right);
-        return TAO_Literal_Constraint (result);
+        CORBA::Long result = (CORBA::Long) left - (CORBA::Long) right;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-        CORBA::ULongLong result = static_cast<CORBA::ULongLong> (left) -
-                                  static_cast<CORBA::ULongLong> (right);
-        return TAO_Literal_Constraint (result);
+        CORBA::ULong result = (CORBA::ULong) left - (CORBA::ULong) right;
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
-      return TAO_Literal_Constraint (static_cast<CORBA::LongLong> (0));
+      return TAO_Literal_Constraint ((CORBA::Long)0);
     }
 }
 
@@ -847,22 +817,20 @@ operator* (const TAO_Literal_Constraint& left,
     case TAO_DOUBLE:
       {
         CORBA::Double result = (CORBA::Double) left * (CORBA::Double) right;
-        return TAO_Literal_Constraint (result);
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-        CORBA::LongLong result = static_cast<CORBA::LongLong> (left) *
-                                 static_cast<CORBA::LongLong> (right);
-        return TAO_Literal_Constraint (result);
+        CORBA::Long result = (CORBA::Long) left * (CORBA::Long) right;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-        CORBA::ULongLong result = static_cast<CORBA::ULongLong> (left) *
-                                  static_cast<CORBA::ULongLong> (right);
-        return TAO_Literal_Constraint (result);
+        CORBA::ULong result = (CORBA::ULong) left * (CORBA::ULong) right;
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
-      return TAO_Literal_Constraint (static_cast<CORBA::LongLong> (0));
+      return TAO_Literal_Constraint ((CORBA::Long)0);
     }
 }
 
@@ -878,22 +846,20 @@ operator/ (const TAO_Literal_Constraint& left,
     case TAO_DOUBLE:
       {
         CORBA::Double result = (CORBA::Double) left / (CORBA::Double) right;
-        return TAO_Literal_Constraint (result);
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-        CORBA::LongLong result = static_cast<CORBA::LongLong> (left) /
-                                 static_cast<CORBA::LongLong> (right);
-        return TAO_Literal_Constraint (result);
+        CORBA::Long result = (CORBA::Long) left / (CORBA::Long) right;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-        CORBA::ULongLong result = static_cast<CORBA::ULongLong> (left) /
-                                  static_cast<CORBA::ULongLong> (right);
-        return TAO_Literal_Constraint (result);
+        CORBA::ULong result = (CORBA::ULong) left / (CORBA::ULong) right;
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
-      return TAO_Literal_Constraint (static_cast<CORBA::LongLong> (0));
+      return TAO_Literal_Constraint ((CORBA::Long)0);
     }
 }
 
@@ -905,21 +871,20 @@ operator- (const TAO_Literal_Constraint& operand)
     case TAO_DOUBLE:
       {
         CORBA::Double result = - (CORBA::Double) operand;
-        return TAO_Literal_Constraint (result);
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-        CORBA::LongLong result = - static_cast<CORBA::LongLong> (operand);
-        return TAO_Literal_Constraint (result);
+        CORBA::Long result = - (CORBA::Long) operand;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-        CORBA::LongLong result = - static_cast<CORBA::LongLong> (
-                                     static_cast<CORBA::ULongLong> (operand));
-        return TAO_Literal_Constraint (static_cast<CORBA::ULongLong> (result));
+        CORBA::Long result = - (CORBA::Long) ((CORBA::ULong) operand);
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
-      return TAO_Literal_Constraint (static_cast<CORBA::LongLong> (0));
+      return TAO_Literal_Constraint ((CORBA::Long)0);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index 5df82ffdd7e..6e9ccd203fd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -15,6 +15,8 @@
 #define TAO_CONSTRAINT_NODES_H
 #include /**/ "ace/pre.h"
 
+#include "orbsvcs/Trader/Constraint_Tokens.h"
+
 #include "tao/Basic_Types.h"
 #include "tao/String_Manager_T.h"
 
@@ -199,7 +201,8 @@ public:
 
   virtual int accept (TAO_Constraint_Visitor* visitor);
 
-  virtual TAO_Expression_Type expr_type (void) const;
+  virtual TAO_Expression_Type expr_type (void) const
+    { return TAO_IDENT; }
 
   /// Returns the name of the property.
   const char* name (void) const;
@@ -223,13 +226,14 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
 {
  public:
 
-  TAO_Literal_Constraint (void);
+  TAO_Literal_Constraint (void)
+    : type_ (TAO_UNKNOWN) {}
 
   // = Constructors for each of the various types of literals.
 
   TAO_Literal_Constraint (CORBA::Any* any);
-  TAO_Literal_Constraint (CORBA::ULongLong uinteger);
-  TAO_Literal_Constraint (CORBA::LongLong integer);
+  TAO_Literal_Constraint (CORBA::ULong uinteger);
+  TAO_Literal_Constraint (CORBA::Long integer);
   TAO_Literal_Constraint (CORBA::Boolean boolean);
   TAO_Literal_Constraint (CORBA::Double doub);
   TAO_Literal_Constraint (const char* str);
@@ -251,8 +255,8 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
 
   // Conversion routines.
   operator CORBA::Boolean (void) const;
-  operator CORBA::ULongLong (void) const;
-  operator CORBA::LongLong (void) const;
+  operator CORBA::ULong (void) const;
+  operator CORBA::Long (void) const;
   operator CORBA::Double (void) const;
   operator const char* (void) const;
   operator const CORBA::Any* (void) const;
@@ -261,57 +265,57 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
 
   // = Comparison operators.
 
-  friend TAO_Trading_Serv_Export bool
+  friend bool
     operator< (const TAO_Literal_Constraint& left,
                const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export bool
+  friend bool
     operator<= (const TAO_Literal_Constraint& left,
                 const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export bool
+  friend bool
     operator> (const TAO_Literal_Constraint& left,
                const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export bool
+  friend bool
     operator>= (const TAO_Literal_Constraint& left,
                 const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export bool
+  friend bool
     operator== (const TAO_Literal_Constraint& left,
                 const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export bool
+  friend bool
     operator!= (const TAO_Literal_Constraint& left,
                 const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export bool
+  friend bool
     operator== (double left,
                 const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export bool
+  friend bool
     operator== (const TAO::String_Manager& left,
                 const TAO_Literal_Constraint& right);
 
   // = Arithmetic operators.
 
-  friend TAO_Trading_Serv_Export TAO_Literal_Constraint
+  friend TAO_Literal_Constraint
     operator+ (const TAO_Literal_Constraint& left,
                const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export TAO_Literal_Constraint
+  friend TAO_Literal_Constraint
     operator- (const TAO_Literal_Constraint& left,
                const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export TAO_Literal_Constraint
+  friend TAO_Literal_Constraint
     operator* (const TAO_Literal_Constraint& left,
                const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export TAO_Literal_Constraint
+  friend TAO_Literal_Constraint
     operator/ (const TAO_Literal_Constraint& left,
                const TAO_Literal_Constraint& right);
 
-  friend TAO_Trading_Serv_Export TAO_Literal_Constraint
+  friend TAO_Literal_Constraint
     operator- (const TAO_Literal_Constraint& operand);
 
   /// Ensure both operands are of the same simple numeric type.
@@ -332,8 +336,8 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
   {
     char* str_;
     CORBA::Any_ptr any_;
-    CORBA::ULongLong uinteger_;
-    CORBA::LongLong integer_;
+    CORBA::ULong uinteger_;
+    CORBA::Long integer_;
     CORBA::Boolean bool_;
     CORBA::Double double_;
   } op_;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
index a40ff4d15da..864f8a512be 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
@@ -4,43 +4,46 @@
 #define CONSTRAINT_TOKEN_H
 #include /**/ "ace/pre.h"
 
-#ifndef YYERRCODE
-#define YYERRCODE 256
-#endif
-
-#define TAO_GT 257
-#define TAO_GE 258
-#define TAO_LT 259
-#define TAO_LE 260
-#define TAO_EQ 261
-#define TAO_NE 262
-#define TAO_EXIST 263
-#define TAO_AND 264
-#define TAO_OR 265
-#define TAO_NOT 266
-#define TAO_IN 267
-#define TAO_TWIDDLE 268
-#define TAO_BOOLEAN 269
-#define TAO_PLUS 270
-#define TAO_MINUS 271
-#define TAO_MULT 272
-#define TAO_DIV 273
-#define TAO_UMINUS 274
-#define TAO_NUMBER 275
-#define TAO_RPAREN 276
-#define TAO_LPAREN 277
-#define TAO_IDENT 278
-#define TAO_STRING 279
-#define TAO_UNKNOWN 280
-#define TAO_SIGNED 281
-#define TAO_UNSIGNED 282
-#define TAO_DOUBLE 283
-#define TAO_CONSTRAINT 284
-#define TAO_SEQUENCE 285
-#define TAO_WITH 286
-#define TAO_MAX 287
-#define TAO_MIN 288
-#define TAO_FIRST 289
-#define TAO_RANDOM 290
+# define TAO_GT 257
+# define TAO_GE 258
+# define TAO_LT 259
+# define TAO_LE 260
+# define TAO_EQ 261
+# define TAO_NE 262
+# define TAO_EXIST 263
+# define TAO_AND 264
+# define TAO_OR 265
+# define TAO_NOT 266
+# define TAO_IN 267
+# define TAO_TWIDDLE 268
+# define TAO_BOOLEAN 269
+# define TAO_PLUS 270
+# define TAO_MINUS 271
+# define TAO_MULT 272
+# define TAO_DIV 273
+# define TAO_UMINUS 274
+# define TAO_NUMBER 275
+# define TAO_RPAREN 276
+# define TAO_LPAREN 277
+# define TAO_IDENT 278
+# define TAO_STRING 279
+# define TAO_UNKNOWN 280
+# define TAO_UNSIGNED 281
+# define TAO_SIGNED 282
+# define TAO_DOUBLE 283
+# define TAO_CONSTRAINT 284
+# define TAO_SEQUENCE 285
+# define TAO_WITH 286
+# define TAO_MAX 287
+# define TAO_MIN 288
+# define TAO_FIRST 289
+# define TAO_RANDOM 290
+
+
 #include /**/ "ace/post.h"
-#endif /* CONSTRAINT_TOKEN_H */
+#endif //CONSTRAINT_TOKEN_H
+
+
+
+
+
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 621aef465e1..74b6cb25967 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -3,7 +3,6 @@
 #include "orbsvcs/Trader/Constraint_Visitors.h"
 #include "orbsvcs/Trader/Constraint_Nodes.h"
 #include "orbsvcs/Trader/Interpreter_Utils_T.h"
-#include "orbsvcs/Trader/Constraint_Tokens.h"
 
 #include "tao/DynamicAny/DynSequence_i.h"
 
@@ -133,7 +132,7 @@ TAO_Constraint_Evaluator::visit_max (TAO_Unary_Constraint* unary_max)
 int
 TAO_Constraint_Evaluator::visit_random (TAO_Noop_Constraint *)
 {
-  TAO_Literal_Constraint random (static_cast<CORBA::LongLong> (ACE_OS::rand ()));
+  TAO_Literal_Constraint random ((CORBA::Long) (ACE_OS::rand ()));
   this->queue_.enqueue_head (random);
   return 0;
 }
@@ -141,7 +140,7 @@ TAO_Constraint_Evaluator::visit_random (TAO_Noop_Constraint *)
 int
 TAO_Constraint_Evaluator::visit_first (TAO_Noop_Constraint *)
 {
-  TAO_Literal_Constraint first (static_cast<CORBA::LongLong> (0));
+  TAO_Literal_Constraint first ((CORBA::Long) 0);
   this->queue_.enqueue_head (first);
   return 0;
 }
@@ -541,37 +540,25 @@ sequence_does_contain (CORBA::Any* sequence,
     {
     case CORBA::tk_short:
       {
-        CORBA::LongLong value = element;
+        CORBA::Long value = element;
         return_value = ::TAO_find (*sequence, static_cast<CORBA::Short> (value));
       }
     break;
     case CORBA::tk_ushort:
       {
-        CORBA::ULongLong value = element;
+        CORBA::ULong value = element;
         return_value = ::TAO_find (*sequence, static_cast<CORBA::UShort> (value));
       }
       break;
     case CORBA::tk_long:
       {
-        CORBA::LongLong value = element;
-        return_value = ::TAO_find (*sequence, static_cast<CORBA::Long> (value));
-      }
-      break;
-    case CORBA::tk_ulong:
-      {
-        CORBA::ULongLong value = element;
-        return_value = ::TAO_find (*sequence, static_cast<CORBA::ULong> (value));
-      }
-      break;
-    case CORBA::tk_longlong:
-      {
-        CORBA::LongLong value = element;
+        CORBA::Long value = element;
         return_value = ::TAO_find (*sequence, value);
       }
       break;
-    case CORBA::tk_ulonglong:
+    case CORBA::tk_ulong:
       {
-        CORBA::ULongLong value = element;
+        CORBA::ULong value = element;
         return_value = ::TAO_find (*sequence, value);
       }
       break;
@@ -685,44 +672,6 @@ operator () (TAO_DynSequence_i& dyn_any,
 }
 
 int
-TAO_Element_Equal<CORBA::LongLong>::
-operator () (TAO_DynSequence_i& dyn_any,
-             CORBA::LongLong element) const
-{
-  int return_value = 0;
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::LongLong value = dyn_any.get_longlong (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      return_value = (value == element);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return return_value;
-}
-
-int
-TAO_Element_Equal<CORBA::ULongLong>::
-operator () (TAO_DynSequence_i& dyn_any,
-             CORBA::ULongLong element) const
-{
-  int return_value = 0;
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULongLong value = dyn_any.get_ulonglong (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      return_value = (value == element);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return return_value;
-}
-
-int
 TAO_Element_Equal<CORBA::Float>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Float element) const
@@ -995,18 +944,15 @@ visit_div (TAO_Binary_Constraint* boolean_div)
         {
         case TAO_UNSIGNED:
           right_isnt_zero =
-            (static_cast<CORBA::ULongLong>
-               (*dynamic_cast<TAO_Literal_Constraint*> (right)) != 0);
+            ((CORBA::ULong) (*((TAO_Literal_Constraint*) right)) != 0);
           break;
         case TAO_SIGNED:
           right_isnt_zero =
-            (static_cast<CORBA::LongLong>
-               (*dynamic_cast<TAO_Literal_Constraint*> (right)) != 0);
+            ((CORBA::Long) (*((TAO_Literal_Constraint*) right)) != 0);
           break;
         case TAO_DOUBLE:
           right_isnt_zero =
-            (static_cast<CORBA::Double>
-               (*dynamic_cast<TAO_Literal_Constraint*> (right)) != 0.0);
+            ((CORBA::Double) (*((TAO_Literal_Constraint*) right)) != 0.0);
           break;
         }
 
@@ -1085,8 +1031,6 @@ visit_in (TAO_Binary_Constraint* binary_in)
                              seq_type == CORBA::tk_ushort ||
                              seq_type == CORBA::tk_long ||
                              seq_type == CORBA::tk_ulong ||
-                             seq_type == CORBA::tk_longlong ||
-                             seq_type == CORBA::tk_ulonglong ||
                              seq_type == CORBA::tk_float ||
                              seq_type == CORBA::tk_double);
             }
@@ -1238,7 +1182,7 @@ TAO_Constraint_Validator::expr_returns_number (TAO_Expression_Type expr_type)
   int return_value = 0;
 
   if ((expr_type >= TAO_PLUS && expr_type <= TAO_NUMBER) ||
-      (expr_type >= TAO_SIGNED && expr_type <= TAO_DOUBLE))
+      (expr_type >= TAO_UNSIGNED && expr_type <= TAO_DOUBLE))
     return_value = 1;
 
   return return_value;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index a36eea5d980..9bbba2e8755 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -404,27 +404,6 @@ public:
 };
 
 template<>
-class TAO_Element_Equal<CORBA::LongLong>
-{
-public:
-  /// Calls the correct method on dyn_seq to extract the element type,
-  /// then uses the appropriate form of equals comparison.
-  int operator () (TAO_DynSequence_i& dyn_any,
-                   CORBA::LongLong element) const;
-};
-
-template<>
-class TAO_Element_Equal<CORBA::ULongLong>
-{
-public:
-  /// Calls the correct method on dyn_seq to extract the element type, then
-  /// uses the appropriate form of equals comparison.
-  int operator () (TAO_DynSequence_i& dyn_any,
-                   CORBA::ULongLong element) const;
-
-};
-
-template<>
 class TAO_Element_Equal<CORBA::Float>
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index c3f0c5d4e28..a451f98e6a9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -1,18 +1,15 @@
-#define YY_NO_UNPUT
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Id$
+ * $Header$
  */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
 
-#include "ace/os_include/os_stdio.h"
-#include "ace/OS_NS_unistd.h"
-#include /**/ "tao/Versioned_Namespace.h"
-
+#include "tao/orbconf.h"
+#include "ace/OS.h"
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
 #ifdef c_plusplus
@@ -24,7 +21,6 @@
 
 #ifdef __cplusplus
 
-
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
 
@@ -41,13 +37,6 @@
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
@@ -283,18 +272,19 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 32
-#define YY_END_OF_BUFFER 33
-static yyconst short int yy_accept[81] =
+#define YY_NUM_RULES 31
+#define YY_END_OF_BUFFER 32
+static yyconst short int yy_accept[82] =
     {   0,
-        0,    0,   33,   31,   30,   31,   31,   22,   23,   14,
-       12,   13,   31,   15,   26,   16,   31,   18,   29,   29,
+        0,    0,   32,   30,   31,   30,   30,   22,   23,   14,
+       12,   13,   30,   15,   26,   16,   30,   18,   29,   29,
        29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       11,   21,    0,   28,    0,    0,   26,   27,   17,   20,
-       19,   29,   29,   29,   29,   29,   29,   10,   29,   29,
-       29,    9,   29,   29,    0,    0,   29,   29,    8,   29,
-       29,    2,    1,    7,   29,   29,    0,   27,   29,   24,
-       29,   29,   29,    5,   25,    6,    3,   29,    4,    0
+       11,   21,    0,   28,    0,   26,   27,    0,   26,   17,
+       20,   19,   29,   29,   29,   29,   29,   29,   10,   29,
+       29,   29,    9,   29,   29,    0,    0,   29,   29,    8,
+       29,   29,    2,    1,    7,   29,   29,    0,   27,   29,
+       24,   29,   29,   29,    5,   25,    6,    3,   29,    4,
+        0
     } ;
 
 static yyconst int yy_ec[256] =
@@ -338,70 +328,70 @@ static yyconst int yy_meta[42] =
         1
     } ;
 
-static yyconst short int yy_base[83] =
+static yyconst short int yy_base[84] =
     {   0,
-        0,    0,  108,  109,  109,   93,   38,  109,  109,  109,
-       33,   34,   94,  109,   37,   91,   90,   89,    0,   86,
-       80,   66,   59,   66,   63,   21,   61,   59,   67,   61,
-      109,  109,   46,  109,   47,   80,   42,   44,  109,  109,
-      109,    0,   71,   66,   61,   56,   51,    0,   46,   51,
-       46,    0,   49,   44,   51,   49,   59,   62,    0,   42,
-       38,    0,    0,    0,   46,   39,   57,   56,   49,    0,
-       28,   27,   29,    0,    0,    0,    0,   27,    0,  109,
-       76,   57
+        0,    0,  107,  108,  108,   92,   38,  108,  108,  108,
+       93,   92,   91,  108,   33,   88,   87,   86,    0,   83,
+       77,   63,   56,   63,   60,   17,   58,   56,   64,   58,
+      108,  108,   42,  108,   43,   77,   36,   76,   40,  108,
+      108,  108,    0,   67,   62,   57,   52,   47,    0,   42,
+       47,   42,    0,   45,   40,   47,   47,   55,   58,    0,
+       38,   34,    0,    0,    0,   42,   38,   54,   52,   44,
+        0,   23,   22,   23,    0,    0,    0,    0,   24,    0,
+      108,   72,   51
     } ;
 
-static yyconst short int yy_def[83] =
+static yyconst short int yy_def[84] =
     {   0,
-       80,    1,   80,   80,   80,   80,   81,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   82,   82,
-       82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-       80,   80,   81,   80,   80,   80,   80,   80,   80,   80,
-       80,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-       82,   82,   82,   82,   81,   80,   82,   82,   82,   82,
-       82,   82,   82,   82,   82,   82,   80,   80,   82,   82,
-       82,   82,   82,   82,   82,   82,   82,   82,   82,    0,
-       80,   80
+       81,    1,   81,   81,   81,   81,   82,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+       81,   81,   82,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   83,   83,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   82,   81,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   81,   81,   83,
+       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+        0,   81,   81
     } ;
 
-static yyconst short int yy_nxt[151] =
+static yyconst short int yy_nxt[150] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   15,   16,   17,   18,   19,   19,   19,   20,   19,
        19,   19,   21,   19,    4,    4,   22,   19,   23,   24,
        19,   25,   26,   27,   28,   29,   19,   19,   30,   19,
-       31,   34,   36,   36,   37,   37,   36,   49,   37,   34,
-       55,   36,   50,   37,   34,   38,   67,   67,   42,   79,
-       68,   56,   35,   78,   77,   76,   75,   68,   68,   74,
-       35,   55,   56,   73,   72,   35,   33,   33,   71,   70,
-       69,   66,   65,   64,   63,   62,   61,   60,   59,   58,
-       57,   38,   54,   53,   52,   51,   48,   47,   46,   45,
-
-       44,   43,   41,   40,   39,   38,   32,   80,    3,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80
+       31,   34,   38,   50,   39,   34,   56,   37,   51,   38,
+       34,   39,   43,   57,   68,   68,   80,   79,   69,   78,
+       77,   76,   35,   69,   57,   69,   35,   56,   75,   74,
+       73,   35,   33,   33,   72,   71,   70,   67,   66,   65,
+       64,   63,   62,   61,   60,   59,   58,   37,   36,   55,
+       54,   53,   52,   49,   48,   47,   46,   45,   44,   42,
+
+       41,   40,   37,   36,   36,   32,   81,    3,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81
     } ;
 
-static yyconst short int yy_chk[151] =
+static yyconst short int yy_chk[150] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    7,   11,   12,   11,   12,   15,   26,   15,   33,
-       35,   37,   26,   37,   55,   38,   56,   56,   82,   78,
-       56,   38,    7,   73,   72,   71,   69,   68,   67,   66,
-       33,   35,   38,   65,   61,   55,   81,   81,   60,   58,
-       57,   54,   53,   51,   50,   49,   47,   46,   45,   44,
-       43,   36,   30,   29,   28,   27,   25,   24,   23,   22,
-
-       21,   20,   18,   17,   16,   13,    6,    3,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80
+        1,    7,   15,   26,   15,   33,   35,   37,   26,   39,
+       56,   39,   83,   37,   57,   57,   79,   74,   57,   73,
+       72,   70,    7,   69,   37,   68,   33,   35,   67,   66,
+       62,   56,   82,   82,   61,   59,   58,   55,   54,   52,
+       51,   50,   48,   47,   46,   45,   44,   38,   36,   30,
+       29,   28,   27,   25,   24,   23,   22,   21,   20,   18,
+
+       17,   16,   13,   12,   11,    6,    3,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -415,7 +405,9 @@ static char *yy_last_accepting_cpos;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
+
 #define INITIAL 0
+
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 // $Id$
@@ -423,7 +415,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 //
 // = LIBRARY
 //    orbsvcs
-//
+// 
 // = FILENAME
 //    constraint.l
 //
@@ -439,8 +431,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 static TAO_Literal_Constraint* extract_string(const char*);
-static CORBA::LongLong trader_strtoll(const char* str, unsigned int base);
-static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base);
 
 #define TAO_YY_LEX_DEBUG
 
@@ -450,6 +440,7 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base);
 
 
 
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -462,9 +453,11 @@ extern int yywrap YY_PROTO(( void ));
 #endif
 #endif
 
+#if 0
 #ifndef YY_NO_UNPUT
 static void yyunput YY_PROTO(( int c, char *buf_ptr ));
 #endif
+#endif /* 0 */
 
 #ifndef yytext_ptr
 static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
@@ -509,6 +502,7 @@ YY_MALLOC_DECL
 #else
 #if __STDC__
 #ifndef __cplusplus
+#include <stdlib.h>
 #endif
 #else
 /* Just try to get by without declaring the routines.  This will fail
@@ -588,7 +582,7 @@ YY_MALLOC_DECL
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK ACE_NOTREACHED (break;)
+#define YY_BREAK break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -605,6 +599,8 @@ YY_DECL
 
 
 
+
+
 	if ( yy_init )
 		{
 		yy_init = 0;
@@ -654,13 +650,13 @@ yy_match:
 			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 >= 81 )
+				if ( yy_current_state >= 82 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 109 );
+		while ( yy_base[yy_current_state] != 108 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -688,167 +684,186 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_MIN; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 2:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_MAX; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 3:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_FIRST; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 4:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_RANDOM; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 5:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_WITH; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 6:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_EXIST; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 7:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_NOT; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 8:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_AND; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 9:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_OR; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 10:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_IN; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 11:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_TWIDDLE; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 12:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_PLUS; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 13:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_MINUS; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 14:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_MULT; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 15:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_DIV; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 16:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_LT; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 17:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_LE; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 18:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_GT; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 19:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_GE; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 20:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_EQ; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 21:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_NE; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 22:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_LPAREN; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 23:
 YY_RULE_SETUP
+
 { TAO_YY_LEX_DEBUG; return TAO_RPAREN; }
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 24:
 YY_RULE_SETUP
-{
-		  yylval.constraint_ =
-                    new TAO_Literal_Constraint(true);
+
+{ 
+		  yylval.constraint_ = 
+		    new TAO_Literal_Constraint(true);
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 25:
 YY_RULE_SETUP
-{
-		  yylval.constraint_ =
-                    new TAO_Literal_Constraint(false);
+
+{ 
+		  yylval.constraint_ = 
+		    new TAO_Literal_Constraint(false);
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 26:
 YY_RULE_SETUP
-{
-                  if (yytext[0] == '-')
-                    {
-                      yylval.constraint_ =
-		        new TAO_Literal_Constraint(
-                              trader_strtoll(yytext, 0));
-                    }
-                  else
-                    {
-                       yylval.constraint_ =
-                         new TAO_Literal_Constraint(
-                               trader_strtoull(yytext, 0));
-                    }
-		  TAO_YY_LEX_DEBUG; return TAO_NUMBER;
+
+{ 
+		  yylval.constraint_ = 
+		    new TAO_Literal_Constraint((yytext[0] == '-' ?
+                    (CORBA::Long)atoi(yytext) : (CORBA::ULong)atoi(yytext)));
+		  TAO_YY_LEX_DEBUG; return TAO_NUMBER; 
 		}
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 27:
 YY_RULE_SETUP
-{
-		  yylval.constraint_ =
-		    new TAO_Literal_Constraint(ACE_OS::strtod(yytext, 0));
-		  TAO_YY_LEX_DEBUG; return TAO_NUMBER;
+
+{ 
+		  yylval.constraint_ = 
+		    new TAO_Literal_Constraint((CORBA::Double)atof(yytext));
+		  TAO_YY_LEX_DEBUG; return TAO_NUMBER; 
 		}
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 28:
 YY_RULE_SETUP
-{
+
+{ 
 		  yylval.constraint_ = extract_string(yytext);
-		  TAO_YY_LEX_DEBUG; return TAO_STRING;
+		  TAO_YY_LEX_DEBUG; return TAO_STRING; 
 		}
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 29:
 YY_RULE_SETUP
-{
-		  yylval.constraint_ =
+
+{ 
+		  yylval.constraint_ = 
 		    new TAO_Property_Constraint(yytext);
-		  TAO_YY_LEX_DEBUG; return TAO_IDENT;
+		  TAO_YY_LEX_DEBUG; return TAO_IDENT; 
 		}
-	YY_BREAK
+	ACE_NOTREACHED (YY_BREAK)
 case 30:
 YY_RULE_SETUP
-{}
-	break;
-case 31:
-YY_RULE_SETUP
-{
+
+{ 
                   TAO_YY_LEX_DEBUG; return TAO_UNKNOWN;
                 }
-	YY_BREAK
-case 32:
+	ACE_NOTREACHED (YY_BREAK)
+case 31:
 YY_RULE_SETUP
+
 TAO_TRADER_ECHO;
-	break;
+	YY_BREAK
+
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1140,7 +1155,7 @@ static yy_state_type yy_get_previous_state()
 		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 >= 81 )
+			if ( yy_current_state >= 82 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1175,16 +1190,16 @@ yy_state_type yy_current_state;
 	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 >= 81 )
+		if ( yy_current_state >= 82 )
 			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 == 80);
+	yy_is_jam = (yy_current_state == 81);
 
 	return yy_is_jam ? 0 : yy_current_state;
 	}
 
-
+#if 0
 #ifndef YY_NO_UNPUT
 #ifdef YY_USE_PROTOS
 static void yyunput( int c, register char *yy_bp )
@@ -1228,9 +1243,8 @@ register char *yy_bp;
 	yy_c_buf_p = yy_cp;
 	}
 #endif	/* ifndef YY_NO_UNPUT */
+#endif /* 0 */
 
-
-#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -1253,7 +1267,7 @@ static int input()
 
 		else
 			{ /* need more input */
-			size_t offset = yy_c_buf_p - yytext_ptr;
+			int offset = yy_c_buf_p - yytext_ptr;
 			++yy_c_buf_p;
 
 			switch ( yy_get_next_buffer() )
@@ -1302,7 +1316,7 @@ static int input()
 
 	return c;
 	}
-#endif /* YY_NO_INPUT */
+
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )
@@ -1429,15 +1443,18 @@ FILE *file;
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
+#if defined (ACE_HAS_WINCE)
+    // Mimic the behavior as WinCE does not have isatty().
+    if ((file != 0) && (file == fileno(file))) {
+        b->yy_is_interactive = 1;
+    }
+    else {
+        b->yy_is_interactive = 0;
+    }
 #else
-	b->yy_is_interactive = file ? (ACE_OS::isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
+	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+#endif  // ACE_HAS_WINCE
+
 	}
 
 
@@ -1732,10 +1749,11 @@ int main()
 #endif
 
 
+
 TAO_Literal_Constraint*
 extract_string(const char* total)
 {
-  int prev_slash = 0,
+  int prev_slash = 0, 
     ctr = 0;
   char str[BUFSIZ],
    *tmp = (char*) total + 1;
@@ -1763,104 +1781,6 @@ extract_string(const char* total)
   return new TAO_Literal_Constraint(str);
 }
 
-CORBA::ULongLong
-trader_strtoull(const char* s, unsigned int base)
-{
-  CORBA::ULongLong result = 0;
-  CORBA::ULongLong previous = 0;
-
-  // Check for a valid base
-  if (!(base == 0 || base == 8 || base == 10 || base == 16))
-    {
-      errno = EINVAL;
-      return result;
-    }
-
-  if (*s == '+')
-    {
-      s++;
-    }
-
-  if ((base == 0 || base == 16) &&
-      *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
-    {
-      s += 2;
-      base = 16;
-    }
-  else if ((base == 0 || base == 8) && *s == '0')
-    {
-      s++;
-      base = 8;
-    }
-  else
-    {
-      base = 10;
-    }
-
-  for (; *s; ++s)
-    {
-      if (base == 8 && *s <= '7' && *s >= '0')
-        {
-          result = (result * base) + (*s - '0');
-        }
-      else if (base > 8 && *s <= '9' && *s >= '0')
-        {
-          result = (result * base) + (*s - '0');
-        }
-      else if (base > 10 && *s <= 'f' && *s >= 'a')
-        {
-          result = (result * base) + (*s - 'a' + 10);
-        }
-      else if (base > 10 && *s <= 'F' && *s >= 'A')
-        {
-          result = (result * base) + (*s - 'A' + 10);
-        }
-      else
-        { 
-          break;
-        }
-
-      // If the previous value is greater than result, then we have
-      // exceeded the size of a CORBA::ULongLong and the result
-      // will be ACE_UINT64_MAX.  However, errno will be set to ERANGE
-      if (previous > result)
-        {
-          errno = ERANGE;
-          result = ACE_UINT64_MAX;
-          break;
-        }
-      previous = result;
-    }
-
-  return result;
-}
-
-CORBA::LongLong
-trader_strtoll(const char* s, unsigned int base)
-{
-  // Check for the negative sign
-  bool negative = false;
-  if (*s == '-')
-    {
-      negative = true;
-      s++;
-    }
-
-  // Convert the raw text into a CORBA::LongLong
-  CORBA::LongLong result = static_cast<CORBA::LongLong> (
-                                         trader_strtoull(s, base));
-
-  // If the result that comes back is negative, then the value exceeded
-  // the maximum for CORBA::LongLong
-  if (result < 0)
-    {
-      errno = ERANGE;
-      return (negative ? ACE_INT64_MIN : ACE_INT64_MAX);
-    }
-
-  return (negative ? -result : result);
-}
-
 int
 yywrap (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff
deleted file mode 100644
index 0067720a575..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- Constraint_l.cpp.orig	2006-12-29 11:48:44.000000000 -0600
-+++ Constraint_l.cpp	2006-12-29 11:48:44.000000000 -0600
-@@ -11,6 +11,7 @@
- 
- #include "ace/os_include/os_stdio.h"
- #include "ace/OS_NS_unistd.h"
-+#include /**/ "tao/Versioned_Namespace.h"
- 
- 
- /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-@@ -94,6 +95,8 @@
- /* Size of default input buffer. */
- #define YY_BUF_SIZE 16384
- 
-+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-+
- typedef struct yy_buffer_state *YY_BUFFER_STATE;
- 
- extern int yyleng;
-@@ -499,6 +502,8 @@
- #define YY_NO_TOP_STATE 1
- #endif
- 
-+TAO_END_VERSIONED_NAMESPACE_DECL
-+
- #ifdef YY_MALLOC_DECL
- YY_MALLOC_DECL
- #else
-@@ -589,6 +594,8 @@
- #define YY_RULE_SETUP \
- 	YY_USER_ACTION
- 
-+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-+
- YY_DECL
- 	{
- 	register yy_state_type yy_current_state;
-@@ -831,7 +838,7 @@
- case 30:
- YY_RULE_SETUP
- {}
--	YY_BREAK
-+	break;
- case 31:
- YY_RULE_SETUP
- {
-@@ -841,7 +848,7 @@
- case 32:
- YY_RULE_SETUP
- TAO_TRADER_ECHO;
--	YY_BREAK
-+	break;
- case YY_STATE_EOF(INITIAL):
- 	yyterminate();
- 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index a47090bb330..4376a5b05ba 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -1,645 +1,900 @@
-#ifndef lint
-static char const
-yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $";
-#endif
-#include <stdlib.h>
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYLEX yylex()
-#define YYEMPTY -1
-#define yyclearin (yychar=(YYEMPTY))
-#define yyerrok (yyerrflag=0)
-#define YYRECOVERING() (yyerrflag!=0)
-
-#define YYPREFIX "yy"
-  /* $Id$*/
-/* ========================================================================*/
-/**/
-/* = LIBRARY*/
-/*    orbsvcs*/
-/* */
-/* = FILENAME*/
-/*    constraint.y*/
-/**/
-/* = AUTHOR*/
-/*    Seth Widoff <sbw1@cs.wustl.edu>*/
-/**/
-/* ========================================================================*/
+
+  // $Id$
+// ========================================================================
+//
+// = LIBRARY
+//    orbsvcs
+// 
+// = FILENAME
+//    constraint.y
+//
+// = AUTHOR
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
+// ========================================================================
 
 #include "ace/OS_NS_string.h"
-#include "ace/OS_NS_stdlib.h"
 #include "orbsvcs/Trader/Constraint_Interpreter.h"
 #include "orbsvcs/Trader/Constraint_Nodes.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-/*#define YYDEBUG 1*/
-#define YYERRCODE 256
-#define TAO_GT 257
-#define TAO_GE 258
-#define TAO_LT 259
-#define TAO_LE 260
-#define TAO_EQ 261
-#define TAO_NE 262
-#define TAO_EXIST 263
-#define TAO_AND 264
-#define TAO_OR 265
-#define TAO_NOT 266
-#define TAO_IN 267
-#define TAO_TWIDDLE 268
-#define TAO_BOOLEAN 269
-#define TAO_PLUS 270
-#define TAO_MINUS 271
-#define TAO_MULT 272
-#define TAO_DIV 273
-#define TAO_UMINUS 274
-#define TAO_NUMBER 275
-#define TAO_RPAREN 276
-#define TAO_LPAREN 277
-#define TAO_IDENT 278
-#define TAO_STRING 279
-#define TAO_UNKNOWN 280
-#define TAO_SIGNED 281
-#define TAO_UNSIGNED 282
-#define TAO_DOUBLE 283
-#define TAO_CONSTRAINT 284
-#define TAO_SEQUENCE 285
-#define TAO_WITH 286
-#define TAO_MAX 287
-#define TAO_MIN 288
-#define TAO_FIRST 289
-#define TAO_RANDOM 290
-const short yylhs[] = {                                        -1,
-    0,    0,    1,    1,    1,    1,    1,    2,    2,    3,
-    3,    4,    4,    4,    4,    4,    4,    4,    5,    5,
-    6,    6,    7,    7,    7,    8,    8,    8,    9,    9,
-   10,   10,   10,   10,   10,   10,   10,
-};
-const short yylen[] = {                                         2,
-    1,    1,    2,    2,    2,    1,    1,    3,    1,    3,
-    1,    3,    3,    3,    3,    3,    3,    1,    3,    1,
-    3,    1,    3,    3,    1,    3,    3,    1,    2,    1,
-    3,    2,    1,    1,    2,    1,    1,
-};
-const short yydefred[] = {                                      0,
-    0,    0,   37,    0,   34,    0,   33,   36,    0,    0,
-    0,    6,    7,    0,    2,    0,    0,   11,    0,    0,
-    0,    0,   28,   30,   32,   29,   35,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   31,    0,   10,   14,   15,
-   16,   17,   12,   13,   19,    0,    0,    0,   26,   27,
-};
-const short yydgoto[] = {                                      14,
-   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-};
-const short yysindex[] = {                                   -253,
- -278, -219,    0, -271,    0, -224,    0,    0, -224, -224,
- -224,    0,    0,    0,    0, -256, -252,    0, -195, -244,
- -251, -243,    0,    0,    0,    0,    0, -262, -256, -256,
- -256, -224, -224, -224, -224, -224, -224, -224, -224, -263,
- -224, -224, -224, -224, -224,    0, -252,    0,    0,    0,
-    0,    0,    0,    0,    0, -239, -243, -243,    0,    0,
-};
-const short yyrindex[] = {                                      0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   27,    8,    0,   11,   87,
-   61,    1,    0,    0,    0,    0,    0,    0,   38,   40,
-   43,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   28,    0,    0,    0,
-    0,    0,    0,    0,    0,   74,   21,   41,    0,    0,
-};
-const short yygindex[] = {                                      0,
-    0,   -4,   14,   24,   34,    0,   36,    6,   31,   76,
-};
-#define YYTABLESIZE 363
-const short yytable[] = {                                      25,
-   25,   28,   32,   27,   29,   30,   31,    9,   32,    1,
-   18,   33,    2,   46,   55,    3,   41,    4,   42,   43,
-   23,    5,   40,    6,    7,    8,    1,    8,   44,   45,
-   42,   43,    9,   10,   11,   12,   13,    5,    1,    4,
-   24,    2,    3,    1,    3,   47,    4,   57,   58,    3,
-    5,    4,    6,    7,    8,    5,   48,    6,    7,    8,
-   22,   34,   35,   36,   37,   38,   39,   49,   50,   51,
-   52,   53,   54,   21,   59,   60,   56,   26,    0,    0,
-    0,    0,    0,    0,    0,    0,   20,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   25,   25,   25,
-   25,   25,   25,    0,   25,   25,    0,   25,   25,    0,
-   25,   25,    9,    0,   18,   18,   25,   23,   23,   23,
-   23,   23,   23,    9,   23,   23,   18,   23,   23,    0,
-   23,   23,    8,    0,    0,    0,   23,   24,   24,   24,
-   24,   24,   24,    8,   24,   24,    0,   24,   24,    0,
-   24,   24,    0,    0,    0,    0,   24,   22,   22,   22,
-   22,   22,   22,    0,   22,   22,    0,   22,    0,    0,
-   21,   21,   21,   21,   21,   21,   22,   21,   21,    0,
-   21,    0,    0,   20,   20,   20,   20,   20,   20,   21,
-   20,   20,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   20,
-};
-const short yycheck[] = {                                     278,
-    0,    6,  265,  275,    9,   10,   11,    0,  265,  263,
-    0,  264,  266,  276,  278,  269,  268,  271,  270,  271,
-    0,  275,  267,  277,  278,  279,    0,    0,  272,  273,
-  270,  271,  286,  287,  288,  289,  290,    0,  263,    0,
-    0,  266,    0,  263,  269,   32,  271,   42,   43,  269,
-  275,  271,  277,  278,  279,  275,   33,  277,  278,  279,
-    0,  257,  258,  259,  260,  261,  262,   34,   35,   36,
-   37,   38,   39,    0,   44,   45,   41,    2,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,  261,  262,   -1,  264,  265,   -1,  267,  268,   -1,
-  270,  271,  265,   -1,  264,  265,  276,  257,  258,  259,
-  260,  261,  262,  276,  264,  265,  276,  267,  268,   -1,
-  270,  271,  265,   -1,   -1,   -1,  276,  257,  258,  259,
-  260,  261,  262,  276,  264,  265,   -1,  267,  268,   -1,
-  270,  271,   -1,   -1,   -1,   -1,  276,  257,  258,  259,
-  260,  261,  262,   -1,  264,  265,   -1,  267,   -1,   -1,
-  257,  258,  259,  260,  261,  262,  276,  264,  265,   -1,
-  267,   -1,   -1,  257,  258,  259,  260,  261,  262,  276,
-  264,  265,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  276,
-};
-#define YYFINAL 14
+//#define YYDEBUG 1
+# define TAO_GT 257
+# define TAO_GE 258
+# define TAO_LT 259
+# define TAO_LE 260
+# define TAO_EQ 261
+# define TAO_NE 262
+# define TAO_EXIST 263
+# define TAO_AND 264
+# define TAO_OR 265
+# define TAO_NOT 266
+# define TAO_IN 267
+# define TAO_TWIDDLE 268
+# define TAO_BOOLEAN 269
+# define TAO_PLUS 270
+# define TAO_MINUS 271
+# define TAO_MULT 272
+# define TAO_DIV 273
+# define TAO_UMINUS 274
+# define TAO_NUMBER 275
+# define TAO_RPAREN 276
+# define TAO_LPAREN 277
+# define TAO_IDENT 278
+# define TAO_STRING 279
+# define TAO_UNKNOWN 280
+# define TAO_UNSIGNED 281
+# define TAO_SIGNED 282
+# define TAO_DOUBLE 283
+# define TAO_CONSTRAINT 284
+# define TAO_SEQUENCE 285
+# define TAO_WITH 286
+# define TAO_MAX 287
+# define TAO_MIN 288
+# define TAO_FIRST 289
+# define TAO_RANDOM 290
+
+#ifdef __cplusplus
+
+#ifndef yyerror
+	void yyerror(const char *);
+#endif
+
+#ifndef yylex
+#ifdef __EXTERN_C__
+	extern "C" { int yylex(void); }
+#else
+	int yylex(void);
+#endif
+#endif
+	int yyparse(void);
+
+#endif
+#define yyclearin yychar = -1
+#define yyerrok yyerrflag = 0
+extern int yychar;
+extern int yyerrflag;
+YYSTYPE yylval;
+YYSTYPE yyval;
+typedef int yytabelem;
+#ifndef YYMAXDEPTH
+#define YYMAXDEPTH 150
+#endif
+#if YYMAXDEPTH > 0
+int yy_yys[YYMAXDEPTH], *yys = yy_yys;
+YYSTYPE yy_yyv[YYMAXDEPTH], *yyv = yy_yyv;
+#else	/* user does initial allocation */
+int *yys;
+YYSTYPE *yyv;
+#endif
+static int yymaxdepth = YYMAXDEPTH;
+# define YYERRCODE 256
+
+
+
+
+//extern int yydebug = 1;
+yytabelem yyexca[] ={
+-1, 1,
+	0, -1,
+	-2, 0,
+	};
+# define YYNPROD 38
+# define YYLAST 93
+yytabelem yyact[]={
+
+    19,    54,    44,    16,    45,    19,    24,    37,    22,    38,
+    39,    24,    21,    22,    18,    20,    23,    21,    25,    18,
+    20,    23,    36,     7,     6,     5,     8,     9,    19,    60,
+    26,    16,    40,    41,    24,    25,    22,    38,    39,    15,
+    21,    11,    18,    20,    23,    32,    33,    34,    35,    30,
+    31,    14,    10,    17,    13,    12,     4,     3,     1,     2,
+     0,     0,     0,     0,     0,    27,    28,    29,     0,     0,
+    42,     0,    48,    49,    50,    51,    52,    53,    43,    47,
+    58,    59,    46,     0,     0,     0,     0,     0,     0,     0,
+    56,    57,    55 };
+yytabelem yypact[]={
+
+  -263,-10000000,  -230,-10000000,  -234,  -235,  -235,  -235,-10000000,-10000000,
+-10000000,  -212,  -245,  -261,  -240,-10000000,  -258,-10000000,  -235,  -276,
+-10000000,-10000000,  -271,-10000000,-10000000,  -235,  -235,  -230,  -230,  -230,
+  -235,  -235,  -235,  -235,  -235,  -235,  -277,  -235,  -235,  -235,
+  -235,  -235,-10000000,  -247,-10000000,-10000000,  -234,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,-10000000,-10000000,  -233,  -240,  -240,-10000000,-10000000,
+-10000000 };
+yytabelem yypgo[]={
+
+     0,    58,    57,    59,    56,    52,    41,    55,    54,    51,
+    39,    53 };
+yytabelem yyr1[]={
+
+     0,     1,     1,     2,     2,     2,     2,     2,     3,     3,
+     4,     4,     5,     5,     5,     5,     5,     5,     5,     6,
+     6,     7,     7,     8,     8,     8,     9,     9,     9,    10,
+    10,    11,    11,    11,    11,    11,    11,    11 };
+yytabelem yyr2[]={
+
+     0,     3,     3,     5,     5,     5,     3,     3,     7,     3,
+     7,     3,     7,     7,     7,     7,     7,     7,     3,     7,
+     3,     7,     3,     7,     7,     3,     7,     7,     3,     5,
+     3,     7,     5,     3,     3,     5,     3,     3 };
+yytabelem yychk[]={
+
+-10000000,    -1,    -3,    -2,    -4,   288,   287,   286,   289,   290,
+    -5,    -6,    -7,    -8,    -9,   -10,   266,   -11,   277,   263,
+   278,   275,   271,   279,   269,   265,   264,    -3,    -3,    -3,
+   261,   262,   257,   258,   259,   260,   267,   268,   270,   271,
+   272,   273,   -11,    -3,   278,   275,    -4,    -5,    -6,    -6,
+    -6,    -6,    -6,    -6,   278,    -8,    -9,    -9,   -10,   -10,
+   276 };
+yytabelem yydef[]={
+
+     0,    -2,     1,     2,     9,     0,     0,     0,     6,     7,
+    11,    18,    20,    22,    25,    28,     0,    30,     0,     0,
+    33,    34,     0,    36,    37,     0,     0,     3,     4,     5,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,    29,     0,    32,    35,     8,    10,    12,    13,
+    14,    15,    16,    17,    19,    21,    23,    24,    26,    27,
+    31 };
+typedef struct
+#ifdef __cplusplus
+	yytoktype
+#endif
+{ char *t_name; int t_val; } yytoktype;
 #ifndef YYDEBUG
-#define YYDEBUG 0
+#	define YYDEBUG	0	/* don't allow debugging */
 #endif
-#define YYMAXTOKEN 290
+
 #if YYDEBUG
-const char * const yyname[] = {
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"TAO_GT","TAO_GE","TAO_LT",
-"TAO_LE","TAO_EQ","TAO_NE","TAO_EXIST","TAO_AND","TAO_OR","TAO_NOT","TAO_IN",
-"TAO_TWIDDLE","TAO_BOOLEAN","TAO_PLUS","TAO_MINUS","TAO_MULT","TAO_DIV",
-"TAO_UMINUS","TAO_NUMBER","TAO_RPAREN","TAO_LPAREN","TAO_IDENT","TAO_STRING",
-"TAO_UNKNOWN","TAO_SIGNED","TAO_UNSIGNED","TAO_DOUBLE","TAO_CONSTRAINT",
-"TAO_SEQUENCE","TAO_WITH","TAO_MAX","TAO_MIN","TAO_FIRST","TAO_RANDOM",
+
+yytoktype yytoks[] =
+{
+	"TAO_GT",	257,
+	"TAO_GE",	258,
+	"TAO_LT",	259,
+	"TAO_LE",	260,
+	"TAO_EQ",	261,
+	"TAO_NE",	262,
+	"TAO_EXIST",	263,
+	"TAO_AND",	264,
+	"TAO_OR",	265,
+	"TAO_NOT",	266,
+	"TAO_IN",	267,
+	"TAO_TWIDDLE",	268,
+	"TAO_BOOLEAN",	269,
+	"TAO_PLUS",	270,
+	"TAO_MINUS",	271,
+	"TAO_MULT",	272,
+	"TAO_DIV",	273,
+	"TAO_UMINUS",	274,
+	"TAO_NUMBER",	275,
+	"TAO_RPAREN",	276,
+	"TAO_LPAREN",	277,
+	"TAO_IDENT",	278,
+	"TAO_STRING",	279,
+	"TAO_UNKNOWN",	280,
+	"TAO_UNSIGNED",	281,
+	"TAO_SIGNED",	282,
+	"TAO_DOUBLE",	283,
+	"TAO_CONSTRAINT",	284,
+	"TAO_SEQUENCE",	285,
+	"TAO_WITH",	286,
+	"TAO_MAX",	287,
+	"TAO_MIN",	288,
+	"TAO_FIRST",	289,
+	"TAO_RANDOM",	290,
+	"-unknown-",	-1	/* ends search */
 };
-const char * const yyrule[] = {
-"$accept : constraint",
-"constraint : bool_or",
-"constraint : preference",
-"preference : TAO_MIN bool_or",
-"preference : TAO_MAX bool_or",
-"preference : TAO_WITH bool_or",
-"preference : TAO_FIRST",
-"preference : TAO_RANDOM",
-"bool_or : bool_or TAO_OR bool_and",
-"bool_or : bool_and",
-"bool_and : bool_and TAO_AND bool_compare",
-"bool_and : bool_compare",
-"bool_compare : expr_in TAO_EQ expr_in",
-"bool_compare : expr_in TAO_NE expr_in",
-"bool_compare : expr_in TAO_GT expr_in",
-"bool_compare : expr_in TAO_GE expr_in",
-"bool_compare : expr_in TAO_LT expr_in",
-"bool_compare : expr_in TAO_LE expr_in",
-"bool_compare : expr_in",
-"expr_in : expr_twiddle TAO_IN TAO_IDENT",
-"expr_in : expr_twiddle",
-"expr_twiddle : expr TAO_TWIDDLE expr",
-"expr_twiddle : expr",
-"expr : expr TAO_PLUS term",
-"expr : expr TAO_MINUS term",
-"expr : term",
-"term : term TAO_MULT factor_not",
-"term : term TAO_DIV factor_not",
-"term : factor_not",
-"factor_not : TAO_NOT factor",
-"factor_not : factor",
-"factor : TAO_LPAREN bool_or TAO_RPAREN",
-"factor : TAO_EXIST TAO_IDENT",
-"factor : TAO_IDENT",
-"factor : TAO_NUMBER",
-"factor : TAO_MINUS TAO_NUMBER",
-"factor : TAO_STRING",
-"factor : TAO_BOOLEAN",
+
+char * yyreds[] =
+{
+	"-no such reduction-",
+	"constraint : bool_or",
+	"constraint : preference",
+	"preference : TAO_MIN bool_or",
+	"preference : TAO_MAX bool_or",
+	"preference : TAO_WITH bool_or",
+	"preference : TAO_FIRST",
+	"preference : TAO_RANDOM",
+	"bool_or : bool_or TAO_OR bool_and",
+	"bool_or : bool_and",
+	"bool_and : bool_and TAO_AND bool_compare",
+	"bool_and : bool_compare",
+	"bool_compare : expr_in TAO_EQ expr_in",
+	"bool_compare : expr_in TAO_NE expr_in",
+	"bool_compare : expr_in TAO_GT expr_in",
+	"bool_compare : expr_in TAO_GE expr_in",
+	"bool_compare : expr_in TAO_LT expr_in",
+	"bool_compare : expr_in TAO_LE expr_in",
+	"bool_compare : expr_in",
+	"expr_in : expr_twiddle TAO_IN TAO_IDENT",
+	"expr_in : expr_twiddle",
+	"expr_twiddle : expr TAO_TWIDDLE expr",
+	"expr_twiddle : expr",
+	"expr : expr TAO_PLUS term",
+	"expr : expr TAO_MINUS term",
+	"expr : term",
+	"term : term TAO_MULT factor_not",
+	"term : term TAO_DIV factor_not",
+	"term : factor_not",
+	"factor_not : TAO_NOT factor",
+	"factor_not : factor",
+	"factor : TAO_LPAREN bool_or TAO_RPAREN",
+	"factor : TAO_EXIST TAO_IDENT",
+	"factor : TAO_IDENT",
+	"factor : TAO_NUMBER",
+	"factor : TAO_MINUS TAO_NUMBER",
+	"factor : TAO_STRING",
+	"factor : TAO_BOOLEAN",
 };
+#endif /* YYDEBUG */
+
+/*
+ * Copyright (c) 1993 by Sun Microsystems, Inc.
+ */
+
+//#pragma ident	"@(#)yaccpar	6.12	93/06/07 SMI"
+
+/*
+** Skeleton parser driver for yacc output
+*/
+
+/*
+** yacc user known macros and defines
+*/
+#define YYERROR		goto yyerrlab
+#define YYACCEPT	return(0)
+#define YYABORT		return(1)
+#define YYBACKUP( newtoken, newvalue )\
+{\
+	if ( yychar >= 0 || ( yyr2[ yytmp ] >> 1 ) != 1 )\
+	{\
+		yyerror( "syntax error - cannot backup" );\
+		goto yyerrlab;\
+	}\
+	yychar = newtoken;\
+	yystate = *yyps;\
+	yylval = newvalue;\
+	goto yynewstate;\
+}
+#define YYRECOVERING()	(!!yyerrflag)
+#define YYNEW(type)	malloc(sizeof(type) * yynewmax)
+#define YYCOPY(to, from, type) \
+	(type *) ACE_OS::memcpy(to, (char *) from, yynewmax * sizeof(type))
+#define YYENLARGE( from, type) \
+	(type *) realloc((char *) from, yynewmax * sizeof(type))
+#ifndef YYDEBUG
+#	define YYDEBUG	1	/* make debugging available */
 #endif
-#if YYDEBUG
-#include <stdio.h>
-#endif
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
+
+/*
+** user known globals
+*/
+int yydebug;			/* set to 1 to get debugging */
+
+/*
+** driver internal defines
+*/
+#define YYFLAG		(-10000000)
+
+/*
+** global variables used by the parser
+*/
+YYSTYPE *yypv;			/* top of value stack */
+int *yyps;			/* top of state stack */
+
+int yystate;			/* current state */
+int yytmp;			/* extra var (lasts between blocks) */
+
+int yynerrs;			/* number of errors */
+int yyerrflag;			/* error recovery flag */
+int yychar;			/* current input token number */
+
+
+
+#ifdef YYNMBCHARS
+#define YYLEX()		yycvtok(yylex())
+/*
+** yycvtok - return a token if i is a wchar_t value that exceeds 255.
+**	If i<255, i itself is the token.  If i>255 but the neither 
+**	of the 30th or 31st bit is on, i is already a token.
+*/
+#if defined(__STDC__) || defined(__cplusplus)
+int yycvtok(int i)
 #else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH 10000
+int yycvtok(i) int i;
 #endif
-#endif
-#define YYINITSTACKSIZE 200
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short *yyss;
-short *yysslim;
-YYSTYPE *yyvs;
-int yystacksize;
-
-//extern int yydebug = 1;
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack()
 {
-    size_t newsize, i;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = yystacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-    i = yyssp - yyss;
-    newss = yyss ? (short *)ACE_OS::realloc(yyss, newsize * sizeof *newss) :
-      (short *)ACE_OS::malloc(newsize * sizeof *newss);
-    if (newss == NULL)
-        return -1;
-    yyss = newss;
-    yyssp = newss + i;
-    newvs = yyvs ? (YYSTYPE *)ACE_OS::realloc(yyvs, newsize * sizeof *newvs) :
-      (YYSTYPE *)ACE_OS::malloc(newsize * sizeof *newvs);
-    if (newvs == NULL)
-        return -1;
-    yyvs = newvs;
-    yyvsp = newvs + i;
-    yystacksize = newsize;
-    yysslim = yyss + newsize - 1;
-    return 0;
+	int first = 0;
+	int last = YYNMBCHARS - 1;
+	int mid;
+	wchar_t j;
+
+	if(i&0x60000000){/*Must convert to a token. */
+		if( yymbchars[last].character < i ){
+			return i;/*Giving up*/
+		}
+		while ((last>=first)&&(first>=0)) {/*Binary search loop*/
+			mid = (first+last)/2;
+			j = yymbchars[mid].character;
+			if( j==i ){/*Found*/ 
+				return yymbchars[mid].tvalue;
+			}else if( j<i ){
+				first = mid + 1;
+			}else{
+				last = mid -1;
+			}
+		}
+		/*No entry in the table.*/
+		return i;/* Giving up.*/
+	}else{/* i is already a token. */
+		return i;
+	}
 }
+#else/*!YYNMBCHARS*/
+#define YYLEX()		yylex()
+#endif/*!YYNMBCHARS*/
 
-#define YYABORT goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-
-#ifndef YYPARSE_PARAM
-#if defined(__cplusplus) || __STDC__
-#define YYPARSE_PARAM_ARG void
-#define YYPARSE_PARAM_DECL
-#else        /* ! ANSI-C/C++ */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif        /* ANSI-C/C++ */
-#else        /* YYPARSE_PARAM */
-#ifndef YYPARSE_PARAM_TYPE
-#define YYPARSE_PARAM_TYPE void *
+/*
+** yyparse - return 0 if worked, 1 if syntax error not recovered from
+*/
+#if defined(__STDC__) || defined(__cplusplus)
+int yyparse(void)
+#else
+int yyparse()
 #endif
-#if defined(__cplusplus) || __STDC__
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else        /* ! ANSI-C/C++ */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM;
-#endif        /* ANSI-C/C++ */
-#endif        /* ! YYPARSE_PARAM */
-
-int
-yyparse (YYPARSE_PARAM_ARG)
-    YYPARSE_PARAM_DECL
 {
-    register int yym, yyn, yystate;
-#if YYDEBUG
-    register const char *yys;
-
-    if ((yys = ACE_OS::getenv("YYDEBUG")))
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
+	register YYSTYPE *yypvt = 0;	/* top of value stack for $vars */
+
+#if defined(__cplusplus) || defined(lint)
+/*
+	hacks to please C++ and lint - goto's inside switch should never be
+	executed; yypvt is set to 0 to avoid "used before set" warning.
+*/
+	static int __yaccpar_lint_hack__ = 0;
+	switch (__yaccpar_lint_hack__)
+	{
+		case 1: goto yyerrlab;
+		case 2: goto yynewstate;
+	}
+	yypvt = 0;
 #endif
 
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = (-1);
+	/*
+	** Initialize externals - yyparse may be called more than once
+	*/
+	yypv = &yyv[-1];
+	yyps = &yys[-1];
+	yystate = 0;
+	yytmp = 0;
+	yynerrs = 0;
+	yyerrflag = 0;
+	yychar = -1;
+
+#if YYMAXDEPTH <= 0
+	if (yymaxdepth <= 0)
+	{
+		if ((yymaxdepth = YYEXPAND(0)) <= 0)
+		{
+			yyerror("yacc initialization error");
+			YYABORT;
+		}
+	}
+#endif
+
+	{
+		register YYSTYPE *yy_pv;	/* top of value stack */
+		register int *yy_ps;		/* top of state stack */
+		register int yy_state;		/* current state */
+		register int  yy_n;		/* internal state number info */
+	goto yystack;	/* moved from 6 lines above to here to please C++ */
+
+		/*
+		** get globals into registers.
+		** branch to here only if YYBACKUP was called.
+		*/
+	yynewstate:
+		yy_pv = yypv;
+		yy_ps = yyps;
+		yy_state = yystate;
+		goto yy_newstate;
 
-    if (yyss == NULL && yygrowstack()) goto yyoverflow;
-    yyssp = yyss;
-    yyvsp = yyvs;
-    *yyssp = yystate = 0;
+		/*
+		** get globals into registers.
+		** either we just started, or we just finished a reduction
+		*/
+	yystack:
+		yy_pv = yypv;
+		yy_ps = yyps;
+		yy_state = yystate;
 
-yyloop:
-    if ((yyn = yydefred[yystate])) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = yylex()) < 0) yychar = 0;
+		/*
+		** top of for (;;) loop while no reductions done
+		*/
+	yy_stack:
+		/*
+		** put a state and value onto the stacks
+		*/
 #if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
+		/*
+		** if debugging, look up token value in list of value vs.
+		** name pairs.  0 and negative (-1) are special values.
+		** Note: linear search is used since time is not a real
+		** consideration while debugging.
+		*/
+		if ( yydebug )
+		{
+			register int yy_i;
+
+			printf( "State %d, token ", yy_state );
+			if ( yychar == 0 )
+				printf( "end-of-file\n" );
+			else if ( yychar < 0 )
+				printf( "-none-\n" );
+			else
+			{
+				for ( yy_i = 0; yytoks[yy_i].t_val >= 0;
+					yy_i++ )
+				{
+					if ( yytoks[yy_i].t_val == yychar )
+						break;
+				}
+				printf( "%s\n", yytoks[yy_i].t_name );
+			}
+		}
+#endif /* YYDEBUG */
+		if ( ++yy_ps >= &yys[ yymaxdepth ] )	/* room on stack? */
+		{
+			/*
+			** reallocate and recover.  Note that pointers
+			** have to be reset, or bad things will happen
+			*/
+			int yyps_index = (yy_ps - yys);
+			int yypv_index = (yy_pv - yyv);
+			int yypvt_index = (yypvt - yyv);
+			int yynewmax;
+#ifdef YYEXPAND
+			yynewmax = YYEXPAND(yymaxdepth);
+#else
+			yynewmax = 2 * yymaxdepth;	/* double table size */
+			if (yymaxdepth == YYMAXDEPTH)	/* first time growth */
+			{
+				char *newyys = (char *)YYNEW(int);
+				char *newyyv = (char *)YYNEW(YYSTYPE);
+				if (newyys != 0 && newyyv != 0)
+				{
+					yys = YYCOPY(newyys, yys, int);
+					yyv = YYCOPY(newyyv, yyv, YYSTYPE);
+				}
+				else
+					yynewmax = 0;	/* failed */
+			}
+			else				/* not first time */
+			{
+				yys = YYENLARGE(yys, int);
+				yyv = YYENLARGE(yyv, YYSTYPE);
+				if (yys == 0 || yyv == 0)
+					yynewmax = 0;	/* failed */
+			}
 #endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
+			if (yynewmax <= yymaxdepth)	/* tables not expanded */
+			{
+				yyerror( "yacc stack overflow" );
+				YYABORT;
+			}
+			yymaxdepth = yynewmax;
+
+			yy_ps = yys + yyps_index;
+			yy_pv = yyv + yypv_index;
+			yypvt = yyv + yypvt_index;
+		}
+		*yy_ps = yy_state;
+		*++yy_pv = yyval;
+
+		/*
+		** we have a new state - find out what to do
+		*/
+	yy_newstate:
+		if ( ( yy_n = yypact[ yy_state ] ) <= YYFLAG )
+			goto yydefault;		/* simple state */
 #if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
+		/*
+		** if debugging, need to mark whether new token grabbed
+		*/
+		yytmp = yychar < 0;
 #endif
-        if (yyssp >= yysslim && yygrowstack())
-        {
-            goto yyoverflow;
-        }
-        *++yyssp = yystate = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = (-1);
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-#if defined(lint) || defined(__GNUC__) || defined (WIN32) || defined (__HP_aCC)
-    goto yynewerror;
-#endif
-yynewerror:
-    yyerror("syntax error");
-#if defined(lint) || defined(__GNUC__) || defined (WIN32) || defined (__HP_aCC)
-    goto yyerrlab;
-#endif
-yyerrlab:
-    ++yynerrs;
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
+		if ( ( yychar < 0 ) && ( ( yychar = YYLEX() ) < 0 ) )
+			yychar = 0;		/* reached EOF */
 #if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
-#endif
-                if (yyssp >= yysslim && yygrowstack())
-                {
-                    goto yyoverflow;
-                }
-                *++yyssp = yystate = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
+		if ( yydebug && yytmp )
+		{
+			register int yy_i;
+
+			printf( "Received token " );
+			if ( yychar == 0 )
+				printf( "end-of-file\n" );
+			else if ( yychar < 0 )
+				printf( "-none-\n" );
+			else
+			{
+				for ( yy_i = 0; yytoks[yy_i].t_val >= 0;
+					yy_i++ )
+				{
+					if ( yytoks[yy_i].t_val == yychar )
+						break;
+				}
+				printf( "%s\n", yytoks[yy_i].t_name );
+			}
+		}
+#endif /* YYDEBUG */
+		if ( ( ( yy_n += yychar ) < 0 ) || ( yy_n >= YYLAST ) )
+			goto yydefault;
+		if ( yychk[ yy_n = yyact[ yy_n ] ] == yychar )	/*valid shift*/
+		{
+			yychar = -1;
+			yyval = yylval;
+			yy_state = yy_n;
+			if ( yyerrflag > 0 )
+				yyerrflag--;
+			goto yy_stack;
+		}
+
+	yydefault:
+		if ( ( yy_n = yydef[ yy_state ] ) == -2 )
+		{
 #if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yyssp);
+			yytmp = yychar < 0;
 #endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
+			if ( ( yychar < 0 ) && ( ( yychar = YYLEX() ) < 0 ) )
+				yychar = 0;		/* reached EOF */
 #if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
+			if ( yydebug && yytmp )
+			{
+				register int yy_i;
+
+				printf( "Received token " );
+				if ( yychar == 0 )
+					printf( "end-of-file\n" );
+				else if ( yychar < 0 )
+					printf( "-none-\n" );
+				else
+				{
+					for ( yy_i = 0;
+						yytoks[yy_i].t_val >= 0;
+						yy_i++ )
+					{
+						if ( yytoks[yy_i].t_val
+							== yychar )
+						{
+							break;
+						}
+					}
+					printf( "%s\n", yytoks[yy_i].t_name );
+				}
+			}
+#endif /* YYDEBUG */
+			/*
+			** look through exception table
+			*/
+			{
+				register int *yyxi = yyexca;
+
+				while ( ( *yyxi != -1 ) ||
+					( yyxi[1] != yy_state ) )
+				{
+					yyxi += 2;
+				}
+				while ( ( *(yyxi += 2) >= 0 ) &&
+					( *yyxi != yychar ) )
+					;
+				if ( ( yy_n = yyxi[1] ) < 0 )
+					YYACCEPT;
+			}
+		}
+
+		/*
+		** check for syntax error
+		*/
+		if ( yy_n == 0 )	/* have an error */
+		{
+			/* no worry about speed here! */
+			switch ( yyerrflag )
+			{
+			case 0:		/* new error */
+				yyerror( "syntax error" );
+				goto skip_init;
+			yyerrlab:
+				/*
+				** get globals into registers.
+				** we have a user generated syntax type error
+				*/
+				yy_pv = yypv;
+				yy_ps = yyps;
+				yy_state = yystate;
+			skip_init:
+				yynerrs++;
+				/* FALLTHRU */
+			case 1:
+			case 2:		/* incompletely recovered error */
+					/* try again... */
+				yyerrflag = 3;
+				/*
+				** find state where "error" is a legal
+				** shift action
+				*/
+				while ( yy_ps >= yys )
+				{
+					yy_n = yypact[ *yy_ps ] + YYERRCODE;
+					if ( yy_n >= 0 && yy_n < YYLAST &&
+						yychk[yyact[yy_n]] == YYERRCODE)					{
+						/*
+						** simulate shift of "error"
+						*/
+						yy_state = yyact[ yy_n ];
+						goto yy_stack;
+					}
+					/*
+					** current state has no shift on
+					** "error", pop stack
+					*/
+#if YYDEBUG
+#	define _POP_ "Error recovery pops state %d, uncovers state %d\n"
+					if ( yydebug )
+						printf( _POP_, *yy_ps,
+							yy_ps[-1] );
+#	undef _POP_
 #endif
-        yychar = (-1);
-        goto yyloop;
-    }
-yyreduce:
+					yy_ps--;
+					yy_pv--;
+				}
+				/*
+				** there is no state on stack with "error" as
+				** a valid shift.  give up.
+				*/
+				YYABORT;
+			case 3:		/* no shift yet; eat a token */
+#if YYDEBUG
+				/*
+				** if debugging, look up token in list of
+				** pairs.  0 and negative shouldn't occur,
+				** but since timing doesn't matter when
+				** debugging, it doesn't hurt to leave the
+				** tests here.
+				*/
+				if ( yydebug )
+				{
+					register int yy_i;
+
+					printf( "Error recovery discards " );
+					if ( yychar == 0 )
+						printf( "token end-of-file\n" );
+					else if ( yychar < 0 )
+						printf( "token -none-\n" );
+					else
+					{
+						for ( yy_i = 0;
+							yytoks[yy_i].t_val >= 0;
+							yy_i++ )
+						{
+							if ( yytoks[yy_i].t_val
+								== yychar )
+							{
+								break;
+							}
+						}
+						printf( "token %s\n",
+							yytoks[yy_i].t_name );
+					}
+				}
+#endif /* YYDEBUG */
+				if ( yychar == 0 )	/* reached EOF. quit */
+					YYABORT;
+				yychar = -1;
+				goto yy_newstate;
+			}
+		}/* end if ( yy_n == 0 ) */
+		/*
+		** reduction by production yy_n
+		** put stack tops, etc. so things right after switch
+		*/
 #if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
+		/*
+		** if debugging, print the string that is the user's
+		** specification of the reduction which is just about
+		** to be done.
+		*/
+		if ( yydebug )
+			printf( "Reduce by (%d) \"%s\"\n",
+				yy_n, yyreds[ yy_n ] );
 #endif
-    yym = yylen[yyn];
-    yyval = yyvsp[1-yym];
-    switch (yyn)
-    {
+		yytmp = yy_n;			/* value to switch over */
+		yypvt = yy_pv;			/* $vars top of value stack */
+		/*
+		** Look in goto table for next state
+		** Sorry about using yy_state here as temporary
+		** register variable, but why not, if it works...
+		** If yyr2[ yy_n ] doesn't have the low order bit
+		** set, then there is no action to be done for
+		** this reduction.  So, no saving & unsaving of
+		** registers done.  The only difference between the
+		** code just after the if and the body of the if is
+		** the goto yy_stack in the body.  This way the test
+		** can be made before the choice of what to do is needed.
+		*/
+		{
+			/* length of production doubled with extra bit */
+			register int yy_len = yyr2[ yy_n ];
+
+			if ( !( yy_len & 01 ) )
+			{
+				yy_len >>= 1;
+				yyval = ( yy_pv -= yy_len )[1];	/* $$ = $1 */
+				yy_state = yypgo[ yy_n = yyr1[ yy_n ] ] +
+					*( yy_ps -= yy_len ) + 1;
+				if ( yy_state >= YYLAST ||
+					yychk[ yy_state =
+					yyact[ yy_state ] ] != -yy_n )
+				{
+					yy_state = yyact[ yypgo[ yy_n ] ];
+				}
+				goto yy_stack;
+			}
+			yy_len >>= 1;
+			yyval = ( yy_pv -= yy_len )[1];	/* $$ = $1 */
+			yy_state = yypgo[ yy_n = yyr1[ yy_n ] ] +
+				*( yy_ps -= yy_len ) + 1;
+			if ( yy_state >= YYLAST ||
+				yychk[ yy_state = yyact[ yy_state ] ] != -yy_n )
+			{
+				yy_state = yyact[ yypgo[ yy_n ] ];
+			}
+		}
+					/* save until reenter driver code */
+		yystate = yy_state;
+		yyps = yy_ps;
+		yypv = yy_pv;
+	}
+	/*
+	** code supplied by user is placed in this switch
+	*/
+	switch( yytmp )
+	{
+		
 case 1:
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_CONSTRAINT, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_CONSTRAINT, yypvt[-0].constraint_); } break;
 case 2:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 3:
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_MIN, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_MIN, yypvt[-0].constraint_); } break;
 case 4:
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_MAX, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_MAX, yypvt[-0].constraint_); } break;
 case 5:
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_WITH, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_WITH, yypvt[-0].constraint_); } break;
 case 6:
-{ yyval.constraint_ = new TAO_Noop_Constraint(TAO_FIRST); }
-break;
+
+{ yyval.constraint_ = new TAO_Noop_Constraint(TAO_FIRST); } break;
 case 7:
-{ yyval.constraint_ = new TAO_Noop_Constraint(TAO_RANDOM); }
-break;
+
+{ yyval.constraint_ = new TAO_Noop_Constraint(TAO_RANDOM); } break;
 case 8:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_OR, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_OR, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 9:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 10:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_AND, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_AND, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 11:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 12:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_EQ, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_EQ, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 13:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_NE, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_NE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 14:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_GT, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_GT, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 15:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_GE, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_GE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 16:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_LT, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_LT, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 17:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_LE, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_LE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 18:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 19:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_IN, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_IN, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 20:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 21:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_TWIDDLE, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_TWIDDLE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 22:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 23:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_PLUS, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_PLUS, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 24:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_MINUS, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_MINUS, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 25:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 26:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_MULT, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_MULT, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 27:
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_DIV, yyvsp[-2].constraint_, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_DIV, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
 case 28:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 29:
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_NOT, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_NOT, yypvt[-0].constraint_); } break;
 case 30:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 31:
-{ yyval.constraint_ = yyvsp[-1].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-1].constraint_; } break;
 case 32:
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_EXIST, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_EXIST, yypvt[-0].constraint_); } break;
 case 33:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 34:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 35:
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_UMINUS, yyvsp[0].constraint_); }
-break;
+
+{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_UMINUS, yypvt[-0].constraint_); } break;
 case 36:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
 case 37:
-{ yyval.constraint_ = yyvsp[0].constraint_; }
-break;
-    }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
-#endif
-    if (yyssp >= yysslim && yygrowstack())
-    {
-        goto yyoverflow;
-    }
-    *++yyssp = yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
-yyoverflow:
-    yyerror("yacc stack overflow");
-yyabort:
-    return (1);
-yyaccept:
-    return (0);
+
+{ yyval.constraint_ = yypvt[-0].constraint_; } break;
+
+	}
+	goto yystack;		/* reset registers in driver code */
 }
+
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
index 9c29900ca1e..ff6f7b4a1e4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
@@ -75,8 +75,7 @@ char* TAO_Lex_String_Input::end_ = 0;
 int
 TAO_Lex_String_Input::copy_into (char* buf, int max_size)
 {
-  int chars_left = static_cast<int> (TAO_Lex_String_Input::end_ -
-                                     TAO_Lex_String_Input::current_);
+  int chars_left =  TAO_Lex_String_Input::end_ - TAO_Lex_String_Input::current_;
   int n = max_size > chars_left ? chars_left : max_size;
 
   if (n > 0)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
index 286f80456ea..7971ed9e024 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
@@ -93,7 +93,6 @@ private:
 };
 
 // The union used by lex and yacc to build the Abstract Syntax Tree.
-#define YYSTYPE_IS_DECLARED
 typedef union
 {
   TAO_Constraint* constraint_;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index b517d964854..61b18d38c72 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -124,7 +124,7 @@ private:
  * Class used to remove the circular dependencies between the
  * Attribute classes and the Trader class.
  */
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x590)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
 // Work around Borland unresolved symbol errors concerning the
 // out-of-line virtual destructor.  The virtual destructor should
 // not be inlined, nor should we have to export TAO_Lockable from the
@@ -132,7 +132,7 @@ private:
 class TAO_Trading_Serv_Export TAO_Lockable
 #else
 class TAO_Lockable
-#endif  /* __BORLANDC__ <= 0x590 */
+#endif  /* __BORLANDC__ < 0x581 */
 {
 public:
   virtual ~TAO_Lockable (void);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 393d73a2e83..60513db6b78 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -1891,7 +1891,7 @@ export_proxy (CosTrading::Lookup_ptr,
 {
   ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
-  ACE_NOTREACHED (return 0;)
+  return 0;
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -1919,7 +1919,7 @@ describe_proxy (const char *
 {
   ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
-  ACE_NOTREACHED (return 0;)
+  return 0;
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.l b/TAO/orbsvcs/orbsvcs/Trader/constraint.l
index d8e67d5ad50..9d1aef05376 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/constraint.l
+++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.l
@@ -1,6 +1,4 @@
 %{
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 // $Id$
 // ========================================================================
 //
@@ -15,15 +13,14 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 //
 // ========================================================================
 
-#include "orbsvcs/Trader/Constraint_Interpreter.h"
-#include "orbsvcs/Trader/Constraint_Nodes.h"
-#include "orbsvcs/Trader/Constraint_Tokens.h"
+#include "ace/OS.h"
+#include "Constraint_Interpreter.h"
+#include "Constraint_Nodes.h"
+#include "Constraint_Tokens.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 static TAO_Literal_Constraint* extract_string(const char*);
-static CORBA::LongLong trader_strtoll(const char* str, unsigned int base);
-static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base);
 
 #define TAO_YY_LEX_DEBUG
 
@@ -39,7 +36,7 @@ letter		[a-zA-Z]
 digit		[0-9]
 alpha_num	({letter}|{digit})
 integer		[-+]?{digit}+
-float		[-+]?({digit}*\.{digit}+)([eE][-+]?{digit}+)?
+float		({digit}*\.{digit}+)([eE][-+]?{digit}+)?
 string		'(([^'\\]*)|([^'\\]*\\')|([^'\\]*\\\\))*'
 ident		{letter}({alpha_num}|[_])*
 newline		\n
@@ -81,23 +78,14 @@ FALSE		{
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
 {integer}	{
-                  if (yytext[0] == '-')
-                    {
-                      yylval.constraint_ =
-		        new TAO_Literal_Constraint(
-                              trader_strtoll(yytext, 0));
-                    }
-                  else
-                    {
-                       yylval.constraint_ =
-                         new TAO_Literal_Constraint(
-                               trader_strtoull(yytext, 0));
-                    }
+		  yylval.constraint_ =
+		    new TAO_Literal_Constraint((yytext[0] == '-' ?
+                    (CORBA::Long)atoi(yytext) : (CORBA::ULong)atoi(yytext)));
 		  TAO_YY_LEX_DEBUG; return TAO_NUMBER;
 		}
 {float}		{
 		  yylval.constraint_ =
-		    new TAO_Literal_Constraint(ACE_OS::strtod(yytext, 0));
+		    new TAO_Literal_Constraint((CORBA::Double)atof(yytext));
 		  TAO_YY_LEX_DEBUG; return TAO_NUMBER;
 		}
 {string}	{
@@ -109,7 +97,6 @@ FALSE		{
 		    new TAO_Property_Constraint(yytext);
 		  TAO_YY_LEX_DEBUG; return TAO_IDENT;
 		}
-{white_space}   {}
 {unknown}       {
                   TAO_YY_LEX_DEBUG; return TAO_UNKNOWN;
                 }
@@ -146,108 +133,4 @@ extract_string(const char* total)
   return new TAO_Literal_Constraint(str);
 }
 
-CORBA::ULongLong
-trader_strtoull(const char* s, unsigned int base)
-{
-  CORBA::ULongLong result = 0;
-  CORBA::ULongLong previous = 0;
-
-  // Check for a valid base
-  if (!(base == 0 || base == 8 || base == 10 || base == 16))
-    {
-      errno = EINVAL;
-      return result;
-    }
-
-  if (*s == '+')
-    {
-      s++;
-    }
-
-  if ((base == 0 || base == 16) &&
-      *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
-    {
-      s += 2;
-      base = 16;
-    }
-  else if ((base == 0 || base == 8) && *s == '0')
-    {
-      s++;
-      base = 8;
-    }
-  else
-    {
-      base = 10;
-    }
-
-  for (; *s; ++s)
-    {
-      if (base == 8 && *s <= '7' && *s >= '0')
-        {
-          result = (result * base) + (*s - '0');
-        }
-      else if (base > 8 && *s <= '9' && *s >= '0')
-        {
-          result = (result * base) + (*s - '0');
-        }
-      else if (base > 10 && *s <= 'f' && *s >= 'a')
-        {
-          result = (result * base) + (*s - 'a' + 10);
-        }
-      else if (base > 10 && *s <= 'F' && *s >= 'A')
-        {
-          result = (result * base) + (*s - 'A' + 10);
-        }
-      else
-        { 
-          break;
-        }
-
-      // If the previous value is greater than result, then we have
-      // exceeded the size of a CORBA::ULongLong and the result
-      // will be ACE_UINT64_MAX.  However, errno will be set to ERANGE
-      if (previous > result)
-        {
-          errno = ERANGE;
-          result = ACE_UINT64_MAX;
-          break;
-        }
-      previous = result;
-    }
-
-  return result;
-}
-
-CORBA::LongLong
-trader_strtoll(const char* s, unsigned int base)
-{
-  // Check for the negative sign
-  bool negative = false;
-  if (*s == '-')
-    {
-      negative = true;
-      s++;
-    }
-
-  // Convert the raw text into a CORBA::LongLong
-  CORBA::LongLong result = static_cast<CORBA::LongLong> (
-                                         trader_strtoull(s, base));
-
-  // If the result that comes back is negative, then the value exceeded
-  // the maximum for CORBA::LongLong
-  if (result < 0)
-    {
-      errno = ERANGE;
-      return (negative ? ACE_INT64_MIN : ACE_INT64_MAX);
-    }
-
-  return (negative ? -result : result);
-}
-
-int
-yywrap (void)
-{
-  return 1;
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.y b/TAO/orbsvcs/orbsvcs/Trader/constraint.y
index 9a69e02b849..7d32796775a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/constraint.y
+++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.y
@@ -13,10 +13,9 @@
 //
 // ========================================================================
 
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_stdlib.h"
-#include "orbsvcs/Trader/Constraint_Interpreter.h"           
-#include "orbsvcs/Trader/Constraint_Nodes.h"
+#include "ace/OS.h"
+#include "Constraint_Interpreter.h"           
+#include "Constraint_Nodes.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -27,7 +26,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 %token TAO_AND TAO_OR TAO_NOT TAO_IN TAO_TWIDDLE TAO_BOOLEAN
 %token TAO_PLUS TAO_MINUS TAO_MULT TAO_DIV TAO_UMINUS TAO_NUMBER 
 %token TAO_RPAREN TAO_LPAREN TAO_IDENT TAO_STRING TAO_UNKNOWN
-%token TAO_SIGNED TAO_UNSIGNED TAO_DOUBLE TAO_CONSTRAINT TAO_SEQUENCE 
+%token TAO_UNSIGNED TAO_SIGNED TAO_DOUBLE TAO_CONSTRAINT TAO_SEQUENCE 
 %token TAO_WITH TAO_MAX TAO_MIN TAO_FIRST TAO_RANDOM
 
 %start constraint
@@ -136,4 +135,5 @@ factor:		TAO_LPAREN bool_or TAO_RPAREN
 
 %%
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 //extern int yydebug = 1;
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_idl.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_idl.mpb
index e41739bf20b..a70334dd978 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events_idl.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_idl.mpb
@@ -4,13 +4,13 @@
 feature(ec_typed_events) {
   macros   += TAO_HAS_TYPED_EVENT_CHANNEL
 
-  idlflags += -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
+  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
 
   IDL_Files {
     CosTypedEventComm.idl
     CosTypedEventChannelAdmin.idl
   }
 
-  idlflags -= -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
+  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
 
 }
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
index b5316d32dab..1b0832a570b 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
@@ -20,6 +20,9 @@ feature(ec_typed_events) {
   Inline_Files {
     CosTypedEventCommS.inl
     CosTypedEventChannelAdminS.inl
+
+    CosTypedEventCommS_T.inl
+    CosTypedEventChannelAdminS_T.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
index 1ae76ad9d3e..beaad418d56 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
@@ -9,7 +9,7 @@ project(*Performance_IDL): loadbalancing, strategies {
 
 project(*Performance_Server): loadbalancing, pi_server, strategies {
   after += *Performance_IDL
-  avoids += ace_for_tao
+
   Source_Files {
     server.cpp
     Roundtrip.cpp
@@ -26,7 +26,7 @@ project(*Performance_Server): loadbalancing, pi_server, strategies {
 
 project(*Performance_Client): loadbalancing, strategies {
   after += *Performance_IDL
-  avoids += ace_for_tao
+ 
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
index 211279d6c40..add39941212 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,8 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -30,7 +31,10 @@ BUILT_SOURCES = \
   TestC.inl \
   TestS.cpp \
   TestS.h \
-  TestS.inl
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
 
 CLEANFILES = \
   Test-stamp \
@@ -39,18 +43,23 @@ CLEANFILES = \
   TestC.inl \
   TestS.cpp \
   TestS.h \
-  TestS.inl
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
 
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
+TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
 
 Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -58,8 +67,8 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -97,8 +106,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -106,8 +115,8 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -150,8 +159,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
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 5fc8f093ff7..18d1be0bb26 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project: orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project: orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
index 2b41c8c2bcc..252262f26b7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
@@ -17,9 +17,9 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Colocated_Roundtrip.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = driver
 
@@ -55,9 +55,9 @@ driver_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
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 11e51c995d0..a6681bf941c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {    
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -13,10 +13,10 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-
+  
   specific (automake) {
     includes += $(srcdir)/../lib
   }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
index efe422db699..6b11a5b9d3a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
@@ -18,9 +18,9 @@ noinst_PROGRAMS =
 ## Makefile.Federated_Roundtrip_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -57,17 +57,17 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Federated_Roundtrip_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -104,9 +104,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
index d55bb3b9ab1..b536939e7c1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -21,9 +21,9 @@ noinst_PROGRAMS =
 ## Makefile.RTCORBA_Baseline_IDL.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -31,7 +31,10 @@ BUILT_SOURCES = \
   TestC.inl \
   TestS.cpp \
   TestS.h \
-  TestS.inl
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
 
 CLEANFILES = \
   Test-stamp \
@@ -40,28 +43,32 @@ CLEANFILES = \
   TestC.inl \
   TestS.cpp \
   TestS.h \
-  TestS.inl
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
 
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
+TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
 
 Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTCORBA_Baseline_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -99,17 +106,17 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTCORBA_Baseline_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -149,9 +156,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
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 a2ddf3694a1..188d5276fd9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 
   IDL_Files {
     Test.idl
@@ -9,7 +9,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoid
   custom_only = 1
 }
 
-project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -31,7 +31,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
index 5469911b220..d94aad01491 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -21,9 +21,9 @@ noinst_PROGRAMS =
 ## Makefile.RTCORBA_Callback_IDL.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -31,7 +31,10 @@ BUILT_SOURCES = \
   TestC.inl \
   TestS.cpp \
   TestS.h \
-  TestS.inl
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
 
 CLEANFILES = \
   Test-stamp \
@@ -40,28 +43,32 @@ CLEANFILES = \
   TestC.inl \
   TestS.cpp \
   TestS.h \
-  TestS.inl
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
 
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
+TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
 
 Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTCORBA_Callback_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -101,17 +108,17 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTCORBA_Callback_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -153,9 +160,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
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 e925a259c6e..bfd1de34f68 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   IDL_Files {
     Test.idl
   }
@@ -8,7 +8,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoid
   custom_only = 1
 }
 
-project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -31,7 +31,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
index 029cc300a49..6a138d998ad 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
@@ -18,9 +18,9 @@ noinst_PROGRAMS =
 ## Makefile.Roundtrip_RTEvent_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -56,17 +56,17 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Roundtrip_RTEvent_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -102,9 +102,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
index 759e87284bf..1921fed616b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -14,7 +14,7 @@ project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_c
   }
 }
 
-project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
index 81b4813c4c7..ce147a0d92d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
@@ -18,9 +18,9 @@ noinst_PROGRAMS =
 ## Makefile.TCP_Baseline_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -56,17 +56,17 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.TCP_Baseline_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -102,9 +102,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
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 0560c30889f..bded52788ee 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -14,7 +14,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl
index abfb4111577..ac013f92dd2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl
@@ -7,8 +7,6 @@
  *
  */
 
-#include "tao/ULongLongSeq.pidl"
-
 module Federated_Test
 {
   interface Peer;
@@ -39,7 +37,7 @@ module Federated_Test
   };
 
   /// The results of a single experiment
-  typedef CORBA::ULongLongSeq Experiment_Results;
+  typedef sequence<unsigned long long> Experiment_Results;
 
   /**
    * @interface Peer
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
index 752295ac9f6..cc8e9942d43 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
@@ -13,16 +13,16 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.RTEC_Perf.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   Federated_TestC.cpp \
@@ -30,7 +30,10 @@ BUILT_SOURCES = \
   Federated_TestC.inl \
   Federated_TestS.cpp \
   Federated_TestS.h \
-  Federated_TestS.inl
+  Federated_TestS.inl \
+  Federated_TestS_T.cpp \
+  Federated_TestS_T.h \
+  Federated_TestS_T.inl
 
 CLEANFILES = \
   Federated_Test-stamp \
@@ -39,12 +42,15 @@ CLEANFILES = \
   Federated_TestC.inl \
   Federated_TestS.cpp \
   Federated_TestS.h \
-  Federated_TestS.inl
+  Federated_TestS.inl \
+  Federated_TestS_T.cpp \
+  Federated_TestS_T.h \
+  Federated_TestS_T.inl
 
-Federated_TestC.cpp Federated_TestC.h Federated_TestC.inl Federated_TestS.cpp Federated_TestS.h Federated_TestS.inl: Federated_Test-stamp
+Federated_TestC.cpp Federated_TestC.h Federated_TestC.inl Federated_TestS.cpp Federated_TestS.h Federated_TestS.inl Federated_TestS_T.cpp Federated_TestS_T.h Federated_TestS_T.inl: Federated_Test-stamp
 
 Federated_Test-stamp: $(srcdir)/Federated_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl
 	@touch $@
 
 noinst_LTLIBRARIES = libTAO_RTEC_Perf.la
@@ -107,6 +113,9 @@ noinst_HEADERS = \
   Federated_TestC.inl \
   Federated_TestS.h \
   Federated_TestS.inl \
+  Federated_TestS_T.cpp \
+  Federated_TestS_T.h \
+  Federated_TestS_T.inl \
   Implicit_Deactivator.h \
   Implicit_Deactivator.inl \
   Loopback.h \
@@ -158,9 +167,9 @@ noinst_HEADERS = \
   Task_Activator.inl \
   rtec_perf_export.h
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
index 7dea662571a..c73d8a6a356 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(RTEC_Perf): strategies, rtcorbaevent, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(RTEC_Perf): strategies, rtcorbaevent, 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/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
index 0bfe196d9ba..8a7311e2ae6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Asynch_Three_Stage_Dist.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += distributer
@@ -48,11 +47,9 @@ distributer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Asynch_Three_Stage_Recv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -83,11 +80,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Asynch_Three_Stage_Send.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
@@ -118,7 +113,6 @@ sender_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
index 4478a21beba..7bf11f4dad7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Bidirectional_Flows_Recv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -46,11 +45,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Bidirectional_Flows_Send.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
@@ -79,7 +76,6 @@ sender_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
index 4ac390ff726..c003c046e46 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Component_Switching_Dist.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += distributer
@@ -49,11 +48,9 @@ distributer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Component_Switching_Recv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -85,11 +82,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Component_Switching_Send.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
@@ -121,7 +116,6 @@ sender_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
index 5f011923973..3db5feff051 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Full_Profile_Ftp.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ftp
@@ -46,11 +45,9 @@ ftp_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Full_Profile_Server.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
@@ -79,7 +76,6 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
index 0f844565b6f..20caef1661f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Latency_Cntl.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += control
@@ -48,11 +47,9 @@ control_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Latency_Ping.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ping
@@ -82,11 +79,9 @@ ping_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Latency_Pong.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += pong
@@ -116,7 +111,6 @@ pong_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
index 99b358a677f..d4640caa093 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Modify_QoS_Recv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -46,11 +45,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Modify_QoS_Send.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
@@ -79,7 +76,6 @@ sender_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
index 7bfeb08e47c..5027e738f6f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Multicast_Ftp.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ftp
@@ -47,11 +46,9 @@ ftp_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Multicast_Server.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
@@ -81,7 +78,6 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
index 27b52a09998..96a3601c4ce 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Multicast_Full_Profile_Ftp.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ftp
@@ -46,11 +45,9 @@ ftp_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Multicast_Full_Profile_Server.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
@@ -79,7 +76,6 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
index 606125b7ed3..5db84134548 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Multiple_Flows_Recv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -46,11 +45,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Multiple_Flows_Send.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
@@ -79,7 +76,6 @@ sender_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
index d6a771ebaaf..23de00a8320 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Pluggable_Ftp.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ftp
@@ -46,11 +45,9 @@ ftp_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Pluggable_Server.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
@@ -79,7 +76,6 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
index aded0981dda..b97da09530e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Pluggable_Flow_Protocol_Recv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -46,11 +45,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Pluggable_Flow_Protocol_Send.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
@@ -79,11 +76,9 @@ sender_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Pluggable_Flow_Protocol_Ts.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_LTLIBRARIES = libTAO_TS.la
@@ -104,7 +99,6 @@ noinst_HEADERS = \
   TimeStamp.h
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
index ec0501a9959..b3e89ef417b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Simple_Three_Stage_Dist.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += distributer
@@ -46,11 +45,9 @@ distributer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Simple_Three_Stage_Recv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -79,11 +76,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Simple_Three_Stage_Send.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
@@ -112,7 +107,6 @@ sender_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
index 2df05d9674f..e4180cd8e0b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Simple_Two_Stage_Recv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -49,11 +48,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Simple_Two_Stage_Send.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
@@ -83,7 +80,6 @@ sender_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
index 8c5fb6f43a2..0f573502d0c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.AVS_Simple_Two_Stage_With_QoS_Recv.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -46,11 +45,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
@@ -79,7 +76,6 @@ sender_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
index 7eb88a9ba45..1201bb99646 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): namingexe, portableserver, bidir_giop, utils, avoids_corba_e_micro {
+project(*Server): namingexe, portableserver, bidir_giop, utils {
   Source_Files {
     TimeServer.cpp
   }
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
index 48461288827..7ebd7213a8c 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
@@ -13,21 +13,21 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.BiDirCORBALOC_Server.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   TimeModuleC.cpp \
   TimeModuleC.h \
   TimeModuleC.inl \
   TimeModuleS.cpp \
   TimeModuleS.h \
-  TimeModuleS.inl
+  TimeModuleS.inl \
+  TimeModuleS_T.cpp \
+  TimeModuleS_T.h \
+  TimeModuleS_T.inl
 
 CLEANFILES = \
   TimeModule-stamp \
@@ -36,12 +36,15 @@ CLEANFILES = \
   TimeModuleC.inl \
   TimeModuleS.cpp \
   TimeModuleS.h \
-  TimeModuleS.inl
+  TimeModuleS.inl \
+  TimeModuleS_T.cpp \
+  TimeModuleS_T.h \
+  TimeModuleS_T.inl
 
-TimeModuleC.cpp TimeModuleC.h TimeModuleC.inl TimeModuleS.cpp TimeModuleS.h TimeModuleS.inl: TimeModule-stamp
+TimeModuleC.cpp TimeModuleC.h TimeModuleC.inl TimeModuleS.cpp TimeModuleS.h TimeModuleS.inl TimeModuleS_T.cpp TimeModuleS_T.h TimeModuleS_T.inl: TimeModule-stamp
 
 TimeModule-stamp: $(srcdir)/TimeModule.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/TimeModule.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/TimeModule.idl
 	@touch $@
 
 noinst_PROGRAMS = TimeServer
@@ -61,7 +64,9 @@ TimeServer_SOURCES = \
   TimeModuleC.h \
   TimeModuleC.inl \
   TimeModuleS.h \
-  TimeModuleS.inl
+  TimeModuleS.inl \
+  TimeModuleS_T.h \
+  TimeModuleS_T.inl
 
 TimeServer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -74,8 +79,6 @@ TimeServer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
index f467720c66e..e583ef1d567 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Bug_1334_client.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -37,8 +34,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
index 4e42c806b57..b0af6b32252 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Bug_1393_Regression_Client.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -35,8 +32,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
index 35d59ec917d..816c0a4a17c 100755
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
@@ -14,10 +14,10 @@ $status = 0;
 $ifr_service_bin = "../../IFR_Service";
 
 # The location of the tao_ifr utility binary
-$tao_ifr_bin = "$ENV{ACE_ROOT}/bin";
+$tao_ifr_bin = "../../../../bin";
 
 # The location of the tao_idl utility binary
-$tao_idl_bin = "$ENV{ACE_ROOT}/bin";
+$tao_idl_bin = "../../../../bin";
 
 # The idl file to be used for the test
 $test_idl = PerlACE::LocalFile("test.idl");
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
index 15ba66d442b..91115978acd 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
@@ -10,7 +10,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, imr_client, avoids_corba_e_micro {
+project(*Server): taoserver, imr_client {
   after += *IDL
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
index 409c5e88ea6..6057ce638b5 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Bug_1395_Regression_IDL.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
 ## Makefile.Bug_1395_Regression_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -68,12 +65,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Bug_1395_Regression_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -96,8 +89,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl
index bd4bc793631..63326050bb0 100755
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl
@@ -12,7 +12,7 @@ use PerlACE::Run_Test;
 $imr_bin_path  = "../../ImplRepo_Service";
 
 # The location of the tao_imr IMR utility
-$tao_imr_bin_path = "$ENV{ACE_ROOT}/bin";
+$tao_imr_bin_path = "../../../../bin";
 
 # IOR file names
 $imr_ior_file        = PerlACE::LocalFile("impl.ior");
diff --git a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
index 0df86c0cb02..ee52cfe9ca6 100755
--- a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
@@ -12,7 +12,7 @@ use PerlACE::Run_Test;
 $ifr_bin_path = "../../IFR_Service";
 
 # The location of the tao_ifr IFR utility
-$tao_ifr_bin_path = "$ENV{ACE_ROOT}/bin";
+$tao_ifr_bin_path = "../../../../bin";
 
 # IOR file names
 $ifr_ior_file = PerlACE::LocalFile("ifr.ior");
diff --git a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl
index d3818dd8ef7..26ad7d45ff4 100755
--- a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl
@@ -12,7 +12,7 @@ use PerlACE::Run_Test;
 $imr_bin_path  = "../../ImplRepo_Service";
 
 # The location of the tao_imr IMR utility
-$tao_imr_bin_path = "$ENV{ACE_ROOT}/bin";
+$tao_imr_bin_path = "../../../../bin";
 
 # IOR file names
 $imr_ior_file        = PerlACE::LocalFile("impl.ior");
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
index cbbfd8ad9c7..a896cd99666 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Bug_1630_testclient.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = testclient
 
@@ -35,7 +35,7 @@ testclient_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
index 488d969324d..bb3c6ac0488 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Bug_1630_testclient ) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, ifr_client {
+project(Bug_1630_testclient ) : taoclient, anytypecode, minimum_corba, ifr_client {
    exename = testclient
 
    Source_Files {
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index fffe62a0cba..360999cdb28 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -15,7 +15,6 @@ int main (int argc, char* argv[])
    {
       int failed = 0;
 
-      ACE_DEBUG((LM_DEBUG, "Start of Client\n"));
       // Initialise ORB.
       //
       CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER);
@@ -23,11 +22,9 @@ int main (int argc, char* argv[])
 
       // Find the Interface Repository.
       //
-      ACE_DEBUG((LM_DEBUG, ". Find IFR\n"));
       CORBA::Object_var ifr_obj = orb->resolve_initial_references( "InterfaceRepository" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG((LM_DEBUG, ". Narrow IFR\n"));
       CORBA::Repository_var ifr = CORBA::Repository::_narrow( ifr_obj.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -37,7 +34,6 @@ int main (int argc, char* argv[])
          return 1;
       }
 
-      ACE_DEBUG((LM_DEBUG, ". Construct interface\n"));
       // Add an interface to the repository.
       //
       CORBA::InterfaceDefSeq baseInterfaces(1) ;
@@ -52,24 +48,19 @@ int main (int argc, char* argv[])
       // Add an operation to the interface.
       // First get some useful things.
       //
-      ACE_DEBUG((LM_DEBUG, ". Get primitive (void)\n"));
       CORBA::PrimitiveDef_var voidPrimitive =
          ifr->get_primitive( CORBA::pk_void ACE_ENV_ARG_PARAMETER) ;
       ACE_TRY_CHECK;
-      ACE_DEBUG((LM_DEBUG, ". Get primitive (char)\n"));
       CORBA::PrimitiveDef_var charPrimitive =
          ifr->get_primitive( CORBA::pk_char ACE_ENV_ARG_PARAMETER) ;
       ACE_TRY_CHECK;
-      ACE_DEBUG((LM_DEBUG, ". Get primitive (long)\n"));
       CORBA::PrimitiveDef_var longPrimitive =
          ifr->get_primitive( CORBA::pk_long ACE_ENV_ARG_PARAMETER) ;
       ACE_TRY_CHECK;
-      ACE_DEBUG((LM_DEBUG, ". Get primitive (short)\n"));
       CORBA::PrimitiveDef_var shortPrimitive =
          ifr->get_primitive( CORBA::pk_short ACE_ENV_ARG_PARAMETER) ;
       ACE_TRY_CHECK;
 
-      ACE_DEBUG((LM_DEBUG, ". create 3 parameters\n"));
       // The operation has three parameters...
       //
       CORBA::ULong numParams = 3 ;
@@ -102,19 +93,16 @@ int main (int argc, char* argv[])
 
       // ...and no exceptions...
       //
-      ACE_DEBUG((LM_DEBUG, ". create 0 excepts\n"));
       CORBA::ExceptionDefSeq exceptions( 1 ) ;
       exceptions.length( 0 ) ;
 
       // ...and no context ids
       //
-      ACE_DEBUG((LM_DEBUG, ". create 0 cids\n"));
       CORBA::ContextIdSeq contextIds( 1 ) ;
       contextIds.length( 0 ) ;
 
       // Create the operation, called "f".
       //
-      ACE_DEBUG((LM_DEBUG, ". create_operation\n"));
       CORBA::OperationDef_var operation =
          interface->create_operation( "IDL:interface865/f:1.0",
                                       "f",
@@ -133,12 +121,14 @@ int main (int argc, char* argv[])
       CORBA::NVList_var opList ;
 
       ACE_DEBUG((LM_DEBUG, "About to call create_operation_list\n"));
+
       orb->create_operation_list(operation.in (),
 		                 opList.out()
 				 ACE_ENV_ARG_PARAMETER) ;
       ACE_TRY_CHECK;
 
       ACE_DEBUG((LM_DEBUG, "Call to create_operation_list succeeded\n"));
+
       CORBA::ULong count = opList->count() ;
       ACE_TRY_CHECK;
 
@@ -153,7 +143,7 @@ int main (int argc, char* argv[])
       {
          ACE_DEBUG((LM_DEBUG, "Test failed: param 1 wrong name\n"));
          failed = 1 ;
-      }
+      };
 
       CORBA::Boolean const eq_char =
         nv->value()->type()->equal (CORBA::_tc_char
@@ -164,19 +154,19 @@ int main (int argc, char* argv[])
       {
          ACE_DEBUG((LM_DEBUG, "Test failed: param 1 wrong type\n"));
          failed = 1 ;
-      }
+      };
       if( nv->flags() != CORBA::ARG_IN )
       {
          ACE_DEBUG((LM_DEBUG, "Test failed: param 1 wrong mode\n"));
          failed = 1 ;
-      }
+      };
 
       nv = opList->item( 1 ) ;
       if(ACE_OS::strcmp( nv->name(), "p2") != 0 )
       {
          ACE_DEBUG((LM_DEBUG, "Test failed: param 2 wrong name\n"));
          failed = 1 ;
-      }
+      };
 
       CORBA::Boolean const eq_long =
         nv->value()->type()->equal (CORBA::_tc_long
@@ -187,19 +177,19 @@ int main (int argc, char* argv[])
       {
          ACE_DEBUG((LM_DEBUG, "Test failed: param 2 wrong type\n"));
          failed = 1 ;
-      }
+      };
       if( nv->flags() != CORBA::ARG_OUT )
       {
          ACE_DEBUG((LM_DEBUG, "Test failed: param 2 wrong mode\n"));
          failed = 1 ;
-      }
+      };
 
       nv = opList->item( 2 ) ;
       if(ACE_OS::strcmp( nv->name(), "p3") != 0 )
       {
          ACE_DEBUG((LM_DEBUG, "Test failed: param 3 wrong name\n"));
          failed = 1 ;
-      }
+      };
 
       CORBA::Boolean const eq_short =
         nv->value()->type()->equal (CORBA::_tc_short
@@ -210,14 +200,15 @@ int main (int argc, char* argv[])
       {
          ACE_DEBUG((LM_DEBUG, "Test failed: param 3 wrong type\n"));
          failed = 1 ;
-      }
+      };
       if( nv->flags() != CORBA::ARG_INOUT )
       {
          ACE_DEBUG((LM_DEBUG, "Test failed: param 3 wrong mode\n"));
          failed = 1 ;
-      }
+      };
+
 
-      // opList->free();
+     // opList->free();
       //operation->destroy();
 
       // Finally destroy the interface.
@@ -230,7 +221,6 @@ int main (int argc, char* argv[])
       {
          return 1 ;
       }
-      ACE_DEBUG((LM_DEBUG, ". seems OK\n"));
    }
    ACE_CATCHANY
    {
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
index 47a3dc1979e..8bc20a15371 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Test): taoclient, messaging, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Test): taoclient, messaging, naming, minimum_corba {
   exename = test
   Source_Files {
     test.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am
index 72b36c37461..02fa11fa326 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am
@@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Bug_2074_Regression_Test.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = test
 
@@ -45,7 +45,7 @@ test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc b/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc
index b357718f9d3..b357718f9d3 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
index 13c4b1693c1..2d5d4b4e89f 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
@@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = client
 
@@ -50,9 +50,9 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/README b/TAO/orbsvcs/tests/Bug_2137_Regression/README
index 67181578d9e..67181578d9e 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/README
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/README
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index 46148e21dee..46148e21dee 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
index 4eaafeddbc7..cfeafb2ed12 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
@@ -9,7 +9,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): portableserver, orbsvcsexe, iormanip, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server): portableserver, orbsvcsexe, iormanip, messaging, minimum_corba {
   after += *idl
   Source_Files {
     test_i.cpp
@@ -21,7 +21,7 @@ project(*server): portableserver, orbsvcsexe, iormanip, messaging, avoids_minimu
   }
 }
 
-project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb, minimum_corba {
   after += *idl
   Source_Files {
     testC.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
index 50efe0c1099..50efe0c1099 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
index 25a4acf8930..c495afa40c1 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,6 +43,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
@@ -50,9 +51,9 @@ noinst_HEADERS = \
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Manager
 
@@ -86,16 +87,16 @@ Manager_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
 ## Makefile.Bug_2247_Regression_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -123,7 +124,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 74d54ebda92..74d54ebda92 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
index 81760e158f4..81760e158f4 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/README b/TAO/orbsvcs/tests/Bug_2247_Regression/README
index b2cda70e18d..b2cda70e18d 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/README
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/README
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index d597ec0d27d..d597ec0d27d 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl b/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl
index ecca7fffd42..ecca7fffd42 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
index 6264149b61e..6264149b61e 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
index f00ae655410..f00ae655410 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
index e8b7128836d..ce7afec6555 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
@@ -10,7 +10,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, minimum_corba {
   after += *idl
 
   Source_Files {
@@ -28,7 +28,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging,
   }
 }
 
-project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, minimum_corba {
   after += *idl
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
index b4eb64b13e5..b4eb64b13e5 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
index 2728ec207c3..244772c3c63 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -40,7 +40,7 @@ CLEANFILES = \
 testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sc $(srcdir)/test.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -63,9 +63,10 @@ CLEANFILES += \
 testsC.cpp testsC.h testsC.inl testsS.cpp testsS.h testsS.inl: tests-stamp
 
 tests-stamp: $(srcdir)/tests.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/tests.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sc $(srcdir)/tests.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl \
   tests.idl
@@ -74,9 +75,9 @@ noinst_HEADERS = \
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -110,9 +111,9 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -120,9 +121,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -164,9 +165,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/README b/TAO/orbsvcs/tests/Bug_2248_Regression/README
index 20a95c0bb35..20a95c0bb35 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/README
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/README
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
index 8a557179c7c..8a557179c7c 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
index 5c8103cd14f..5c8103cd14f 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
index 69617231383..69617231383 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
index c9a8151677a..c9a8151677a 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 0d6a828940b..0d6a828940b 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
index 1bf9b049712..1bf9b049712 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index 60f306ac782..60f306ac782 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl b/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl
index f1ba468adb1..f1ba468adb1 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
index c3cc5424921..c3cc5424921 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
index 09da165bd14..09da165bd14 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl b/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl
index a1be42b8619..a1be42b8619 100644..100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am
index 27a08fb27a7..63042936044 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,6 +43,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
@@ -50,9 +51,9 @@ noinst_HEADERS = \
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -86,9 +87,9 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -96,9 +97,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client2
 
@@ -134,9 +135,9 @@ client2_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -144,9 +145,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -185,9 +186,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -195,9 +196,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server2
 
@@ -236,9 +237,9 @@ server2_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am
index d0a83f62519..4e41c8eec08 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,6 +43,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
@@ -50,9 +51,9 @@ noinst_HEADERS = \
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -86,9 +87,9 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -96,9 +97,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -137,9 +138,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/README b/TAO/orbsvcs/tests/Bug_2287_Regression/README
index affa491c70e..3c77b3edb08 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/README
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/README
@@ -8,7 +8,7 @@ The server installs a server request interceptor and persistent servant and writ
 The client installs client side FT support and invokes the method "throw_location_forward" on the IOGR.
 The server request interceptor detects invocations of this method and in response either:
 a/ Throws a location forward back to the original IOGR if cannot determine (from the expiration_time member of the FT request service context) thatthe client must have despatched the request after the expiration time.
-b/ Allows the request to be completed if it can determine absolutely that the request was dispatched after the expiration time. This indicates a regression to the client.
+b/ Allows the request to be completed if it can determine absolutely that the request was despatched after the expiration time. This indicates a regression to the client.
 
 A successful outcome is if the client stops following the location forwards once it detects that the expiration time has passed, and a TRANSIENT system exception is recived in the application code.
 
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am
index 564e673242e..a04dad99ade 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
 ## Makefile.Bug_2316_Regression_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -79,13 +80,13 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Bug_2316_Regression_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -117,7 +118,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am
index 0bc6ddfda9e..0eaedade3c5 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.Bug_2377_Regression_Test.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   HelloC.cpp \
@@ -28,7 +28,10 @@ BUILT_SOURCES = \
   HelloC.inl \
   HelloS.cpp \
   HelloS.h \
-  HelloS.inl
+  HelloS.inl \
+  HelloS_T.cpp \
+  HelloS_T.h \
+  HelloS_T.inl
 
 CLEANFILES = \
   Hello-stamp \
@@ -37,12 +40,15 @@ CLEANFILES = \
   HelloC.inl \
   HelloS.cpp \
   HelloS.h \
-  HelloS.inl
+  HelloS.inl \
+  HelloS_T.cpp \
+  HelloS_T.h \
+  HelloS_T.inl
 
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
+HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl HelloS_T.cpp HelloS_T.h HelloS_T.inl: Hello-stamp
 
 Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Hello.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Hello.idl
 	@touch $@
 
 noinst_PROGRAMS = uipmc_test
@@ -62,7 +68,9 @@ uipmc_test_SOURCES = \
   HelloC.h \
   HelloC.inl \
   HelloS.h \
-  HelloS.inl
+  HelloS.inl \
+  HelloS_T.h \
+  HelloS_T.inl
 
 uipmc_test_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
@@ -77,7 +85,7 @@ uipmc_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2615_Regression/Makefile.am
deleted file mode 100644
index f9b096ac26c..00000000000
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2615_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2615_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2615_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl
index 948f976ce02..b72036a4a05 100755
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "$ENV{ACE_ROOT}/bin";
+use lib '../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc b/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
deleted file mode 100644
index 8c73a352758..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults, fault_tolerance {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*Client): taoserver, iortable, ftclientorb, fault_tolerance {
-  after += *idl
-  exename = client
-  Source_Files {
-    TestS.cpp
-    TestC.cpp
-    client.cpp
-    Client_Task.cpp
-    Server_Task.cpp
-    TestImpl.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*Server): taoserver, iortable, fault_tolerance {
-  after += *idl
-  exename = server
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-    server.cpp
-    Server_Task.cpp
-    TestImpl.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
deleted file mode 100644
index a735418a945..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "Client_Task.h"
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
-
-//////////////////////////////////////////////////////////////////////////
-
-ACE_CString file_prefix("file://");
-
-/// Constructor
-Client_Task::Client_Task (CORBA::ORB_ptr corb,
-  ACE_Thread_Manager *thr_mgr,
-  const ACE_CString& collocated_ior_file,
-  const ACE_CString& server_ior_file)
-  : ACE_Task_Base (thr_mgr)
-  , corb_ (CORBA::ORB::_duplicate (corb))
-  , collocated_ior_file_(collocated_ior_file)
-  , server_ior_file_(server_ior_file)
-{
-}
-
-CORBA::Object_ptr
-Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version ACE_ENV_ARG_DECL)
-{
-  CORBA::Object_var remote_server(
-    corb_->string_to_object (ACE_CString(file_prefix + this->server_ior_file_).c_str()));
-
-  if (CORBA::is_nil (remote_server.in ()))
-    {
-      ACE_ERROR ((LM_ERROR, "Error: Remote server is not started.\n"));
-      ACE_TRY_THROW (CORBA::INTERNAL ());
-    }
-
-  CORBA::Object_var collocated_server(
-    corb_->string_to_object (ACE_CString(file_prefix + this->collocated_ior_file_).c_str()));
-
-  if (CORBA::is_nil (collocated_server.in ()))
-    {
-      ACE_ERROR ((LM_ERROR, "Error: Collocated server is not started.\n"));
-      ACE_TRY_THROW (CORBA::INTERNAL ());
-    }
-
-  FT::TagFTGroupTaggedComponent ft_tag_component;
-
-  // Create the list
-  TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
-  iors.length (2);
-  iors [0] = CORBA::Object::_duplicate (remote_server.ptr());
-  iors [1] = CORBA::Object::_duplicate (collocated_server.ptr());
-
-  CORBA::Object_var new_ref =
-    this->iorm_->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Property values
-
-  // Major and Minor revision numbers
-  ft_tag_component.component_version.major = (CORBA::Octet) 1;
-  ft_tag_component.component_version.minor = (CORBA::Octet) 0;
-
-  // Domain id
-  ft_tag_component.group_domain_id = domain_id;
-
-  // Object group id
-  ft_tag_component.object_group_id = group_id;
-
-  // Version
-  ft_tag_component.object_group_ref_version = group_version;
-
-  // Construct the IOGR Property class
-  TAO_FT_IOGR_Property iogr_prop (ft_tag_component);
-
-  // Set the property
-  CORBA::Boolean retval = this->iorm_->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Set the primary
-  // See we are setting the second ior as the primary
-  retval = this->iorm_->set_primary (&iogr_prop,
-                              remote_server.in (),
-                              new_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return new_ref._retn ();
-}
-
-/// Thread entry point
-int Client_Task::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Get a ref to the IORManipulation object
-      CORBA::Object_var IORM =
-        corb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-        0
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Narrow
-      this->iorm_ =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var iorgr_string =
-        corb_->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var object =
-        corb_->string_to_object (iorgr_string.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test_var server =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-            "Object reference <%s> is nil\n", iorgr_string.in()), 1);
-        }
-
-      CORBA::Object_var remote_server(
-        corb_->string_to_object (ACE_CString(file_prefix + this->server_ior_file_).c_str()));
-
-      Test_var remote_server_as_test =
-        Test::_narrow (remote_server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var collocated_server(
-        corb_->string_to_object (ACE_CString(file_prefix + this->collocated_ior_file_).c_str()));
-
-      Test_var collocated_server_as_test =
-        Test::_narrow (collocated_server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!collocated_server->_is_collocated())
-        { // Collocation is disabled, just skip the test - it has no sense.
-          ACE_DEBUG ((LM_ERROR, "Test has no sense, because collocation is disabled.\n") );
-        }
-      else
-        {
-          ACE_TRY_NEW_ENV
-          {
-            // Following call will fail if the problem is not fixed.
-
-            // Because we are using TRANSIENT objects with the SYSTEM_ID policy
-            // the object keys won't match so the POA won't be able to dispatch locally.
-            // This wouldn't work with 'direct' collocation strategy but the default is 'through poa'.
-            server->myMethod (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-          ACE_CATCHANY
-          {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-              "Exception caught in client task:");
-          }
-          ACE_ENDTRY;
-        }
-
-      remote_server_as_test->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      collocated_server_as_test->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Exception caught in client task:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
deleted file mode 100644
index 30c2a82fe49..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-
-#include "ace/Task.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-
-//////////////////////////////////////////////////////////////////////////
-
-/// Implement a Task to run the client as a thread
-class Client_Task : public ACE_Task_Base
-{
-public:
-
-  /// Constructor
-  Client_Task (CORBA::ORB_ptr corb,
-    ACE_Thread_Manager *thr_mgr,
-    const ACE_CString& collocated_ior_file,
-    const ACE_CString& server_ior_file);
-
-  CORBA::Object_ptr make_iogr (
-     const char* domain_id, 
-     CORBA::ULongLong group_id, 
-     CORBA::ULong group_version ACE_ENV_ARG_DECL);
-
-  /// Thread entry point
-  int svc (void);
-
-private:
-  CORBA::ORB_var corb_;
-
-  TAO_IOP::TAO_IOR_Manipulation_var iorm_;
-
-  const ACE_CString& collocated_ior_file_;
-
-  const ACE_CString& server_ior_file_;
-};
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2709_Regression/Makefile.am
deleted file mode 100644
index d615c43cc4a..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Makefile.am
+++ /dev/null
@@ -1,179 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2709_Regression_Idl.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2709_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestImpl.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Server_Task.h \
-  TestImpl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2709_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestImpl.cpp \
-  TestS.cpp \
-  server.cpp \
-  Server_Task.h \
-  TestImpl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/README b/TAO/orbsvcs/tests/Bug_2709_Regression/README
deleted file mode 100644
index 0f974d4cae2..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/README
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-This test checks that the IOGRs are works correctly if non-primary profile is process-local.
-
-_Expected Success Output_
-
-d:\tao151\prism\tests\tao449_regression>run_test.pl
-event loop finished
-event loop finished
-
-_Expected Regression Output_
-
-(2140|2664) EXCEPTION, Exception caught in client task:
-system exception, ID 'IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0'
-Unknown vendor minor code id (0), minor code = 0, completed = NO
-
-ERROR: client timedout
-ERROR: client returned -1
-ERROR: server timedout
-ERROR: server returned -1
-
-All other output is an unexpected problem.
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
deleted file mode 100644
index 1b5dad7d41f..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// $Id$
-
-#include "ace/OS_NS_unistd.h"
-#include "TestImpl.h"
-#include "Server_Task.h"
-
-//////////////////////////////////////////////////////////////////////////
-
-Server_Task::Server_Task (const char *output,
-  CORBA::ORB_ptr sorb,
-  ACE_Manual_Event &me,
-  ACE_Thread_Manager *thr_mgr) :
-  ACE_Task_Base(thr_mgr),
-  output_(output),
-  me_(me),
-  sorb_(sorb)
-{
-}
-
-int
-Server_Task::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Object_var poa_object =
-        sorb_->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;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TestImpl * server_impl = 0;
-      ACE_NEW_RETURN (server_impl, TestImpl (sorb_.in ()), 1);
-
-      PortableServer::ObjectId_var id =
-        root_poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test_var server = Test::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER);
-
-      CORBA::String_var ior =
-        sorb_->object_to_string (test_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (output_, "w");
-      if (output_file != 0)
-        {
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-
-          ACE_DEBUG ((LM_ERROR, "(%P): Server's IOR was written to file: %s.\n", output_) );
-        }
-
-      // Signal the main thread before we call orb->run ();
-      this->me_.signal ();
-
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
deleted file mode 100644
index 34535ceefdf..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#include "ace/Task.h"
-#include "ace/Manual_Event.h"
-#include "tao/ORB.h"
-
-//////////////////////////////////////////////////////////////////////////
-
-// This task should be run to start Test object implementation
-class Server_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Server_Task (const char *output,
-    CORBA::ORB_ptr sorb,
-    ACE_Manual_Event &me,
-    ACE_Thread_Manager *thr_mgr);
-
-  /// Thread entry point
-  int svc (void);
-
-private:
-  /// Output file for IOR
-  const char *output_;
-
-  /// Manual event to wake up the main thread to create a client
-  /// thread.
-  ACE_Manual_Event &me_;
-
-  CORBA::ORB_var sorb_;
-};
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl
deleted file mode 100644
index 57202e9372e..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-// Just need this for standard includes - contents irrelevent.
-
-interface Test
-{
-  void myMethod ();
-  void shutdown ();
-};
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
deleted file mode 100644
index e81edb9b66e..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-#include "ace/OS_NS_unistd.h"
-#include "TestImpl.h"
-
-TestImpl::TestImpl (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-// virtual 
-void TestImpl::myMethod (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") );
-}
-
-
-// virtual 
-void TestImpl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Give the client thread time to return from the collocated
-  // call to this method before shutting down the ORB.  We sleep
-  // to avoid BAD_INV_ORDER exceptions on fast dual processor machines.
-  ACE_OS::sleep (1);
-  this->orb_->shutdown ();
-}
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
deleted file mode 100644
index fae8f7d2b8d..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#include "tao/ORB.h"
-#include "TestS.h"
-
-class TestImpl
-  : public virtual POA_Test
-{
-public:
-  TestImpl (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual void myMethod (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::ORB_var orb_;
-};
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
deleted file mode 100644
index 644645faa3c..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "TestImpl.h"
-#include "Client_Task.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/Argv_Type_Converter.h"
-#include "tao/ORB_Core.h"
-#include "Server_Task.h"
-
-//////////////////////////////////////////////////////////////////////////
-
-ACE_CString collocated_ior_file("collocated_server.ior");
-ACE_CString server_ior_file("server.ior");
-
-//////////////////////////////////////////////////////////////////////////
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "s:o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 's':
-        server_ior_file = get_opts.opt_arg ();
-        break;
-      case 'o':
-        collocated_ior_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-          "usage:  %s "
-          "-s <server_iorfile>"
-          "-o <collocated_iorfile>"
-          "\n",
-          argv [0]),
-          -1);
-      }
-
-  // Indicates successful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char * argv [])
-{
-  int failed = 0;
-
-  ACE_CString server_orb;
-  server_orb.set ("server_orb");
-  ACE_CString client_orb;
-  client_orb.set ("client_orb");
-
-  ACE_TRY_NEW_ENV
-    {
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      ACE_Argv_Type_Converter satc (argc, argv);
-      CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_Argv_Type_Converter catc (argc, argv);
-      CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      {
-        ACE_Manual_Event me;
-
-        Server_Task server_task (collocated_ior_file.c_str(),
-          sorb.in (),
-          me,
-          ACE_Thread_Manager::instance ());
-
-        if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
-          1,
-          1) == -1)
-          {
-            ACE_ERROR ((LM_ERROR, "Error activating server task\n"));
-          }
-
-        // Wait for the server thread to do some processing
-        me.wait ();
-
-        Client_Task client_task (corb.in (),
-          ACE_Thread_Manager::instance (),
-          collocated_ior_file, server_ior_file);
-
-        if (client_task.activate (THR_NEW_LWP | THR_JOINABLE,
-          1,
-          1) == -1)
-          {
-            ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
-          }
-
-        ACE_Thread_Manager::instance ()->wait ();
-      }
-
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  if (failed)
-    {
-      ACE_DEBUG ((LM_ERROR, "Test failed.\n") );
-    }
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl
deleted file mode 100755
index d5f741aaea2..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl
+++ /dev/null
@@ -1,52 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-$colloc_iorfile = PerlACE::LocalFile ("collocated_server.ior");
-unlink $iorfile;
-unlink $colloc_iorfile;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
-}
-else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile");
-}
-$CL = new PerlACE::Process ("client", " -s $iorfile -o $colloc_iorfile");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (30);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-unlink $colloc_iorfile;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
deleted file mode 100644
index a7cf486602f..00000000000
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// $Id$
-//
-
-#include "TestImpl.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/Argv_Type_Converter.h"
-#include "tao/IORTable/IORTable.h"
-#include "Server_Task.h"
-
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
-const char *ior_output_file = "server.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 successful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      ACE_Argv_Type_Converter satc (argc, argv);
-      CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv ()                         
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      {
-        ACE_Manual_Event me;
-
-        Server_Task server_task (ior_output_file,
-          sorb.in (),
-          me,
-          ACE_Thread_Manager::instance ());
-
-        if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
-          1,
-          1) == -1)
-          {
-            ACE_ERROR ((LM_ERROR, "Error activating server task\n"));
-          }
-
-        // Wait for the server thread to do some processing
-        me.wait ();
-
-        ACE_Thread_Manager::instance ()->wait ();
-      }
-
-      sorb->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/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am
index c81514493b2..d73d8319cc3 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile.am
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.CC_client.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = CC_client
 
 CC_client_CPPFLAGS = \
@@ -53,8 +50,6 @@ CC_client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
index c0268e4afd9..4677afe69e4 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
@@ -18,7 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.CosEvent_Basic_Disconnect.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Disconnect
 
@@ -56,13 +56,13 @@ Disconnect_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.CosEvent_Basic_MT_Disconnect.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += MT_Disconnect
 
@@ -99,13 +99,13 @@ MT_Disconnect_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.CosEvent_Basic_Pull_Push_Event.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Pull_Push_Event
 
@@ -143,13 +143,13 @@ Pull_Push_Event_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.CosEvent_Basic_Push_Event.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Push_Event
 
@@ -187,13 +187,13 @@ Push_Event_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.CosEvent_Basic_Random.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Random
 
@@ -230,13 +230,13 @@ Random_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.CosEvent_Basic_Shutdown.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Shutdown
 
@@ -274,7 +274,7 @@ Shutdown_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/CosEvent/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Makefile.am
index ffb416ac4a2..19f692f256b 100644
--- a/TAO/orbsvcs/tests/CosEvent/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/Makefile.am
@@ -9,7 +9,6 @@
 ## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
-        Timeout \
         lib \
         Basic
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Timeout/Makefile.am
deleted file mode 100644
index 42cc127d425..00000000000
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Timeout_Timeout.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = TimeoutTest
-
-TimeoutTest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-TimeoutTest_SOURCES = \
-  TestEventConsumer_i.cpp \
-  TimeoutTestMain.cpp \
-  TestEventConsumer_i.h
-
-TimeoutTest_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
index 132f55111fc..a9b61c7c29f 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.CosEvent_Test_Lib.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libCECTests.la
 
@@ -39,7 +39,7 @@ noinst_HEADERS = \
   Counting_Supplier.h \
   cectest_export.h
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
index 9604476e566..6dee1408491 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
 ## Makefile.EC_Custom_Marshal_IDL.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   dataC.cpp \
@@ -29,7 +28,10 @@ BUILT_SOURCES = \
   dataC.inl \
   dataS.cpp \
   dataS.h \
-  dataS.inl
+  dataS.inl \
+  dataS_T.cpp \
+  dataS_T.h \
+  dataS_T.inl
 
 CLEANFILES = \
   data-stamp \
@@ -38,24 +40,26 @@ CLEANFILES = \
   dataC.inl \
   dataS.cpp \
   dataS.h \
-  dataS.inl
+  dataS.inl \
+  dataS_T.cpp \
+  dataS_T.h \
+  dataS_T.inl
 
-dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl: data-stamp
+dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl dataS_T.cpp dataS_T.h dataS_T.inl: data-stamp
 
 data-stamp: $(srcdir)/data.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/data.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   data.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.ECM_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += ECM_Consumer
 
@@ -90,13 +94,11 @@ ECM_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.ECM_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ECM_Supplier
@@ -134,7 +136,6 @@ ECM_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
index 2d4e76e9d6c..550d53a525c 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.EC_MT_Mcast.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = MCast
@@ -55,7 +54,6 @@ MCast_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index ceb4108095b..c036ec7bda4 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -269,11 +269,10 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
 
   ACE_INET_Addr ignore_from;
   this->endpoint_.dgram ().get_local_addr (ignore_from);
-  ACE_TCHAR buffer[256];
-  ignore_from.addr_to_string (buffer,256);
-  ACE_DEBUG ((LM_DEBUG, "(%P) ECM_Driver::open_senders - "
-              "local endpoint = (%s)\n",
-              ACE_TEXT_ALWAYS_CHAR (buffer)));
+  ACE_DEBUG ((LM_DEBUG, "ECM_Driver::open_senders - "
+              "local endpoint = (%u:%d)\n",
+              ignore_from.get_ip_address (),
+              ignore_from.get_port_number ()));
   for (int i = 0; i < this->all_federations_count_; ++i)
     {
       TAO_ECG_UDP_Out_Endpoint* clone;
@@ -587,12 +586,12 @@ ECM_Federation::ECM_Federation (char* name,
   int i;
   for (i = 0; i < this->supplier_types_; ++i)
     {
-      ACE_INET_Addr addr (u_short(0), this->supplier_names_[i], AF_INET);
+      ACE_INET_Addr addr (u_short(0), this->supplier_names_[i]);
       this->supplier_ipaddr_[i] = addr.get_ip_address ();
     }
   for (i = 0; i < this->consumer_types_; ++i)
     {
-      ACE_INET_Addr addr (u_short(0), this->consumer_names_[i], AF_INET);
+      ACE_INET_Addr addr (u_short(0), this->consumer_names_[i]);
       this->consumer_ipaddr_[i] = addr.get_ip_address ();
     }
 }
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
index efc0e0bf21c..9c913d77f7a 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.EC_Mcast.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = EC_Mcast
@@ -50,7 +49,6 @@ EC_Mcast_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
index ef1eaba0a3f..0f1ad4410cc 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.EC_Multiple.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = EC_Multiple
@@ -56,7 +55,6 @@ EC_Multiple_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
index 4f04ed9e586..170b9b086cd 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.ECT_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += ECT_Consumer
 
@@ -54,13 +53,11 @@ ECT_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.ECT_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ECT_Supplier
@@ -98,13 +95,11 @@ ECT_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.ECT_Throughput.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ECT_Throughput
@@ -145,7 +140,6 @@ ECT_Throughput_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
index baf705df43c..b68828bdc89 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Event_Basic_Atomic_Reconnect.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Atomic_Reconnect
@@ -54,13 +53,11 @@ Atomic_Reconnect_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_BCast.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += BCast
@@ -96,13 +93,11 @@ BCast_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Bitmask.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Bitmask
@@ -146,13 +141,11 @@ Bitmask_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Complex.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Complex
@@ -196,13 +189,11 @@ Complex_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Control.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Control
@@ -238,13 +229,11 @@ Control_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Disconnect.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Disconnect
@@ -288,13 +277,11 @@ Disconnect_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Gateway.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Gateway
@@ -338,13 +325,11 @@ Gateway_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_MT_Disconnect.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += MT_Disconnect
@@ -380,13 +365,11 @@ MT_Disconnect_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Negation.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Negation
@@ -430,13 +413,11 @@ Negation_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Observer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Observer
@@ -472,13 +453,11 @@ Observer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Random.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Random
@@ -514,13 +493,11 @@ Random_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Reconnect.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Reconnect
@@ -556,13 +533,11 @@ Reconnect_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Shutdown.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Shutdown
@@ -598,13 +573,11 @@ Shutdown_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Timeout.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Timeout
@@ -648,13 +621,11 @@ Timeout_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Wildcard.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Wildcard
@@ -698,7 +669,6 @@ Wildcard_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Makefile.am b/TAO/orbsvcs/tests/Event/Makefile.am
index 7663a0d02bd..ad70d16ed4e 100644
--- a/TAO/orbsvcs/tests/Event/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Makefile.am
@@ -10,8 +10,6 @@
 
 SUBDIRS = \
         Mcast \
-        ThreadFlags \
-        UDP \
         lib \
         Performance \
         Basic
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
index 443c61d62a5..27940a1cb2b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.ECMcastTests_lib.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_LTLIBRARIES = libECMcastTests.la
@@ -41,7 +40,6 @@ noinst_HEADERS = \
   Gateway_EC.h
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
index 5c1c4a2aa28..1b52b4fb3bd 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Complex_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += consumer
@@ -53,13 +52,11 @@ consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Complex_Gateway_Ec.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += gateway-ec
@@ -94,13 +91,11 @@ gateway_ec_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Complex_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += supplier
@@ -135,7 +130,6 @@ supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
index b3e3678af5f..8633ab9fcef 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
@@ -11,7 +11,6 @@
 SUBDIRS = \
         Common \
         Complex \
-        RTEC_MCast_Federated \
         Simple \
         Two_Way
 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
deleted file mode 100644
index ba7e9e16b05..00000000000
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTEC_MCast_Federated_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += EchoEventConsumer
-
-EchoEventConsumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-EchoEventConsumer_SOURCES = \
-  EchoEventConsumerMain.cpp \
-  EchoEventConsumer_i.cpp \
-  EchoEventConsumer_i.h
-
-EchoEventConsumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTEC_MCast_Federated_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += EchoEventSupplier
-
-EchoEventSupplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-EchoEventSupplier_SOURCES = \
-  EchoEventSupplierMain.cpp \
-  EchoEventSupplier_i.cpp \
-  SimpleAddressServer.cpp \
-  EchoEventSupplier_i.h \
-  SimpleAddressServer.h
-
-EchoEventSupplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
index a255da56843..6910d790a5d 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
@@ -2,13 +2,9 @@
 // $Id$
 
 project(*Supplier): namingexe, rteventexe, rtevent_serv {
+  requires += exceptions
   exename   = EchoEventSupplier
-
-  specific(automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../common
 
   Source_Files {
     EchoEventSupplierMain.cpp
@@ -18,13 +14,9 @@ project(*Supplier): namingexe, rteventexe, rtevent_serv {
 }
 
 project(*Consumer): namingexe, rteventexe,  {
+  requires += exceptions
   exename   = EchoEventConsumer
-
-  specific(automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../common
 
   Source_Files {
     EchoEventConsumerMain.cpp
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
index 93b8bf84898..617b25f0ec2 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Simple_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += consumer
@@ -53,13 +52,11 @@ consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Simple_Gateway_Ec.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += gateway-ec
@@ -94,13 +91,11 @@ gateway_ec_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Simple_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += supplier
@@ -135,7 +130,6 @@ supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
index 77efa6f4a6f..9ad215d370a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Two_Way_Application.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += application
@@ -53,13 +52,11 @@ application_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Two_Way_Gateway_Ec.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += gateway-ec
@@ -94,7 +91,6 @@ gateway_ec_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
index 0da617d516c..b37e6f11b58 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Event_Performance_Connect.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Connect
@@ -54,13 +53,11 @@ Connect_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Performance_Inversion.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Inversion
@@ -96,13 +93,11 @@ Inversion_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Performance_Latency.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Latency
@@ -139,13 +134,11 @@ Latency_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Performance_Latency_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Latency_Server
@@ -185,13 +178,11 @@ Latency_Server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Performance_Throughput.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Throughput
@@ -227,7 +218,6 @@ Throughput_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
index 6fcee9bdecd..bde6790200e 100755
--- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
@@ -8,7 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl script that runs the client and all the other servers that
 # are needed
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/Makefile.am b/TAO/orbsvcs/tests/Event/ThreadFlags/Makefile.am
deleted file mode 100644
index 10fcbfa4263..00000000000
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.TFTest.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = testflags
-
-testflags_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-testflags_SOURCES = \
-  testflags.cpp
-
-testflags_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
deleted file mode 100644
index f4fde487940..00000000000
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// $Id$
-
-/*
- * Test TAO_EC_Thread_Flags encapsulation.
- */
-
-#include "orbsvcs/Event/EC_Thread_Flags.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/OS_NS_strings.h"
-
-ACE_RCSID(EC_Tests, testflags, "$Id$")
-
-/*
-  Here are the scenarios we need to test:
-
-  1. Initialize/assign empty instance and validate defaults, priority, etc.
-  2. Initialize/assign with each flag and validate value of flags.
-  3. Initialize/assign with each scope and validate scope and flags.
-  4. Initialize/assign with each sched and validate sched and flags.
-  5. Initialize/assign with single numeric value and validate flags, sched, and scope values.
-  6. Initialize/assign with bogus symbols and validate scope/flags + error.
-  7. Initialize/assign with multiple flags and validate flags, scope, sched.
-
- */
-struct ExpectedValues
-{
-  long flags;
-  long scope;
-  long sched;
-
-  ExpectedValues(long f = 0, long sco = 0, long sch = 0)
-    : flags(f)
-    , scope(sco)
-    , sched(sch)
-    {
-    }
-};
-
-struct ThreadFlagsTest
-{
-  enum How {
-    INIT = 0x1, // use constructor initialization
-    ASSIGN = 0x2, // use assignment operator
-    BOTH = 0x3
-  };
-
-  ThreadFlagsTest (const char* sym, How assign, ExpectedValues ev, ExpectedValues which_check);
-
-  // Execute the test and pass back an ExpectedValues struct where the
-  // values are zero if the values were not as expected or non-zero if
-  // they were as expected.  Return value is zero for success, or
-  // the bitmask of the "How" version of the test that failed.
-  int runtest(ExpectedValues& results);
-
-  const char* sym_;
-  How assign_;
-  ExpectedValues expected_values_;
-  ExpectedValues which_results_to_check_;
-
-};
-
-ThreadFlagsTest::ThreadFlagsTest (const char* sym,
-                                  How assign,
-                                  ExpectedValues ev,
-                                  ExpectedValues which_check)
-  : sym_(sym)
-  , assign_(assign)
-  , expected_values_(ev)
-  , which_results_to_check_(which_check)
-{
-}
-
-int
-ThreadFlagsTest::runtest (ExpectedValues& results)
-{
-  int r = 0;
-  if (assign_ & INIT)
-    {
-      TAO_EC_Thread_Flags f(sym_);
-      if ( ((results.flags = f.flags()) == expected_values_.flags) &&
-           ((results.scope = f.scope()) == expected_values_.scope) &&
-           ((results.sched = f.sched()) == expected_values_.sched) )
-        ; // we succeeded, do nothing
-      else
-        r |= INIT;
-    }
-  if (assign_ & ASSIGN)
-    {
-      TAO_EC_Thread_Flags f;
-      f = sym_;
-      if ( ((results.flags = f.flags()) == expected_values_.flags) &&
-           ((results.scope = f.scope()) == expected_values_.scope) &&
-           ((results.sched = f.sched()) == expected_values_.sched) )
-        ; // we succeeded, do nothing
-      else
-        r |= ASSIGN;
-    }
-
-  return r;
-}
-
-// Common things to pass for 'which_check'
-static const ExpectedValues CHECK_ALL(1, 1, 1);
-static const ExpectedValues ONLY_FLAGS(1, 0, 0);
-// ExpectedValues set indicating the default values
-static const ExpectedValues DEFAULTS(0, 0, 0);
-
-void
-print_results (int how, ExpectedValues expected, ExpectedValues actuals)
-{
-  const char* op =
-    (how == ThreadFlagsTest::INIT) ? "INIT" : 
-    (how == ThreadFlagsTest::ASSIGN) ? "ASSIGN" :
-    (how == ThreadFlagsTest::BOTH) ? "BOTH" :
-    "unk?";
-
-  ACE_DEBUG ((LM_DEBUG, "  %s: expected {%x,%x,%x} got {%x,%x,%x}",
-              op,
-              expected.flags, expected.scope, expected.sched,
-              actuals.flags, actuals.scope, actuals.sched));
-}
-
-int
-main (int argc, char* argv[])
-{
-  ThreadFlagsTest static_tests[] = {
-    // Test 1
-    ThreadFlagsTest(0, ThreadFlagsTest::BOTH, DEFAULTS, CHECK_ALL), 
-    // Test 2
-    ThreadFlagsTest("THR_CANCEL_DISABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_DISABLE), CHECK_ALL),
-    ThreadFlagsTest("THR_CANCEL_ENABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_ENABLE), CHECK_ALL),
-    ThreadFlagsTest("THR_CANCEL_DEFERRED", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_DEFERRED), CHECK_ALL),
-    ThreadFlagsTest("THR_CANCEL_ASYNCHRONOUS", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_ASYNCHRONOUS), CHECK_ALL),
-    ThreadFlagsTest("THR_BOUND", ThreadFlagsTest::BOTH, ExpectedValues(THR_BOUND), CHECK_ALL),
-    ThreadFlagsTest("THR_NEW_LWP", ThreadFlagsTest::BOTH, ExpectedValues(THR_NEW_LWP), CHECK_ALL),
-    ThreadFlagsTest("THR_DETACHED", ThreadFlagsTest::BOTH, ExpectedValues(THR_DETACHED), CHECK_ALL),
-    ThreadFlagsTest("THR_SUSPENDED", ThreadFlagsTest::BOTH, ExpectedValues(THR_SUSPENDED), CHECK_ALL),
-    ThreadFlagsTest("THR_DAEMON", ThreadFlagsTest::BOTH, ExpectedValues(THR_DAEMON), CHECK_ALL),
-    ThreadFlagsTest("THR_JOINABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_JOINABLE), CHECK_ALL),
-    // Test 3
-    ThreadFlagsTest("THR_SCHED_FIFO", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_FIFO, 0, THR_SCHED_FIFO), CHECK_ALL),
-    ThreadFlagsTest("THR_SCHED_RR", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_RR, 0, THR_SCHED_RR), CHECK_ALL),
-    ThreadFlagsTest("THR_SCHED_DEFAULT", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_DEFAULT, 0, THR_SCHED_DEFAULT), CHECK_ALL),
-    // Test 4
-    ThreadFlagsTest("THR_SCOPE_SYSTEM", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCOPE_SYSTEM, THR_SCOPE_SYSTEM, 0), CHECK_ALL),
-    ThreadFlagsTest("THR_SCOPE_PROCESS", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCOPE_PROCESS, THR_SCOPE_PROCESS, 0), CHECK_ALL),
-    // Test 5
-    ThreadFlagsTest("0x0001", ThreadFlagsTest::BOTH, ExpectedValues(1, 0, 0), CHECK_ALL),
-    // Test 6
-    ThreadFlagsTest("Zaphod|Beeblebrox|THR_BOGUS", ThreadFlagsTest::BOTH, DEFAULTS, CHECK_ALL),
-    // Test 7
-    ThreadFlagsTest("THR_BOUND|THR_JOINABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_BOUND|THR_JOINABLE), CHECK_ALL),
-    ThreadFlagsTest("THR_SCHED_FIFO|THR_DAEMON|THR_SCOPE_PROCESS", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_FIFO|THR_DAEMON|THR_SCOPE_PROCESS, THR_SCOPE_PROCESS, THR_SCHED_FIFO), CHECK_ALL),
-    ThreadFlagsTest("THR_SCHED_DEFAULT|THR_SCOPE_SYSTEM|THR_NEW_LWP", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_DEFAULT|THR_SCOPE_SYSTEM|THR_NEW_LWP, THR_SCOPE_SYSTEM, THR_SCHED_DEFAULT), CHECK_ALL),
-    ThreadFlagsTest("THR_NEW_LWP|THR_SCOPE_SYSTEM|THR_JOINABLE|THR_SCHED_FIFO",
-                    ThreadFlagsTest::BOTH,
-                    ExpectedValues(THR_NEW_LWP|THR_SCHED_FIFO|THR_SCOPE_SYSTEM|THR_JOINABLE, THR_SCOPE_SYSTEM, THR_SCHED_FIFO),
-                    CHECK_ALL)
-  };
-  
-  int returnval = 0;
-  const size_t numtests = sizeof(static_tests)/sizeof(static_tests[0]);
-  if (argc > 1)
-    {
-      char* which_test;
-      while ((which_test = *++argv))
-        {
-          size_t testnum = ACE_OS_String::strtol (which_test, 0, 0);
-          if (testnum < numtests)
-            {
-              ExpectedValues results;
-              ThreadFlagsTest& t = static_tests[testnum];
-              ACE_DEBUG ((LM_DEBUG, "Test #%d for %s...", testnum, t.sym_));
-              int r = t.runtest (results);
-              if (r != 0)
-                {
-                  returnval = 1;
-                  ACE_DEBUG ((LM_DEBUG, "FAILED -- details: "));
-                  if (r & ThreadFlagsTest::INIT)
-                    print_results (ThreadFlagsTest::INIT, t.expected_values_, results);
-              
-                  if (r & ThreadFlagsTest::ASSIGN)
-                    print_results (ThreadFlagsTest::ASSIGN, t.expected_values_, results);
-          
-                  ACE_DEBUG ((LM_DEBUG, "\n"));
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG, "ok.\n"));
-                }
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "%d is not a valid test number\n", testnum));
-            }
-        }
-    }
-  else
-    {
-      for(size_t i = 0; i < numtests; ++i)
-        {
-          ExpectedValues results;
-          ThreadFlagsTest& t = static_tests[i];
-          ACE_DEBUG ((LM_DEBUG, "Test #%d for %s...", i, t.sym_));
-          int r = t.runtest (results);
-          if (r != 0)
-            {
-              returnval = 1;
-              ACE_DEBUG ((LM_DEBUG, "FAILED -- details: "));
-              if (r & ThreadFlagsTest::INIT)
-                print_results (ThreadFlagsTest::INIT, t.expected_values_, results);
-              
-              if (r & ThreadFlagsTest::ASSIGN)
-                print_results (ThreadFlagsTest::ASSIGN, t.expected_values_, results);
-          
-              ACE_DEBUG ((LM_DEBUG, "\n"));
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG, "ok.\n"));
-            }
-        }
-
-    }
-
-  return returnval;
-}
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc b/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
deleted file mode 100644
index 18bbbbed5e8..00000000000
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-project(TFTest): rteventexe, rtevent_serv {
-  exename = testflags 
-}
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
index 42a1a23e8db..efdc33730e2 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -102,7 +102,7 @@ Consumer::push (const RtecEventComm::EventSet& events
 
       if (this->valuetype_)
         {
-          Hello::ValueTypeData * test_data = 0;
+          ValueTypeData * test_data = 0;
           if (events[i].data.any_value >>= test_data)
             {
               ACE_DEBUG ((LM_DEBUG, "Consumer (%P|%t): Received message <%d>: %s\n",
diff --git a/TAO/orbsvcs/tests/Event/UDP/Makefile.am b/TAO/orbsvcs/tests/Event/UDP/Makefile.am
deleted file mode 100644
index 4d2b1dc4419..00000000000
--- a/TAO/orbsvcs/tests/Event/UDP/Makefile.am
+++ /dev/null
@@ -1,145 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RtEC_UDP_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.RtEC_UDP_Receiver.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  AddrServer.cpp \
-  Consumer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  receiver.cpp \
-  AddrServer.h \
-  Consumer.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RtEC_UDP_Sender.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  AddrServer.cpp \
-  Supplier.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  sender.cpp \
-  AddrServer.h \
-  Supplier.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc b/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc
index 8bbd9069095..caf503219e2 100644
--- a/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc
+++ b/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc
@@ -1,41 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project (*idl): taoidldefaults {
-  idlflags -= -Sa -St
-
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project (*sender): orbsvcsexe, rtevent_serv, rtsched {
-  after += *idl
-
+project (* sender): orbsvcsexe, rtevent_serv, rtsched {
   exename = sender
   Source_Files {
     AddrServer.cpp
     Supplier.cpp
     sender.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
+    Test.idl
   }
 }
 
-project (*receiver) : orbsvcsexe, rtevent_serv, rtsched {
-  after += *idl;
-
+project (* receiver) : orbsvcsexe, rtevent_serv, rtsched {
   exename = receiver
   Source_Files {
     AddrServer.cpp
     Consumer.cpp
     receiver.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
+    Test.idl
   }
 }
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
index 8cdb64a3ca5..9a1888df558 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -4,6 +4,8 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
+#include "TestC.h"
+
 ACE_RCSID (EC_Examples,
            Supplier,
            "$Id$")
@@ -65,12 +67,6 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Supplier::insert_into_any (CORBA::Any& any, Components::EventBase* vb)
-{
-  any <<= vb;
-}
-
-void
 Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
@@ -87,10 +83,10 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
 
       if (this->valuetype_)
         {
-          OBV_Hello::ValueTypeData * test_data = 0;
-          ACE_NEW (test_data, OBV_Hello::ValueTypeData ());
+          OBV_ValueTypeData * test_data = 0;
+          ACE_NEW (test_data, OBV_ValueTypeData ());
           test_data->data ("ACE/TAO/CIAO");
-          insert_into_any (event[0].data.any_value, test_data);
+          event[0].data.any_value <<= test_data;
         }
       else
         {
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
index 6f8b9b1310b..eae15e57257 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
@@ -19,7 +19,6 @@
 
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
-#include "TestC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -56,8 +55,6 @@ public:
   // The skeleton methods.
 
 private:
-  void insert_into_any (CORBA::Any& any, Components::EventBase* vb);
-
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy_;
   // The proxy
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/Test.idl b/TAO/orbsvcs/tests/Event/UDP/Test.idl
index fc1724d9993..fc7e50d4fd2 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Test.idl
+++ b/TAO/orbsvcs/tests/Event/UDP/Test.idl
@@ -3,17 +3,9 @@
 #ifndef TAO_RTEC_MCAST_TEST_IDL
 #define TAO_RTEC_MCAST_TEST_IDL
 
-module Components
+valuetype ValueTypeData
 {
-  abstract valuetype EventBase {};
-};
-
-module Hello
-{
-  valuetype ValueTypeData : Components::EventBase
-  {
-    public string data;
-  };
+  public string data;
 };
 
 #endif /* TAO_RTEC_MCAST_TEST_IDL */
diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
index 30a675ede38..3a6906100b6 100644
--- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -64,9 +64,9 @@ main (int argc, char* argv[])
 
       if (valuetype)
         {
-          Hello::ValueTypeData_init *vb_factory = 0;
+          ValueTypeData_init *vb_factory = 0;
           ACE_NEW_RETURN (vb_factory,
-                          Hello::ValueTypeData_init,
+                          ValueTypeData_init,
                           1); // supplied by mapping
 
           orb->register_value_factory (vb_factory->tao_repository_id (),
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am
index cc6f3bd2da2..5df44088400 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Event_Test_Lib.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_LTLIBRARIES = libECTests.la
@@ -43,12 +42,11 @@ noinst_HEADERS = \
   Counting_Consumer.h \
   Counting_Supplier.h \
   Driver.h \
-  Driver.inl \
+  Driver.inl\
   Supplier.h \
   ectest_export.h
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
index de0dad2a116..4864a0acb3c 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc
+++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
@@ -7,7 +7,7 @@ project(*idl): taoidldefaults, orbsvcslib {
   custom_only = 1
 }
 
-project(*Server): taoserver, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoserver, fault_tolerance, orbsvcsexe, minimum_corba {
   exename = ft_replica
   after += *idl
   Source_Files {
@@ -47,7 +47,7 @@ project(*Server): taoserver, fault_tolerance, orbsvcsexe, avoids_minimum_corba,
   }
 }
 
-project(*Client): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Client): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
   exename = ft_client
   after += *idl
   Source_Files {
@@ -60,7 +60,7 @@ project(*Client): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba,
   }
 }
 
-project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, minimum_corba {
   exename = ft_notifier
   Source_Files {
     FTAPP_Notifier_Main.cpp
@@ -91,7 +91,7 @@ project(*Analyzer): taoclient, fault_tolerance, notification_skel, orbsvcsexe {
   }
 }
 
-project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, minimum_corba {
   exename = ft_fault_consumer
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
@@ -107,7 +107,7 @@ project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcse
   }
 }
 
-project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
   exename = ft_registry
 
   Source_Files {
@@ -124,7 +124,7 @@ project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, avoids_minimu
   }
 }
 
-project(*Creator): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Creator): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
   exename = ft_create
 
   Source_Files {
@@ -140,7 +140,7 @@ project(*Creator): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba,
   }
 }
 
-project(*RMController): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*RMController): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
   exename = replmgr_controller
   Source_Files {
     FT_ReplicationManagerController.cpp
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 16f1f70eee4..16f1f70eee4 100644..100755
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am
index c0754803a38..1ce5367ba13 100644
--- a/TAO/orbsvcs/tests/FT_App/Makefile.am
+++ b/TAO/orbsvcs/tests/FT_App/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,9 +22,9 @@ noinst_PROGRAMS =
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_analyzer
 
@@ -68,23 +68,24 @@ ft_analyzer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
 ## Makefile.FT_App_Idl.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   FT_TestReplicaC.cpp \
   FT_TestReplicaC.h \
   FT_TestReplicaC.inl \
   FT_TestReplicaS.cpp \
   FT_TestReplicaS.h \
-  FT_TestReplicaS.inl
+  FT_TestReplicaS.inl \
+  FT_TestReplicaS_T.cpp \
+  FT_TestReplicaS_T.h \
+  FT_TestReplicaS_T.inl
 
 CLEANFILES = \
   FT_TestReplica-stamp \
@@ -93,26 +94,28 @@ CLEANFILES = \
   FT_TestReplicaC.inl \
   FT_TestReplicaS.cpp \
   FT_TestReplicaS.h \
-  FT_TestReplicaS.inl
+  FT_TestReplicaS.inl \
+  FT_TestReplicaS_T.cpp \
+  FT_TestReplicaS_T.h \
+  FT_TestReplicaS_T.inl
 
-FT_TestReplicaC.cpp FT_TestReplicaC.h FT_TestReplicaC.inl FT_TestReplicaS.cpp FT_TestReplicaS.h FT_TestReplicaS.inl: FT_TestReplica-stamp
+FT_TestReplicaC.cpp FT_TestReplicaC.h FT_TestReplicaC.inl FT_TestReplicaS.cpp FT_TestReplicaS.h FT_TestReplicaS.inl FT_TestReplicaS_T.cpp FT_TestReplicaS_T.h FT_TestReplicaS_T.inl: FT_TestReplica-stamp
 
 FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/FT_TestReplica.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   FT_TestReplica.idl
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.FT_App_Client.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_client
 
@@ -158,9 +161,9 @@ ft_client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -168,9 +171,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_create
 
@@ -209,9 +212,9 @@ ft_create_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -219,9 +222,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_registry
 
@@ -257,9 +260,9 @@ ft_registry_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -267,9 +270,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_fault_consumer
 
@@ -310,9 +313,9 @@ ft_fault_consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -320,9 +323,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_notifier
 
@@ -360,9 +363,9 @@ ft_notifier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -370,9 +373,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += replmgr_controller
 
@@ -417,9 +420,9 @@ replmgr_controller_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -427,9 +430,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_replica
 
@@ -471,9 +474,9 @@ ft_replica_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 12357cb9297..12357cb9297 100644..100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index 6b45d786a6e..6b45d786a6e 100644..100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
index fb30d6682ad..7fc6b28e84a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,6 +43,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -DCORBA3 $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
@@ -50,9 +51,9 @@ noinst_HEADERS = \
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -88,9 +89,9 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -98,9 +99,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -140,9 +141,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
index d8a8cf205e1..27be663173a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,6 +43,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
@@ -50,9 +51,9 @@ noinst_HEADERS = \
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Manager
 
@@ -86,9 +87,9 @@ Manager_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -96,9 +97,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -134,9 +135,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
index f446221ab9c..ffcaf97f714 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
@@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = IOGRTest
 
@@ -52,9 +52,9 @@ IOGRTest_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
index 895035c4bad..2e3981fe200 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
+++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
@@ -19,9 +19,9 @@ noinst_PROGRAMS =
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += consumer
 
@@ -61,9 +61,9 @@ consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
@@ -71,9 +71,9 @@ endif BUILD_ACE_UUID
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += supplier
 
@@ -113,9 +113,9 @@ supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
index d400b16f933..8e47b662087 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   ami_testC.cpp \
@@ -47,10 +46,10 @@ ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   ami_test.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -58,7 +57,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += client
 
@@ -86,7 +84,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -94,7 +91,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += server
 
@@ -123,7 +119,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -131,7 +126,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += simple_client
 
@@ -159,7 +153,6 @@ simple_client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
index 9709574bc7e..981b180e88a 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
@@ -10,7 +10,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoexe, portableserver, bidir_giop, avoids_corba_e_micro {
+project(*Server): taoexe, portableserver, bidir_giop {
   after += *idl
   Source_Files {
     testC.cpp
@@ -22,7 +22,7 @@ project(*Server): taoexe, portableserver, bidir_giop, avoids_corba_e_micro {
   }
 }
 
-project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
+project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
   after += *idl
   Source_Files {
     testC.cpp
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
index 909bd00541a..39c535a40ff 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.HTIOP_BiDirectional_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -75,12 +76,10 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.HTIOP_BiDirectional_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -106,8 +105,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
index 4e03e2c6f10..18a98bc6fc4 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.HTIOP_Hello_Idl.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
 ## Makefile.HTIOP_Hello_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -69,12 +66,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.HTIOP_Hello_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -103,8 +96,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
index 76cc6ea8b8a..2bc7d3d8d76 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
+++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.IOR_MCast_Idl.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ MCast-stamp: $(srcdir)/MCast.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MCast.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   MCast.idl
 
 ## Makefile.IOR_MCast_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -80,12 +77,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.IOR_MCast_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -114,8 +107,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
index c42ffc5651c..049f561a5fc 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
@@ -1,36 +1,19 @@
 // $Id$
 
-project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoserver, minimum_corba, imr_client {
   idlflags += -Sa -St
-
-  IDL_Files {
-    Messenger.idl
-  }
-
-  custom_only = 1
-}
-
-
-project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, imr_client {
-  after += *idl
   exename = MessengerServer
   Source_Files {
     Messenger_i.cpp
     MessengerServer.cpp
-    MessengerS.cpp
-    MessengerC.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*Client): taoexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): taoexe, minimum_corba {
+  idlflags += -Sa -St
   exename = MessengerClient
   Source_Files {
     MessengerC.cpp
     MessengerClient.cpp
   }
-  IDL_Files {
-  }
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am
deleted file mode 100644
index 95ef8567a2b..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2604_Idl.am
-
-BUILT_SOURCES = \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES = \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Messenger.idl
-
-## Makefile.Bug_2604_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MessengerClient
-
-MessengerClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-MessengerClient_SOURCES = \
-  MessengerC.cpp \
-  MessengerClient.cpp \
-  Messenger_i.h
-
-MessengerClient_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2604_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MessengerServer
-
-MessengerServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-MessengerServer_SOURCES = \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  MessengerServer.cpp \
-  Messenger_i.cpp \
-  Messenger_i.h
-
-MessengerServer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
index 41195ba4376..ebb2309b7f7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
@@ -73,10 +73,6 @@ main (int argc, char *argv[])
 
       orb->run ();
 
-      // the following 1 second of sleep is needed to help
-      // Windows with "server shutdown too quickly so the 
-      // client cannot get the reply" issue.
-      ACE_OS::sleep(1);
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Messenger server shutting "
                                       "down.\n")));
       root_poa->destroy (1, 1);
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
index 12ce27f4286..848b239d9ee 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
@@ -9,8 +9,8 @@ project(airplane_idl) : taoidldefaults {
 }
 
 
-project(airplane server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro {
-  after += airplane_idl
+project(airplane server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client {
+  after += airplane_idl 
 
   IDL_Files {
   }
@@ -24,8 +24,8 @@ project(airplane server) : portableserver, orbsvcsexe, avoids_minimum_corba, ior
   }
 }
 
-project(airplane client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable {
-  after += airplane_idl
+project(airplane client) : portableserver, orbsvcsexe, minimum_corba, iortable {
+  after += airplane_idl 
 
   IDL_Files {
   }
@@ -46,7 +46,8 @@ project(nestea_idl): taoidldefaults {
   custom_only = 1
 }
 
-project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro, avoids_ace_for_tao {
+project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client {
+  avoids += ace_for_tao
   after  += nestea_idl
 
   IDL_Files {
@@ -67,7 +68,7 @@ project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iorta
   }
 }
 
-project(nestea client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable {
+project(nestea client) : portableserver, orbsvcsexe, minimum_corba, iortable {
   after += nestea_idl
 
   IDL_Files {
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am
index d2dd49722b9..15e3b659ff7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am
@@ -13,12 +13,11 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 SUBDIRS = \
         . \
-        Bug_2604_Regression \
         NameService \
         scale
 
@@ -49,12 +48,13 @@ Airplane-stamp: $(srcdir)/Airplane.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Airplane.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Airplane.idl
 
 ## Makefile.airplane_client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += airplane_client
 
@@ -78,11 +78,11 @@ airplane_client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.airplane_server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += airplane_server
 
@@ -109,7 +109,7 @@ airplane_server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.nestea_idl.am
 
@@ -136,12 +136,13 @@ Nestea-stamp: $(srcdir)/Nestea.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Nestea.idl
 	@touch $@
 
+
 noinst_HEADERS += \
   Nestea.idl
 
 ## Makefile.nestea_client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += nestea_client
 
@@ -165,11 +166,12 @@ nestea_client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.nestea_server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += nestea_server
 
@@ -196,7 +198,8 @@ nestea_server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
index c5a71e0cbca..fe939b060c5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: namingexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project: namingexe, minimum_corba {
 }
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am
index 8ced4a626dc..038d3a8f254 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.ImplRepo_NameService.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = test
 
@@ -37,7 +37,7 @@ test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
index b9b1ec65089..827a33cd317 100755
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
@@ -18,7 +18,7 @@ $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 ("$ENV{ACE_ROOT}/bin/tao_imr");
+$TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr");
 
 # We want the tao_imr executable to be found exactly in the path
 # given, without being modified by the value of -ExeSubDir.
diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
index 629083b74d9..a2f9847b70a 100755
--- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
@@ -15,7 +15,7 @@ $imr_locator_ior = PerlACE::LocalFile ("imr_locator.ior");
 $pfile = PerlACE::LocalFile ("persistence.dat");
 
 $IMR_LOCATOR = new PerlACE::Process ("../../../ImplRepo_Service/ImplRepo_Service");
-$TAO_IMR = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/tao_imr");
+$TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr");
 
 # We want the tao_imr executable to be found exactly in the path
 # given, without being modified by the value of -ExeSubDir.
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index 532f878adbe..21fcf064c49 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -45,7 +45,7 @@ my $endpoint = "-ORBEndpoint " . "$protocol" . "://:" . $port;
 
 my $IMR_LOCATOR = new PerlACE::Process ("../../ImplRepo_Service/ImplRepo_Service");
 my $IMR_ACTIVATOR = new PerlACE::Process ("../../ImplRepo_Service/ImR_Activator");
-my $TAO_IMR = new PerlACE::Process("$ENV{ACE_ROOT}/bin/tao_imr");
+my $TAO_IMR = new PerlACE::Process("../../../../bin/tao_imr");
 
 # We want the tao_imr executable to be found exactly in the path
 # given, without being modified by the value of -ExeSubDir.
@@ -272,7 +272,7 @@ sub airplane_ir_test
 
     my $imr_initref = "-ORBInitRef ImplRepoService=file://$imr_locator_ior";
 
-    $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior $refstyle");
+    $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior");
     $IMR_LOCATOR->Spawn ();
 
     if (PerlACE::waitforfile_timed ($imr_locator_ior, 5) == -1) {
@@ -372,7 +372,7 @@ sub nestea_ir_test
 
     my $imr_initref = "-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$imr_locator_ior";
 
-    $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior $refstyle");
+    $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior");
     $IMR_LOCATOR->Spawn ();
 
     if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
@@ -510,7 +510,7 @@ sub perclient
     my $imr_initref = "-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$imr_locator_ior";
 
     # specify an endpoint so that we can use corbaloc url for the client.
-    $IMR_LOCATOR->Arguments ("-d 2 -orbendpoint iiop://:8888 -o $imr_locator_ior $refstyle");
+    $IMR_LOCATOR->Arguments ("-d 2 -orbendpoint iiop://:8888 -o $imr_locator_ior");
     $IMR_LOCATOR->Spawn ();
 
     if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
@@ -605,7 +605,7 @@ sub shutdown_repo
 
     # Specify an endpoint so that we can restart on the same port.
     # Specify persistence so that we can test that shutdown-repo -a works after reconnect
-    $IMR_LOCATOR->Arguments ("-p test.repo -d 1 -orbendpoint iiop://:8888 -o $imr_locator_ior $refstyle");
+    $IMR_LOCATOR->Arguments ("-p test.repo -d 1 -orbendpoint iiop://:8888 -o $imr_locator_ior");
 
     unlink $imr_locator_ior;
     $IMR_LOCATOR->Spawn ();
@@ -685,7 +685,7 @@ sub persistent_ir_test
     unlink $imr_locator_ior;
     ## Be sure to start the ImR on a consistent endpoint, so that any created IORs
     ## remain valid even if the ImR restarts.
-    $IMR_LOCATOR->Arguments ("-orbendpoint iiop://:8888 -x $backing_store -d 2 -o $imr_locator_ior $refstyle");
+    $IMR_LOCATOR->Arguments ("-orbendpoint iiop://:8888 -x $backing_store -d 2 -o $imr_locator_ior");
     $IMR_LOCATOR->Spawn ();
     if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
       print STDERR "ERROR: cannot find $imr_locator_ior\n";
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
index 8d985b8e508..7b336b7db96 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.scaletest_client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -71,11 +72,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.scaletest_server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -100,7 +101,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
index 1c256087109..5e8640bf068 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
@@ -7,7 +7,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro {
+project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client {
   after += *idl
 
   IDL_Files {
@@ -21,7 +21,7 @@ project(*server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, i
   }
 }
 
-project(*client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable {
+project(*client) : portableserver, orbsvcsexe, minimum_corba, iortable {
   after += *idl
 
   IDL_Files {
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 16c973851b9..3396f7a98fe 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,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server): taoexe, portableserver, ifr_client, minimum_corba {
 
   Source_Files {
     test_i.cpp
@@ -9,7 +9,7 @@ project(*server): taoexe, portableserver, ifr_client, avoids_minimum_corba, avoi
   }
 }
 
-project(*client): taoexe, portableserver, ifr_client, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): taoexe, portableserver, ifr_client, dynamicinterface, minimum_corba {
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
index cb68ab8c316..7e6f5e5bdcf 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -21,7 +21,7 @@ noinst_PROGRAMS =
 ## Makefile.IFR_Application_Test_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -48,12 +48,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.IFR_Application_Test_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   testC.cpp \
@@ -104,7 +104,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
index 8586a721088..5ff9f8d336c 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
@@ -26,7 +26,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$TAO_IFR = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/tao_ifr");
+$TAO_IFR = new PerlACE::Process ("../../../../../bin/tao_ifr");
 
 # We want the tao_ifr executable to be found exactly in the path
 # given, without being modified by the value of -ExeSubDir.
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 c69559d7705..e1f0a71cc46 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project: taoexe, ifr_client, minimum_corba {
   exename  = IDL3_Test
-
+  
   Source_Files {
 	client.cpp
 	idl3_client.cpp
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
index 471b2f19e9a..34c2f1abb7d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.IFR_IDL3_Test.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = IDL3_Test
 
@@ -37,7 +37,7 @@ IDL3_Test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
index c5f823f364c..65568172685 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.IFR_Inheritance_Test.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = IFR_Inheritance_Test
 
 IFR_Inheritance_Test_CPPFLAGS = \
@@ -36,8 +33,6 @@ IFR_Inheritance_Test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
index c346b86e657..66d4c91ce83 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
@@ -60,7 +60,7 @@ my $CL = new PerlACE::Process ("IFR_Inheritance_Test",
 my $tao_ifr = "undefined";
 if ($^O eq "MSWin32")
 {
-   $tao_ifr = "$ENV{ACE_ROOT}/bin/tao_ifr";
+   $tao_ifr = "../../../../../bin/tao_ifr";
 }
 else
 {
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 cd458dac258..c351c9ef039 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,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project: taoexe, ifr_client, minimum_corba {
   exename  = IFR_Test
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
index d97df280f9a..7df8ba75c5c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.IFR_IFR_Test.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = IFR_Test
 
@@ -37,7 +37,7 @@ IFR_Test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
index 5cd0c3a6029..269964f7a1a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
@@ -16,7 +16,6 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Latency_Test.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = client
@@ -39,7 +38,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
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 2c9a5ad5cd3..57112a88744 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,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project: taoexe, ifr_client, minimum_corba {
   exename  = Persistence_Test
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
index 434c936a151..9a124a27e7b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.IFR_Persistence_Test.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Persistence_Test
 
@@ -37,7 +37,7 @@ Persistence_Test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am
index 070784ba86f..bea2ef61ae1 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am
@@ -13,21 +13,21 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Interoperable_Naming.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   Web_ServerC.cpp \
   Web_ServerC.h \
   Web_ServerC.inl \
   Web_ServerS.cpp \
   Web_ServerS.h \
-  Web_ServerS.inl
+  Web_ServerS.inl \
+  Web_ServerS_T.cpp \
+  Web_ServerS_T.h \
+  Web_ServerS_T.inl
 
 CLEANFILES = \
   Web_Server-stamp \
@@ -36,12 +36,15 @@ CLEANFILES = \
   Web_ServerC.inl \
   Web_ServerS.cpp \
   Web_ServerS.h \
-  Web_ServerS.inl
+  Web_ServerS.inl \
+  Web_ServerS_T.cpp \
+  Web_ServerS_T.h \
+  Web_ServerS_T.inl
 
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl: Web_Server-stamp
+Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
 
 Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Web_Server.idl
 	@touch $@
 
 noinst_PROGRAMS = client
@@ -63,6 +66,8 @@ client_SOURCES = \
   Web_ServerC.inl \
   Web_ServerS.h \
   Web_ServerS.inl \
+  Web_ServerS_T.h \
+  Web_ServerS_T.inl \
   ncontextext_client_i.h
 
 client_LDADD = \
@@ -72,8 +77,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
index 868c7fd9a2e..17331079c93 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,6 +43,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
@@ -50,7 +51,7 @@ noinst_HEADERS = \
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -86,7 +87,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -94,7 +95,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -133,7 +134,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
index 6103852869a..c5dee68b8be 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,6 +43,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
@@ -50,7 +51,7 @@ noinst_HEADERS = \
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -88,7 +89,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -96,7 +97,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -140,7 +141,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
index 633bb31504e..8f8d87249e8 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
@@ -21,7 +21,7 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -29,7 +29,10 @@ BUILT_SOURCES = \
   TestC.inl \
   TestS.cpp \
   TestS.h \
-  TestS.inl
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
 
 CLEANFILES = \
   Test-stamp \
@@ -38,12 +41,15 @@ CLEANFILES = \
   TestC.inl \
   TestS.cpp \
   TestS.h \
-  TestS.inl
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
 
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
+TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
 
 Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl
 	@touch $@
 
 noinst_PROGRAMS = server
@@ -69,7 +75,9 @@ server_SOURCES = \
   TestC.h \
   TestC.inl \
   TestS.h \
-  TestS.inl
+  TestS.inl \
+  TestS_T.h \
+  TestS_T.inl
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
@@ -89,7 +97,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
index 1caa1b015f9..f9c6fe2837e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
@@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = client
 
@@ -50,7 +50,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
index 6650036eb9e..b4e0f64554f 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Log_Basic_Log_Test.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -37,15 +34,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
index 6e20721549d..3db8a30cb7f 100644
--- a/TAO/orbsvcs/tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Makefile.am
@@ -23,8 +23,6 @@ SUBDIRS = \
         Bug_2287_Regression \
         Bug_2316_Regression \
         Bug_2377_Regression \
-        Bug_2615_Regression \
-        Bug_2709_Regression \
         Concurrency \
         CosEvent \
         EC_Custom_Marshal \
@@ -54,6 +52,5 @@ SUBDIRS = \
         Time \
         Trading \
         ior_corbaname \
-        tests_svc_loader \
-        unit
+        tests_svc_loader
 
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
index 85a70d26da1..a0a511d4393 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
+++ b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
 ## Makefile.McastHello_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -79,13 +80,13 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.McastHello_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -117,7 +118,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
index 117a6038b80..3a4a36013ce 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
@@ -18,7 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.Basic_Notify_AdminProperties.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += AdminProperties
 
@@ -44,10 +44,10 @@ AdminProperties_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -59,13 +59,13 @@ AdminProperties_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_ConnectDisconnect.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ConnectDisconnect
 
@@ -91,10 +91,10 @@ ConnectDisconnect_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -106,13 +106,13 @@ ConnectDisconnect_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Events.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Events
 
@@ -138,10 +138,10 @@ Events_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -153,13 +153,13 @@ Events_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Filter.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Filter
 
@@ -185,10 +185,10 @@ Filter_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -200,13 +200,13 @@ Filter_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_IdAssignment.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += IdAssignment
 
@@ -232,10 +232,10 @@ IdAssignment_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -247,13 +247,13 @@ IdAssignment_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_LifeCycle.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += LifeCycle
 
@@ -279,10 +279,10 @@ LifeCycle_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -294,13 +294,13 @@ LifeCycle_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_MultiTypes.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += MultiTypes
 
@@ -326,10 +326,10 @@ MultiTypes_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -341,13 +341,13 @@ MultiTypes_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Sequence.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence
 
@@ -373,10 +373,10 @@ Sequence_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -388,13 +388,13 @@ Sequence_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Simple.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Simple
 
@@ -420,10 +420,10 @@ Simple_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -435,13 +435,13 @@ Simple_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Updates.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Updates
 
@@ -467,10 +467,10 @@ Updates_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -482,7 +482,7 @@ Updates_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
index 18fccbc0466..23c71d27f1a 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
@@ -91,15 +91,11 @@ if (PerlACE::waitforfile_timed ($namingior, $startup_timeout) == -1) {
   exit 1;
 }
 
-for $dispatch_opt ("", "-UseSeparateDispatchingOrb 1")
-{
-
 for $config (@test_configs)
   {
     print STDERR "\nTesting Notification Service with config file = $config ....\n\n";
 
     $Notification = new PerlACE::Process ("../../../Notify_Service/Notify_Service",
-					  ' '.$dispatch_opt.' '.
                                           "-ORBInitRef NameService=file://$namingior " .
                                           "-IORoutput $notifyior " .
                                           "-ORBSvcConf $config");
@@ -147,7 +143,6 @@ for $config (@test_configs)
     
     $Notification->Kill ();
   }
-}
 
 $Naming->Kill ();
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
index 0a37bf4613b..8a181a0712b 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
@@ -87,14 +87,11 @@ if (PerlACE::waitforfile_timed ($namingior, $startup_timeout) == -1) {
   exit 1;
 }
 
-for $dispatch_opt ("", "-UseSeparateDispatchingOrb 1")
-{
 for $config (@test_configs)
   {
     print STDERR "\nTesting Notification Service with config file = $config ....\n\n";
 
     $Notification = new PerlACE::Process ("../../../Notify_Service/Notify_Service",
-					  ' '.$dispatch_opt.' '.
                                           "-ORBInitRef NameService=file://$namingior " .
                                           "-IORoutput $notifyior " .
                                           "-ORBSvcConf $config " .
@@ -139,7 +136,6 @@ for $config (@test_configs)
 
     $Notification->Kill ();
   }
-}
 
 $Naming->Kill ();
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
index 4aad5496558..c03d37e861b 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   go.idl
 
 ## Makefile.Blocking_Ntf_Struct_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
 
@@ -77,10 +78,10 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -92,13 +93,13 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Blocking_Ntf_Struct_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
 
@@ -126,10 +127,10 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -141,7 +142,7 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
index edd5cae2e19..a16dbea16ed 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
@@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Notify_Test_Destroy.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Notify_Tests_Destroy
 
@@ -43,10 +43,10 @@ Notify_Tests_Destroy_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -58,7 +58,7 @@ Notify_Tests_Destroy_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
index 26314084ae3..fe056312136 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   go.idl
 
 ## Makefile.Discarding_Ntf_Seq_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
 
@@ -77,10 +78,10 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -92,13 +93,13 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Discarding_Ntf_Seq_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
 
@@ -127,10 +128,10 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -142,13 +143,13 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Discarding_Ntf_Struct_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
 
@@ -176,10 +177,10 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -191,13 +192,13 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Discarding_Ntf_Struct_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
 
@@ -226,10 +227,10 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -241,7 +242,7 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
index d08de6f9acc..aa14a71cd4f 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
@@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Notify_Test_Driver.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Notify_Tests_Driver
 
@@ -42,10 +42,10 @@ Notify_Tests_Driver_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -57,7 +57,7 @@ Notify_Tests_Driver_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
index 3e9cab4b7dc..c78ddc8f1fe 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -45,6 +45,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   go.idl
 
@@ -53,8 +54,8 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.MT_Dispatching_Ntf_Struct_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
 
@@ -82,10 +83,10 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -97,15 +98,15 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.MT_Dispatching_Ntf_Struct_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
 
@@ -133,10 +134,10 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -148,8 +149,8 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
index 5d00f198d16..dfe5e1ea684 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   go.idl
 
 ## Makefile.Ordering_Ntf_Seq_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
 
@@ -77,10 +78,10 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -92,13 +93,13 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Ordering_Ntf_Seq_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
 
@@ -127,10 +128,10 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -142,13 +143,13 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Ordering_Ntf_Struct_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
 
@@ -176,10 +177,10 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -191,13 +192,13 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Ordering_Ntf_Struct_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
 
@@ -226,10 +227,10 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -241,7 +242,7 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
index 9c437f749d5..40b502a5abf 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
@@ -18,6 +18,7 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libNotifyPlugTop.la
 
@@ -39,6 +40,7 @@ noinst_HEADERS = \
   Test_Saver.h \
   Test_Topology_Factory.h
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
@@ -46,6 +48,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = main
 
@@ -83,6 +86,7 @@ main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc b/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc
index 80c79319c21..d77816dd0d4 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*lib): orbsvcslib, notify_serv {
+project(*lib): orbsvcslib, notify_serv, exceptions {
   sharedname = NotifyPlugTop
   dynamicflags = PLUGTOP_BUILD_DLL
   source_files {
@@ -9,7 +9,7 @@ project(*lib): orbsvcslib, notify_serv {
   }
 }
 
-project : orbsvcsexe, notify_serv {
+project : orbsvcsexe, notify_serv, exceptions {
   after += *lib
   source_files {
     main.cpp
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
index 9a308abb944..e665d59cb88 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
@@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RT_Notify_lib.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libTAO_RT_NotifyTests.la
 
@@ -44,8 +44,8 @@ noinst_HEADERS = \
   RT_POA_Command.h \
   RT_Priority_Mapping.h
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
index 77977ac38cc..caaf2d4cb8f 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: orbsvcslib, notification, rtcorba, rtportableserver, notifytest, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project: orbsvcslib, notification, rtcorba, rtportableserver, notifytest, minimum_corba {
 
   sharedname = TAO_RT_NotifyTests
 
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
index 831fc62862f..40c52148050 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
@@ -18,7 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.Reconnecting_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Consumer
 
@@ -44,10 +44,10 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -59,13 +59,13 @@ Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Reconnecting_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Supplier
 
@@ -91,10 +91,10 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -106,7 +106,7 @@ Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
index 07a6b683726..9cac82d4d1e 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -45,6 +45,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   go.idl
 
@@ -53,8 +54,8 @@ endif !BUILD_ACE_FOR_TAO
 ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
 
@@ -82,10 +83,10 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -97,15 +98,15 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
 
@@ -133,10 +134,10 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -148,8 +149,8 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
index 526b519825c..e631380281c 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   go.idl
 
 ## Makefile.Seq_Multi_Filter_Ntf_Seq_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
 
@@ -77,10 +78,10 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -92,13 +93,13 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Seq_Multi_Filter_Ntf_Seq_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
 
@@ -126,10 +127,10 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -141,7 +142,7 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
index 18f499e43f5..86a4ee0f29e 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   go.idl
 
 ## Makefile.Struct_Filter_Ntf_Struct_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
 
@@ -77,10 +78,10 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -92,13 +93,13 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Struct_Filter_Ntf_Struct_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
 
@@ -126,10 +127,10 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -141,7 +142,7 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
index c5a25c29feb..34ce6df284b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   go.idl
 
 ## Makefile.Struct_Multi_Filter_Ntf_Struct_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
 
@@ -77,10 +78,10 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -92,13 +93,13 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Struct_Multi_Filter_Ntf_Struct_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
 
@@ -127,10 +128,10 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -142,7 +143,7 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am
index a02868bb942..98815fbca6e 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am
@@ -16,8 +16,8 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.TAO_RT_NotifyTests_Filter.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libTAO_RT_NotifyTests_Filter.la
 
@@ -39,8 +39,8 @@ noinst_HEADERS = \
   RT_Test_Filter.h \
   RT_Test_FilterFactory.h
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
index 437189cffdf..78d0832f1b2 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
@@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.XML_Persistence.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = main
 
@@ -55,7 +55,7 @@ main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am
index 014b47352ce..a209a46382e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.NotifyTests_Lib.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   Activation_ManagerC.cpp \
@@ -28,7 +28,10 @@ BUILT_SOURCES = \
   Activation_ManagerC.inl \
   Activation_ManagerS.cpp \
   Activation_ManagerS.h \
-  Activation_ManagerS.inl
+  Activation_ManagerS.inl \
+  Activation_ManagerS_T.cpp \
+  Activation_ManagerS_T.h \
+  Activation_ManagerS_T.inl
 
 CLEANFILES = \
   Activation_Manager-stamp \
@@ -37,12 +40,15 @@ CLEANFILES = \
   Activation_ManagerC.inl \
   Activation_ManagerS.cpp \
   Activation_ManagerS.h \
-  Activation_ManagerS.inl
+  Activation_ManagerS.inl \
+  Activation_ManagerS_T.cpp \
+  Activation_ManagerS_T.h \
+  Activation_ManagerS_T.inl
 
-Activation_ManagerC.cpp Activation_ManagerC.h Activation_ManagerC.inl Activation_ManagerS.cpp Activation_ManagerS.h Activation_ManagerS.inl: Activation_Manager-stamp
+Activation_ManagerC.cpp Activation_ManagerC.h Activation_ManagerC.inl Activation_ManagerS.cpp Activation_ManagerS.h Activation_ManagerS.inl Activation_ManagerS_T.cpp Activation_ManagerS_T.h Activation_ManagerS_T.inl: Activation_Manager-stamp
 
 Activation_Manager-stamp: $(srcdir)/Activation_Manager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Activation_Manager.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Activation_Manager.idl
 	@touch $@
 
 noinst_LTLIBRARIES = libTAO_NotifyTests.la
@@ -102,6 +108,9 @@ noinst_HEADERS = \
   Activation_ManagerC.inl \
   Activation_ManagerS.h \
   Activation_ManagerS.inl \
+  Activation_ManagerS_T.cpp \
+  Activation_ManagerS_T.h \
+  Activation_ManagerS_T.inl \
   Application_Command.h \
   Command.h \
   Command_Builder.h \
@@ -162,7 +171,7 @@ noinst_HEADERS = \
   common.h \
   notify_test_export.h
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
index f9df5f787f5..f2020bde1d3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
@@ -1,13 +1,13 @@
 // $Id$
 
-project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*idl): taoidldefaults, minimum_corba {
   IDL_Files {
     go.idl
   }
   custom_only = 1
 }
 
-project(*Ntf Perf Struct Supp): notifytest, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Ntf Perf Struct Supp): notifytest, minimum_corba {
   after += *idl
   exename = Structured_Supplier
   Source_Files {
@@ -19,7 +19,7 @@ project(*Ntf Perf Struct Supp): notifytest, avoids_minimum_corba, avoids_corba_e
   }
 }
 
-project(*Ntf Perf Struct Cons): notifytest, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Ntf Perf Struct Cons): notifytest, minimum_corba {
   after += *idl
   exename = Structured_Consumer
   Source_Files {
@@ -31,7 +31,7 @@ project(*Ntf Perf Struct Cons): notifytest, avoids_minimum_corba, avoids_corba_e
   }
 }
 
-project(*Ntf Perf Seq Supp): notifytest, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Ntf Perf Seq Supp): notifytest, minimum_corba {
   after += *idl
   exename = Sequence_Supplier
   Source_Files {
@@ -43,7 +43,7 @@ project(*Ntf Perf Seq Supp): notifytest, avoids_minimum_corba, avoids_corba_e_co
   }
 }
 
-project(*notify perf Sequence Consumer): notifytest, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*notify perf Sequence Consumer): notifytest, minimum_corba {
   after += *idl
   exename = Sequence_Consumer
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
index ff59d166651..4718b9c9c15 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
@@ -13,13 +13,15 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Filter_Idl.am
 
+if !BUILD_MINIMUM_CORBA
+
 BUILT_SOURCES = \
   goC.cpp \
   goC.h \
@@ -43,13 +45,16 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   go.idl
 
+endif !BUILD_MINIMUM_CORBA
+
 ## Makefile.Filter_Notify_Perf_Sequence_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
 
@@ -77,10 +82,10 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -92,13 +97,13 @@ Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Filter_Ntf_Perf_Seq_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
 
@@ -127,10 +132,10 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -142,13 +147,13 @@ Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Filter_Ntf_Perf_Struct_Cons.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
 
@@ -176,10 +181,10 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -191,13 +196,13 @@ Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Filter_Ntf_Perf_Struct_Supp.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
 
@@ -226,10 +231,10 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -241,7 +246,7 @@ Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
index a41e1be69b1..56b72ea0e04 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
@@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RedGreen_Ntf_Perf_RedGreen.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = RedGreen_Test
 
@@ -44,10 +44,10 @@ RedGreen_Test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -59,7 +59,7 @@ RedGreen_Test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
index 6a9006c0599..3b6efe85d86 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
@@ -17,7 +17,8 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Throughput_Ntf_Perf_Throughput.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Throughput
 
@@ -44,10 +45,10 @@ Throughput_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
@@ -59,7 +60,8 @@ Throughput_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
index 284e43e9fab..b16923c43da 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Perf Throughput): notifytest, strategies, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Ntf Perf Throughput): notifytest, strategies, messaging, minimum_corba {
   exename  = Throughput
 }
diff --git a/TAO/orbsvcs/tests/Property/Makefile.am b/TAO/orbsvcs/tests/Property/Makefile.am
index 2c4a37be736..689e58209a1 100644
--- a/TAO/orbsvcs/tests/Property/Makefile.am
+++ b/TAO/orbsvcs/tests/Property/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Property_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -44,12 +40,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Property_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -77,8 +69,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc
index f1cef55d7f8..6e8b8e678f8 100644
--- a/TAO/orbsvcs/tests/Property/Property.mpc
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, property_serv, utils, avoids_corba_e_micro {
+project(*server): namingexe, property_serv, utils {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/run_test.pl b/TAO/orbsvcs/tests/RTCosScheduling/run_test.pl
index 282b74b3d6f..9fd147a6a20 100755
--- a/TAO/orbsvcs/tests/RTCosScheduling/run_test.pl
+++ b/TAO/orbsvcs/tests/RTCosScheduling/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 # $Id$
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am
index 44a78824d74..7ff62dd7eec 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am
+++ b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am
@@ -13,21 +13,21 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Redundant_Naming_Client.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   test_objectC.cpp \
   test_objectC.h \
   test_objectC.inl \
   test_objectS.cpp \
   test_objectS.h \
-  test_objectS.inl
+  test_objectS.inl \
+  test_objectS_T.cpp \
+  test_objectS_T.h \
+  test_objectS_T.inl
 
 CLEANFILES = \
   test_object-stamp \
@@ -36,12 +36,15 @@ CLEANFILES = \
   test_objectC.inl \
   test_objectS.cpp \
   test_objectS.h \
-  test_objectS.inl
+  test_objectS.inl \
+  test_objectS_T.cpp \
+  test_objectS_T.h \
+  test_objectS_T.inl
 
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp
+test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp
 
 test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl
 	@touch $@
 
 noinst_PROGRAMS = client
@@ -61,7 +64,9 @@ client_SOURCES = \
   test_objectC.h \
   test_objectC.inl \
   test_objectS.h \
-  test_objectS.inl
+  test_objectS.inl \
+  test_objectS_T.h \
+  test_objectS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -70,8 +75,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Sched/Makefile.am b/TAO/orbsvcs/tests/Sched/Makefile.am
index 8bc86453037..d561f875016 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile.am
+++ b/TAO/orbsvcs/tests/Sched/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Sched.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = Sched
 
 Sched_CPPFLAGS = \
@@ -40,8 +37,6 @@ Sched_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am
index 70335c7c397..3ea1fb05ab9 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Sched_Conf.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = Sched_Conf
 
 Sched_Conf_CPPFLAGS = \
@@ -42,8 +39,6 @@ Sched_Conf_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
index 9bc95a72445..2f02b708355 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.Secure_BiDir_SSL_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -75,11 +76,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.Secure_BiDir_SSL_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -106,7 +107,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
index 9481d3d8af2..2b128347974 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*SSL Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
+project(*SSL Server): taoexe, portableserver, minimum_corba, bidir_giop {
   after += *idl
   Source_Files {
     test_i.cpp
@@ -20,7 +20,7 @@ project(*SSL Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop,
   }
 }
 
-project(*SSL Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
+project(*SSL Client): taoexe, portableserver, minimum_corba, bidir_giop {
   after += *idl
   Source_Files {
     test_i.cpp
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
index 69bd628a62a..21c8934a1bd 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ TX_Object-stamp: $(srcdir)/TX_Object.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TX_Object.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   TX_Object.idl
 
 ## Makefile.Big_Request_Security_Client.am
 
-if BUILD_EXCEPTIONS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -76,13 +77,13 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Big_Request_Security_Server.am
 
-if BUILD_EXCEPTIONS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -112,8 +113,8 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl b/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
index fad3ec69c72..c2806f6c246 100755
--- a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 # $Id$
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile.am b/TAO/orbsvcs/tests/Security/Callback/Makefile.am
index d48d518c347..43e645ea98f 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Callback/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -66,14 +66,15 @@ client-stamp: $(srcdir)/client.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/client.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   client.idl \
   server.idl
 
 ## Makefile.Callback_Security_Client.am
 
-if BUILD_EXCEPTIONS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -104,13 +105,13 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Callback_Security_Server.am
 
-if BUILD_EXCEPTIONS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -141,8 +142,8 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Security/Callback/run_test.pl b/TAO/orbsvcs/tests/Security/Callback/run_test.pl
index f7fe142a954..910425441aa 100755
--- a/TAO/orbsvcs/tests/Security/Callback/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Callback/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 # $Id$
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
index 75f3501e5ac..3993d9dd02a 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,15 +43,16 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.Security_Crash_Test_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -88,17 +89,17 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Security_Crash_Test_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -137,9 +138,9 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
index bd8753a98a8..68fcc5c24a8 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
@@ -13,10 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
 
 ## Makefile.MT_IIOP_SSL_Idl.am
 
@@ -43,14 +42,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.MT_IIOP_SSL_Security_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -72,14 +70,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.MT_IIOP_SSL_Security_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -120,9 +116,9 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
index a8cf67fd954..030b9393b4b 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,14 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.MT_SSLIOP_Security_Client.am
 
-if BUILD_EXCEPTIONS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -78,13 +79,13 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
-endif BUILD_EXCEPTIONS
 
 ## Makefile.MT_SSLIOP_Security_Server.am
 
-if BUILD_EXCEPTIONS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -118,8 +119,8 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
index a074bfa31e1..3dadc41e4e1 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,13 +43,13 @@ Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Foo.idl
 
 ## Makefile.Secure_Invocation_Security_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 
 noinst_PROGRAMS += client
@@ -78,15 +78,14 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Secure_Invocation_Security_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -124,9 +123,9 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
index 5ad46953859..313d10bcfee 100755
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
@@ -6,7 +6,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
index 0221811f0c2..220499d6f56 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
@@ -13,21 +13,21 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Corbaloc_Ssliop_Client.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   test_objectC.cpp \
   test_objectC.h \
   test_objectC.inl \
   test_objectS.cpp \
   test_objectS.h \
-  test_objectS.inl
+  test_objectS.inl \
+  test_objectS_T.cpp \
+  test_objectS_T.h \
+  test_objectS_T.inl
 
 CLEANFILES = \
   test_object-stamp \
@@ -36,12 +36,15 @@ CLEANFILES = \
   test_objectC.inl \
   test_objectS.cpp \
   test_objectS.h \
-  test_objectS.inl
+  test_objectS.inl \
+  test_objectS_T.cpp \
+  test_objectS_T.h \
+  test_objectS_T.inl
 
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp
+test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp
 
 test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl
 	@touch $@
 
 noinst_PROGRAMS = client
@@ -62,7 +65,9 @@ client_SOURCES = \
   test_objectC.h \
   test_objectC.inl \
   test_objectS.h \
-  test_objectS.inl
+  test_objectS.inl \
+  test_objectS_T.h \
+  test_objectS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -74,8 +79,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am
index 0533da6d515..01c8adb2ce2 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am
@@ -13,21 +13,21 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Simple_Naming_Client.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   test_objectC.cpp \
   test_objectC.h \
   test_objectC.inl \
   test_objectS.cpp \
   test_objectS.h \
-  test_objectS.inl
+  test_objectS.inl \
+  test_objectS_T.cpp \
+  test_objectS_T.h \
+  test_objectS_T.inl
 
 CLEANFILES = \
   test_object-stamp \
@@ -36,12 +36,15 @@ CLEANFILES = \
   test_objectC.inl \
   test_objectS.cpp \
   test_objectS.h \
-  test_objectS.inl
+  test_objectS.inl \
+  test_objectS_T.cpp \
+  test_objectS_T.h \
+  test_objectS_T.inl
 
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp
+test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp
 
 test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl
 	@touch $@
 
 noinst_PROGRAMS = client
@@ -62,7 +65,9 @@ client_SOURCES = \
   test_objectC.h \
   test_objectC.inl \
   test_objectS.h \
-  test_objectS.inl
+  test_objectS.inl \
+  test_objectS_T.h \
+  test_objectS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -74,8 +79,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Time/Makefile.am b/TAO/orbsvcs/tests/Time/Makefile.am
index 6beaf43556d..1c540fee207 100644
--- a/TAO/orbsvcs/tests/Time/Makefile.am
+++ b/TAO/orbsvcs/tests/Time/Makefile.am
@@ -13,11 +13,8 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.Time_Orbsvcs_Client.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -42,8 +39,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Trading/Makefile.am b/TAO/orbsvcs/tests/Trading/Makefile.am
index 76bf6db8c32..c07c73d2a91 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile.am
+++ b/TAO/orbsvcs/tests/Trading/Makefile.am
@@ -13,22 +13,21 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Trading_Test_Lib.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES = \
   TTestC.cpp \
   TTestC.h \
   TTestC.inl \
   TTestS.cpp \
   TTestS.h \
-  TTestS.inl
+  TTestS.inl \
+  TTestS_T.cpp \
+  TTestS_T.h \
+  TTestS_T.inl
 
 CLEANFILES = \
   TTest-stamp \
@@ -37,12 +36,15 @@ CLEANFILES = \
   TTestC.inl \
   TTestS.cpp \
   TTestS.h \
-  TTestS.inl
+  TTestS.inl \
+  TTestS_T.cpp \
+  TTestS_T.h \
+  TTestS_T.inl
 
-TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl: TTest-stamp
+TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl TTestS_T.cpp TTestS_T.h TTestS_T.inl: TTest-stamp
 
 TTest-stamp: $(srcdir)/TTest.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -I..\..\.. -I..\..\..\orbsvcs -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl
 	@touch $@
 
 noinst_LTLIBRARIES = libTTest.la
@@ -76,15 +78,14 @@ noinst_HEADERS = \
   TTestC.inl \
   TTestS.h \
   TTestS.inl \
+  TTestS_T.cpp \
+  TTestS_T.h \
+  TTestS_T.inl \
   ttest_export.h
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Trading_Colocated_Test.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += colocated_test
+noinst_PROGRAMS = colocated_test
 
 colocated_test_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -112,7 +113,6 @@ colocated_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
@@ -121,12 +121,8 @@ colocated_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Trading_Export_Test.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += export_test
 
 export_test_CPPFLAGS = \
@@ -155,7 +151,6 @@ export_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
@@ -164,12 +159,8 @@ export_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Trading_Import_Test.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += import_test
 
 import_test_CPPFLAGS = \
@@ -198,7 +189,6 @@ import_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
@@ -207,8 +197,6 @@ import_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 8c353be3664..e13b3b0766b 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -127,16 +127,14 @@ const char* TT_Info::MODEL_NUMBERS[] =
   "9q834jidlj234ujof"
 };
 
-const int TT_Info::NUM_QUERIES = 9;
+const int TT_Info::NUM_QUERIES = 7;
 const char* TT_Info::QUERIES[][3] =
 {
   {INTERFACE_NAMES[REMOTE_IO], "", ""},
   {INTERFACE_NAMES[REMOTE_IO], "'Cupples' ~ Location", ""},
   {INTERFACE_NAMES[PLOTTER], "'sbw1' in User_Queue", "min Cost_Per_Page"},
   {INTERFACE_NAMES[PLOTTER], "Num_Colors > 1 and 'Cupples' ~ Location", "min Cost_Per_Page"},
-  {INTERFACE_NAMES[PRINTER], "Pages_Per_Sec < -101215752192 and Color == TRUE", "with 'sbw1' in User_Queue"},
-  {INTERFACE_NAMES[PRINTER], "Pages_Per_Sec > 3.0 and Color == TRUE", "with 'sbw1' in User_Queue"},
-  {INTERFACE_NAMES[PRINTER], "Pages_Per_Sec > -3.0 and Color == TRUE", "with 'sbw1' in User_Queue"},
+  {INTERFACE_NAMES[PRINTER], "Pages_Per_Sec > 3 and Color == TRUE", "with 'sbw1' in User_Queue"},
   {INTERFACE_NAMES[PRINTER], "Color == TRUE or Double_Sided == TRUE", "random"},
   {INTERFACE_NAMES[PRINTER], "(Color or Double_Sided) and 'sbw1' in User_Queue", "with 'Cupples' ~ Location"}
 };
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
index 0384f7ebf2f..52542ab8cec 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.ior_corbaname_idl.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ corbaname-stamp: $(srcdir)/corbaname.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/corbaname.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   corbaname.idl
 
 ## Makefile.ior_corbaname_client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -73,12 +70,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.ior_corbaname_server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -103,8 +96,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am
index 31eae6825ea..57d76e66aeb 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am
+++ b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.tests_svc_loader.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = tests_svc_loader
 
@@ -33,7 +33,7 @@ tests_svc_loader_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
index a75454ff9bb..6437d7e9c6f 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project: taoexe, minimum_corba {
   exename = tests_svc_loader
 }
diff --git a/TAO/orbsvcs/tests/unit/Makefile.am b/TAO/orbsvcs/tests/unit/Makefile.am
deleted file mode 100644
index 9f305056c53..00000000000
--- a/TAO/orbsvcs/tests/unit/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Trading
-
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
deleted file mode 100644
index edc28721c2c..00000000000
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-// $Id$
-
-#include "orbsvcs/Trader/Interpreter.h"
-#include "orbsvcs/Trader/Constraint_Visitors.h"
-#include "ace/OS_NS_string.h"
-
-template<class T> class Literal_Interpreter;
-
-template<class T>
-class Literal_Visitor: public TAO_Constraint_Visitor
-{
-public:
-  Literal_Visitor (Literal_Interpreter<T>* interp);
-  virtual ~Literal_Visitor (void);
-
-  virtual int visit_constraint (TAO_Unary_Constraint*);
-
-  virtual int visit_with (TAO_Unary_Constraint*) { return 1; }
-  virtual int visit_min (TAO_Unary_Constraint*) { return 1; }  
-  virtual int visit_max (TAO_Unary_Constraint*) { return 1; }  
-  virtual int visit_first (TAO_Noop_Constraint*) { return 1; }
-  virtual int visit_random (TAO_Noop_Constraint*) { return 1; }
-
-  virtual int visit_and (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_or (TAO_Binary_Constraint*) { return 1; }  
-  virtual int visit_not (TAO_Unary_Constraint*) { return 1; }   
-
-  virtual int visit_exist (TAO_Unary_Constraint*) { return 1; }
-  virtual int visit_unary_minus (TAO_Unary_Constraint*) { return 1; }
-
-  virtual int visit_add (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_sub (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_mult (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_div (TAO_Binary_Constraint*) { return 1; }  
-
-  virtual int visit_twiddle (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_in (TAO_Binary_Constraint*) { return 1; }
-
-  virtual int visit_less_than (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_less_than_equal (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_greater_than (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_greater_than_equal (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_equal (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_not_equal (TAO_Binary_Constraint*) { return 1; }
-
-  virtual int visit_literal (TAO_Literal_Constraint*);
-  virtual int visit_property (TAO_Property_Constraint*) { return 1; }
-
-private:
-  Literal_Interpreter<T>* interp_;
-};
-
-template<class T>
-Literal_Visitor<T>::Literal_Visitor (Literal_Interpreter<T>* interp)
- : interp_ (interp)
-{
-}
-
-template<class T>
-Literal_Visitor<T>::~Literal_Visitor (void)
-{
-}
-
-template<class T> int
-Literal_Visitor<T>::visit_constraint (TAO_Unary_Constraint* c)
-{
-  return c->operand ()->accept (this);
-}
-
-template<class T> int
-Literal_Visitor<T>::visit_literal (TAO_Literal_Constraint* literal)
-{
-  this->interp_->constraint(*literal);
-  return 1;
-}
-
-template<class T>
-class Literal_Interpreter: public TAO_Interpreter
-{
-public:
-  Literal_Interpreter (void);
-  virtual ~Literal_Interpreter (void);
-
-  bool test (const char* str,
-             T expected);
-  void constraint (TAO_Literal_Constraint& constraint);
-  const TAO_Literal_Constraint& constraint (void) const;
-
-private:
-  bool compare (T expected) const;
-
-  TAO_Literal_Constraint constraint_;
-};
-
-template<class T>
-Literal_Interpreter<T>::Literal_Interpreter (void)
-{
-}
-
-template<class T>
-Literal_Interpreter<T>::~Literal_Interpreter (void)
-{
-}
-
-template<class T> bool
-Literal_Interpreter<T>::test (const char* str,
-                              T expected)
-{
-  this->build_tree (str);
-  if (this->root_ == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR: Invalid interpreter string.\n"));
-      return false;
-    }
-
-  Literal_Visitor<T> visitor (this);
-  this->root_->accept (&visitor);
-
-  return this->compare(expected);
-}
-
-template<> bool
-Literal_Interpreter<const char*>::compare (const char* expected) const
-{
-  return (ACE_OS::strcmp(static_cast<const char*> (this->constraint_),
-                         expected) == 0);
-}
-
-template<class T> bool
-Literal_Interpreter<T>::compare (T expected) const
-{
-  return (static_cast<T> (this->constraint_) == expected);
-}
-
-template<class T> void
-Literal_Interpreter<T>::constraint (TAO_Literal_Constraint& constraint)
-{
-  this->constraint_ = constraint;
-}
-
-template<class T> const TAO_Literal_Constraint&
-Literal_Interpreter<T>::constraint (void) const
-{
-  return this->constraint_;
-}
-
-int
-ACE_TMAIN (int, ACE_TCHAR **)
-{
-  int status = 0;
-  {
-    Literal_Interpreter<CORBA::ULongLong> u_interp;
-    if (!u_interp.test ("993834343433882",
-                        ACE_UINT64_LITERAL (993834343433882)))
-      {
-        status++;
-        ACE_ERROR ((LM_ERROR, "ERROR: CORBA::ULongLong test failed.\n"));
-      }
-
-    Literal_Interpreter<CORBA::LongLong> interp;
-    if (!interp.test ("-1879048193", -1879048193))
-      {
-        status++;
-        ACE_ERROR ((LM_ERROR, "ERROR: CORBA::LongLong test failed.\n"));
-      }
-
-    // Since we're comparing signed and unsigned, the signed should get
-    // promoted to unsigned.  However, it gets logically promoted, not
-    // binarily.  So, a negative value is converted into zero as an
-    // unsigned value.
-    if (interp.constraint () > u_interp.constraint ())
-      {
-        status++;
-        ACE_ERROR ((LM_ERROR, "ERROR: Mixed greater than test 1 failed.\n"));
-      }
-  }
-  {
-    Literal_Interpreter<CORBA::Double> u_interp;
-    if (!u_interp.test ("993834343433882.88837719", 993834343433882.88837719))
-      {
-        status++;
-        ACE_ERROR ((LM_ERROR, "ERROR: CORBA::Double test 1 failed.\n"));
-      }
-
-    Literal_Interpreter<CORBA::Double> interp;
-    if (!interp.test ("-993834343433882.88837719",
-                       -993834343433882.88837719))
-      {
-        status++;
-        ACE_ERROR ((LM_ERROR, "ERROR: CORBA::Double test 2 failed.\n"));
-      }
-
-    if (interp.constraint () > u_interp.constraint ())
-      {
-        status++;
-        ACE_ERROR ((LM_ERROR, "ERROR: Mixed greater than test 2 failed.\n"));
-      }
-  }
-  {
-    Literal_Interpreter<CORBA::Boolean> interp;
-    if (!interp.test ("TRUE", true))
-      {
-        status++;
-        ACE_ERROR ((LM_ERROR, "ERROR: CORBA::Boolean test 1 failed.\n"));
-      }
-  }
-  {
-    Literal_Interpreter<CORBA::Boolean> interp;
-    if (!interp.test ("FALSE", false))
-      {
-        status++;
-        ACE_ERROR ((LM_ERROR, "ERROR: CORBA::Boolean test 2 failed.\n"));
-      }
-  }
-  {
-    Literal_Interpreter<const char*> interp;
-    if (!interp.test ("'This is a test'", "This is a test"))
-      {
-        status++;
-        ACE_ERROR ((LM_ERROR, "ERROR: const char* test failed.\n"));
-      }
-  }
-  return status;
-}
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc
deleted file mode 100644
index b19d12a3bc1..00000000000
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: trading_serv, portableserver {
-  exename = Interpreter
-}
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am
deleted file mode 100644
index 683cb587fff..00000000000
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Interpreter.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Interpreter
-
-Interpreter_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Interpreter_SOURCES = \
-  Interpreter.cpp
-
-Interpreter_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl b/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl
deleted file mode 100755
index 162b910b3fb..00000000000
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-use File::Basename;
-
-my $status = 0;
-
-my $SV = new PerlACE::Process ("Interpreter");
-
-my $server = $SV->SpawnWaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: ", basename($SV->Executable()),
-                 " returned $server \n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/unit/Trading/Makefile.am b/TAO/orbsvcs/tests/unit/Trading/Makefile.am
deleted file mode 100644
index add42f9d0ae..00000000000
--- a/TAO/orbsvcs/tests/unit/Trading/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Interpreter
-
diff --git a/TAO/performance-tests/Anyop/Makefile.am b/TAO/performance-tests/Anyop/Makefile.am
index 888c6ae5f19..9c04401410d 100644
--- a/TAO/performance-tests/Anyop/Makefile.am
+++ b/TAO/performance-tests/Anyop/Makefile.am
@@ -13,13 +13,12 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.Anyop.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
@@ -65,7 +64,6 @@ anyop_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am
index 4d2edbcde62..75662f143d6 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am
@@ -13,14 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.csd_test_client.am
 
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
+noinst_PROGRAMS = client_main
 
 client_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -46,14 +41,8 @@ client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
 ## Makefile.csd_test_server.am
 
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
 noinst_PROGRAMS += server_main
 
 server_main_CPPFLAGS = \
@@ -80,9 +69,6 @@ server_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc b/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
index ab02eb59e4d..330fcd4afc5 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(csd_test_server): csd_pt_test_exe, avoids_corba_e_micro {
+project(csd_test_server): csd_pt_test_exe {
   exename=server_main
 
   Source_Files {
@@ -10,7 +10,7 @@ project(csd_test_server): csd_pt_test_exe, avoids_corba_e_micro {
   }
 }
 
-project(csd_test_client): csd_pt_test_exe, avoids_corba_e_micro {
+project(csd_test_client): csd_pt_test_exe {
   exename=client_main
 
   Source_Files {
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am
index 88626ab9840..dc9a0e39848 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am
@@ -13,18 +13,12 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
-BUILT_SOURCES =
-
 ## Makefile.csd_pt_testinf.am
 
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   FooExceptionC.cpp \
   FooExceptionC.h \
   FooExceptionC.inl \
@@ -32,7 +26,7 @@ BUILT_SOURCES += \
   FooExceptionS.h \
   FooExceptionS.inl
 
-CLEANFILES += \
+CLEANFILES = \
   FooException-stamp \
   FooExceptionC.cpp \
   FooExceptionC.h \
@@ -176,9 +170,6 @@ noinst_HEADERS = \
   TestAppExceptionS.h \
   TestAppExceptionS.inl
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc b/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
index 80ef827f0f9..39bea8a0c18 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro {
+project : taolib_with_idl, csd_threadpool {
   sharedname   = CSD_PT_TestInf
   dynamicflags = CSD_PT_TESTINF_BUILD_DLL
   idlflags  += -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h
@@ -8,8 +8,8 @@ project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro {
   IDL_Files {
     FooException.idl
     TestAppException.idl
-    CancelledException.idl
-    CustomException.idl
+    CancelledException.idl  
+    CustomException.idl    
   }
 
   Source_Files {
@@ -27,8 +27,8 @@ project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro {
     TestAppExceptionS.cpp
     CancelledExceptionC.cpp
     CancelledExceptionS.cpp
-    CustomExceptionC.cpp
-    CustomExceptionS.cpp
+    CustomExceptionC.cpp  
+    CustomExceptionS.cpp  
   }
 
   Template_Files {
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am
index 337e4246a37..9d41e3ae543 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am
@@ -13,15 +13,11 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-
 ## Makefile.csd_pt_testservant.am
 
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
 BUILT_SOURCES = \
   FooC.cpp \
   FooC.h \
@@ -73,9 +69,6 @@ noinst_HEADERS = \
   Foo_Statistics.h \
   Foo_i.h
 
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc b/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc
index 6fb11a1f1b5..543180258f2 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc
@@ -1,9 +1,9 @@
 //$Id$
-project : csd_pt_testinf_lib, avoids_corba_e_micro {
+project : csd_pt_testinf_lib {
   sharedname   = CSD_PT_TestServant
   dynamicflags = CSD_PT_TESTSERVANT_BUILD_DLL
   idlflags  += -Wb,export_macro=CSD_PT_TestServant_Export -Wb,export_include=CSD_PT_TestServant_Export.h
-  includes  += $(TAO_ROOT)/tao
+  includes  += $(TAO_ROOT)/tao   
 
   IDL_Files {
     Foo.idl
diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc
index 55764d4ae3a..9357cab7408 100644
--- a/TAO/performance-tests/Callback/Callback.mpc
+++ b/TAO/performance-tests/Callback/Callback.mpc
@@ -10,7 +10,6 @@ project(*Perf_IDL): taoidldefaults, strategies {
 
 project(*server): taoserver, messaging, strategies {
   after += *Perf_IDL
-  avoids += ace_for_tao
   Source_Files {
     Server_i.cpp
     server.cpp
@@ -23,7 +22,6 @@ project(*server): taoserver, messaging, strategies {
 
 project(*client): taoexe, messaging, portableserver, strategies {
   after += *Perf_IDL
-  avoids += ace_for_tao
   Source_Files {
     Callback_i.cpp
     client.cpp
diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am
index 11cf0e3bf25..dc8918bcc07 100644
--- a/TAO/performance-tests/Callback/Makefile.am
+++ b/TAO/performance-tests/Callback/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Callback_Perf_IDL.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   callbackC.cpp \
@@ -45,15 +45,15 @@ callback-stamp: $(srcdir)/callback.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/callback.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   callback.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Callback_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -84,13 +84,11 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Callback_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
@@ -121,7 +119,6 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
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 3c0cf42923d..c0c97e91f12 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,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client): taoexe, portableserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba {
   after    += IDL_Cubit_Server
-  avoids   += ace_for_tao
   idlflags += -Gd
 
   Source_Files {
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
index 1ccc53a0a36..c17c1286c4a 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
@@ -13,15 +13,15 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.DII_Cubit_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   cubitC.cpp \
@@ -72,8 +72,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
index f6828602b80..fb8d3c5430a 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
@@ -10,8 +10,9 @@ project(*IDL): taoidldefaults, strategies {
   custom_only = 1
 }
 
-project(*Server): taoexe, utils, portableserver, strategies, avoids_corba_e_micro, avoids_ace_for_tao {
+project(*Server): taoexe, utils, portableserver, strategies {
   after += *IDL
+
   Source_Files {
     RTI_IO.cpp
     Cubit_i.cpp
@@ -28,7 +29,7 @@ project(*Server): taoexe, utils, portableserver, strategies, avoids_corba_e_micr
 
 project(*client): taoexe, portableserver, strategies {
   after += *IDL
-  avoids += ace_for_tao
+
   Source_Files {
     RTI_IO.cpp
     Cubit_Client.cpp
@@ -40,8 +41,9 @@ project(*client): taoexe, portableserver, strategies {
   }
 }
 
-project(*collocation): taoserver, utils, strategies, avoids_corba_e_micro, avoids_ace_for_tao {
+project(*collocation): taoexe, utils, portableserver, strategies {
   after += *IDL
+
   // Note : You can't just prepend collocation/ to the exename
   //        to get it to ouput to that directory. It won't go
   //        to the right place on some platforms. (Windows)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
index f042cdfe932..6b1fdb381a6 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.IDL_Cubit_IDL.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   cubitC.cpp \
@@ -45,14 +45,14 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Gd $(srcdir)/cubit.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   cubit.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.IDL_Cubit_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -79,11 +79,10 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.IDL_Cubit_Collocation.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += collocation_test
 
@@ -116,11 +115,11 @@ collocation_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.IDL_Cubit_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -153,7 +152,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
index 53a781ee070..d5cc27cdc06 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults, strategies {
   custom_only = 1
 }
 
-project(*server): taoexe, utils, portableserver, strategies, avoids_corba_e_micro {
+project(*server): taoexe, utils, portableserver, strategies {
   after += *IDL
 
   Source_Files {
@@ -25,9 +25,9 @@ project(*server): taoexe, utils, portableserver, strategies, avoids_corba_e_micr
   }
 }
 
-project(*client): taoexe, utils, portableserver, strategies, avoids_corba_e_micro {
+project(*client): taoexe, utils, portableserver, strategies {
   after += *IDL
-  avoids += ace_for_tao
+
   Source_Files {
     Timer.cpp
     Globals.cpp
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
index 812bfe95478..bad37120f93 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.MT_Cubit_IDL.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   cubitC.cpp \
@@ -45,14 +45,14 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/cubit.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   cubit.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.MT_Cubit_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -92,11 +92,10 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.MT_Cubit_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -130,7 +129,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
index 5f606ac6209..65db66449b1 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
 ## Makefile.Single_Threaded_AMH_Latency_Idl.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -46,16 +45,15 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Single_Threaded_AMH_Latency_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -83,13 +81,12 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Single_Threaded_AMH_Latency_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -117,7 +114,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
index 512c9e74b13..55d3be2527c 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -22,7 +22,6 @@ project(*AMH latency server): taoserver, strategies, valuetype, amh {
 
 project(*AMH latency client): taoclient, strategies, valuetype, amh {
   after += *AMH_latency_idl
-  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/AMI/Makefile.am b/TAO/performance-tests/Latency/AMI/Makefile.am
index 6068f0c3d51..024c7528a38 100644
--- a/TAO/performance-tests/Latency/AMI/Makefile.am
+++ b/TAO/performance-tests/Latency/AMI/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -47,10 +46,10 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -58,7 +57,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -86,7 +85,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -94,7 +93,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -124,7 +123,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/performance-tests/Latency/Collocation/Collocation.mpc b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
index b9f851bf3c2..ea188cdcef5 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocation.mpc
+++ b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
@@ -1,5 +1,4 @@
 // $Id$
 project(Latency*): taoserver, strategies {
   exename = Collocated_Test
-  avoids += ace_for_tao
 }
diff --git a/TAO/performance-tests/Latency/Collocation/Makefile.am b/TAO/performance-tests/Latency/Collocation/Makefile.am
index f04d95ca9eb..b43312f070c 100644
--- a/TAO/performance-tests/Latency/Collocation/Makefile.am
+++ b/TAO/performance-tests/Latency/Collocation/Makefile.am
@@ -13,13 +13,12 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.Latency_Collocation.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
@@ -76,7 +75,6 @@ Collocated_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index 3d5ec120dcf..3ba347e0274 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*latency_idl): taoidldefaults, strategies, minimum_corba {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*latency server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*latency server): taoserver, strategies, minimum_corba {
   after += *latency_idl
   Source_Files {
     Roundtrip.cpp
@@ -20,9 +20,8 @@ project(*latency server): taoserver, strategies, avoids_minimum_corba, avoids_co
   }
 }
 
-project(*latency client): taoclient, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*latency client): taoclient, strategies, dynamicinterface, minimum_corba {
   after += *latency_idl
-  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/DII/Makefile.am b/TAO/performance-tests/Latency/DII/Makefile.am
index 1c8dada0b21..96b993f19c7 100644
--- a/TAO/performance-tests/Latency/DII/Makefile.am
+++ b/TAO/performance-tests/Latency/DII/Makefile.am
@@ -13,14 +13,15 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.DII_Latency_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,16 +46,18 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.DII_Latency_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -81,13 +84,14 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.DII_Latency_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -111,7 +115,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc
index 9ab8cd43ff3..aec58c1431c 100644
--- a/TAO/performance-tests/Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Latency/DSI/DSI.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency server): taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*latency server): taoserver, strategies, dynamicinterface, minimum_corba {
 
   IDL_Files {
   }
@@ -12,8 +12,8 @@ project(*latency server): taoserver, strategies, dynamicinterface, avoids_minimu
   }
 }
 
-project(*latency client): taoclient, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  avoids += ace_for_tao
+project(*latency client): taoclient, strategies, minimum_corba {
+
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am
index be65cc192f6..0bb027af70c 100644
--- a/TAO/performance-tests/Latency/DSI/Makefile.am
+++ b/TAO/performance-tests/Latency/DSI/Makefile.am
@@ -13,15 +13,15 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.DSI_Latency_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -66,13 +66,14 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.DSI_Latency_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -99,7 +100,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
index e71e4ec9178..9e35337054a 100644
--- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*latency_idl): taoidldefaults, strategies, minimum_corba {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*latency server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*latency server): taoserver, strategies, minimum_corba {
   after += *latency_idl
   Source_Files {
     Roundtrip.cpp
@@ -20,9 +20,8 @@ project(*latency server): taoserver, strategies, avoids_minimum_corba, avoids_co
   }
 }
 
-project(*latency client): taoclient, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*latency client): taoclient, strategies, dynamicinterface, minimum_corba {
   after += *latency_idl
-  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/Deferred/Makefile.am b/TAO/performance-tests/Latency/Deferred/Makefile.am
index 68cec77b8ae..7413be425b8 100644
--- a/TAO/performance-tests/Latency/Deferred/Makefile.am
+++ b/TAO/performance-tests/Latency/Deferred/Makefile.am
@@ -13,14 +13,15 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Deferred_Latency_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,16 +46,18 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Deferred_Latency_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -81,13 +84,14 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Deferred_Latency_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -111,7 +115,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
index 1a6c14c9c8c..9a01d29a3a1 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Single_Threaded_Latency_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,14 +45,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Single_Threaded_Latency_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -75,11 +75,10 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Single_Threaded_Latency_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -103,7 +102,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
index 699b18e36ac..993e2a46d4b 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
@@ -22,7 +22,6 @@ project(*latency server): taoserver, strategies {
 
 project(*latency client): taoclient, strategies {
   after += *latency_idl
-  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
index b2d8964222a..36b19276513 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Thread_Per_Connection_Latency_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,14 +45,15 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Thread_Per_Connection_Latency_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -74,11 +75,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Thread_Per_Connection_Latency_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -102,7 +103,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
index 7f884cc20d1..9f34726a6fe 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Thread_Pool_Latency_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,14 +45,15 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Thread_Pool_Latency_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -74,11 +75,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Thread_Pool_Latency_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -104,7 +105,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Memory/IORsize/Makefile.am b/TAO/performance-tests/Memory/IORsize/Makefile.am
index a7ac9ed3e79..e29753ed209 100644
--- a/TAO/performance-tests/Memory/IORsize/Makefile.am
+++ b/TAO/performance-tests/Memory/IORsize/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Memory_IORsize_Idl.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
 ## Makefile.Memory_IORsize_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -71,12 +68,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Memory_IORsize_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -98,8 +91,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am
index 79289e99ec9..4f61f97705b 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Memory_Growth_Idl.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
 ## Makefile.Memory_Growth_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -67,12 +64,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Memory_Growth_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -94,8 +87,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
index 0fa233bb2d0..e0d5963b3d2 100644
--- a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
+++ b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoserver, avoids_corba_e_micro, avoids_ace_for_tao {
+project: taoserver {
+  avoids += ace_for_tao
   exename = create_reference
 }
diff --git a/TAO/performance-tests/POA/Create_Reference/Makefile.am b/TAO/performance-tests/POA/Create_Reference/Makefile.am
index eac7786b3a9..873ee0da632 100644
--- a/TAO/performance-tests/POA/Create_Reference/Makefile.am
+++ b/TAO/performance-tests/POA/Create_Reference/Makefile.am
@@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Create_Reference.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = create_reference
 
@@ -35,7 +35,7 @@ create_reference_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/POA/Demux/Demux.mpc b/TAO/performance-tests/POA/Demux/Demux.mpc
index d46772490d2..c082083251a 100644
--- a/TAO/performance-tests/POA/Demux/Demux.mpc
+++ b/TAO/performance-tests/POA/Demux/Demux.mpc
@@ -8,7 +8,7 @@ project(*poa idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*poa server): namingexe, portableserver, avoids_corba_e_micro {
+project(*poa server): namingexe, portableserver {
   after += *poa_idl
   Source_Files {
     demux_test_server.cpp
diff --git a/TAO/performance-tests/POA/Demux/Makefile.am b/TAO/performance-tests/POA/Demux/Makefile.am
index 830f99e3258..773111daf43 100644
--- a/TAO/performance-tests/POA/Demux/Makefile.am
+++ b/TAO/performance-tests/POA/Demux/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Demux_Poa_Idl.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ demux_test-stamp: $(srcdir)/demux_test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/demux_test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   demux_test.idl
 
 ## Makefile.Demux_Poa_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -75,12 +72,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Demux_Poa_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -97,7 +90,7 @@ server_SOURCES = \
   demux_test_i.cpp \
   demux_test_server.cpp \
   server.cpp \
-  demux_test_client.inl \
+  demux_test_client.inl\
   demux_test_i.h \
   demux_test_server.h
 
@@ -108,8 +101,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am
index b3970226570..d6f4aa4d3a1 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am
+++ b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,12 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
 ## Makefile.Implicit_Activation_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -70,11 +70,9 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Implicit_Activation_Collocated.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += collocated
@@ -99,12 +97,9 @@ collocated_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Implicit_Activation_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -128,8 +123,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
index 4f7f009ed7b..190c17dd54a 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
@@ -13,13 +13,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.registration.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   testC.cpp \
@@ -67,7 +67,7 @@ registration_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
index ac39fcfb8c9..3ebd5ff6be4 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(registration): taoexe, portableserver, avoids_corba_e_micro, avoids_ace_for_tao {
+project(registration): taoexe, portableserver {
+  avoids += ace_for_tao
   exename = registration
 }
diff --git a/TAO/performance-tests/Pluggable/Makefile.am b/TAO/performance-tests/Pluggable/Makefile.am
index 4e4e4d211a9..1b745bfd92e 100644
--- a/TAO/performance-tests/Pluggable/Makefile.am
+++ b/TAO/performance-tests/Pluggable/Makefile.am
@@ -13,11 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.Pluggable_Idl.am
 
 BUILT_SOURCES = \
@@ -43,14 +41,13 @@ PP_Test-stamp: $(srcdir)/PP_Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/PP_Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   PP_Test.idl
 
 ## Makefile.Pluggable_Client.am
 
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -69,12 +66,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.Pluggable_Server.am
 
-if BUILD_EXCEPTIONS
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -101,8 +94,6 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc
index 2981dd161a6..0efccabbceb 100644
--- a/TAO/performance-tests/Pluggable/Pluggable.mpc
+++ b/TAO/performance-tests/Pluggable/Pluggable.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): taoserver, utils, avoids_corba_e_micro {
+project(*server): taoserver, utils {
   after += *idl
   Source_Files {
     PP_Test_Server.cpp
diff --git a/TAO/performance-tests/Protocols/Makefile.am b/TAO/performance-tests/Protocols/Makefile.am
index 54843c6a9e7..81c6a7eadb9 100644
--- a/TAO/performance-tests/Protocols/Makefile.am
+++ b/TAO/performance-tests/Protocols/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,12 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.Protocols_Distributor.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 noinst_PROGRAMS += distributor
@@ -75,11 +75,9 @@ distributor_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Protocols_Receiver.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += receiver
@@ -102,11 +100,9 @@ receiver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Protocols_Sender.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
 
@@ -133,7 +129,6 @@ sender_LDADD = \
 
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
index 784f3da00c2..3319967277c 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(RTCORBA_Common): taolib_with_idl, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(RTCORBA_Common): taolib_with_idl, portableserver, 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/Common/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
index 249ba4434c7..a6399dc7438 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 
 ## Makefile.RTCORBA_Common.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   testC.cpp \
@@ -69,8 +69,8 @@ noinst_HEADERS = \
   test_i.h \
   test_i.inl
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
index b0fee8ddf9a..896dea50b5f 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
@@ -17,8 +17,9 @@ noinst_PROGRAMS =
 
 ## Makefile.ORB_Per_Priority_Client.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -44,13 +45,15 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Makefile.ORB_Per_Priority_Server.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -77,8 +80,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
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 22fa8a8fce4..0819f051562 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,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): rt_server, strategies, rtcorbacommon, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server): rt_server, strategies, rtcorbacommon, minimum_corba {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
index f6dd942c4b7..693baae47e7 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
@@ -17,8 +17,9 @@ noinst_PROGRAMS =
 
 ## Makefile.Single_Endpoint_Client.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -44,13 +45,15 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Single_Endpoint_Server.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -77,8 +80,9 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
index 5e6b0a4336f..4dd4225fd1e 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,14 +43,15 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.Reliable_Oneways_Client_RT.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -77,15 +78,15 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Reliable_Oneways_Server_RT.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -115,8 +116,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
index f9c59018da4..a05388566f9 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
@@ -7,7 +7,7 @@ project(*oneways idl RT): taoidldefaults {
   custom_only = 1
 }
 
-project(*oneways server RT): rt_server, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*oneways server RT): rt_server, messaging, minimum_corba {
   after += *oneways_idl_RT
   Source_Files {
     test_i.cpp
@@ -19,7 +19,7 @@ project(*oneways server RT): rt_server, messaging, avoids_minimum_corba, avoids_
   }
 }
 
-project(*oneways client RT): rt_client, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*oneways client RT): rt_client, messaging, minimum_corba {
   after += *oneways_idl_RT
   Source_Files {
     testC.cpp
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am
index 513b93fdaa6..2512eb329b1 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,14 +43,15 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   test.idl
 
 ## Makefile.Thread_Pool_RTCorba_Client.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -72,14 +73,14 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Thread_Pool_RTCorba_Server.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -104,8 +105,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
index 13a81a456f5..2049c723a97 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -8,7 +8,7 @@ project(*RTCorba idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*RTCorba server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*RTCorba server): rt_server, minimum_corba {
   after += *RTCorba_idl
   Source_Files {
     server.cpp
@@ -19,7 +19,7 @@ project(*RTCorba server): rt_server, avoids_minimum_corba, avoids_corba_e_compac
   }
 }
 
-project(*RTCorba client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*RTCorba client): rt_client, minimum_corba {
   avoids += ace_for_tao
   after  += *RTCorba_idl
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
index 9684eade427..0e91b45fcb8 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
 ## Makefile.Single_Threaded_AMH_Sequence_Idl.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -46,16 +45,15 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Single_Threaded_AMH_Sequence_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -83,13 +81,12 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Single_Threaded_AMH_Sequence_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -117,7 +114,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
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 7fdc182014e..d92af709ed0 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
@@ -22,7 +22,6 @@ project(*AMH sequence server): taoserver, strategies, valuetype, amh {
 
 project(*AMH sequence client): taoclient, strategies, valuetype, amh {
   after += *AMH_sequence_idl
-  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
index af35d0c6917..b851295dfa3 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -47,10 +46,10 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -58,7 +57,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -86,7 +85,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -94,7 +93,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -124,7 +123,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
index b5adcb751a1..2a49e587b0a 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*sequence_idl): taoidldefaults, strategies, minimum_corba {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*sequence server): taoserver, strategies, minimum_corba {
   after += *sequence_idl
 
   exename = server
@@ -22,9 +22,8 @@ project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_c
   }
 }
 
-project(*sequence client): taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
   after += *sequence_idl
-  avoids += ace_for_tao
 
   exename = client
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
index e0550637fea..3ac424d40e4 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
@@ -13,14 +13,15 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.DII_Sequence_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,16 +46,18 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.DII_Sequence_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -81,13 +84,14 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.DII_Sequence_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -111,7 +115,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index 97120f54c39..09868b8bab8 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*idl): taoidldefaults, strategies, minimum_corba {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*sequence server) : taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*sequence server) : taoserver, strategies, dynamicinterface, minimum_corba {
   after += *idl
   Source_Files {
     Roundtrip.cpp
@@ -18,9 +18,8 @@ project(*sequence server) : taoserver, strategies, dynamicinterface, avoids_mini
   IDL_Files {
   }
 }
-project(*sequence client): taoclient, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*sequence client): taoclient, strategies, minimum_corba {
   after += *idl
-  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
index 8c9500e6cb2..bc8f4387742 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
@@ -13,14 +13,15 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.DSI_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,15 +46,17 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.DSI_Sequence_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -74,13 +77,14 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.DSI_Sequence_Server.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -108,7 +112,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 375e7e0cc3b..2a49e587b0a 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*sequence_idl): taoidldefaults, strategies, minimum_corba {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*sequence server): taoserver, strategies, minimum_corba {
   after += *sequence_idl
 
   exename = server
@@ -22,9 +22,9 @@ project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_c
   }
 }
 
-project(*sequence client): taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
   after += *sequence_idl
-  avoids += ace_for_tao
+
   exename = client
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
index 6c5abfa9c74..3bfe3653b10 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
@@ -13,14 +13,15 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Deferred_Sequence_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,16 +46,18 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Deferred_Sequence_Client.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
 
@@ -81,13 +84,14 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Deferred_Sequence_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
 
@@ -111,7 +115,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
index 98e6557e0e2..c352e76e3e6 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Single_Threaded_Sequence_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,14 +45,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Single_Threaded_Sequence_Client.am
 
-if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
@@ -75,11 +75,10 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
 
 ## Makefile.Single_Threaded_Sequence_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -103,7 +102,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
index fae260ec562..9cb41beface 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
@@ -22,7 +22,6 @@ project(*sequence server) : taoserver, strategies {
 
 project(*sequence client): taoclient, strategies {
   after += *sequence_idl
-  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
index 636d3508248..57d239f16e9 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Thread_Per_Conn_Sequence_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,14 +45,15 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Thread_Per_Conn_Sequence_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -74,11 +75,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Thread_Per_Conn_Sequence_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -102,7 +103,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
index 25513e38d6f..0596650c04f 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
@@ -13,14 +13,14 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
 ## Makefile.Thread_Pool_Sequence_Idl.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -45,14 +45,15 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Thread_Pool_Sequence_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -74,11 +75,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Thread_Pool_Sequence_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -104,7 +105,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am
index 1e937134220..aa262794ff7 100644
--- a/TAO/performance-tests/Throughput/Makefile.am
+++ b/TAO/performance-tests/Throughput/Makefile.am
@@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
@@ -43,12 +43,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
 noinst_HEADERS = \
   Test.idl
 
 ## Makefile.Throughput_Client.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -70,11 +71,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Throughput_Server.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -100,7 +101,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 90feed1c79a..b3052df6775 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -93,11 +93,11 @@ public:
       ACE_ENV_SINGLE_ARG_DECL
     ) = 0;
 
-  /// Default @c _get_component: always returns nil.
+  /// Default @c_get_component: always returns nil.
   virtual CORBA::Object_ptr _get_component (
     ACE_ENV_SINGLE_ARG_DECL) = 0;
 
-  /// Default @c _repository_id
+  /// Default @c_repository_id
   virtual char * _repository_id (
     ACE_ENV_SINGLE_ARG_DECL) = 0;
 
diff --git a/TAO/tao/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode.mpc
index de13ea65e18..c5d1d8080b2 100644
--- a/TAO/tao/AnyTypeCode.mpc
+++ b/TAO/tao/AnyTypeCode.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, extra_anytypecode, tao_versioning_idl_defaults {
+project : taolib, core, extra_anytypecode, tao_versioning_idl_defaults {
   sharedname   = TAO_AnyTypeCode
   dynamicflags = TAO_ANYTYPECODE_BUILD_DLL
 
@@ -14,7 +14,6 @@ project : taolib, install, extra_anytypecode, tao_versioning_idl_defaults {
     AnyTypeCode/Any_Unknown_IDL_Type.cpp
     AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
     AnyTypeCode/append.cpp
-    AnyTypeCode/BasicTypeTraits.cpp
     AnyTypeCode/BooleanSeqA.cpp
     AnyTypeCode/BoundsA.cpp
     AnyTypeCode/BoundsC.cpp
@@ -80,40 +79,6 @@ project : taolib, install, extra_anytypecode, tao_versioning_idl_defaults {
 
   Header_Files {
     AnyTypeCode/*.h
-    AnyTypeCode/GIOPA.h
-    AnyTypeCode/BooleanSeqA.h
-    AnyTypeCode/CONV_FRAMEA.h
-    AnyTypeCode/CharSeqA.h
-    AnyTypeCode/CurrentA.h
-    AnyTypeCode/DoubleSeqA.h
-    AnyTypeCode/FloatSeqA.h
-    AnyTypeCode/LongSeqA.h
-    AnyTypeCode/IIOPA.h
-    AnyTypeCode/IIOP_EndpointsA.h
-    AnyTypeCode/IOPA.h
-    AnyTypeCode/IOP_IORA.h
-    AnyTypeCode/LongDoubleSeqA.h
-    AnyTypeCode/LongLongSeqA.h
-    AnyTypeCode/LongSeqA.h
-    AnyTypeCode/Messaging_PolicyValueA.h
-    AnyTypeCode/Messaging_SyncScopeA.h
-    AnyTypeCode/ObjectIdListA.h
-    AnyTypeCode/OctetSeqA.h
-    AnyTypeCode/PI_ForwardA.h
-    AnyTypeCode/ParameterModeA.h
-    AnyTypeCode/Policy_ForwardA.h
-    AnyTypeCode/PortableInterceptorA.h
-    AnyTypeCode/ServicesA.h
-    AnyTypeCode/ShortSeqA.h
-    AnyTypeCode/StringSeqA.h
-    AnyTypeCode/TAOA.h
-    AnyTypeCode/TimeBaseA.h
-    AnyTypeCode/ULongLongSeqA.h
-    AnyTypeCode/ULongSeqA.h
-    AnyTypeCode/UShortSeqA.h
-    AnyTypeCode/WCharSeqA.h
-    AnyTypeCode/WStringSeqA.h
-    AnyTypeCode/orb_typesA.h
   }
 
   Inline_Files {
@@ -143,7 +108,7 @@ project : taolib, install, extra_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GA \
+    idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 \
                 -Wb,export_macro=TAO_AnyTypeCode_Export \
                 -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h \
                 -o AnyTypeCode
@@ -155,7 +120,7 @@ project : taolib, install, extra_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -GA \
+    idlflags += -Gp -Gd -Sci -SS -GA -Ge 1 \
                 -Wb,export_macro=TAO_AnyTypeCode_Export \
                 -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h \
                 -o AnyTypeCode
diff --git a/TAO/tao/AnyTypeCode/AnySeq.pidl b/TAO/tao/AnyTypeCode/AnySeq.pidl
index 7d125d431d0..18cf94274d6 100644
--- a/TAO/tao/AnyTypeCode/AnySeq.pidl
+++ b/TAO/tao/AnyTypeCode/AnySeq.pidl
@@ -8,7 +8,7 @@
  * The command used to generate code is:
  *
  *     tao_idl
- *        -o orig -GA -SS -Sci
+ *        -o orig -Ge 1 -GA -SS -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index 5b2e0257e79..e9a050dde77 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -194,21 +194,17 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
 
       if (kind != CORBA::tk_objref)
         {
-          return false;
+          return 0;
         }
 
-      // We don't want the rd_ptr to move, in case we are shared by
-      // another Any, so we use this to copy the state, not the buffer.
-      TAO_InputCDR for_reading (this->cdr_);
-      
-      return for_reading >> obj;
+      return this->cdr_ >> obj;
     }
   ACE_CATCH (CORBA::Exception, ex)
     {
     }
   ACE_ENDTRY;
 
-  return false;
+  return 0;
 }
 
 CORBA::Boolean
@@ -234,7 +230,7 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
 
       if (kind != CORBA::tk_value)
         {
-          return false;
+          return 0;
         }
 
     TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
@@ -258,7 +254,7 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
     }
   ACE_ENDTRY;
 
-  return false;
+  return 0;
 }
 
 CORBA::Boolean
@@ -284,7 +280,7 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
 
       if (kind != CORBA::tk_value)
         {
-          return false;
+          return 0;
         }
 
     TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
@@ -309,7 +305,7 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
     }
   ACE_ENDTRY;
 
-  return false;
+  return 0;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/BasicTypeTraits.cpp b/TAO/tao/AnyTypeCode/BasicTypeTraits.cpp
deleted file mode 100644
index d6d4c56276c..00000000000
--- a/TAO/tao/AnyTypeCode/BasicTypeTraits.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    BasicTypeTraits.cpp
- *
- *  $Id$
- *
- *  Assign values to specialization members in BasicTypeTraits.h.
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#include "tao/AnyTypeCode/BasicTypeTraits.h"
-#include "tao/AnyTypeCode/BooleanSeqA.h"
-#include "tao/AnyTypeCode/CharSeqA.h"
-#include "tao/AnyTypeCode/OctetSeqA.h"
-#include "tao/AnyTypeCode/WCharSeqA.h"
-#include "tao/AnyTypeCode/ShortSeqA.h"
-#include "tao/AnyTypeCode/UShortSeqA.h"
-#include "tao/AnyTypeCode/LongSeqA.h"
-#include "tao/AnyTypeCode/ULongSeqA.h"
-#include "tao/AnyTypeCode/LongLongSeqA.h"
-#include "tao/AnyTypeCode/ULongLongSeqA.h"
-#include "tao/AnyTypeCode/FloatSeqA.h"
-#include "tao/AnyTypeCode/DoubleSeqA.h"
-#include "tao/AnyTypeCode/LongDoubleSeqA.h"
-#include "tao/AnyTypeCode/AnySeqA.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Boolean>::tc_value = CORBA::_tc_boolean;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Boolean>::tckind_value = CORBA::tk_boolean;
-
-  BasicTypeTraits<CORBA::Boolean>::return_type
-  BasicTypeTraits<CORBA::Boolean>::convert (extract_type& et)
-  {
-    return et.ref_;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Octet>::tc_value = CORBA::_tc_octet;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Octet>::tckind_value = CORBA::tk_octet;
-
-  BasicTypeTraits<CORBA::Octet>::return_type
-  BasicTypeTraits<CORBA::Octet>::convert (extract_type& et)
-  {
-    return et.ref_;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Char>::tc_value = CORBA::_tc_char;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Char>::tckind_value = CORBA::tk_char;
-
-  BasicTypeTraits<CORBA::Char>::return_type
-  BasicTypeTraits<CORBA::Char>::convert (extract_type& et)
-  {
-    return et.ref_;
-  }
-
-  //================================================================
-
-#if (defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)) && !defined (ACE_LACKS_NATIVE_WCHAR_T)
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::WChar>::tc_value = CORBA::_tc_wchar;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::WChar>::tckind_value = CORBA::tk_wchar;
-
-  BasicTypeTraits<CORBA::WChar>::return_type
-  BasicTypeTraits<CORBA::WChar>::convert (extract_type& et)
-  {
-    return et.ref_;
-  }
-
-#endif
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Short>::tc_value = CORBA::_tc_short;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Short>::tckind_value = CORBA::tk_short;
-
-  BasicTypeTraits<CORBA::Short>::return_type
-  BasicTypeTraits<CORBA::Short>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::UShort>::tc_value = CORBA::_tc_ushort;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::UShort>::tckind_value = CORBA::tk_ushort;
-
-  BasicTypeTraits<CORBA::UShort>::return_type
-  BasicTypeTraits<CORBA::UShort>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Long>::tc_value = CORBA::_tc_long;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Long>::tckind_value = CORBA::tk_long;
-
-  BasicTypeTraits<CORBA::Long>::return_type
-  BasicTypeTraits<CORBA::Long>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::ULong>::tc_value = CORBA::_tc_ulong;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::ULong>::tckind_value = CORBA::tk_ulong;
-
-  BasicTypeTraits<CORBA::ULong>::return_type
-  BasicTypeTraits<CORBA::ULong>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::LongLong>::tc_value = CORBA::_tc_longlong;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::LongLong>::tckind_value = CORBA::tk_longlong;
-
-  BasicTypeTraits<CORBA::LongLong>::return_type
-  BasicTypeTraits<CORBA::LongLong>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::ULongLong>::tc_value = CORBA::_tc_ulonglong;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::ULongLong>::tckind_value = CORBA::tk_ulonglong;
-
-  BasicTypeTraits<CORBA::ULongLong>::return_type
-  BasicTypeTraits<CORBA::ULongLong>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Float>::tc_value = CORBA::_tc_float;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Float>::tckind_value = CORBA::tk_float;
-
-  BasicTypeTraits<CORBA::Float>::return_type
-  BasicTypeTraits<CORBA::Float>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Double>::tc_value = CORBA::_tc_double;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Double>::tckind_value = CORBA::tk_double;
-
-  BasicTypeTraits<CORBA::Double>::return_type
-  BasicTypeTraits<CORBA::Double>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::LongDouble>::tc_value = CORBA::_tc_longdouble;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::LongDouble>::tckind_value = CORBA::tk_longdouble;
-
-  BasicTypeTraits<CORBA::LongDouble>::return_type
-  BasicTypeTraits<CORBA::LongDouble>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Char *>::tc_value = CORBA::_tc_string;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Char *>::tckind_value = CORBA::tk_string;
-
-  BasicTypeTraits<CORBA::Char *>::return_type
-  BasicTypeTraits<CORBA::Char *>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::WChar *>::tc_value = CORBA::_tc_wstring;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::WChar *>::tckind_value = CORBA::tk_wstring;
-
-  BasicTypeTraits<CORBA::WChar *>::return_type
-  BasicTypeTraits<CORBA::WChar *>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Any>::tc_value = CORBA::_tc_any;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Any>::tckind_value = CORBA::tk_any;
-
-  BasicTypeTraits<CORBA::Any>::return_type
-  BasicTypeTraits<CORBA::Any>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::Object_ptr>::tc_value = CORBA::_tc_Object;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::Object_ptr>::tckind_value = CORBA::tk_objref;
-
-  BasicTypeTraits<CORBA::Object_ptr>::return_type
-  BasicTypeTraits<CORBA::Object_ptr>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::TypeCode_ptr>::tc_value = CORBA::_tc_TypeCode;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::TypeCode_ptr>::tckind_value = CORBA::tk_TypeCode;
-
-  BasicTypeTraits<CORBA::TypeCode_ptr>::return_type
-  BasicTypeTraits<CORBA::TypeCode_ptr>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::BooleanSeq>::tc_value = CORBA::_tc_BooleanSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::BooleanSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::BooleanSeq>::return_type
-  BasicTypeTraits<CORBA::BooleanSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::OctetSeq>::tc_value = CORBA::_tc_OctetSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::OctetSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::OctetSeq>::return_type
-  BasicTypeTraits<CORBA::OctetSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::CharSeq>::tc_value = CORBA::_tc_CharSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::CharSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::CharSeq>::return_type
-  BasicTypeTraits<CORBA::CharSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::WCharSeq>::tc_value = CORBA::_tc_WCharSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::WCharSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::WCharSeq>::return_type
-  BasicTypeTraits<CORBA::WCharSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::ShortSeq>::tc_value = CORBA::_tc_ShortSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::ShortSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::ShortSeq>::return_type
-  BasicTypeTraits<CORBA::ShortSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::UShortSeq>::tc_value = CORBA::_tc_UShortSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::UShortSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::UShortSeq>::return_type
-  BasicTypeTraits<CORBA::UShortSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::LongSeq>::tc_value = CORBA::_tc_LongSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::LongSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::LongSeq>::return_type
-  BasicTypeTraits<CORBA::LongSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::ULongSeq>::tc_value = CORBA::_tc_ULongSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::ULongSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::ULongSeq>::return_type
-  BasicTypeTraits<CORBA::ULongSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::LongLongSeq>::tc_value = CORBA::_tc_LongLongSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::LongLongSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::LongLongSeq>::return_type
-  BasicTypeTraits<CORBA::LongLongSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::ULongLongSeq>::tc_value = CORBA::_tc_ULongLongSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::ULongLongSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::ULongLongSeq>::return_type
-  BasicTypeTraits<CORBA::ULongLongSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::FloatSeq>::tc_value = CORBA::_tc_FloatSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::FloatSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::FloatSeq>::return_type
-  BasicTypeTraits<CORBA::FloatSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::DoubleSeq>::tc_value = CORBA::_tc_DoubleSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::DoubleSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::DoubleSeq>::return_type
-  BasicTypeTraits<CORBA::DoubleSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::LongDoubleSeq>::tc_value = CORBA::_tc_LongDoubleSeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::LongDoubleSeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::LongDoubleSeq>::return_type
-  BasicTypeTraits<CORBA::LongDoubleSeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-
-  //================================================================
-
-  CORBA::TypeCode_ptr const
-  BasicTypeTraits<CORBA::AnySeq>::tc_value = CORBA::_tc_AnySeq;
-
-  CORBA::TCKind const
-  BasicTypeTraits<CORBA::AnySeq>::tckind_value = CORBA::tk_sequence;
-
-  BasicTypeTraits<CORBA::AnySeq>::return_type
-  BasicTypeTraits<CORBA::AnySeq>::convert (extract_type& et)
-  {
-    return et;
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
diff --git a/TAO/tao/AnyTypeCode/BasicTypeTraits.h b/TAO/tao/AnyTypeCode/BasicTypeTraits.h
deleted file mode 100644
index 73b3c0b4109..00000000000
--- a/TAO/tao/AnyTypeCode/BasicTypeTraits.h
+++ /dev/null
@@ -1,469 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    BasicTypeTraits.h
- *
- *  $Id$
- *
- *  Specializations of template traits in BasicTypeTraits_T.h.
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#include "tao/AnyTypeCode/BasicTypeTraits_T.h"
-#include "tao/AnyTypeCode/Any.h"
-
-#include "tao/Typecode_typesC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode * TypeCode_ptr;
-
-  class BooleanSeq;
-  class CharSeq;
-  class OctetSeq;
-  class WCharSeq;
-  class ShortSeq;
-  class UShortSeq;
-  class LongSeq;
-  class ULongSeq;
-  class LongLongSeq;
-  class ULongLongSeq;
-  class FloatSeq;
-  class DoubleSeq;
-  class LongDoubleSeq;
-  class AnySeq;
-}
-
-namespace TAO
-{
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Boolean>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Any::from_boolean insert_type;
-    typedef CORBA::Any::to_boolean extract_type;
-    typedef CORBA::Boolean return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Octet>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Any::from_octet insert_type;
-    typedef CORBA::Any::to_octet extract_type;
-    typedef CORBA::Octet return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Char>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Any::from_char insert_type;
-    typedef CORBA::Any::to_char extract_type;
-    typedef CORBA::Char return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-#if (defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)) && !defined (ACE_LACKS_NATIVE_WCHAR_T)
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::WChar>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Any::from_wchar insert_type;
-    typedef CORBA::Any::to_wchar extract_type;
-    typedef CORBA::WChar return_type;
-
-    static return_type convert (extract_type& et);
-  };
-#endif
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Short>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Short insert_type;
-    typedef CORBA::Short extract_type;
-    typedef CORBA::Short return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::UShort>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::UShort insert_type;
-    typedef CORBA::UShort extract_type;
-    typedef CORBA::UShort return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Long>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Long insert_type;
-    typedef CORBA::Long extract_type;
-    typedef CORBA::Long return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::ULong>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::ULong insert_type;
-    typedef CORBA::ULong extract_type;
-    typedef CORBA::ULong return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::LongLong>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::LongLong insert_type;
-    typedef CORBA::LongLong extract_type;
-    typedef CORBA::LongLong return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::ULongLong>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::ULongLong insert_type;
-    typedef CORBA::ULongLong extract_type;
-    typedef CORBA::ULongLong return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Float>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Float insert_type;
-    typedef CORBA::Float extract_type;
-    typedef CORBA::Float return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Double>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Double insert_type;
-    typedef CORBA::Double extract_type;
-    typedef CORBA::Double return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::LongDouble>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::LongDouble insert_type;
-    typedef CORBA::LongDouble extract_type;
-    typedef CORBA::LongDouble return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Char *>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Char * insert_type;
-    typedef CORBA::Char * extract_type;
-    typedef CORBA::Char * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::WChar *>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::WChar * insert_type;
-    typedef CORBA::WChar * extract_type;
-    typedef CORBA::WChar * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Any>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Any insert_type;
-    typedef CORBA::Any * extract_type;
-    typedef CORBA::Any * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::Object_ptr>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::Object_ptr insert_type;
-    typedef CORBA::Object_ptr extract_type;
-    typedef CORBA::Object_ptr return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::TypeCode_ptr>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::TypeCode_ptr insert_type;
-    typedef CORBA::TypeCode_ptr extract_type;
-    typedef CORBA::TypeCode_ptr return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::BooleanSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::BooleanSeq insert_type;
-    typedef CORBA::BooleanSeq * extract_type;
-    typedef CORBA::BooleanSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::OctetSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value ;
-
-    typedef CORBA::OctetSeq insert_type;
-    typedef CORBA::OctetSeq * extract_type;
-    typedef CORBA::OctetSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::CharSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::CharSeq insert_type;
-    typedef CORBA::CharSeq * extract_type;
-    typedef CORBA::CharSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::WCharSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::WCharSeq insert_type;
-    typedef CORBA::WCharSeq * extract_type;
-    typedef CORBA::WCharSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::ShortSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::ShortSeq insert_type;
-    typedef CORBA::ShortSeq * extract_type;
-    typedef CORBA::ShortSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::UShortSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::UShortSeq insert_type;
-    typedef CORBA::UShortSeq * extract_type;
-    typedef CORBA::UShortSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::LongSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::LongSeq insert_type;
-    typedef CORBA::LongSeq * extract_type;
-    typedef CORBA::LongSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::ULongSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::ULongSeq insert_type;
-    typedef CORBA::ULongSeq * extract_type;
-    typedef CORBA::ULongSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::LongLongSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::LongLongSeq insert_type;
-    typedef CORBA::LongLongSeq * extract_type;
-    typedef CORBA::LongLongSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::ULongLongSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::ULongLongSeq insert_type;
-    typedef CORBA::ULongLongSeq * extract_type;
-    typedef CORBA::ULongLongSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::FloatSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::FloatSeq insert_type;
-    typedef CORBA::FloatSeq * extract_type;
-    typedef CORBA::FloatSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::DoubleSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::DoubleSeq insert_type;
-    typedef CORBA::DoubleSeq * extract_type;
-    typedef CORBA::DoubleSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::LongDoubleSeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::LongDoubleSeq insert_type;
-    typedef CORBA::LongDoubleSeq * extract_type;
-    typedef CORBA::LongDoubleSeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-
-  template<>
-  struct TAO_AnyTypeCode_Export BasicTypeTraits<CORBA::AnySeq>
-  {
-    static CORBA::TypeCode_ptr const tc_value;
-    static CORBA::TCKind const tckind_value;
-
-    typedef CORBA::AnySeq insert_type;
-    typedef CORBA::AnySeq * extract_type;
-    typedef CORBA::AnySeq * return_type;
-
-    static return_type convert (extract_type& et);
-  };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
diff --git a/TAO/tao/AnyTypeCode/BasicTypeTraits_T.h b/TAO/tao/AnyTypeCode/BasicTypeTraits_T.h
deleted file mode 100644
index 9e1321f36c7..00000000000
--- a/TAO/tao/AnyTypeCode/BasicTypeTraits_T.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    BasicTypeTraits_T.h
- *
- *  $Id$
- *
- *  Template traits useful for programming with predefined types.
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef BASIC_TYPE_TRAITS_T_H
-#define BASIC_TYPE_TRAITS_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  // Forward declaration forces specialization for each type used,
-  // necessary since each instantiated struct has values that cannot
-  // be set generically, so they must be set explicitly and exported.
-  template<typename T>
-  struct BasicTypeTraits;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* BASIC_TYPE_TRAITS_T_H */
-
diff --git a/TAO/tao/AnyTypeCode/Bounds.pidl b/TAO/tao/AnyTypeCode/Bounds.pidl
index 1ade7f964b6..f0155c854ab 100644
--- a/TAO/tao/AnyTypeCode/Bounds.pidl
+++ b/TAO/tao/AnyTypeCode/Bounds.pidl
@@ -10,7 +10,7 @@
  * following command:
  *
  *   tao_idl
- *        -o orig -GA -Sci
+ *        -o orig -Ge 1 -GA -Sci
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/AnyTypeCode/Dynamic.pidl b/TAO/tao/AnyTypeCode/Dynamic.pidl
index 51c4053c75f..48bd24f4971 100644
--- a/TAO/tao/AnyTypeCode/Dynamic.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic.pidl
@@ -10,7 +10,7 @@
  *   used to generate code is:
  *
  *     tao_idl
- *        -o orig -GA -SS -Sci
+ *        -o orig -Ge 1 -GA -SS -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/AnyTypeCode/DynamicC.h b/TAO/tao/AnyTypeCode/DynamicC.h
index c345eb2c66d..92e2d9ba9b9 100644
--- a/TAO/tao/AnyTypeCode/DynamicC.h
+++ b/TAO/tao/AnyTypeCode/DynamicC.h
@@ -129,7 +129,6 @@ namespace Dynamic
     static void _tao_any_destructor (void *);
 
     typedef ParameterList_var _var_type;
-    typedef ParameterList_out _out_type;
   };
 
 #endif /* end #if !defined */
diff --git a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
index 0d69d6c54ff..aee0f76d991 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
@@ -10,7 +10,7 @@
  *   used to generate code is:
  *
  *     tao_idl
- *        -o orig -GA -Sci
+ *        -o orig -Ge 1 -GA -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
index 058b327e37e..3e300cb3658 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -33,7 +33,7 @@ namespace TAO
     /**
      * @class Fixed
      *
-     * @brief @c CORBA::TypeCode implementation for the OMG IDL fixed
+     * @brief @c CORBA::TypeCode implementation for the OMG IDL @fixed
      *        types.
      *
      * This class implements a @c CORBA::TypeCode for the OMG IDL @c
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index 56528db0c81..0a0b9ef54ee 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -490,11 +490,11 @@ CORBA::NVList::_lazy_has_arguments (void) const
 {
   if (this->incoming_ != 0)
     {
-      return this->incoming_->length () <= 1 ? false : true;
+      return this->incoming_->length () == 0 ? 0 : 1;
     }
   else
     {
-      return this->count () <= 1 ? false : true;
+      return this->count () == 0 ? 0 : 1;
     }
 }
 
diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp
new file mode 100644
index 00000000000..dd6b7864968
--- /dev/null
+++ b/TAO/tao/AnyTypeCode/OctetSeqA.cpp
@@ -0,0 +1,146 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "tao/AnyTypeCode/OctetSeqA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_OctetSeq_GUARD
+#define _TAO_TYPECODE_CORBA_OctetSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_OctetSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_octet,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_OctetSeq_0 =
+      &CORBA_OctetSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_OctetSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OctetSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/OctetSeq:1.0",
+    "OctetSeq",
+    &TAO::TypeCode::tc_CORBA_OctetSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_OctetSeq =
+    &_tao_tc_CORBA_OctetSeq;
+}
+
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::OctetSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy (
+      _tao_any,
+      CORBA::OctetSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_OctetSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OctetSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert (
+      _tao_any,
+      CORBA::OctetSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_OctetSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OctetSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::OctetSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::OctetSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract (
+        _tao_any,
+        CORBA::OctetSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_OctetSeq_0,
+        _tao_elem
+      );
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.h b/TAO/tao/AnyTypeCode/OctetSeqA.h
new file mode 100644
index 00000000000..8b94976cb20
--- /dev/null
+++ b/TAO/tao/AnyTypeCode/OctetSeqA.h
@@ -0,0 +1,71 @@
+// -*- 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:788
+
+#ifndef _TAO_IDL_ANYTYPECODE_OCTETSEQA_H_
+#define _TAO_IDL_ANYTYPECODE_OCTETSEQA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/OctetSeqC.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace CORBA
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_OctetSeq;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:53
+
+TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
+TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
+TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated
+TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h
index 98957712997..141e89f46e8 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.h
+++ b/TAO/tao/AnyTypeCode/TypeCode.h
@@ -423,7 +423,7 @@ namespace CORBA
      * @note This is a TAO-specific method that is not part of the
      *       standard @c CORBA::TypeCode interface.
      *
-     * @note If this method returns false, the contents of the @a cdr
+     * @note If this method returns @false, the contents of the @a cdr
      *       output CDR stream are undefined.
      */
     virtual bool tao_marshal (TAO_OutputCDR & cdr,
diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.cpp b/TAO/tao/AnyTypeCode/UShortSeqA.cpp
new file mode 100644
index 00000000000..582d15d69d0
--- /dev/null
+++ b/TAO/tao/AnyTypeCode/UShortSeqA.cpp
@@ -0,0 +1,146 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "tao/AnyTypeCode/UShortSeqA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_UShortSeq_GUARD
+#define _TAO_TYPECODE_CORBA_UShortSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_UShortSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ushort,
+        0U);
+
+    ::CORBA::TypeCode_ptr const tc_CORBA_UShortSeq_0 =
+      &CORBA_UShortSeq_0;
+
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_UShortSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_UShortSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/UShortSeq:1.0",
+    "UShortSeq",
+    &TAO::TypeCode::tc_CORBA_UShortSeq_0);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_UShortSeq =
+    &_tao_tc_CORBA_UShortSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::UShortSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert_copy (
+      _tao_any,
+      CORBA::UShortSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_UShortSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::UShortSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert (
+      _tao_any,
+      CORBA::UShortSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_UShortSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::UShortSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::UShortSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::UShortSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::extract (
+        _tao_any,
+        CORBA::UShortSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_UShortSeq_0,
+        _tao_elem
+      );
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.h b/TAO/tao/AnyTypeCode/UShortSeqA.h
new file mode 100644
index 00000000000..824246509de
--- /dev/null
+++ b/TAO/tao/AnyTypeCode/UShortSeqA.h
@@ -0,0 +1,112 @@
+// -*- 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:153
+
+#ifndef _TAO_IDL_ORIG_USHORTSEQA_H_
+#define _TAO_IDL_ORIG_USHORTSEQA_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/UShortSeqC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace CORBA
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
+  extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_UShortSeq;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::UShortSeq &); // copying version
+TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::UShortSeq*); // noncopying version
+TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UShortSeq *&); // deprecated
+TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UShortSeq *&);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:955
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/AnyTypeCode/ValueModifier.pidl b/TAO/tao/AnyTypeCode/ValueModifier.pidl
index e5e8981c404..794ac4af092 100644
--- a/TAO/tao/AnyTypeCode/ValueModifier.pidl
+++ b/TAO/tao/AnyTypeCode/ValueModifier.pidl
@@ -10,7 +10,7 @@
  *   used to generate code is:
  *
  *     tao_idl
- *        -o orig -SS -Sci -St
+ *        -o orig -Ge 1 -SS -Sci -St
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/AnyTypeCode/Visibility.pidl b/TAO/tao/AnyTypeCode/Visibility.pidl
index 6b2b5b645d9..27f4f755c8b 100644
--- a/TAO/tao/AnyTypeCode/Visibility.pidl
+++ b/TAO/tao/AnyTypeCode/Visibility.pidl
@@ -10,7 +10,7 @@
  *   used to generate code is:
  *
  *     tao_idl
- *        -o orig -SS -Sci
+ *        -o orig -SS -Ge 1 -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp
index 4f46e782f41..195cab9ef0b 100644
--- a/TAO/tao/Base_Transport_Property.cpp
+++ b/TAO/tao/Base_Transport_Property.cpp
@@ -21,7 +21,7 @@ TAO_Transport_Descriptor_Interface *
 TAO_Base_Transport_Property::duplicate (void)
 {
   // Get a copy of the underlying endpoint
-  TAO_Endpoint * const endpt = this->endpoint_->duplicate ();
+  TAO_Endpoint *endpt = this->endpoint_->duplicate ();
   if (endpt == 0)
     return 0;
 
diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc
index 6da01a49cfa..af2a4bce1ea 100644
--- a/TAO/tao/BiDir_GIOP.mpc
+++ b/TAO/tao/BiDir_GIOP.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, pi, tao_versioning_idl_defaults {
+project : taolib, core, pi, tao_versioning_idl_defaults {
   sharedname   = TAO_BiDirGIOP
   dynamicflags = TAO_BIDIRGIOP_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : taolib, install, pi, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sa -St \
                 -Wb,export_macro=TAO_BiDirGIOP_Export \
                 -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h \
                 -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE \
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
index bc167979213..91c6be9dc4c 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
@@ -5,7 +5,7 @@
  * BiDirPolicy*.* The command used to generate code
  * is:
  *
- * tao_idl -o orig -Sa -St -Sci \
+ * tao_idl -o orig -Ge 1 -Sa -St -Sci \
  *           -Wb,export_macro=TAO_BiDirGIOP_Export \
  *           -Wb,export_include="bidirgiop_export.h" \
  *           -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/BooleanSeq.pidl b/TAO/tao/BooleanSeq.pidl
index 5ae3d3e667c..34ad2ac2aa9 100644
--- a/TAO/tao/BooleanSeq.pidl
+++ b/TAO/tao/BooleanSeq.pidl
@@ -8,7 +8,7 @@
  *
  *     tao_idl
  *          -oA AnyTypeCode
- *          -GA -SS -Sci
+ *          -Ge 1 -GA -SS -Sci
  *          -Wb,pre_include=ace/pre.h
  *          -Wb,post_include=ace/post.h
  *          -Wb,export_macro=TAO_Export
diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h
index 4865865998f..da573662bc7 100644
--- a/TAO/tao/Bounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h
@@ -18,6 +18,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
+namespace details
+{
+
 template<typename charT, CORBA::ULong MAX>
 class bounded_basic_string_sequence
 {
@@ -35,55 +38,55 @@ public:
 
   typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
 
-  /// @copydoc details::generic_sequence::generic_sequence
+  /// @copydoc generic_sequence::generic_sequence
   inline bounded_basic_string_sequence()
     : impl_()
   {}
-  /// @copydoc details::generic_sequence::generic_sequence
+  /// @copydoc generic_sequence::generic_sequence
   inline bounded_basic_string_sequence(
       CORBA::ULong length,
       value_type * data,
       CORBA::Boolean release)
     : impl_(MAX, length, data, release)
   {}
-  /// @copydoc details::generic_sequence::maximum
+  /// @copydoc generic_sequence::maximum
   inline CORBA::ULong maximum() const {
     return impl_.maximum();
   }
-  /// @copydoc details::generic_sequence::release
+  /// @copydoc generic_sequence::release
   inline CORBA::Boolean release() const {
     return impl_.release();
   }
-  /// @copydoc details::generic_sequence::length
+  /// @copydoc generic_sequence::length
   inline CORBA::ULong length() const {
     return impl_.length();
   }
 
-  /// @copydoc details::generic_sequence::length
+  /// @copydoc generic_sequence::length
   inline void length(CORBA::ULong length) {
     implementation_type::range::check_length(length, MAX);
     impl_.length(length);
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc generic_sequence::operator[]
   inline const_value_type operator[](CORBA::ULong i) const {
     return impl_[i];
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc generic_sequence::operator[]
   inline element_type operator[](CORBA::ULong i) {
     return element_type(impl_[i], release());
   }
-  /// @copydoc details::generic_sequence::get_buffer
+  /// @copydoc generic_sequence::get_buffer
   inline const_value_type const * get_buffer() const {
     return impl_.get_buffer();
   }
-  /// @copydoc details::generic_sequence::replace
+  /// @copydoc generic_sequence::replace
   inline void replace(
       CORBA::ULong length,
       value_type * data,
       CORBA::Boolean release = false) {
     impl_.replace(MAX, length, data, release);
   }
-  /// @copydoc details::generic_sequence::get_buffer(CORBA::Boolean)
+  /// @copydoc generic_sequence::get_buffer(CORBA::Boolean)
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
@@ -106,6 +109,8 @@ public:
 private:
   implementation_type impl_;
 };
+
+} // namespace details
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Bounded_Sequence_CDR_T.h b/TAO/tao/Bounded_Sequence_CDR_T.h
index 379410b5a22..70d1480f1ba 100644
--- a/TAO/tao/Bounded_Sequence_CDR_T.h
+++ b/TAO/tao/Bounded_Sequence_CDR_T.h
@@ -12,6 +12,7 @@
  */
 
 #include "tao/orbconf.h"
+#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -281,8 +282,8 @@ namespace TAO {
   }
 
   template <typename stream, typename charT, CORBA::ULong MAX>
-  bool demarshal_sequence(stream & strm, TAO::bounded_basic_string_sequence <charT, MAX> & target) {
-    typedef typename TAO::bounded_basic_string_sequence <charT, MAX> sequence;
+  bool demarshal_sequence(stream & strm, TAO::details::bounded_basic_string_sequence <charT, MAX> & target) {
+    typedef typename TAO::details::bounded_basic_string_sequence <charT, MAX> sequence;
     typedef typename sequence::element_traits::string_var string_var;
     ::CORBA::ULong new_length = 0;
     if (!(strm >> new_length)) {
@@ -332,6 +333,8 @@ namespace TAO {
 namespace TAO {
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Short, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -341,6 +344,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Long, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -350,6 +355,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::ULong, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -359,6 +366,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::UShort, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -368,6 +377,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Octet, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -377,6 +388,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Char, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -387,6 +400,8 @@ namespace TAO {
 # if (defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)) && !defined (ACE_LACKS_NATIVE_WCHAR_T)
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::WChar, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -397,6 +412,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Float, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -406,6 +423,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Double, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -415,6 +434,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::ULongLong, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -424,6 +445,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::LongDouble, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -433,6 +456,8 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Boolean, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -442,6 +467,8 @@ namespace TAO {
 
   template <typename stream, typename value_t, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <value_t, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -455,7 +482,9 @@ namespace TAO {
   }
 
   template <typename stream, typename charT, CORBA::ULong MAX>
-  bool marshal_sequence(stream & strm, const TAO::bounded_basic_string_sequence <charT, MAX> & source) {
+  bool marshal_sequence(stream & strm, const TAO::details::bounded_basic_string_sequence <charT, MAX> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -471,6 +500,8 @@ namespace TAO {
   template <typename stream, typename object_t, typename object_t_var, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_object_reference_sequence<object_t, object_t_var, MAX> & source) {
     typedef typename TAO::bounded_object_reference_sequence<object_t, object_t_var, MAX>::object_type object_type;
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
diff --git a/TAO/tao/Bounded_String_Sequence_T.h b/TAO/tao/Bounded_String_Sequence_T.h
new file mode 100644
index 00000000000..9f6373343b6
--- /dev/null
+++ b/TAO/tao/Bounded_String_Sequence_T.h
@@ -0,0 +1,42 @@
+#ifndef guard_bounded_string_sequence_hpp
+#define guard_bounded_string_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement bounded sequences for strings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "tao/Bounded_Basic_String_Sequence_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+template<CORBA::ULong MAX>
+class bounded_string_sequence
+  : public details::bounded_basic_string_sequence<char,MAX>
+{
+public:
+  inline bounded_string_sequence()
+    : details::bounded_basic_string_sequence<char,MAX>()
+  {}
+  inline bounded_string_sequence(
+      CORBA::ULong length,
+      char * * data,
+      CORBA::Boolean release = false)
+    : details::bounded_basic_string_sequence<char,MAX>(
+        length, data, release)
+  {}
+};
+
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_bounded_string_sequence_hpp
diff --git a/TAO/tao/Bounded_Value_Sequence_T.h b/TAO/tao/Bounded_Value_Sequence_T.h
index 991b282a2e0..dbb466fac3a 100644
--- a/TAO/tao/Bounded_Value_Sequence_T.h
+++ b/TAO/tao/Bounded_Value_Sequence_T.h
@@ -44,48 +44,37 @@ public:
     : impl_(MAX, length, data, release)
   {}
   /* Use default ctor, operator= and dtor */
-
-  /// @copydoc details::generic_sequence::maximum
   inline CORBA::ULong maximum() const {
     return impl_.maximum();
   }
-  /// @copydoc details::generic_sequence::release
   inline CORBA::Boolean release() const {
     return impl_.release();
   }
-  /// @copydoc details::generic_sequence::length
   inline CORBA::ULong length() const {
     return impl_.length();
   }
-  /// @copydoc details::generic_sequence::length
   inline void length(CORBA::ULong length) {
     implementation_type::range::check_length(length, MAX);
     impl_.length(length);
   }
-  /// @copydoc details::generic_sequence::operator[]
   inline value_type const & operator[](CORBA::ULong i) const {
     return impl_[i];
   }
-  /// @copydoc details::generic_sequence::operator[]
   inline value_type & operator[](CORBA::ULong i) {
     return impl_[i];
   }
-  /// @copydoc details::generic_sequence::replace
   inline void replace(
       CORBA::ULong length,
       value_type * data,
       CORBA::Boolean release = false) {
     impl_.replace(MAX, length, data, release);
   }
-  /// @copydoc details::generic_sequence::get_buffer
   inline value_type const * get_buffer() const {
     return impl_.get_buffer();
   }
-  /// @copydoc details::generic_sequence::get_buffer(CORBA::Boolean)
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  /// @copydoc details::generic_sequence::swap
   inline void swap(bounded_value_sequence & rhs) throw() {
     impl_.swap(rhs.impl_);
   }
diff --git a/TAO/tao/Bounded_Wstring_Sequence_T.h b/TAO/tao/Bounded_Wstring_Sequence_T.h
new file mode 100644
index 00000000000..c0ed84f289e
--- /dev/null
+++ b/TAO/tao/Bounded_Wstring_Sequence_T.h
@@ -0,0 +1,42 @@
+#ifndef guard_bounded_wstring_sequence_hpp
+#define guard_bounded_wstring_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement bounded sequences for wstrings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "tao/Bounded_Basic_String_Sequence_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+template<CORBA::ULong MAX>
+class bounded_wstring_sequence
+  : public details::bounded_basic_string_sequence<CORBA::WChar,MAX>
+{
+public:
+  inline bounded_wstring_sequence()
+    : details::bounded_basic_string_sequence<CORBA::WChar,MAX>()
+  {}
+  inline bounded_wstring_sequence(
+      CORBA::ULong length,
+      CORBA::WChar * * data,
+      CORBA::Boolean release = false)
+    : details::bounded_basic_string_sequence<CORBA::WChar,MAX>(
+        length, data, release)
+  {}
+};
+
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_bounded_wstring_sequence_hpp
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
index 637f4d35a89..671887bff88 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -9,7 +9,7 @@
  * following command:
  *
  *   tao_idl
- *        -o orig -GA -SS -Sci -Sc
+ *        -o orig -Ge 1 -GA -SS -Sci -Sc
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include="tao/TAO_Export.h"
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/CSD_Framework.mpc b/TAO/tao/CSD_Framework.mpc
index d0d508e88b4..e366ec7a3ba 100644
--- a/TAO/tao/CSD_Framework.mpc
+++ b/TAO/tao/CSD_Framework.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, portableserver, install, pi, tao_versioning_idl_defaults {
+project : taolib, portableserver, core, pi, tao_versioning_idl_defaults {
   sharedname   = TAO_CSD_Framework
   dynamicflags = TAO_CSD_FW_BUILD_DLL
   includes    += $(TAO_ROOT)/tao
@@ -33,7 +33,7 @@ project : taolib, portableserver, install, pi, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -GA -Sal \
+    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sorb -GA -Sal \
                 -Wb,export_macro=TAO_CSD_FW_Export \
                 -Wb,export_include=tao/CSD_Framework/CSD_FW_Export.h \
                 -o CSD_Framework
diff --git a/TAO/tao/CSD_Framework/CSD_Framework.pidl b/TAO/tao/CSD_Framework/CSD_Framework.pidl
index 9161ca09d93..ef542697765 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework.pidl
+++ b/TAO/tao/CSD_Framework/CSD_Framework.pidl
@@ -10,7 +10,7 @@
  * CSD_FrameworkC.{h,inl,cpp}, using the following command:
  *
  * $ACE_ROOT/bin/tao_idl \
- *     -o orig -Gp -Gd -Gt -GA -I$TAO_ROOT -Sci \
+ *     -o orig -Gp -Gd -Ge 1 -Gt -GA -I$TAO_ROOT -Sci \
  *          -Wb,export_macro=TAO_CSD_FW_Export \
  *          -Wb,export_include="CSD_FW_Export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool.mpc
index 4cdd69e86e2..e3fcd2ccb26 100644
--- a/TAO/tao/CSD_ThreadPool.mpc
+++ b/TAO/tao/CSD_ThreadPool.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : csd_framework, install, threads {
+project : csd_framework, core, threads {
   sharedname   = TAO_CSD_ThreadPool
   dynamicflags = TAO_CSD_TP_BUILD_DLL
   includes    += $(TAO_ROOT)/tao
diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl
index 8102da205b1..b5e93d86565 100644
--- a/TAO/tao/CharSeq.pidl
+++ b/TAO/tao/CharSeq.pidl
@@ -8,7 +8,7 @@
  *
  *     tao_idl
  *          -oA AnyTypeCode
- *          -GA -SS -Sci
+ *          -Ge 1 -GA -SS -Sci
  *          -Wb,pre_include=ace/pre.h
  *          -Wb,post_include=ace/post.h
  *          -Wb,export_macro=TAO_Export
diff --git a/TAO/tao/CodecFactory.mpc b/TAO/tao/CodecFactory.mpc
index 95c8b162a26..0732157687a 100644
--- a/TAO/tao/CodecFactory.mpc
+++ b/TAO/tao/CodecFactory.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
+project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
   sharedname    = TAO_CodecFactory
   dynamicflags  = TAO_CODECFACTORY_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -Sal -GX \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sal -GX \
                 -Wb,export_macro=TAO_CodecFactory_Export \
                 -Wb,export_include=tao/CodecFactory/codecfactory_export.h \
                 -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE \
@@ -39,7 +39,7 @@ project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Sorb -Sa -GX \
+    idlflags += -Ge 1 -Sci -SS -Sorb -Sa -GX \
                 -Wb,export_macro=TAO_CodecFactory_Export \
                 -Wb,export_include=tao/CodecFactory/codecfactory_export.h \
                 -Wb,unique_include=tao/CodecFactory/CodecFactory.h \
diff --git a/TAO/tao/CodecFactory/IOP_Codec.pidl b/TAO/tao/CodecFactory/IOP_Codec.pidl
index 619d63e9217..3157ae946ea 100644
--- a/TAO/tao/CodecFactory/IOP_Codec.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec.pidl
@@ -11,7 +11,7 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -SS -Sci
+ *        -o orig -Gp -Gd -Ge 1 -SS -Sci
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Codeset.mpc b/TAO/tao/Codeset.mpc
index 2d4adc0c24c..67405531582 100644
--- a/TAO/tao/Codeset.mpc
+++ b/TAO/tao/Codeset.mpc
@@ -1,6 +1,6 @@
 //$Id$
 
-project : taolib, install, tao_versioning_idl_defaults {
+project : taolib, core, tao_versioning_idl_defaults {
   sharedname   = TAO_Codeset
   dynamicflags = TAO_CODESET_BUILD_DLL
   pch_header   =
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h
index bbd82d40c45..9dd7b50d7a8 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.h
+++ b/TAO/tao/Codeset_Manager_Factory_Base.h
@@ -37,7 +37,7 @@ class TAO_Codeset_Manager;
  *
  * @brief Base class for creating instances of the codeset manager.
  *
- * The base also provides a default implementation which
+ * @description The base also provides a default implementation which
  * instantiates nothing. This default impl is replaced by the actual
  * implementation if libTAO_Codeset is loaded.
  *
diff --git a/TAO/tao/Compression.mpc b/TAO/tao/Compression.mpc
deleted file mode 100644
index f1242c80dd8..00000000000
--- a/TAO/tao/Compression.mpc
+++ /dev/null
@@ -1,43 +0,0 @@
-//$Id$
-project : taolib, install, tao_versioning_idl_defaults {
-  sharedname   = TAO_Compression
-  dynamicflags = TAO_COMPRESSION_BUILD_DLL
-
-  Source_Files {
-    Compression
-  }
-
-  Header_Files {
-    Compression
-  }
-
-  Inline_Files {
-    Compression
-  }
-
-  Template_Files {
-    Compression
-  }
-
-  Resource_Files {
-    Compression
-  }
-
-  PIDL_Files {
-    Compression
-  }
-
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
-                -Wb,export_macro=TAO_Compression_Export \
-                -Wb,export_include=tao/Compression/compression_export.h \
-                -Wb,include_guard=TAO_COMPRESSION_SAFE_INCLUDE \
-                -Wb,safe_include=tao/Compression/Compression.h \
-                -o Compression
-    Compression/Compression.pidl
-  }
-
-  Pkgconfig_Files {
-    Compression/TAO_Compression.pc.in
-  }
-}
diff --git a/TAO/tao/Compression/Base_Compressor.cpp b/TAO/tao/Compression/Base_Compressor.cpp
deleted file mode 100644
index f6b0200bd44..00000000000
--- a/TAO/tao/Compression/Base_Compressor.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "tao/Compression/Base_Compressor.h"
-
-ACE_RCSID (Compression,
-           Base_Compressor,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-BaseCompressor::BaseCompressor (
-  ::Compression::CompressionLevel compression_level,
-  ::Compression::CompressorFactory_ptr compressor_factory) :
-    compression_level_ (compression_level),
-    compressor_factory_ (::Compression::CompressorFactory::_duplicate (compressor_factory))
-{
-}
-
-::Compression::CompressorFactory_ptr
-BaseCompressor::compressor_factory (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ))
-{
-  return ::Compression::CompressorFactory::_duplicate (compressor_factory_.in ());
-}
-
-::Compression::CompressionLevel
-BaseCompressor::compression_level (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ))
-{
-  return compression_level_;
-}
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Base_Compressor.h b/TAO/tao/Compression/Base_Compressor.h
deleted file mode 100644
index a7fb2ad5820..00000000000
--- a/TAO/tao/Compression/Base_Compressor.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Base_Compressor.h
- *
- *  $Id$
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-// ===================================================================
-
-#ifndef TAO_BASE_COMPRESSOR_H
-#define TAO_BASE_COMPRESSOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Compression/compression_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Compression/Compression.h"
-#include "tao/LocalObject.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  /**
-   * This class is a helper to implement real compressors
-   */
-  class TAO_Compression_Export BaseCompressor :
-    public virtual ::Compression::Compressor,
-    public virtual TAO_Local_RefCounted_Object
-  {
-    public:
-    BaseCompressor (::Compression::CompressionLevel compression_level,
-                    ::Compression::CompressorFactory_ptr compressor_factory);
-
-    virtual void compress (
-        const ::CORBA::OctetSeq & source,
-        ::CORBA::OctetSeq & target
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Compression::CompressionException
-      )) = 0;
-
-    virtual void decompress (
-        const ::CORBA::OctetSeq & source,
-        ::CORBA::OctetSeq & target
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Compression::CompressionException
-      )) = 0;
-
-    virtual ::Compression::CompressorFactory_ptr compressor_factory (void)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
-
-    virtual ::Compression::CompressionLevel compression_level (void)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
-
-    protected:
-      ::Compression::CompressionLevel compression_level_;
-      ::Compression::CompressorFactory_var compressor_factory_;
-  };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BASE_COMPRESSOR_H */
-
diff --git a/TAO/tao/Compression/Compression.cpp b/TAO/tao/Compression/Compression.cpp
deleted file mode 100644
index fc25beff65d..00000000000
--- a/TAO/tao/Compression/Compression.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "tao/Compression/Compression.h"
-#include "tao/Compression/Compression_Manager.h"
-#include "tao/debug.h"
-
-ACE_RCSID (Compression,
-           Compression,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-CORBA::Object_ptr
-TAO_Compression_Loader::create_object (
-  CORBA::ORB_ptr,
-  int,
-  ACE_TCHAR *[]
-  ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-  ACE_NEW_RETURN (obj,
-                  TAO::CompressionManager (),
-                  CORBA::Object::_nil ());
-  return obj;
-}
-
-
-int
-TAO_Compression_Loader::Initializer (void)
-{
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Compression_Loader);
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DEFINE (TAO_Compression_Loader,
-                       ACE_TEXT ("Compression_Loader"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Compression_Loader),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_Compression, TAO_Compression_Loader)
diff --git a/TAO/tao/Compression/Compression.h b/TAO/tao/Compression/Compression.h
deleted file mode 100644
index ac579fb9c72..00000000000
--- a/TAO/tao/Compression/Compression.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Compression.h
- *
- *  $Id$
- *
- *  Dynamic loader object for Compression
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_COMPRESSION_GIOP_H
-#define TAO_COMPRESSION_GIOP_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Compression/compression_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Versioned_Namespace.h"
-#include "tao/Object_Loader.h"
-#include "ace/Service_Config.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Compression_Loader
- *
- * @brief Class that loads the Compression library.
- */
-
-class TAO_Compression_Export TAO_Compression_Loader
-  : public TAO_Object_Loader
-{
-public:
-  /// Creates a Compression Manager and returns it.
-  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                           int argc,
-                                           ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
-};
-
-static int
-TAO_Requires_Compression_Initializer = TAO_Compression_Loader::Initializer ();
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE (TAO_Compression_Loader)
-ACE_FACTORY_DECLARE (TAO_Compression, TAO_Compression_Loader)
-
-#define TAO_COMPRESSION_SAFE_INCLUDE
-#include "tao/Compression/CompressionC.h"
-#undef TAO_COMPRESSION_SAFE_INCLUDE
-
-#include /**/ "ace/post.h"
-#endif /* TAO_COMPRESSION_GIOP_H */
diff --git a/TAO/tao/Compression/Compression.pidl b/TAO/tao/Compression/Compression.pidl
deleted file mode 100644
index 76404daf6d9..00000000000
--- a/TAO/tao/Compression/Compression.pidl
+++ /dev/null
@@ -1,151 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file Compression.pidl
- *
- * $Id$
- */
-
-#ifndef _COMPRESSION_PIDL_
-#define _COMPRESSION_PIDL_
-
-#include "tao/OctetSeq.pidl"
-
-module Compression
-{
-    typeprefix Compression "omg.org";
-
-    /**
-     * Exception thrown when an error occurs during a compress or decompress
-     * operation.
-     */
-    exception CompressionException
-    {
-    };
-
-    /**
-     * Exception thrown if a CompressorFactory with the same CompressorId is
-     * already registered with the CompressionManager.
-     */
-    exception FactoryAlreadyRegistered
-    {
-    };
-
-    /**
-     * Exception thrown if a CompressorId is not known.
-     */
-    exception UnknownCompressorId
-    {
-    };
-
-    /**
-     * CompressorId type.
-     */
-    typedef unsigned long CompressorId;
-
-    /**
-     * CompressionLevel type.
-     */
-    typedef unsigned long CompressionLevel;
-
-    local interface CompressorFactory;
-
-    /**
-     * Compressor - abstraction of a compressor and decompressor.
-     */
-    local interface Compressor
-    {
-        /**
-         * Operation that compresses data contained in the source Buffer into
-         * the target Buffer. If an error occurs during the compression, it
-         * throws CompressionException
-         */
-        void compress(in CORBA::OctetSeq source, inout CORBA::OctetSeq target) raises (CompressionException);
-        /**
-         * Operation that decompresses data contained in the source Buffer into
-         * the target Buffer. If an error occurs during the decompression, it
-         * throws CompressionException
-         */
-        void decompress(in CORBA::OctetSeq source, inout CORBA::OctetSeq target) raises(CompressionException);
-        /**
-         * The CompressorFactory associated with this Compressor.
-         */
-        readonly attribute CompressorFactory compressor_factory;
-        /**
-         * The (implementation and algorithm specific) compression level
-         * associated with this Compressor.
-         */
-        readonly attribute CompressionLevel compression_level;
-    };
-
-    local interface CompressorFactory
-    {
-        /**
-         * The CompressorId associated with this CompressorFactory
-         */
-        readonly attribute CompressorId compressor_id;
-        /**
-         * The total number of compressed bytes read and written by Compressors
-         * that were created by this CompressorFactory
-         * (i.e. the "target" side of Compressor::compress and
-         * the "source" side of Compressor::decompress operations).
-         */
-        readonly attribute unsigned long long compressed_bytes;
-        /**
-         * The total number of uncompressed bytes read and written by
-         * Compressors that were created by this CompressorFactory
-         * (i.e. the "source" side of Compressor::compress and
-         * the "target" side of Compressor::decompress operations).
-         */
-        readonly attribute unsigned long long uncompressed_bytes;
-        /**
-         * The average compression achieved by Compressors that were created by
-         * this CompressorFactory, usually a value between 0 and >=1.
-         * (i.e. compressed_bytes divided by uncompressed_bytes).
-         */
-        readonly attribute double average_compression;
-        /**
-         * Create a Compressor instance with the given compression level.
-         */
-        Compressor get_compressor(in CompressionLevel compression_level);
-        /**
-         * Add a sample of compressed and uncompressed bytes.
-         */
-        void add_sample(in unsigned long long compressed_bytes, in unsigned long long uncompressed_bytes);
-    };
-
-    typedef sequence<CompressorFactory> CompressorFactorySeq;
-
-    /**
-     * Per-ORB interface to register and unregister CompressorFactories.
-     * Initial reference: "CompressionManager"
-     */
-    local interface CompressionManager
-    {
-        /**
-         * Register a new CompressorFactory
-         */
-        void register_factory(in CompressorFactory compressor_factory) raises(FactoryAlreadyRegistered);
-        /**
-         * Unregister a CompressorFactory with the given CompressorId from the
-         * CompressionManager
-         */
-        void unregister_factory(in CompressorId compressor_id) raises (UnknownCompressorId);
-        /**
-         * Retrieve a CompressorFactory with the given CompressorId from the
-         * CompressionManager
-         */
-        CompressorFactory get_factory(in CompressorId compressor_id) raises(UnknownCompressorId);
-        /**
-         * Create a Compressor with the given compression_level from the
-         * CompressorFactory with the given CompressorId
-         */
-        Compressor get_compressor(in CompressorId compressor_id, in CompressionLevel compression_level) raises(UnknownCompressorId);
-        /**
-         * List all registered CompressorFactories
-         */
-        CompressorFactorySeq get_factories();
-    };
-};
-
-#endif
diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp
deleted file mode 100644
index e4052b730d0..00000000000
--- a/TAO/tao/Compression/Compression_Manager.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-#include "tao/Compression/Compression_Manager.h"
-
-ACE_RCSID (Compression,
-           Compression_Manager,
-           "$Id$")
-
-#include "tao/ORB_Constants.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-
-void CompressionManager::register_factory (
-  ::Compression::CompressorFactory_ptr compressor_factory)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException,
-            ::Compression::FactoryAlreadyRegistered
-          ))
-{
-  if (!::CORBA::is_nil (compressor_factory))
-    {
-      ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
-
-      CORBA::ULong const length = this->factories_.length ();
-
-      for (CORBA::ULong i = 0; i < length; ++i)
-        {
-          ::Compression::CompressorId const current =
-            this->factories_[i]->compressor_id ();
-
-          if (compressor_factory->compressor_id () == current)
-            {
-              ACE_THROW (::Compression::FactoryAlreadyRegistered ());
-            }
-        }
-      factories_.length (length + 1);
-      factories_[length] = ::Compression::CompressorFactory::_duplicate (compressor_factory);
-    }
-  else
-    {
-      // @todo Standardize this minor code
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 44,
-                                   CORBA::COMPLETED_YES));
-    }
-}
-
-void
-CompressionManager::unregister_factory (
-  ::Compression::CompressorId compressor_id)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException,
-            ::Compression::UnknownCompressorId
-          ))
-{
-  ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
-
-  CORBA::ULong const length = this->factories_.length ();
-
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      ::Compression::CompressorId const current =
-        this->factories_[i]->compressor_id ();
-
-      if (current != compressor_id)
-        {
-          continue;
-        }
-
-      this->factories_[i] = ::Compression::CompressorFactory::_nil ();
-      // make sequence smaller
-
-      return;
-    }
-
-  // todo exception
-  ACE_THROW (::Compression::UnknownCompressorId ());
-}
-
-::Compression::CompressorFactory_ptr
-CompressionManager::get_factory (
-  ::Compression::CompressorId compressor_id)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException,
-            ::Compression::UnknownCompressorId
-          ))
-{
-  ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
-
-  CORBA::ULong const length = this->factories_.length ();
-
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      ::Compression::CompressorId const current =
-        this->factories_[i]->compressor_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (current != compressor_id)
-        {
-          continue;
-        }
-
-      return ::Compression::CompressorFactory::_duplicate (this->factories_[i]);
-    }
-
-  ACE_THROW (::Compression::UnknownCompressorId ());
-
-  ACE_NOTREACHED (return ::Compression::CompressorFactory::_nil ());
-}
-
-::Compression::Compressor_ptr
-CompressionManager::get_compressor (
-            ::Compression::CompressorId compressor_id,
-            ::Compression::CompressionLevel compression_level
-          )
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException,
-            ::Compression::UnknownCompressorId
-          ))
-{
-  ::Compression::CompressorFactory_var factory = this->get_factory (compressor_id);
-
-  return factory->get_compressor (compression_level);
-}
-
-::Compression::CompressorFactorySeq *
-CompressionManager::get_factories (
-          )
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
-{
-  // todo
-  return 0;
-}
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Compression_Manager.h b/TAO/tao/Compression/Compression_Manager.h
deleted file mode 100644
index 0d56910d5e8..00000000000
--- a/TAO/tao/Compression/Compression_Manager.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Compression_Manager.h
- *
- *  $Id$
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-// ===================================================================
-
-#ifndef TAO_COMPRESSION_MANAGER_H
-#define TAO_COMPRESSION_MANAGER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Compression/compression_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Compression/Compression.h"
-#include "tao/LocalObject.h"
-#include "ace/Synch_Traits.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  class TAO_Compression_Export CompressionManager :
-    public virtual ::Compression::CompressionManager,
-    public virtual TAO_Local_RefCounted_Object
-  {
-    virtual void register_factory (
-        ::Compression::CompressorFactory_ptr compressor_factory
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Compression::FactoryAlreadyRegistered
-      ));
-
-    virtual void unregister_factory (
-        ::Compression::CompressorId compressor_id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Compression::UnknownCompressorId
-      ));
-
-    virtual ::Compression::CompressorFactory_ptr get_factory (
-        ::Compression::CompressorId compressor_id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Compression::UnknownCompressorId
-      ));
-
-    virtual ::Compression::Compressor_ptr get_compressor (
-        ::Compression::CompressorId compressor_id,
-        ::Compression::CompressionLevel compression_level
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Compression::UnknownCompressorId
-      ));
-
-    virtual ::Compression::CompressorFactorySeq * get_factories (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
-
-    private:
-      ACE_SYNCH_MUTEX mutex_;
-      ::Compression::CompressorFactorySeq factories_;
-  };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_COMPRESSION_MANAGER_H */
diff --git a/TAO/tao/Compression/Compressor_Factory.cpp b/TAO/tao/Compression/Compressor_Factory.cpp
deleted file mode 100644
index 89db794c56f..00000000000
--- a/TAO/tao/Compression/Compressor_Factory.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "tao/Compression/Compressor_Factory.h"
-
-ACE_RCSID (Compression,
-           Compressor_Factory,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-CompressorFactory::CompressorFactory (::Compression::CompressorId compressor_id) :
-  compressor_id_ (compressor_id),
-  compressed_bytes_ (0),
-  uncompressed_bytes_ (0)
-{
-}
-
-::Compression::CompressorId
-CompressorFactory::compressor_id (void)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
-{
-  return compressor_id_;
-}
-
-::CORBA::ULongLong
-CompressorFactory::compressed_bytes (void)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
-{
-  ::CORBA::ULongLong return_value;
-  {
-    ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
-    return_value = compressed_bytes_;
-  }
-  return return_value;
-}
-
-::CORBA::ULongLong
-CompressorFactory::uncompressed_bytes (
-          )
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
-{
-  ::CORBA::ULongLong return_value;
-  {
-    ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
-    return_value = uncompressed_bytes_;
-  }
-  return return_value;
-}
-
-::CORBA::Double
-CompressorFactory::average_compression (void)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
-{
-  ::CORBA::Double return_value = 0.0;
-  {
-    ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
-    if (this->uncompressed_bytes_ > 0)
-      {
-        return_value = static_cast < ::CORBA::Double>((this->uncompressed_bytes_ - this->compressed_bytes_) / this->uncompressed_bytes_);
-      }
-  }
-  return return_value;
-}
-
-void
-CompressorFactory::add_sample (
-  ::CORBA::ULongLong compressed_bytes,
-  ::CORBA::ULongLong uncompressed_bytes)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
-{
-  ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
-  this->compressed_bytes_ += compressed_bytes;
-  this->uncompressed_bytes_ += uncompressed_bytes;
-}
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h
deleted file mode 100644
index 67ef3c1c596..00000000000
--- a/TAO/tao/Compression/Compressor_Factory.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Compressor_Factory.h
- *
- *  $Id$
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-// ===================================================================
-
-#ifndef TAO_COMPRESSOR_FACTORY_H
-#define TAO_COMPRESSOR_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Compression/compression_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Compression/Compression.h"
-#include "tao/LocalObject.h"
-#include "ace/Synch_Traits.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  class TAO_Compression_Export CompressorFactory :
-    public virtual ::Compression::CompressorFactory,
-    public virtual TAO_Local_RefCounted_Object
-  {
-    public:
-      CompressorFactory (::Compression::CompressorId compressor_id);
-
-      virtual ::Compression::CompressorId compressor_id (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
-
-      virtual ::CORBA::ULongLong compressed_bytes (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
-
-      virtual ::CORBA::ULongLong uncompressed_bytes (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
-
-      virtual ::CORBA::Double average_compression (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
-
-      virtual ::Compression::Compressor_ptr get_compressor (
-          ::Compression::CompressionLevel compression_level
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
-
-      virtual void add_sample (
-          ::CORBA::ULongLong compressed_bytes,
-          ::CORBA::ULongLong uncompressed_bytes
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
-
-    private:
-      ACE_SYNCH_MUTEX mutex_;
-      ::Compression::CompressorId compressor_id_;
-      ::CORBA::ULongLong compressed_bytes_;
-      ::CORBA::ULongLong uncompressed_bytes_;
-    };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_COMPRESSOR_FACTORY_H */
-
diff --git a/TAO/tao/Compression/TAO_Compression.pc.in b/TAO/tao/Compression/TAO_Compression.pc.in
deleted file mode 100644
index 84a7d1ef082..00000000000
--- a/TAO/tao/Compression/TAO_Compression.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_Compression
-Description: TAO Compression Library
-Requires: TAO_CodecFactory, TAO_AnyTypeCode, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_Compression
-Cflags: -I${includedir}
diff --git a/TAO/tao/Compression/TAO_Compression.rc b/TAO/tao/Compression/TAO_Compression.rc
deleted file mode 100644
index bcf4630f6a3..00000000000
--- a/TAO/tao/Compression/TAO_Compression.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "Compression\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_CompressionDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_Compression.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/Compression/compression_export.h b/TAO/tao/Compression/compression_export.h
deleted file mode 100644
index fe32df0cecb..00000000000
--- a/TAO/tao/Compression/compression_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_COMPRESSION_EXPORT_H
-#define TAO_COMPRESSION_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_COMPRESSION_HAS_DLL)
-#    define TAO_COMPRESSION_HAS_DLL 0
-#  endif /* ! TAO_COMPRESSION_HAS_DLL */
-#else
-#  if !defined (TAO_COMPRESSION_HAS_DLL)
-#    define TAO_COMPRESSION_HAS_DLL 1
-#  endif /* ! TAO_COMPRESSION_HAS_DLL */
-#endif
-
-#if defined (TAO_COMPRESSION_HAS_DLL) && (TAO_COMPRESSION_HAS_DLL == 1)
-#  if defined (TAO_COMPRESSION_BUILD_DLL)
-#    define TAO_Compression_Export ACE_Proper_Export_Flag
-#    define TAO_COMPRESSION_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_COMPRESSION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_COMPRESSION_BUILD_DLL */
-#    define TAO_Compression_Export ACE_Proper_Import_Flag
-#    define TAO_COMPRESSION_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_COMPRESSION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_COMPRESSION_BUILD_DLL */
-#else /* TAO_COMPRESSION_HAS_DLL == 1 */
-#  define TAO_Compression_Export
-#  define TAO_COMPRESSION_SINGLETON_DECLARATION(T)
-#  define TAO_COMPRESSION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_COMPRESSION_HAS_DLL == 1 */
-
-#endif /* TAO_COMPRESSION_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Compression/zlib/TAO_ZlibCompressor.pc.in b/TAO/tao/Compression/zlib/TAO_ZlibCompressor.pc.in
deleted file mode 100644
index 4a4f44124a0..00000000000
--- a/TAO/tao/Compression/zlib/TAO_ZlibCompressor.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_ZLIB_COMPRESSOR
-Description: TAO Zlib Compression Library
-Requires: TAO_Compression
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_ZLIB_Compressor
-Cflags: -I${includedir}
diff --git a/TAO/tao/Compression/zlib/TAO_ZlibCompressor.rc b/TAO/tao/Compression/zlib/TAO_ZlibCompressor.rc
deleted file mode 100644
index 7b477f04351..00000000000
--- a/TAO/tao/Compression/zlib/TAO_ZlibCompressor.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "ZLIBCOMPRESSOR\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_ZLIBCOMPRESSORDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_ZLIBCOMPRESSOR.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.cpp b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
deleted file mode 100644
index 4af3ab9ed72..00000000000
--- a/TAO/tao/Compression/zlib/ZlibCompressor.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "ZlibCompressor.h"
-
-ACE_RCSID (ZLIB,
-           ZlibCompressor,
-           "$Id$")
-
-#include "zlib.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-ZlibCompressor::ZlibCompressor (
-  ::Compression::CompressionLevel compression_level,
-  ::Compression::CompressorFactory_ptr compressor_factory) :
-    BaseCompressor (compression_level, compressor_factory)
-{
-}
-
-void
-ZlibCompressor::compress (
-    const ::CORBA::OctetSeq & source,
-    ::CORBA::OctetSeq & target
-  )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Compression::CompressionException
-  ))
-{
-  ::CORBA::ULong max_length = static_cast <CORBA::ULong> (source.length () * 1.1) + 12;
-  target.length (max_length);
-
-  int const retval = ::compress2 (reinterpret_cast <Bytef*>(target.get_buffer ()),
-                                  reinterpret_cast <uLongf *>(&max_length),
-                                  reinterpret_cast <const Bytef*>(source.get_buffer ()),
-                                  source.length (),
-                                  this->compression_level ());
-
-  if (retval != Z_OK)
-    {
-      ACE_THROW (::Compression::CompressionException ());
-    }
-  else
-    {
-      target.length (max_length);
-    }
-}
-
-void
-ZlibCompressor::decompress (
-  const ::CORBA::OctetSeq & source,
-  ::CORBA::OctetSeq & target)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException,
-          ::Compression::CompressionException
-        ))
-{
-  CORBA::ULong max_length = target.length ();
-  int const retval = uncompress (reinterpret_cast <Bytef*>(target.get_buffer ()),
-                                 reinterpret_cast <uLongf *>(&max_length),
-                                 reinterpret_cast <const Bytef*>(source.get_buffer ()),
-                                 source.length ());
-
-  if (retval != Z_OK)
-    {
-      ACE_THROW (::Compression::CompressionException ());
-    }
-  else
-    {
-      target.length (max_length);
-    }
-}
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.h b/TAO/tao/Compression/zlib/ZlibCompressor.h
deleted file mode 100644
index 3ed01b483e6..00000000000
--- a/TAO/tao/Compression/zlib/ZlibCompressor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   ZlibCompressor.h
- *
- *  $Id$
- *
- *  See http://www.zlib.net/manual.html for the zlib interface itself
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-// ===================================================================
-
-#ifndef TAO_ZLIBCOMPRESSOR_H
-#define TAO_ZLIBCOMPRESSOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Compression/zlib/ZlibCompressor_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Compression/Compression.h"
-#include "tao/Compression/Base_Compressor.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  class TAO_ZLIBCOMPRESSOR_Export ZlibCompressor : public BaseCompressor
-  {
-    public:
-      ZlibCompressor (::Compression::CompressionLevel compression_level,
-                      ::Compression::CompressorFactory_ptr compressor_factory);
-
-      virtual void compress (
-          const ::CORBA::OctetSeq & source,
-          ::CORBA::OctetSeq & target
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException,
-          ::Compression::CompressionException
-        ));
-
-      virtual void decompress (
-          const ::CORBA::OctetSeq & source,
-          ::CORBA::OctetSeq & target
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException,
-          ::Compression::CompressionException
-        ));
-  };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ZLIBCOMPRESSOR_H */
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
deleted file mode 100644
index 40a8119a1d6..00000000000
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "tao/Compression/zlib/ZlibCompressor_Factory.h"
-#include "tao/Compression/zlib/ZlibCompressor.h"
-
-ACE_RCSID (ZLIB,
-           ZlibCompressor_Factory,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-
-Zlib_CompressorFactory::Zlib_CompressorFactory (void) :
-  ::TAO::CompressorFactory (4),
-  compressor_ (::Compression::Compressor::_nil ())
-{
-}
-
-::Compression::Compressor_ptr
-Zlib_CompressorFactory::get_compressor (
-    ::Compression::CompressionLevel compression_level
-  )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
-{
-  // @todo, make a array based on compression level
-  if (CORBA::is_nil (compressor_.in ()))
-    {
-      compressor_ = new ZlibCompressor (compression_level, this);
-    }
-
-  return ::Compression::Compressor::_duplicate (compressor_.in ());
-}
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
deleted file mode 100644
index e20251af378..00000000000
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   ZlibCompressor_Factory.h
- *
- *  $Id$
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-// ===================================================================
-
-#ifndef TAO_ZLIBCOMPRESSOR_FACTORY_H
-#define TAO_ZLIBCOMPRESSOR_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Compression/zlib/ZlibCompressor_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Compression/Compression.h"
-#include "tao/Compression/Compressor_Factory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-    class TAO_ZLIBCOMPRESSOR_Export Zlib_CompressorFactory : public ::TAO::CompressorFactory
-    {
-      public:
-        Zlib_CompressorFactory (void);
-
-        virtual ::Compression::Compressor_ptr get_compressor (
-            ::Compression::CompressionLevel compression_level
-          )
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ));
-       private:
-         ::Compression::Compressor_var compressor_;
-    };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ZLIBCOMPRESSOR_FACTORY_H */
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_export.h b/TAO/tao/Compression/zlib/ZlibCompressor_export.h
deleted file mode 100644
index 9c3e8a8cd50..00000000000
--- a/TAO/tao/Compression/zlib/ZlibCompressor_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_ZLIBCOMPRESSOR_EXPORT_H
-#define TAO_ZLIBCOMPRESSOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_ZLIBCOMPRESSOR_HAS_DLL)
-#    define TAO_ZLIBCOMPRESSOR_HAS_DLL 0
-#  endif /* ! TAO_ZLIBCOMPRESSOR_HAS_DLL */
-#else
-#  if !defined (TAO_ZLIBCOMPRESSOR_HAS_DLL)
-#    define TAO_ZLIBCOMPRESSOR_HAS_DLL 1
-#  endif /* ! TAO_ZLIBCOMPRESSOR_HAS_DLL */
-#endif
-
-#if defined (TAO_ZLIBCOMPRESSOR_HAS_DLL) && (TAO_ZLIBCOMPRESSOR_HAS_DLL == 1)
-#  if defined (TAO_ZLIBCOMPRESSOR_BUILD_DLL)
-#    define TAO_ZLIBCOMPRESSOR_Export ACE_Proper_Export_Flag
-#    define TAO_ZLIBCOMPRESSOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_ZLIBCOMPRESSOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_ZLIBCOMPRESSOR_BUILD_DLL */
-#    define TAO_ZLIBCOMPRESSOR_Export ACE_Proper_Import_Flag
-#    define TAO_ZLIBCOMPRESSOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_ZLIBCOMPRESSOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_ZLIBCOMPRESSOR_BUILD_DLL */
-#else /* TAO_ZLIBCOMPRESSOR_HAS_DLL == 1 */
-#  define TAO_ZLIBCOMPRESSOR_Export
-#  define TAO_ZLIBCOMPRESSOR_SINGLETON_DECLARATION(T)
-#  define TAO_ZLIBCOMPRESSOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_ZLIBCOMPRESSOR_HAS_DLL == 1 */
-
-#endif /* TAO_ZLIBCOMPRESSOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 70b23c82fa9..850d93da175 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -24,9 +24,8 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core),
-    transport_ (0),
-    connection_pending_ (false)
+  : orb_core_ (orb_core)
+  , transport_ (0)
 {
   // @@todo: We need to have a distinct option/ method in the resource
   // factory for this and TAO_Transport.
@@ -47,18 +46,6 @@ TAO_Connection_Handler::~TAO_Connection_Handler (void)
   //@@ CONNECTION_HANDLER_DESTRUCTOR_ADD_HOOK
 }
 
-int
-TAO_Connection_Handler::shared_open (void)
-{
-  // This reference counting is related to asynch connections.  It
-  // should probably be managed by the ACE_Strategy_Connector, since
-  // that's really the reference being managed here.  also, whether
-  // open ultimately succeeds or fails, the connection attempted is
-  // ending, so the reference must be removed in any case.
-  this->cancel_pending_connection();
-
-  return 0;
-}
 
 int
 TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock,
@@ -310,7 +297,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
                    handle));
     }
 
-  this->transport ()->pre_close ();
+  this->transport ()->purge_entry ();
 
   // @@ This seems silly, but if we have no reason to be in the
   // reactor, then we dont remove ourselves.
@@ -320,7 +307,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
 
       if (this->orb_core_->has_shutdown () == 0)
         {
-          // If the ORB is nil, get the reactor from orb_core which gets it
+          // If the ORB is nill, get the reactor from orb_core which gets it
           // from LF.
           if (eh_reactor == 0)
             eh_reactor = this->transport()->orb_core()->reactor ();
@@ -428,14 +415,7 @@ TAO_Connection_Handler::close_handler (void)
 {
   this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
                        this->orb_core_->leader_follower ());
-  this->transport ()->purge_entry();
   this->transport ()->remove_reference ();
-
-  // @@ I think that if the connection_pending state is true
-  // when close_handler is calld, we should probably release
-  // another reference so that the connector doesn't have to
-  // worry about it.
-
   return 0;
 }
 
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 6cc2a558dac..0299a98ca2e 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -23,7 +23,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Basic_Types.h"
-#include "ace/Event_Handler.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_SOCK;
@@ -113,19 +112,6 @@ public:
   /// this handler
   virtual int close_handler (void);
 
-  /// When waiting for an asynchronous connection to complete an
-  /// additional reference must be maintained, related to bugzilla
-  /// #2417. However once the connection is successfully established,
-  /// this reference must be removed. Using connection_pending allows
-  /// the connection handler to know that it is opening as a result of
-  /// a delayed asynch connection rather than an immediate synch
-  /// connection, which has no additional reference needs.
-  void connection_pending (void);
-
-  /// A pending connection may be canceled due to an error detected
-  /// while the initiating thread is still in the Connector.
-  void cancel_pending_connection (void);
-
   /// Set the Diff-Serv codepoint on outgoing packets.  Only has
   /// effect for remote protocols (e.g., IIOP); no effect for local
   /// protocols (UIOP).  Default implementation is for local
@@ -147,11 +133,6 @@ protected:
   /// Return our TAO_ORB_Core pointer
   TAO_ORB_Core *orb_core (void);
 
-  /// A common function called at the start of any protocol-specific
-  /// open. Returns -1 on a failure (although no failure mode is
-  /// currently defined).
-  int shared_open (void);
-
   /// Set options on the socket
   int set_socket_option (ACE_SOCK &sock,
                          int snd_size,
@@ -198,6 +179,7 @@ protected:
   virtual void pos_io_hook (int & return_value);
   //@}
 
+
 private:
   /// Pointer to the TAO_ORB_Core
   TAO_ORB_Core * const orb_core_;
@@ -209,9 +191,6 @@ private:
   /// count / pending upcalls lock because they interleave.
   ACE_Lock * lock_;
 
-  /// Stores the connection pending state
-  bool connection_pending_;
-
   /*
    * Hook to add instance members from derived class
    * onto base Connection_Handler class. Any further
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index 25083177be2..48e1b0b1b41 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -2,8 +2,6 @@
 //
 //$Id$
 
-#include "tao/Transport.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_ORB_Core *
@@ -43,27 +41,6 @@ TAO_Connection_Handler::is_connecting (void) const
   return this->state_ == TAO_LF_Event::LFS_CONNECTION_WAIT;
 }
 
-
-ACE_INLINE void
-TAO_Connection_Handler::connection_pending (void)
-{
-  if (!this->connection_pending_)
-    {
-      this->connection_pending_ = true;
-      this->transport()->add_reference();
-    }
-}
-
-ACE_INLINE void
-TAO_Connection_Handler::cancel_pending_connection (void)
-{
-  if (this->connection_pending_)
-    {
-      this->connection_pending_ = false;
-      this->transport()->remove_reference();
-    }
-}
-
 //@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
index 895a144048b..643ffdc6914 100644
--- a/TAO/tao/Current.pidl
+++ b/TAO/tao/Current.pidl
@@ -9,7 +9,7 @@
  * following command:
  *
  *    tao_idl.exe
- *       -o orig -Gp -Gd -GA -SS -Sci
+ *       -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *         -Wb,export_macro=TAO_Export
  *         -Wb,export_include="tao/TAO_Export.h"
  *         -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Domain.mpc b/TAO/tao/Domain.mpc
index 3fa2ec09599..d3f79463993 100644
--- a/TAO/tao/Domain.mpc
+++ b/TAO/tao/Domain.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, ifr_client, portableserver {
+project : taolib, core, ifr_client, portableserver {
   sharedname   = TAO_Domain
   dynamicflags = TAO_DOMAIN_BUILD_DLL
 
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
index 22a5ef708e2..b221159edee 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -16,7 +16,7 @@
  *   command used for this is:
  *
  *     tao_idl
- *        -o orig -Gp -Gd -GA
+ *        -o orig -Gp -Gd -Ge 1 -GA
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include=TAO_Export.h
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl
index cc3107b663b..d9d603f0ca1 100644
--- a/TAO/tao/DoubleSeq.pidl
+++ b/TAO/tao/DoubleSeq.pidl
@@ -8,7 +8,7 @@
  *
  *     tao_idl
  *          -oA AnyTypeCode
- *          -GA -SS -Sci
+ *          -Ge 1 -GA -SS -Sci
  *          -Wb,pre_include=ace/pre.h
  *          -Wb,post_include=ace/post.h
  *          -Wb,export_macro=TAO_Export
diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc
index daece37b93e..1b1c35a2149 100644
--- a/TAO/tao/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny.mpc
@@ -1,6 +1,6 @@
 //$Id$
 
-project : install, valuetype, tao_versioning_idl_defaults {
+project : valuetype, tao_versioning_idl_defaults {
   sharedname    = TAO_DynamicAny
   dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
 
@@ -29,7 +29,7 @@ project : install, valuetype, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb \
                 -Wb,export_macro=TAO_DynamicAny_Export \
                 -Wb,export_include=tao/DynamicAny/dynamicany_export.h \
                 -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE \
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index 4910fc1a1a2..33e2e77d355 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -19,7 +19,6 @@
 #include "tao/DynamicAny/DynEnum_i.h"
 #include "tao/DynamicAny/DynArray_i.h"
 #include "tao/DynamicAny/DynUnion_i.h"
-#include "tao/DynamicAny/DynAnyUtils_T.h"
 
 #include "ace/Auto_Ptr.h"
 
@@ -34,6 +33,50 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 {
 }
 
+// Utility function called by all the DynAny classes
+// to extract the TCKind of possibly aliased types.
+CORBA::TCKind
+TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc
+                            ACE_ENV_ARG_DECL)
+{
+  CORBA::TCKind tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::tk_null);
+
+  while (tck == CORBA::tk_alias)
+    {
+      CORBA::TypeCode_var temp =
+        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::tk_null);
+
+      tck = TAO_DynAnyFactory::unalias (temp.in ()
+                                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::tk_null);
+    }
+
+  return tck;
+}
+
+// Same as above, but returns the type code.
+CORBA::TypeCode_ptr
+TAO_DynAnyFactory::strip_alias (CORBA::TypeCode_ptr tc
+                                ACE_ENV_ARG_DECL)
+{
+  CORBA::TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
+  CORBA::TCKind tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+
+  while (tck == CORBA::tk_alias)
+    {
+      retval = retval->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+
+      tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+    }
+
+  return retval._retn ();
+}
+
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::create_dyn_any (
       const CORBA::Any & value
@@ -44,10 +87,7 @@ TAO_DynAnyFactory::create_dyn_any (
       DynamicAny::DynAnyFactory::InconsistentTypeCode
     ))
 {
-  return
-    TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-      value._tao_get_typecode (),
-      value);
+  return TAO_DynAnyFactory::make_dyn_any (value ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAny_ptr
@@ -60,12 +100,7 @@ TAO_DynAnyFactory::create_dyn_any_from_type_code (
       DynamicAny::DynAnyFactory::InconsistentTypeCode
     ))
 {
-  // Second arg is typed in the template parameter, repeating it
-  // this way allows cleaner template code.
-  return
-    TAO::MakeDynAnyUtils<CORBA::TypeCode_ptr>::make_dyn_any_t (
-      type,
-      type);
+  return TAO_DynAnyFactory::make_dyn_any (type ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAny_ptr
@@ -79,8 +114,8 @@ TAO_DynAnyFactory::create_dyn_any_without_truncation (
       DynamicAny::MustTruncate
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    DynamicAny::DynAny::_nil ());
+  // TODO
+  return DynamicAny::DynAny::_nil ();
 }
 
 DynamicAny::DynAnySeq *
@@ -95,7 +130,8 @@ TAO_DynAnyFactory::create_multiple_dyn_anys (
       DynamicAny::MustTruncate
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  // TODO
+  return 0;
 }
 
 DynamicAny::AnySeq *
@@ -107,51 +143,287 @@ TAO_DynAnyFactory::create_multiple_anys (
       CORBA::SystemException
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  // TODO
+  return 0;
 }
       
-// Utility function called by all the DynAny classes
-// to extract the TCKind of possibly aliased types.
-CORBA::TCKind
-TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc
-                            ACE_ENV_ARG_DECL)
+//*******************************************************************
+    
+DynamicAny::DynAny_ptr
+TAO_DynAnyFactory::make_dyn_any (const CORBA::Any &any
+                                 ACE_ENV_ARG_DECL)
 {
-  CORBA::TCKind tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+  CORBA::TypeCode_var tc = any.type ();
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
-  while (tck == CORBA::tk_alias)
+  switch (kind)
     {
-      CORBA::TypeCode_var temp =
-        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::tk_null);
+      case CORBA::tk_null:
+      case CORBA::tk_void:
+      case CORBA::tk_short:
+      case CORBA::tk_long:
+      case CORBA::tk_ushort:
+      case CORBA::tk_ulong:
+      case CORBA::tk_float:
+      case CORBA::tk_double:
+      case CORBA::tk_longlong:
+      case CORBA::tk_ulonglong:
+      case CORBA::tk_boolean:
+      case CORBA::tk_char:
+      case CORBA::tk_wchar:
+      case CORBA::tk_octet:
+      case CORBA::tk_any:
+      case CORBA::tk_TypeCode:
+      case CORBA::tk_objref:
+      case CORBA::tk_string:
+      case CORBA::tk_wstring:
+        {
+          TAO_DynAny_i *p = 0;
 
-      tck = TAO_DynAnyFactory::unalias (temp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::tk_null);
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynAny_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p);
+          p->init (any ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_struct:
+      case CORBA::tk_except:
+        {
+          TAO_DynStruct_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynStruct_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p);
+          p->init (any ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_sequence:
+        {
+          TAO_DynSequence_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynSequence_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p);
+          p->init (any ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_union:
+        {
+          TAO_DynUnion_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynUnion_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p);
+          p->init (any ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_enum:
+        {
+          TAO_DynEnum_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynEnum_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p);
+          p->init (any ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_array:
+        {
+          TAO_DynArray_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynArray_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p);
+          p->init (any ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+
+    case CORBA::tk_fixed:
+    case CORBA::tk_value:
+    case CORBA::tk_value_box:
+    case CORBA::tk_abstract_interface:
+    case CORBA::tk_component:
+    case CORBA::tk_home:
+      ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
+                        DynamicAny::DynAny::_nil ());
+    case CORBA::tk_native:
+      ACE_THROW_RETURN (DynamicAny::DynAnyFactory::InconsistentTypeCode (),
+                        DynamicAny::DynAny::_nil ());
+    default:
+      break;
     }
 
-  return tck;
+  return DynamicAny::DynAny::_nil ();
 }
 
-// Same as above, but returns the type code.
-CORBA::TypeCode_ptr
-TAO_DynAnyFactory::strip_alias (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL)
+DynamicAny::DynAny_ptr
+TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
+                                 ACE_ENV_ARG_DECL)
 {
-  CORBA::TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
-  CORBA::TCKind tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::TCKind kind =
+    TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
-  while (tck == CORBA::tk_alias)
+  switch (kind)
     {
-      retval = retval->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      case CORBA::tk_null:
+      case CORBA::tk_void:
+      case CORBA::tk_short:
+      case CORBA::tk_long:
+      case CORBA::tk_ushort:
+      case CORBA::tk_ulong:
+      case CORBA::tk_float:
+      case CORBA::tk_double:
+      case CORBA::tk_longlong:
+      case CORBA::tk_ulonglong:
+      case CORBA::tk_boolean:
+      case CORBA::tk_char:
+      case CORBA::tk_wchar:
+      case CORBA::tk_octet:
+      case CORBA::tk_any:
+      case CORBA::tk_TypeCode:
+      case CORBA::tk_objref:
+      case CORBA::tk_string:
+      case CORBA::tk_wstring:
+        {
+          TAO_DynAny_i *p = 0;
 
-      tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynAny_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_struct:
+      case CORBA::tk_except:
+        {
+          TAO_DynStruct_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynStruct_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_sequence:
+        {
+          TAO_DynSequence_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynSequence_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_union:
+        {
+          TAO_DynUnion_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynUnion_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_enum:
+        {
+          TAO_DynEnum_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynEnum_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+      case CORBA::tk_array:
+        {
+          TAO_DynArray_i *p = 0;
+
+          ACE_NEW_THROW_EX (p,
+                            TAO_DynArray_i,
+                            CORBA::NO_MEMORY ());
+          ACE_CHECK_RETURN (0);
+
+          ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return dp.release ();
+        }
+
+    case CORBA::tk_fixed:
+    case CORBA::tk_value:
+    case CORBA::tk_value_box:
+    case CORBA::tk_abstract_interface:
+    case CORBA::tk_component:
+    case CORBA::tk_home:
+      ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
+                        DynamicAny::DynAny::_nil ());
+    case CORBA::tk_native:
+      ACE_THROW_RETURN (DynamicAny::DynAnyFactory::InconsistentTypeCode (),
+                        DynamicAny::DynAny::_nil ());
+    default:
+      break;
     }
 
-  return retval._retn ();
+  return DynamicAny::DynAny::_nil ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 69fc9a1b05d..1a02019b529 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -46,6 +46,25 @@ public:
   /// Constructor.
   TAO_DynAnyFactory (void);
 
+  /// Obtain the kind of object, after all aliasing has been removed.
+  static CORBA::TCKind unalias (CORBA::TypeCode_ptr tc
+                                ACE_ENV_ARG_DECL);
+
+  /// Same as above, but returns type code instead of TCKind. Caller
+  /// must release the return value.
+  static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc
+                                          ACE_ENV_ARG_DECL);
+
+  /// Create the correct type of DynAny object for <any>.
+  static DynamicAny::DynAny_ptr
+     make_dyn_any (const CORBA::Any &any
+                   ACE_ENV_ARG_DECL);
+
+  /// Create the correct type of DynAny object for <tc>
+  static DynamicAny::DynAny_ptr
+     make_dyn_any (CORBA::TypeCode_ptr tc
+                   ACE_ENV_ARG_DECL);
+
   // = The DynamicAnyFactory methods.
   virtual DynamicAny::DynAny_ptr create_dyn_any (
       const CORBA::Any & value
@@ -93,18 +112,7 @@ public:
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-      
-  /// TAO-specific methods.
     
-  /// Obtain the kind of object, after all aliasing has been removed.
-  static CORBA::TCKind unalias (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL);
-
-  /// Same as above, but returns type code instead of TCKind. Caller
-  /// must release the return value.
-  static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc
-                                          ACE_ENV_ARG_DECL);
-
 private:
   // Not allowed.
   TAO_DynAnyFactory (const TAO_DynAnyFactory &src);
diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.h b/TAO/tao/DynamicAny/DynAnyUtils_T.h
deleted file mode 100644
index 08742ad5d00..00000000000
--- a/TAO/tao/DynamicAny/DynAnyUtils_T.h
+++ /dev/null
@@ -1,238 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DynAnyUtils_T.h
- *
- *  $Id$
- *
- *  Collection of templatized common code used in Dynamic Any
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#include "tao/DynamicAny/DynAny_i.h"
-#include "tao/DynamicAny/DynArray_i.h"
-#include "tao/DynamicAny/DynEnum_i.h"
-#include "tao/DynamicAny/DynSequence_i.h"
-#include "tao/DynamicAny/DynStruct_i.h"
-#include "tao/DynamicAny/DynUnion_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
-
-#include "tao/AnyTypeCode/BasicTypeTraits.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  // Encapsulates common code for inserting and extracting basic
-  // types, parameterized on the basic type.
-  template<typename T>
-  struct DynAnyBasicTypeUtils
-  {
-    static void
-    insert_value (const T &val,
-                  TAO_DynCommon *the_dynany)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          DynamicAny::DynAny::TypeMismatch,
-          DynamicAny::DynAny::InvalidValue
-        ))
-    {
-      if (the_dynany->destroyed ())
-        {
-          ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-        }
-
-      if (the_dynany->has_components ())
-        {
-          DynamicAny::DynAny_var cc = the_dynany->check_component ();
-          TAO_DynCommon *dc = dynamic_cast<TAO_DynCommon *> (cc.in ());
-          TAO::DynAnyBasicTypeUtils<T>::insert_value (val, dc);
-        }
-      else
-        {
-          the_dynany->check_type (TAO::BasicTypeTraits<T>::tc_value);
-          CORBA::Any &my_any = the_dynany->the_any ();
-          typedef typename TAO::BasicTypeTraits<T>::insert_type i_type;
-          i_type insert_arg (val);
-          my_any <<= insert_arg;
-        }
-    }
-
-    static typename TAO::BasicTypeTraits<T>::return_type
-    get_value (TAO_DynCommon *the_dynany)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          DynamicAny::DynAny::TypeMismatch,
-          DynamicAny::DynAny::InvalidValue
-        ))
-    {
-      if (the_dynany->destroyed ())
-        {
-          ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                            TAO::BasicTypeTraits<T>::return_type ());
-        }
-
-      if (the_dynany->has_components ())
-        {
-          DynamicAny::DynAny_var cc = the_dynany->check_component ();
-          TAO_DynCommon *dc = dynamic_cast<TAO_DynCommon *> (cc.in ());
-          return TAO::DynAnyBasicTypeUtils<T>::get_value (dc);
-        }
-      else
-        {
-          typedef typename TAO::BasicTypeTraits<T>::return_type ret_type;
-          typedef typename TAO::BasicTypeTraits<T>::extract_type ext_type;
-          ret_type retval = ret_type ();
-          ext_type extval (retval);
-          const CORBA::Any &my_any = the_dynany->the_any ();
-
-          if (!(my_any >>= extval))
-            {
-              ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                                TAO::BasicTypeTraits<T>::return_type ());
-            }
-
-          return TAO::BasicTypeTraits<T>::convert (extval);
-        }
-    }
-  };
-
-  // Encapsulates code that would otherwise be repeated in
-  // TAO_DynCommon::set_flag(). Parameterized on the type
-  // of dynany impl class that underlies the DynAny arg.
-  template<typename T>
-  struct DynAnyFlagUtils
-  {
-    static void
-    set_flag_t (DynamicAny::DynAny_ptr component,
-                CORBA::Boolean destroying)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ))
-    {
-      T *tmp = T::_narrow (component);
-
-      if (destroying)
-        {
-          tmp->container_is_destroying (true);
-        }
-      else
-        {
-          tmp->ref_to_component (true);
-        }
-    }
-  };
-
-  // Used by MakeDynAnyUtils below, parameterized on the type of
-  // impl class and on {Any | TypeCode}.
-  template<typename DA_IMPL, typename ANY_TC>
-  struct CreateDynAnyUtils
-  {
-    static DynamicAny::DynAny_ptr
-    create_dyn_any_t (ANY_TC any_tc)
-    {
-      DA_IMPL *p = 0;
-      ACE_NEW_THROW_EX (p,
-                        DA_IMPL,
-                        CORBA::NO_MEMORY ());
-
-      ACE_Auto_Basic_Ptr<DA_IMPL> dp (p);
-      p->init (any_tc);
-
-      return dp.release ();
-    }
-  };
-
-  // Code common to DynAnyFactory create_* calls, parameterized on
-  // {Any | TypeCode}.
-  template<typename ANY_TC>
-  struct MakeDynAnyUtils
-  {
-    static DynamicAny::DynAny_ptr
-    make_dyn_any_t (CORBA::TypeCode_ptr tc, ANY_TC any_tc)
-    {
-      switch (TAO_DynAnyFactory::unalias (tc))
-        {
-          case CORBA::tk_null:
-          case CORBA::tk_void:
-          case CORBA::tk_short:
-          case CORBA::tk_long:
-          case CORBA::tk_ushort:
-          case CORBA::tk_ulong:
-          case CORBA::tk_float:
-          case CORBA::tk_double:
-          case CORBA::tk_longlong:
-          case CORBA::tk_ulonglong:
-          case CORBA::tk_boolean:
-          case CORBA::tk_char:
-          case CORBA::tk_wchar:
-          case CORBA::tk_octet:
-          case CORBA::tk_any:
-          case CORBA::tk_TypeCode:
-          case CORBA::tk_objref:
-          case CORBA::tk_string:
-          case CORBA::tk_wstring:
-            return
-              TAO::CreateDynAnyUtils<
-                TAO_DynAny_i,
-                ANY_TC>::create_dyn_any_t (any_tc);
-          case CORBA::tk_struct:
-          case CORBA::tk_except:
-            return
-              TAO::CreateDynAnyUtils<
-                TAO_DynStruct_i,
-                ANY_TC>::create_dyn_any_t (any_tc);
-          case CORBA::tk_sequence:
-            if (TAO_DynCommon::is_basic_type_seq (tc))
-              {
-                return
-                  TAO::CreateDynAnyUtils<
-                    TAO_DynAny_i,
-                    ANY_TC>::create_dyn_any_t (any_tc);
-              }
-            else
-              {
-                return
-                  TAO::CreateDynAnyUtils<
-                    TAO_DynSequence_i,
-                    ANY_TC>::create_dyn_any_t (any_tc);
-              }
-          case CORBA::tk_union:
-            return
-              TAO::CreateDynAnyUtils<
-                TAO_DynUnion_i,
-                ANY_TC>::create_dyn_any_t (any_tc);
-          case CORBA::tk_enum:
-            return
-              TAO::CreateDynAnyUtils<
-                TAO_DynEnum_i,
-                ANY_TC>::create_dyn_any_t (any_tc);
-          case CORBA::tk_array:
-            return
-              TAO::CreateDynAnyUtils<
-                TAO_DynArray_i,
-                ANY_TC>::create_dyn_any_t (any_tc);
-        case CORBA::tk_fixed:
-        case CORBA::tk_value:
-        case CORBA::tk_value_box:
-        case CORBA::tk_abstract_interface:
-        case CORBA::tk_component:
-        case CORBA::tk_home:
-          ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                            DynamicAny::DynAny::_nil ());
-        case CORBA::tk_native:
-          ACE_THROW_RETURN (DynamicAny::DynAnyFactory::InconsistentTypeCode (),
-                            DynamicAny::DynAny::_nil ());
-        default:
-          break;
-        }
-
-      return DynamicAny::DynAny::_nil ();
-    }
-  };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index 3cb5e9d8cbd..5bbdac5e629 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -2,16 +2,13 @@
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "tao/DynamicAny/DynAnyUtils_T.h"
-
 #include "tao/DynamicAny/DynAny_i.h"
 #include "tao/DynamicAny/DynAnyFactory.h"
-
 #include "tao/CDR.h"
-
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
 
+
 ACE_RCSID (DynamicAny,
            DynAny_i,
            "$Id$")
@@ -55,24 +52,6 @@ TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc
     case CORBA::tk_string:
     case CORBA::tk_wstring:
       break;
-    case CORBA::tk_sequence:
-      if (tc == CORBA::_tc_BooleanSeq
-          || tc == CORBA::_tc_OctetSeq
-          || tc == CORBA::_tc_CharSeq
-          || tc == CORBA::_tc_WCharSeq
-          || tc == CORBA::_tc_ShortSeq
-          || tc == CORBA::_tc_UShortSeq
-          || tc == CORBA::_tc_LongSeq
-          || tc == CORBA::_tc_ULongSeq
-          || tc == CORBA::_tc_LongLongSeq
-          || tc == CORBA::_tc_ULongLongSeq
-          || tc == CORBA::_tc_FloatSeq
-          || tc == CORBA::_tc_DoubleSeq
-          || tc == CORBA::_tc_LongDoubleSeq)
-        {
-          // Otherwise fall through.
-          break;
-        }
     default:
       ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
   }
@@ -165,10 +144,10 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
 void
 TAO_DynAny_i::init_common (void)
 {
-  this->ref_to_component_ = false;
-  this->container_is_destroying_ = false;
-  this->has_components_ = false;
-  this->destroyed_ = false;
+  this->ref_to_component_ = 0;
+  this->container_is_destroying_ = 0;
+  this->has_components_ = 0;
+  this->destroyed_ = 0;
   this->current_position_ = -1;
   this->component_count_ = 0;
 }
@@ -419,14 +398,14 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
         this->any_ >>= lhs_v;
 
         DynamicAny::DynAny_var rhs_dyn =
-          TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-            rhs_v->_tao_get_typecode (),
-            *rhs_v);
+          TAO_DynAnyFactory::make_dyn_any (*rhs_v
+                                           ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN (0);
 
         DynamicAny::DynAny_var lhs_dyn =
-          TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-            lhs_v->_tao_get_typecode (),
-            *lhs_v);
+          TAO_DynAnyFactory::make_dyn_any (*lhs_v
+                                           ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN (0);
 
         CORBA::Boolean b = rhs_dyn->equal (lhs_dyn.in ()
                                            ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 9c4c799e65f..11a03a7677d 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
-#include "tao/DynamicAny/DynArray_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
-#include "tao/DynamicAny/DynAnyUtils_T.h"
-
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-
+#include "tao/DynamicAny/DynArray_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
@@ -27,10 +24,10 @@ TAO_DynArray_i::~TAO_DynArray_i (void)
 void
 TAO_DynArray_i::init_common (void)
 {
-  this->ref_to_component_ = false;
-  this->container_is_destroying_ = false;
-  this->has_components_ = true;
-  this->destroyed_ = false;
+  this->ref_to_component_ = 0;
+  this->container_is_destroying_ = 0;
+  this->has_components_ = 1;
+  this->destroyed_ = 0;
   this->current_position_ = 0;
   this->component_count_ = static_cast<CORBA::ULong> (this->da_members_.size ());
 }
@@ -96,9 +93,9 @@ TAO_DynArray_i::init (const CORBA::Any & any
       // This recursive step will call the correct constructor
       // based on the type of field_any.
       this->da_members_[i] =
-        TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-          field_any._tao_get_typecode (),
-          field_any);
+        TAO_DynAnyFactory::make_dyn_any (field_any
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
@@ -140,9 +137,9 @@ TAO_DynArray_i::init (CORBA::TypeCode_ptr tc
     {
       // Recursively initialize each element.
       this->da_members_[i] =
-        TAO::MakeDynAnyUtils<CORBA::TypeCode_ptr>::make_dyn_any_t (
-          elemtype.in (),
-          elemtype.in ());
+        TAO_DynAnyFactory::make_dyn_any (elemtype.in ()
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
 
@@ -291,9 +288,9 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
           ACE_CHECK;
 
           this->da_members_[i] =
-            TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-              value[i]._tao_get_typecode (),
-              value[i]);
+            TAO_DynAnyFactory::make_dyn_any (value[i]
+                                             ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
       else
         {
@@ -464,9 +461,9 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
           ACE_CHECK;
 
           this->da_members_[i] =
-            TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-              field_any._tao_get_typecode (),
-              field_any);
+            TAO_DynAnyFactory::make_dyn_any (field_any
+                                          ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 357820e8236..49c1a50de0a 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1,7 +1,8 @@
 // $Id$
 
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/DynamicAny/DynCommon.h"
-
 #include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/DynamicAny/DynAny_i.h"
 #include "tao/DynamicAny/DynArray_i.h"
@@ -9,13 +10,7 @@
 #include "tao/DynamicAny/DynSequence_i.h"
 #include "tao/DynamicAny/DynStruct_i.h"
 #include "tao/DynamicAny/DynUnion_i.h"
-#include "tao/DynamicAny/DynAnyUtils_T.h"
-
-#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
-#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-
 #include "tao/CDR.h"
-
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
 
@@ -33,6 +28,8 @@ TAO_DynCommon::~TAO_DynCommon (void)
 {
 }
 
+// *****************************************************************
+
 CORBA::TypeCode_ptr
 TAO_DynCommon::type (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -64,7 +61,7 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
   CORBA::TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Boolean const equivalent =
+  CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -86,15 +83,36 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
 
 void
 TAO_DynCommon::insert_boolean (CORBA::Boolean value
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Boolean>::insert_value (value,
-                                                           this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_boolean (value
+                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_boolean
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= CORBA::Any::from_boolean (value);
+    }
 }
 
 void
@@ -106,8 +124,29 @@ TAO_DynCommon::insert_octet (CORBA::Octet value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Octet>::insert_value (value,
-                                                         this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_octet (value
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_octet
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= CORBA::Any::from_octet (value);
+    }
 }
 
 void
@@ -119,8 +158,29 @@ TAO_DynCommon::insert_char (CORBA::Char value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Char>::insert_value (value,
-                                                        this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_char (value
+                       ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_char
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= CORBA::Any::from_char (value);
+    }
 }
 
 void
@@ -132,8 +192,29 @@ TAO_DynCommon::insert_short (CORBA::Short value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Short>::insert_value (value,
-                                                         this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_short (value
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_short
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -145,8 +226,29 @@ TAO_DynCommon::insert_ushort (CORBA::UShort value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::UShort>::insert_value (value,
-                                                          this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_ushort (value
+                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_ushort
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -158,8 +260,29 @@ TAO_DynCommon::insert_long (CORBA::Long value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Long>::insert_value (value,
-                                                        this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_long (value
+                       ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_long
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -171,8 +294,29 @@ TAO_DynCommon::insert_ulong (CORBA::ULong value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::ULong>::insert_value (value,
-                                                         this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_ulong (value
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_ulong
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -184,8 +328,29 @@ TAO_DynCommon::insert_float (CORBA::Float value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Float>::insert_value (value,
-                                                         this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_float (value
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_float
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -197,8 +362,29 @@ TAO_DynCommon::insert_double (CORBA::Double value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Double>::insert_value (value,
-                                                          this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_double (value
+                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_double
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -232,7 +418,7 @@ TAO_DynCommon::insert_string (const char * value
                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::TCKind const kind =
+      CORBA::TCKind kind =
         unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
@@ -241,7 +427,7 @@ TAO_DynCommon::insert_string (const char * value
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      CORBA::ULong const bound =
+      CORBA::ULong bound =
         unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
@@ -281,15 +467,15 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
     }
   else
     {
-      CORBA::Boolean good_type = true;
-      CORBA::TCKind const kind =
+      CORBA::Boolean good_type = 1;
+      CORBA::TCKind kind =
         TAO_DynAnyFactory::unalias (this->type_.in ()
                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind != CORBA::tk_objref)
         {
-          good_type = false;
+          good_type = 0;
         }
       else if (!CORBA::is_nil (value))
         {
@@ -323,10 +509,7 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
             }
           else
             {
-              if (!value->marshal (cdr))
-                {
-                  ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-                }
+              value->marshal (cdr);
             }
 
           TAO_InputCDR in (cdr);
@@ -352,8 +535,29 @@ TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::TypeCode_ptr>::insert_value (value,
-                                                                this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_typecode (value
+                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_TypeCode
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -365,8 +569,29 @@ TAO_DynCommon::insert_longlong (CORBA::LongLong value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::insert_value (value,
-                                                            this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_longlong (value
+                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_longlong
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -378,8 +603,29 @@ TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::insert_value (value,
-                                                             this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_ulonglong (value
+                            ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_ulonglong
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -391,8 +637,29 @@ TAO_DynCommon::insert_longdouble (CORBA::LongDouble value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::LongDouble>::insert_value (value,
-                                                              this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_longdouble (value
+                             ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_longdouble
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 void
@@ -404,8 +671,29 @@ TAO_DynCommon::insert_wchar (CORBA::WChar value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::WChar>::insert_value (value,
-                                                         this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_wchar (value
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_wchar
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= CORBA::Any::from_wchar (value);
+    }
 }
 
 void
@@ -439,7 +727,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value
                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::ULong const bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (bound > 0 && bound < ACE_OS::wslen (value))
@@ -461,8 +749,29 @@ TAO_DynCommon::insert_any (const CORBA::Any &value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Any>::insert_value (value,
-                                                       this);
+  if (this->destroyed_)
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      cc->insert_any (value
+                      ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    {
+      this->check_type (CORBA::_tc_any
+                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->any_ <<= value;
+    }
 }
 
 // @@@ (JP) TODO - optimize - this version was intended by the OMG to
@@ -490,7 +799,7 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
 }
 
 void
-TAO_DynCommon::insert_val (CORBA::ValueBase *value
+TAO_DynCommon::insert_val (CORBA::ValueBase *
                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -498,87 +807,47 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value
       DynamicAny::DynAny::InvalidValue
     ))
 {
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
+}
+
+// ****************************************************************
+
+CORBA::Boolean
+TAO_DynCommon::get_boolean (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      DynamicAny::DynAny::TypeMismatch,
+      DynamicAny::DynAny::InvalidValue
+    ))
+{
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        0);
     }
 
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
         this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      ACE_CHECK_RETURN (0);
 
-      cc->insert_val (value
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      return cc->get_boolean (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
-      CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Boolean retval;
 
-      if (kind != CORBA::tk_value)
+      if ((this->any_ >>= CORBA::Any::to_boolean (retval)) == 0)
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-
-      // If the arg is 0 we can't do this kind of type checking,
-      // and the call to _tao_marshal() below will handle the
-      // null value correctly.
-      if (value != 0)
-        {
-          const char *value_id = value->_tao_obv_repository_id ();
-          const char *my_id =
-            this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          // Valuetypes, unlike interfaces, don't have a virtual
-          // method to check for a more derived type when the
-          // repo ids don't match. Valuetypes have only
-          // a static _downcast() method, which can't be used
-          // here, so if the repo ids don't match, we're hosed.
-          if (ACE_OS::strcmp (value_id, my_id) != 0)
-            {
-              ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-            }
-        }
-
-      // This will handle null values correctly, or otherwise
-      // make a virtual call to marshal the state.
-      TAO_OutputCDR out;
-      CORBA::Boolean const good_insert =
-        CORBA::ValueBase::_tao_marshal (out, value);
-
-      if (!good_insert)
-        {
-          ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            0);
         }
 
-      TAO_InputCDR in (out);
-      TAO::Unknown_IDL_Type *unk = 0;
-      ACE_NEW (unk,
-               TAO::Unknown_IDL_Type (this->type_.in (),
-                                      in));
-      this->any_.replace (unk);
+      return retval;
     }
 }
 
-// ****************************************************************
-
-CORBA::Boolean
-TAO_DynCommon::get_boolean (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  return TAO::DynAnyBasicTypeUtils<CORBA::Boolean>::get_value (this);
-}
-
 CORBA::Octet
 TAO_DynCommon::get_octet (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -587,7 +856,32 @@ TAO_DynCommon::get_octet (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::Octet>::get_value (this);
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        0);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return cc->get_octet (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      CORBA::Octet retval;
+
+      if ((this->any_ >>= CORBA::Any::to_octet (retval)) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            0);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::Char
@@ -598,7 +892,32 @@ TAO_DynCommon::get_char (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::Char>::get_value (this);
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        0);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return cc->get_char (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      CORBA::Char retval;
+
+      if ((this->any_ >>= CORBA::Any::to_char (retval)) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            0);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::Short
@@ -609,7 +928,32 @@ TAO_DynCommon::get_short (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::Short>::get_value (this);
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        0);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      CORBA::Short retval;
+
+      if ((this->any_ >>= retval) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            0);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::UShort
@@ -620,7 +964,32 @@ TAO_DynCommon::get_ushort (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::UShort>::get_value (this);
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        0);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return cc->get_ushort (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      CORBA::UShort retval;
+
+      if ((this->any_ >>= retval) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            0);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::Long
@@ -631,7 +1000,32 @@ TAO_DynCommon::get_long (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::Long>::get_value (this);
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        0);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return cc->get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      CORBA::Long retval;
+
+      if ((this->any_ >>= retval) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            0);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::ULong
@@ -642,7 +1036,32 @@ TAO_DynCommon::get_ulong (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::ULong>::get_value (this);
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        0);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return cc->get_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      CORBA::ULong retval;
+
+      if ((this->any_ >>= retval) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            0);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::Float
@@ -653,7 +1072,32 @@ TAO_DynCommon::get_float (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::Float>::get_value (this);
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        0);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return cc->get_float (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      CORBA::Float retval;
+
+      if ((this->any_ >>= retval) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            0);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::Double
@@ -664,7 +1108,32 @@ TAO_DynCommon::get_double (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::Double>::get_value (this);
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        0);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return cc->get_double (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      CORBA::Double retval;
+
+      if ((this->any_ >>= retval) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            0);
+        }
+
+      return retval;
+    }
 }
 
 char *
@@ -708,7 +1177,7 @@ TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL)
 
       char *retval = 0;
 
-      CORBA::ULong const bound =
+      CORBA::ULong bound =
         unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
@@ -804,7 +1273,32 @@ TAO_DynCommon::get_longlong (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::get_value (this);
+  CORBA::LongLong retval = ACE_CDR_LONGLONG_INITIALIZER;
+
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        retval);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (retval);
+
+      return cc->get_longlong (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      if ((this->any_ >>= retval) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            retval);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::ULongLong
@@ -815,7 +1309,32 @@ TAO_DynCommon::get_ulonglong (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::get_value (this);
+  CORBA::ULongLong retval = 0;
+
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        retval);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (retval);
+
+      return cc->get_ulonglong (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      if ((this->any_ >>= retval) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            retval);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::LongDouble
@@ -826,7 +1345,32 @@ TAO_DynCommon::get_longdouble (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  return TAO::DynAnyBasicTypeUtils<CORBA::LongDouble>::get_value (this);
+  CORBA::LongDouble retval = ACE_CDR_LONG_DOUBLE_INITIALIZER;
+
+  if (this->destroyed_)
+    {
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                        retval);
+    }
+
+  if (this->has_components_)
+    {
+      DynamicAny::DynAny_var cc =
+        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (retval);
+
+      return cc->get_longdouble (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      if ((this->any_ >>= retval) == 0)
+        {
+          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
+                            retval);
+        }
+
+      return retval;
+    }
 }
 
 CORBA::WChar
@@ -969,10 +1513,8 @@ TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return
-    TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-      any.in ()._tao_get_typecode (),
-      any.in ());
+  return TAO_DynAnyFactory::make_dyn_any (any.in ()
+                                          ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::ValueBase *
@@ -983,57 +1525,8 @@ TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_val (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (kind != CORBA::tk_value)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), 0);
-        }
-
-      CORBA::ValueBase_var retval;
-      TAO::Any_Impl *any_impl = this->any_.impl ();
-
-      if (any_impl == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (), 0);
-        }
-
-      // This should always be non-zero for dynamic anys.
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (any_impl);
-
-      // Demarshal from a copy so we can retain ownership of our contents.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_extract =
-        CORBA::ValueBase::_tao_unmarshal (for_reading,
-                                          retval.inout ());
-
-      if (!good_extract)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (), 0);
-        }
-
-      return retval._retn ();
-    }
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
+                    0);
 }
 
 // ****************************************************************
@@ -1048,24 +1541,24 @@ TAO_DynCommon::seek (CORBA::Long slot
   if (this->destroyed_)
     {
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        false);
+                        0);
     }
 
   if (this->has_components_ == 0)
     {
       ACE_UNUSED_ARG (slot);
       this->current_position_ = -1;
-      return false;
+      return 0;
     }
   else if (slot < 0 || slot >= static_cast<CORBA::Long> (this->component_count_))
     {
       this->current_position_ = -1;
-      return false;
+      return 0;
     }
   else
     {
       this->current_position_ = slot;
-      return true;
+      return 1;
     }
 }
 
@@ -1102,12 +1595,12 @@ TAO_DynCommon::next (ACE_ENV_SINGLE_ARG_DECL)
                                           ))
     {
       this->current_position_ = -1;
-      return false;
+      return 0;
     }
   else
     {
       ++this->current_position_;
-      return true;
+      return 1;
     }
 }
 
@@ -1127,9 +1620,9 @@ TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   DynamicAny::DynAny_ptr retval =
-    TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-      any.in ()._tao_get_typecode (),
-      any.in ());
+    TAO_DynAnyFactory::make_dyn_any (any.in ()
+                                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return retval;
 }
@@ -1152,7 +1645,7 @@ TAO_DynCommon::component_count (ACE_ENV_SINGLE_ARG_DECL)
 // ****************************************************************
 
 void
-TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
+TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr /* value */
                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1160,83 +1653,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_abstract (value
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::Boolean good_type = true;
-      CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (kind != CORBA::tk_abstract_interface)
-        {
-          good_type = false;
-        }
-      else if (!CORBA::is_nil (value))
-        {
-          const char *value_id = value->_interface_repository_id ();
-          int cmp =
-            ACE_OS::strcmp (value_id, "IDL:omg.org/CORBA/AbstractBase:1.0");
-
-          if (cmp != 0)
-            {
-              const char *my_id =
-                this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
-
-              if (ACE_OS::strcmp (value_id, my_id) != 0)
-                {
-                  // If 'value' is an objref, this will be a virtual
-                  // call. If not, it will just compare to the repo id
-                  // above, which we already know won't match. We see
-                  // in insert_val() (see comment there) that there
-                  // is no way to check for derived valuetypes w/o
-                  // type knowledge at compile time.
-                  good_type = value->_is_a (my_id
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK;
-                }
-            }
-        }
-
-      if (good_type)
-        {
-          TAO_OutputCDR out;
-
-          // The CDR insertion operator for AbstractBase handles
-          // all cases - nil, objref and valuetype - polymorphically.
-          if (!(out << value))
-            {
-              ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-            }
-
-          TAO_InputCDR in (out);
-          TAO::Unknown_IDL_Type *unk = 0;
-          ACE_NEW (unk,
-                   TAO::Unknown_IDL_Type (this->type_.in (),
-                                          in));
-          this->any_.replace (unk);
-        }
-      else
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-    }
+  // TODO
 }
 
 CORBA::AbstractBase_ptr
@@ -1247,77 +1664,50 @@ TAO_DynCommon::get_abstract (ACE_ENV_SINGLE_ARG_DECL)
       DynamicAny::DynAny::InvalidValue
     ))
 {
+  // TODO
+  return CORBA::AbstractBase::_nil ();
+}
+
+// ****************************************************************
+
+void
+TAO_DynCommon::insert_boolean_seq (
+    const CORBA::BooleanSeq &value
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      DynamicAny::DynAny::TypeMismatch,
+      DynamicAny::DynAny::InvalidValue
+    ))
+{
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::AbstractBase::_nil ());
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
         this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::AbstractBase::_nil ());
+      ACE_CHECK;
 
-      return cc->get_abstract (ACE_ENV_SINGLE_ARG_PARAMETER);
+      cc->insert_boolean_seq (value
+                              ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else
     {
-      CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+      this->check_type (CORBA::_tc_BooleanSeq
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      if (kind != CORBA::tk_abstract_interface)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), 0);
-        }
-
-      CORBA::AbstractBase_var retval;
-      TAO::Any_Impl *any_impl = this->any_.impl ();
-
-      if (any_impl == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (), 0);
-        }
-
-      // This should always be non-zero for dynamic anys.
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (any_impl);
-
-      // Make a copy to extract from so we retain ownership of contents.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      // The CDR extraction operator for AbstractBase handles
-      // all cases.
-      if (!(for_reading >> retval.inout ()))
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (), 0);
-        }
-
-      return retval._retn ();
+      this->any_ <<= value;
     }
 }
 
-// ****************************************************************
-
-void
-TAO_DynCommon::insert_boolean_seq (
-    const CORBA::BooleanSeq &value
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  TAO::DynAnyBasicTypeUtils<CORBA::BooleanSeq>::insert_value (value,
-                                                              this);
-}
-
 void
 TAO_DynCommon::insert_octet_seq (
-    const CORBA::OctetSeq &value
+    const CORBA::OctetSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1325,13 +1715,11 @@ TAO_DynCommon::insert_octet_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::OctetSeq>::insert_value (value,
-                                                            this);
 }
 
 void
 TAO_DynCommon::insert_char_seq (
-    const CORBA::CharSeq &value
+    const CORBA::CharSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1339,13 +1727,11 @@ TAO_DynCommon::insert_char_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::CharSeq>::insert_value (value,
-                                                           this);
 }
 
 void
 TAO_DynCommon::insert_short_seq (
-    const CORBA::ShortSeq &value
+    const CORBA::ShortSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1353,13 +1739,11 @@ TAO_DynCommon::insert_short_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::insert_value (value,
-                                                            this);
 }
 
 void
 TAO_DynCommon::insert_ushort_seq (
-    const CORBA::UShortSeq &value
+    const CORBA::UShortSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1367,13 +1751,11 @@ TAO_DynCommon::insert_ushort_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::insert_value (value,
-                                                             this);
 }
 
 void
 TAO_DynCommon::insert_long_seq (
-    const CORBA::LongSeq &value
+    const CORBA::LongSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1381,13 +1763,11 @@ TAO_DynCommon::insert_long_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::LongSeq>::insert_value (value,
-                                                           this);
 }
 
 void
 TAO_DynCommon::insert_ulong_seq (
-    const CORBA::ULongSeq &value
+    const CORBA::ULongSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1395,13 +1775,11 @@ TAO_DynCommon::insert_ulong_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::ULongSeq>::insert_value (value,
-                                                            this);
 }
 
 void
 TAO_DynCommon::insert_float_seq (
-    const CORBA::FloatSeq &value
+    const CORBA::FloatSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1409,13 +1787,11 @@ TAO_DynCommon::insert_float_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::FloatSeq>::insert_value (value,
-                                                            this);
 }
 
 void
 TAO_DynCommon::insert_double_seq (
-    const CORBA::DoubleSeq &value
+    const CORBA::DoubleSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1423,13 +1799,11 @@ TAO_DynCommon::insert_double_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::DoubleSeq>::insert_value (value,
-                                                             this);
 }
 
 void
 TAO_DynCommon::insert_longlong_seq (
-    const CORBA::LongLongSeq &value
+    const CORBA::LongLongSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1437,13 +1811,11 @@ TAO_DynCommon::insert_longlong_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::LongLongSeq>::insert_value (value,
-                                                               this);
 }
 
 void
 TAO_DynCommon::insert_ulonglong_seq (
-    const CORBA::ULongLongSeq &value
+    const CORBA::ULongLongSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1451,13 +1823,11 @@ TAO_DynCommon::insert_ulonglong_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::ULongLongSeq>::insert_value (value,
-                                                                this);
 }
 
 void
 TAO_DynCommon::insert_longdouble_seq (
-    const CORBA::LongDoubleSeq &value
+    const CORBA::LongDoubleSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1465,13 +1835,11 @@ TAO_DynCommon::insert_longdouble_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::LongDoubleSeq>::insert_value (value,
-                                                                 this);
 }
 
 void
 TAO_DynCommon::insert_wchar_seq (
-    const CORBA::WCharSeq &value
+    const CORBA::WCharSeq & /* value */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1479,8 +1847,6 @@ TAO_DynCommon::insert_wchar_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::WCharSeq>::insert_value (value,
-                                                            this);
 }
 
 // ****************************************************************
@@ -1494,9 +1860,7 @@ TAO_DynCommon::get_boolean_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::BooleanSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::BooleanSeq>::get_value (this);
-  return new CORBA::BooleanSeq (*owned);
+  return 0;
 }
 
 CORBA::OctetSeq *
@@ -1508,9 +1872,7 @@ TAO_DynCommon::get_octet_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::OctetSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::OctetSeq>::get_value (this);
-  return new CORBA::OctetSeq (*owned);
+  return 0;
 }
 
 CORBA::CharSeq *
@@ -1522,9 +1884,7 @@ TAO_DynCommon::get_char_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::CharSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::CharSeq>::get_value (this);
-  return new CORBA::CharSeq (*owned);
+  return 0;
 }
 
 CORBA::ShortSeq *
@@ -1536,9 +1896,7 @@ TAO_DynCommon::get_short_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::ShortSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::get_value (this);
-  return new CORBA::ShortSeq (*owned);
+  return 0;
 }
 
 CORBA::UShortSeq *
@@ -1550,9 +1908,7 @@ TAO_DynCommon::get_ushort_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::UShortSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::get_value (this);
-  return new CORBA::UShortSeq (*owned);
+  return 0;
 }
 
 CORBA::LongSeq *
@@ -1564,9 +1920,7 @@ TAO_DynCommon::get_long_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::LongSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::LongSeq>::get_value (this);
-  return new CORBA::LongSeq (*owned);
+  return 0;
 }
 
 CORBA::ULongSeq *
@@ -1578,9 +1932,7 @@ TAO_DynCommon::get_ulong_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::ULongSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::ULongSeq>::get_value (this);
-  return new CORBA::ULongSeq (*owned);
+  return 0;
 }
 
 CORBA::FloatSeq *
@@ -1592,9 +1944,7 @@ TAO_DynCommon::get_float_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::FloatSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::FloatSeq>::get_value (this);
-  return new CORBA::FloatSeq (*owned);
+  return 0;
 }
 
 CORBA::DoubleSeq *
@@ -1606,9 +1956,7 @@ TAO_DynCommon::get_double_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::DoubleSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::DoubleSeq>::get_value (this);
-  return new CORBA::DoubleSeq (*owned);
+  return 0;
 }
 
 CORBA::LongLongSeq *
@@ -1620,9 +1968,7 @@ TAO_DynCommon::get_longlong_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::LongLongSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::LongLongSeq>::get_value (this);
-  return new CORBA::LongLongSeq (*owned);
+  return 0;
 }
 
 CORBA::ULongLongSeq *
@@ -1634,9 +1980,7 @@ TAO_DynCommon::get_ulonglong_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::ULongLongSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::ULongLongSeq>::get_value (this);
-  return new CORBA::ULongLongSeq (*owned);
+  return 0;
 }
 
 CORBA::LongDoubleSeq *
@@ -1648,9 +1992,7 @@ TAO_DynCommon::get_longdouble_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::LongDoubleSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::LongDoubleSeq>::get_value (this);
-  return new CORBA::LongDoubleSeq (*owned);
+  return 0;
 }
 
 CORBA::WCharSeq *
@@ -1662,9 +2004,7 @@ TAO_DynCommon::get_wchar_seq (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::WCharSeq *owned =
-    TAO::DynAnyBasicTypeUtils<CORBA::WCharSeq>::get_value (this);
-  return new CORBA::WCharSeq (*owned);
+  return 0;
 }
 
 // ****************************************************************
@@ -1687,41 +2027,115 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
   switch (tk)
   {
     case CORBA::tk_array:
-      TAO::DynAnyFlagUtils<TAO_DynArray_i>::set_flag_t (component,
-                                                        destroying);
-      break;
+      {
+        TAO_DynArray_i *tmp =
+          TAO_DynArray_i::_narrow (component
+                                   ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (destroying)
+          {
+            tmp->container_is_destroying_ = 1;
+          }
+        else
+          {
+            tmp->ref_to_component_ = 1;
+          }
+
+        break;
+      }
     case CORBA::tk_enum:
-      TAO::DynAnyFlagUtils<TAO_DynEnum_i>::set_flag_t (component,
-                                                       destroying);
-      break;
+      {
+        TAO_DynEnum_i *tmp = TAO_DynEnum_i::_narrow (component
+                                                     ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (destroying)
+          {
+            tmp->container_is_destroying_ = 1;
+          }
+        else
+          {
+            tmp->ref_to_component_ = 1;
+          }
+
+        break;
+      }
     case CORBA::tk_sequence:
-      if (TAO_DynCommon::is_basic_type_seq (tc.in ()))
-        {
-          TAO::DynAnyFlagUtils<TAO_DynAny_i>::set_flag_t (component,
-                                                          destroying);
-        }
-      else
-        {
-          TAO::DynAnyFlagUtils<TAO_DynSequence_i>::set_flag_t (component,
-                                                               destroying);
-        }
-      break;
+      {
+        TAO_DynSequence_i *tmp =
+          TAO_DynSequence_i::_narrow (component
+                                      ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (destroying)
+          {
+            tmp->container_is_destroying_ = 1;
+          }
+        else
+          {
+            tmp->ref_to_component_ = 1;
+          }
+
+        break;
+      }
     case CORBA::tk_struct:
-      TAO::DynAnyFlagUtils<TAO_DynStruct_i>::set_flag_t (component,
-                                                         destroying);
-      break;
+      {
+        TAO_DynStruct_i *tmp =
+          TAO_DynStruct_i::_narrow (component
+                                    ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (destroying)
+          {
+            tmp->container_is_destroying_ = 1;
+          }
+        else
+          {
+            tmp->ref_to_component_ = 1;
+          }
+
+        break;
+      }
     case CORBA::tk_union:
-      TAO::DynAnyFlagUtils<TAO_DynUnion_i>::set_flag_t (component,
-                                                        destroying);
-      break;
+      {
+        TAO_DynUnion_i *tmp =
+          TAO_DynUnion_i::_narrow (component
+                                   ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (destroying)
+          {
+            tmp->container_is_destroying_ = 1;
+          }
+        else
+          {
+            tmp->ref_to_component_ = 1;
+          }
+
+        break;
+      }
     case CORBA::tk_fixed:
     case CORBA::tk_value:
     case CORBA::tk_value_box:
       ACE_THROW (CORBA::NO_IMPLEMENT ());
     default:
-      TAO::DynAnyFlagUtils<TAO_DynAny_i>::set_flag_t (component,
-                                                      destroying);
-      break;
+      {
+        TAO_DynAny_i *tmp = TAO_DynAny_i::_narrow (component
+                                                   ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (destroying)
+          {
+            tmp->container_is_destroying_ = 1;
+          }
+        else
+          {
+            tmp->ref_to_component_ = 1;
+          }
+
+        break;
+      }
   }
 }
 
@@ -1758,20 +2172,11 @@ TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL)
   {
     case CORBA::tk_array:
     case CORBA::tk_except:
+    case CORBA::tk_sequence:
     case CORBA::tk_struct:
     case CORBA::tk_union:
       ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                         DynamicAny::DynAny::_nil ());
-    case CORBA::tk_sequence:
-      if (TAO_DynCommon::is_basic_type_seq (tc.in ()))
-        {
-          return cc._retn ();
-        }
-      else
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            DynamicAny::DynAny::_nil ());
-        }
     default:
       return cc._retn ();
   }
@@ -1796,54 +2201,6 @@ TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc
     }
 }
 
-bool
-TAO_DynCommon::is_basic_type_seq (CORBA::TypeCode_ptr tc)
-{
-  return (tc == CORBA::_tc_BooleanSeq
-          || tc == CORBA::_tc_OctetSeq
-          || tc == CORBA::_tc_CharSeq
-          || tc == CORBA::_tc_WCharSeq
-          || tc == CORBA::_tc_ShortSeq
-          || tc == CORBA::_tc_UShortSeq
-          || tc == CORBA::_tc_LongSeq
-          || tc == CORBA::_tc_ULongSeq
-          || tc == CORBA::_tc_LongLongSeq
-          || tc == CORBA::_tc_ULongLongSeq
-          || tc == CORBA::_tc_FloatSeq
-          || tc == CORBA::_tc_DoubleSeq
-          || tc == CORBA::_tc_LongDoubleSeq);
-}
-
-CORBA::Boolean
-TAO_DynCommon::has_components (void) const
-{
-  return this->has_components_;
-}
-
-CORBA::Boolean
-TAO_DynCommon::destroyed (void) const
-{
-  return this->destroyed_;
-}
-
-CORBA::Any &
-TAO_DynCommon::the_any (void)
-{
-  return this->any_;
-}
-
-void
-TAO_DynCommon::container_is_destroying (CORBA::Boolean val)
-{
-  this->container_is_destroying_ = val;
-}
-
-void
-TAO_DynCommon::ref_to_component (CORBA::Boolean val)
-{
-  this->ref_to_component_ = val;
-}
-
 CORBA::TypeCode_ptr
 TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc
                                        ACE_ENV_ARG_DECL)
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 9e07090e260..c15cd5f5e24 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -682,35 +682,6 @@ public:
         CORBA::SystemException
       ));
 
-  // Utility functions.
-
-  DynamicAny::DynAny_ptr check_component (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  void check_type (CORBA::TypeCode_ptr tc
-                   ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-  static bool is_basic_type_seq (CORBA::TypeCode_ptr tc);
-
-  // Accessors
-
-  CORBA::Boolean has_components (void) const;
-  CORBA::Boolean destroyed (void) const;
-  CORBA::Any &the_any (void);
-
-  // Mutators
-
-  void container_is_destroying (CORBA::Boolean val);
-  void ref_to_component (CORBA::Boolean val);
-
 protected:
   /// Were we created by current_component()?
   CORBA::Boolean ref_to_component_;
@@ -740,6 +711,20 @@ protected:
 private:
   // Utility functions used by insert_* and get_*.
 
+  DynamicAny::DynAny_ptr check_component (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        DynamicAny::DynAny::TypeMismatch,
+        DynamicAny::DynAny::InvalidValue
+      ));
+
+  void check_type (CORBA::TypeCode_ptr tc
+                   ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        DynamicAny::DynAny::TypeMismatch
+      ));
+
   CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc
                                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 6ce0a7dcedc..2d94ed2a047 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -26,10 +26,10 @@ TAO_DynEnum_i::~TAO_DynEnum_i (void)
 void
 TAO_DynEnum_i::init_common (void)
 {
-  this->ref_to_component_ = false;
-  this->container_is_destroying_ = false;
-  this->has_components_ = false;
-  this->destroyed_ = false;
+  this->ref_to_component_ = 0;
+  this->container_is_destroying_ = 0;
+  this->has_components_ = 0;
+  this->destroyed_ = 0;
   this->current_position_ = -1;
   this->component_count_ = 0;
 }
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index a18d518dae2..40422885eae 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
-#include "tao/DynamicAny/DynSequence_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
-#include "tao/DynamicAny/DynAnyUtils_T.h"
-
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-
+#include "tao/DynamicAny/DynSequence_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
@@ -27,10 +24,10 @@ TAO_DynSequence_i::~TAO_DynSequence_i (void)
 void
 TAO_DynSequence_i::init_common (void)
 {
-  this->ref_to_component_ = false;
-  this->container_is_destroying_ = false;
-  this->has_components_ = true;
-  this->destroyed_ = false;
+  this->ref_to_component_ = 0;
+  this->container_is_destroying_ = 0;
+  this->has_components_ = 1;
+  this->destroyed_ = 0;
   this->current_position_ = -1;
   this->component_count_ = static_cast<CORBA::ULong> (this->da_members_.size ());
 }
@@ -100,9 +97,9 @@ TAO_DynSequence_i::init (const CORBA::Any& any
       // This recursive step will call the correct constructor
       // based on the type of field_any.
       this->da_members_[i] =
-        TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-          field_any._tao_get_typecode (),
-          field_any);
+        TAO_DynAnyFactory::make_dyn_any (field_any
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
@@ -256,9 +253,9 @@ TAO_DynSequence_i::set_length (CORBA::ULong length
       for (CORBA::ULong i = this->component_count_; i < length; ++i)
         {
           this->da_members_[i] =
-        TAO::MakeDynAnyUtils<CORBA::TypeCode_ptr>::make_dyn_any_t (
-          elemtype.in (),
-          elemtype.in ());
+            TAO_DynAnyFactory::make_dyn_any (elemtype.in ()
+                                             ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
     }
   else if (length < this->component_count_)
@@ -383,9 +380,9 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
             }
 
           this->da_members_[i] =
-            TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-              value[i]._tao_get_typecode (),
-              value[i]);
+            TAO_DynAnyFactory::make_dyn_any (value[i]
+                                          ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
       else
         {
@@ -614,9 +611,9 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
             }
 
           this->da_members_[i] =
-            TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-              field_any._tao_get_typecode (),
-              field_any);
+            TAO_DynAnyFactory::make_dyn_any (field_any
+                                          ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 70e4b68f075..ec32782d851 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "tao/DynamicAny/DynStruct_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
-#include "tao/DynamicAny/DynAnyUtils_T.h"
-
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-
+#include "tao/DynamicAny/DynStruct_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
            DynStruct_i,
            "$Id$")
 
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynStruct_i::TAO_DynStruct_i (void)
@@ -43,10 +41,10 @@ TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc
 void
 TAO_DynStruct_i::init_common (void)
 {
-  this->ref_to_component_ = false;
-  this->container_is_destroying_ = false;
-  this->has_components_ = true;
-  this->destroyed_ = false;
+  this->ref_to_component_ = 0;
+  this->container_is_destroying_ = 0;
+  this->has_components_ = 1;
+  this->destroyed_ = 0;
   this->component_count_ = static_cast <CORBA::ULong> (this->da_members_.size ());
   this->current_position_ = this->component_count_ ? 0 : -1;
 }
@@ -136,9 +134,9 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
       // This recursive step will call the correct constructor
       // based on the type of field_any.
       this->da_members_[i] =
-        TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-          field_any._tao_get_typecode (),
-          field_any);
+        TAO_DynAnyFactory::make_dyn_any (field_any
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
@@ -183,9 +181,9 @@ TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc
 
       // Recursively initialize each member.
       this->da_members_[i] =
-        TAO::MakeDynAnyUtils<CORBA::TypeCode_ptr>::make_dyn_any_t (
-          mtype.in (),
-          mtype.in ());
+        TAO_DynAnyFactory::make_dyn_any (mtype.in ()
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
 
@@ -402,9 +400,9 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
       ACE_CHECK;
 
       this->da_members_[i] =
-        TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-          values[i].value._tao_get_typecode (),
-          values[i].value);
+        TAO_DynAnyFactory::make_dyn_any (values[i].value
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
 
   this->current_position_ = length ? 0 : -1;
@@ -605,9 +603,9 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
           ACE_CHECK;
 
           this->da_members_[i] =
-            TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-              field_any._tao_get_typecode (),
-              field_any);
+            TAO_DynAnyFactory::make_dyn_any (field_any
+                                             ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 2ac94000dd2..b01187b8db1 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
-#include "tao/DynamicAny/DynUnion_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
-#include "tao/DynamicAny/DynAnyUtils_T.h"
-
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-
+#include "tao/DynamicAny/DynUnion_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
@@ -27,10 +24,10 @@ TAO_DynUnion_i::~TAO_DynUnion_i (void)
 void
 TAO_DynUnion_i::init_common (void)
 {
-  this->ref_to_component_ = false;
-  this->container_is_destroying_ = false;
-  this->has_components_ = true;
-  this->destroyed_ = false;
+  this->ref_to_component_ = 0;
+  this->container_is_destroying_ = 0;
+  this->has_components_ = 1;
+  this->destroyed_ = 0;
   this->component_count_ = 2;
   this->current_position_ = 0;
   this->member_slot_ = 0;
@@ -58,7 +55,8 @@ TAO_DynUnion_i::init (const CORBA::Any& any
 
   // Set the from_factory arg to TRUE, so any problems will throw
   // InconsistentTypeCode.
-  this->set_from_any (any
+  this->set_from_any (any,
+                      1
                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -94,9 +92,9 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc
 
   // Initialize the discriminator to the label value of the first member.
   this->discriminator_ =
-    TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-      first_label.in ()._tao_get_typecode (),
-      first_label.in ());
+    TAO_DynAnyFactory::make_dyn_any (first_label.in ()
+                                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   CORBA::TypeCode_var first_type =
     unaliased_tc->member_type (this->current_position_
@@ -104,10 +102,9 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc
   ACE_CHECK;
 
   // Recursively initialize the member to its default value.
-  this->member_ =
-    TAO::MakeDynAnyUtils<CORBA::TypeCode_ptr>::make_dyn_any_t (
-      first_type.in (),
-      first_type.in ());
+  this->member_ = TAO_DynAnyFactory::make_dyn_any (first_type.in ()
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 // ****************************************************************
@@ -127,7 +124,8 @@ TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref
 // This code is common to from_any() and the init() overload that takes
 // an Any argument.
 void
-TAO_DynUnion_i::set_from_any (const CORBA::Any & any
+TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
+                              CORBA::Boolean /* from_factory */
                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -139,7 +137,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
   // only on unions, so strip the alias out of the type code
   //
   CORBA::TypeCode_var tc =
-   TAO_DynAnyFactory::strip_alias (any._tao_get_typecode ()
+   TAO_DynAnyFactory::strip_alias (any.type ()
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -185,9 +183,9 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
 
   // Set the discriminator.
   this->discriminator_ =
-    TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-      disc_any._tao_get_typecode (),
-      disc_any);
+    TAO_DynAnyFactory::make_dyn_any (disc_any
+                                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   // Move to the next field in the CDR stream.
   (void) TAO_Marshal_Object::perform_skip (disc_tc.in (),
@@ -247,9 +245,9 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
       member_any.replace (unk);
 
       this->member_ =
-        TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-          member_any._tao_get_typecode (),
-          member_any);
+        TAO_DynAnyFactory::make_dyn_any (member_any
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       this->member_slot_ = i;
     }
@@ -290,9 +288,9 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
           default_any.replace (unk);
 
           this->member_ =
-            TAO::MakeDynAnyUtils<const CORBA::Any&>::make_dyn_any_t (
-              default_any._tao_get_typecode (),
-              default_any);
+            TAO_DynAnyFactory::make_dyn_any (default_any
+                                             ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
 
           this->member_slot_ = index;
         }
@@ -411,9 +409,9 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
 
       // Initialize member to default value.
       this->member_ =
-        TAO::MakeDynAnyUtils<CORBA::TypeCode_ptr>::make_dyn_any_t (
-          member_tc.in (),
-          member_tc.in ());
+        TAO_DynAnyFactory::make_dyn_any (member_tc.in ()
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       // Named active member (CORBA 2.3.1).
       this->current_position_ = 1;
@@ -499,9 +497,9 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
       ACE_CHECK;
 
       this->member_ =
-        TAO::MakeDynAnyUtils<CORBA::TypeCode_ptr>::make_dyn_any_t (
-          default_tc.in (),
-          default_tc.in ());
+        TAO_DynAnyFactory::make_dyn_any (default_tc.in ()
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       // Default member active (CORBA 2.3.1).
       this->current_position_ = 0;
@@ -741,7 +739,8 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any
 
       // Set the from_factory arg to FALSE, so any problems will throw
       // TypeMismatch.
-      this->set_from_any (any
+      this->set_from_any (any,
+                          0
                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index e3498b65ef9..c7aa9c1377e 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -178,7 +178,8 @@ public:
 private:
   /// Code common to the constructor from an Any arg and the member
   /// function from_any().
-  void set_from_any (const CORBA::Any &any
+  void set_from_any (const CORBA::Any &any,
+                     CORBA::Boolean from_factory
                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp
index d11b799ccde..ae1a690a5a8 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp
@@ -25,7 +25,7 @@ TAO_DynValueBox_i::get_boxed_value (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  return 0;
 }
 
 void
@@ -39,7 +39,6 @@ TAO_DynValueBox_i::set_boxed_value (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 DynamicAny::DynAny_ptr
@@ -51,8 +50,7 @@ TAO_DynValueBox_i::get_boxed_value_as_dyn_any (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    DynamicAny::DynAny::_nil ());
+  return DynamicAny::DynAny::_nil ();
 }
 
 void
@@ -65,7 +63,6 @@ TAO_DynValueBox_i::set_boxed_value_as_dyn_any (
       DynamicAny::DynAny::TypeMismatch
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
index ba824c12188..9637088f987 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
@@ -23,7 +23,7 @@ TAO_DynValueCommon_i::is_null (
       CORBA::SystemException
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+  return true;
 }
   
 void
@@ -33,7 +33,6 @@ TAO_DynValueCommon_i::set_to_null (
       CORBA::SystemException
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
   
 void
@@ -43,7 +42,6 @@ TAO_DynValueCommon_i::set_to_value (
       CORBA::SystemException
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp
index 60bcd9dd209..316eeed5bd5 100644
--- a/TAO/tao/DynamicAny/DynValue_i.cpp
+++ b/TAO/tao/DynamicAny/DynValue_i.cpp
@@ -25,7 +25,7 @@ TAO_DynValue_i::current_member_name (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  return 0;
 }
 
 CORBA::TCKind
@@ -37,8 +37,7 @@ TAO_DynValue_i::current_member_kind (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    CORBA::tk_null);
+  return CORBA::tk_null;
 }
 
 DynamicAny::NameValuePairSeq *
@@ -48,7 +47,7 @@ TAO_DynValue_i::get_members (
       CORBA::SystemException
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  return 0;
 }
 
 void
@@ -61,7 +60,6 @@ TAO_DynValue_i::set_members (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 DynamicAny::NameDynAnyPairSeq *
@@ -71,7 +69,7 @@ TAO_DynValue_i::get_members_as_dyn_any (
       CORBA::SystemException
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  return 0;
 }
 
 void
@@ -84,7 +82,6 @@ TAO_DynValue_i::set_members_as_dyn_any (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc
index 0225830fbdf..7e01c656a18 100644
--- a/TAO/tao/DynamicInterface.mpc
+++ b/TAO/tao/DynamicInterface.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, messaging, core_minimum_corba {
+project : taolib, core, messaging, core_minimum_corba {
   sharedname   = TAO_DynamicInterface
   dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL
 
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index f437ba7fb80..3edab19588b 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -35,7 +35,7 @@ CORBA::Context::_incr_refcnt (void)
 CORBA::ULong
 CORBA::Context::_decr_refcnt (void)
 {
-  CORBA::ULong const new_count = --this->refcount_;
+  const CORBA::ULong new_count = --this->refcount_;
 
   if (new_count == 0)
     delete this;
@@ -118,7 +118,7 @@ CORBA::ContextList::~ContextList (void)
 {
   for (CORBA::ULong i = 0; i < this->count (); ++i)
     {
-      char **ctx = 0;
+      char **ctx;
 
       if (this->ctx_list_.get (ctx, i) == -1)
         {
@@ -175,7 +175,7 @@ CORBA::ContextList::_duplicate (void)
 void
 CORBA::ContextList::_destroy (void)
 {
-  CORBA::ULong const current = --this->ref_count_;
+  CORBA::ULong current = --this->ref_count_;
 
   if (current == 0)
     {
@@ -186,13 +186,13 @@ CORBA::ContextList::_destroy (void)
 void
 CORBA::ContextList::_incr_refcnt (void)
 {
-  ++this->ref_count_;
+  this->ref_count_++;
 }
 
 void
 CORBA::ContextList::_decr_refcnt (void)
 {
-  --this->ref_count_;
+  this->ref_count_--;
 
   if (this->ref_count_ != 0)
     {
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index 3118f59a81d..d72c4f43420 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -108,7 +108,7 @@ namespace TAO
   void
   NVList_Argument::interceptor_paramlist (Dynamic::ParameterList *lst)
   {
-    CORBA::ULong const len = this->x_->count ();
+    const CORBA::ULong len = this->x_->count ();
     lst->length (len);
 
     for (CORBA::ULong i = 0; i < len; ++i)
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
index ec8e6788bef..7e570ba0e3f 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -26,7 +26,7 @@ TAO_DII_Arguments_Converter_Impl::convert (
   // in collocation case and the server expects the list of arguments
   // and not the NVList_Argument, we need expand the NVList_Argument
   // to be list of Arguments.
-
+  
   // Before expanding NVList_Argument logic was added, the
   // $TAO_ROOT/tests/DII_Collocated_Tests/run_test.pl should fail.
   // The servant will get incorrect "IN" parameter from the oneway
@@ -36,7 +36,7 @@ TAO_DII_Arguments_Converter_Impl::convert (
   CORBA::NVList_ptr lst
     = static_cast<TAO::NVList_Argument *> (server_request.operation_details ()->args()[1])->arg ();
 
-  CORBA::ULong const sz = lst->count (ACE_ENV_SINGLE_ARG_PARAMETER);
+  const CORBA::ULong sz = lst->count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (sz != nargs - 1)
@@ -52,7 +52,7 @@ TAO_DII_Arguments_Converter_Impl::convert (
     {
       CORBA::NamedValue_ptr theitem = lst->item (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-
+      
       if (!(theitem->value ()->impl ()->marshal_value (output)))
         {
           ACE_THROW (CORBA::BAD_PARAM ());
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 34519883c93..799870a0f64 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -47,7 +47,7 @@ CORBA::Request::_decr_refcnt (void)
                       this->lock_,
                       0);
 
-    --this->refcount_;
+    this->refcount_--;
 
     if (this->refcount_ != 0)
       {
@@ -128,7 +128,7 @@ CORBA::Request::~Request (void)
   ACE_ASSERT (refcount_ == 0);
 
   ::CORBA::release (this->target_);
-  ::CORBA::string_free ((char*) this->opname_);
+  CORBA::string_free ((char*) this->opname_);
   this->opname_ = 0;
   ::CORBA::release (this->args_);
   ::CORBA::release (this->result_);
@@ -144,8 +144,12 @@ CORBA::Request::~Request (void)
 void
 CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
 {
+  const CORBA::Boolean argument_flag =
+    this->args_->_lazy_has_arguments ();
+
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
+
   TAO::NVList_Argument _tao_in_list (this->args_,
                                      this->lazy_evaluation_);
 
@@ -154,10 +158,17 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
     &_tao_in_list
   };
 
+  int number_args = 0;
+
+  if (argument_flag)
+    number_args = 2;
+  else
+    number_args = 1;
+
   TAO::DII_Invocation_Adapter _tao_call (
        this->target_,
        _tao_arg_list,
-       sizeof( _tao_arg_list ) / sizeof( TAO::Argument* ),
+       number_args,
        this->opname_,
        static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)),
        this->exceptions_.in (),
@@ -178,8 +189,12 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
 void
 CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL)
 {
+  const CORBA::Boolean argument_flag =
+    this->args_->_lazy_has_arguments ();
+
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
+
   TAO::NVList_Argument _tao_in_list (this->args_,
                                      this->lazy_evaluation_);
 
@@ -188,10 +203,17 @@ CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL)
     &_tao_in_list
   };
 
+  int number_args = 0;
+
+  if (argument_flag)
+    number_args = 2;
+  else
+    number_args = 1;
+
   TAO::Invocation_Adapter _tao_call (
       this->target_,
       _tao_arg_list,
-      sizeof( _tao_arg_list ) / sizeof( TAO::Argument* ),
+      number_args,
       this->opname_,
       static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)),
       0,
@@ -213,9 +235,10 @@ CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL)
                ace_mon,
                this->lock_);
 
-    this->response_received_ = false;
+    this->response_received_ = 0;
   }
-  CORBA::Boolean const argument_flag = this->args_->count () ? true : false;
+
+  const CORBA::Boolean argument_flag = this->args_->count () ? 1 : 0;
 
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
@@ -227,7 +250,7 @@ CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL)
     &_tao_in_list
   };
 
-  size_t number_args = 0;
+  int number_args = 0;
 
   if (argument_flag)
     number_args = 2;
@@ -320,7 +343,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
                    ace_mon,
                    this->lock_);
 
-        this->response_received_ = true;
+        this->response_received_ = 1;
       }
 
       break;
diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc
index 3d349a9db22..fe00fe7a5b7 100644
--- a/TAO/tao/EndpointPolicy.mpc
+++ b/TAO/tao/EndpointPolicy.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project : taolib, core, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, minimum_corba {
   sharedname   = TAO_EndpointPolicy
   dynamicflags = TAO_ENDPOINTPOLICY_BUILD_DLL
 
@@ -27,7 +27,7 @@ project : taolib, install, portableserver, pi, tao_versioning_idl_defaults, tao_
   }
 
   IDL_Files {
-    idlflags += -GA -SS -Sci -Sorb \
+    idlflags += -GA -SS -Sci -Ge 1 -Sorb \
                 -Wb,export_macro=TAO_EndpointPolicy_Export \
                 -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h \
                 -o EndpointPolicy
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl b/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl
index 3f0cc03b936..4e5c9b0e614 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl
+++ b/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl
@@ -9,7 +9,7 @@
  * This file was used to generate the code in
  * EndpointPolicyTypeC.* The command used to generate code is:
  * tao_idl
- *          -o orig -GA \
+ *          -o orig -Ge 1 -GA \
  *          -Wb,export_macro=TAO_EndpointPolicy_Export \
  *          -Wb,export_include="tao/EndpointPolicy/TAO_EndpointPolicy_Export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h
index 5eea21c1e1b..d198402cc5e 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h
@@ -28,10 +28,11 @@
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
 #include "tao/EndpointPolicy/EndpointPolicyC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_POA_Manager;
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //=============================================================================
 /**
  * @class TAO_Endpoint_Acceptor_Filter
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index b0f0d551994..91579c20c98 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -52,7 +52,7 @@ TAO_FILE_Parser::parse_string (const char *ior,
   if (file == 0)
     return CORBA::Object::_nil ();
 
-  ACE_Read_Buffer reader (file, true);
+  ACE_Read_Buffer reader (file, 1);
 
   char* string = reader.read ();
 
diff --git a/TAO/tao/FlResource.mpc b/TAO/tao/FlResource.mpc
index 6b3b0e1cd0c..0c0161c2d99 100644
--- a/TAO/tao/FlResource.mpc
+++ b/TAO/tao/FlResource.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(TAO_FlResource) : acelib, taolib, install, tao_output, taodefaults, ace_flreactor, tao_versioning_idl_defaults {
+project(TAO_FlResource) : acelib, taolib, core, tao_output, taodefaults, ace_flreactor, tao_versioning_idl_defaults {
 
   sharedname   = TAO_FlResource
   dynamicflags += TAO_FLRESOURCE_BUILD_DLL
diff --git a/TAO/tao/FlResource/FlResource_Factory.cpp b/TAO/tao/FlResource/FlResource_Factory.cpp
index 2071a22c25c..a280383b065 100644
--- a/TAO/tao/FlResource/FlResource_Factory.cpp
+++ b/TAO/tao/FlResource/FlResource_Factory.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/FlResource/FlResource_Factory.h"
 #include "tao/debug.h"
-#include "ace/FlReactor/FlReactor.h"
+#include "ace/FlReactor.h"
 
 ACE_RCSID( TAO_FlResource,
            FlResource_Factory,
diff --git a/TAO/tao/FlResource/FlResource_Factory.h b/TAO/tao/FlResource/FlResource_Factory.h
index 7d70cf7c5bd..28da6ab9341 100644
--- a/TAO/tao/FlResource/FlResource_Factory.h
+++ b/TAO/tao/FlResource/FlResource_Factory.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/FlReactor/FlReactor.h"
+#include "ace/FlReactor.h"
 #include "tao/GUIResource_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/FloatSeq.pidl b/TAO/tao/FloatSeq.pidl
index 3793e28d898..40b02b8f887 100644
--- a/TAO/tao/FloatSeq.pidl
+++ b/TAO/tao/FloatSeq.pidl
@@ -8,7 +8,7 @@
  *
  *     tao_idl
  *          -oA AnyTypeCode
- *          -GA -SS -Sci
+ *          -Ge 1 -GA -SS -Sci
  *          -Wb,pre_include=ace/pre.h
  *          -Wb,post_include=ace/post.h
  *          -Wb,export_macro=TAO_Export
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index 3fbce7bca86..eb6e86ca8c4 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -14,7 +14,7 @@
 //   is:
 //
 //     tao_idl
-//        -o orig -GA -I.. -SS -Sc
+//        -o orig -Ge 1 -GA -I.. -SS -Sc
 //          -Wb,export_macro=TAO_Export
 //          -Wb,export_include="tao/TAO_Export.h"
 //          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 5262caa29f6..97575e5d72b 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1797,6 +1797,7 @@ TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd,
       db = qd->msg_block_->data_block ()->duplicate ();
     }
 
+
   TAO_InputCDR input_cdr (db,
                           flg,
                           rd_pos,
@@ -1806,7 +1807,7 @@ TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd,
                           qd->minor_version_,
                           this->orb_core_);
 
-  if (qd->major_version_ == 1 &&
+  if (qd->major_version_ >= 1 &&
       (qd->minor_version_ == 0 || qd->minor_version_ == 1))
     {
       if (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_REQUEST ||
@@ -1814,20 +1815,32 @@ TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd,
         {
           IOP::ServiceContextList service_context;
 
-          if ((input_cdr >> service_context)
-              && (input_cdr >> request_id))
+          if ( ! (input_cdr >> service_context))
+            {
+              return -1;
+            }
+
+          if ( ! (input_cdr >> request_id))
             {
-              return 0;
+              return -1;
             }
+
+          return 0;
         }
       else if (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_CANCELREQUEST ||
                qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST ||
                qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREPLY)
         {
-          if ((input_cdr >> request_id))
+          if ( ! (input_cdr >> request_id) )
             {
-              return 0;
+              return -1;
             }
+
+          return 0;
+        }
+      else
+        {
+          return -1;
         }
     }
   else
@@ -1839,14 +1852,18 @@ TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd,
           qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST ||
           qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREPLY)
         {
-          // Dealing with GIOP-1.2, the request-id is located directly
-          // behind the GIOP-Header.  This is true for all message
-          // types that might be sent in form of fragments or
-          // cancel-requests.
-          if ((input_cdr >> request_id))
+          // Dealing with GIOP-1.2, the request-id is located directly behind the GIOP-Header.
+          // This is true for all message types that might be sent in form of fragments or cancel-requests.
+          if ( ! (input_cdr >> request_id) )
             {
-              return 0;
+              return -1;
             }
+
+          return 0;
+        }
+      else
+        {
+          return -1;
         }
     }
 
@@ -1855,9 +1872,7 @@ TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd,
 
 /* @return -1 error, 0 ok, +1 outstanding fragments */
 int
-TAO_GIOP_Message_Base::consolidate_fragmented_message (
-  TAO_Queued_Data * qd,
-  TAO_Queued_Data *& msg)
+TAO_GIOP_Message_Base::consolidate_fragmented_message (TAO_Queued_Data *qd, TAO_Queued_Data *&msg)
 {
   TAO::Incoming_Message_Stack reverse_stack;
 
diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp
index 55799ea5dcf..19f591b623c 100644
--- a/TAO/tao/GIOP_Message_State.cpp
+++ b/TAO/tao/GIOP_Message_State.cpp
@@ -77,21 +77,18 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming)
 
   if (this->message_size_ == 0)
     {
-      switch (this->message_type_)
+      if (this->message_type_ == TAO_GIOP_MESSAGERROR)
         {
-        case TAO_GIOP_MESSAGERROR:
-        case TAO_GIOP_CLOSECONNECTION:
           if (TAO_debug_level > 0)
             {
-              CORBA::Octet& t = this->message_type_;
-              const char* which =
-                (t == TAO_GIOP_CLOSECONNECTION) ? "CloseConnection" :
-                (t == TAO_GIOP_MESSAGERROR) ? "MessageError" : "unknown";
               ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - GIOP %s received \n", which));
+                          "TAO (%P|%t) -"
+                          "GIOP_MESSAGE_ERROR received \n"));
             }
           return 0;
-        default:
+        }
+      else
+        {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
                         "TAO (%P|%t) - "
diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h
index 50bb953f1c2..dc471999831 100644
--- a/TAO/tao/GIOP_Utils.h
+++ b/TAO/tao/GIOP_Utils.h
@@ -40,8 +40,8 @@ typedef enum GIOP_Messages
   TAO_GIOP_CANCELREQUEST = 2,          // by client.
   TAO_GIOP_LOCATEREQUEST = 3,          // by client.
   TAO_GIOP_LOCATEREPLY = 4,
-  TAO_GIOP_CLOSECONNECTION = 5,        // by both.
-  TAO_GIOP_MESSAGERROR = 6,            // by both.
+  TAO_GIOP_CLOSECONNECTION = 5,
+  TAO_GIOP_MESSAGERROR = 6,           // by both.
   TAO_GIOP_FRAGMENT = 7                // by both.
 }  TAO_GIOP_Message_Type;
 
diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp
index 33695590b87..a94f2e97302 100644
--- a/TAO/tao/GUIResource_Factory.cpp
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   GUIResource_Factory::GUIResource_Factory (void)
-    : dynamically_allocated_reactor_ (false)
+    : dynamically_allocated_reactor_ (0)
   {
   }
 
@@ -41,7 +41,7 @@ namespace TAO
       reactor = 0;
     }
     else
-      this->dynamically_allocated_reactor_ = true;
+      this->dynamically_allocated_reactor_ = 1;
 
     return reactor;
   }
@@ -51,7 +51,7 @@ namespace TAO
   {
     ACE_GUARD ( TAO_SYNCH_MUTEX, ace_mon, this->lock_ );
 
-    if (this->dynamically_allocated_reactor_)
+    if (this->dynamically_allocated_reactor_ == 1)
       delete reactor;
   }
 }
diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h
index e0f2dab0543..aae6da6ba35 100644
--- a/TAO/tao/GUIResource_Factory.h
+++ b/TAO/tao/GUIResource_Factory.h
@@ -59,8 +59,7 @@ namespace TAO
      */
     virtual ACE_Reactor *get_reactor (void) ;
 
-    /**
-     * Reclaim the reactor if allocated by this factory.
+    /** Reclaim the reactor if allocated by this factory.
      * Please note that this call is NOT synchronized. Left to the
      * higher level versions to synchronize access.
      */
@@ -68,8 +67,7 @@ namespace TAO
 
   protected:
 
-    /**
-     * Create or return current reactor instance.
+    /** Create or return current reactor instance.
      * Please note that this call is NOT synchronized. Left to the
      * get_reactor to synchronize access.
      */
@@ -78,9 +76,9 @@ namespace TAO
   private:
 
     /**
-     * Flag that is set to true if the reactor obtained from the
+     * Flag that is set to 1 if the reactor obtained from the
      * get_reactor() method is dynamically allocated.  If this flag is
-     * set to true, then the reclaim_reactor() method with call the delete
+     * set to 1, then the reclaim_reactor() method with call the delete
      * operator on the given reactor.  This flag is necessary to make
      * sure that a reactor not allocated by the default resource factory
      * is not reclaimed by the default resource factory.  Such a
@@ -88,7 +86,7 @@ namespace TAO
      * default one overrides the get_reactor() method but does not
      * override the reclaim_reactor() method.
      */
-    bool dynamically_allocated_reactor_;
+    int dynamically_allocated_reactor_;
 
     /// for internal locking.
     TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp
deleted file mode 100644
index a1091b80858..00000000000
--- a/TAO/tao/HTTP_Client.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-
-#include "tao/HTTP_Client.h"
-#include "tao/HTTP_Handler.h"
-#include "ace/OS_NS_string.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_HTTP_Client::TAO_HTTP_Client (void)
-{
-}
-
-TAO_HTTP_Client::~TAO_HTTP_Client (void)
-{
-  this->close ();
-}
-
-int
-TAO_HTTP_Client::open (const ACE_TCHAR *filename,
-                       const ACE_TCHAR *hostname,
-                       u_short port)
-{
-  this->filename_ = ACE_OS::strdup (filename);
-  this->inet_addr_.set (port, hostname);
-  return 0;
-}
-
-int
-TAO_HTTP_Client::read (ACE_Message_Block *mb)
-{
-  // Create a HTTP_Client Reader
-  TAO_HTTP_Reader HTTP_reader (mb, this->filename_);
-  TAO_HTTP_Handler *brp = &HTTP_reader;
-
-  // Connect to the server
-  if (connector_.connect (brp, this->inet_addr_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TAO_HTTP_Client::read(): Connector error\n"), -1);
-    }
-
-  return HTTP_reader.byte_count ();
-
-}
-
-int
-TAO_HTTP_Client::close (void)
-{
-  if (this->filename_)
-    {
-      ACE_OS::free ((void *) this->filename_);
-      this->filename_ = 0;
-    }
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
diff --git a/TAO/tao/HTTP_Client.h b/TAO/tao/HTTP_Client.h
deleted file mode 100644
index f7882226693..00000000000
--- a/TAO/tao/HTTP_Client.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    HTTP_Client.h
- *
- *  $Id$
- *
- *   This is the HTTP_Client class, which is the API for doing file
- *   uploads/downloads.
- *
- *  @author Stoyan Paunov
- */
-//=============================================================================
-
-
-#ifndef TAO_HTTP_CLIENT_H
-#define TAO_HTTP_CLIENT_H
-
-#include /**/ "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/INET_Addr.h"
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Connector.h"
-#include "ace/Message_Block.h"
-#include "tao/HTTP_Handler.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_HTTP_Client
- *
- * @brief HTTP_Client is intended to provide application API to
- * classes that wish to do network i/o at a very
- * high level of abstraction.
- *
- * This class provides the ability to retrieve data from
- * the network, of specified length and offset, and potentially
- * use any protocol "under the hood" to do so. It currently
- * uses HTTP. See HTTP_Handler also.
- */
-class TAO_Export TAO_HTTP_Client
-{
-public:
-  TAO_HTTP_Client (void);
-  ~TAO_HTTP_Client (void);
-
-  /// Initializes the class with the given filename, hostname and port.
-  /// it should be called with the filename, before any read/write calls
-  int open (const ACE_TCHAR *filename,
-            const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST,
-            u_short port = 80);
-
-  /// Starts a connection, and reads a file from the server into
-  /// Message_Block mb
-  int read (ACE_Message_Block *mb);
-
-  /// Frees memory allocated for filename.
-  int close ();
-
-private:
-  /// Store the internet address of the server
-  ACE_INET_Addr inet_addr_;
-
-  /// The filename
-  ACE_TCHAR *filename_;
-
-  /// The connector endpoint to initiate the client connection
-  ACE_Connector<TAO_HTTP_Handler, ACE_SOCK_CONNECTOR> connector_;
-
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_HTTP_CLIENT_H */
diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp
deleted file mode 100644
index 16e3c2c70c0..00000000000
--- a/TAO/tao/HTTP_Handler.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// $Id$
-
-#include "tao/HTTP_Handler.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_strings.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_HTTP_Handler::TAO_HTTP_Handler (void)
-{
-}
-
-TAO_HTTP_Handler::TAO_HTTP_Handler (ACE_Message_Block * mb,
-                            ACE_TCHAR *filename) :
-  mb_ (mb),
-  filename_ (ACE_OS::strdup (filename)),
-  bytecount_ (0)
-{
-}
-
-TAO_HTTP_Handler::~TAO_HTTP_Handler (void)
-{
-  if (this->filename_)
-    {
-      ACE_OS::free (this->filename_);
-      filename_ = 0;
-    }
-}
-
-int
-TAO_HTTP_Handler::open (void *)
-{
-  if (this->send_request () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TAO_HTTP_Handler::open():send_request failed\n"), -1);
-
-  if (this->receive_reply () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TAO_HTTP_Handler::open():receive_reply failed\n"), -1);
-  return 0;
-
-}
-
-int
-TAO_HTTP_Handler::close (u_long)
-{
-  return 0;
-}
-
-int
-TAO_HTTP_Handler::send_request (void)
-{
-  return -1;
-}
-
-int
-TAO_HTTP_Handler::receive_reply (void)
-{
-  return -1;
-}
-
-size_t
-TAO_HTTP_Handler::byte_count (void) const
-{
-  return bytecount_;
-}
-
-// Reader **************************************************
-
-TAO_HTTP_Reader::TAO_HTTP_Reader (ACE_Message_Block * mb,
-                                  ACE_TCHAR *filename,
-                                  const char *request_prefix,
-                                  const char *request_suffix) :
-  TAO_HTTP_Handler (mb, filename),
-  request_prefix_ (request_prefix),
-  request_suffix_ (request_suffix)
-{
-}
-
-int
-TAO_HTTP_Reader::send_request (void)
-{
-  char mesg [MAX_HEADER_SIZE];
-
-  // Check to see if the request is too big
-  if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_)
-                         + ACE_OS::strlen (filename_)
-                         + ACE_OS::strlen (request_suffix_) + 4))
-    ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1);
-
-  // Create a message to send to the server requesting retrieval of the file
-  int const len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_);
-
-  // Send the message to server
-  if (peer ().send_n (mesg, len) != len)
-    ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1);
-
-  return 0;
-}
-
-int
-TAO_HTTP_Reader::receive_reply (void)
-{
-  size_t num_recvd = 0;
-  char buf [MTU+1];
-  char *buf_ptr = 0;
-  size_t bytes_read = 0;
-
-  // Receive the first MTU bytes and strip the header off.
-  // Note that we assume that the header will fit into MTU bytes.
-  if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0)
-    {
-      //Make sure that response type is 200 OK
-      if (ACE_OS::strstr (buf,"200 OK") == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                            "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1);
-
-      // Search for the header termination string "\r\n\r\n", or "\n\n". If
-      // found, move past it to get to the data portion.
-      if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0)
-        buf_ptr += 4;
-      else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0)     //for compatibility with JAWS
-        buf_ptr += 2;
-      else
-        buf_ptr = buf;
-
-      // Determine number of data bytes read. This is equal to the
-      // total bytes read minus number of header bytes.
-      bytes_read = num_recvd - (buf_ptr - buf);
-
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
-    }
-
-  // ***************************************************************
-  // At this point, we have stripped off the header and are ready to
-  // process data. buf_ptr points to the data
-
-  ACE_Message_Block* temp = 0;
-  ACE_Message_Block* curr = this->mb_;
-
-  ACE_NEW_RETURN (temp,
-                  ACE_Message_Block (bytes_read),
-                  -1);
-  curr->cont (temp);
-  curr = curr->cont ();
-
-  // Copy over all the data bytes into our message buffer.
-  if (curr->copy (buf_ptr, bytes_read) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
-                          "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1);
-    }
-
-  // read the rest of the data into a number of ACE_Message_Blocks and
-  // chain them together in a link list fashion
-  num_recvd = 0;
-
-  do
-  {
-    if (curr->space () == 0)
-    {
-      ACE_NEW_RETURN (temp,
-                      ACE_Message_Block (MTU),
-                      -1);
-      curr->cont (temp);
-      curr = curr->cont ();
-    }
-
-  if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0)
-    {
-      // Move the write pointer
-      curr->wr_ptr (num_recvd);
-
-      // Increment bytes_read
-      bytes_read += num_recvd;
-
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "TAO_HTTP_Reader::receive_reply(): Error while reading header\n"), -1);
-    }
-  } while (num_recvd != 0);
-
-  // Set the byte count to number of bytes received
-  this->bytecount_ = bytes_read;
-
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
diff --git a/TAO/tao/HTTP_Handler.h b/TAO/tao/HTTP_Handler.h
deleted file mode 100644
index f789f07915d..00000000000
--- a/TAO/tao/HTTP_Handler.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    HTTP_Handler.h
- *
- *  $Id$
- *
- *   HTTP_Handler is a base class for HTTP_Reader and
- *   HTTP_Writer which are created in response to calls to
- *   read/write, as appropriate
- */
-//=============================================================================
-
-
-#ifndef TAO_HTTP_HANDLER_H
-#define TAO_HTTP_HANDLER_H
-
-#include /**/ "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Message_Block.h"
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_HTTP_Handler
- * class to retrieve data via HTTP
- */
-class TAO_Export TAO_HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  /// Null constructor, insures that it works properly with Connector
-  TAO_HTTP_Handler (void);
-
-  /// Always use this constructor to make HTTP_Handlers
-  TAO_HTTP_Handler (ACE_Message_Block *mb,
-                    ACE_TCHAR *filename);
-
-  /// returns the number of bytes read/written in the last operation.
-  size_t byte_count (void) const;
-
-  /// Activate this instance of the <HTTP_Handler>
-  virtual int open (void * = 0);
-
-  /// Close down the Blob
-  virtual int close (u_long flags = 0);
-
-  ~TAO_HTTP_Handler (void);
-
-protected:
-  virtual int send_request (void);
-  virtual int receive_reply (void);
-
-  ACE_Message_Block *mb_;
-  ACE_TCHAR *filename_;
-  size_t bytecount_;
-  enum
-  {
-    /// The handler assumes that the first 2048 bytes of a server response
-    /// contains the header
-    MAX_HEADER_SIZE = 2048,
-
-    /// set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS
-    MTU = BUFSIZ
-  };
-};
-
-class TAO_HTTP_Reader : public TAO_HTTP_Handler
-{
-public:
-  TAO_HTTP_Reader (ACE_Message_Block *mb,
-                   ACE_TCHAR *filename,
-                   const char *request_prefix = "GET",
-                   const char *request_suffix = "HTTP/1.0\r\nAccept: HTTP/1.0\r\n\r\n");
-
-private:
-  //NOTE: these functions return -1 on error
-  int send_request (void);
-  int receive_reply (void);
-  const char *request_prefix_;
-  const char *request_suffix_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_HTTP_HANDLER_H */
diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp
deleted file mode 100644
index 496734e91b0..00000000000
--- a/TAO/tao/HTTP_Parser.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-// $Id$
-
-#include "tao/HTTP_Parser.h"
-#include "tao/HTTP_Client.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-
-#include "ace/Read_Buffer.h"
-#include "ace/Malloc_Base.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (tao,
-           HTTP_Parser,
-           "$Id$")
-
-static const char file_prefix[] = "http:";
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_HTTP_Parser::~TAO_HTTP_Parser (void)
-{
-}
-
-
-bool
-TAO_HTTP_Parser::match_prefix (const char *ior_string) const
-{
-  return (ACE_OS::strncmp (ior_string,
-                           ::file_prefix,
-                           sizeof (::file_prefix) - 1) == 0);
-}
-
-CORBA::Object_ptr
-TAO_HTTP_Parser::parse_string (const char *ior,
-                               CORBA::ORB_ptr orb
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Skip the prefix, we know it is there because this method in only
-  // called if <match_prefix> returns 1.
-  const char *http_url =
-    ior + sizeof (::file_prefix) + 1;
-
-  ACE_TCHAR *hostname = 0;
-  ACE_TCHAR *filename = 0;
-  const ACE_TCHAR *ptr = 0;
-  u_short port = 80;
-
-  if (http_url[0] == '/')
-    {
-      filename = ACE_OS::strdup (http_url);
-    }
-  else
-    {
-      ptr = ACE_OS::strstr (http_url, ":");
-      if (ptr)
-        port = ACE_OS::atoi (ptr + 1);
-      else
-        ptr = ACE_OS::strstr (http_url, "/");
-
-    if(!ptr)
-      return 0;
-    else
-    {
-      size_t const host_len = ptr - http_url;
-      ACE_NEW_RETURN (hostname, char [host_len + 1], 0 );
-      ACE_OS::strncpy (hostname, http_url, host_len);
-      hostname [host_len] = '\0';
-      ptr = ACE_OS::strstr (ptr, "/");
-      if (ptr)
-      {
-        filename = ACE_OS::strdup(ptr);
-      }
-      else
-        return 0;
-    }
-  }
-
-  ACE_Message_Block* mb = 0;
-  ACE_NEW_THROW_EX (mb,
-                    ACE_Message_Block (),
-                    CORBA::INTERNAL ());
-
-  // Create a client
-  TAO_HTTP_Client client;
-
-  if (TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) HTTP_Parser::parse_string, getting IOR from <%s> <%s> <%d>\n"),
-                  hostname, filename, port));
-    }
-
-  // Open the client
-  if (client.open (filename,
-                   hostname,
-                   port) == -1)
-  {
-      client.close ();
-      return 0;
-  }
-
-  delete [] hostname;
-  ACE_OS::free (filename);
-
-  // Read from it
-  if (client.read (mb) <= 0)
-  {
-      client.close ();
-      return 0;
-  }
-
-  // We get multiple message blocks back, concatenate them to
-  // one large string
-  ACE_CString string;
-  for (ACE_Message_Block * curr = mb; curr != 0; curr = curr->cont ())
-    string += curr->rd_ptr();
-
-  CORBA::Object_ptr object = CORBA::Object::_nil ();
-  ACE_TRY
-    {
-      object = orb->string_to_object (string.c_str() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return object;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DEFINE (TAO_HTTP_Parser,
-                       ACE_TEXT ("HTTP_Parser"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_HTTP_Parser),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_HTTP_Parser)
-
-
diff --git a/TAO/tao/HTTP_Parser.h b/TAO/tao/HTTP_Parser.h
deleted file mode 100644
index 8396039e864..00000000000
--- a/TAO/tao/HTTP_Parser.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file   HTTP_Parser.h
- *
- *  $Id$
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-
-#ifndef TAO_HTTP_PARSER_H
-#define TAO_HTTP_PARSER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IOR_Parser.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_HTTP_Parser
- *
- * @brief Implements the <http:> IOR format
- *
- * This class implements the <http:> IOR format.
- * It is dynamically loaded by the ORB and used to get an IOR
- * from a http server and then interprete the data as an IOR (that
- * can be in any valid format).
- */
-class TAO_HTTP_Parser : public TAO_IOR_Parser
-{
-public:
-
-  /// The destructor
-  virtual ~TAO_HTTP_Parser (void);
-
-  // = The IOR_Parser methods, please read the documentation in
-  //   IOR_Parser.h
-  virtual bool match_prefix (const char *ior_string) const;
-  virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_HTTP_Parser)
-ACE_FACTORY_DECLARE (TAO, TAO_HTTP_Parser)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_HTTP_PARSER_H */
-
diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc
index 81eae8994fa..56f334456f0 100644
--- a/TAO/tao/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
+project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
   sharedname   = TAO_IFR_Client
   dynamicflags = TAO_IFR_CLIENT_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -SS -GX \
+    idlflags += -SS -Ge 1 -GX \
                 -Wb,stub_export_macro=TAO_IFR_Client_Export \
                 -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h \
                 -o IFR_Client
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 90ca3824737..754dadb1a90 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -14,7 +14,7 @@
  *
  * The command used to generate code from this IDL file is:
  *
- *   tao_idl -GT -I../.. \
+ *   tao_idl -Ge 1 -GT -I../.. \
  *        -Wb,export_macro=TAO_IFR_Client_Export \
  *        -Wb,export_include=ifr_client_export.h \
  *        -Wb,pre_include="ace/pre.h" \
@@ -30,7 +30,7 @@
  *
  * To generate the skeleton files for the IFR Service, the command is:
  *
- *   tao_idl -o ../../orbsvcs/orbsvcs/IFRService \
+ *   tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
  *        -Wb,pre_include="ace/pre.h" \
  *        -Wb,post_include="ace/post.h" \
  *        IFR_Base.pidl
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index eeab5b1bc63..82f7063c51f 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -13,7 +13,7 @@
  *
  * The command used to generate code from this IDL file is:
  *
- *     tao_idl -GT -I../.. \
+ *     tao_idl -Ge 1 -GT -I../.. \
  *          -Wb,export_macro=TAO_IFR_Client_Export \
  *          -Wb,export_include=ifr_client_export.h \
  *          -Wb,pre_include="ace/pre.h" \
@@ -29,7 +29,7 @@
  *
  *   To generate the skeleton files for the IFR Service, the command is:
  *
- *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService \
+ *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
  *          IFR_Basic.pidl
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 17e928e1ed6..636c1adecd0 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -147,7 +147,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote (
   return _tao_retval.retn ();
 }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 void
 TAO_IFR_Client_Adapter_Impl::create_operation_list (
     CORBA::ORB_ptr orb,
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index 3686f11a0cd..e3cfcd6b22d 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -68,7 +68,7 @@ public:
       ACE_ENV_ARG_DECL
     );
 
-#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
   virtual void create_operation_list (
       CORBA::ORB_ptr orb,
       CORBA::OperationDef_ptr,
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 3bd9adeb3c8..bad6a63dbf7 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -13,7 +13,7 @@
  *
  *   The command used to generate code from this IDL file is:
  *
- *     tao_idl -GT -I../.. \
+ *     tao_idl -Ge 1 -GT -I../.. \
  *          -Wb,export_macro=TAO_IFR_Client_Export \
  *          -Wb,export_include=ifr_client_export.h \
  *          -Wb,pre_include="ace/pre.h" \
@@ -29,7 +29,7 @@
  *
  *   To generate the skeleton files for the IFR Service, the command is:
  *
- *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService \
+ *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
  *          IFR_Components.pidl
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index c45562b777f..be97275f02e 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -13,7 +13,7 @@
  *
  *   The command used to generate code from this IDL file is:
  *
- *     tao_idl -GT -I../.. \
+ *     tao_idl -Ge 1 -GT -I../.. \
  *          -Wb,export_macro=TAO_IFR_Client_Export \
  *          -Wb,export_include=ifr_client_export.h \
  *          -Wb,pre_include="ace/pre.h" \
@@ -29,7 +29,7 @@
  *
  *   To generate the skeleton files for the IFR Service, the command is:
  *
- *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService \
+ *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
  *          IFR_Extended.pidl
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index 6f85a0af52e..cf41c584ee8 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -88,7 +88,7 @@ public:
       ACE_ENV_ARG_DECL
     ) = 0;
 
-#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
   virtual void create_operation_list (
                CORBA::ORB_ptr orb,
                CORBA::OperationDef_ptr,
diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl
index cb5d6606a9d..9a6762f5228 100644
--- a/TAO/tao/IIOP.pidl
+++ b/TAO/tao/IIOP.pidl
@@ -9,7 +9,7 @@
  *   is:
  *
  *     tao_idl \
- *        -o orig -Gp -Gd -GA -Sci
+ *        -o orig -Gp -Gd -Ge 1 -GA -Sci
  *          -Wb,export_macro=TAO_Export \
  *          -Wb,export_include="tao/TAO_Export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 30758b60b00..ce96357b3b2 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -326,11 +326,6 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
       if (this->probe_interfaces (orb_core, def_type) == -1)
         return -1;
 
-      // Probe interfaces has a side effect of potentially modifying
-      // the default address, since that is where the address family
-      // is considered.
-      addr.set(this->default_address_);
-
       return this->open_i (addr, reactor);
     }
 
@@ -1190,7 +1185,15 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
                            ACE_TEXT ("TAO (%P|%t) Zero length IIOP ")
                            ACE_TEXT ("option name.\n")),
                           -1);
-      if (name == "portspan")
+      if (name == "priority")
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ")
+                             ACE_TEXT ("endpoint priorities no longer supported. \n"),
+                             value.c_str ()),
+                            -1);
+        }
+      else if (name == "portspan")
         {
           int range = static_cast <int> (ACE_OS::atoi (value.c_str ()));
           // @@ What's the lower bound on the range?  zero, or one?
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 3f62e43d82e..447c3d511ee 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -24,7 +24,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_IIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2),
+    connection_pending_ (false)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -40,7 +41,8 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
   CORBA::Boolean flag)
   : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2),
+    connection_pending_ (false)
 {
   TAO_IIOP_Transport* specific_transport = 0;
   ACE_NEW (specific_transport,
@@ -53,7 +55,8 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
 TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core)
   : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2),
+    connection_pending_ (false)
 {
 }
 
@@ -88,9 +91,6 @@ TAO_IIOP_Connection_Handler::open_handler (void *v)
 int
 TAO_IIOP_Connection_Handler::open (void*)
 {
-  if (this->shared_open() == -1)
-    return -1;
-
   TAO_IIOP_Protocol_Properties protocol_properties;
 
   // Initialize values from ORB params.
@@ -264,12 +264,27 @@ TAO_IIOP_Connection_Handler::open (void*)
   // compilers
   if (!this->transport ()->post_open ((size_t) this->get_handle ()))
     return -1;
+  if (this->connection_pending_)
+    {
+      this->connection_pending_ = false;
+      this->remove_reference();
+    }
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
                        this->orb_core ()->leader_follower ());
 
   return 0;
 }
 
+void
+TAO_IIOP_Connection_Handler::connection_pending (void)
+{
+  if (!this->connection_pending_)
+    {
+      this->connection_pending_ = true;
+      this->add_reference();
+    }
+}
+
 int
 TAO_IIOP_Connection_Handler::resume_handler (void)
 {
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index d00a736d5a4..a1405bf541d 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -112,6 +112,15 @@ public:
   /// hang around.
   void abort (void);
 
+  /// When waiting for an asynchronous connection to complete an
+  /// additional reference must be maintained, related to bugzilla
+  /// #2417. However once the connection is successfully established,
+  /// this reference must be removed. Using connection_pending allows
+  /// the connection handler to know that it is opening as a result of
+  /// a delayed asynch connection rather than an immediate synch
+  /// connection, which has no additional reference needs.
+  void connection_pending (void);
+
 protected:
 
   /// Constructor that could be used by the derived classes.
@@ -135,6 +144,9 @@ private:
 
   /// Stores the type of service value.
   int dscp_codepoint_;
+
+  /// Stores the connection pending state
+  bool connection_pending_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 3d509136a89..e2aa959519d 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -25,17 +25,7 @@ ACE_RCSID (tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Uncomment *one* of the the following defines if you want to explicitly induce
-// the race condition defined in Bug 2654. These enable the introduction of a
-// slight delay during connection completion processing.
-// A - before checking the connection_pending status
-// B - after A but before checking the connection error result
-// C - acter B but before caching
-// D - after caching
-//#define INDUCE_BUG_2654_A
-//#define INDUCE_BUG_2654_B
-//#define INDUCE_BUG_2654_C
-//#define INDUCE_BUG_2654_D
+
 
 //-----------------------------------------------------------------------------
 
@@ -434,25 +424,6 @@ TAO_IIOP_Connector::complete_connection (int result,
             }
         }
     }
-
-#if defined (INDUCE_BUG_2654_A)
-  // This is where the fatal error would occur. A pending asynch
-  // connection would fail, the failure handled by another thread,
-  // closing the connection.  However the remainder of this method
-  // only checked to see if the keep_waiting status was true, and bump
-  // the refcount then. However if the status was really
-  // error_detected, then no bump in refcount occured allowing the
-  // connection_handler's close_handler method to effectively steal
-  // the reference to be handed back to the caller. That would then
-  // trigger an abort as the profile_transport_resolver (our caller)
-  // to delete the transport while it is still cached.
-  ACE_Time_Value udelay(0,600);
-  struct timespec ts = udelay;
-  ACE_OS::nanosleep (&ts);
-#endif // INDUCE_BUG_2654_A
-
-  int retval = -1;
-
   // At this point, the connection has been successfully created
   // connected or not connected, but we have a connection.
   TAO_IIOP_Connection_Handler *svc_handler = 0;
@@ -460,21 +431,17 @@ TAO_IIOP_Connector::complete_connection (int result,
 
   if (transport != 0)
     {
-      if (count == 1)
-        {
-          svc_handler = sh_list[0];
-          iiop_endpoint = ep_list[0];
-        }
-      else
+      for (unsigned i = 0; i < count; i++)
         {
-          for (unsigned i = 0; i < count; i++)
+          if (transport == tlist[i])
             {
-              if (transport == tlist[i])
+              svc_handler = sh_list[i];
+              if (transport->connection_handler()->keep_waiting())
                 {
-                  svc_handler = sh_list[i];
-                  iiop_endpoint = ep_list[i];
-                  break;
+                  svc_handler->connection_pending();
                 }
+              iiop_endpoint = ep_list[i];
+              break;
             }
         }
     }
@@ -503,31 +470,6 @@ TAO_IIOP_Connector::complete_connection (int result,
       return 0;
     }
 
-  if (svc_handler->keep_waiting())
-    {
-      svc_handler->connection_pending();
-    }
-
-#if defined (INDUCE_BUG_2654_B)
-  // It is possible for the connection failure to be processed after bumping
-  // the reference count and before we plan to cache the connection. Prior to
-  // fixing bug 2654, this would lead to a failed connection in the cache.
-  // Though not a fatal condition, it was certainly wasteful of resources.
-  ACE_Time_Value udelay(0,600);
-  struct timespec ts = udelay;
-  ACE_OS::nanosleep (&ts);
-#endif // INDUCE_BUG_2654_B
-
-  // Fix for bug 2654.
-  if (transport->connection_handler()->error_detected())
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG((LM_DEBUG,
-                   ACE_TEXT("TAO (%P|%t) - IIOP_Connector::make_connection, ")
-                   ACE_TEXT("transport in error before cache! \n")));
-      transport->connection_handler()->cancel_pending_connection();
-      return 0;
-    }
 
   if (TAO_debug_level > 2)
     {
@@ -541,25 +483,16 @@ TAO_IIOP_Connector::complete_connection (int result,
                 svc_handler->peer ().get_handle ()));
     }
 
-#if defined (INDUCE_BUG_2654_C)
-  // This sets up the possibility that a failed connection is detected after we
-  // checked the connection status but before we cached the connection. This
-  // will allow a failed connection to be cached
-  ACE_Time_Value udelay(0,600);
-  struct timespec ts = udelay;
-  ACE_OS::nanosleep (&ts);
-#endif // INDUCE_BUG_2654_C
-
-
   // Add the handler to Cache
-  if (count == 1 || desc.reset_endpoint(iiop_endpoint))
+  int retval = -1;
+  if (count == 1U || desc.reset_endpoint(iiop_endpoint))
     {
       retval = this->orb_core ()->
         lane_resources ().transport_cache ().cache_transport (&desc,
                                                               transport);
     }
 
-  // Failure in adding to cache
+  // Failure in adding to cache.
   if (retval != 0)
     {
       // Close the handler.
@@ -575,31 +508,6 @@ TAO_IIOP_Connector::complete_connection (int result,
       return 0;
     }
 
-  // Other part of fix for bug 2654.
-  // It is possible that after checking for a connection failure but
-  // before caching, the connection really failed, thus an invalid
-  // connection is put into the cache. Thus we do one last status
-  // check before handing the connection back to the caller.
-  if (svc_handler->error_detected())
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG((LM_DEBUG,
-                   ACE_TEXT("TAO (%P|%t) - IIOP_Connector::make_connection, ")
-                   ACE_TEXT("transport in error after cache! \n")));
-      svc_handler->cancel_pending_connection();
-      transport->purge_entry();
-      return 0;
-    }
-
-
-#if defined (INDUCE_BUG_2654_D)
-  // at this point the connection handler's close connection will manage
-  // purging the entry from the cache so we are fine there.
-  ACE_Time_Value udelay(0,600);
-  struct timespec ts = udelay;
-  ACE_OS::nanosleep (&ts);
-#endif // INDUCE_BUG_2654_D
-
   if (transport->is_connected () &&
       transport->wait_strategy ()->register_handler () != 0)
     {
diff --git a/TAO/tao/IIOP_Endpoints.pidl b/TAO/tao/IIOP_Endpoints.pidl
index 72819ca75d4..192000d8536 100644
--- a/TAO/tao/IIOP_Endpoints.pidl
+++ b/TAO/tao/IIOP_Endpoints.pidl
@@ -14,7 +14,7 @@
  * is:
  *
  * tao_idl
- *          -o orig -GA -Sci \
+ *          -o orig -Ge 1 -GA -Sci \
  *          -Wb,export_macro=TAO_Export \
  *          -Wb,export_include="tao/TAO_Export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index ceb6d1f4fec..63cc46e53f8 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -93,13 +93,8 @@ int
 TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 {
   // Decode host and port into the <endpoint_>.
-  // it is necessary to do it indirectly so that IPv6 host addresses
-  // can be evaluated correctly.
-  CORBA::String_var host;
-  CORBA::UShort port;
-
-  if (cdr.read_string(host.out()) == 0 ||
-      cdr.read_ushort (port) == 0)
+  if (cdr.read_string (this->endpoint_.host_.out ()) == 0
+      || cdr.read_ushort (this->endpoint_.port_) == 0)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -108,9 +103,6 @@ TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr)
       return -1;
     }
 
-  this->endpoint_.host(host.in());
-  this->endpoint_.port(port);
-
   if (cdr.good_bit ())
     {
       // Invalidate the object_addr_ until first access.
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index 5dee8585d10..90ed9c8b7f4 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -10,7 +10,7 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -St -Sp -SS -Sci
+ *        -o orig -St -Sp -Ge 1 -SS -Sci
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include="tao/TAO_Export.h"
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl
index 8a181d8164a..896ef455302 100644
--- a/TAO/tao/IOP_IOR.pidl
+++ b/TAO/tao/IOP_IOR.pidl
@@ -10,7 +10,7 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -GA -SS -Sci
+ *        -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc
index e086d8a455f..df213daacdd 100644
--- a/TAO/tao/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, portableserver, objreftemplate, pi, install, tao_versioning_idl_defaults {
+project : taolib, portableserver, objreftemplate, pi, core, tao_versioning_idl_defaults {
   sharedname    = TAO_IORInterceptor
   dynamicflags  = TAO_IORINTERCEPTOR_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : taolib, portableserver, objreftemplate, pi, install, tao_versioning_id
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sa -St \
                 -Wb,export_macro=TAO_IORInterceptor_Export \
                 -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h \
                 -Wb,include_guard=TAO_IORINTERCEPTOR_SAFE_INCLUDE \
@@ -38,7 +38,7 @@ project : taolib, portableserver, objreftemplate, pi, install, tao_versioning_id
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sa -St \
                 -Wb,export_macro=TAO_IORInterceptor_Export \
                 -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h \
                 -o IORInterceptor
diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl
index 48adfe9d342..86b21230a74 100644
--- a/TAO/tao/IORInterceptor/IORInfo.pidl
+++ b/TAO/tao/IORInterceptor/IORInfo.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -SS -Gd -Sa -St -Sci
+ *     -o orig -Gp -SS -Gd -Ge 1 -Sa -St -Sci
  *          -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_IORInterceptor_Export
  *          -Wb,export_include="iorinterceptor_export.h"
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl
index 255079acff1..40568168fd8 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor.pidl
+++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -Sa -St -Sci -SS
+ *     -o orig -Gp -Gd -Ge 1 -Sa -St -Sci -SS
  *          -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_IORInterceptor_Export
  *          -Wb,export_include="iorinterceptor_export.h"
diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc
index 5bd3e7dcb32..75e6315b616 100644
--- a/TAO/tao/IORManipulation.mpc
+++ b/TAO/tao/IORManipulation.mpc
@@ -1,6 +1,6 @@
 //$Id$
 
-project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
+project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
   sharedname   = TAO_IORManip
   dynamicflags = TAO_IORMANIP_BUILD_DLL
 
@@ -29,7 +29,7 @@ project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GX \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX \
                 -Wb,export_macro=TAO_IORManip_Export \
                 -Wb,export_include=tao/IORManipulation/ior_manip_export.h \
                 -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE \
diff --git a/TAO/tao/IORManipulation/IOR.pidl b/TAO/tao/IORManipulation/IOR.pidl
index 62d1e006697..94027389de6 100644
--- a/TAO/tao/IORManipulation/IOR.pidl
+++ b/TAO/tao/IORManipulation/IOR.pidl
@@ -10,7 +10,7 @@
  * To regenerate the code use:
  *
  * tao_idl \
- *        -o orig -Gp -Gd -GA -Sci \
+ *        -o orig -Gp -Gd -Ge 1 -GA -Sci \
  *          -Wb,export_macro=TAO_IORManip_Export \
  *          -Wb,export_include="ior_manip_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc
index d79b2c364fd..2f9e8106a19 100644
--- a/TAO/tao/IORTable.mpc
+++ b/TAO/tao/IORTable.mpc
@@ -1,6 +1,6 @@
 //$Id$
 
-project : taolib, install, tao_versioning_idl_defaults {
+project : taolib, core, tao_versioning_idl_defaults {
   sharedname   = TAO_IORTable
   dynamicflags = TAO_IORTABLE_BUILD_DLL
 
@@ -29,7 +29,7 @@ project : taolib, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb \
                 -Wb,export_macro=TAO_IORTable_Export \
                 -Wb,export_include=tao/IORTable/iortable_export.h \
                 -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE \
diff --git a/TAO/tao/IORTable/IORTable.pidl b/TAO/tao/IORTable/IORTable.pidl
index 67ca4308b17..f68bd177e2a 100644
--- a/TAO/tao/IORTable/IORTable.pidl
+++ b/TAO/tao/IORTable/IORTable.pidl
@@ -13,7 +13,7 @@
  *
  *   The command used to generate code from this file is:
  *
- *     tao_idl -o orig -Sa -St -Sci \
+ *     tao_idl -o orig -Ge 1 -Sa -St -Sci \
  *          -Wb,export_macro=TAO_IORTable_Export \
  *          -Wb,export_include=iortable_export.h \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client.mpc
index 786c3171610..d6e51a3c62a 100644
--- a/TAO/tao/ImR_Client.mpc
+++ b/TAO/tao/ImR_Client.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, portableserver, tao_versioning_idl_defaults {
+project : taolib, core, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_ImR_Client
   dynamicflags = TAO_IMR_CLIENT_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : taolib, install, portableserver, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Ssi -Gd -Sorb -GA \
+    idlflags += -Gp -Ssi -Gd -Ge 1 -Sorb -GA \
                 -Wb,export_macro=TAO_IMR_Client_Export \
                 -Wb,export_include=tao/ImR_Client/imr_client_export.h \
                 -o ImR_Client
@@ -37,7 +37,7 @@ project : taolib, install, portableserver, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Ssi -Gd -Sorb -GX \
+    idlflags += -Gp -Ssi -Gd -Ge 1 -Sorb -GX \
                 -Wb,export_macro=TAO_IMR_Client_Export \
                 -Wb,export_include=tao/ImR_Client/imr_client_export.h \
                 -o ImR_Client
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 621433e6e40..47fc9c960fe 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -81,7 +81,7 @@ namespace TAO
       // Since this method is called from the POA constructor, there
       // shouldn't be any waiting required.  Therefore,
       // <wait_occurred_restart_call_ignored> can be ignored.
-      bool wait_occurred_restart_call_ignored = false;
+      int wait_occurred_restart_call_ignored = 0;
 
       // Activate the servant in the root poa.
       PortableServer::ObjectId_var id =
diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
index 010899bda14..9806d3ada1e 100644
--- a/TAO/tao/ImR_Client/ImplRepo.pidl
+++ b/TAO/tao/ImR_Client/ImplRepo.pidl
@@ -10,7 +10,7 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl -Ssi -Gp -Gd -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl
+ *   tao_idl -Ssi -Gp -Gd -Ge 1 -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl
  *
  */
 //=============================================================================
diff --git a/TAO/tao/ImR_Client/ServerObject.pidl b/TAO/tao/ImR_Client/ServerObject.pidl
index 25439fc14cd..f74d1be86a9 100644
--- a/TAO/tao/ImR_Client/ServerObject.pidl
+++ b/TAO/tao/ImR_Client/ServerObject.pidl
@@ -10,7 +10,7 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl -Ssi -Gp -Gd -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ServerObject.pidl
+ *   tao_idl -Ssi -Gp -Gd -Ge 1 -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ServerObject.pidl
  *
  */
 //=============================================================================
diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h
index f0cfba43043..453af96fb24 100644..100755
--- a/TAO/tao/Incoming_Message_Stack.h
+++ b/TAO/tao/Incoming_Message_Stack.h
@@ -41,7 +41,7 @@ namespace TAO
  * Internal class, providing stack functionality for TAO_Queued_Data
  * objects.  Stack operations don't require memory allocation.
 */
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x590)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
 class TAO_Export Incoming_Message_Stack
 #else
 class Incoming_Message_Stack
diff --git a/TAO/tao/Incoming_Message_Stack.inl b/TAO/tao/Incoming_Message_Stack.inl
index fd13e03a54e..fd13e03a54e 100644..100755
--- a/TAO/tao/Incoming_Message_Stack.inl
+++ b/TAO/tao/Incoming_Message_Stack.inl
diff --git a/TAO/tao/InvalidName.pidl b/TAO/tao/InvalidName.pidl
index 40724fdb597..67546d33943 100644
--- a/TAO/tao/InvalidName.pidl
+++ b/TAO/tao/InvalidName.pidl
@@ -10,7 +10,7 @@
  * using the following command:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index b3577fb9e7e..5e39f482997 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -14,8 +14,6 @@
 #include "tao/GIOP_Utils.h"
 #include "tao/TAOC.h"
 
-#include "ace/Service_Config.h"
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Invocation_Adapter.inl"
 #endif /* __ACE_INLINE__ */
@@ -62,13 +60,6 @@ namespace TAO
                                 TAO_Operation_Details &details
                                 ACE_ENV_ARG_DECL)
   {
-    // The invocation has got to be within the context of the
-    // corresponding ORB's configuration. Otherwise things like
-    // timeout hooks, etc may not work as expected. Especially if
-    // there are multiple ORB instances in the process, each with its
-    // own, local configuration.
-    ACE_Service_Config_Guard scg (stub->orb_core ()->configuration ());
-
     // Cache the target to a local variable.
     CORBA::Object_var effective_target =
       CORBA::Object::_duplicate (this->target_);
@@ -344,7 +335,7 @@ namespace TAO
                                         r,
                                         details);
 
-    Invocation_Status const status =
+    Invocation_Status status =
       synch.remote_twoway (max_wait_time
                            ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
@@ -383,7 +374,7 @@ namespace TAO
                                         r,
                                         details);
 
-    Invocation_Status const s =
+    Invocation_Status s =
       synch.remote_oneway (max_wait_time
                            ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index a5558b74465..dd2ab25d2cf 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -155,7 +155,7 @@ namespace TAO
         ACE_ENDTRY;
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
-        PortableInterceptor::ReplyStatus const status =
+        const PortableInterceptor::ReplyStatus status =
           this->adapter_->reply_status (*this);
 
         if (status == PortableInterceptor::LOCATION_FORWARD ||
@@ -222,14 +222,8 @@ namespace TAO
                                            ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (PortableInterceptor::UNKNOWN);
 
-        if (this->forwarded_to_.in ())
-          {
-            status = PortableInterceptor::LOCATION_FORWARD;
-          }
-        else
-          {
-            status = this->adapter_->reply_status (*this);
-          }
+        status =
+          this->adapter_->reply_status (*this);
       }
 
     return status;
@@ -265,7 +259,6 @@ namespace TAO
     else if (CORBA::UserException::_downcast (exception) != 0)
       this->invoke_status_ = TAO::TAO_INVOKE_USER_EXCEPTION;
 
-    this->forwarded_to_ = CORBA::Object::_nil ();      
     this->caught_exception_ = exception;
   }
 
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
index a8058d59eeb..98e31a4cd23 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
@@ -5,9 +5,6 @@
 #include "tao/Transport.h"
 #include "tao/Transport_Mux_Strategy.h"
 #include "tao/ORB_Core.h"
-#include "tao/Stub.h"
-
-#include "ace/Service_Config.h"
 
 ACE_RCSID (tao,
            LocateRequest_Invocation_Adapter,
@@ -31,6 +28,7 @@ namespace TAO
 
     TAO_Stub * const stub =
       this->target_->_stubobj ();
+
     if (stub == 0)
       ACE_THROW (CORBA::INTERNAL (
                      CORBA::SystemException::_tao_minor_code (
@@ -38,13 +36,6 @@ namespace TAO
                          EINVAL),
                         CORBA::COMPLETED_NO));
 
-    // The invocation has got to be within the context of the
-    // corresponding ORB's configuration. Otherwise things like
-    // timeout hooks, etc may not work as expected. Especially if
-    // there are multiple ORB instances in the process, each with its
-    // own, local configuration.
-    ACE_Service_Config_Guard scg (stub->orb_core ()->configuration ());
-    
     ACE_Time_Value tmp_wait_time;
     ACE_Time_Value *max_wait_time = 0;
 
diff --git a/TAO/tao/LongDoubleSeq.pidl b/TAO/tao/LongDoubleSeq.pidl
index ee8573c87ab..80594c356b1 100644
--- a/TAO/tao/LongDoubleSeq.pidl
+++ b/TAO/tao/LongDoubleSeq.pidl
@@ -8,7 +8,7 @@
  * The command used to generate code is:
  *
  *     tao_idl
- *        -o orig -GA -SS -Sci
+ *        -o orig -Ge 1 -GA -SS -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/LongLongSeq.pidl b/TAO/tao/LongLongSeq.pidl
index 21f4d8d909f..5cd57874ef9 100644
--- a/TAO/tao/LongLongSeq.pidl
+++ b/TAO/tao/LongLongSeq.pidl
@@ -8,7 +8,7 @@
  * The command used to generate code is:
  *
  *     tao_idl
- *        -o orig -GA -SS -Sci
+ *        -o orig -Ge 1 -GA -SS -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/LongSeq.pidl b/TAO/tao/LongSeq.pidl
index be5548f2ae6..823f7790ab2 100644
--- a/TAO/tao/LongSeq.pidl
+++ b/TAO/tao/LongSeq.pidl
@@ -8,7 +8,7 @@
  * The command used to generate code is:
  *
  *     tao_idl
- *        -o orig -GA -SS -Sci
+ *        -o orig -Ge 1 -GA -SS -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include=TAO_Export.h
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index c1cd2706762..750fe412b31 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
+## ..\bin\mwc.pl -type automake -noreldefs TAO.mwc
 
 includedir = @includedir@/tao
 pkgconfigdir = @libdir@/pkgconfig
@@ -16,19 +16,13 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_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
 TAO_ROOT = $(top_srcdir)
 
-lib_LTLIBRARIES =
-pkgconfig_DATA =
-CLEANFILES =
-BUILT_SOURCES =
 
 ## Makefile.TAO.am
 
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   AnyTypeCode/GIOPA.cpp \
   AnyTypeCode/GIOPA.h \
   GIOPC.cpp \
@@ -36,7 +30,7 @@ BUILT_SOURCES += \
   GIOPC.inl \
   GIOPS.h
 
-CLEANFILES += \
+CLEANFILES = \
   GIOP-stamp \
   AnyTypeCode/GIOPA.cpp \
   AnyTypeCode/GIOPA.h \
@@ -48,8 +42,50 @@ CLEANFILES += \
 AnyTypeCode/GIOPA.cpp AnyTypeCode/GIOPA.h GIOPC.cpp GIOPC.h GIOPC.inl GIOPS.h: GIOP-stamp
 
 GIOP-stamp: $(srcdir)/GIOP.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/GIOP.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/GIOP.pidl
+	@touch "$@"
+
+BUILT_SOURCES += \
+  AnyTypeCode/BooleanSeqA.cpp \
+  AnyTypeCode/BooleanSeqA.h \
+  BooleanSeqC.cpp \
+  BooleanSeqC.h \
+  BooleanSeqS.h
+
+CLEANFILES += \
+  BooleanSeq-stamp \
+  AnyTypeCode/BooleanSeqA.cpp \
+  AnyTypeCode/BooleanSeqA.h \
+  BooleanSeqC.cpp \
+  BooleanSeqC.h \
+  BooleanSeqS.h
+
+AnyTypeCode/BooleanSeqA.cpp AnyTypeCode/BooleanSeqA.h BooleanSeqC.cpp BooleanSeqC.h BooleanSeqS.h: BooleanSeq-stamp
+
+BooleanSeq-stamp: $(srcdir)/BooleanSeq.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/BooleanSeq.pidl
+	@touch "$@"
+
+BUILT_SOURCES += \
+  AnyTypeCode/CharSeqA.cpp \
+  AnyTypeCode/CharSeqA.h \
+  CharSeqC.cpp \
+  CharSeqC.h \
+  CharSeqS.h
+
+CLEANFILES += \
+  CharSeq-stamp \
+  AnyTypeCode/CharSeqA.cpp \
+  AnyTypeCode/CharSeqA.h \
+  CharSeqC.cpp \
+  CharSeqC.h \
+  CharSeqS.h
+
+AnyTypeCode/CharSeqA.cpp AnyTypeCode/CharSeqA.h CharSeqC.cpp CharSeqC.h CharSeqS.h: CharSeq-stamp
+
+CharSeq-stamp: $(srcdir)/CharSeq.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/CharSeq.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/CONV_FRAMEA.cpp \
@@ -69,8 +105,8 @@ CLEANFILES += \
 AnyTypeCode/CONV_FRAMEA.cpp AnyTypeCode/CONV_FRAMEA.h CONV_FRAMEC.cpp CONV_FRAMEC.h CONV_FRAMES.h: CONV_FRAME-stamp
 
 CONV_FRAME-stamp: $(srcdir)/CONV_FRAME.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/CONV_FRAME.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/CONV_FRAME.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/CurrentA.cpp \
@@ -90,8 +126,50 @@ CLEANFILES += \
 AnyTypeCode/CurrentA.cpp AnyTypeCode/CurrentA.h CurrentC.cpp CurrentC.h CurrentS.h: Current-stamp
 
 Current-stamp: $(srcdir)/Current.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Current.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Current.pidl
+	@touch "$@"
+
+BUILT_SOURCES += \
+  AnyTypeCode/DoubleSeqA.cpp \
+  AnyTypeCode/DoubleSeqA.h \
+  DoubleSeqC.cpp \
+  DoubleSeqC.h \
+  DoubleSeqS.h
+
+CLEANFILES += \
+  DoubleSeq-stamp \
+  AnyTypeCode/DoubleSeqA.cpp \
+  AnyTypeCode/DoubleSeqA.h \
+  DoubleSeqC.cpp \
+  DoubleSeqC.h \
+  DoubleSeqS.h
+
+AnyTypeCode/DoubleSeqA.cpp AnyTypeCode/DoubleSeqA.h DoubleSeqC.cpp DoubleSeqC.h DoubleSeqS.h: DoubleSeq-stamp
+
+DoubleSeq-stamp: $(srcdir)/DoubleSeq.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/DoubleSeq.pidl
+	@touch "$@"
+
+BUILT_SOURCES += \
+  AnyTypeCode/FloatSeqA.cpp \
+  AnyTypeCode/FloatSeqA.h \
+  FloatSeqC.cpp \
+  FloatSeqC.h \
+  FloatSeqS.h
+
+CLEANFILES += \
+  FloatSeq-stamp \
+  AnyTypeCode/FloatSeqA.cpp \
+  AnyTypeCode/FloatSeqA.h \
+  FloatSeqC.cpp \
+  FloatSeqC.h \
+  FloatSeqS.h
+
+AnyTypeCode/FloatSeqA.cpp AnyTypeCode/FloatSeqA.h FloatSeqC.cpp FloatSeqC.h FloatSeqS.h: FloatSeq-stamp
+
+FloatSeq-stamp: $(srcdir)/FloatSeq.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/FloatSeq.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/IIOPA.cpp \
@@ -109,8 +187,8 @@ CLEANFILES += \
 AnyTypeCode/IIOPA.cpp AnyTypeCode/IIOPA.h IIOPC.cpp IIOPC.h: IIOP-stamp
 
 IIOP-stamp: $(srcdir)/IIOP.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IIOP.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/IIOP_EndpointsA.cpp \
@@ -130,8 +208,8 @@ CLEANFILES += \
 AnyTypeCode/IIOP_EndpointsA.cpp AnyTypeCode/IIOP_EndpointsA.h IIOP_EndpointsC.cpp IIOP_EndpointsC.h IIOP_EndpointsS.h: IIOP_Endpoints-stamp
 
 IIOP_Endpoints-stamp: $(srcdir)/IIOP_Endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP_Endpoints.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IIOP_Endpoints.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/IOPA.cpp \
@@ -151,8 +229,8 @@ CLEANFILES += \
 AnyTypeCode/IOPA.cpp AnyTypeCode/IOPA.h IOPC.cpp IOPC.h IOPS.h: IOP-stamp
 
 IOP-stamp: $(srcdir)/IOP.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IOP.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IOP.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/IOP_IORA.cpp \
@@ -170,8 +248,71 @@ CLEANFILES += \
 AnyTypeCode/IOP_IORA.cpp AnyTypeCode/IOP_IORA.h IOP_IORC.cpp IOP_IORC.h: IOP_IOR-stamp
 
 IOP_IOR-stamp: $(srcdir)/IOP_IOR.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IOP_IOR.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IOP_IOR.pidl
+	@touch "$@"
+
+BUILT_SOURCES += \
+  AnyTypeCode/LongDoubleSeqA.cpp \
+  AnyTypeCode/LongDoubleSeqA.h \
+  LongDoubleSeqC.cpp \
+  LongDoubleSeqC.h \
+  LongDoubleSeqS.h
+
+CLEANFILES += \
+  LongDoubleSeq-stamp \
+  AnyTypeCode/LongDoubleSeqA.cpp \
+  AnyTypeCode/LongDoubleSeqA.h \
+  LongDoubleSeqC.cpp \
+  LongDoubleSeqC.h \
+  LongDoubleSeqS.h
+
+AnyTypeCode/LongDoubleSeqA.cpp AnyTypeCode/LongDoubleSeqA.h LongDoubleSeqC.cpp LongDoubleSeqC.h LongDoubleSeqS.h: LongDoubleSeq-stamp
+
+LongDoubleSeq-stamp: $(srcdir)/LongDoubleSeq.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongDoubleSeq.pidl
+	@touch "$@"
+
+BUILT_SOURCES += \
+  AnyTypeCode/LongLongSeqA.cpp \
+  AnyTypeCode/LongLongSeqA.h \
+  LongLongSeqC.cpp \
+  LongLongSeqC.h \
+  LongLongSeqS.h
+
+CLEANFILES += \
+  LongLongSeq-stamp \
+  AnyTypeCode/LongLongSeqA.cpp \
+  AnyTypeCode/LongLongSeqA.h \
+  LongLongSeqC.cpp \
+  LongLongSeqC.h \
+  LongLongSeqS.h
+
+AnyTypeCode/LongLongSeqA.cpp AnyTypeCode/LongLongSeqA.h LongLongSeqC.cpp LongLongSeqC.h LongLongSeqS.h: LongLongSeq-stamp
+
+LongLongSeq-stamp: $(srcdir)/LongLongSeq.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongLongSeq.pidl
+	@touch "$@"
+
+BUILT_SOURCES += \
+  AnyTypeCode/LongSeqA.cpp \
+  AnyTypeCode/LongSeqA.h \
+  LongSeqC.cpp \
+  LongSeqC.h \
+  LongSeqS.h
+
+CLEANFILES += \
+  LongSeq-stamp \
+  AnyTypeCode/LongSeqA.cpp \
+  AnyTypeCode/LongSeqA.h \
+  LongSeqC.cpp \
+  LongSeqC.h \
+  LongSeqS.h
+
+AnyTypeCode/LongSeqA.cpp AnyTypeCode/LongSeqA.h LongSeqC.cpp LongSeqC.h LongSeqS.h: LongSeq-stamp
+
+LongSeq-stamp: $(srcdir)/LongSeq.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongSeq.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/Messaging_PolicyValueA.cpp \
@@ -189,8 +330,8 @@ CLEANFILES += \
 AnyTypeCode/Messaging_PolicyValueA.cpp AnyTypeCode/Messaging_PolicyValueA.h Messaging_PolicyValueC.cpp Messaging_PolicyValueC.h: Messaging_PolicyValue-stamp
 
 Messaging_PolicyValue-stamp: $(srcdir)/Messaging_PolicyValue.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_PolicyValue.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Messaging_PolicyValue.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/Messaging_SyncScopeA.cpp \
@@ -208,8 +349,8 @@ CLEANFILES += \
 AnyTypeCode/Messaging_SyncScopeA.cpp AnyTypeCode/Messaging_SyncScopeA.h Messaging_SyncScopeC.cpp Messaging_SyncScopeC.h: Messaging_SyncScope-stamp
 
 Messaging_SyncScope-stamp: $(srcdir)/Messaging_SyncScope.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_SyncScope.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Messaging_SyncScope.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/ObjectIdListA.cpp \
@@ -227,8 +368,8 @@ CLEANFILES += \
 AnyTypeCode/ObjectIdListA.cpp AnyTypeCode/ObjectIdListA.h ObjectIdListC.cpp ObjectIdListC.h: ObjectIdList-stamp
 
 ObjectIdList-stamp: $(srcdir)/ObjectIdList.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ObjectIdList.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ObjectIdList.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/orb_typesA.cpp \
@@ -248,8 +389,8 @@ CLEANFILES += \
 AnyTypeCode/orb_typesA.cpp AnyTypeCode/orb_typesA.h orb_typesC.cpp orb_typesC.h orb_typesS.h: orb_types-stamp
 
 orb_types-stamp: $(srcdir)/orb_types.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/orb_types.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/orb_types.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/ParameterModeA.cpp \
@@ -269,8 +410,8 @@ CLEANFILES += \
 AnyTypeCode/ParameterModeA.cpp AnyTypeCode/ParameterModeA.h ParameterModeC.cpp ParameterModeC.h ParameterModeS.h: ParameterMode-stamp
 
 ParameterMode-stamp: $(srcdir)/ParameterMode.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ParameterMode.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ParameterMode.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/Policy_ForwardA.cpp \
@@ -290,8 +431,8 @@ CLEANFILES += \
 AnyTypeCode/Policy_ForwardA.cpp AnyTypeCode/Policy_ForwardA.h Policy_ForwardC.cpp Policy_ForwardC.h Policy_ForwardS.h: Policy_Forward-stamp
 
 Policy_Forward-stamp: $(srcdir)/Policy_Forward.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Policy_Forward.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Policy_Forward.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/PI_ForwardA.cpp \
@@ -309,8 +450,8 @@ CLEANFILES += \
 AnyTypeCode/PI_ForwardA.cpp AnyTypeCode/PI_ForwardA.h PI_ForwardC.cpp PI_ForwardC.h: PI_Forward-stamp
 
 PI_Forward-stamp: $(srcdir)/PI_Forward.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PI_Forward.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/PI_Forward.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/PortableInterceptorA.cpp \
@@ -330,8 +471,8 @@ CLEANFILES += \
 AnyTypeCode/PortableInterceptorA.cpp AnyTypeCode/PortableInterceptorA.h PortableInterceptorC.cpp PortableInterceptorC.h PortableInterceptorS.h: PortableInterceptor-stamp
 
 PortableInterceptor-stamp: $(srcdir)/PortableInterceptor.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PortableInterceptor.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/PortableInterceptor.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/ServicesA.cpp \
@@ -351,218 +492,8 @@ CLEANFILES += \
 AnyTypeCode/ServicesA.cpp AnyTypeCode/ServicesA.h ServicesC.cpp ServicesC.h ServicesS.h: Services-stamp
 
 Services-stamp: $(srcdir)/Services.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Services.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/TAOA.cpp \
-  AnyTypeCode/TAOA.h \
-  TAOC.cpp \
-  TAOC.h \
-  TAOS.h
-
-CLEANFILES += \
-  TAO-stamp \
-  AnyTypeCode/TAOA.cpp \
-  AnyTypeCode/TAOA.h \
-  TAOC.cpp \
-  TAOC.h \
-  TAOS.h
-
-AnyTypeCode/TAOA.cpp AnyTypeCode/TAOA.h TAOC.cpp TAOC.h TAOS.h: TAO-stamp
-
-TAO-stamp: $(srcdir)/TAO.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TAO.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/TimeBaseA.cpp \
-  AnyTypeCode/TimeBaseA.h \
-  TimeBaseC.cpp \
-  TimeBaseC.h \
-  TimeBaseS.h
-
-CLEANFILES += \
-  TimeBase-stamp \
-  AnyTypeCode/TimeBaseA.cpp \
-  AnyTypeCode/TimeBaseA.h \
-  TimeBaseC.cpp \
-  TimeBaseC.h \
-  TimeBaseS.h
-
-AnyTypeCode/TimeBaseA.cpp AnyTypeCode/TimeBaseA.h TimeBaseC.cpp TimeBaseC.h TimeBaseS.h: TimeBase-stamp
-
-TimeBase-stamp: $(srcdir)/TimeBase.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TimeBase.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/BooleanSeqA.cpp \
-  AnyTypeCode/BooleanSeqA.h \
-  BooleanSeqC.cpp \
-  BooleanSeqC.h \
-  BooleanSeqS.h
-
-CLEANFILES += \
-  BooleanSeq-stamp \
-  AnyTypeCode/BooleanSeqA.cpp \
-  AnyTypeCode/BooleanSeqA.h \
-  BooleanSeqC.cpp \
-  BooleanSeqC.h \
-  BooleanSeqS.h
-
-AnyTypeCode/BooleanSeqA.cpp AnyTypeCode/BooleanSeqA.h BooleanSeqC.cpp BooleanSeqC.h BooleanSeqS.h: BooleanSeq-stamp
-
-BooleanSeq-stamp: $(srcdir)/BooleanSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/BooleanSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/CharSeqA.cpp \
-  AnyTypeCode/CharSeqA.h \
-  CharSeqC.cpp \
-  CharSeqC.h \
-  CharSeqS.h
-
-CLEANFILES += \
-  CharSeq-stamp \
-  AnyTypeCode/CharSeqA.cpp \
-  AnyTypeCode/CharSeqA.h \
-  CharSeqC.cpp \
-  CharSeqC.h \
-  CharSeqS.h
-
-AnyTypeCode/CharSeqA.cpp AnyTypeCode/CharSeqA.h CharSeqC.cpp CharSeqC.h CharSeqS.h: CharSeq-stamp
-
-CharSeq-stamp: $(srcdir)/CharSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/CharSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/DoubleSeqA.cpp \
-  AnyTypeCode/DoubleSeqA.h \
-  DoubleSeqC.cpp \
-  DoubleSeqC.h \
-  DoubleSeqS.h
-
-CLEANFILES += \
-  DoubleSeq-stamp \
-  AnyTypeCode/DoubleSeqA.cpp \
-  AnyTypeCode/DoubleSeqA.h \
-  DoubleSeqC.cpp \
-  DoubleSeqC.h \
-  DoubleSeqS.h
-
-AnyTypeCode/DoubleSeqA.cpp AnyTypeCode/DoubleSeqA.h DoubleSeqC.cpp DoubleSeqC.h DoubleSeqS.h: DoubleSeq-stamp
-
-DoubleSeq-stamp: $(srcdir)/DoubleSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/DoubleSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/FloatSeqA.cpp \
-  AnyTypeCode/FloatSeqA.h \
-  FloatSeqC.cpp \
-  FloatSeqC.h \
-  FloatSeqS.h
-
-CLEANFILES += \
-  FloatSeq-stamp \
-  AnyTypeCode/FloatSeqA.cpp \
-  AnyTypeCode/FloatSeqA.h \
-  FloatSeqC.cpp \
-  FloatSeqC.h \
-  FloatSeqS.h
-
-AnyTypeCode/FloatSeqA.cpp AnyTypeCode/FloatSeqA.h FloatSeqC.cpp FloatSeqC.h FloatSeqS.h: FloatSeq-stamp
-
-FloatSeq-stamp: $(srcdir)/FloatSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/FloatSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/LongDoubleSeqA.cpp \
-  AnyTypeCode/LongDoubleSeqA.h \
-  LongDoubleSeqC.cpp \
-  LongDoubleSeqC.h \
-  LongDoubleSeqS.h
-
-CLEANFILES += \
-  LongDoubleSeq-stamp \
-  AnyTypeCode/LongDoubleSeqA.cpp \
-  AnyTypeCode/LongDoubleSeqA.h \
-  LongDoubleSeqC.cpp \
-  LongDoubleSeqC.h \
-  LongDoubleSeqS.h
-
-AnyTypeCode/LongDoubleSeqA.cpp AnyTypeCode/LongDoubleSeqA.h LongDoubleSeqC.cpp LongDoubleSeqC.h LongDoubleSeqS.h: LongDoubleSeq-stamp
-
-LongDoubleSeq-stamp: $(srcdir)/LongDoubleSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongDoubleSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/LongLongSeqA.cpp \
-  AnyTypeCode/LongLongSeqA.h \
-  LongLongSeqC.cpp \
-  LongLongSeqC.h \
-  LongLongSeqS.h
-
-CLEANFILES += \
-  LongLongSeq-stamp \
-  AnyTypeCode/LongLongSeqA.cpp \
-  AnyTypeCode/LongLongSeqA.h \
-  LongLongSeqC.cpp \
-  LongLongSeqC.h \
-  LongLongSeqS.h
-
-AnyTypeCode/LongLongSeqA.cpp AnyTypeCode/LongLongSeqA.h LongLongSeqC.cpp LongLongSeqC.h LongLongSeqS.h: LongLongSeq-stamp
-
-LongLongSeq-stamp: $(srcdir)/LongLongSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongLongSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/LongSeqA.cpp \
-  AnyTypeCode/LongSeqA.h \
-  LongSeqC.cpp \
-  LongSeqC.h \
-  LongSeqS.h
-
-CLEANFILES += \
-  LongSeq-stamp \
-  AnyTypeCode/LongSeqA.cpp \
-  AnyTypeCode/LongSeqA.h \
-  LongSeqC.cpp \
-  LongSeqC.h \
-  LongSeqS.h
-
-AnyTypeCode/LongSeqA.cpp AnyTypeCode/LongSeqA.h LongSeqC.cpp LongSeqC.h LongSeqS.h: LongSeq-stamp
-
-LongSeq-stamp: $(srcdir)/LongSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/OctetSeqA.cpp \
-  AnyTypeCode/OctetSeqA.h \
-  OctetSeqC.cpp \
-  OctetSeqC.h \
-  OctetSeqS.h
-
-CLEANFILES += \
-  OctetSeq-stamp \
-  AnyTypeCode/OctetSeqA.cpp \
-  AnyTypeCode/OctetSeqA.h \
-  OctetSeqC.cpp \
-  OctetSeqC.h \
-  OctetSeqS.h
-
-AnyTypeCode/OctetSeqA.cpp AnyTypeCode/OctetSeqA.h OctetSeqC.cpp OctetSeqC.h OctetSeqS.h: OctetSeq-stamp
-
-OctetSeq-stamp: $(srcdir)/OctetSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/OctetSeq.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Services.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/ShortSeqA.cpp \
@@ -582,8 +513,8 @@ CLEANFILES += \
 AnyTypeCode/ShortSeqA.cpp AnyTypeCode/ShortSeqA.h ShortSeqC.cpp ShortSeqC.h ShortSeqS.h: ShortSeq-stamp
 
 ShortSeq-stamp: $(srcdir)/ShortSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ShortSeq.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ShortSeq.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/StringSeqA.cpp \
@@ -603,8 +534,50 @@ CLEANFILES += \
 AnyTypeCode/StringSeqA.cpp AnyTypeCode/StringSeqA.h StringSeqC.cpp StringSeqC.h StringSeqS.h: StringSeq-stamp
 
 StringSeq-stamp: $(srcdir)/StringSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/StringSeq.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/StringSeq.pidl
+	@touch "$@"
+
+BUILT_SOURCES += \
+  AnyTypeCode/TAOA.cpp \
+  AnyTypeCode/TAOA.h \
+  TAOC.cpp \
+  TAOC.h \
+  TAOS.h
+
+CLEANFILES += \
+  TAO-stamp \
+  AnyTypeCode/TAOA.cpp \
+  AnyTypeCode/TAOA.h \
+  TAOC.cpp \
+  TAOC.h \
+  TAOS.h
+
+AnyTypeCode/TAOA.cpp AnyTypeCode/TAOA.h TAOC.cpp TAOC.h TAOS.h: TAO-stamp
+
+TAO-stamp: $(srcdir)/TAO.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/TAO.pidl
+	@touch "$@"
+
+BUILT_SOURCES += \
+  AnyTypeCode/TimeBaseA.cpp \
+  AnyTypeCode/TimeBaseA.h \
+  TimeBaseC.cpp \
+  TimeBaseC.h \
+  TimeBaseS.h
+
+CLEANFILES += \
+  TimeBase-stamp \
+  AnyTypeCode/TimeBaseA.cpp \
+  AnyTypeCode/TimeBaseA.h \
+  TimeBaseC.cpp \
+  TimeBaseC.h \
+  TimeBaseS.h
+
+AnyTypeCode/TimeBaseA.cpp AnyTypeCode/TimeBaseA.h TimeBaseC.cpp TimeBaseC.h TimeBaseS.h: TimeBase-stamp
+
+TimeBase-stamp: $(srcdir)/TimeBase.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/TimeBase.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/ULongLongSeqA.cpp \
@@ -624,8 +597,8 @@ CLEANFILES += \
 AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULongLongSeqC.h ULongLongSeqS.h: ULongLongSeq-stamp
 
 ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ULongLongSeq.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ULongLongSeq.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/ULongSeqA.cpp \
@@ -645,29 +618,8 @@ CLEANFILES += \
 AnyTypeCode/ULongSeqA.cpp AnyTypeCode/ULongSeqA.h ULongSeqC.cpp ULongSeqC.h ULongSeqS.h: ULongSeq-stamp
 
 ULongSeq-stamp: $(srcdir)/ULongSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ULongSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/UShortSeqA.cpp \
-  AnyTypeCode/UShortSeqA.h \
-  UShortSeqC.cpp \
-  UShortSeqC.h \
-  UShortSeqS.h
-
-CLEANFILES += \
-  UShortSeq-stamp \
-  AnyTypeCode/UShortSeqA.cpp \
-  AnyTypeCode/UShortSeqA.h \
-  UShortSeqC.cpp \
-  UShortSeqC.h \
-  UShortSeqS.h
-
-AnyTypeCode/UShortSeqA.cpp AnyTypeCode/UShortSeqA.h UShortSeqC.cpp UShortSeqC.h UShortSeqS.h: UShortSeq-stamp
-
-UShortSeq-stamp: $(srcdir)/UShortSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/UShortSeq.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ULongSeq.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/WCharSeqA.cpp \
@@ -687,8 +639,8 @@ CLEANFILES += \
 AnyTypeCode/WCharSeqA.cpp AnyTypeCode/WCharSeqA.h WCharSeqC.cpp WCharSeqC.h WCharSeqS.h: WCharSeq-stamp
 
 WCharSeq-stamp: $(srcdir)/WCharSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WCharSeq.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/WCharSeq.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/WStringSeqA.cpp \
@@ -708,10 +660,10 @@ CLEANFILES += \
 AnyTypeCode/WStringSeqA.cpp AnyTypeCode/WStringSeqA.h WStringSeqC.cpp WStringSeqC.h WStringSeqS.h: WStringSeq-stamp
 
 WStringSeq-stamp: $(srcdir)/WStringSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WStringSeq.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/WStringSeq.pidl
+	@touch "$@"
 
-lib_LTLIBRARIES += libTAO.la
+lib_LTLIBRARIES = libTAO.la
 
 libTAO_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -792,9 +744,6 @@ libTAO_la_SOURCES = \
   GIOP_Message_State.cpp \
   GIOP_Message_Version.cpp \
   GUIResource_Factory.cpp \
-  HTTP_Client.cpp \
-  HTTP_Handler.cpp \
-  HTTP_Parser.cpp \
   IFR_Client_Adapter.cpp \
   IIOPC.cpp \
   IIOP_Acceptor.cpp \
@@ -926,7 +875,6 @@ libTAO_la_SOURCES = \
   Transport_Descriptor_Interface.cpp \
   Transport_Mux_Strategy.cpp \
   Transport_Queueing_Strategies.cpp \
-  Transport_Selection_Guard.cpp \
   Transport_Timer.cpp \
   TypeCodeFactory_Adapter.cpp \
   Typecode_typesC.cpp \
@@ -954,7 +902,7 @@ libTAO_la_SOURCES = \
   target_specification.cpp
 
 libTAO_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -998,7 +946,6 @@ nobase_include_HEADERS = \
   Block_Flushing_Strategy.h \
   Blocked_Connect_Strategy.h \
   BooleanSeq.pidl \
-  BooleanSeq.pidl \
   BooleanSeqC.h \
   BooleanSeqS.h \
   Bounded_Array_Allocation_Traits_T.h \
@@ -1007,8 +954,10 @@ nobase_include_HEADERS = \
   Bounded_Object_Reference_Sequence_T.h \
   Bounded_Reference_Allocation_Traits_T.h \
   Bounded_Sequence_CDR_T.h \
+  Bounded_String_Sequence_T.h \
   Bounded_Value_Allocation_Traits_T.h \
   Bounded_Value_Sequence_T.h \
+  Bounded_Wstring_Sequence_T.h \
   Buffer_Allocator_T.cpp \
   Buffer_Allocator_T.h \
   Buffering_Constraint_Policy.h \
@@ -1016,7 +965,6 @@ nobase_include_HEADERS = \
   CDR.h \
   CDR.inl \
   CONV_FRAME.pidl \
-  CONV_FRAME.pidl \
   CONV_FRAMEC.h \
   CONV_FRAMES.h \
   CORBALOC_Parser.h \
@@ -1028,7 +976,6 @@ nobase_include_HEADERS = \
   Cache_Entries.h \
   Cache_Entries.inl \
   CharSeq.pidl \
-  CharSeq.pidl \
   CharSeqC.h \
   CharSeqS.h \
   Cleanup_Func_Registry.h \
@@ -1059,7 +1006,6 @@ nobase_include_HEADERS = \
   Connector_Registry.h \
   Connector_Registry.inl \
   Current.pidl \
-  Current.pidl \
   CurrentC.h \
   CurrentS.h \
   DLL_Parser.h \
@@ -1072,7 +1018,6 @@ nobase_include_HEADERS = \
   DomainC.h \
   DomainC.inl \
   DoubleSeq.pidl \
-  DoubleSeq.pidl \
   DoubleSeqC.h \
   DoubleSeqS.h \
   Dynamic_Adapter.h \
@@ -1095,12 +1040,10 @@ nobase_include_HEADERS = \
   Fixed_Size_Argument_T.h \
   Fixed_Size_Argument_T.inl \
   FloatSeq.pidl \
-  FloatSeq.pidl \
   FloatSeqC.h \
   FloatSeqS.h \
   Flushing_Strategy.h \
   GIOP.pidl \
-  GIOP.pidl \
   GIOPC.h \
   GIOPC.inl \
   GIOPS.h \
@@ -1122,12 +1065,8 @@ nobase_include_HEADERS = \
   GIOP_Utils.h \
   GUIResource_Factory.h \
   Generic_Sequence_T.h \
-  HTTP_Client.h \
-  HTTP_Handler.h \
-  HTTP_Parser.h \
   IFR_Client_Adapter.h \
   IIOP.pidl \
-  IIOP.pidl \
   IIOPC.h \
   IIOP_Acceptor.h \
   IIOP_Acceptor.inl \
@@ -1136,7 +1075,6 @@ nobase_include_HEADERS = \
   IIOP_Endpoint.h \
   IIOP_Endpoint.inl \
   IIOP_Endpoints.pidl \
-  IIOP_Endpoints.pidl \
   IIOP_EndpointsC.h \
   IIOP_EndpointsS.h \
   IIOP_Factory.h \
@@ -1144,11 +1082,9 @@ nobase_include_HEADERS = \
   IIOP_Profile.h \
   IIOP_Transport.h \
   IOP.pidl \
-  IOP.pidl \
   IOPC.h \
   IOPS.h \
   IOP_IOR.pidl \
-  IOP_IOR.pidl \
   IOP_IORC.h \
   IORInterceptor_Adapter.h \
   IORInterceptor_Adapter_Factory.h \
@@ -1199,15 +1135,12 @@ nobase_include_HEADERS = \
   LocateRequest_Invocation.h \
   LocateRequest_Invocation_Adapter.h \
   LongDoubleSeq.pidl \
-  LongDoubleSeq.pidl \
   LongDoubleSeqC.h \
   LongDoubleSeqS.h \
   LongLongSeq.pidl \
-  LongLongSeq.pidl \
   LongLongSeqC.h \
   LongLongSeqS.h \
   LongSeq.pidl \
-  LongSeq.pidl \
   LongSeqC.h \
   LongSeqS.h \
   MCAST_Parser.h \
@@ -1216,10 +1149,8 @@ nobase_include_HEADERS = \
   MProfile.h \
   MProfile.inl \
   Messaging_PolicyValue.pidl \
-  Messaging_PolicyValue.pidl \
   Messaging_PolicyValueC.h \
   Messaging_SyncScope.pidl \
-  Messaging_SyncScope.pidl \
   Messaging_SyncScopeC.h \
   Muxed_TMS.h \
   NVList_Adapter.h \
@@ -1240,7 +1171,6 @@ nobase_include_HEADERS = \
   Object.h \
   Object.inl \
   ObjectIdList.pidl \
-  ObjectIdList.pidl \
   ObjectIdListC.h \
   ObjectKey_Table.h \
   Object_Argument_T.cpp \
@@ -1260,15 +1190,12 @@ nobase_include_HEADERS = \
   Objref_VarOut_T.cpp \
   Objref_VarOut_T.h \
   OctetSeq.pidl \
-  OctetSeq.pidl \
   OctetSeqC.h \
   OctetSeqS.h \
   On_Demand_Fragmentation_Strategy.h \
   PI_Forward.pidl \
-  PI_Forward.pidl \
   PI_ForwardC.h \
   ParameterMode.pidl \
-  ParameterMode.pidl \
   ParameterModeC.h \
   ParameterModeS.h \
   Parser_Registry.h \
@@ -1287,7 +1214,6 @@ nobase_include_HEADERS = \
   Policy_Current_Impl.h \
   Policy_Current_Impl.inl \
   Policy_Forward.pidl \
-  Policy_Forward.pidl \
   Policy_ForwardC.h \
   Policy_ForwardS.h \
   Policy_Manager.h \
@@ -1297,7 +1223,6 @@ nobase_include_HEADERS = \
   Policy_Validator.h \
   PortableInterceptor.h \
   PortableInterceptor.pidl \
-  PortableInterceptor.pidl \
   PortableInterceptorC.h \
   PortableInterceptorS.h \
   Principal.h \
@@ -1339,12 +1264,10 @@ nobase_include_HEADERS = \
   Service_Context.h \
   Service_Context.inl \
   Services.pidl \
-  Services.pidl \
   ServicesC.h \
   ServicesS.h \
   Services_Activate.h \
   ShortSeq.pidl \
-  ShortSeq.pidl \
   ShortSeqC.h \
   ShortSeqS.h \
   Special_Basic_Argument_T.cpp \
@@ -1352,7 +1275,6 @@ nobase_include_HEADERS = \
   Special_Basic_Argument_T.inl \
   Special_Basic_Arguments.h \
   StringSeq.pidl \
-  StringSeq.pidl \
   StringSeqC.h \
   StringSeqS.h \
   String_Alloc.h \
@@ -1370,7 +1292,6 @@ nobase_include_HEADERS = \
   SystemException.h \
   SystemException.inl \
   TAO.pidl \
-  TAO.pidl \
   TAOC.h \
   TAOS.h \
   TAO_Export.h \
@@ -1391,7 +1312,6 @@ nobase_include_HEADERS = \
   Thread_Lane_Resources_Manager.h \
   Thread_Per_Connection_Handler.h \
   TimeBase.pidl \
-  TimeBase.pidl \
   TimeBaseC.h \
   TimeBaseS.h \
   Timeprobe.h \
@@ -1407,7 +1327,6 @@ nobase_include_HEADERS = \
   Transport_Descriptor_Interface.inl \
   Transport_Mux_Strategy.h \
   Transport_Queueing_Strategies.h \
-  Transport_Selection_Guard.h \
   Transport_Timer.h \
   TypeCodeFactory_Adapter.h \
   Typecode_types.pidl \
@@ -1418,15 +1337,12 @@ nobase_include_HEADERS = \
   UB_String_Argument_T.inl \
   UB_String_Arguments.h \
   ULongLongSeq.pidl \
-  ULongLongSeq.pidl \
   ULongLongSeqC.h \
   ULongLongSeqS.h \
   ULongSeq.pidl \
-  ULongSeq.pidl \
   ULongSeqC.h \
   ULongSeqS.h \
   UShortSeq.pidl \
-  UShortSeq.pidl \
   UShortSeqC.h \
   UShortSeqS.h \
   Unbounded_Array_Allocation_Traits_T.h \
@@ -1436,8 +1352,10 @@ nobase_include_HEADERS = \
   Unbounded_Octet_Sequence_T.h \
   Unbounded_Reference_Allocation_Traits_T.h \
   Unbounded_Sequence_CDR_T.h \
+  Unbounded_String_Sequence_T.h \
   Unbounded_Value_Allocation_Traits_T.h \
   Unbounded_Value_Sequence_T.h \
+  Unbounded_Wstring_Sequence_T.h \
   UserException.h \
   UserException.inl \
   Value_Traits_T.h \
@@ -1455,11 +1373,9 @@ nobase_include_HEADERS = \
   Version.h \
   Versioned_Namespace.h \
   WCharSeq.pidl \
-  WCharSeq.pidl \
   WCharSeqC.h \
   WCharSeqS.h \
   WStringSeq.pidl \
-  WStringSeq.pidl \
   WStringSeqC.h \
   WStringSeqS.h \
   Wait_On_LF_No_Upcall.h \
@@ -1482,8 +1398,6 @@ nobase_include_HEADERS = \
   objectid.h \
   operation_details.h \
   operation_details.inl \
-  orb.idl \
-  orb_types.pidl \
   orb_types.pidl \
   orb_typesC.h \
   orb_typesS.h \
@@ -1494,16 +1408,14 @@ nobase_include_HEADERS = \
   target_specification.inl \
   varbase.h
 
-pkgconfig_DATA += \
+pkgconfig_DATA = \
   TAO.pc
 
 CLEANFILES += \
   TAO.pc
 
 TAO.pc: ${top_builddir}/config.status ${srcdir}/TAO.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO.pc.in
 
 EXTRA_DIST = \
   TAO.pc.in \
@@ -1512,8 +1424,6 @@ EXTRA_DIST = \
 
 ## Makefile.Codeset.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_Codeset.la
 
 libTAO_Codeset_la_CPPFLAGS = \
@@ -1535,7 +1445,7 @@ libTAO_Codeset_la_SOURCES = \
   Codeset/UTF8_Latin1_Translator.cpp
 
 libTAO_Codeset_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_Codeset_la_LIBADD = \
   libTAO.la \
@@ -1555,12 +1465,8 @@ nobase_include_HEADERS += \
   Codeset/UTF8_Latin1_Translator.h \
   Codeset/codeset_export.h
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.AnyTypeCode.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   AnyTypeCode/AnySeqA.cpp \
   AnyTypeCode/AnySeqA.h \
@@ -1577,8 +1483,8 @@ CLEANFILES += \
 AnyTypeCode/AnySeqA.cpp AnyTypeCode/AnySeqA.h AnyTypeCode/AnySeqC.cpp AnyTypeCode/AnySeqC.h: AnyTypeCode/AnySeq-stamp
 
 AnyTypeCode/AnySeq-stamp: $(srcdir)/AnyTypeCode/AnySeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/AnySeq.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/AnySeq.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/Dynamic_ParameterA.cpp \
@@ -1596,8 +1502,8 @@ CLEANFILES += \
 AnyTypeCode/Dynamic_ParameterA.cpp AnyTypeCode/Dynamic_ParameterA.h AnyTypeCode/Dynamic_ParameterC.cpp AnyTypeCode/Dynamic_ParameterC.h: AnyTypeCode/Dynamic_Parameter-stamp
 
 AnyTypeCode/Dynamic_Parameter-stamp: $(srcdir)/AnyTypeCode/Dynamic_Parameter.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Dynamic_Parameter.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Dynamic_Parameter.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/ValueModifierA.cpp \
@@ -1615,8 +1521,8 @@ CLEANFILES += \
 AnyTypeCode/ValueModifierA.cpp AnyTypeCode/ValueModifierA.h AnyTypeCode/ValueModifierC.cpp AnyTypeCode/ValueModifierC.h: AnyTypeCode/ValueModifier-stamp
 
 AnyTypeCode/ValueModifier-stamp: $(srcdir)/AnyTypeCode/ValueModifier.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/ValueModifier.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/ValueModifier.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/VisibilityA.cpp \
@@ -1634,8 +1540,8 @@ CLEANFILES += \
 AnyTypeCode/VisibilityA.cpp AnyTypeCode/VisibilityA.h AnyTypeCode/VisibilityC.cpp AnyTypeCode/VisibilityC.h: AnyTypeCode/Visibility-stamp
 
 AnyTypeCode/Visibility-stamp: $(srcdir)/AnyTypeCode/Visibility.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Visibility.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Visibility.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   AnyTypeCode/BoundsA.cpp \
@@ -1653,8 +1559,8 @@ CLEANFILES += \
 AnyTypeCode/BoundsA.cpp AnyTypeCode/BoundsA.h AnyTypeCode/BoundsC.cpp AnyTypeCode/BoundsC.h: AnyTypeCode/Bounds-stamp
 
 AnyTypeCode/Bounds-stamp: $(srcdir)/AnyTypeCode/Bounds.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Bounds.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Bounds.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_AnyTypeCode.la
 
@@ -1675,7 +1581,6 @@ libTAO_AnyTypeCode_la_SOURCES = \
   AnyTypeCode/Any_Impl.cpp \
   AnyTypeCode/Any_SystemException.cpp \
   AnyTypeCode/Any_Unknown_IDL_Type.cpp \
-  AnyTypeCode/BasicTypeTraits.cpp \
   AnyTypeCode/BooleanSeqA.cpp \
   AnyTypeCode/BoundsA.cpp \
   AnyTypeCode/BoundsC.cpp \
@@ -1741,7 +1646,7 @@ libTAO_AnyTypeCode_la_SOURCES = \
   AnyTypeCode/skip.cpp
 
 libTAO_AnyTypeCode_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_AnyTypeCode_la_LIBADD = \
   libTAO.la \
@@ -1780,17 +1685,10 @@ nobase_include_HEADERS += \
   AnyTypeCode/Any_Special_Impl_T.inl \
   AnyTypeCode/Any_SystemException.h \
   AnyTypeCode/Any_Unknown_IDL_Type.h \
-  AnyTypeCode/BasicTypeTraits.h \
-  AnyTypeCode/BasicTypeTraits_T.h \
-  AnyTypeCode/BooleanSeqA.h \
   AnyTypeCode/Bounds.pidl \
   AnyTypeCode/BoundsA.h \
   AnyTypeCode/BoundsC.h \
-  AnyTypeCode/CONV_FRAMEA.h \
-  AnyTypeCode/CharSeqA.h \
-  AnyTypeCode/CurrentA.h \
   AnyTypeCode/DomainA.h \
-  AnyTypeCode/DoubleSeqA.h \
   AnyTypeCode/DynamicA.h \
   AnyTypeCode/DynamicC.h \
   AnyTypeCode/DynamicS.h \
@@ -1808,35 +1706,19 @@ nobase_include_HEADERS += \
   AnyTypeCode/Fixed_TypeCode.cpp \
   AnyTypeCode/Fixed_TypeCode.h \
   AnyTypeCode/Fixed_TypeCode.inl \
-  AnyTypeCode/FloatSeqA.h \
-  AnyTypeCode/GIOPA.h \
-  AnyTypeCode/IIOPA.h \
-  AnyTypeCode/IIOP_EndpointsA.h \
-  AnyTypeCode/IOPA.h \
-  AnyTypeCode/IOP_IORA.h \
-  AnyTypeCode/LongDoubleSeqA.h \
-  AnyTypeCode/LongLongSeqA.h \
-  AnyTypeCode/LongSeqA.h \
   AnyTypeCode/Marshal.h \
   AnyTypeCode/Marshal.inl \
-  AnyTypeCode/Messaging_PolicyValueA.h \
-  AnyTypeCode/Messaging_SyncScopeA.h \
   AnyTypeCode/NVList.h \
   AnyTypeCode/NVList.inl \
   AnyTypeCode/NVList_Adapter_Impl.h \
   AnyTypeCode/Null_RefCount_Policy.h \
-  AnyTypeCode/ObjectIdListA.h \
   AnyTypeCode/Objref_TypeCode.cpp \
   AnyTypeCode/Objref_TypeCode.h \
   AnyTypeCode/Objref_TypeCode.inl \
   AnyTypeCode/Objref_TypeCode_Static.h \
   AnyTypeCode/Objref_TypeCode_Static.inl \
   AnyTypeCode/OctetSeqA.h \
-  AnyTypeCode/PI_ForwardA.h \
-  AnyTypeCode/ParameterModeA.h \
   AnyTypeCode/PolicyA.h \
-  AnyTypeCode/Policy_ForwardA.h \
-  AnyTypeCode/PortableInterceptorA.h \
   AnyTypeCode/Recursive_Type_TypeCode.cpp \
   AnyTypeCode/Recursive_Type_TypeCode.h \
   AnyTypeCode/Recursive_Type_TypeCode.inl \
@@ -1846,9 +1728,6 @@ nobase_include_HEADERS += \
   AnyTypeCode/Sequence_TypeCode.inl \
   AnyTypeCode/Sequence_TypeCode_Static.h \
   AnyTypeCode/Sequence_TypeCode_Static.inl \
-  AnyTypeCode/ServicesA.h \
-  AnyTypeCode/ShortSeqA.h \
-  AnyTypeCode/StringSeqA.h \
   AnyTypeCode/String_TypeCode.cpp \
   AnyTypeCode/String_TypeCode.h \
   AnyTypeCode/String_TypeCode.inl \
@@ -1861,10 +1740,8 @@ nobase_include_HEADERS += \
   AnyTypeCode/Struct_TypeCode_Static.h \
   AnyTypeCode/Struct_TypeCode_Static.inl \
   AnyTypeCode/SystemExceptionA.h \
-  AnyTypeCode/TAOA.h \
   AnyTypeCode/TAO_AnyTypeCode_Export.h \
   AnyTypeCode/TC_Constants_Forward.h \
-  AnyTypeCode/TimeBaseA.h \
   AnyTypeCode/True_RefCount_Policy.h \
   AnyTypeCode/True_RefCount_Policy.inl \
   AnyTypeCode/TypeCode.h \
@@ -1887,8 +1764,6 @@ nobase_include_HEADERS += \
   AnyTypeCode/TypeCode_Traits.h \
   AnyTypeCode/TypeCode_Value_Field.h \
   AnyTypeCode/Typecode_typesA.h \
-  AnyTypeCode/ULongLongSeqA.h \
-  AnyTypeCode/ULongSeqA.h \
   AnyTypeCode/UShortSeqA.h \
   AnyTypeCode/Union_TypeCode.cpp \
   AnyTypeCode/Union_TypeCode.h \
@@ -1906,10 +1781,7 @@ nobase_include_HEADERS += \
   AnyTypeCode/Visibility.pidl \
   AnyTypeCode/VisibilityA.h \
   AnyTypeCode/VisibilityC.h \
-  AnyTypeCode/WCharSeqA.h \
-  AnyTypeCode/WStringSeqA.h \
-  AnyTypeCode/WrongTransactionA.h \
-  AnyTypeCode/orb_typesA.h
+  AnyTypeCode/WrongTransactionA.h
 
 pkgconfig_DATA += \
   TAO_AnyTypeCode.pc
@@ -1918,9 +1790,7 @@ CLEANFILES += \
   TAO_AnyTypeCode.pc
 
 TAO_AnyTypeCode.pc: ${top_builddir}/config.status ${srcdir}/AnyTypeCode/TAO_AnyTypeCode.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/AnyTypeCode/TAO_AnyTypeCode.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/AnyTypeCode/TAO_AnyTypeCode.pc.in
 
 EXTRA_DIST += \
   AnyTypeCode/TAO_AnyTypeCode.pc.in
@@ -1928,45 +1798,35 @@ EXTRA_DIST += \
 
 ## Makefile.CodecFactory.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
-  CodecFactory/IOP_CodecA.h \
   CodecFactory/IOP_CodecC.cpp \
-  CodecFactory/IOP_CodecC.h \
-  CodecFactory/IOP_CodecS.h
+  CodecFactory/IOP_CodecC.h
 
 CLEANFILES += \
   CodecFactory/IOP_Codec-stamp \
-  CodecFactory/IOP_CodecA.h \
   CodecFactory/IOP_CodecC.cpp \
-  CodecFactory/IOP_CodecC.h \
-  CodecFactory/IOP_CodecS.h
+  CodecFactory/IOP_CodecC.h
 
-CodecFactory/IOP_CodecA.h CodecFactory/IOP_CodecC.cpp CodecFactory/IOP_CodecC.h CodecFactory/IOP_CodecS.h: CodecFactory/IOP_Codec-stamp
+CodecFactory/IOP_CodecC.cpp CodecFactory/IOP_CodecC.h: CodecFactory/IOP_Codec-stamp
 
 CodecFactory/IOP_Codec-stamp: $(srcdir)/CodecFactory/IOP_Codec.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sal -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE -Wb,safe_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sal -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE -Wb,safe_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  CodecFactory/IOP_Codec_includeA.h \
   CodecFactory/IOP_Codec_includeC.cpp \
-  CodecFactory/IOP_Codec_includeC.h \
-  CodecFactory/IOP_Codec_includeS.h
+  CodecFactory/IOP_Codec_includeC.h
 
 CLEANFILES += \
   CodecFactory/IOP_Codec_include-stamp \
-  CodecFactory/IOP_Codec_includeA.h \
   CodecFactory/IOP_Codec_includeC.cpp \
-  CodecFactory/IOP_Codec_includeC.h \
-  CodecFactory/IOP_Codec_includeS.h
+  CodecFactory/IOP_Codec_includeC.h
 
-CodecFactory/IOP_Codec_includeA.h CodecFactory/IOP_Codec_includeC.cpp CodecFactory/IOP_Codec_includeC.h CodecFactory/IOP_Codec_includeS.h: CodecFactory/IOP_Codec_include-stamp
+CodecFactory/IOP_Codec_includeC.cpp CodecFactory/IOP_Codec_includeC.h: CodecFactory/IOP_Codec_include-stamp
 
 CodecFactory/IOP_Codec_include-stamp: $(srcdir)/CodecFactory/IOP_Codec_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,unique_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec_include.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,unique_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec_include.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_CodecFactory.la
 
@@ -1985,7 +1845,7 @@ libTAO_CodecFactory_la_SOURCES = \
   CodecFactory/IOP_Codec_includeC.cpp
 
 libTAO_CodecFactory_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CodecFactory_la_LIBADD = \
   libTAO_AnyTypeCode.la \
@@ -1998,14 +1858,10 @@ nobase_include_HEADERS += \
   CodecFactory/CodecFactory_impl.h \
   CodecFactory/IOP_Codec.pidl \
   CodecFactory/IOP_Codec.pidl \
-  CodecFactory/IOP_CodecA.h \
   CodecFactory/IOP_CodecC.h \
-  CodecFactory/IOP_CodecS.h \
   CodecFactory/IOP_Codec_include.pidl \
   CodecFactory/IOP_Codec_include.pidl \
-  CodecFactory/IOP_Codec_includeA.h \
   CodecFactory/IOP_Codec_includeC.h \
-  CodecFactory/IOP_Codec_includeS.h \
   CodecFactory/codecfactory_export.h
 
 pkgconfig_DATA += \
@@ -2015,9 +1871,7 @@ CLEANFILES += \
   TAO_CodecFactory.pc
 
 TAO_CodecFactory.pc: ${top_builddir}/config.status ${srcdir}/CodecFactory/TAO_CodecFactory.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/CodecFactory/TAO_CodecFactory.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/CodecFactory/TAO_CodecFactory.pc.in
 
 EXTRA_DIST += \
   CodecFactory/TAO_CodecFactory.pc.in \
@@ -2026,215 +1880,191 @@ EXTRA_DIST += \
 
 ## Makefile.PI.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
-  PI/ORBInitInfoA.h \
   PI/ORBInitInfoC.cpp \
-  PI/ORBInitInfoC.h \
-  PI/ORBInitInfoS.h
+  PI/ORBInitInfoC.h
 
 CLEANFILES += \
   PI/ORBInitInfo-stamp \
-  PI/ORBInitInfoA.h \
   PI/ORBInitInfoC.cpp \
-  PI/ORBInitInfoC.h \
-  PI/ORBInitInfoS.h
+  PI/ORBInitInfoC.h
 
-PI/ORBInitInfoA.h PI/ORBInitInfoC.cpp PI/ORBInitInfoC.h PI/ORBInitInfoS.h: PI/ORBInitInfo-stamp
+PI/ORBInitInfoC.cpp PI/ORBInitInfoC.h: PI/ORBInitInfo-stamp
 
 PI/ORBInitInfo-stamp: $(srcdir)/PI/ORBInitInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -Sal -GX -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ORBInitInfo.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ORBInitInfo.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PI/ORBInitializerA.cpp \
   PI/ORBInitializerA.h \
   PI/ORBInitializerC.cpp \
-  PI/ORBInitializerC.h \
-  PI/ORBInitializerS.h
+  PI/ORBInitializerC.h
 
 CLEANFILES += \
   PI/ORBInitializer-stamp \
   PI/ORBInitializerA.cpp \
   PI/ORBInitializerA.h \
   PI/ORBInitializerC.cpp \
-  PI/ORBInitializerC.h \
-  PI/ORBInitializerS.h
+  PI/ORBInitializerC.h
 
-PI/ORBInitializerA.cpp PI/ORBInitializerA.h PI/ORBInitializerC.cpp PI/ORBInitializerC.h PI/ORBInitializerS.h: PI/ORBInitializer-stamp
+PI/ORBInitializerA.cpp PI/ORBInitializerA.h PI/ORBInitializerC.cpp PI/ORBInitializerC.h: PI/ORBInitializer-stamp
 
 PI/ORBInitializer-stamp: $(srcdir)/PI/ORBInitializer.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ORBInitializer.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ORBInitializer.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PI/ClientRequestInterceptorA.cpp \
   PI/ClientRequestInterceptorA.h \
   PI/ClientRequestInterceptorC.cpp \
-  PI/ClientRequestInterceptorC.h \
-  PI/ClientRequestInterceptorS.h
+  PI/ClientRequestInterceptorC.h
 
 CLEANFILES += \
   PI/ClientRequestInterceptor-stamp \
   PI/ClientRequestInterceptorA.cpp \
   PI/ClientRequestInterceptorA.h \
   PI/ClientRequestInterceptorC.cpp \
-  PI/ClientRequestInterceptorC.h \
-  PI/ClientRequestInterceptorS.h
+  PI/ClientRequestInterceptorC.h
 
-PI/ClientRequestInterceptorA.cpp PI/ClientRequestInterceptorA.h PI/ClientRequestInterceptorC.cpp PI/ClientRequestInterceptorC.h PI/ClientRequestInterceptorS.h: PI/ClientRequestInterceptor-stamp
+PI/ClientRequestInterceptorA.cpp PI/ClientRequestInterceptorA.h PI/ClientRequestInterceptorC.cpp PI/ClientRequestInterceptorC.h: PI/ClientRequestInterceptor-stamp
 
 PI/ClientRequestInterceptor-stamp: $(srcdir)/PI/ClientRequestInterceptor.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ClientRequestInterceptor.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ClientRequestInterceptor.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PI/InterceptorA.cpp \
   PI/InterceptorA.h \
   PI/InterceptorC.cpp \
-  PI/InterceptorC.h \
-  PI/InterceptorS.h
+  PI/InterceptorC.h
 
 CLEANFILES += \
   PI/Interceptor-stamp \
   PI/InterceptorA.cpp \
   PI/InterceptorA.h \
   PI/InterceptorC.cpp \
-  PI/InterceptorC.h \
-  PI/InterceptorS.h
+  PI/InterceptorC.h
 
-PI/InterceptorA.cpp PI/InterceptorA.h PI/InterceptorC.cpp PI/InterceptorC.h PI/InterceptorS.h: PI/Interceptor-stamp
+PI/InterceptorA.cpp PI/InterceptorA.h PI/InterceptorC.cpp PI/InterceptorC.h: PI/Interceptor-stamp
 
 PI/Interceptor-stamp: $(srcdir)/PI/Interceptor.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/Interceptor.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/Interceptor.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PI/ClientRequestInfoA.cpp \
   PI/ClientRequestInfoA.h \
   PI/ClientRequestInfoC.cpp \
-  PI/ClientRequestInfoC.h \
-  PI/ClientRequestInfoS.h
+  PI/ClientRequestInfoC.h
 
 CLEANFILES += \
   PI/ClientRequestInfo-stamp \
   PI/ClientRequestInfoA.cpp \
   PI/ClientRequestInfoA.h \
   PI/ClientRequestInfoC.cpp \
-  PI/ClientRequestInfoC.h \
-  PI/ClientRequestInfoS.h
+  PI/ClientRequestInfoC.h
 
-PI/ClientRequestInfoA.cpp PI/ClientRequestInfoA.h PI/ClientRequestInfoC.cpp PI/ClientRequestInfoC.h PI/ClientRequestInfoS.h: PI/ClientRequestInfo-stamp
+PI/ClientRequestInfoA.cpp PI/ClientRequestInfoA.h PI/ClientRequestInfoC.cpp PI/ClientRequestInfoC.h: PI/ClientRequestInfo-stamp
 
 PI/ClientRequestInfo-stamp: $(srcdir)/PI/ClientRequestInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ClientRequestInfo.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ClientRequestInfo.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PI/RequestInfoA.cpp \
   PI/RequestInfoA.h \
   PI/RequestInfoC.cpp \
-  PI/RequestInfoC.h \
-  PI/RequestInfoS.h
+  PI/RequestInfoC.h
 
 CLEANFILES += \
   PI/RequestInfo-stamp \
   PI/RequestInfoA.cpp \
   PI/RequestInfoA.h \
   PI/RequestInfoC.cpp \
-  PI/RequestInfoC.h \
-  PI/RequestInfoS.h
+  PI/RequestInfoC.h
 
-PI/RequestInfoA.cpp PI/RequestInfoA.h PI/RequestInfoC.cpp PI/RequestInfoC.h PI/RequestInfoS.h: PI/RequestInfo-stamp
+PI/RequestInfoA.cpp PI/RequestInfoA.h PI/RequestInfoC.cpp PI/RequestInfoC.h: PI/RequestInfo-stamp
 
 PI/RequestInfo-stamp: $(srcdir)/PI/RequestInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/RequestInfo.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/RequestInfo.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PI/PIForwardRequestA.cpp \
   PI/PIForwardRequestA.h \
   PI/PIForwardRequestC.cpp \
-  PI/PIForwardRequestC.h \
-  PI/PIForwardRequestS.h
+  PI/PIForwardRequestC.h
 
 CLEANFILES += \
   PI/PIForwardRequest-stamp \
   PI/PIForwardRequestA.cpp \
   PI/PIForwardRequestA.h \
   PI/PIForwardRequestC.cpp \
-  PI/PIForwardRequestC.h \
-  PI/PIForwardRequestS.h
+  PI/PIForwardRequestC.h
 
-PI/PIForwardRequestA.cpp PI/PIForwardRequestA.h PI/PIForwardRequestC.cpp PI/PIForwardRequestC.h PI/PIForwardRequestS.h: PI/PIForwardRequest-stamp
+PI/PIForwardRequestA.cpp PI/PIForwardRequestA.h PI/PIForwardRequestC.cpp PI/PIForwardRequestC.h: PI/PIForwardRequest-stamp
 
 PI/PIForwardRequest-stamp: $(srcdir)/PI/PIForwardRequest.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/PIForwardRequest.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/PIForwardRequest.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PI/PICurrentA.cpp \
   PI/PICurrentA.h \
   PI/PICurrentC.cpp \
-  PI/PICurrentC.h \
-  PI/PICurrentS.h
+  PI/PICurrentC.h
 
 CLEANFILES += \
   PI/PICurrent-stamp \
   PI/PICurrentA.cpp \
   PI/PICurrentA.h \
   PI/PICurrentC.cpp \
-  PI/PICurrentC.h \
-  PI/PICurrentS.h
+  PI/PICurrentC.h
 
-PI/PICurrentA.cpp PI/PICurrentA.h PI/PICurrentC.cpp PI/PICurrentC.h PI/PICurrentS.h: PI/PICurrent-stamp
+PI/PICurrentA.cpp PI/PICurrentA.h PI/PICurrentC.cpp PI/PICurrentC.h: PI/PICurrent-stamp
 
 PI/PICurrent-stamp: $(srcdir)/PI/PICurrent.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/PICurrent.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/PICurrent.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PI/ProcessingModePolicyA.cpp \
   PI/ProcessingModePolicyA.h \
   PI/ProcessingModePolicyC.cpp \
-  PI/ProcessingModePolicyC.h \
-  PI/ProcessingModePolicyS.h
+  PI/ProcessingModePolicyC.h
 
 CLEANFILES += \
   PI/ProcessingModePolicy-stamp \
   PI/ProcessingModePolicyA.cpp \
   PI/ProcessingModePolicyA.h \
   PI/ProcessingModePolicyC.cpp \
-  PI/ProcessingModePolicyC.h \
-  PI/ProcessingModePolicyS.h
+  PI/ProcessingModePolicyC.h
 
-PI/ProcessingModePolicyA.cpp PI/ProcessingModePolicyA.h PI/ProcessingModePolicyC.cpp PI/ProcessingModePolicyC.h PI/ProcessingModePolicyS.h: PI/ProcessingModePolicy-stamp
+PI/ProcessingModePolicyA.cpp PI/ProcessingModePolicyA.h PI/ProcessingModePolicyC.cpp PI/ProcessingModePolicyC.h: PI/ProcessingModePolicy-stamp
 
 PI/ProcessingModePolicy-stamp: $(srcdir)/PI/ProcessingModePolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ProcessingModePolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ProcessingModePolicy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PI/InvalidSlotA.cpp \
   PI/InvalidSlotA.h \
   PI/InvalidSlotC.cpp \
-  PI/InvalidSlotC.h \
-  PI/InvalidSlotS.h
+  PI/InvalidSlotC.h
 
 CLEANFILES += \
   PI/InvalidSlot-stamp \
   PI/InvalidSlotA.cpp \
   PI/InvalidSlotA.h \
   PI/InvalidSlotC.cpp \
-  PI/InvalidSlotC.h \
-  PI/InvalidSlotS.h
+  PI/InvalidSlotC.h
 
-PI/InvalidSlotA.cpp PI/InvalidSlotA.h PI/InvalidSlotC.cpp PI/InvalidSlotC.h PI/InvalidSlotS.h: PI/InvalidSlot-stamp
+PI/InvalidSlotA.cpp PI/InvalidSlotA.h PI/InvalidSlotC.cpp PI/InvalidSlotC.h: PI/InvalidSlot-stamp
 
 PI/InvalidSlot-stamp: $(srcdir)/PI/InvalidSlot.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/InvalidSlot.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/InvalidSlot.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_PI.la
 
@@ -2285,7 +2115,7 @@ libTAO_PI_la_SOURCES = \
   PI/RequestInfo_Util.cpp
 
 libTAO_PI_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_PI_la_LIBADD = \
   libTAO_CodecFactory.la \
@@ -2301,12 +2131,10 @@ nobase_include_HEADERS += \
   PI/ClientRequestInfo.pidl \
   PI/ClientRequestInfoA.h \
   PI/ClientRequestInfoC.h \
-  PI/ClientRequestInfoS.h \
   PI/ClientRequestInterceptor.pidl \
   PI/ClientRequestInterceptor.pidl \
   PI/ClientRequestInterceptorA.h \
   PI/ClientRequestInterceptorC.h \
-  PI/ClientRequestInterceptorS.h \
   PI/ClientRequestInterceptor_Adapter_Impl.h \
   PI/ClientRequestInterceptor_Adapter_Impl.inl \
   PI/ClientRequestInterceptor_Factory_Impl.h \
@@ -2314,26 +2142,21 @@ nobase_include_HEADERS += \
   PI/Interceptor.pidl \
   PI/InterceptorA.h \
   PI/InterceptorC.h \
-  PI/InterceptorS.h \
   PI/Interceptor_List_T.cpp \
   PI/Interceptor_List_T.h \
   PI/InvalidSlot.pidl \
   PI/InvalidSlot.pidl \
   PI/InvalidSlotA.h \
   PI/InvalidSlotC.h \
-  PI/InvalidSlotS.h \
   PI/ORBInitInfo.h \
   PI/ORBInitInfo.inl \
   PI/ORBInitInfo.pidl \
   PI/ORBInitInfo.pidl \
-  PI/ORBInitInfoA.h \
   PI/ORBInitInfoC.h \
-  PI/ORBInitInfoS.h \
   PI/ORBInitializer.pidl \
   PI/ORBInitializer.pidl \
   PI/ORBInitializerA.h \
   PI/ORBInitializerC.h \
-  PI/ORBInitializerS.h \
   PI/ORBInitializer_Registry_Impl.h \
   PI/PI.h \
   PI/PICurrent.h \
@@ -2342,7 +2165,6 @@ nobase_include_HEADERS += \
   PI/PICurrent.pidl \
   PI/PICurrentA.h \
   PI/PICurrentC.h \
-  PI/PICurrentS.h \
   PI/PICurrent_Impl.h \
   PI/PICurrent_Impl.inl \
   PI/PICurrent_Loader.h \
@@ -2350,7 +2172,6 @@ nobase_include_HEADERS += \
   PI/PIForwardRequest.pidl \
   PI/PIForwardRequestA.h \
   PI/PIForwardRequestC.h \
-  PI/PIForwardRequestS.h \
   PI/PI_ORBInitializer.h \
   PI/PI_PolicyFactory.h \
   PI/PolicyFactory.pidl \
@@ -2364,12 +2185,10 @@ nobase_include_HEADERS += \
   PI/ProcessingModePolicy.pidl \
   PI/ProcessingModePolicyA.h \
   PI/ProcessingModePolicyC.h \
-  PI/ProcessingModePolicyS.h \
   PI/RequestInfo.pidl \
   PI/RequestInfo.pidl \
   PI/RequestInfoA.h \
   PI/RequestInfoC.h \
-  PI/RequestInfoS.h \
   PI/RequestInfo_Util.h \
   PI/pi_export.h
 
@@ -2380,9 +2199,7 @@ CLEANFILES += \
   TAO_PI.pc
 
 TAO_PI.pc: ${top_builddir}/config.status ${srcdir}/PI/TAO_PI.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/PI/TAO_PI.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/PI/TAO_PI.pc.in
 
 EXTRA_DIST += \
   PI/TAO_PI.pc.in
@@ -2390,24 +2207,20 @@ EXTRA_DIST += \
 
 ## Makefile.BiDir_GIOP.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   BiDir_GIOP/BiDirPolicyC.cpp \
-  BiDir_GIOP/BiDirPolicyC.h \
-  BiDir_GIOP/BiDirPolicyS.h
+  BiDir_GIOP/BiDirPolicyC.h
 
 CLEANFILES += \
   BiDir_GIOP/BiDirPolicy-stamp \
   BiDir_GIOP/BiDirPolicyC.cpp \
-  BiDir_GIOP/BiDirPolicyC.h \
-  BiDir_GIOP/BiDirPolicyS.h
+  BiDir_GIOP/BiDirPolicyC.h
 
-BiDir_GIOP/BiDirPolicyC.cpp BiDir_GIOP/BiDirPolicyC.h BiDir_GIOP/BiDirPolicyS.h: BiDir_GIOP/BiDirPolicy-stamp
+BiDir_GIOP/BiDirPolicyC.cpp BiDir_GIOP/BiDirPolicyC.h: BiDir_GIOP/BiDirPolicy-stamp
 
 BiDir_GIOP/BiDirPolicy-stamp: $(srcdir)/BiDir_GIOP/BiDirPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_BiDirGIOP_Export -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h -o BiDir_GIOP $(srcdir)/BiDir_GIOP/BiDirPolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_BiDirGIOP_Export -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h -o BiDir_GIOP $(srcdir)/BiDir_GIOP/BiDirPolicy.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_BiDirGIOP.la
 
@@ -2427,7 +2240,7 @@ libTAO_BiDirGIOP_la_SOURCES = \
   BiDir_GIOP/BiDir_Policy_i.cpp
 
 libTAO_BiDirGIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_BiDirGIOP_la_LIBADD = \
   libTAO_PI.la \
@@ -2441,7 +2254,6 @@ nobase_include_HEADERS += \
   BiDir_GIOP/BiDirPolicy.pidl \
   BiDir_GIOP/BiDirPolicy.pidl \
   BiDir_GIOP/BiDirPolicyC.h \
-  BiDir_GIOP/BiDirPolicyS.h \
   BiDir_GIOP/BiDirPolicy_Validator.h \
   BiDir_GIOP/BiDir_ORBInitializer.h \
   BiDir_GIOP/BiDir_PolicyFactory.h \
@@ -2455,9 +2267,7 @@ CLEANFILES += \
   TAO_BiDirGIOP.pc
 
 TAO_BiDirGIOP.pc: ${top_builddir}/config.status ${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
 
 EXTRA_DIST += \
   BiDir_GIOP/TAO_BiDirGIOP.pc.in \
@@ -2466,365 +2276,323 @@ EXTRA_DIST += \
 
 ## Makefile.PortableServer.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   PortableServer/ForwardRequestA.cpp \
   PortableServer/ForwardRequestA.h \
   PortableServer/ForwardRequestC.cpp \
-  PortableServer/ForwardRequestC.h \
-  PortableServer/ForwardRequestS.h
+  PortableServer/ForwardRequestC.h
 
 CLEANFILES += \
   PortableServer/ForwardRequest-stamp \
   PortableServer/ForwardRequestA.cpp \
   PortableServer/ForwardRequestA.h \
   PortableServer/ForwardRequestC.cpp \
-  PortableServer/ForwardRequestC.h \
-  PortableServer/ForwardRequestS.h
+  PortableServer/ForwardRequestC.h
 
-PortableServer/ForwardRequestA.cpp PortableServer/ForwardRequestA.h PortableServer/ForwardRequestC.cpp PortableServer/ForwardRequestC.h PortableServer/ForwardRequestS.h: PortableServer/ForwardRequest-stamp
+PortableServer/ForwardRequestA.cpp PortableServer/ForwardRequestA.h PortableServer/ForwardRequestC.cpp PortableServer/ForwardRequestC.h: PortableServer/ForwardRequest-stamp
 
 PortableServer/ForwardRequest-stamp: $(srcdir)/PortableServer/ForwardRequest.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ForwardRequest.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ForwardRequest.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/AdapterActivatorA.cpp \
   PortableServer/AdapterActivatorA.h \
   PortableServer/AdapterActivatorC.cpp \
-  PortableServer/AdapterActivatorC.h \
-  PortableServer/AdapterActivatorS.h
+  PortableServer/AdapterActivatorC.h
 
 CLEANFILES += \
   PortableServer/AdapterActivator-stamp \
   PortableServer/AdapterActivatorA.cpp \
   PortableServer/AdapterActivatorA.h \
   PortableServer/AdapterActivatorC.cpp \
-  PortableServer/AdapterActivatorC.h \
-  PortableServer/AdapterActivatorS.h
+  PortableServer/AdapterActivatorC.h
 
-PortableServer/AdapterActivatorA.cpp PortableServer/AdapterActivatorA.h PortableServer/AdapterActivatorC.cpp PortableServer/AdapterActivatorC.h PortableServer/AdapterActivatorS.h: PortableServer/AdapterActivator-stamp
+PortableServer/AdapterActivatorA.cpp PortableServer/AdapterActivatorA.h PortableServer/AdapterActivatorC.cpp PortableServer/AdapterActivatorC.h: PortableServer/AdapterActivator-stamp
 
 PortableServer/AdapterActivator-stamp: $(srcdir)/PortableServer/AdapterActivator.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/AdapterActivator.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/AdapterActivator.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/IdAssignmentPolicyA.cpp \
   PortableServer/IdAssignmentPolicyA.h \
   PortableServer/IdAssignmentPolicyC.cpp \
-  PortableServer/IdAssignmentPolicyC.h \
-  PortableServer/IdAssignmentPolicyS.h
+  PortableServer/IdAssignmentPolicyC.h
 
 CLEANFILES += \
   PortableServer/IdAssignmentPolicy-stamp \
   PortableServer/IdAssignmentPolicyA.cpp \
   PortableServer/IdAssignmentPolicyA.h \
   PortableServer/IdAssignmentPolicyC.cpp \
-  PortableServer/IdAssignmentPolicyC.h \
-  PortableServer/IdAssignmentPolicyS.h
+  PortableServer/IdAssignmentPolicyC.h
 
-PortableServer/IdAssignmentPolicyA.cpp PortableServer/IdAssignmentPolicyA.h PortableServer/IdAssignmentPolicyC.cpp PortableServer/IdAssignmentPolicyC.h PortableServer/IdAssignmentPolicyS.h: PortableServer/IdAssignmentPolicy-stamp
+PortableServer/IdAssignmentPolicyA.cpp PortableServer/IdAssignmentPolicyA.h PortableServer/IdAssignmentPolicyC.cpp PortableServer/IdAssignmentPolicyC.h: PortableServer/IdAssignmentPolicy-stamp
 
 PortableServer/IdAssignmentPolicy-stamp: $(srcdir)/PortableServer/IdAssignmentPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdAssignmentPolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdAssignmentPolicy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/IdUniquenessPolicyA.cpp \
   PortableServer/IdUniquenessPolicyA.h \
   PortableServer/IdUniquenessPolicyC.cpp \
-  PortableServer/IdUniquenessPolicyC.h \
-  PortableServer/IdUniquenessPolicyS.h
+  PortableServer/IdUniquenessPolicyC.h
 
 CLEANFILES += \
   PortableServer/IdUniquenessPolicy-stamp \
   PortableServer/IdUniquenessPolicyA.cpp \
   PortableServer/IdUniquenessPolicyA.h \
   PortableServer/IdUniquenessPolicyC.cpp \
-  PortableServer/IdUniquenessPolicyC.h \
-  PortableServer/IdUniquenessPolicyS.h
+  PortableServer/IdUniquenessPolicyC.h
 
-PortableServer/IdUniquenessPolicyA.cpp PortableServer/IdUniquenessPolicyA.h PortableServer/IdUniquenessPolicyC.cpp PortableServer/IdUniquenessPolicyC.h PortableServer/IdUniquenessPolicyS.h: PortableServer/IdUniquenessPolicy-stamp
+PortableServer/IdUniquenessPolicyA.cpp PortableServer/IdUniquenessPolicyA.h PortableServer/IdUniquenessPolicyC.cpp PortableServer/IdUniquenessPolicyC.h: PortableServer/IdUniquenessPolicy-stamp
 
 PortableServer/IdUniquenessPolicy-stamp: $(srcdir)/PortableServer/IdUniquenessPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdUniquenessPolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdUniquenessPolicy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/ImplicitActivationPolicyA.cpp \
   PortableServer/ImplicitActivationPolicyA.h \
   PortableServer/ImplicitActivationPolicyC.cpp \
-  PortableServer/ImplicitActivationPolicyC.h \
-  PortableServer/ImplicitActivationPolicyS.h
+  PortableServer/ImplicitActivationPolicyC.h
 
 CLEANFILES += \
   PortableServer/ImplicitActivationPolicy-stamp \
   PortableServer/ImplicitActivationPolicyA.cpp \
   PortableServer/ImplicitActivationPolicyA.h \
   PortableServer/ImplicitActivationPolicyC.cpp \
-  PortableServer/ImplicitActivationPolicyC.h \
-  PortableServer/ImplicitActivationPolicyS.h
+  PortableServer/ImplicitActivationPolicyC.h
 
-PortableServer/ImplicitActivationPolicyA.cpp PortableServer/ImplicitActivationPolicyA.h PortableServer/ImplicitActivationPolicyC.cpp PortableServer/ImplicitActivationPolicyC.h PortableServer/ImplicitActivationPolicyS.h: PortableServer/ImplicitActivationPolicy-stamp
+PortableServer/ImplicitActivationPolicyA.cpp PortableServer/ImplicitActivationPolicyA.h PortableServer/ImplicitActivationPolicyC.cpp PortableServer/ImplicitActivationPolicyC.h: PortableServer/ImplicitActivationPolicy-stamp
 
 PortableServer/ImplicitActivationPolicy-stamp: $(srcdir)/PortableServer/ImplicitActivationPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ImplicitActivationPolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ImplicitActivationPolicy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/LifespanPolicyA.cpp \
   PortableServer/LifespanPolicyA.h \
   PortableServer/LifespanPolicyC.cpp \
-  PortableServer/LifespanPolicyC.h \
-  PortableServer/LifespanPolicyS.h
+  PortableServer/LifespanPolicyC.h
 
 CLEANFILES += \
   PortableServer/LifespanPolicy-stamp \
   PortableServer/LifespanPolicyA.cpp \
   PortableServer/LifespanPolicyA.h \
   PortableServer/LifespanPolicyC.cpp \
-  PortableServer/LifespanPolicyC.h \
-  PortableServer/LifespanPolicyS.h
+  PortableServer/LifespanPolicyC.h
 
-PortableServer/LifespanPolicyA.cpp PortableServer/LifespanPolicyA.h PortableServer/LifespanPolicyC.cpp PortableServer/LifespanPolicyC.h PortableServer/LifespanPolicyS.h: PortableServer/LifespanPolicy-stamp
+PortableServer/LifespanPolicyA.cpp PortableServer/LifespanPolicyA.h PortableServer/LifespanPolicyC.cpp PortableServer/LifespanPolicyC.h: PortableServer/LifespanPolicy-stamp
 
 PortableServer/LifespanPolicy-stamp: $(srcdir)/PortableServer/LifespanPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/LifespanPolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/LifespanPolicy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/RequestProcessingPolicyA.cpp \
   PortableServer/RequestProcessingPolicyA.h \
   PortableServer/RequestProcessingPolicyC.cpp \
-  PortableServer/RequestProcessingPolicyC.h \
-  PortableServer/RequestProcessingPolicyS.h
+  PortableServer/RequestProcessingPolicyC.h
 
 CLEANFILES += \
   PortableServer/RequestProcessingPolicy-stamp \
   PortableServer/RequestProcessingPolicyA.cpp \
   PortableServer/RequestProcessingPolicyA.h \
   PortableServer/RequestProcessingPolicyC.cpp \
-  PortableServer/RequestProcessingPolicyC.h \
-  PortableServer/RequestProcessingPolicyS.h
+  PortableServer/RequestProcessingPolicyC.h
 
-PortableServer/RequestProcessingPolicyA.cpp PortableServer/RequestProcessingPolicyA.h PortableServer/RequestProcessingPolicyC.cpp PortableServer/RequestProcessingPolicyC.h PortableServer/RequestProcessingPolicyS.h: PortableServer/RequestProcessingPolicy-stamp
+PortableServer/RequestProcessingPolicyA.cpp PortableServer/RequestProcessingPolicyA.h PortableServer/RequestProcessingPolicyC.cpp PortableServer/RequestProcessingPolicyC.h: PortableServer/RequestProcessingPolicy-stamp
 
 PortableServer/RequestProcessingPolicy-stamp: $(srcdir)/PortableServer/RequestProcessingPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/RequestProcessingPolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/RequestProcessingPolicy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/ServantActivatorA.cpp \
   PortableServer/ServantActivatorA.h \
   PortableServer/ServantActivatorC.cpp \
-  PortableServer/ServantActivatorC.h \
-  PortableServer/ServantActivatorS.h
+  PortableServer/ServantActivatorC.h
 
 CLEANFILES += \
   PortableServer/ServantActivator-stamp \
   PortableServer/ServantActivatorA.cpp \
   PortableServer/ServantActivatorA.h \
   PortableServer/ServantActivatorC.cpp \
-  PortableServer/ServantActivatorC.h \
-  PortableServer/ServantActivatorS.h
+  PortableServer/ServantActivatorC.h
 
-PortableServer/ServantActivatorA.cpp PortableServer/ServantActivatorA.h PortableServer/ServantActivatorC.cpp PortableServer/ServantActivatorC.h PortableServer/ServantActivatorS.h: PortableServer/ServantActivator-stamp
+PortableServer/ServantActivatorA.cpp PortableServer/ServantActivatorA.h PortableServer/ServantActivatorC.cpp PortableServer/ServantActivatorC.h: PortableServer/ServantActivator-stamp
 
 PortableServer/ServantActivator-stamp: $(srcdir)/PortableServer/ServantActivator.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantActivator.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantActivator.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/ServantLocatorA.cpp \
   PortableServer/ServantLocatorA.h \
   PortableServer/ServantLocatorC.cpp \
-  PortableServer/ServantLocatorC.h \
-  PortableServer/ServantLocatorS.h
+  PortableServer/ServantLocatorC.h
 
 CLEANFILES += \
   PortableServer/ServantLocator-stamp \
   PortableServer/ServantLocatorA.cpp \
   PortableServer/ServantLocatorA.h \
   PortableServer/ServantLocatorC.cpp \
-  PortableServer/ServantLocatorC.h \
-  PortableServer/ServantLocatorS.h
+  PortableServer/ServantLocatorC.h
 
-PortableServer/ServantLocatorA.cpp PortableServer/ServantLocatorA.h PortableServer/ServantLocatorC.cpp PortableServer/ServantLocatorC.h PortableServer/ServantLocatorS.h: PortableServer/ServantLocator-stamp
+PortableServer/ServantLocatorA.cpp PortableServer/ServantLocatorA.h PortableServer/ServantLocatorC.cpp PortableServer/ServantLocatorC.h: PortableServer/ServantLocator-stamp
 
 PortableServer/ServantLocator-stamp: $(srcdir)/PortableServer/ServantLocator.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantLocator.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantLocator.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/ServantManagerA.cpp \
   PortableServer/ServantManagerA.h \
   PortableServer/ServantManagerC.cpp \
-  PortableServer/ServantManagerC.h \
-  PortableServer/ServantManagerS.h
+  PortableServer/ServantManagerC.h
 
 CLEANFILES += \
   PortableServer/ServantManager-stamp \
   PortableServer/ServantManagerA.cpp \
   PortableServer/ServantManagerA.h \
   PortableServer/ServantManagerC.cpp \
-  PortableServer/ServantManagerC.h \
-  PortableServer/ServantManagerS.h
+  PortableServer/ServantManagerC.h
 
-PortableServer/ServantManagerA.cpp PortableServer/ServantManagerA.h PortableServer/ServantManagerC.cpp PortableServer/ServantManagerC.h PortableServer/ServantManagerS.h: PortableServer/ServantManager-stamp
+PortableServer/ServantManagerA.cpp PortableServer/ServantManagerA.h PortableServer/ServantManagerC.cpp PortableServer/ServantManagerC.h: PortableServer/ServantManager-stamp
 
 PortableServer/ServantManager-stamp: $(srcdir)/PortableServer/ServantManager.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantManager.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantManager.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/ServantRetentionPolicyA.cpp \
   PortableServer/ServantRetentionPolicyA.h \
   PortableServer/ServantRetentionPolicyC.cpp \
-  PortableServer/ServantRetentionPolicyC.h \
-  PortableServer/ServantRetentionPolicyS.h
+  PortableServer/ServantRetentionPolicyC.h
 
 CLEANFILES += \
   PortableServer/ServantRetentionPolicy-stamp \
   PortableServer/ServantRetentionPolicyA.cpp \
   PortableServer/ServantRetentionPolicyA.h \
   PortableServer/ServantRetentionPolicyC.cpp \
-  PortableServer/ServantRetentionPolicyC.h \
-  PortableServer/ServantRetentionPolicyS.h
+  PortableServer/ServantRetentionPolicyC.h
 
-PortableServer/ServantRetentionPolicyA.cpp PortableServer/ServantRetentionPolicyA.h PortableServer/ServantRetentionPolicyC.cpp PortableServer/ServantRetentionPolicyC.h PortableServer/ServantRetentionPolicyS.h: PortableServer/ServantRetentionPolicy-stamp
+PortableServer/ServantRetentionPolicyA.cpp PortableServer/ServantRetentionPolicyA.h PortableServer/ServantRetentionPolicyC.cpp PortableServer/ServantRetentionPolicyC.h: PortableServer/ServantRetentionPolicy-stamp
 
 PortableServer/ServantRetentionPolicy-stamp: $(srcdir)/PortableServer/ServantRetentionPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantRetentionPolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantRetentionPolicy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/ThreadPolicyA.cpp \
   PortableServer/ThreadPolicyA.h \
   PortableServer/ThreadPolicyC.cpp \
-  PortableServer/ThreadPolicyC.h \
-  PortableServer/ThreadPolicyS.h
+  PortableServer/ThreadPolicyC.h
 
 CLEANFILES += \
   PortableServer/ThreadPolicy-stamp \
   PortableServer/ThreadPolicyA.cpp \
   PortableServer/ThreadPolicyA.h \
   PortableServer/ThreadPolicyC.cpp \
-  PortableServer/ThreadPolicyC.h \
-  PortableServer/ThreadPolicyS.h
+  PortableServer/ThreadPolicyC.h
 
-PortableServer/ThreadPolicyA.cpp PortableServer/ThreadPolicyA.h PortableServer/ThreadPolicyC.cpp PortableServer/ThreadPolicyC.h PortableServer/ThreadPolicyS.h: PortableServer/ThreadPolicy-stamp
+PortableServer/ThreadPolicyA.cpp PortableServer/ThreadPolicyA.h PortableServer/ThreadPolicyC.cpp PortableServer/ThreadPolicyC.h: PortableServer/ThreadPolicy-stamp
 
 PortableServer/ThreadPolicy-stamp: $(srcdir)/PortableServer/ThreadPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ThreadPolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ThreadPolicy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/POAManagerC.cpp \
-  PortableServer/POAManagerC.h \
-  PortableServer/POAManagerS.h
+  PortableServer/POAManagerC.h
 
 CLEANFILES += \
   PortableServer/POAManager-stamp \
   PortableServer/POAManagerC.cpp \
-  PortableServer/POAManagerC.h \
-  PortableServer/POAManagerS.h
+  PortableServer/POAManagerC.h
 
-PortableServer/POAManagerC.cpp PortableServer/POAManagerC.h PortableServer/POAManagerS.h: PortableServer/POAManager-stamp
+PortableServer/POAManagerC.cpp PortableServer/POAManagerC.h: PortableServer/POAManager-stamp
 
 PortableServer/POAManager-stamp: $(srcdir)/PortableServer/POAManager.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManager.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManager.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/POAManagerFactoryC.cpp \
-  PortableServer/POAManagerFactoryC.h \
-  PortableServer/POAManagerFactoryS.h
+  PortableServer/POAManagerFactoryC.h
 
 CLEANFILES += \
   PortableServer/POAManagerFactory-stamp \
   PortableServer/POAManagerFactoryC.cpp \
-  PortableServer/POAManagerFactoryC.h \
-  PortableServer/POAManagerFactoryS.h
+  PortableServer/POAManagerFactoryC.h
 
-PortableServer/POAManagerFactoryC.cpp PortableServer/POAManagerFactoryC.h PortableServer/POAManagerFactoryS.h: PortableServer/POAManagerFactory-stamp
+PortableServer/POAManagerFactoryC.cpp PortableServer/POAManagerFactoryC.h: PortableServer/POAManagerFactory-stamp
 
 PortableServer/POAManagerFactory-stamp: $(srcdir)/PortableServer/POAManagerFactory.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManagerFactory.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManagerFactory.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/POAC.cpp \
-  PortableServer/POAC.h \
-  PortableServer/POAS.h
+  PortableServer/POAC.h
 
 CLEANFILES += \
   PortableServer/POA-stamp \
   PortableServer/POAC.cpp \
-  PortableServer/POAC.h \
-  PortableServer/POAS.h
+  PortableServer/POAC.h
 
-PortableServer/POAC.cpp PortableServer/POAC.h PortableServer/POAS.h: PortableServer/POA-stamp
+PortableServer/POAC.cpp PortableServer/POAC.h: PortableServer/POA-stamp
 
 PortableServer/POA-stamp: $(srcdir)/PortableServer/POA.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POA.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POA.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   PortableServer/PS_CurrentC.cpp \
-  PortableServer/PS_CurrentC.h \
-  PortableServer/PS_CurrentS.h
+  PortableServer/PS_CurrentC.h
 
 CLEANFILES += \
   PortableServer/PS_Current-stamp \
   PortableServer/PS_CurrentC.cpp \
-  PortableServer/PS_CurrentC.h \
-  PortableServer/PS_CurrentS.h
+  PortableServer/PS_CurrentC.h
 
-PortableServer/PS_CurrentC.cpp PortableServer/PS_CurrentC.h PortableServer/PS_CurrentS.h: PortableServer/PS_Current-stamp
+PortableServer/PS_CurrentC.cpp PortableServer/PS_CurrentC.h: PortableServer/PS_Current-stamp
 
 PortableServer/PS_Current-stamp: $(srcdir)/PortableServer/PS_Current.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/PS_Current.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/PS_Current.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  PortableServer/PortableServer_includeA.h \
   PortableServer/PortableServer_includeC.cpp \
-  PortableServer/PortableServer_includeC.h \
-  PortableServer/PortableServer_includeS.h
+  PortableServer/PortableServer_includeC.h
 
 CLEANFILES += \
   PortableServer/PortableServer_include-stamp \
-  PortableServer/PortableServer_includeA.h \
   PortableServer/PortableServer_includeC.cpp \
-  PortableServer/PortableServer_includeC.h \
-  PortableServer/PortableServer_includeS.h
+  PortableServer/PortableServer_includeC.h
 
-PortableServer/PortableServer_includeA.h PortableServer/PortableServer_includeC.cpp PortableServer/PortableServer_includeC.h PortableServer/PortableServer_includeS.h: PortableServer/PortableServer_include-stamp
+PortableServer/PortableServer_includeC.cpp PortableServer/PortableServer_includeC.h: PortableServer/PortableServer_include-stamp
 
 PortableServer/PortableServer_include-stamp: $(srcdir)/PortableServer/PortableServer_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,unique_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer_include.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,unique_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer_include.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  PortableServer/PortableServerA.h \
   PortableServer/PortableServerC.cpp \
-  PortableServer/PortableServerC.h \
-  PortableServer/PortableServerS.h
+  PortableServer/PortableServerC.h
 
 CLEANFILES += \
   PortableServer/PortableServer-stamp \
-  PortableServer/PortableServerA.h \
   PortableServer/PortableServerC.cpp \
-  PortableServer/PortableServerC.h \
-  PortableServer/PortableServerS.h
+  PortableServer/PortableServerC.h
 
-PortableServer/PortableServerA.h PortableServer/PortableServerC.cpp PortableServer/PortableServerC.h PortableServer/PortableServerS.h: PortableServer/PortableServer-stamp
+PortableServer/PortableServerC.cpp PortableServer/PortableServerC.h: PortableServer/PortableServer-stamp
 
 PortableServer/PortableServer-stamp: $(srcdir)/PortableServer/PortableServer.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_PortableServer.la
 
@@ -2960,7 +2728,7 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/Upcall_Wrapper.cpp
 
 libTAO_PortableServer_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_PortableServer_la_LIBADD = \
   libTAO_AnyTypeCode.la \
@@ -2978,7 +2746,6 @@ nobase_include_HEADERS += \
   PortableServer/AdapterActivator.pidl \
   PortableServer/AdapterActivatorA.h \
   PortableServer/AdapterActivatorC.h \
-  PortableServer/AdapterActivatorS.h \
   PortableServer/Adapter_Activator.h \
   PortableServer/Any_SArg_Traits.h \
   PortableServer/BD_String_SArgument_T.cpp \
@@ -3006,13 +2773,11 @@ nobase_include_HEADERS += \
   PortableServer/ForwardRequest.pidl \
   PortableServer/ForwardRequestA.h \
   PortableServer/ForwardRequestC.h \
-  PortableServer/ForwardRequestS.h \
   PortableServer/IdAssignmentPolicy.h \
   PortableServer/IdAssignmentPolicy.pidl \
   PortableServer/IdAssignmentPolicy.pidl \
   PortableServer/IdAssignmentPolicyA.h \
   PortableServer/IdAssignmentPolicyC.h \
-  PortableServer/IdAssignmentPolicyS.h \
   PortableServer/IdAssignmentStrategy.h \
   PortableServer/IdAssignmentStrategyFactory.h \
   PortableServer/IdAssignmentStrategyFactoryImpl.h \
@@ -3023,7 +2788,6 @@ nobase_include_HEADERS += \
   PortableServer/IdUniquenessPolicy.pidl \
   PortableServer/IdUniquenessPolicyA.h \
   PortableServer/IdUniquenessPolicyC.h \
-  PortableServer/IdUniquenessPolicyS.h \
   PortableServer/IdUniquenessStrategy.h \
   PortableServer/IdUniquenessStrategyFactory.h \
   PortableServer/IdUniquenessStrategyFactoryImpl.h \
@@ -3036,7 +2800,6 @@ nobase_include_HEADERS += \
   PortableServer/ImplicitActivationPolicy.pidl \
   PortableServer/ImplicitActivationPolicyA.h \
   PortableServer/ImplicitActivationPolicyC.h \
-  PortableServer/ImplicitActivationPolicyS.h \
   PortableServer/ImplicitActivationStrategy.h \
   PortableServer/ImplicitActivationStrategyExplicit.h \
   PortableServer/ImplicitActivationStrategyFactory.h \
@@ -3048,7 +2811,6 @@ nobase_include_HEADERS += \
   PortableServer/LifespanPolicy.pidl \
   PortableServer/LifespanPolicyA.h \
   PortableServer/LifespanPolicyC.h \
-  PortableServer/LifespanPolicyS.h \
   PortableServer/LifespanStrategy.h \
   PortableServer/LifespanStrategyFactory.h \
   PortableServer/LifespanStrategyFactoryImpl.h \
@@ -3086,9 +2848,6 @@ nobase_include_HEADERS += \
   PortableServer/POAManagerFactory.pidl \
   PortableServer/POAManagerFactory.pidl \
   PortableServer/POAManagerFactoryC.h \
-  PortableServer/POAManagerFactoryS.h \
-  PortableServer/POAManagerS.h \
-  PortableServer/POAS.h \
   PortableServer/POA_Cached_Policies.h \
   PortableServer/POA_Cached_Policies.inl \
   PortableServer/POA_Current.h \
@@ -3101,7 +2860,6 @@ nobase_include_HEADERS += \
   PortableServer/PS_Current.pidl \
   PortableServer/PS_Current.pidl \
   PortableServer/PS_CurrentC.h \
-  PortableServer/PS_CurrentS.h \
   PortableServer/PS_Forward.pidl \
   PortableServer/PS_ForwardA.h \
   PortableServer/PS_ForwardC.h \
@@ -3113,16 +2871,12 @@ nobase_include_HEADERS += \
   PortableServer/PortableServer.h \
   PortableServer/PortableServer.pidl \
   PortableServer/PortableServer.pidl \
-  PortableServer/PortableServerA.h \
   PortableServer/PortableServerC.h \
-  PortableServer/PortableServerS.h \
   PortableServer/PortableServer_Functions.h \
   PortableServer/PortableServer_WFunctions.h \
   PortableServer/PortableServer_include.pidl \
   PortableServer/PortableServer_include.pidl \
-  PortableServer/PortableServer_includeA.h \
   PortableServer/PortableServer_includeC.h \
-  PortableServer/PortableServer_includeS.h \
   PortableServer/Regular_POA.h \
   PortableServer/Regular_POA.inl \
   PortableServer/RequestProcessingPolicy.h \
@@ -3130,7 +2884,6 @@ nobase_include_HEADERS += \
   PortableServer/RequestProcessingPolicy.pidl \
   PortableServer/RequestProcessingPolicyA.h \
   PortableServer/RequestProcessingPolicyC.h \
-  PortableServer/RequestProcessingPolicyS.h \
   PortableServer/RequestProcessingStrategy.h \
   PortableServer/RequestProcessingStrategyAOMOnly.h \
   PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h \
@@ -3150,23 +2903,19 @@ nobase_include_HEADERS += \
   PortableServer/ServantActivator.pidl \
   PortableServer/ServantActivatorA.h \
   PortableServer/ServantActivatorC.h \
-  PortableServer/ServantActivatorS.h \
   PortableServer/ServantLocator.pidl \
   PortableServer/ServantLocator.pidl \
   PortableServer/ServantLocatorA.h \
   PortableServer/ServantLocatorC.h \
-  PortableServer/ServantLocatorS.h \
   PortableServer/ServantManager.pidl \
   PortableServer/ServantManager.pidl \
   PortableServer/ServantManagerA.h \
   PortableServer/ServantManagerC.h \
-  PortableServer/ServantManagerS.h \
   PortableServer/ServantRetentionPolicy.h \
   PortableServer/ServantRetentionPolicy.pidl \
   PortableServer/ServantRetentionPolicy.pidl \
   PortableServer/ServantRetentionPolicyA.h \
   PortableServer/ServantRetentionPolicyC.h \
-  PortableServer/ServantRetentionPolicyS.h \
   PortableServer/ServantRetentionStrategy.h \
   PortableServer/ServantRetentionStrategyFactory.h \
   PortableServer/ServantRetentionStrategyFactoryImpl.h \
@@ -3193,7 +2942,6 @@ nobase_include_HEADERS += \
   PortableServer/ThreadPolicy.pidl \
   PortableServer/ThreadPolicyA.h \
   PortableServer/ThreadPolicyC.h \
-  PortableServer/ThreadPolicyS.h \
   PortableServer/ThreadStrategy.h \
   PortableServer/ThreadStrategyFactory.h \
   PortableServer/ThreadStrategyFactoryImpl.h \
@@ -3224,9 +2972,7 @@ CLEANFILES += \
   TAO_PortableServer.pc
 
 TAO_PortableServer.pc: ${top_builddir}/config.status ${srcdir}/PortableServer/TAO_PortableServer.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/PortableServer/TAO_PortableServer.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/PortableServer/TAO_PortableServer.pc.in
 
 EXTRA_DIST += \
   PortableServer/TAO_PortableServer.pc.in \
@@ -3235,28 +2981,24 @@ EXTRA_DIST += \
 
 ## Makefile.CSD_Framework.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   CSD_Framework/CSD_FrameworkA.cpp \
   CSD_Framework/CSD_FrameworkA.h \
   CSD_Framework/CSD_FrameworkC.cpp \
-  CSD_Framework/CSD_FrameworkC.h \
-  CSD_Framework/CSD_FrameworkS.h
+  CSD_Framework/CSD_FrameworkC.h
 
 CLEANFILES += \
   CSD_Framework/CSD_Framework-stamp \
   CSD_Framework/CSD_FrameworkA.cpp \
   CSD_Framework/CSD_FrameworkA.h \
   CSD_Framework/CSD_FrameworkC.cpp \
-  CSD_Framework/CSD_FrameworkC.h \
-  CSD_Framework/CSD_FrameworkS.h
+  CSD_Framework/CSD_FrameworkC.h
 
-CSD_Framework/CSD_FrameworkA.cpp CSD_Framework/CSD_FrameworkA.h CSD_Framework/CSD_FrameworkC.cpp CSD_Framework/CSD_FrameworkC.h CSD_Framework/CSD_FrameworkS.h: CSD_Framework/CSD_Framework-stamp
+CSD_Framework/CSD_FrameworkA.cpp CSD_Framework/CSD_FrameworkA.h CSD_Framework/CSD_FrameworkC.cpp CSD_Framework/CSD_FrameworkC.h: CSD_Framework/CSD_Framework-stamp
 
 CSD_Framework/CSD_Framework-stamp: $(srcdir)/CSD_Framework/CSD_Framework.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -GA -Sal -Wb,export_macro=TAO_CSD_FW_Export -Wb,export_include=tao/CSD_Framework/CSD_FW_Export.h -o CSD_Framework $(srcdir)/CSD_Framework/CSD_Framework.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -GA -Sal -Wb,export_macro=TAO_CSD_FW_Export -Wb,export_include=tao/CSD_Framework/CSD_FW_Export.h -o CSD_Framework $(srcdir)/CSD_Framework/CSD_Framework.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_CSD_Framework.la
 
@@ -3283,7 +3025,7 @@ libTAO_CSD_Framework_la_SOURCES = \
   CSD_Framework/CSD_Strategy_Repository.cpp
 
 libTAO_CSD_Framework_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CSD_Framework_la_LIBADD = \
   libTAO_PI.la \
@@ -3302,7 +3044,6 @@ nobase_include_HEADERS += \
   CSD_Framework/CSD_Framework.pidl \
   CSD_Framework/CSD_FrameworkA.h \
   CSD_Framework/CSD_FrameworkC.h \
-  CSD_Framework/CSD_FrameworkS.h \
   CSD_Framework/CSD_Framework_Loader.h \
   CSD_Framework/CSD_ORBInitializer.h \
   CSD_Framework/CSD_Object_Adapter.h \
@@ -3322,9 +3063,7 @@ CLEANFILES += \
   TAO_CSD_Framework.pc
 
 TAO_CSD_Framework.pc: ${top_builddir}/config.status ${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in
 
 EXTRA_DIST += \
   CSD_Framework/TAO_CSD_Framework.pc.in
@@ -3332,7 +3071,6 @@ EXTRA_DIST += \
 
 ## Makefile.CSD_ThreadPool.am
 
-if BUILD_EXCEPTIONS
 if BUILD_THREADS
 
 lib_LTLIBRARIES += libTAO_CSD_ThreadPool.la
@@ -3369,7 +3107,7 @@ libTAO_CSD_ThreadPool_la_SOURCES = \
   CSD_ThreadPool/CSD_ThreadPool.cpp
 
 libTAO_CSD_ThreadPool_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_CSD_ThreadPool_la_LIBADD = \
   libTAO_CSD_Framework.la \
@@ -3430,176 +3168,83 @@ CLEANFILES += \
   TAO_CSD_ThreadPool.pc
 
 TAO_CSD_ThreadPool.pc: ${top_builddir}/config.status ${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
 
 endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
 
 EXTRA_DIST += \
   CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
 
 
-## Makefile.Compression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  Compression/CompressionC.cpp \
-  Compression/CompressionC.h \
-  Compression/CompressionS.h
-
-CLEANFILES += \
-  Compression/Compression-stamp \
-  Compression/CompressionC.cpp \
-  Compression/CompressionC.h \
-  Compression/CompressionS.h
-
-Compression/CompressionC.cpp Compression/CompressionC.h Compression/CompressionS.h: Compression/Compression-stamp
-
-Compression/Compression-stamp: $(srcdir)/Compression/Compression.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_Compression_Export -Wb,export_include=tao/Compression/compression_export.h -Wb,include_guard=TAO_COMPRESSION_SAFE_INCLUDE -Wb,safe_include=tao/Compression/Compression.h -o Compression $(srcdir)/Compression/Compression.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Compression.la
-
-libTAO_Compression_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_COMPRESSION_BUILD_DLL
-
-libTAO_Compression_la_SOURCES = \
-  Compression/Base_Compressor.cpp \
-  Compression/Compression.cpp \
-  Compression/CompressionC.cpp \
-  Compression/Compression_Manager.cpp \
-  Compression/Compressor_Factory.cpp
-
-libTAO_Compression_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Compression_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Compression/Base_Compressor.h \
-  Compression/Compression.h \
-  Compression/Compression.pidl \
-  Compression/Compression.pidl \
-  Compression/CompressionC.h \
-  Compression/CompressionS.h \
-  Compression/Compression_Manager.h \
-  Compression/Compressor_Factory.h \
-  Compression/compression_export.h
-
-pkgconfig_DATA += \
-  TAO_Compression.pc
-
-CLEANFILES += \
-  TAO_Compression.pc
-
-TAO_Compression.pc: ${top_builddir}/config.status ${srcdir}/Compression/TAO_Compression.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Compression/TAO_Compression.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  Compression/TAO_Compression.pc.in \
-  Compression/TAO_Compression.rc
-
-
 ## Makefile.IFR_Client.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
-  IFR_Client/IFR_BaseA.h \
   IFR_Client/IFR_BaseC.cpp \
   IFR_Client/IFR_BaseC.h \
-  IFR_Client/IFR_BaseC.inl \
-  IFR_Client/IFR_BaseS.h
+  IFR_Client/IFR_BaseC.inl
 
 CLEANFILES += \
   IFR_Client/IFR_Base-stamp \
-  IFR_Client/IFR_BaseA.h \
   IFR_Client/IFR_BaseC.cpp \
   IFR_Client/IFR_BaseC.h \
-  IFR_Client/IFR_BaseC.inl \
-  IFR_Client/IFR_BaseS.h
+  IFR_Client/IFR_BaseC.inl
 
-IFR_Client/IFR_BaseA.h IFR_Client/IFR_BaseC.cpp IFR_Client/IFR_BaseC.h IFR_Client/IFR_BaseC.inl IFR_Client/IFR_BaseS.h: IFR_Client/IFR_Base-stamp
+IFR_Client/IFR_BaseC.cpp IFR_Client/IFR_BaseC.h IFR_Client/IFR_BaseC.inl: IFR_Client/IFR_Base-stamp
 
 IFR_Client/IFR_Base-stamp: $(srcdir)/IFR_Client/IFR_Base.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Base.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Base.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  IFR_Client/IFR_BasicA.h \
   IFR_Client/IFR_BasicC.cpp \
   IFR_Client/IFR_BasicC.h \
-  IFR_Client/IFR_BasicC.inl \
-  IFR_Client/IFR_BasicS.h
+  IFR_Client/IFR_BasicC.inl
 
 CLEANFILES += \
   IFR_Client/IFR_Basic-stamp \
-  IFR_Client/IFR_BasicA.h \
   IFR_Client/IFR_BasicC.cpp \
   IFR_Client/IFR_BasicC.h \
-  IFR_Client/IFR_BasicC.inl \
-  IFR_Client/IFR_BasicS.h
+  IFR_Client/IFR_BasicC.inl
 
-IFR_Client/IFR_BasicA.h IFR_Client/IFR_BasicC.cpp IFR_Client/IFR_BasicC.h IFR_Client/IFR_BasicC.inl IFR_Client/IFR_BasicS.h: IFR_Client/IFR_Basic-stamp
+IFR_Client/IFR_BasicC.cpp IFR_Client/IFR_BasicC.h IFR_Client/IFR_BasicC.inl: IFR_Client/IFR_Basic-stamp
 
 IFR_Client/IFR_Basic-stamp: $(srcdir)/IFR_Client/IFR_Basic.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Basic.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Basic.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  IFR_Client/IFR_ComponentsA.h \
   IFR_Client/IFR_ComponentsC.cpp \
   IFR_Client/IFR_ComponentsC.h \
-  IFR_Client/IFR_ComponentsC.inl \
-  IFR_Client/IFR_ComponentsS.h
+  IFR_Client/IFR_ComponentsC.inl
 
 CLEANFILES += \
   IFR_Client/IFR_Components-stamp \
-  IFR_Client/IFR_ComponentsA.h \
   IFR_Client/IFR_ComponentsC.cpp \
   IFR_Client/IFR_ComponentsC.h \
-  IFR_Client/IFR_ComponentsC.inl \
-  IFR_Client/IFR_ComponentsS.h
+  IFR_Client/IFR_ComponentsC.inl
 
-IFR_Client/IFR_ComponentsA.h IFR_Client/IFR_ComponentsC.cpp IFR_Client/IFR_ComponentsC.h IFR_Client/IFR_ComponentsC.inl IFR_Client/IFR_ComponentsS.h: IFR_Client/IFR_Components-stamp
+IFR_Client/IFR_ComponentsC.cpp IFR_Client/IFR_ComponentsC.h IFR_Client/IFR_ComponentsC.inl: IFR_Client/IFR_Components-stamp
 
 IFR_Client/IFR_Components-stamp: $(srcdir)/IFR_Client/IFR_Components.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Components.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Components.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  IFR_Client/IFR_ExtendedA.h \
   IFR_Client/IFR_ExtendedC.cpp \
   IFR_Client/IFR_ExtendedC.h \
-  IFR_Client/IFR_ExtendedC.inl \
-  IFR_Client/IFR_ExtendedS.h
+  IFR_Client/IFR_ExtendedC.inl
 
 CLEANFILES += \
   IFR_Client/IFR_Extended-stamp \
-  IFR_Client/IFR_ExtendedA.h \
   IFR_Client/IFR_ExtendedC.cpp \
   IFR_Client/IFR_ExtendedC.h \
-  IFR_Client/IFR_ExtendedC.inl \
-  IFR_Client/IFR_ExtendedS.h
+  IFR_Client/IFR_ExtendedC.inl
 
-IFR_Client/IFR_ExtendedA.h IFR_Client/IFR_ExtendedC.cpp IFR_Client/IFR_ExtendedC.h IFR_Client/IFR_ExtendedC.inl IFR_Client/IFR_ExtendedS.h: IFR_Client/IFR_Extended-stamp
+IFR_Client/IFR_ExtendedC.cpp IFR_Client/IFR_ExtendedC.h IFR_Client/IFR_ExtendedC.inl: IFR_Client/IFR_Extended-stamp
 
 IFR_Client/IFR_Extended-stamp: $(srcdir)/IFR_Client/IFR_Extended.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Extended.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Extended.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_IFR_Client.la
 
@@ -3618,7 +3263,7 @@ libTAO_IFR_Client_la_SOURCES = \
   IFR_Client/IFR_ExtendedC.cpp
 
 libTAO_IFR_Client_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_IFR_Client_la_LIBADD = \
   libTAO_AnyTypeCode.la \
@@ -3628,29 +3273,21 @@ libTAO_IFR_Client_la_LIBADD = \
 nobase_include_HEADERS += \
   IFR_Client/IFR_Base.pidl \
   IFR_Client/IFR_Base.pidl \
-  IFR_Client/IFR_BaseA.h \
   IFR_Client/IFR_BaseC.h \
   IFR_Client/IFR_BaseC.inl \
-  IFR_Client/IFR_BaseS.h \
   IFR_Client/IFR_Basic.pidl \
   IFR_Client/IFR_Basic.pidl \
-  IFR_Client/IFR_BasicA.h \
   IFR_Client/IFR_BasicC.h \
   IFR_Client/IFR_BasicC.inl \
-  IFR_Client/IFR_BasicS.h \
   IFR_Client/IFR_Client_Adapter_Impl.h \
   IFR_Client/IFR_Components.pidl \
   IFR_Client/IFR_Components.pidl \
-  IFR_Client/IFR_ComponentsA.h \
   IFR_Client/IFR_ComponentsC.h \
   IFR_Client/IFR_ComponentsC.inl \
-  IFR_Client/IFR_ComponentsS.h \
   IFR_Client/IFR_Extended.pidl \
   IFR_Client/IFR_Extended.pidl \
-  IFR_Client/IFR_ExtendedA.h \
   IFR_Client/IFR_ExtendedC.h \
   IFR_Client/IFR_ExtendedC.inl \
-  IFR_Client/IFR_ExtendedS.h \
   IFR_Client/ifr_client_export.h
 
 pkgconfig_DATA += \
@@ -3660,9 +3297,7 @@ CLEANFILES += \
   TAO_IFR_Client.pc
 
 TAO_IFR_Client.pc: ${top_builddir}/config.status ${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
 
 EXTRA_DIST += \
   IFR_Client/TAO_IFR_Client.pc.in \
@@ -3671,8 +3306,6 @@ EXTRA_DIST += \
 
 ## Makefile.Domain.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_Domain.la
 
 libTAO_Domain_la_CPPFLAGS = \
@@ -3686,7 +3319,7 @@ libTAO_Domain_la_SOURCES = \
   Domain/DomainS.cpp
 
 libTAO_Domain_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_Domain_la_LIBADD = \
   libTAO_PortableServer.la \
@@ -3710,37 +3343,106 @@ CLEANFILES += \
   TAO_Domain.pc
 
 TAO_Domain.pc: ${top_builddir}/config.status ${srcdir}/Domain/TAO_Domain.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Domain/TAO_Domain.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/Domain/TAO_Domain.pc.in
 
 EXTRA_DIST += \
   Domain/TAO_Domain.pc.in \
   Domain/TAO_Domain.rc
 
 
-## Makefile.Valuetype.am
+## Makefile.DynamicAny.am
+
+BUILT_SOURCES += \
+  DynamicAny/DynamicAnyC.cpp \
+  DynamicAny/DynamicAnyC.h
 
-if BUILD_EXCEPTIONS
+CLEANFILES += \
+  DynamicAny/DynamicAny-stamp \
+  DynamicAny/DynamicAnyC.cpp \
+  DynamicAny/DynamicAnyC.h
+
+DynamicAny/DynamicAnyC.cpp DynamicAny/DynamicAnyC.h: DynamicAny/DynamicAny-stamp
+
+DynamicAny/DynamicAny-stamp: $(srcdir)/DynamicAny/DynamicAny.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_DynamicAny_Export -Wb,export_include=tao/DynamicAny/dynamicany_export.h -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE -Wb,safe_include=tao/DynamicAny/DynamicAny.h -o DynamicAny $(srcdir)/DynamicAny/DynamicAny.pidl
+	@touch "$@"
+
+lib_LTLIBRARIES += libTAO_DynamicAny.la
+
+libTAO_DynamicAny_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_DYNAMICANY_BUILD_DLL
+
+libTAO_DynamicAny_la_SOURCES = \
+  DynamicAny/DynAnyFactory.cpp \
+  DynamicAny/DynAny_i.cpp \
+  DynamicAny/DynArray_i.cpp \
+  DynamicAny/DynCommon.cpp \
+  DynamicAny/DynEnum_i.cpp \
+  DynamicAny/DynSequence_i.cpp \
+  DynamicAny/DynStruct_i.cpp \
+  DynamicAny/DynUnion_i.cpp \
+  DynamicAny/DynamicAny.cpp \
+  DynamicAny/DynamicAnyC.cpp
+
+libTAO_DynamicAny_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
+
+libTAO_DynamicAny_la_LIBADD = \
+  libTAO_AnyTypeCode.la \
+  libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  DynamicAny/DynAnyFactory.h \
+  DynamicAny/DynAny_i.h \
+  DynamicAny/DynArray_i.h \
+  DynamicAny/DynCommon.h \
+  DynamicAny/DynEnum_i.h \
+  DynamicAny/DynSequence_i.h \
+  DynamicAny/DynStruct_i.h \
+  DynamicAny/DynUnion_i.h \
+  DynamicAny/DynamicAny.h \
+  DynamicAny/DynamicAny.pidl \
+  DynamicAny/DynamicAny.pidl \
+  DynamicAny/DynamicAnyC.h \
+  DynamicAny/dynamicany_export.h
+
+pkgconfig_DATA += \
+  TAO_DynamicAny.pc
+
+CLEANFILES += \
+  TAO_DynamicAny.pc
+
+TAO_DynamicAny.pc: ${top_builddir}/config.status ${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
+
+EXTRA_DIST += \
+  DynamicAny/TAO_DynamicAny.pc.in \
+  DynamicAny/TAO_DynamicAny.rc
+
+
+## Makefile.Valuetype.am
 
 BUILT_SOURCES += \
   Valuetype/StringValueC.cpp \
   Valuetype/StringValueC.h \
-  Valuetype/StringValueC.inl \
-  Valuetype/StringValueS.h
+  Valuetype/StringValueC.inl
 
 CLEANFILES += \
   Valuetype/StringValue-stamp \
   Valuetype/StringValueC.cpp \
   Valuetype/StringValueC.h \
-  Valuetype/StringValueC.inl \
-  Valuetype/StringValueS.h
+  Valuetype/StringValueC.inl
 
-Valuetype/StringValueC.cpp Valuetype/StringValueC.h Valuetype/StringValueC.inl Valuetype/StringValueS.h: Valuetype/StringValue-stamp
+Valuetype/StringValueC.cpp Valuetype/StringValueC.h Valuetype/StringValueC.inl: Valuetype/StringValue-stamp
 
 Valuetype/StringValue-stamp: $(srcdir)/Valuetype/StringValue.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -Wb,export_macro=TAO_Valuetype_Export -Wb,export_include=tao/Valuetype/valuetype_export.h -o Valuetype $(srcdir)/Valuetype/StringValue.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -Sorb -Wb,export_macro=TAO_Valuetype_Export -Wb,export_include=tao/Valuetype/valuetype_export.h -o Valuetype $(srcdir)/Valuetype/StringValue.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_Valuetype.la
 
@@ -3762,7 +3464,7 @@ libTAO_Valuetype_la_SOURCES = \
   Valuetype/Valuetype_Adapter_Impl.cpp
 
 libTAO_Valuetype_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_Valuetype_la_LIBADD = \
   libTAO_AnyTypeCode.la \
@@ -3781,7 +3483,6 @@ nobase_include_HEADERS += \
   Valuetype/StringValue.pidl \
   Valuetype/StringValueC.h \
   Valuetype/StringValueC.inl \
-  Valuetype/StringValueS.h \
   Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h \
   Valuetype/Unbounded_Valuetype_Sequence_T.h \
   Valuetype/ValueBase.h \
@@ -3805,116 +3506,21 @@ CLEANFILES += \
   TAO_Valuetype.pc
 
 TAO_Valuetype.pc: ${top_builddir}/config.status ${srcdir}/Valuetype/TAO_Valuetype.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Valuetype/TAO_Valuetype.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/Valuetype/TAO_Valuetype.pc.in
 
 EXTRA_DIST += \
   Valuetype/TAO_Valuetype.pc.in \
   Valuetype/TAO_Valuetype.rc
 
 
-## Makefile.DynamicAny.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  DynamicAny/DynamicAnyC.cpp \
-  DynamicAny/DynamicAnyC.h \
-  DynamicAny/DynamicAnyS.h
-
-CLEANFILES += \
-  DynamicAny/DynamicAny-stamp \
-  DynamicAny/DynamicAnyC.cpp \
-  DynamicAny/DynamicAnyC.h \
-  DynamicAny/DynamicAnyS.h
-
-DynamicAny/DynamicAnyC.cpp DynamicAny/DynamicAnyC.h DynamicAny/DynamicAnyS.h: DynamicAny/DynamicAny-stamp
-
-DynamicAny/DynamicAny-stamp: $(srcdir)/DynamicAny/DynamicAny.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_DynamicAny_Export -Wb,export_include=tao/DynamicAny/dynamicany_export.h -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE -Wb,safe_include=tao/DynamicAny/DynamicAny.h -o DynamicAny $(srcdir)/DynamicAny/DynamicAny.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_DynamicAny.la
-
-libTAO_DynamicAny_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_DYNAMICANY_BUILD_DLL
-
-libTAO_DynamicAny_la_SOURCES = \
-  DynamicAny/DynAnyFactory.cpp \
-  DynamicAny/DynAny_i.cpp \
-  DynamicAny/DynArray_i.cpp \
-  DynamicAny/DynCommon.cpp \
-  DynamicAny/DynEnum_i.cpp \
-  DynamicAny/DynSequence_i.cpp \
-  DynamicAny/DynStruct_i.cpp \
-  DynamicAny/DynUnion_i.cpp \
-  DynamicAny/DynValueBox_i.cpp \
-  DynamicAny/DynValueCommon_i.cpp \
-  DynamicAny/DynValue_i.cpp \
-  DynamicAny/DynamicAny.cpp \
-  DynamicAny/DynamicAnyC.cpp
-
-libTAO_DynamicAny_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DynamicAny_la_LIBADD = \
-  libTAO_Valuetype.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DynamicAny/DynAnyFactory.h \
-  DynamicAny/DynAnyUtils_T.h \
-  DynamicAny/DynAny_i.h \
-  DynamicAny/DynArray_i.h \
-  DynamicAny/DynCommon.h \
-  DynamicAny/DynEnum_i.h \
-  DynamicAny/DynSequence_i.h \
-  DynamicAny/DynStruct_i.h \
-  DynamicAny/DynUnion_i.h \
-  DynamicAny/DynValueBox_i.h \
-  DynamicAny/DynValueCommon_i.h \
-  DynamicAny/DynValue_i.h \
-  DynamicAny/DynamicAny.h \
-  DynamicAny/DynamicAny.pidl \
-  DynamicAny/DynamicAny.pidl \
-  DynamicAny/DynamicAnyC.h \
-  DynamicAny/DynamicAnyS.h \
-  DynamicAny/dynamicany_export.h
-
-pkgconfig_DATA += \
-  TAO_DynamicAny.pc
-
-CLEANFILES += \
-  TAO_DynamicAny.pc
-
-TAO_DynamicAny.pc: ${top_builddir}/config.status ${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  DynamicAny/TAO_DynamicAny.pc.in \
-  DynamicAny/TAO_DynamicAny.rc
-
-
 ## Makefile.Messaging.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   Messaging/ExceptionHolderA.cpp \
   Messaging/ExceptionHolderA.h \
   Messaging/ExceptionHolderC.cpp \
   Messaging/ExceptionHolderC.h \
-  Messaging/ExceptionHolderC.inl \
-  Messaging/ExceptionHolderS.h
+  Messaging/ExceptionHolderC.inl
 
 CLEANFILES += \
   Messaging/ExceptionHolder-stamp \
@@ -3922,136 +3528,119 @@ CLEANFILES += \
   Messaging/ExceptionHolderA.h \
   Messaging/ExceptionHolderC.cpp \
   Messaging/ExceptionHolderC.h \
-  Messaging/ExceptionHolderC.inl \
-  Messaging/ExceptionHolderS.h
+  Messaging/ExceptionHolderC.inl
 
-Messaging/ExceptionHolderA.cpp Messaging/ExceptionHolderA.h Messaging/ExceptionHolderC.cpp Messaging/ExceptionHolderC.h Messaging/ExceptionHolderC.inl Messaging/ExceptionHolderS.h: Messaging/ExceptionHolder-stamp
+Messaging/ExceptionHolderA.cpp Messaging/ExceptionHolderA.h Messaging/ExceptionHolderC.cpp Messaging/ExceptionHolderC.h Messaging/ExceptionHolderC.inl: Messaging/ExceptionHolder-stamp
 
 Messaging/ExceptionHolder-stamp: $(srcdir)/Messaging/ExceptionHolder.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/ExceptionHolder.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/ExceptionHolder.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  Messaging/PollableA.h \
   Messaging/PollableC.cpp \
-  Messaging/PollableC.h \
-  Messaging/PollableS.h
+  Messaging/PollableC.h
 
 CLEANFILES += \
   Messaging/Pollable-stamp \
-  Messaging/PollableA.h \
   Messaging/PollableC.cpp \
-  Messaging/PollableC.h \
-  Messaging/PollableS.h
+  Messaging/PollableC.h
 
-Messaging/PollableA.h Messaging/PollableC.cpp Messaging/PollableC.h Messaging/PollableS.h: Messaging/Pollable-stamp
+Messaging/PollableC.cpp Messaging/PollableC.h: Messaging/Pollable-stamp
 
 Messaging/Pollable-stamp: $(srcdir)/Messaging/Pollable.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Pollable.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Pollable.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  Messaging/Messaging_TypesA.h \
   Messaging/Messaging_TypesC.cpp \
-  Messaging/Messaging_TypesC.h \
-  Messaging/Messaging_TypesS.h
+  Messaging/Messaging_TypesC.h
 
 CLEANFILES += \
   Messaging/Messaging_Types-stamp \
-  Messaging/Messaging_TypesA.h \
   Messaging/Messaging_TypesC.cpp \
-  Messaging/Messaging_TypesC.h \
-  Messaging/Messaging_TypesS.h
+  Messaging/Messaging_TypesC.h
 
-Messaging/Messaging_TypesA.h Messaging/Messaging_TypesC.cpp Messaging/Messaging_TypesC.h Messaging/Messaging_TypesS.h: Messaging/Messaging_Types-stamp
+Messaging/Messaging_TypesC.cpp Messaging/Messaging_TypesC.h: Messaging/Messaging_Types-stamp
 
 Messaging/Messaging_Types-stamp: $(srcdir)/Messaging/Messaging_Types.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_Types.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_Types.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   Messaging/TAO_ExtA.cpp \
   Messaging/TAO_ExtA.h \
   Messaging/TAO_ExtC.cpp \
-  Messaging/TAO_ExtC.h \
-  Messaging/TAO_ExtS.h
+  Messaging/TAO_ExtC.h
 
 CLEANFILES += \
   Messaging/TAO_Ext-stamp \
   Messaging/TAO_ExtA.cpp \
   Messaging/TAO_ExtA.h \
   Messaging/TAO_ExtC.cpp \
-  Messaging/TAO_ExtC.h \
-  Messaging/TAO_ExtS.h
+  Messaging/TAO_ExtC.h
 
-Messaging/TAO_ExtA.cpp Messaging/TAO_ExtA.h Messaging/TAO_ExtC.cpp Messaging/TAO_ExtC.h Messaging/TAO_ExtS.h: Messaging/TAO_Ext-stamp
+Messaging/TAO_ExtA.cpp Messaging/TAO_ExtA.h Messaging/TAO_ExtC.cpp Messaging/TAO_ExtC.h: Messaging/TAO_Ext-stamp
 
 Messaging/TAO_Ext-stamp: $(srcdir)/Messaging/TAO_Ext.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/TAO_Ext.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/TAO_Ext.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   Messaging/Messaging_RT_PolicyA.cpp \
   Messaging/Messaging_RT_PolicyA.h \
   Messaging/Messaging_RT_PolicyC.cpp \
-  Messaging/Messaging_RT_PolicyC.h \
-  Messaging/Messaging_RT_PolicyS.h
+  Messaging/Messaging_RT_PolicyC.h
 
 CLEANFILES += \
   Messaging/Messaging_RT_Policy-stamp \
   Messaging/Messaging_RT_PolicyA.cpp \
   Messaging/Messaging_RT_PolicyA.h \
   Messaging/Messaging_RT_PolicyC.cpp \
-  Messaging/Messaging_RT_PolicyC.h \
-  Messaging/Messaging_RT_PolicyS.h
+  Messaging/Messaging_RT_PolicyC.h
 
-Messaging/Messaging_RT_PolicyA.cpp Messaging/Messaging_RT_PolicyA.h Messaging/Messaging_RT_PolicyC.cpp Messaging/Messaging_RT_PolicyC.h Messaging/Messaging_RT_PolicyS.h: Messaging/Messaging_RT_Policy-stamp
+Messaging/Messaging_RT_PolicyA.cpp Messaging/Messaging_RT_PolicyA.h Messaging/Messaging_RT_PolicyC.cpp Messaging/Messaging_RT_PolicyC.h: Messaging/Messaging_RT_Policy-stamp
 
 Messaging/Messaging_RT_Policy-stamp: $(srcdir)/Messaging/Messaging_RT_Policy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_RT_Policy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_RT_Policy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   Messaging/Messaging_SyncScope_PolicyA.cpp \
   Messaging/Messaging_SyncScope_PolicyA.h \
   Messaging/Messaging_SyncScope_PolicyC.cpp \
-  Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/Messaging_SyncScope_PolicyS.h
+  Messaging/Messaging_SyncScope_PolicyC.h
 
 CLEANFILES += \
   Messaging/Messaging_SyncScope_Policy-stamp \
   Messaging/Messaging_SyncScope_PolicyA.cpp \
   Messaging/Messaging_SyncScope_PolicyA.h \
   Messaging/Messaging_SyncScope_PolicyC.cpp \
-  Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/Messaging_SyncScope_PolicyS.h
+  Messaging/Messaging_SyncScope_PolicyC.h
 
-Messaging/Messaging_SyncScope_PolicyA.cpp Messaging/Messaging_SyncScope_PolicyA.h Messaging/Messaging_SyncScope_PolicyC.cpp Messaging/Messaging_SyncScope_PolicyC.h Messaging/Messaging_SyncScope_PolicyS.h: Messaging/Messaging_SyncScope_Policy-stamp
+Messaging/Messaging_SyncScope_PolicyA.cpp Messaging/Messaging_SyncScope_PolicyA.h Messaging/Messaging_SyncScope_PolicyC.cpp Messaging/Messaging_SyncScope_PolicyC.h: Messaging/Messaging_SyncScope_Policy-stamp
 
 Messaging/Messaging_SyncScope_Policy-stamp: $(srcdir)/Messaging/Messaging_SyncScope_Policy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_SyncScope_Policy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_SyncScope_Policy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   Messaging/Messaging_No_ImplA.cpp \
   Messaging/Messaging_No_ImplA.h \
   Messaging/Messaging_No_ImplC.cpp \
-  Messaging/Messaging_No_ImplC.h \
-  Messaging/Messaging_No_ImplS.h
+  Messaging/Messaging_No_ImplC.h
 
 CLEANFILES += \
   Messaging/Messaging_No_Impl-stamp \
   Messaging/Messaging_No_ImplA.cpp \
   Messaging/Messaging_No_ImplA.h \
   Messaging/Messaging_No_ImplC.cpp \
-  Messaging/Messaging_No_ImplC.h \
-  Messaging/Messaging_No_ImplS.h
+  Messaging/Messaging_No_ImplC.h
 
-Messaging/Messaging_No_ImplA.cpp Messaging/Messaging_No_ImplA.h Messaging/Messaging_No_ImplC.cpp Messaging/Messaging_No_ImplC.h Messaging/Messaging_No_ImplS.h: Messaging/Messaging_No_Impl-stamp
+Messaging/Messaging_No_ImplA.cpp Messaging/Messaging_No_ImplA.h Messaging/Messaging_No_ImplC.cpp Messaging/Messaging_No_ImplC.h: Messaging/Messaging_No_Impl-stamp
 
 Messaging/Messaging_No_Impl-stamp: $(srcdir)/Messaging/Messaging_No_Impl.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging_No_Impl.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging_No_Impl.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   Messaging/MessagingA.cpp \
@@ -4075,8 +3664,8 @@ CLEANFILES += \
 Messaging/MessagingA.cpp Messaging/MessagingA.h Messaging/MessagingC.cpp Messaging/MessagingC.h Messaging/MessagingC.inl Messaging/MessagingS.cpp Messaging/MessagingS.h: Messaging/Messaging-stamp
 
 Messaging/Messaging-stamp: $(srcdir)/Messaging/Messaging.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ssi -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ssi -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_Messaging.la
 
@@ -4117,7 +3706,7 @@ libTAO_Messaging_la_SOURCES = \
   Messaging/TAO_ExtC.cpp
 
 libTAO_Messaging_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_Messaging_la_LIBADD = \
   libTAO_Valuetype.la \
@@ -4139,7 +3728,6 @@ nobase_include_HEADERS += \
   Messaging/ExceptionHolderA.h \
   Messaging/ExceptionHolderC.h \
   Messaging/ExceptionHolderC.inl \
-  Messaging/ExceptionHolderS.h \
   Messaging/ExceptionHolder_i.h \
   Messaging/Messaging.h \
   Messaging/Messaging.pidl \
@@ -4151,7 +3739,6 @@ nobase_include_HEADERS += \
   Messaging/Messaging_No_Impl.pidl \
   Messaging/Messaging_No_ImplA.h \
   Messaging/Messaging_No_ImplC.h \
-  Messaging/Messaging_No_ImplS.h \
   Messaging/Messaging_ORBInitializer.h \
   Messaging/Messaging_PolicyFactory.h \
   Messaging/Messaging_Policy_i.h \
@@ -4159,23 +3746,16 @@ nobase_include_HEADERS += \
   Messaging/Messaging_RT_Policy.pidl \
   Messaging/Messaging_RT_PolicyA.h \
   Messaging/Messaging_RT_PolicyC.h \
-  Messaging/Messaging_RT_PolicyS.h \
   Messaging/Messaging_SyncScope_Policy.pidl \
   Messaging/Messaging_SyncScope_PolicyA.h \
   Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/Messaging_SyncScope_PolicyS.h \
   Messaging/Messaging_Types.pidl \
-  Messaging/Messaging_TypesA.h \
   Messaging/Messaging_TypesC.h \
-  Messaging/Messaging_TypesS.h \
   Messaging/Pollable.pidl \
-  Messaging/PollableA.h \
   Messaging/PollableC.h \
-  Messaging/PollableS.h \
   Messaging/TAO_Ext.pidl \
   Messaging/TAO_ExtA.h \
   Messaging/TAO_ExtC.h \
-  Messaging/TAO_ExtS.h \
   Messaging/messaging_export.h
 
 pkgconfig_DATA += \
@@ -4185,9 +3765,7 @@ CLEANFILES += \
   TAO_Messaging.pc
 
 TAO_Messaging.pc: ${top_builddir}/config.status ${srcdir}/Messaging/TAO_Messaging.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Messaging/TAO_Messaging.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/Messaging/TAO_Messaging.pc.in
 
 EXTRA_DIST += \
   Messaging/TAO_Messaging.pc.in \
@@ -4197,7 +3775,6 @@ EXTRA_DIST += \
 ## Makefile.DynamicInterface.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
 lib_LTLIBRARIES += libTAO_DynamicInterface.la
 
@@ -4223,7 +3800,7 @@ libTAO_DynamicInterface_la_SOURCES = \
   DynamicInterface/Unknown_User_Exception.cpp
 
 libTAO_DynamicInterface_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_DynamicInterface_la_LIBADD = \
   libTAO_Messaging.la \
@@ -4263,9 +3840,8 @@ CLEANFILES += \
   TAO_DynamicInterface.pc
 
 TAO_DynamicInterface.pc: ${top_builddir}/config.status ${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
 
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -4275,70 +3851,62 @@ EXTRA_DIST += \
 
 ## Makefile.EndpointPolicy.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   EndpointPolicy/EndpointPolicyA.cpp \
   EndpointPolicy/EndpointPolicyA.h \
   EndpointPolicy/EndpointPolicyC.cpp \
-  EndpointPolicy/EndpointPolicyC.h \
-  EndpointPolicy/EndpointPolicyS.h
+  EndpointPolicy/EndpointPolicyC.h
 
 CLEANFILES += \
   EndpointPolicy/EndpointPolicy-stamp \
   EndpointPolicy/EndpointPolicyA.cpp \
   EndpointPolicy/EndpointPolicyA.h \
   EndpointPolicy/EndpointPolicyC.cpp \
-  EndpointPolicy/EndpointPolicyC.h \
-  EndpointPolicy/EndpointPolicyS.h
+  EndpointPolicy/EndpointPolicyC.h
 
-EndpointPolicy/EndpointPolicyA.cpp EndpointPolicy/EndpointPolicyA.h EndpointPolicy/EndpointPolicyC.cpp EndpointPolicy/EndpointPolicyC.h EndpointPolicy/EndpointPolicyS.h: EndpointPolicy/EndpointPolicy-stamp
+EndpointPolicy/EndpointPolicyA.cpp EndpointPolicy/EndpointPolicyA.h EndpointPolicy/EndpointPolicyC.cpp EndpointPolicy/EndpointPolicyC.h: EndpointPolicy/EndpointPolicy-stamp
 
 EndpointPolicy/EndpointPolicy-stamp: $(srcdir)/EndpointPolicy/EndpointPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicy.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Ge 1 -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicy.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   EndpointPolicy/IIOPEndpointValueA.cpp \
   EndpointPolicy/IIOPEndpointValueA.h \
   EndpointPolicy/IIOPEndpointValueC.cpp \
-  EndpointPolicy/IIOPEndpointValueC.h \
-  EndpointPolicy/IIOPEndpointValueS.h
+  EndpointPolicy/IIOPEndpointValueC.h
 
 CLEANFILES += \
   EndpointPolicy/IIOPEndpointValue-stamp \
   EndpointPolicy/IIOPEndpointValueA.cpp \
   EndpointPolicy/IIOPEndpointValueA.h \
   EndpointPolicy/IIOPEndpointValueC.cpp \
-  EndpointPolicy/IIOPEndpointValueC.h \
-  EndpointPolicy/IIOPEndpointValueS.h
+  EndpointPolicy/IIOPEndpointValueC.h
 
-EndpointPolicy/IIOPEndpointValueA.cpp EndpointPolicy/IIOPEndpointValueA.h EndpointPolicy/IIOPEndpointValueC.cpp EndpointPolicy/IIOPEndpointValueC.h EndpointPolicy/IIOPEndpointValueS.h: EndpointPolicy/IIOPEndpointValue-stamp
+EndpointPolicy/IIOPEndpointValueA.cpp EndpointPolicy/IIOPEndpointValueA.h EndpointPolicy/IIOPEndpointValueC.cpp EndpointPolicy/IIOPEndpointValueC.h: EndpointPolicy/IIOPEndpointValue-stamp
 
 EndpointPolicy/IIOPEndpointValue-stamp: $(srcdir)/EndpointPolicy/IIOPEndpointValue.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/IIOPEndpointValue.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Ge 1 -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/IIOPEndpointValue.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   EndpointPolicy/EndpointPolicyTypeA.cpp \
   EndpointPolicy/EndpointPolicyTypeA.h \
   EndpointPolicy/EndpointPolicyTypeC.cpp \
-  EndpointPolicy/EndpointPolicyTypeC.h \
-  EndpointPolicy/EndpointPolicyTypeS.h
+  EndpointPolicy/EndpointPolicyTypeC.h
 
 CLEANFILES += \
   EndpointPolicy/EndpointPolicyType-stamp \
   EndpointPolicy/EndpointPolicyTypeA.cpp \
   EndpointPolicy/EndpointPolicyTypeA.h \
   EndpointPolicy/EndpointPolicyTypeC.cpp \
-  EndpointPolicy/EndpointPolicyTypeC.h \
-  EndpointPolicy/EndpointPolicyTypeS.h
+  EndpointPolicy/EndpointPolicyTypeC.h
 
-EndpointPolicy/EndpointPolicyTypeA.cpp EndpointPolicy/EndpointPolicyTypeA.h EndpointPolicy/EndpointPolicyTypeC.cpp EndpointPolicy/EndpointPolicyTypeC.h EndpointPolicy/EndpointPolicyTypeS.h: EndpointPolicy/EndpointPolicyType-stamp
+EndpointPolicy/EndpointPolicyTypeA.cpp EndpointPolicy/EndpointPolicyTypeA.h EndpointPolicy/EndpointPolicyTypeC.cpp EndpointPolicy/EndpointPolicyTypeC.h: EndpointPolicy/EndpointPolicyType-stamp
 
 EndpointPolicy/EndpointPolicyType-stamp: $(srcdir)/EndpointPolicy/EndpointPolicyType.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicyType.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Ge 1 -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicyType.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_EndpointPolicy.la
 
@@ -4366,7 +3934,7 @@ libTAO_EndpointPolicy_la_SOURCES = \
   EndpointPolicy/IIOPEndpointValue_i.cpp
 
 libTAO_EndpointPolicy_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_EndpointPolicy_la_LIBADD = \
   libTAO_PI.la \
@@ -4381,11 +3949,9 @@ nobase_include_HEADERS += \
   EndpointPolicy/EndpointPolicy.pidl \
   EndpointPolicy/EndpointPolicyA.h \
   EndpointPolicy/EndpointPolicyC.h \
-  EndpointPolicy/EndpointPolicyS.h \
   EndpointPolicy/EndpointPolicyType.pidl \
   EndpointPolicy/EndpointPolicyTypeA.h \
   EndpointPolicy/EndpointPolicyTypeC.h \
-  EndpointPolicy/EndpointPolicyTypeS.h \
   EndpointPolicy/EndpointPolicy_Export.h \
   EndpointPolicy/EndpointPolicy_Factory.h \
   EndpointPolicy/EndpointPolicy_ORBInitializer.h \
@@ -4396,7 +3962,6 @@ nobase_include_HEADERS += \
   EndpointPolicy/IIOPEndpointValue.pidl \
   EndpointPolicy/IIOPEndpointValueA.h \
   EndpointPolicy/IIOPEndpointValueC.h \
-  EndpointPolicy/IIOPEndpointValueS.h \
   EndpointPolicy/IIOPEndpointValue_i.h
 
 pkgconfig_DATA += \
@@ -4406,9 +3971,7 @@ CLEANFILES += \
   TAO_EndpointPolicy.pc
 
 TAO_EndpointPolicy.pc: ${top_builddir}/config.status ${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in
 
 EXTRA_DIST += \
   EndpointPolicy/TAO_EndpointPolicy.pc.in
@@ -4416,55 +3979,44 @@ EXTRA_DIST += \
 
 ## Makefile.ObjRefTemplate.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
-  ObjRefTemplate/ObjectReferenceTemplateA.h \
   ObjRefTemplate/ObjectReferenceTemplateC.cpp \
   ObjRefTemplate/ObjectReferenceTemplateC.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.inl \
-  ObjRefTemplate/ObjectReferenceTemplateS.h
+  ObjRefTemplate/ObjectReferenceTemplateC.inl
 
 CLEANFILES += \
   ObjRefTemplate/ObjectReferenceTemplate-stamp \
-  ObjRefTemplate/ObjectReferenceTemplateA.h \
   ObjRefTemplate/ObjectReferenceTemplateC.cpp \
   ObjRefTemplate/ObjectReferenceTemplateC.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.inl \
-  ObjRefTemplate/ObjectReferenceTemplateS.h
+  ObjRefTemplate/ObjectReferenceTemplateC.inl
 
-ObjRefTemplate/ObjectReferenceTemplateA.h ObjRefTemplate/ObjectReferenceTemplateC.cpp ObjRefTemplate/ObjectReferenceTemplateC.h ObjRefTemplate/ObjectReferenceTemplateC.inl ObjRefTemplate/ObjectReferenceTemplateS.h: ObjRefTemplate/ObjectReferenceTemplate-stamp
+ObjRefTemplate/ObjectReferenceTemplateC.cpp ObjRefTemplate/ObjectReferenceTemplateC.h ObjRefTemplate/ObjectReferenceTemplateC.inl: ObjRefTemplate/ObjectReferenceTemplate-stamp
 
 ObjRefTemplate/ObjectReferenceTemplate-stamp: $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -Sorb -GX -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE -Wb,safe_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -SS -Sorb -GX -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE -Wb,safe_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  ObjRefTemplate/ObjectReferenceTemplate_includeA.h \
   ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp \
-  ObjRefTemplate/ObjectReferenceTemplate_includeC.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeS.h
+  ObjRefTemplate/ObjectReferenceTemplate_includeC.h
 
 CLEANFILES += \
   ObjRefTemplate/ObjectReferenceTemplate_include-stamp \
-  ObjRefTemplate/ObjectReferenceTemplate_includeA.h \
   ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp \
-  ObjRefTemplate/ObjectReferenceTemplate_includeC.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeS.h
+  ObjRefTemplate/ObjectReferenceTemplate_includeC.h
 
-ObjRefTemplate/ObjectReferenceTemplate_includeA.h ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp ObjRefTemplate/ObjectReferenceTemplate_includeC.h ObjRefTemplate/ObjectReferenceTemplate_includeS.h: ObjRefTemplate/ObjectReferenceTemplate_include-stamp
+ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp ObjRefTemplate/ObjectReferenceTemplate_includeC.h: ObjRefTemplate/ObjectReferenceTemplate_include-stamp
 
 ObjRefTemplate/ObjectReferenceTemplate_include-stamp: $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GX -Sci -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate_include.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -SS -Sorb -GX -Sci -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate_include.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   ObjRefTemplate/Default_ORTA.cpp \
   ObjRefTemplate/Default_ORTA.h \
   ObjRefTemplate/Default_ORTC.cpp \
   ObjRefTemplate/Default_ORTC.h \
-  ObjRefTemplate/Default_ORTC.inl \
-  ObjRefTemplate/Default_ORTS.h
+  ObjRefTemplate/Default_ORTC.inl
 
 CLEANFILES += \
   ObjRefTemplate/Default_ORT-stamp \
@@ -4472,14 +4024,13 @@ CLEANFILES += \
   ObjRefTemplate/Default_ORTA.h \
   ObjRefTemplate/Default_ORTC.cpp \
   ObjRefTemplate/Default_ORTC.h \
-  ObjRefTemplate/Default_ORTC.inl \
-  ObjRefTemplate/Default_ORTS.h
+  ObjRefTemplate/Default_ORTC.inl
 
-ObjRefTemplate/Default_ORTA.cpp ObjRefTemplate/Default_ORTA.h ObjRefTemplate/Default_ORTC.cpp ObjRefTemplate/Default_ORTC.h ObjRefTemplate/Default_ORTC.inl ObjRefTemplate/Default_ORTS.h: ObjRefTemplate/Default_ORT-stamp
+ObjRefTemplate/Default_ORTA.cpp ObjRefTemplate/Default_ORTA.h ObjRefTemplate/Default_ORTC.cpp ObjRefTemplate/Default_ORTC.h ObjRefTemplate/Default_ORTC.inl: ObjRefTemplate/Default_ORT-stamp
 
 ObjRefTemplate/Default_ORT-stamp: $(srcdir)/ObjRefTemplate/Default_ORT.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -GA -Sorb -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/Default_ORT.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -SS -GA -Sorb -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/Default_ORT.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
 
@@ -4500,7 +4051,7 @@ libTAO_ObjRefTemplate_la_SOURCES = \
   ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp
 
 libTAO_ObjRefTemplate_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_ObjRefTemplate_la_LIBADD = \
   libTAO_PortableServer.la \
@@ -4515,22 +4066,17 @@ nobase_include_HEADERS += \
   ObjRefTemplate/Default_ORTA.h \
   ObjRefTemplate/Default_ORTC.h \
   ObjRefTemplate/Default_ORTC.inl \
-  ObjRefTemplate/Default_ORTS.h \
   ObjRefTemplate/ORT_Adapter_Factory_Impl.h \
   ObjRefTemplate/ORT_Adapter_Impl.h \
   ObjRefTemplate/ObjectReferenceTemplate.h \
   ObjRefTemplate/ObjectReferenceTemplate.pidl \
   ObjRefTemplate/ObjectReferenceTemplate.pidl \
-  ObjRefTemplate/ObjectReferenceTemplateA.h \
   ObjRefTemplate/ObjectReferenceTemplateC.h \
   ObjRefTemplate/ObjectReferenceTemplateC.inl \
-  ObjRefTemplate/ObjectReferenceTemplateS.h \
   ObjRefTemplate/ObjectReferenceTemplate_i.h \
   ObjRefTemplate/ObjectReferenceTemplate_include.pidl \
   ObjRefTemplate/ObjectReferenceTemplate_include.pidl \
-  ObjRefTemplate/ObjectReferenceTemplate_includeA.h \
   ObjRefTemplate/ObjectReferenceTemplate_includeC.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeS.h \
   ObjRefTemplate/ort_export.h
 
 pkgconfig_DATA += \
@@ -4540,9 +4086,7 @@ CLEANFILES += \
   TAO_ObjRefTemplate.pc
 
 TAO_ObjRefTemplate.pc: ${top_builddir}/config.status ${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
 
 EXTRA_DIST += \
   ObjRefTemplate/TAO_ObjRefTemplate.pc.in \
@@ -4551,41 +4095,35 @@ EXTRA_DIST += \
 
 ## Makefile.IORInterceptor.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   IORInterceptor/IORInterceptorC.cpp \
-  IORInterceptor/IORInterceptorC.h \
-  IORInterceptor/IORInterceptorS.h
+  IORInterceptor/IORInterceptorC.h
 
 CLEANFILES += \
   IORInterceptor/IORInterceptor-stamp \
   IORInterceptor/IORInterceptorC.cpp \
-  IORInterceptor/IORInterceptorC.h \
-  IORInterceptor/IORInterceptorS.h
+  IORInterceptor/IORInterceptorC.h
 
-IORInterceptor/IORInterceptorC.cpp IORInterceptor/IORInterceptorC.h IORInterceptor/IORInterceptorS.h: IORInterceptor/IORInterceptor-stamp
+IORInterceptor/IORInterceptorC.cpp IORInterceptor/IORInterceptorC.h: IORInterceptor/IORInterceptor-stamp
 
 IORInterceptor/IORInterceptor-stamp: $(srcdir)/IORInterceptor/IORInterceptor.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -Wb,include_guard=TAO_IORINTERCEPTOR_SAFE_INCLUDE -Wb,safe_include=tao/IORInterceptor/IORInterceptor.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInterceptor.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -Wb,include_guard=TAO_IORINTERCEPTOR_SAFE_INCLUDE -Wb,safe_include=tao/IORInterceptor/IORInterceptor.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInterceptor.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   IORInterceptor/IORInfoC.cpp \
-  IORInterceptor/IORInfoC.h \
-  IORInterceptor/IORInfoS.h
+  IORInterceptor/IORInfoC.h
 
 CLEANFILES += \
   IORInterceptor/IORInfo-stamp \
   IORInterceptor/IORInfoC.cpp \
-  IORInterceptor/IORInfoC.h \
-  IORInterceptor/IORInfoS.h
+  IORInterceptor/IORInfoC.h
 
-IORInterceptor/IORInfoC.cpp IORInterceptor/IORInfoC.h IORInterceptor/IORInfoS.h: IORInterceptor/IORInfo-stamp
+IORInterceptor/IORInfoC.cpp IORInterceptor/IORInfoC.h: IORInterceptor/IORInfo-stamp
 
 IORInterceptor/IORInfo-stamp: $(srcdir)/IORInterceptor/IORInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInfo.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInfo.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_IORInterceptor.la
 
@@ -4605,7 +4143,7 @@ libTAO_IORInterceptor_la_SOURCES = \
   IORInterceptor/IORInterceptor_Details.cpp
 
 libTAO_IORInterceptor_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_IORInterceptor_la_LIBADD = \
   libTAO_PI.la \
@@ -4623,12 +4161,10 @@ nobase_include_HEADERS += \
   IORInterceptor/IORInfo.pidl \
   IORInterceptor/IORInfo.pidl \
   IORInterceptor/IORInfoC.h \
-  IORInterceptor/IORInfoS.h \
   IORInterceptor/IORInterceptor.h \
   IORInterceptor/IORInterceptor.pidl \
   IORInterceptor/IORInterceptor.pidl \
   IORInterceptor/IORInterceptorC.h \
-  IORInterceptor/IORInterceptorS.h \
   IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
   IORInterceptor/IORInterceptor_Adapter_Impl.h \
   IORInterceptor/IORInterceptor_Details.h \
@@ -4641,9 +4177,7 @@ CLEANFILES += \
   TAO_IORInterceptor.pc
 
 TAO_IORInterceptor.pc: ${top_builddir}/config.status ${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
 
 EXTRA_DIST += \
   IORInterceptor/TAO_IORInterceptor.pc.in \
@@ -4652,26 +4186,20 @@ EXTRA_DIST += \
 
 ## Makefile.IORManipulation.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
-  IORManipulation/IORA.h \
   IORManipulation/IORC.cpp \
-  IORManipulation/IORC.h \
-  IORManipulation/IORS.h
+  IORManipulation/IORC.h
 
 CLEANFILES += \
   IORManipulation/IOR-stamp \
-  IORManipulation/IORA.h \
   IORManipulation/IORC.cpp \
-  IORManipulation/IORC.h \
-  IORManipulation/IORS.h
+  IORManipulation/IORC.h
 
-IORManipulation/IORA.h IORManipulation/IORC.cpp IORManipulation/IORC.h IORManipulation/IORS.h: IORManipulation/IOR-stamp
+IORManipulation/IORC.cpp IORManipulation/IORC.h: IORManipulation/IOR-stamp
 
 IORManipulation/IOR-stamp: $(srcdir)/IORManipulation/IOR.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GX -Wb,export_macro=TAO_IORManip_Export -Wb,export_include=tao/IORManipulation/ior_manip_export.h -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE -Wb,safe_include=tao/IORManipulation/IORManip_Loader.h -o IORManipulation $(srcdir)/IORManipulation/IOR.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX -Wb,export_macro=TAO_IORManip_Export -Wb,export_include=tao/IORManipulation/ior_manip_export.h -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE -Wb,safe_include=tao/IORManipulation/IORManip_Loader.h -o IORManipulation $(srcdir)/IORManipulation/IOR.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_IORManip.la
 
@@ -4688,7 +4216,7 @@ libTAO_IORManip_la_SOURCES = \
   IORManipulation/IORManipulation.cpp
 
 libTAO_IORManip_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_IORManip_la_LIBADD = \
   libTAO_AnyTypeCode.la \
@@ -4698,11 +4226,9 @@ libTAO_IORManip_la_LIBADD = \
 nobase_include_HEADERS += \
   IORManipulation/IOR.pidl \
   IORManipulation/IOR.pidl \
-  IORManipulation/IORA.h \
   IORManipulation/IORC.h \
   IORManipulation/IORManip_Loader.h \
   IORManipulation/IORManipulation.h \
-  IORManipulation/IORS.h \
   IORManipulation/ior_manip_export.h
 
 pkgconfig_DATA += \
@@ -4712,9 +4238,7 @@ CLEANFILES += \
   TAO_IORManip.pc
 
 TAO_IORManip.pc: ${top_builddir}/config.status ${srcdir}/IORManipulation/TAO_IORManip.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORManipulation/TAO_IORManip.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/IORManipulation/TAO_IORManip.pc.in
 
 EXTRA_DIST += \
   IORManipulation/TAO_IORManip.pc.in \
@@ -4723,24 +4247,20 @@ EXTRA_DIST += \
 
 ## Makefile.IORTable.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   IORTable/IORTableC.cpp \
-  IORTable/IORTableC.h \
-  IORTable/IORTableS.h
+  IORTable/IORTableC.h
 
 CLEANFILES += \
   IORTable/IORTable-stamp \
   IORTable/IORTableC.cpp \
-  IORTable/IORTableC.h \
-  IORTable/IORTableS.h
+  IORTable/IORTableC.h
 
-IORTable/IORTableC.cpp IORTable/IORTableC.h IORTable/IORTableS.h: IORTable/IORTable-stamp
+IORTable/IORTableC.cpp IORTable/IORTableC.h: IORTable/IORTable-stamp
 
 IORTable/IORTable-stamp: $(srcdir)/IORTable/IORTable.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_IORTable_Export -Wb,export_include=tao/IORTable/iortable_export.h -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE -Wb,safe_include=tao/IORTable/IORTable.h -o IORTable $(srcdir)/IORTable/IORTable.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_IORTable_Export -Wb,export_include=tao/IORTable/iortable_export.h -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE -Wb,safe_include=tao/IORTable/IORTable.h -o IORTable $(srcdir)/IORTable/IORTable.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_IORTable.la
 
@@ -4758,7 +4278,7 @@ libTAO_IORTable_la_SOURCES = \
   IORTable/Table_Adapter.cpp
 
 libTAO_IORTable_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_IORTable_la_LIBADD = \
   libTAO.la \
@@ -4769,7 +4289,6 @@ nobase_include_HEADERS += \
   IORTable/IORTable.pidl \
   IORTable/IORTable.pidl \
   IORTable/IORTableC.h \
-  IORTable/IORTableS.h \
   IORTable/IOR_Table_Impl.h \
   IORTable/Table_Adapter.h \
   IORTable/iortable_export.h
@@ -4781,9 +4300,7 @@ CLEANFILES += \
   TAO_IORTable.pc
 
 TAO_IORTable.pc: ${top_builddir}/config.status ${srcdir}/IORTable/TAO_IORTable.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORTable/TAO_IORTable.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/IORTable/TAO_IORTable.pc.in
 
 EXTRA_DIST += \
   IORTable/TAO_IORTable.pc.in \
@@ -4792,8 +4309,6 @@ EXTRA_DIST += \
 
 ## Makefile.ImR_Client.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   ImR_Client/ServerObjectA.cpp \
   ImR_Client/ServerObjectA.h \
@@ -4816,11 +4331,10 @@ CLEANFILES += \
 ImR_Client/ServerObjectA.cpp ImR_Client/ServerObjectA.h ImR_Client/ServerObjectC.cpp ImR_Client/ServerObjectC.h ImR_Client/ServerObjectC.inl ImR_Client/ServerObjectS.cpp ImR_Client/ServerObjectS.h: ImR_Client/ServerObject-stamp
 
 ImR_Client/ServerObject-stamp: $(srcdir)/ImR_Client/ServerObject.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Sorb -GA -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ServerObject.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Ge 1 -Sorb -GA -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ServerObject.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  ImR_Client/ImplRepoA.h \
   ImR_Client/ImplRepoC.cpp \
   ImR_Client/ImplRepoC.h \
   ImR_Client/ImplRepoC.inl \
@@ -4829,18 +4343,17 @@ BUILT_SOURCES += \
 
 CLEANFILES += \
   ImR_Client/ImplRepo-stamp \
-  ImR_Client/ImplRepoA.h \
   ImR_Client/ImplRepoC.cpp \
   ImR_Client/ImplRepoC.h \
   ImR_Client/ImplRepoC.inl \
   ImR_Client/ImplRepoS.cpp \
   ImR_Client/ImplRepoS.h
 
-ImR_Client/ImplRepoA.h ImR_Client/ImplRepoC.cpp ImR_Client/ImplRepoC.h ImR_Client/ImplRepoC.inl ImR_Client/ImplRepoS.cpp ImR_Client/ImplRepoS.h: ImR_Client/ImplRepo-stamp
+ImR_Client/ImplRepoC.cpp ImR_Client/ImplRepoC.h ImR_Client/ImplRepoC.inl ImR_Client/ImplRepoS.cpp ImR_Client/ImplRepoS.h: ImR_Client/ImplRepo-stamp
 
 ImR_Client/ImplRepo-stamp: $(srcdir)/ImR_Client/ImplRepo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Sorb -GX -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ImplRepo.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Ge 1 -Sorb -GX -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ImplRepo.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_ImR_Client.la
 
@@ -4861,7 +4374,7 @@ libTAO_ImR_Client_la_SOURCES = \
   ImR_Client/ServerObject_i.cpp
 
 libTAO_ImR_Client_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_ImR_Client_la_LIBADD = \
   libTAO_PortableServer.la \
@@ -4873,7 +4386,6 @@ nobase_include_HEADERS += \
   ImR_Client/ImR_Client.h \
   ImR_Client/ImplRepo.pidl \
   ImR_Client/ImplRepo.pidl \
-  ImR_Client/ImplRepoA.h \
   ImR_Client/ImplRepoC.h \
   ImR_Client/ImplRepoC.inl \
   ImR_Client/ImplRepoS.h \
@@ -4893,9 +4405,7 @@ CLEANFILES += \
   TAO_ImR_Client.pc
 
 TAO_ImR_Client.pc: ${top_builddir}/config.status ${srcdir}/ImR_Client/TAO_ImR_Client.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ImR_Client/TAO_ImR_Client.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/ImR_Client/TAO_ImR_Client.pc.in
 
 EXTRA_DIST += \
   ImR_Client/TAO_IMR_Client.rc \
@@ -4904,47 +4414,39 @@ EXTRA_DIST += \
 
 ## Makefile.PI_Server.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   PI_Server/ServerRequestInfoA.cpp \
   PI_Server/ServerRequestInfoA.h \
   PI_Server/ServerRequestInfoC.cpp \
-  PI_Server/ServerRequestInfoC.h \
-  PI_Server/ServerRequestInfoS.h
+  PI_Server/ServerRequestInfoC.h
 
 CLEANFILES += \
   PI_Server/ServerRequestInfo-stamp \
   PI_Server/ServerRequestInfoA.cpp \
   PI_Server/ServerRequestInfoA.h \
   PI_Server/ServerRequestInfoC.cpp \
-  PI_Server/ServerRequestInfoC.h \
-  PI_Server/ServerRequestInfoS.h
+  PI_Server/ServerRequestInfoC.h
 
-PI_Server/ServerRequestInfoA.cpp PI_Server/ServerRequestInfoA.h PI_Server/ServerRequestInfoC.cpp PI_Server/ServerRequestInfoC.h PI_Server/ServerRequestInfoS.h: PI_Server/ServerRequestInfo-stamp
+PI_Server/ServerRequestInfoA.cpp PI_Server/ServerRequestInfoA.h PI_Server/ServerRequestInfoC.cpp PI_Server/ServerRequestInfoC.h: PI_Server/ServerRequestInfo-stamp
 
 PI_Server/ServerRequestInfo-stamp: $(srcdir)/PI_Server/ServerRequestInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -o PI_Server $(srcdir)/PI_Server/ServerRequestInfo.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -o PI_Server $(srcdir)/PI_Server/ServerRequestInfo.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  PI_Server/PI_Server_includeA.h \
   PI_Server/PI_Server_includeC.cpp \
-  PI_Server/PI_Server_includeC.h \
-  PI_Server/PI_Server_includeS.h
+  PI_Server/PI_Server_includeC.h
 
 CLEANFILES += \
   PI_Server/PI_Server_include-stamp \
-  PI_Server/PI_Server_includeA.h \
   PI_Server/PI_Server_includeC.cpp \
-  PI_Server/PI_Server_includeC.h \
-  PI_Server/PI_Server_includeS.h
+  PI_Server/PI_Server_includeC.h
 
-PI_Server/PI_Server_includeA.h PI_Server/PI_Server_includeC.cpp PI_Server/PI_Server_includeC.h PI_Server/PI_Server_includeS.h: PI_Server/PI_Server_include-stamp
+PI_Server/PI_Server_includeC.cpp PI_Server/PI_Server_includeC.h: PI_Server/PI_Server_include-stamp
 
 PI_Server/PI_Server_include-stamp: $(srcdir)/PI_Server/PI_Server_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GX -Sci -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -Wb,unique_include=tao/PI_Server/ServerRequestInterceptorC.h -o PI_Server $(srcdir)/PI_Server/PI_Server_include.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -SS -Sorb -GX -Sci -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -Wb,unique_include=tao/PI_Server/ServerRequestInterceptorC.h -o PI_Server $(srcdir)/PI_Server/PI_Server_include.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_PI_Server.la
 
@@ -4972,7 +4474,7 @@ libTAO_PI_Server_la_SOURCES = \
   PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
 
 libTAO_PI_Server_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_PI_Server_la_LIBADD = \
   libTAO_PortableServer.la \
@@ -4988,9 +4490,7 @@ nobase_include_HEADERS += \
   PI_Server/PI_Server_Loader.h \
   PI_Server/PI_Server_include.pidl \
   PI_Server/PI_Server_include.pidl \
-  PI_Server/PI_Server_includeA.h \
   PI_Server/PI_Server_includeC.h \
-  PI_Server/PI_Server_includeS.h \
   PI_Server/Policy_Creator_T.h \
   PI_Server/PortableServer_ORBInitializer.h \
   PI_Server/PortableServer_PolicyFactory.h \
@@ -5003,7 +4503,6 @@ nobase_include_HEADERS += \
   PI_Server/ServerRequestInfo.pidl \
   PI_Server/ServerRequestInfoA.h \
   PI_Server/ServerRequestInfoC.h \
-  PI_Server/ServerRequestInfoS.h \
   PI_Server/ServerRequestInterceptor.pidl \
   PI_Server/ServerRequestInterceptorA.h \
   PI_Server/ServerRequestInterceptorC.h \
@@ -5018,9 +4517,7 @@ CLEANFILES += \
   TAO_PI_Server.pc
 
 TAO_PI_Server.pc: ${top_builddir}/config.status ${srcdir}/PI_Server/TAO_PI_Server.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/PI_Server/TAO_PI_Server.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/PI_Server/TAO_PI_Server.pc.in
 
 EXTRA_DIST += \
   PI_Server/TAO_PI_Server.pc.in
@@ -5028,27 +4525,22 @@ EXTRA_DIST += \
 
 ## Makefile.RTCORBA.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 BUILT_SOURCES += \
-  RTCORBA/RTCORBA_includeA.h \
   RTCORBA/RTCORBA_includeC.cpp \
-  RTCORBA/RTCORBA_includeC.h \
-  RTCORBA/RTCORBA_includeS.h
+  RTCORBA/RTCORBA_includeC.h
 
 CLEANFILES += \
   RTCORBA/RTCORBA_include-stamp \
-  RTCORBA/RTCORBA_includeA.h \
   RTCORBA/RTCORBA_includeC.cpp \
-  RTCORBA/RTCORBA_includeC.h \
-  RTCORBA/RTCORBA_includeS.h
+  RTCORBA/RTCORBA_includeC.h
 
-RTCORBA/RTCORBA_includeA.h RTCORBA/RTCORBA_includeC.cpp RTCORBA/RTCORBA_includeC.h RTCORBA/RTCORBA_includeS.h: RTCORBA/RTCORBA_include-stamp
+RTCORBA/RTCORBA_includeC.cpp RTCORBA/RTCORBA_includeC.h: RTCORBA/RTCORBA_include-stamp
 
 RTCORBA/RTCORBA_include-stamp: $(srcdir)/RTCORBA/RTCORBA_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_RTCORBA_Export -Wb,export_include=tao/RTCORBA/rtcorba_export.h -Wb,unique_include=tao/RTCORBA/RTCORBA.h -o RTCORBA $(srcdir)/RTCORBA/RTCORBA_include.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Ge 1 -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_RTCORBA_Export -Wb,export_include=tao/RTCORBA/rtcorba_export.h -Wb,unique_include=tao/RTCORBA/RTCORBA.h -o RTCORBA $(srcdir)/RTCORBA/RTCORBA_include.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_RTCORBA.la
 
@@ -5092,7 +4584,7 @@ libTAO_RTCORBA_la_SOURCES = \
   RTCORBA/Thread_Pool.cpp
 
 libTAO_RTCORBA_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTCORBA_la_LIBADD = \
   libTAO_PI.la \
@@ -5120,9 +4612,7 @@ nobase_include_HEADERS += \
   RTCORBA/RTCORBAS.h \
   RTCORBA/RTCORBA_include.pidl \
   RTCORBA/RTCORBA_include.pidl \
-  RTCORBA/RTCORBA_includeA.h \
   RTCORBA/RTCORBA_includeC.h \
-  RTCORBA/RTCORBA_includeS.h \
   RTCORBA/RT_Current.h \
   RTCORBA/RT_Endpoint_Selector_Factory.h \
   RTCORBA/RT_Endpoint_Utils.h \
@@ -5153,10 +4643,9 @@ CLEANFILES += \
   TAO_RTCORBA.pc
 
 TAO_RTCORBA.pc: ${top_builddir}/config.status ${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 EXTRA_DIST += \
   RTCORBA/TAO_RTCORBA.pc.in \
@@ -5165,46 +4654,37 @@ EXTRA_DIST += \
 
 ## Makefile.RTPortableServer.am
 
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 BUILT_SOURCES += \
-  RTPortableServer/RTPortableServerA.h \
   RTPortableServer/RTPortableServerC.cpp \
-  RTPortableServer/RTPortableServerC.h \
-  RTPortableServer/RTPortableServerS.h
+  RTPortableServer/RTPortableServerC.h
 
 CLEANFILES += \
   RTPortableServer/RTPortableServer-stamp \
-  RTPortableServer/RTPortableServerA.h \
   RTPortableServer/RTPortableServerC.cpp \
-  RTPortableServer/RTPortableServerC.h \
-  RTPortableServer/RTPortableServerS.h
+  RTPortableServer/RTPortableServerC.h
 
-RTPortableServer/RTPortableServerA.h RTPortableServer/RTPortableServerC.cpp RTPortableServer/RTPortableServerC.h RTPortableServer/RTPortableServerS.h: RTPortableServer/RTPortableServer-stamp
+RTPortableServer/RTPortableServerC.cpp RTPortableServer/RTPortableServerC.h: RTPortableServer/RTPortableServer-stamp
 
 RTPortableServer/RTPortableServer-stamp: $(srcdir)/RTPortableServer/RTPortableServer.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Gp -Gd -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  RTPortableServer/RTPortableServer_includeA.h \
   RTPortableServer/RTPortableServer_includeC.cpp \
-  RTPortableServer/RTPortableServer_includeC.h \
-  RTPortableServer/RTPortableServer_includeS.h
+  RTPortableServer/RTPortableServer_includeC.h
 
 CLEANFILES += \
   RTPortableServer/RTPortableServer_include-stamp \
-  RTPortableServer/RTPortableServer_includeA.h \
   RTPortableServer/RTPortableServer_includeC.cpp \
-  RTPortableServer/RTPortableServer_includeC.h \
-  RTPortableServer/RTPortableServer_includeS.h
+  RTPortableServer/RTPortableServer_includeC.h
 
-RTPortableServer/RTPortableServer_includeA.h RTPortableServer/RTPortableServer_includeC.cpp RTPortableServer/RTPortableServer_includeC.h RTPortableServer/RTPortableServer_includeS.h: RTPortableServer/RTPortableServer_include-stamp
+RTPortableServer/RTPortableServer_includeC.cpp RTPortableServer/RTPortableServer_includeC.h: RTPortableServer/RTPortableServer_include-stamp
 
 RTPortableServer/RTPortableServer_include-stamp: $(srcdir)/RTPortableServer/RTPortableServer_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer_include.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Ge 1 -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer_include.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_RTPortableServer.la
 
@@ -5227,7 +4707,7 @@ libTAO_RTPortableServer_la_SOURCES = \
   RTPortableServer/RT_Servant_Dispatcher.cpp
 
 libTAO_RTPortableServer_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTPortableServer_la_LIBADD = \
   libTAO_PortableServer.la \
@@ -5242,14 +4722,10 @@ nobase_include_HEADERS += \
   RTPortableServer/RTPortableServer.h \
   RTPortableServer/RTPortableServer.pidl \
   RTPortableServer/RTPortableServer.pidl \
-  RTPortableServer/RTPortableServerA.h \
   RTPortableServer/RTPortableServerC.h \
-  RTPortableServer/RTPortableServerS.h \
   RTPortableServer/RTPortableServer_include.pidl \
   RTPortableServer/RTPortableServer_include.pidl \
-  RTPortableServer/RTPortableServer_includeA.h \
   RTPortableServer/RTPortableServer_includeC.h \
-  RTPortableServer/RTPortableServer_includeS.h \
   RTPortableServer/RT_Acceptor_Filters.h \
   RTPortableServer/RT_Collocation_Resolver.h \
   RTPortableServer/RT_Object_Adapter_Factory.h \
@@ -5266,10 +4742,9 @@ CLEANFILES += \
   TAO_RTPortableServer.pc
 
 TAO_RTPortableServer.pc: ${top_builddir}/config.status ${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 
 EXTRA_DIST += \
   RTPortableServer/TAO_RTPortableServer.pc.in \
@@ -5279,46 +4754,37 @@ EXTRA_DIST += \
 ## Makefile.RTScheduler.am
 
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 BUILT_SOURCES += \
-  RTScheduling/RTSchedulerA.h \
   RTScheduling/RTSchedulerC.cpp \
-  RTScheduling/RTSchedulerC.h \
-  RTScheduling/RTSchedulerS.h
+  RTScheduling/RTSchedulerC.h
 
 CLEANFILES += \
   RTScheduling/RTScheduler-stamp \
-  RTScheduling/RTSchedulerA.h \
   RTScheduling/RTSchedulerC.cpp \
-  RTScheduling/RTSchedulerC.h \
-  RTScheduling/RTSchedulerS.h
+  RTScheduling/RTSchedulerC.h
 
-RTScheduling/RTSchedulerA.h RTScheduling/RTSchedulerC.cpp RTScheduling/RTSchedulerC.h RTScheduling/RTSchedulerS.h: RTScheduling/RTScheduler-stamp
+RTScheduling/RTSchedulerC.cpp RTScheduling/RTSchedulerC.h: RTScheduling/RTScheduler-stamp
 
 RTScheduling/RTScheduler-stamp: $(srcdir)/RTScheduling/RTScheduler.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,include_guard=TAO_RTSCHEDULER_SAFE_INCLUDE -Wb,safe_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,include_guard=TAO_RTSCHEDULER_SAFE_INCLUDE -Wb,safe_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
-  RTScheduling/RTScheduler_includeA.h \
   RTScheduling/RTScheduler_includeC.cpp \
-  RTScheduling/RTScheduler_includeC.h \
-  RTScheduling/RTScheduler_includeS.h
+  RTScheduling/RTScheduler_includeC.h
 
 CLEANFILES += \
   RTScheduling/RTScheduler_include-stamp \
-  RTScheduling/RTScheduler_includeA.h \
   RTScheduling/RTScheduler_includeC.cpp \
-  RTScheduling/RTScheduler_includeC.h \
-  RTScheduling/RTScheduler_includeS.h
+  RTScheduling/RTScheduler_includeC.h
 
-RTScheduling/RTScheduler_includeA.h RTScheduling/RTScheduler_includeC.cpp RTScheduling/RTScheduler_includeC.h RTScheduling/RTScheduler_includeS.h: RTScheduling/RTScheduler_include-stamp
+RTScheduling/RTScheduler_includeC.cpp RTScheduling/RTScheduler_includeC.h: RTScheduling/RTScheduler_include-stamp
 
 RTScheduling/RTScheduler_include-stamp: $(srcdir)/RTScheduling/RTScheduler_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,unique_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler_include.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,unique_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler_include.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_RTScheduler.la
 
@@ -5341,7 +4807,7 @@ libTAO_RTScheduler_la_SOURCES = \
   RTScheduling/Request_Interceptor.cpp
 
 libTAO_RTScheduler_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_RTScheduler_la_LIBADD = \
   libTAO_PI_Server.la \
@@ -5359,18 +4825,14 @@ nobase_include_HEADERS += \
   RTScheduling/RTScheduler.h \
   RTScheduling/RTScheduler.pidl \
   RTScheduling/RTScheduler.pidl \
-  RTScheduling/RTSchedulerA.h \
   RTScheduling/RTSchedulerC.h \
-  RTScheduling/RTSchedulerS.h \
   RTScheduling/RTScheduler_Initializer.h \
   RTScheduling/RTScheduler_Loader.h \
   RTScheduling/RTScheduler_Manager.h \
   RTScheduling/RTScheduler_Manager.inl \
   RTScheduling/RTScheduler_include.pidl \
   RTScheduling/RTScheduler_include.pidl \
-  RTScheduling/RTScheduler_includeA.h \
   RTScheduling/RTScheduler_includeC.h \
-  RTScheduling/RTScheduler_includeS.h \
   RTScheduling/Request_Interceptor.h \
   RTScheduling/ThreadAction.h \
   RTScheduling/rtscheduler_export.h
@@ -5382,10 +4844,9 @@ CLEANFILES += \
   TAO_RTScheduler.pc
 
 TAO_RTScheduler.pc: ${top_builddir}/config.status ${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -5395,8 +4856,6 @@ EXTRA_DIST += \
 
 ## Makefile.SmartProxies.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_SmartProxies.la
 
 libTAO_SmartProxies_la_CPPFLAGS = \
@@ -5410,7 +4869,7 @@ libTAO_SmartProxies_la_SOURCES = \
   SmartProxies/Smart_Proxies.cpp
 
 libTAO_SmartProxies_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_SmartProxies_la_LIBADD = \
   libTAO.la \
@@ -5428,9 +4887,7 @@ CLEANFILES += \
   TAO_SmartProxies.pc
 
 TAO_SmartProxies.pc: ${top_builddir}/config.status ${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
 
 EXTRA_DIST += \
   SmartProxies/SmartProxies.rc \
@@ -5439,58 +4896,37 @@ EXTRA_DIST += \
 
 ## Makefile.Strategies.am
 
-if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES += \
   Strategies/uiop_endpointsC.cpp \
-  Strategies/uiop_endpointsC.h \
-  Strategies/uiop_endpointsS.h
+  Strategies/uiop_endpointsC.h
 
 CLEANFILES += \
   Strategies/uiop_endpoints-stamp \
   Strategies/uiop_endpointsC.cpp \
-  Strategies/uiop_endpointsC.h \
-  Strategies/uiop_endpointsS.h
+  Strategies/uiop_endpointsC.h
 
-Strategies/uiop_endpointsC.cpp Strategies/uiop_endpointsC.h Strategies/uiop_endpointsS.h: Strategies/uiop_endpoints-stamp
+Strategies/uiop_endpointsC.cpp Strategies/uiop_endpointsC.h: Strategies/uiop_endpoints-stamp
 
 Strategies/uiop_endpoints-stamp: $(srcdir)/Strategies/uiop_endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/uiop_endpoints.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/uiop_endpoints.pidl
+	@touch "$@"
 
 BUILT_SOURCES += \
   Strategies/sciop_endpointsC.cpp \
-  Strategies/sciop_endpointsC.h \
-  Strategies/sciop_endpointsS.h
+  Strategies/sciop_endpointsC.h
 
 CLEANFILES += \
   Strategies/sciop_endpoints-stamp \
   Strategies/sciop_endpointsC.cpp \
-  Strategies/sciop_endpointsC.h \
-  Strategies/sciop_endpointsS.h
+  Strategies/sciop_endpointsC.h
 
-Strategies/sciop_endpointsC.cpp Strategies/sciop_endpointsC.h Strategies/sciop_endpointsS.h: Strategies/sciop_endpoints-stamp
+Strategies/sciop_endpointsC.cpp Strategies/sciop_endpointsC.h: Strategies/sciop_endpoints-stamp
 
 Strategies/sciop_endpoints-stamp: $(srcdir)/Strategies/sciop_endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/sciop_endpoints.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Strategies/COIOP_EndpointsC.cpp \
-  Strategies/COIOP_EndpointsC.h \
-  Strategies/COIOP_EndpointsS.h
-
-CLEANFILES += \
-  Strategies/COIOP_Endpoints-stamp \
-  Strategies/COIOP_EndpointsC.cpp \
-  Strategies/COIOP_EndpointsC.h \
-  Strategies/COIOP_EndpointsS.h
-
-Strategies/COIOP_EndpointsC.cpp Strategies/COIOP_EndpointsC.h Strategies/COIOP_EndpointsS.h: Strategies/COIOP_Endpoints-stamp
-
-Strategies/COIOP_Endpoints-stamp: $(srcdir)/Strategies/COIOP_Endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/COIOP_Endpoints.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/sciop_endpoints.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_Strategies.la
 
@@ -5502,14 +4938,6 @@ libTAO_Strategies_la_CPPFLAGS = \
   -DTAO_STRATEGIES_BUILD_DLL
 
 libTAO_Strategies_la_SOURCES = \
-  Strategies/COIOP_Acceptor.cpp \
-  Strategies/COIOP_Connection_Handler.cpp \
-  Strategies/COIOP_Connector.cpp \
-  Strategies/COIOP_Endpoint.cpp \
-  Strategies/COIOP_EndpointsC.cpp \
-  Strategies/COIOP_Factory.cpp \
-  Strategies/COIOP_Profile.cpp \
-  Strategies/COIOP_Transport.cpp \
   Strategies/DIOP_Acceptor.cpp \
   Strategies/DIOP_Connection_Handler.cpp \
   Strategies/DIOP_Connector.cpp \
@@ -5552,7 +4980,7 @@ libTAO_Strategies_la_SOURCES = \
   Strategies/uiop_endpointsC.cpp
 
 libTAO_Strategies_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_Strategies_la_LIBADD = \
   libTAO_AnyTypeCode.la \
@@ -5560,17 +4988,6 @@ libTAO_Strategies_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Strategies/COIOP_Acceptor.h \
-  Strategies/COIOP_Connection_Handler.h \
-  Strategies/COIOP_Connector.h \
-  Strategies/COIOP_Endpoint.h \
-  Strategies/COIOP_Endpoint.inl \
-  Strategies/COIOP_Endpoints.pidl \
-  Strategies/COIOP_EndpointsC.h \
-  Strategies/COIOP_EndpointsS.h \
-  Strategies/COIOP_Factory.h \
-  Strategies/COIOP_Profile.h \
-  Strategies/COIOP_Transport.h \
   Strategies/DIOP_Acceptor.h \
   Strategies/DIOP_Acceptor.inl \
   Strategies/DIOP_Connection_Handler.h \
@@ -5617,12 +5034,12 @@ nobase_include_HEADERS += \
   Strategies/UIOP_Transport.h \
   Strategies/advanced_resource.h \
   Strategies/sciop_endpoints.pidl \
+  Strategies/sciop_endpoints.pidl \
   Strategies/sciop_endpointsC.h \
-  Strategies/sciop_endpointsS.h \
   Strategies/strategies_export.h \
   Strategies/uiop_endpoints.pidl \
-  Strategies/uiop_endpointsC.h \
-  Strategies/uiop_endpointsS.h
+  Strategies/uiop_endpoints.pidl \
+  Strategies/uiop_endpointsC.h
 
 pkgconfig_DATA += \
   TAO_Strategies.pc
@@ -5631,9 +5048,9 @@ CLEANFILES += \
   TAO_Strategies.pc
 
 TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in
+	${top_builddir}/config.status --file "$@":${srcdir}/Strategies/TAO_Strategies.pc.in
 
-endif BUILD_EXCEPTIONS
+endif !BUILD_ACE_FOR_TAO
 
 EXTRA_DIST += \
   Strategies/TAO_Strategies.pc.in \
@@ -5643,7 +5060,6 @@ EXTRA_DIST += \
 ## Makefile.TAO_FlResource.am
 
 if BUILD_ACE_FLREACTOR
-if BUILD_EXCEPTIONS
 if BUILD_FL
 if BUILD_GL
 if BUILD_X11
@@ -5663,7 +5079,7 @@ libTAO_FlResource_la_SOURCES = \
   FlResource/FlResource_Loader.cpp
 
 libTAO_FlResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_FLTK_LDFLAGS)
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_FLTK_LDFLAGS) -L. -L$(ACE_ROOT)/lib
 
 libTAO_FlResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
@@ -5679,13 +5095,11 @@ nobase_include_HEADERS += \
 endif BUILD_X11
 endif BUILD_GL
 endif BUILD_FL
-endif BUILD_EXCEPTIONS
 endif BUILD_ACE_FLREACTOR
 
 ## Makefile.TAO_QtResource.am
 
 if BUILD_ACE_QTREACTOR
-if BUILD_EXCEPTIONS
 if BUILD_QT
 
 lib_LTLIBRARIES += libTAO_QtResource.la
@@ -5703,7 +5117,7 @@ libTAO_QtResource_la_SOURCES = \
   QtResource/QtResource_Loader.cpp
 
 libTAO_QtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_QT_LDFLAGS)
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_QT_LDFLAGS) -L. -L$(ACE_ROOT)/lib
 
 libTAO_QtResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \
@@ -5717,13 +5131,11 @@ nobase_include_HEADERS += \
   QtResource/TAO_QtResource_Export.h
 
 endif BUILD_QT
-endif BUILD_EXCEPTIONS
 endif BUILD_ACE_QTREACTOR
 
 ## Makefile.TAO_TkResource.am
 
 if BUILD_ACE_TKREACTOR
-if BUILD_EXCEPTIONS
 if BUILD_TK
 
 lib_LTLIBRARIES += libTAO_TkResource.la
@@ -5742,7 +5154,7 @@ libTAO_TkResource_la_SOURCES = \
   TkResource/TkResource_Loader.cpp
 
 libTAO_TkResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS)
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) -L. -L$(ACE_ROOT)/lib
 
 libTAO_TkResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_TkReactor.la \
@@ -5757,13 +5169,11 @@ nobase_include_HEADERS += \
   TkResource/TkResource_Loader.h
 
 endif BUILD_TK
-endif BUILD_EXCEPTIONS
 endif BUILD_ACE_TKREACTOR
 
 ## Makefile.TAO_XtResource.am
 
 if BUILD_ACE_XTREACTOR
-if BUILD_EXCEPTIONS
 if BUILD_X11
 if BUILD_XT
 
@@ -5783,7 +5193,7 @@ libTAO_XtResource_la_SOURCES = \
   XtResource/XtResource_Loader.cpp
 
 libTAO_XtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) -L. -L$(ACE_ROOT)/lib
 
 libTAO_XtResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
@@ -5799,166 +5209,24 @@ nobase_include_HEADERS += \
 
 endif BUILD_XT
 endif BUILD_X11
-endif BUILD_EXCEPTIONS
 endif BUILD_ACE_XTREACTOR
 
-## Makefile.TC.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES += \
-  TransportCurrent/TCC.cpp \
-  TransportCurrent/TCC.h \
-  TransportCurrent/TCC.inl \
-  TransportCurrent/TCS.cpp \
-  TransportCurrent/TCS.h \
-  TransportCurrent/TCS.inl
-
-CLEANFILES += \
-  TransportCurrent/TC-stamp \
-  TransportCurrent/TCC.cpp \
-  TransportCurrent/TCC.h \
-  TransportCurrent/TCC.inl \
-  TransportCurrent/TCS.cpp \
-  TransportCurrent/TCS.h \
-  TransportCurrent/TCS.inl
-
-TransportCurrent/TCC.cpp TransportCurrent/TCC.h TransportCurrent/TCC.inl TransportCurrent/TCS.cpp TransportCurrent/TCS.h TransportCurrent/TCS.inl: TransportCurrent/TC-stamp
-
-TransportCurrent/TC-stamp: $(srcdir)/TransportCurrent/TC.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export -o TransportCurrent -I./TransportCurrent $(srcdir)/TransportCurrent/TC.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_TC.la
-
-libTAO_TC_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_TRANSPORT_CURRENT_BUILD_DLL
-
-libTAO_TC_la_SOURCES = \
-  TransportCurrent/Current_Impl.cpp \
-  TransportCurrent/Current_Loader.cpp \
-  TransportCurrent/Current_ORBInitializer_Base.cpp \
-  TransportCurrent/TCC.cpp \
-  TransportCurrent/TCS.cpp
-
-libTAO_TC_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_TC_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  TransportCurrent/Current_Impl.h \
-  TransportCurrent/Current_Loader.h \
-  TransportCurrent/Current_ORBInitializer.cpp \
-  TransportCurrent/Current_ORBInitializer.h \
-  TransportCurrent/Current_ORBInitializer_Base.h \
-  TransportCurrent/TC.idl \
-  TransportCurrent/TCC.h \
-  TransportCurrent/TCC.inl \
-  TransportCurrent/TCS.h \
-  TransportCurrent/TCS.inl \
-  TransportCurrent/Transport_Current.h
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.TC_IIOP.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES += \
-  TransportCurrent/TC_IIOPC.cpp \
-  TransportCurrent/TC_IIOPC.h \
-  TransportCurrent/TC_IIOPC.inl \
-  TransportCurrent/TC_IIOPS.cpp \
-  TransportCurrent/TC_IIOPS.h \
-  TransportCurrent/TC_IIOPS.inl
-
-CLEANFILES += \
-  TransportCurrent/TC_IIOP-stamp \
-  TransportCurrent/TC_IIOPC.cpp \
-  TransportCurrent/TC_IIOPC.h \
-  TransportCurrent/TC_IIOPC.inl \
-  TransportCurrent/TC_IIOPS.cpp \
-  TransportCurrent/TC_IIOPS.h \
-  TransportCurrent/TC_IIOPS.inl
-
-TransportCurrent/TC_IIOPC.cpp TransportCurrent/TC_IIOPC.h TransportCurrent/TC_IIOPC.inl TransportCurrent/TC_IIOPS.cpp TransportCurrent/TC_IIOPS.h TransportCurrent/TC_IIOPS.inl: TransportCurrent/TC_IIOP-stamp
-
-TransportCurrent/TC_IIOP-stamp: $(srcdir)/TransportCurrent/TC_IIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export -o TransportCurrent -I./TransportCurrent $(srcdir)/TransportCurrent/TC_IIOP.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_TC_IIOP.la
-
-libTAO_TC_IIOP_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_TRANSPORT_CURRENT_BUILD_DLL
-
-libTAO_TC_IIOP_la_SOURCES = \
-  TransportCurrent/IIOP_Current_Impl.cpp \
-  TransportCurrent/IIOP_Current_Loader.cpp \
-  TransportCurrent/TC_IIOPC.cpp \
-  TransportCurrent/TC_IIOPS.cpp
-
-libTAO_TC_IIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_TC_IIOP_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO_TC.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  TransportCurrent/IIOP_Current_Impl.h \
-  TransportCurrent/IIOP_Current_Loader.h \
-  TransportCurrent/IIOP_Transport_Current.h \
-  TransportCurrent/TC_IIOP.idl \
-  TransportCurrent/TC_IIOPC.h \
-  TransportCurrent/TC_IIOPC.inl \
-  TransportCurrent/TC_IIOPS.h \
-  TransportCurrent/TC_IIOPS.inl
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
 ## Makefile.TypeCodeFactory.am
 
-if BUILD_EXCEPTIONS
-
 BUILT_SOURCES += \
   TypeCodeFactory/TypeCodeFactoryC.cpp \
-  TypeCodeFactory/TypeCodeFactoryC.h \
-  TypeCodeFactory/TypeCodeFactoryS.h
+  TypeCodeFactory/TypeCodeFactoryC.h
 
 CLEANFILES += \
   TypeCodeFactory/TypeCodeFactory-stamp \
   TypeCodeFactory/TypeCodeFactoryC.cpp \
-  TypeCodeFactory/TypeCodeFactoryC.h \
-  TypeCodeFactory/TypeCodeFactoryS.h
+  TypeCodeFactory/TypeCodeFactoryC.h
 
-TypeCodeFactory/TypeCodeFactoryC.cpp TypeCodeFactory/TypeCodeFactoryC.h TypeCodeFactory/TypeCodeFactoryS.h: TypeCodeFactory/TypeCodeFactory-stamp
+TypeCodeFactory/TypeCodeFactoryC.cpp TypeCodeFactory/TypeCodeFactoryC.h: TypeCodeFactory/TypeCodeFactory-stamp
 
 TypeCodeFactory/TypeCodeFactory-stamp: $(srcdir)/TypeCodeFactory/TypeCodeFactory.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Sorb -Wb,export_macro=TAO_TypeCodeFactory_Export -Wb,export_include=tao/TypeCodeFactory/typecodefactory_export.h -o TypeCodeFactory $(srcdir)/TypeCodeFactory/TypeCodeFactory.pidl
-	@touch $@
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Ge 1 -Sorb -Wb,export_macro=TAO_TypeCodeFactory_Export -Wb,export_include=tao/TypeCodeFactory/typecodefactory_export.h -o TypeCodeFactory $(srcdir)/TypeCodeFactory/TypeCodeFactory.pidl
+	@touch "$@"
 
 lib_LTLIBRARIES += libTAO_TypeCodeFactory.la
 
@@ -5977,7 +5245,7 @@ libTAO_TypeCodeFactory_la_SOURCES = \
   TypeCodeFactory/TypeCodeFactory_i.cpp
 
 libTAO_TypeCodeFactory_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_TypeCodeFactory_la_LIBADD = \
   libTAO_IFR_Client.la \
@@ -5990,7 +5258,6 @@ nobase_include_HEADERS += \
   TypeCodeFactory/Recursive_TypeCode.inl \
   TypeCodeFactory/TypeCodeFactory.pidl \
   TypeCodeFactory/TypeCodeFactoryC.h \
-  TypeCodeFactory/TypeCodeFactoryS.h \
   TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h \
   TypeCodeFactory/TypeCodeFactory_Loader.h \
   TypeCodeFactory/TypeCodeFactory_i.h \
@@ -6003,9 +5270,7 @@ CLEANFILES += \
   TAO_TypeCodeFactory.pc
 
 TAO_TypeCodeFactory.pc: ${top_builddir}/config.status ${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
 
 EXTRA_DIST += \
   TypeCodeFactory/TAO_TypeCodeFactory.pc.in \
@@ -6014,8 +5279,6 @@ EXTRA_DIST += \
 
 ## Makefile.Utils.am
 
-if BUILD_EXCEPTIONS
-
 lib_LTLIBRARIES += libTAO_Utils.la
 
 libTAO_Utils_la_CPPFLAGS = \
@@ -6037,7 +5300,7 @@ libTAO_Utils_la_SOURCES = \
   Utils/Synch_Refcountable.cpp
 
 libTAO_Utils_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib
 
 libTAO_Utils_la_LIBADD = \
   libTAO_PI.la \
@@ -6070,67 +5333,12 @@ CLEANFILES += \
   TAO_Utils.pc
 
 TAO_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_Utils.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_Utils.pc.in
-
-endif BUILD_EXCEPTIONS
+	${top_builddir}/config.status --file "$@":${srcdir}/TAO_Utils.pc.in
 
 EXTRA_DIST += \
   TAO_Utils.pc.in
 
 
-## Makefile.ZlibCompressor.am
-
-if BUILD_EXCEPTIONS
-if BUILD_ZLIB
-
-lib_LTLIBRARIES += libTAO_ZlibCompressor.la
-
-libTAO_ZlibCompressor_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_ZLIBCOMPRESSOR_BUILD_DLL \
-  $(ACE_ZLIB_CPPFLAGS)
-
-libTAO_ZlibCompressor_la_SOURCES = \
-  Compression/zlib/ZlibCompressor.cpp \
-  Compression/zlib/ZlibCompressor_Factory.cpp
-
-libTAO_ZlibCompressor_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_ZLIB_LDFLAGS)
-
-libTAO_ZlibCompressor_la_LIBADD = \
-  libTAO_Compression.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_ZLIB_LIBS)
-
-nobase_include_HEADERS += \
-  Compression/zlib/ZlibCompressor.h \
-  Compression/zlib/ZlibCompressor_Factory.h \
-  Compression/zlib/ZlibCompressor_export.h
-
-pkgconfig_DATA += \
-  TAO_ZlibCompressor.pc
-
-CLEANFILES += \
-  TAO_ZlibCompressor.pc
-
-TAO_ZlibCompressor.pc: ${top_builddir}/config.status ${srcdir}/Compression/zlib/TAO_ZlibCompressor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Compression/zlib/TAO_ZlibCompressor.pc.in
-
-endif BUILD_ZLIB
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  Compression/zlib/TAO_ZlibCompressor.pc.in \
-  Compression/zlib/TAO_ZlibCompressor.rc
-
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
index d6540f7544c..64505dc920a 100644
--- a/TAO/tao/Messaging.mpc
+++ b/TAO/tao/Messaging.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, portableserver, pi, valuetype, tao_versioning_idl_defaults {
+project : taolib, core, portableserver, pi, valuetype, tao_versioning_idl_defaults {
   sharedname   = TAO_Messaging
   dynamicflags = TAO_MESSAGING_BUILD_DLL
 
@@ -27,7 +27,7 @@ project : taolib, install, portableserver, pi, valuetype, tao_versioning_idl_def
   }
 
   IDL_Files {
-    idlflags += -SS -GA -Gp -Gd -Sorb -Sal \
+    idlflags += -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -o Messaging
@@ -36,7 +36,7 @@ project : taolib, install, portableserver, pi, valuetype, tao_versioning_idl_def
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \
+    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -o Messaging
@@ -45,7 +45,7 @@ project : taolib, install, portableserver, pi, valuetype, tao_versioning_idl_def
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \
+    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -o Messaging
@@ -54,7 +54,7 @@ project : taolib, install, portableserver, pi, valuetype, tao_versioning_idl_def
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
+    idlflags += -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -o Messaging
@@ -65,7 +65,7 @@ project : taolib, install, portableserver, pi, valuetype, tao_versioning_idl_def
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
+    idlflags += -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \
@@ -76,7 +76,7 @@ project : taolib, install, portableserver, pi, valuetype, tao_versioning_idl_def
   }
 
   IDL_Files {
-    idlflags += -Ssi -GA -Gp -Gd -Sorb -Sal \
+    idlflags += -Ssi -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 7296456a0ad..619de3ed97b 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -155,7 +155,7 @@ namespace TAO
     ACE_CATCHANY
       {
 #if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus const status =
+        PortableInterceptor::ReplyStatus status =
           this->handle_any_exception (&ACE_ANY_EXCEPTION
                                       ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
diff --git a/TAO/tao/Messaging/ExceptionHolder.pidl b/TAO/tao/Messaging/ExceptionHolder.pidl
index 90a3f69604e..a00643e9368 100644
--- a/TAO/tao/Messaging/ExceptionHolder.pidl
+++ b/TAO/tao/Messaging/ExceptionHolder.pidl
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *   tao_idl
- *        -o orig -Gp -Gd -GA -SS
+ *        -o orig -Gp -Gd -Ge 1 -GA -SS
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl
index f96164b99f9..45f1cdae526 100644
--- a/TAO/tao/Messaging/Messaging.pidl
+++ b/TAO/tao/Messaging/Messaging.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -GA -Ssi
+ *        -o orig -Gp -Gd -Ge 1 -GA -Ssi
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl
index 44b70574cfa..35f127449a3 100644
--- a/TAO/tao/Messaging/Messaging_No_Impl.pidl
+++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl
@@ -13,7 +13,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -GA -Sci -SS
+ *        -o orig -Gp -Gd -Ge 1 -GA -Sci -SS
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
index 80b0b229961..ebcb3ee95dc 100644
--- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
@@ -12,7 +12,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -GA -Sci -SS
+ *        -o orig -Gp -Gd -Ge 1 -GA -Sci -SS
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
index 5007decf337..34594b58852 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
@@ -12,7 +12,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -GA -Sci
+ *        -o orig -Gp -Gd -Ge 1 -GA -Sci
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/Messaging_Types.pidl b/TAO/tao/Messaging/Messaging_Types.pidl
index ef0163ec8a7..e75ecbb5394 100644
--- a/TAO/tao/Messaging/Messaging_Types.pidl
+++ b/TAO/tao/Messaging/Messaging_Types.pidl
@@ -4,7 +4,7 @@
 /**
  *  @file   Messaging_Types.pidl
  *
- *  $Id$
+ *  $Id: Messaging_No_Impl.pidl 72588 2006-05-09 07:36:18Z jwillemsen $
  *
  * This file was used to generate the code in
  * Messaging__Types{C}.{h,cpp} and as the name implies is not
@@ -13,7 +13,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -GA -Sci -SS
+ *        -o orig -Gp -Gd -Ge 1 -GA -Sci -SS
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/Pollable.pidl b/TAO/tao/Messaging/Pollable.pidl
index 5441f0ff041..80c14f7ebc2 100644
--- a/TAO/tao/Messaging/Pollable.pidl
+++ b/TAO/tao/Messaging/Pollable.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *     -o orig -St -Sa -Gp -Gd -SS -Sci
+ *     -o orig -St -Sa -Gp -Gd -Ge 1 -SS -Sci
  *     -Wb,export_macro=TAO_Export
  *     -Wb,pre_include="ace/pre.h"
  *     -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/Messaging/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl
index 8b0bce7ce28..55eb98af6ec 100644
--- a/TAO/tao/Messaging/TAO_Ext.pidl
+++ b/TAO/tao/Messaging/TAO_Ext.pidl
@@ -15,7 +15,7 @@
  *   this is:
  *
  *   tao_idl
- *       -o orig -Gp -Gd -GA -Sci -SS
+ *       -o orig -Gp -Gd -Ge 1 -GA -Sci -SS
  *       -Wb,export_macro=TAO_Messaging_Export
  *       -Wb,export_include=messaging_export.h
  *       -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index 17c568c8c04..e52ea2a59e2 100644
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ b/TAO/tao/Messaging_PolicyValue.pidl
@@ -10,7 +10,7 @@
  *
  *     tao_idl
  *          -oA AnyTypeCode
- *          -GA -SS -Sci
+ *          -Ge 1 -GA -SS -Sci
  *          -Wb,pre_include=ace/pre.h
  *          -Wb,post_include=ace/post.h
  *          -Wb,export_macro=TAO_Export
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index a3ce4098b83..cef6cc634ab 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -279,7 +279,7 @@ CORBA::ORB::work_pending (ACE_ENV_SINGLE_ARG_DECL)
   return 1;
 }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 
 void
 CORBA::ORB::create_list (CORBA::Long count,
@@ -1116,12 +1116,6 @@ CORBA::ORB::resolve_initial_references (const char *name,
         (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
-  else if (ACE_OS::strcmp (name, TAO_OBJID_COMPRESSIONMANAGER) == 0)
-    {
-      result = this->orb_core ()->resolve_compression_manager
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
 #if TAO_HAS_INTERCEPTORS == 1
   else if (ACE_OS::strcmp (name, TAO_OBJID_PICurrent) == 0)
     {
@@ -1311,7 +1305,7 @@ TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
 CORBA::ORB_ptr
 CORBA::ORB::_tao_make_ORB (TAO_ORB_Core * orb_core)
 {
-  CORBA::ORB_ptr orb = CORBA::ORB_ptr ();
+  CORBA::ORB_ptr orb = CORBA::ORB::_nil ();
 
   ACE_NEW_RETURN (orb,
                   CORBA::ORB (orb_core),
@@ -1329,27 +1323,10 @@ CORBA::ORB_init (int &argc,
                  char *argv[],
                  const char *orb_name)
 {
-#ifndef ACE_HAS_EXCEPTIONS
-  // Make sure TAO's singleton manager is initialized.
-  //
-  // We need to initialize before TAO_default_environment() is called
-  // since that call instantiates a TAO_TSS_Singleton.
-  if (TAO_Singleton_Manager::instance ()->init () == -1)
-    {
-      return CORBA::ORB::_nil ();
-    }
-
   return CORBA::ORB_init (argc,
                           argv,
                           orb_name,
                           TAO_default_environment ());
-#else
-  CORBA::Environment env;
-  return CORBA::ORB_init (argc,
-                          argv,
-                          orb_name,
-                          env /* unused */);
-#endif  /* !ACE_HAS_EXCEPTIONS */
 }
 
 CORBA::ORB_ptr
@@ -1592,20 +1569,11 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj
   this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  if (!CORBA::is_nil (obj))
-    {
-      if (!obj->can_convert_to_ior ())
-        ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::OMGVMCID | 4,
-                                          CORBA::COMPLETED_NO),
-                          0);
+  if (!CORBA::is_nil (obj) && obj->_is_local ())
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::OMGVMCID | 4,
+                                      CORBA::COMPLETED_NO),
+                      0);
 
-      // Allow a user to provide custom object stringification
-      char* user_string =
-        obj->convert_to_ior (this->use_omg_ior_format_,
-                             ior_prefix);
-      if (user_string != 0)
-        return user_string;
-    }
 
   // Application writer controls what kind of objref strings they get,
   // maybe along with other things, by how they initialize the ORB.
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 6fcdb74d24f..e08484e3ae6 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -121,7 +121,7 @@ namespace CORBA
 
   typedef CORBA::Short ValueModifier;
 
-#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 
     // Typedefs for CORBA::RequestSeq, which is an argument of
     // send_multiple_requests_*().
@@ -246,7 +246,7 @@ namespace CORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 #endif
 
-#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 
     void create_list (CORBA::Long count,
                       CORBA::NVList_ptr &new_list
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index bd4eeb28dbe..86548d59087 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -219,7 +219,6 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     imr_endpoints_in_ior_ (1),
     typecode_factory_ (CORBA::Object::_nil ()),
     codec_factory_ (CORBA::Object::_nil ()),
-    compression_manager_ (CORBA::Object::_nil ()), 
     dynany_factory_ (CORBA::Object::_nil ()),
     ior_manip_factory_ (CORBA::Object::_nil ()),
     ior_table_ (CORBA::Object::_nil ()),
@@ -251,11 +250,11 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     tm_ (),
     tss_cleanup_funcs_ (),
     tss_resources_ (),
-    has_shutdown_ (true),  // Start the ORB in a  "shutdown" state.  Only
-                           // after CORBA::ORB_init() is called will the
-                           // ORB no longer be shutdown.  This does not
-                           // mean that the ORB can be reinitialized.  It
-                           // can only be initialized once.
+    has_shutdown_ (1),  // Start the ORB in a  "shutdown" state.  Only
+                        // after CORBA::ORB_init() is called will the
+                        // ORB no longer be shutdown.  This does not
+                        // mean that the ORB can be reinitialized.  It
+                        // can only be initialized once.
     thread_per_connection_use_timeout_ (1),
     open_lock_ (),
     endpoint_selector_factory_ (0),
@@ -367,9 +366,6 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
   delete this->codeset_manager_;
   this->codeset_manager_ = 0;
 
-  // This will destroy the service repository for this core
-  (void) TAO::ORB::close_services (this->config_);
-
   delete this->config_;
   this->config_ = 0;
 }
@@ -1093,11 +1089,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
       // ok, we can't interpret this argument, move to next argument//
       ////////////////////////////////////////////////////////////////
       else
-        {
-          // Any arguments that don't match are ignored so that the
-          // caller can still use them.
-          arg_shifter.ignore_arg ();
-        }
+        // Any arguments that don't match are ignored so that the
+        // caller can still use them.
+        arg_shifter.ignore_arg ();
     }
 
   const char *env_endpoint =
@@ -1348,7 +1342,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
   // The ORB has been initialized, meaning that the ORB is no longer
   // in the shutdown state.
-  this->has_shutdown_ = false;
+  this->has_shutdown_ = 0;
 
   return 0;
 }
@@ -1412,6 +1406,8 @@ TAO_ORB_Core::fini (void)
   if (this->thread_lane_resources_manager_ != 0)
     this->thread_lane_resources_manager_->finalize ();
 
+  (void) TAO::ORB::close_services (this->configuration ());
+
   // Destroy the object_key table
   this->object_key_table_.destroy ();
 
@@ -1625,30 +1621,26 @@ TAO_ORB_Core::policy_factory_registry_i (void)
 TAO::ORBInitializer_Registry_Adapter *
 TAO_ORB_Core::orbinitializer_registry_i (void)
 {
-  // @todo The ORBInitializer_Registry is supposed to be a singleton.
-
-  ACE_Service_Gestalt * const config = this->configuration ();
-
   // If not, lookup it up.
   this->orbinitializer_registry_ =
     ACE_Dynamic_Service<TAO::ORBInitializer_Registry_Adapter>::instance
-      (config,
+      (this->configuration (),
        ACE_TEXT ("ORBInitializer_Registry"));
 
 #if !defined (TAO_AS_STATIC_LIBS)
       // In case we build shared, try to load the PI Client library, in a
       // static build we just can't do this, so don't try it, lower layers
       // output an error then.
-  if (this->orbinitializer_registry_ == 0)
+  if (orbinitializer_registry_ == 0)
     {
-      config->process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
-                                       "TAO_PI",
-                                       "_make_ORBInitializer_Registry",
-                                       ""));
-      this->orbinitializer_registry_ =
+      this->configuration ()->process_directive (
+        ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
+                                      "TAO_PI",
+                                      "_make_ORBInitializer_Registry",
+                                      ""));
+      orbinitializer_registry_ =
         ACE_Dynamic_Service<TAO::ORBInitializer_Registry_Adapter>::instance
-          (config,
+          (this->configuration (),
            ACE_TEXT ("ORBInitializer_Registry"));
     }
 #endif /* !TAO_AS_STATIC_LIBS */
@@ -2105,21 +2097,13 @@ CORBA::Boolean
 TAO_ORB_Core::is_collocation_enabled (TAO_ORB_Core *orb_core,
                                       const TAO_MProfile &mp)
 {
-  TAO_MProfile mp_temp;
-
-  TAO_Profile* profile = 0;
-  if (this->service_profile_selection(mp, profile) && profile)
-  {
-    mp_temp.add_profile(profile);
-  }
-
   if (!orb_core->optimize_collocation_objects ())
     return 0;
 
   if (!orb_core->use_global_collocation () && orb_core != this)
     return 0;
 
-  if (!orb_core->is_collocated (profile ? mp_temp : mp))
+  if (!orb_core->is_collocated (mp))
     return 0;
 
   return 1;
@@ -2189,7 +2173,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
   // We don't need to do this because we use the Reactor
   // mechanisms to shutdown in a thread-safe way.
 
-  while (this->has_shutdown () == false)
+  while (this->has_shutdown () == 0)
     {
       // Every time we perform an interation we have to become the
       // leader again, because it is possible that a client has
@@ -2261,7 +2245,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
       // Otherwise just continue..
     }
 
-  if (this->has_shutdown () == true &&
+  if (this->has_shutdown () == 1 &&
       this->server_factory_->activate_server_connections ())
       this->tm_.wait ();
 
@@ -2284,7 +2268,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
-    if (this->has_shutdown () == true)
+    if (this->has_shutdown () != 0)
       return;
 
     // Check if we are on the right state, i.e. do not accept
@@ -2296,7 +2280,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
 
     // Set the 'has_shutdown' flag, so any further attempt to shutdown
     // becomes a noop.
-    this->has_shutdown_ = true;
+    this->has_shutdown_ = 1;
 
     // need to release the mutex, because some of the shutdown
     // operations invoke application code, that could (and in practice
@@ -2505,34 +2489,6 @@ TAO_ORB_Core::resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_ORB_Core::resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Object_Loader *loader =
-    ACE_Dynamic_Service<TAO_Object_Loader>::instance
-      (this->configuration (),
-       ACE_TEXT ("Compression_Loader"));
-
-  if (loader == 0)
-    {
-      this->configuration()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression",
-                                       "TAO_Compression",
-                                       "_make_TAO_Compression_Loader",
-                                       ""));
-      loader =
-        ACE_Dynamic_Service<TAO_Object_Loader>::instance
-          (this->configuration (), ACE_TEXT ("Compression_Loader"));
-    }
-
-  if (loader != 0)
-    {
-      this->compression_manager_ =
-        loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
 TAO_ORB_Core::resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Object_Loader *loader =
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index b655b0f7a72..d114ef39412 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -596,7 +596,7 @@ public:
                  ACE_ENV_ARG_DECL);
 
   /// Get the shutdown flag value
-  bool has_shutdown (void) const;
+  int has_shutdown (void);
 
   /// Shutdown the ORB and free resources
   void destroy (ACE_ENV_SINGLE_ARG_DECL);
@@ -673,9 +673,6 @@ public:
   /// Resolve the CodecFactory DLL.
   CORBA::Object_ptr resolve_codecfactory (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Resolve the Compression DLL.
-  CORBA::Object_ptr resolve_compression_manager (ACE_ENV_SINGLE_ARG_DECL);
-
   /// Resolve the Dynamic Any Factory
   CORBA::Object_ptr resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -730,10 +727,23 @@ public:
    * services do make the selection they would return the selected
    * profile through <profile>.
    */
-  CORBA::Boolean service_profile_selection (const TAO_MProfile &mprofile,
+  CORBA::Boolean service_profile_selection (TAO_MProfile &mprofile,
                                             TAO_Profile  *&profile);
 
   /**
+   * The loaded service in the ORB_Core would determine if the profile
+   * reselection is going to be made by the services or not. If the
+   * services do make the reselection they would return the selected
+   * profile through <profile>. The reselction is for the
+   * multi-profile IORS.
+   */
+  CORBA::Boolean service_profile_reselection (TAO_Stub *stub,
+                                              TAO_Profile *&profile);
+
+  /// Reset the flags in the loaded services.
+  void reset_service_profile_flags (void);
+
+  /**
    * The loaded service would determine if the CORBA::Object_ptr is
    * actually nil or not. This would be useful to accomodate new
    * enhanced definitions as defined by the service specification.
@@ -959,9 +969,6 @@ protected:
   /// Obtain and cache the codec factory object reference.
   void resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Obtain and cache the compression manager object reference.
-  void resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_DECL);
-
   /// Obtain and cache the dynamic any factory object reference.
   void resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -1054,9 +1061,6 @@ protected:
   /// The cached IOR for the CodecFactory DLL.
   CORBA::Object_ptr codec_factory_;
 
-  /// The cached IOR for the Compression DLL.
-  CORBA::Object_ptr compression_manager_;
-
   /// The cached object reference for the DynAnyFactory.
   CORBA::Object_ptr dynany_factory_;
 
@@ -1179,7 +1183,7 @@ protected:
   ACE_TSS_TYPE (TAO_ORB_Core_TSS_Resources) tss_resources_;
 
   /// Flag which denotes that the ORB has been shutdown.
-  bool has_shutdown_;
+  int has_shutdown_;
 
   /// The value of the timeout if the flag above is not zero.
   //@{
@@ -1418,6 +1422,9 @@ public:
 
 private:
 
+  /// The singleton instance.
+//   static TAO_ORB_Core_Static_Resources* instance_;
+
   /// Mostly unused variable whose sole purpose is to enforce
   /// the instantiation of a TAO_ORB_Core_Static_Resources instance
   /// at initialization time.
diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl
index 06ce24dd019..ca3defce178 100644
--- a/TAO/tao/ORB_Core.inl
+++ b/TAO/tao/ORB_Core.inl
@@ -76,7 +76,7 @@ TAO_ORB_Core::get_protocols_hooks (void)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::service_profile_selection (const TAO_MProfile &mprofile,
+TAO_ORB_Core::service_profile_selection (TAO_MProfile &mprofile,
                                          TAO_Profile  *&profile)
 {
   CORBA::Boolean retval = 0;
@@ -86,13 +86,45 @@ TAO_ORB_Core::service_profile_selection (const TAO_MProfile &mprofile,
   if (this->ft_service_.service_callback ())
     {
       retval =
-        this->ft_service_.service_callback ()->select_profile (mprofile,
+        this->ft_service_.service_callback ()->select_profile (&mprofile,
                                                                 profile);
     }
   return retval;
 }
 
 ACE_INLINE CORBA::Boolean
+TAO_ORB_Core::service_profile_reselection (TAO_Stub *stub,
+                                           TAO_Profile *&profile)
+{
+  CORBA::Boolean retval = 0;
+  // @@ If different services have the same feature we may want to
+  // prioritise them here. We need to decide here whose selection of
+  // profile is more important.
+  if (this->ft_service_.service_callback ())
+    {
+      retval =
+        this->ft_service_.service_callback ()->reselect_profile (stub,
+                                                                 profile);
+    }
+  return retval;
+}
+
+ACE_INLINE void
+TAO_ORB_Core::reset_service_profile_flags (void)
+{
+  // @@ If different services have the same feature we may want to
+  // prioritise them here. We need to decide here whose selection of
+  // profile is more important.
+
+  if (this->ft_service_.service_callback ())
+    {
+      this->ft_service_.service_callback ()->reset_profile_flags ();
+    }
+  return;
+}
+
+
+ACE_INLINE CORBA::Boolean
 TAO_ORB_Core::object_is_nil (CORBA::Object_ptr obj)
 {
   CORBA::Boolean retval = 0;
@@ -314,8 +346,8 @@ TAO_ORB_Core::tss_cleanup_funcs (void)
   return &(this->tss_cleanup_funcs_);
 }
 
-ACE_INLINE bool
-TAO_ORB_Core::has_shutdown (void) const
+ACE_INLINE int
+TAO_ORB_Core::has_shutdown (void)
 {
   return this->has_shutdown_;
 }
@@ -394,19 +426,6 @@ TAO_ORB_Core::resolve_codecfactory (ACE_ENV_SINGLE_ARG_DECL)
   return CORBA::Object::_duplicate (this->codec_factory_);
 }
 
-ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_compression_manager (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
-                    CORBA::Object::_nil ());
-  if (CORBA::is_nil (this->compression_manager_))
-    {
-      this->resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-  return CORBA::Object::_duplicate (this->compression_manager_);
-}
-
 ACE_INLINE const char *
 TAO_ORB_Core::server_id (void) const
 {
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
index 7d294acbccb..d069dd0aab0 100644
--- a/TAO/tao/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : valuetype, portableserver, install, tao_versioning_idl_defaults {
+project : valuetype, portableserver, core, tao_versioning_idl_defaults {
   sharedname   = TAO_ObjRefTemplate
   dynamicflags = TAO_ORT_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : valuetype, portableserver, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -SS -Sorb -GX \
+    idlflags += -Gp -Gd -Ge 1 -SS -Sorb -GX \
                 -Wb,export_macro=TAO_ORT_Export \
                 -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
                 -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE \
@@ -39,7 +39,7 @@ project : valuetype, portableserver, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -SS -Sorb -GX -Sci \
+    idlflags += -Ge 1 -SS -Sorb -GX -Sci \
                 -Wb,export_macro=TAO_ORT_Export \
                 -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
                 -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \
@@ -48,7 +48,7 @@ project : valuetype, portableserver, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -SS -GA -Sorb  \
+    idlflags += -Gp -Gd -Ge 1 -SS -GA -Sorb  \
                 -Wb,export_macro=TAO_ORT_Export \
                 -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
                 -o ObjRefTemplate
diff --git a/TAO/tao/ObjRefTemplate/Default_ORT.pidl b/TAO/tao/ObjRefTemplate/Default_ORT.pidl
index f143c2353e6..31b9596fe9e 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORT.pidl
+++ b/TAO/tao/ObjRefTemplate/Default_ORT.pidl
@@ -10,7 +10,7 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -GA
+ *        -o orig -Ge 1 -GA
  *        -I../..
  *        -Wb,export_macro=TAO_ORT_Export \
  *        -Wb,export_include="ort_export.h" \
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 08d10c311ef..6aac19e67e9 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -162,19 +162,6 @@ CORBA::Object::marshal (const CORBA::Object_ptr x,
   return x->marshal (cdr);
 }
 
-bool
-CORBA::Object::can_convert_to_ior (void) const
-{
-  // By default, objects can not be stringified if they are local
-  return !this->_is_local ();
-}
-
-char*
-CORBA::Object::convert_to_ior (bool,
-                               const char*) const
-{
-  return 0;
-}
 
 TAO_Abstract_ServantBase*
 CORBA::Object::_servant (void) const
@@ -602,13 +589,6 @@ CORBA::Object::_set_policy_overrides (
                       CORBA::COMPLETED_MAYBE));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  // If the stub is collocated and we don't have a collocated server we need
-  // to reinitialize it to get it.
-  if (stub->is_collocated () && stub->collocated_servant () == 0)
-    {
-      obj->orb_core ()->reinitialize_object (stub);
-    }
-
   (void) safe_stub.release ();
 
   return obj;
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index d0a0f44d12d..b47ba1f64aa 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -356,15 +356,6 @@ namespace CORBA
 
     //@} End of TAO-specific methods..
 
-    /// Can this object be stringified?
-    virtual bool can_convert_to_ior (void) const;
-
-    /// A hook to allow users to provide custom object stringification.
-    /// @note This method is intended to be used by classes that
-    /// implement Smart Proxies and no others.
-    virtual char* convert_to_ior (bool use_omg_ior_format,
-                                  const char* ior_prefix) const;
-
   protected:
 
     /// Initializing a local object.
diff --git a/TAO/tao/ObjectIdList.pidl b/TAO/tao/ObjectIdList.pidl
index c0e793e799e..05309585742 100644
--- a/TAO/tao/ObjectIdList.pidl
+++ b/TAO/tao/ObjectIdList.pidl
@@ -14,7 +14,7 @@
  *   command used for this is:
  *
  *     tao_idl.exe
- *        -o orig -Sa -GA -Sci
+ *        -o orig -Sa -Ge 1 -GA -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp
index 38a851353de..e3e52089e4a 100644
--- a/TAO/tao/ObjectKey_Table.cpp
+++ b/TAO/tao/ObjectKey_Table.cpp
@@ -11,26 +11,32 @@ ACE_RCSID(tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-bool
+int
 TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs,
                                        const TAO::ObjectKey &rhs) const
 {
-  const CORBA::ULong rlen = rhs.length ();
-  const CORBA::ULong llen = lhs.length ();
-  if (llen < rlen)
+  if (lhs.length () < rhs.length ())
     {
       return 1;
     }
-  else if (llen > rlen)
+  else if (lhs.length () > rhs.length ())
     {
       return 0;
     }
 
-  const CORBA::Octet * rhs_buff = rhs.get_buffer ();
-  const CORBA::Octet * lhs_buff = lhs.get_buffer ();
-  const bool result = (ACE_OS::memcmp (lhs_buff, rhs_buff, rlen) < 0);
+  for (CORBA::ULong i = 0; i < rhs.length (); ++i)
+    {
+      if (lhs[i] < rhs[i])
+        {
+          return 1;
+        }
+      else if (lhs[i] > rhs[i])
+        {
+          return 0;
+        }
+    }
 
-  return result;
+  return 0;
 }
 
 /********************************************************/
@@ -86,7 +92,7 @@ TAO::ObjectKey_Table::bind (const TAO::ObjectKey &key,
                              key_new);
       }
 
-    (void) key_new->incr_refcount ();
+    key_new->incr_refcount ();
   }
 
   return retval;
diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h
index 86a84a450ca..9deb1fbbd88 100644
--- a/TAO/tao/ObjectKey_Table.h
+++ b/TAO/tao/ObjectKey_Table.h
@@ -50,7 +50,7 @@ namespace TAO
   class TAO_Export Less_Than_ObjectKey
   {
   public:
-    bool operator () (const TAO::ObjectKey &lhs,
+    int operator () (const TAO::ObjectKey &lhs,
                      const TAO::ObjectKey &rhs) const;
   };
 
diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl
index 0654d873600..ef451a7c595 100644
--- a/TAO/tao/Object_Key.pidl
+++ b/TAO/tao/Object_Key.pidl
@@ -6,7 +6,7 @@
 //   The command used to generate code is:
 //
 //     tao_idl
-//        -o orig -St -Gp -Gd -Sci
+//        -o orig -Ge 1 -St -Gp -Gd -Sci
 //          -Wb,export_macro=TAO_Export
 //          -Wb,export_macro="tao/TAO_Export"
 //          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl
index 1cf3a9b6ebd..19ad732f38c 100644
--- a/TAO/tao/OctetSeq.pidl
+++ b/TAO/tao/OctetSeq.pidl
@@ -9,7 +9,7 @@
  *
  *     tao_idl
  *          -oA AnyTypeCode
- *          -GA -SS -Sci -Sorb
+ *          -Ge 1 -GA -SS -Sci -Sorb
  *          -Wb,pre_include=ace/pre.h
  *          -Wb,post_include=ace/post.h
  *          -Wb,export_macro=TAO_Export
@@ -17,6 +17,9 @@
  *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
  *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
  *          OctetSeq.pidl
+ *
+ *   Patches for changes to the generated code are available in the
+ *   `diffs' directory.
  */
 
 
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
new file mode 100644
index 00000000000..93c712762cb
--- /dev/null
+++ b/TAO/tao/OctetSeqC.cpp
@@ -0,0 +1,124 @@
+// -*- 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:288
+
+
+#include "tao/OctetSeqC.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:70
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/sequence_cs.cpp:65
+
+#if !defined (_CORBA_OCTETSEQ_CS_)
+#define _CORBA_OCTETSEQ_CS_
+
+CORBA::OctetSeq::OctetSeq (void)
+{}
+
+CORBA::OctetSeq::OctetSeq (
+    CORBA::ULong max
+  )
+  : TAO::unbounded_value_sequence<
+        CORBA::Octet
+      >
+    (max)
+{}
+
+CORBA::OctetSeq::OctetSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet * buffer,
+    CORBA::Boolean release
+  )
+  : TAO::unbounded_value_sequence<
+        CORBA::Octet
+      >
+    (max, length, buffer, release)
+{}
+
+CORBA::OctetSeq::OctetSeq (
+    const OctetSeq &seq
+  )
+  : TAO::unbounded_value_sequence<
+        CORBA::Octet
+      >
+    (seq)
+{}
+
+CORBA::OctetSeq::~OctetSeq (void)
+{}
+
+void CORBA::OctetSeq::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  OctetSeq * _tao_tmp_pointer =
+    static_cast<OctetSeq *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
+
+#if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_
+#define _TAO_CDR_OP_CORBA_OctetSeq_CPP_
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::OctetSeq &_tao_sequence
+  )
+{
+  return TAO::marshal_sequence(strm, _tao_sequence);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::OctetSeq &_tao_sequence
+  )
+{
+  return TAO::demarshal_sequence(strm, _tao_sequence);
+}
+
+#endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
new file mode 100644
index 00000000000..ab093f703bd
--- /dev/null
+++ b/TAO/tao/OctetSeqC.h
@@ -0,0 +1,175 @@
+// -*- 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:154
+
+#ifndef _TAO_IDL_OCTETSEQC_H_
+#define _TAO_IDL_OCTETSEQC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "tao/TAO_Export.h"
+#include "tao/Environment.h"
+#include "tao/Sequence_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:49
+
+namespace CORBA
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_sequence/sequence_ch.cpp:101
+
+#if !defined (_CORBA_OCTETSEQ_CH_)
+#define _CORBA_OCTETSEQ_CH_
+
+  class OctetSeq;
+
+  typedef
+    TAO_FixedSeq_Var_T<
+        OctetSeq
+      >
+    OctetSeq_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        OctetSeq
+      >
+    OctetSeq_out;
+
+  class TAO_Export OctetSeq
+    : public
+        TAO::unbounded_value_sequence<
+            CORBA::Octet
+          >
+  {
+  public:
+    OctetSeq (void);
+    OctetSeq (CORBA::ULong max);
+    OctetSeq (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::Octet* buffer,
+        CORBA::Boolean release = false
+      );
+    OctetSeq (const OctetSeq &);
+    ~OctetSeq (void);
+
+    static void _tao_any_destructor (void *);
+
+    typedef OctetSeq_var _var_type;
+    typedef OctetSeq_out _out_type;
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+    OctetSeq (
+        CORBA::ULong length,
+        const ACE_Message_Block* mb
+      )
+      : TAO::unbounded_value_sequence<CORBA::Octet> (length, mb) {}
+#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
+  };
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:78
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+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 PortableServer,
+// but we put the instantiation here because the application will
+// need to see it in *C.h to avoid the error.
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+  template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
+
+#if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_
+#define _TAO_CDR_OP_CORBA_OctetSeq_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::OctetSeq &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::OctetSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1062
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/OctetSeqS.h b/TAO/tao/OctetSeqS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/OctetSeqS.h
@@ -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
+
+// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PI.mpc b/TAO/tao/PI.mpc
index 18e633b83cb..9e5c3c38459 100644
--- a/TAO/tao/PI.mpc
+++ b/TAO/tao/PI.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, codecfactory, install, tao_versioning_idl_defaults {
+project : taolib, codecfactory, core, tao_versioning_idl_defaults {
   sharedname   = TAO_PI
   dynamicflags = TAO_PI_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : taolib, codecfactory, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \
+    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX \
                 -Wb,export_macro=TAO_PI_Export \
                 -Wb,export_include=tao/PI/pi_export.h \
                 -o PI
@@ -37,7 +37,7 @@ project : taolib, codecfactory, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
+    idlflags += -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_PI_Export \
                 -Wb,export_include=tao/PI/pi_export.h \
                 -o PI
@@ -53,7 +53,7 @@ project : taolib, codecfactory, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sal \
+    idlflags += -Sci -SS -GA -Gp -Gd -Ge 1 -Sal \
                 -Wb,export_macro=TAO_PI_Export \
                 -Wb,export_include=tao/PI/pi_export.h \
                 -o PI
diff --git a/TAO/tao/PI/ClientRequestInfo.pidl b/TAO/tao/PI/ClientRequestInfo.pidl
index 5a0a2dd8e52..f649b1d130b 100644
--- a/TAO/tao/PI/ClientRequestInfo.pidl
+++ b/TAO/tao/PI/ClientRequestInfo.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI/ClientRequestInterceptor.pidl b/TAO/tao/PI/ClientRequestInterceptor.pidl
index e1ecefc69e0..e45311359d9 100644
--- a/TAO/tao/PI/ClientRequestInterceptor.pidl
+++ b/TAO/tao/PI/ClientRequestInterceptor.pidl
@@ -17,7 +17,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/PI_Client/pi_client_export.h.h"
  *          -Wb,export_macro=TAO_PI_CLIENT_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 1d1dd7429b2..741d185e2b9 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -29,7 +29,7 @@ namespace TAO
     // This method implements one of the "starting" client side
     // interception point.
 
-    bool const is_remote_request = invocation.is_remote_request();
+    bool is_remote_request = invocation.is_remote_request();
 
     ACE_TRY
       {
@@ -72,7 +72,7 @@ namespace TAO
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
 
-    bool const is_remote_request = invocation.is_remote_request();
+    bool is_remote_request = invocation.is_remote_request();
 
     // Notice that the interceptors are processed in the opposite order
     // they were pushed onto the stack since this is an "ending"
@@ -81,7 +81,7 @@ namespace TAO
     TAO_ClientRequestInfo ri (&invocation);
 
     // Unwind the stack.
-    size_t const len = invocation.stack_size ();
+    const size_t len = invocation.stack_size ();
     for (size_t i = 0; i < len; ++i)
       {
         // Pop the interceptor off of the flow stack before it is
@@ -117,7 +117,7 @@ namespace TAO
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
 
-    bool const is_remote_request = invocation.is_remote_request();
+    bool is_remote_request = invocation.is_remote_request();
 
     // Notice that the interceptors are processed in the opposite order
     // they were pushed onto the stack since this is an "ending"
@@ -127,7 +127,7 @@ namespace TAO
         TAO_ClientRequestInfo ri (&invocation);
 
         // Unwind the flow stack.
-        size_t const len = invocation.stack_size ();
+        const size_t len = invocation.stack_size ();
         for (size_t i = 0; i < len; ++i)
           {
             // Pop the interceptor off of the flow stack before it is
@@ -196,7 +196,7 @@ namespace TAO
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
 
-    bool const is_remote_request = invocation.is_remote_request();
+    bool is_remote_request = invocation.is_remote_request();
 
     // Notice that the interceptors are processed in the opposite order
     // they were pushed onto the stack since this is an "ending"
@@ -207,7 +207,7 @@ namespace TAO
         TAO_ClientRequestInfo ri (&invocation);
 
         // Unwind the stack.
-        size_t const len = invocation.stack_size ();
+        const size_t len = invocation.stack_size ();
         for (size_t i = 0; i < len; ++i)
         {
           // Pop the interceptor off of the flow stack before it is
@@ -237,35 +237,8 @@ namespace TAO
                                        ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
-    ACE_CATCHANY
-      {
-        // The receive_exception() interception point in the remaining
-        // interceptors must be called so call this method (not the
-        // interceptor's corresponding method) recursively.  The call is
-        // made recursively since the caught exception must survive
-        // until the remaining interceptors have been called.
-
-        // Note that the recursion will stop once the flow stack size
-        // drops to zero, i.e., once each interceptor has been invoked.
-        // This prevents infinite recursion from occuring.
-
-        invocation.exception (&ACE_ANY_EXCEPTION);
-
-        this->receive_exception (invocation ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        PortableInterceptor::ReplyStatus status =
-          this->reply_status (invocation);
-
-        // Only re-throw the exception if it hasn't been transformed by
-        // the receive_exception() interception point (e.g. to a
-        // LOCATION_FORWARD).
-        if (status == PortableInterceptor::SYSTEM_EXCEPTION
-            || status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
-      }
     ACE_ENDTRY;
-    ACE_CHECK;                                      
+    ACE_CHECK;
   }
 
   void
diff --git a/TAO/tao/PI/Interceptor.pidl b/TAO/tao/PI/Interceptor.pidl
index 2f794c52bed..ed9ec855a56 100644
--- a/TAO/tao/PI/Interceptor.pidl
+++ b/TAO/tao/PI/Interceptor.pidl
@@ -12,7 +12,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index fe216233ca9..657f69213ad 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -49,7 +49,7 @@ namespace TAO
   {
     if (!CORBA::is_nil (interceptor))
       {
-        size_t const old_len = this->interceptors_.size ();
+        const size_t old_len = this->interceptors_.size ();
 
         // Don't bother checking the name for duplicates if no
         // interceptors have been registered.  This saves an
@@ -94,7 +94,7 @@ namespace TAO
           }
 
         /// Increase the length of the Interceptor sequence by one.
-        size_t const new_len = old_len + 1;
+        const size_t new_len = old_len + 1;
         this->interceptors_.size (new_len);
 
         // Add the interceptor
@@ -124,7 +124,7 @@ namespace TAO
   {
     if (!CORBA::is_nil (interceptor))
       {
-        size_t const old_len = this->interceptors_.size ();
+        const size_t old_len = this->interceptors_.size ();
 
         // Don't bother checking the name for duplicates if no
         // interceptors have been registered.  This saves an
@@ -203,7 +203,7 @@ namespace TAO
   Interceptor_List<InterceptorType,DetailsType>::destroy_interceptors (
     ACE_ENV_SINGLE_ARG_DECL)
   {
-    size_t const len = this->interceptors_.size ();
+    const size_t len = this->interceptors_.size ();
     size_t ilen = len;
 
     ACE_TRY
diff --git a/TAO/tao/PI/InvalidSlot.pidl b/TAO/tao/PI/InvalidSlot.pidl
index d0090a4fd82..bc5b26c72a9 100644
--- a/TAO/tao/PI/InvalidSlot.pidl
+++ b/TAO/tao/PI/InvalidSlot.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 7dbc9cb0bb4..23ec50a3dae 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -14,7 +14,7 @@
 #include "tao/PI/PICurrent.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-ACE_RCSID (PI,
+ACE_RCSID (TAO,
            ORBInitInfo,
            "$Id$")
 
diff --git a/TAO/tao/PI/ORBInitInfo.pidl b/TAO/tao/PI/ORBInitInfo.pidl
index b53e6dbfe4c..780d6783da7 100644
--- a/TAO/tao/PI/ORBInitInfo.pidl
+++ b/TAO/tao/PI/ORBInitInfo.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI/ORBInitializer.pidl b/TAO/tao/PI/ORBInitializer.pidl
index 765177ab437..f8f871449a6 100644
--- a/TAO/tao/PI/ORBInitializer.pidl
+++ b/TAO/tao/PI/ORBInitializer.pidl
@@ -12,7 +12,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/PI_Client/pi_client_export.h.h"
  *          -Wb,export_macro=TAO_PI_CLIENT_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index d49e331f594..1212598ae47 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -6,6 +6,7 @@ ACE_RCSID (tao,
            PICurrent,
            "$Id$")
 
+
 #if !defined (__ACE_INLINE__)
 # include "tao/PI/PICurrent.inl"
 #endif /* __ACE_INLINE__ */
@@ -21,8 +22,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core)
   : orb_core_ (orb_core),
-    tss_slot_ (0), // Call initialize() before use.
-    slot_count_ (0) // Call initialize() before use.
+    tss_slot_ (0),
+    slot_count_ (0)
 {
 }
 
@@ -39,7 +40,14 @@ TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier
   this->check_validity (identifier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->tsc ()->get_slot (identifier ACE_ENV_ARG_PARAMETER);
+  PICurrent_Impl *impl = this->tsc ();
+
+  if (impl == 0)
+    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                            CORBA::COMPLETED_NO),
+                      0);
+
+  return impl->get_slot (identifier ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -52,16 +60,14 @@ TAO::PICurrent::set_slot (PortableInterceptor::SlotId identifier,
   this->check_validity (identifier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->tsc ()->set_slot (identifier, data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
+  PICurrent_Impl *impl = this->tsc ();
 
-namespace
-{
-  extern "C" void CleanUpPICurrent(void *object, void *)
-  {
-    delete static_cast<TAO::PICurrent_Impl *> (object);
-  }
+  if (impl == 0)
+    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                     CORBA::COMPLETED_NO));
+
+  impl->set_slot (identifier, data ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 TAO::PICurrent_Impl *
@@ -71,20 +77,6 @@ TAO::PICurrent::tsc (void)
     static_cast<TAO::PICurrent_Impl *> (
       this->orb_core_.get_tss_resource (this->tss_slot_));
 
-  // If this TSS has not yet been set-up, give it it's own PICurrent_Impl.
-  if (0 == impl)
-  {
-    ACE_NEW_THROW_EX (impl,
-                      TAO::PICurrent_Impl,
-                      CORBA::NO_MEMORY (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO::VMCID,
-                          ENOMEM),
-                        CORBA::COMPLETED_NO));
-
-    this->orb_core_.set_tss_resource (this->tss_slot_, impl);
-  }
-
   return impl;
 }
 
@@ -92,13 +84,6 @@ void
 TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier
                                 ACE_ENV_ARG_DECL)
 {
-  // If the slot_count is zero, no initialization has been done (if there are
-  // no slots, then the PICurrent_impl object is not created as there is no
-  // data to copy).
-  if (0 == this->slot_count_)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                     CORBA::COMPLETED_NO));
-
   // No need to acquire a lock for this check.  At this point, these
   // attributes are read only.
   if (identifier >= this->slot_count_)
@@ -111,28 +96,29 @@ TAO::PICurrent::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::ORB::_duplicate (this->orb_core_.orb ());
 }
 
-void
+int
 TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
-                            ACE_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL_NOT_USED)
 {
-  // Only allow a single initialization; sc is the number of
-  // allocated PICurrent data slots the end user wants. If 0
-  // PICurrent is not used, as no data is to be stored.
-  if ((0 == this->slot_count_) && (0 != sc))
-  {
-    // NOTE: This function not only adds the cleanup function
-    // but ALSO allocates the TSS slot PICurrent is to use.
-    // It MUST be called BEFORE we attempt to get/set any
-    // PICurrent slot data.
-    if (0 != orb_core_.add_tss_cleanup_func (CleanUpPICurrent, this->tss_slot_))
-      ACE_THROW (CORBA::NO_MEMORY (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     ENOMEM),
-                   CORBA::COMPLETED_NO));
-
-    this->slot_count_ = sc;
-  }
+  this->slot_count_ = sc;
+
+  if (this->tsc () == 0 && tss_slot_ == 0)
+    {
+      TAO::PICurrent_Impl *impl = 0;
+      ACE_NEW_RETURN (impl,
+                      TAO::PICurrent_Impl,
+                      0);
+
+      const int result = this->orb_core_.add_tss_cleanup_func (0,
+                                                               tss_slot_);
+
+      if (result != 0)
+        return result;
+
+      this->orb_core_.set_tss_resource (tss_slot_, impl);
+    }
+
+  return 0;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 4cc3e99a218..6f50a5d93da 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -59,6 +59,7 @@ namespace TAO
       public virtual TAO_Local_RefCounted_Object
   {
   public:
+
     /// Constructor.
     PICurrent (TAO_ORB_Core &orb_core);
 
@@ -100,9 +101,10 @@ namespace TAO
                          ACE_ENV_ARG_DECL);
 
     /// Initialize the PICurrent object.
-    void initialize (PortableInterceptor::SlotId sc ACE_ENV_ARG_DECL);
+    int initialize (PortableInterceptor::SlotId sc ACE_ENV_ARG_DECL);
 
   protected:
+
     /// Destructor
     /**
      * Protected destructor to enforce the fact this class is reference
@@ -112,6 +114,7 @@ namespace TAO
     virtual ~PICurrent (void);
 
   private:
+
     /// Prevent copying through the copy constructor and the assignment
     /// operator.
     //@{
@@ -123,14 +126,12 @@ namespace TAO
     /// Reference to the orb core.
     TAO_ORB_Core &orb_core_;
 
-   	/// TSS slot assigned to PICurrent_Impl objects in the OrbCore.
-    /// Allocated by the orb_core_.add_tss_cleanup_func() when our
-    /// initialize() method is called.
+    /// TSS slot assigned to this object.
     size_t tss_slot_;
 
-    /// The number of allocated PICurrent slots end user wants. (0 is
-    /// uninitialized or PICurrent is not used as no data is to be stored).
+    /// The number of allocated slots.
     PortableInterceptor::SlotId slot_count_;
+
   };
 }
 
diff --git a/TAO/tao/PI/PICurrent.pidl b/TAO/tao/PI/PICurrent.pidl
index ada9eff63df..3cfc5cfb8cb 100644
--- a/TAO/tao/PI/PICurrent.pidl
+++ b/TAO/tao/PI/PICurrent.pidl
@@ -9,7 +9,7 @@
  * components in the ORB.
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI/PIForwardRequest.pidl b/TAO/tao/PI/PIForwardRequest.pidl
index a494521edcf..d30720eb633 100644
--- a/TAO/tao/PI/PIForwardRequest.pidl
+++ b/TAO/tao/PI/PIForwardRequest.pidl
@@ -12,7 +12,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI/PolicyFactory.pidl b/TAO/tao/PI/PolicyFactory.pidl
index 97df0401db2..761eea60052 100644
--- a/TAO/tao/PI/PolicyFactory.pidl
+++ b/TAO/tao/PI/PolicyFactory.pidl
@@ -8,7 +8,7 @@
  * @brief Pre-compiled IDL source for the PolicyFactory
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI/ProcessingModePolicy.pidl b/TAO/tao/PI/ProcessingModePolicy.pidl
index 3225558efb1..aa1f2d9b71e 100644
--- a/TAO/tao/PI/ProcessingModePolicy.pidl
+++ b/TAO/tao/PI/ProcessingModePolicy.pidl
@@ -7,7 +7,7 @@
  * the PortableInterceptor module.
  *
  * tao_idl \
- *     -o orig -Gp -Gd -GT -GA \
+ *     -o orig -Gp -Gd -Ge 1 -GT -GA \
  *          -Wb,export_include="tao/TAO_Export.h" \
  *          -Wb,export_macro=TAO_Export \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PI/RequestInfo.pidl b/TAO/tao/PI/RequestInfo.pidl
index 558b6654de4..b26d17b1ca5 100644
--- a/TAO/tao/PI/RequestInfo.pidl
+++ b/TAO/tao/PI/RequestInfo.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
index 438a6889987..556d23a7a4c 100644
--- a/TAO/tao/PI_Forward.pidl
+++ b/TAO/tao/PI_Forward.pidl
@@ -12,7 +12,7 @@
  * using the following command:
 	 *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Sci
+ *        -o orig -Gp -Gd -Ge 1 -Sci
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI_Server.mpc b/TAO/tao/PI_Server.mpc
index 1c3578cae67..b50e7c3b27d 100644
--- a/TAO/tao/PI_Server.mpc
+++ b/TAO/tao/PI_Server.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, pi, portableserver, install, tao_versioning_idl_defaults {
+project : taolib, pi, portableserver, core, tao_versioning_idl_defaults {
   sharedname   = TAO_PI_Server
   dynamicflags = TAO_PI_SERVER_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : taolib, pi, portableserver, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
+    idlflags += -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal \
                 -Wb,export_macro=TAO_PI_Server_Export \
                 -Wb,export_include=tao/PI_Server/pi_server_export.h \
                 -o PI_Server
@@ -37,7 +37,7 @@ project : taolib, pi, portableserver, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -SS -Sorb -GX -Sci \
+    idlflags += -Ge 1 -SS -Sorb -GX -Sci \
                 -Wb,export_macro=TAO_PI_Server_Export \
                 -Wb,export_include=tao/PI_Server/pi_server_export.h \
                 -Wb,unique_include=tao/PI_Server/ServerRequestInterceptorC.h \
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 301ea9d90b5..8534d3cbd23 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -57,7 +57,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
   // types since a single policy factory is used to create each of the
   // different types of PortableServer policies.
   static CORBA::PolicyType const type[] = {
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
     PortableServer::THREAD_POLICY_ID,
     PortableServer::IMPLICIT_ACTIVATION_POLICY_ID,
     PortableServer::SERVANT_RETENTION_POLICY_ID,
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
index eaa42cf7ff5..cf31c2d03f4 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -26,7 +26,8 @@ TAO_PortableServer_PolicyFactory::create_policy (
                    CORBA::PolicyError))
 {
 #if !defined (CORBA_E_MICRO)
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 
   if (type == ::PortableServer::THREAD_POLICY_ID)
     {
@@ -73,7 +74,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       return id_assignment_policy;
     }
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
 
   if (type == PortableServer::IMPLICIT_ACTIVATION_POLICY_ID)
     {
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.pidl b/TAO/tao/PI_Server/ServerRequestInfo.pidl
index 0f4228caa93..9679b29c2e8 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
index 4278a387a2e..40d2e9d53e2 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
@@ -12,7 +12,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *          -Wb,export_include="tao/PI_Server/pi_server_export.h"
  *          -Wb,export_macro=TAO_PI_Server_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/ParameterMode.pidl b/TAO/tao/ParameterMode.pidl
index f288ce58325..2fb02fa70f4 100644
--- a/TAO/tao/ParameterMode.pidl
+++ b/TAO/tao/ParameterMode.pidl
@@ -10,7 +10,7 @@
  *   used to generate code is:
  *
  *     tao_idl
- *        -o orig -GA -SS -Sci
+ *        -o orig -Ge 1 -GA -SS -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index d4f8a91a049..27d648fb17f 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -135,8 +135,8 @@ public:
   virtual int extract_next_message (ACE_Message_Block &incoming,
                                     TAO_Queued_Data *&qd) = 0;
 
-  /// Check whether the node @a qd needs consolidation from @a incoming
-  /// @return 0 on success, -1 on error
+  /// Check whether the node @a qd needs consolidation from @a incoming,
+  /// @r 0 on success, -1 on error
   virtual int consolidate_node (TAO_Queued_Data *qd,
                                 ACE_Message_Block &incoming) = 0;
 
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
index 43267ebc50b..62dfc3e50bc 100644
--- a/TAO/tao/Policy.pidl
+++ b/TAO/tao/Policy.pidl
@@ -17,7 +17,7 @@
  *   command used for this is:
  *
  *     tao_idl.exe
- *        -o orig -Gp -Gd -GA -Ssi
+ *        -o orig -Gp -Gd -Ge 1 -GA -Ssi
  *          -Wb,stub_export_macro=TAO_Export
  *          -Wb,stub_export_include="tao/TAO_Export.h"
  *          -Wb,skel_export_macro=TAO_PortableServer_Export
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index e51f5208e3d..d0530021af4 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -39,6 +39,10 @@
 #include "tao/AnyTypeCode_Adapter.h"
 #include "ace/Dynamic_Service.h"
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "tao/PolicyC.inl"
 #endif /* !defined INLINE */
diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl
index 3b8d09d39a9..ed07e168ce3 100644
--- a/TAO/tao/Policy_Forward.pidl
+++ b/TAO/tao/Policy_Forward.pidl
@@ -17,7 +17,7 @@
  *   command used for this is:
  *
  *     tao_idl.exe
- *        -o orig -GA -SS -Sci -Sorb
+ *        -o orig -Ge 1 -GA -SS -Sci -Sorb
  *          -Wb,export_macro="tao/TAO_Export"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index 5b0eda9ad12..0717181b929 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -272,8 +272,8 @@ CORBA::PolicyList *
 TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
                                       ACE_ENV_ARG_DECL)
 {
-  CORBA::ULong const slots = types.length ();
-  CORBA::PolicyList *policy_list_ptr = 0;
+  const CORBA::ULong slots = types.length ();
+  CORBA::PolicyList *policy_list_ptr;
 
   if (slots == 0)
     {
@@ -297,12 +297,12 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
 
   for (CORBA::ULong j = 0; j < slots; ++j)
     {
-      CORBA::ULong const slot = types[j];
-      CORBA::ULong const length = this->policy_list_.length ();
+      const CORBA::ULong slot = types[j];
+      const CORBA::ULong length = this->policy_list_.length ();
 
       for (CORBA::ULong i = 0; i < length; ++i)
         {
-          CORBA::ULong const current =
+          const CORBA::ULong current =
             this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 5dda30b0323..cec2a5046f1 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -22,7 +22,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
index 46f35f6cb0c..1ddb69bdbd3 100644
--- a/TAO/tao/PortableServer.mpc
+++ b/TAO/tao/PortableServer.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
+project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
   sharedname   = TAO_PortableServer
   dynamicflags = TAO_PORTABLESERVER_BUILD_DLL
 
@@ -25,7 +25,7 @@ project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GA \
+    idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 \
                 -Wb,export_macro=TAO_PortableServer_Export \
                 -Wb,export_include=tao/PortableServer/portableserver_export.h \
                 -o PortableServer
@@ -34,7 +34,7 @@ project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Sal \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal \
                 -Wb,export_macro=TAO_PortableServer_Export \
                 -Wb,export_include=tao/PortableServer/portableserver_export.h \
                 -o PortableServer
@@ -53,7 +53,7 @@ project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb \
                 -Wb,export_macro=TAO_PortableServer_Export \
                 -Wb,export_include=tao/PortableServer/portableserver_export.h \
                 -o PortableServer
@@ -65,7 +65,7 @@ project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Sorb -Sa -GX \
+    idlflags += -Ge 1 -Sci -SS -Sorb -Sa -GX \
                 -Wb,export_macro=TAO_PortableServer_Export \
                 -Wb,export_include=tao/PortableServer/portableserver_export.h \
                 -Wb,unique_include=tao/PortableServer/PortableServer.h \
@@ -74,7 +74,7 @@ project : taolib, install, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Sorb -Sa -GX \
+    idlflags += -Ge 1 -Sci -SS -Sorb -Sa -GX \
                 -Wb,export_macro=TAO_PortableServer_Export \
                 -Wb,export_include=tao/PortableServer/portableserver_export.h \
                 -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE \
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
index 18a29db0aab..f84c13217b8 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
@@ -71,8 +71,8 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 ACE_STATIC_SVC_DECLARE (TAO_Acceptor_Filter_Factory)
 ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Acceptor_Filter_Factory)
 
-#endif /* #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)*/
-
 #include /**/ "ace/post.h"
 
+#endif /* #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)*/
+
 #endif /* TAO_ACCEPTOR_FILTER_FACTORY_H */
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index a0996627247..b5822a2d438 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -322,32 +322,37 @@ TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
   delete this->user_id_map_;
 }
 
-bool
+int
 TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_id,
                                           CORBA::Short priority,
-                                          bool &priorities_match,
-                                          bool &deactivated)
+                                          int &priorities_match,
+                                          int &deactivated)
 {
   TAO_Active_Object_Map_Entry *entry = 0;
-  bool result = false;
-  int const find_result = this->user_id_map_->find (user_id,
-                                                    entry);
-  if (find_result == 0)
+  int result = this->user_id_map_->find (user_id,
+                                         entry);
+  if (result == 0)
     {
       if (entry->servant_ == 0)
         {
+          result = 0;
+
           if (entry->priority_ != priority)
-            priorities_match = false;
+            priorities_match = 0;
         }
       else
         {
-          result = true;
+          result = 1;
           if (entry->deactivated_)
             {
-              deactivated = true;
+              deactivated = 1;
             }
         }
     }
+  else
+    {
+      result = 0;
+    }
 
   return result;
 }
@@ -366,7 +371,7 @@ TAO_Id_Uniqueness_Strategy::set_active_object_map (TAO_Active_Object_Map *active
 
 int
 TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant,
-                                           bool &deactivated)
+                                           int &deactivated)
 {
   TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->active_object_map_->servant_map_->find (servant,
@@ -376,7 +381,7 @@ TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant,
       result = 1;
       if (entry->deactivated_)
         {
-          deactivated = true;
+          deactivated = 1;
         }
     }
   else
@@ -523,7 +528,7 @@ TAO_Unique_Id_Strategy::remaining_activations (PortableServer::Servant servant)
 
 int
 TAO_Multiple_Id_Strategy::is_servant_in_map (PortableServer::Servant,
-                                             bool &)
+                                             int &)
 {
   return -1;
 }
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index 7232685a272..83ebca8823c 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -58,14 +58,14 @@ public:
 
   /// Must be used with UNIQUE_ID policy.
   int is_servant_in_map (PortableServer::Servant servant,
-                         bool &deactivated);
+                         int &deactivated);
 
   /// Can be used with any policy.  With the SYSTEM_ID policy,
   /// user_id is actually system_id.
-  bool is_user_id_in_map (const PortableServer::ObjectId &user_id,
-                          CORBA::Short priority,
-                          bool &priorities_match,
-                          bool &deactivated);
+  int is_user_id_in_map (const PortableServer::ObjectId &user_id,
+                         CORBA::Short priority,
+                         int &priorities_match,
+                         int &deactivated);
 
   /// Must be used with SYSTEM_ID policy.
   int bind_using_system_id_returning_system_id (PortableServer::Servant servant,
@@ -250,7 +250,7 @@ public:
 
   /// Must be used with UNIQUE_ID policy.
   virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 bool &deactivated) = 0;
+                                 int &deactivated) = 0;
 
   /// Can be used with any policy.  With the SYSTEM_ID policy,
   /// <user_id> is actually <system_id>.
@@ -300,7 +300,7 @@ public:
 
   /// Must be used with UNIQUE_ID policy.
   virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 bool &deactivated);
+                                 int &deactivated);
 
   /// Can be used with any policy.  With the SYSTEM_ID policy,
   /// <user_id> is actually <system_id>.
@@ -342,7 +342,7 @@ public:
 
   /// Must be used with UNIQUE_ID policy.
   virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 bool &deactivated);
+                                 int &deactivated);
 
   /// Can be used with any policy.  With the SYSTEM_ID policy,
   /// <user_id> is actually <system_id>.
diff --git a/TAO/tao/PortableServer/Active_Object_Map.inl b/TAO/tao/PortableServer/Active_Object_Map.inl
index 4ccd3ff3281..31b3326b811 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.inl
+++ b/TAO/tao/PortableServer/Active_Object_Map.inl
@@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
 TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant,
-                                          bool &deactivated)
+                                          int &deactivated)
 {
   return this->id_uniqueness_strategy_->is_servant_in_map (servant,
                                                            deactivated);
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
index 8c622b4eaea..fc29e9faec0 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
@@ -13,7 +13,7 @@ TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void)
     system_id_ (),
     servant_ (0),
     reference_count_ (1),
-    deactivated_ (false),
+    deactivated_ (0),
     priority_ (-1)
 {
 }
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h
index 72fcc22dbc7..de0fb20c737 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategy.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h
@@ -41,7 +41,7 @@ namespace TAO
        */
       virtual bool is_servant_activation_allowed (
         PortableServer::Servant s,
-        bool &w) = 0;
+        int &w) = 0;
 
       virtual bool allow_multiple_activations (void) const = 0;
 
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index 8fb4db2d48b..d1071f1470c 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -29,7 +29,7 @@ namespace TAO
     bool
     IdUniquenessStrategyMultiple::is_servant_activation_allowed (
       PortableServer::Servant /*servant*/,
-      bool & /*wait_occurred_restart_call*/)
+      int & /*wait_occurred_restart_call*/)
     {
       // With the multiple id strategy we can always activate the servant
       // another time
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
index 92179068d95..f3c2e405447 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
@@ -39,7 +39,7 @@ namespace TAO
 
       virtual bool is_servant_activation_allowed (
         PortableServer::Servant servant,
-        bool &w);
+        int &w);
 
       virtual bool allow_multiple_activations (void) const;
 
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
index 061cb611907..3c5516d4956 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -37,11 +37,11 @@ namespace TAO
     bool
     IdUniquenessStrategyUnique::is_servant_activation_allowed (
       PortableServer::Servant servant,
-      bool &wait_occurred_restart_call)
+      int &wait_occurred_restart_call)
     {
       // If the specified servant is already in the Active Object Map, the
       // ServantAlreadyActive exception is raised.
-      int const result =
+      int result =
         this->poa_->is_servant_active (servant,
                                        wait_occurred_restart_call);
 
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
index 8bcdbe180f7..58bbf096de5 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
@@ -42,7 +42,7 @@ namespace TAO
 
       virtual bool is_servant_activation_allowed (
         PortableServer::Servant servant,
-        bool &wait_occurred_restart_call);
+        int &wait_occurred_restart_call);
 
       virtual bool allow_multiple_activations (void) const;
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
index edea2d2d328..551d6f45bdf 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -6,7 +6,6 @@ ACE_RCSID (PortableServer,
            ImplicitActivationStrategyImplicit,
            "$Id$")
 
-#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -37,4 +36,4 @@ ACE_STATIC_SVC_DEFINE (
   ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
   0)
 
-#endif
+
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
index a1fcea6da7e..92f9feab992 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
@@ -23,8 +23,6 @@
 #include "tao/PortableServer/ImplicitActivationStrategy.h"
 #include "ace/Service_Config.h"
 
-#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -45,7 +43,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit)
 ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit)
 
-#endif
 
 #include /**/ "ace/post.h"
 #endif /* TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H */
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index eba1da2172c..b67c2cd1482 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -309,7 +309,7 @@ TAO_Object_Adapter::~TAO_Object_Adapter (void)
   delete this->servant_dispatcher_;
 
   // This cleanup may have already occurred in the close() method.  If
-  // that is the case then this won't cause any harm since root_ and
+  // that is the case then this won't cause any harm since root_ and 
   // poa_manager_factory_ would have been set to zero.  But, if close
   // wasn't called, then these would be leaked.  It may be better if
   // these pointers had a corresponding _var version so that this cleanup
@@ -648,18 +648,17 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 #else
-  PortableServer::POAManager_ptr poa_manager_ptr;
+  PortableServer::POAManager_var poa_manager;
   ::CORBA::PolicyList policy_list;
-  ACE_NEW_THROW_EX (poa_manager_ptr,
+  ACE_NEW_THROW_EX (poa_manager,
                     TAO_POA_Manager (*this, TAO_DEFAULT_ROOTPOAMANAGER_NAME),
                     CORBA::NO_MEMORY
                     (CORBA::SystemException::_tao_minor_code (0, ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
 
-  PortableServer::POAManager_var poa_manager = poa_manager_ptr;
-  // Keep reference of POAManager in TAO_Object_Adapter so the POAManager
-  // object is destructed after RootPOA is destructed.
+  // Keep reference of POAManager in TAO_Object_Adapter so the POAManager 
+  // object is detructed after RootPOA is destructed.
   the_poa_manager_ = poa_manager;
 
 #endif
diff --git a/TAO/tao/PortableServer/POA.pidl b/TAO/tao/PortableServer/POA.pidl
index be91adb3935..c9cebdd32b1 100644
--- a/TAO/tao/PortableServer/POA.pidl
+++ b/TAO/tao/PortableServer/POA.pidl
@@ -9,7 +9,7 @@
  * PortableServerC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Sci -Gp -Gd -GA -I$(TAO_ROOT)
+ *     -o orig -Sci -Gp -Gd -Ge 1 -GA -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/POAManagerFactory.pidl b/TAO/tao/PortableServer/POAManagerFactory.pidl
index 1a47c584714..502b8727168 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.pidl
+++ b/TAO/tao/PortableServer/POAManagerFactory.pidl
@@ -6,7 +6,7 @@
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
   $ACE_ROOT/bin/tao_idl \
-  -Gp -Gd -Sci -I$TAO_ROOT \
+  -Gp -Gd -Ge 1 -Sci -I$TAO_ROOT \
   -Wb,export_macro=TAO_PortableServer_Export \
   -Wb,export_include="tao/PortableServer/portableserver_export.h" \
   -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl
index 4c61a6ac1d9..408fd7360ad 100644
--- a/TAO/tao/PortableServer/PS_Forward.pidl
+++ b/TAO/tao/PortableServer/PS_Forward.pidl
@@ -9,7 +9,7 @@
  * PS_ForwardC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
+ *     -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
index a459b31b8bd..e3edaf32b58 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -76,15 +76,15 @@ TAO_POA_Initializer::init (void)
       ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl
     );
 
+#if !defined (CORBA_E_MICRO)
   ACE_Service_Config::process_directive (
       ace_svc_desc_ImplicitActivationStrategyExplicit
     );
+#endif /* CORBA_E_MICRO */
 
-#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
   ACE_Service_Config::process_directive (
       ace_svc_desc_ImplicitActivationStrategyImplicit
     );
-#endif /* CORBA_E_MICRO */
 
   // Strategy factories
 
@@ -92,7 +92,7 @@ TAO_POA_Initializer::init (void)
       ace_svc_desc_ThreadStrategyFactoryImpl
     );
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
   ACE_Service_Config::process_directive (
       ace_svc_desc_ThreadStrategySingleFactoryImpl
     );
@@ -154,7 +154,7 @@ TAO_POA_Initializer::init (void)
       ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl
     );
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO)
   ACE_Service_Config::process_directive (
       ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl
     );
@@ -166,7 +166,7 @@ TAO_POA_Initializer::init (void)
       ace_svc_desc_ThreadStrategyORBControl
     );
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO)
   ACE_Service_Config::process_directive (
       ace_svc_desc_ThreadStrategySingle
     );
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 4d90a9b3273..14a8e4afdfc 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -9,7 +9,7 @@
  * PortableServerC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Sci -Gp -Gd -GA -I$(TAO_ROOT)
+ *     -o orig -Sci -Gp -Gd -Ge 1 -GA -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index b24192c3439..7b55a084199 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -1,4 +1,5 @@
-#include "tao/orbconf.h"
+#include "tao/PortableServer/RequestProcessingPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingPolicy,
@@ -6,9 +7,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-#include "tao/PortableServer/RequestProcessingPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
index 9edff2ec46e..a7d47f4747c 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
@@ -6,7 +6,7 @@
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
+ *     -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
index 19ae155a117..8c767103d0b 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h
@@ -96,7 +96,7 @@ namespace TAO
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-        bool &wait_occurred_restart_call
+        int &wait_occurred_restart_call
         ACE_ENV_ARG_DECL) = 0;
 
       virtual void cleanup_servant (
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 718132bda26..877f8033219 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -80,7 +80,7 @@ namespace TAO
       const PortableServer::ObjectId &system_id,
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      bool & /*wait_occurred_restart_call*/
+      int & /*wait_occurred_restart_call*/
       ACE_ENV_ARG_DECL)
     {
       PortableServer::Servant servant = 0;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
index 6e16c94e876..b8b1b493ad4 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -78,7 +78,7 @@ namespace TAO
                       const PortableServer::ObjectId &system_id,
                       TAO::Portable_Server::Servant_Upcall &servant_upcall,
                       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-                      bool &wait_occurred_restart_call
+                      int &wait_occurred_restart_call
                       ACE_ENV_ARG_DECL);
 
       virtual PortableServer::Servant system_id_to_servant (
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index 208b7770b31..63e873629e9 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -1,13 +1,5 @@
 // -*- C++ -*-
 
-#include "tao/orbconf.h"
-
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-
 #include "tao/ORB_Constants.h"
 #include "tao/TSS_Resources.h"
 #include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
@@ -17,6 +9,12 @@ ACE_RCSID (PortableServer,
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/POA_Current_Impl.h"
 
+ACE_RCSID (PortableServer,
+           Request_Processing,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -130,7 +128,7 @@ namespace TAO
       const PortableServer::ObjectId & system_id,
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      bool & /*wait_occurred_restart_call*/
+      int & /*wait_occurred_restart_call*/
       ACE_ENV_ARG_DECL)
     {
       PortableServer::Servant servant = 0;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
index dea5baa5697..6752b0dfe36 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -74,7 +74,7 @@ namespace TAO
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-        bool &wait_occurred_restart_call
+        int &wait_occurred_restart_call
         ACE_ENV_ARG_DECL);
 
       virtual PortableServer::Servant system_id_to_servant (
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
index 027240a7c2a..9ad0493cb75 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -1,6 +1,10 @@
 // $Id$
 
-#include "tao/orbconf.h"
+#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
+#include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingStrategyDefaultServantFI,
@@ -8,12 +12,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h"
-#include "tao/PortableServer/RequestProcessingStrategy.h"
-#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index ab9874f5e5d..2010b5e9076 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -1,12 +1,4 @@
 // $Id$
-#include "tao/orbconf.h"
-
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/ServantActivatorC.h"
 #include "tao/PortableServer/RequestProcessingStrategyServantActivator.h"
@@ -16,6 +8,12 @@ ACE_RCSID (PortableServer,
 #include "tao/PortableServer/POA_Current_Impl.h"
 #include "tao/PortableServer/Servant_Upcall.h"
 
+ACE_RCSID (PortableServer,
+           Request_Processing,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -110,7 +108,7 @@ namespace TAO
       const PortableServer::ObjectId &system_id,
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      bool &wait_occurred_restart_call
+      int &wait_occurred_restart_call
       ACE_ENV_ARG_DECL)
     {
       PortableServer::Servant servant = 0;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
index 559cc8ce071..19e1337576b 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
@@ -59,7 +59,7 @@ namespace TAO
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-        bool &wait_occurred_restart_call
+        int &wait_occurred_restart_call
         ACE_ENV_ARG_DECL);
 
       virtual void cleanup_servant (
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
index 7f57f08204f..69ae2437301 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -1,6 +1,10 @@
 // $Id$
 
-#include "tao/orbconf.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h"
+#include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingStrategyServantActivatorFactoryImpl,
@@ -8,12 +12,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h"
-#include "tao/PortableServer/RequestProcessingStrategy.h"
-#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index aebefaa0118..481521ad6fb 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -1,11 +1,3 @@
-#include "tao/orbconf.h"
-
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/PortableServer/RequestProcessingStrategyServantLocator.h"
@@ -15,6 +7,12 @@ ACE_RCSID (PortableServer,
 #include "tao/PortableServer/Non_Servant_Upcall.h"
 #include "tao/PortableServer/Servant_Base.h"
 
+ACE_RCSID (PortableServer,
+           Request_Processing,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -105,7 +103,7 @@ namespace TAO
       const PortableServer::ObjectId &system_id,
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      bool &/*wait_occurred_restart_call*/
+      int &/*wait_occurred_restart_call*/
       ACE_ENV_ARG_DECL)
     {
       PortableServer::Servant servant = 0;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
index 255c5448cfd..79cac166c68 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
@@ -65,7 +65,7 @@ namespace TAO
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-        bool &wait_occurred_restart_call
+        int &wait_occurred_restart_call
         ACE_ENV_ARG_DECL);
 
       virtual void cleanup_servant (
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index 9e5c094dd4f..fe3d489977d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -1,6 +1,10 @@
 // $Id$
 
-#include "tao/orbconf.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h"
+#include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingStrategyServantLocatorFactoryImpl,
@@ -8,12 +12,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h"
-#include "tao/PortableServer/RequestProcessingStrategy.h"
-#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index 580cbb8fdc1..60cd7eb033f 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -1,6 +1,9 @@
 // -*- C++ -*-
 
-#include "tao/orbconf.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
+#include "tao/PortableServer/ServantManagerC.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/ORB_Constants.h"
 
 ACE_RCSID (PortableServer,
            Request_Processing,
@@ -8,11 +11,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
-#include "tao/PortableServer/ServantManagerC.h"
-#include "tao/PortableServer/Root_POA.h"
-#include "tao/ORB_Constants.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 2eebbc9fa21..458c909ee3d 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -250,7 +250,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
     filter_factory_ (0),
-#endif
+#endif 
 
     caller_key_to_object_ (0),
     servant_for_key_to_object_ (0)
@@ -430,7 +430,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
 
   if (CORBA::is_nil (poa_manager))
     {
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) 
 
       PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
       PortableServer::POA_var root_poa;
@@ -457,12 +457,10 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
                                                       empty_policies
                                                       ACE_ENV_ARG_PARAMETER);
 #else
-
-      PortableServer::POAManager_ptr the_poa_manager_ptr;
-      ACE_NEW_THROW_EX (the_poa_manager_ptr,
+  
+      ACE_NEW_THROW_EX (the_poa_manager,
                         TAO_POA_Manager (this->object_adapter (), 0),
                         CORBA::NO_MEMORY ());
-      the_poa_manager = the_poa_manager_ptr;
 #endif /* TAO_HAS_MINIMUM_POA == 0 && ! CORBA_E_COMPACT) */
 
       ACE_CHECK_RETURN (PortableServer::POA::_nil ());
@@ -1224,7 +1222,7 @@ TAO_Root_POA::adapter_state_changed (
 PortableServer::ObjectId *
 TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
                                  CORBA::Short priority,
-                                 bool &wait_occurred_restart_call
+                                 int &wait_occurred_restart_call
                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
@@ -1246,7 +1244,7 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant
 {
   while (1)
     {
-      bool wait_occurred_restart_call = false;
+      int wait_occurred_restart_call = 0;
 
       // Lock access for the duration of this transaction.
       TAO_POA_GUARD_RETURN (0);
@@ -1280,7 +1278,7 @@ TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id,
 {
   while (1)
     {
-      bool wait_occurred_restart_call = false;
+      int wait_occurred_restart_call = 0;
 
       // Lock access for the duration of this transaction.
       TAO_POA_GUARD;
@@ -1308,7 +1306,7 @@ void
 TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant servant,
                                          CORBA::Short priority,
-                                         bool &wait_occurred_restart_call
+                                         int &wait_occurred_restart_call
                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
@@ -1778,7 +1776,7 @@ TAO_Root_POA::locate_servant_i (const char *operation,
                                 const PortableServer::ObjectId &system_id,
                                 TAO::Portable_Server::Servant_Upcall &servant_upcall,
                                 TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-                                bool &wait_occurred_restart_call
+                                int &wait_occurred_restart_call
                                 ACE_ENV_ARG_DECL)
 {
   return this->active_policy_strategies_.request_processing_strategy()->
@@ -2311,7 +2309,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
     this->client_exposed_policies (priority
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Acceptor_Filter* filter = 0;
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -2739,7 +2737,7 @@ TAO_Root_POA::set_servant (PortableServer::Servant servant
 
 bool
 TAO_Root_POA::is_servant_activation_allowed (PortableServer::Servant servant,
-                                             bool &wait_occurred_restart_call)
+                                             int &wait_occurred_restart_call)
 {
   return this->active_policy_strategies_.id_uniqueness_strategy ()->
     is_servant_activation_allowed (servant, wait_occurred_restart_call);
@@ -2805,7 +2803,7 @@ TAO_Root_POA::server_priority (void) const
 int
 TAO_Root_POA::is_servant_active (
   PortableServer::Servant servant,
-  bool &wait_occurred_restart_call)
+  int &wait_occurred_restart_call)
 {
   return this->active_policy_strategies_.servant_retention_strategy ()->
     is_servant_in_map (servant, wait_occurred_restart_call);
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index 34128790c9b..d4166ebfc5c 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -471,7 +471,7 @@ public:
    */
   bool is_servant_activation_allowed (
     PortableServer::Servant servant,
-    bool &wait_occurred_restart_call);
+    int &wait_occurred_restart_call);
 
   int rebind_using_user_id_and_system_id (
     PortableServer::Servant servant,
@@ -488,7 +488,7 @@ public:
 
   int is_servant_active (
     PortableServer::Servant servant,
-    bool &wait_occurred_restart_call);
+    int &wait_occurred_restart_call);
 
   void deactivate_object_i (const PortableServer::ObjectId &oid
                             ACE_ENV_ARG_DECL)
@@ -547,7 +547,7 @@ public:
   PortableServer::ObjectId *activate_object_i (
       PortableServer::Servant p_servant,
       CORBA::Short priority,
-      bool &wait_occurred_restart_call
+      int &wait_occurred_restart_call
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -720,7 +720,7 @@ protected:
   void activate_object_with_id_i (const PortableServer::ObjectId &id,
                                   PortableServer::Servant p_servant,
                                   CORBA::Short priority,
-                                  bool &wait_occurred_restart_call
+                                  int &wait_occurred_restart_call
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
@@ -837,7 +837,7 @@ protected:
       const PortableServer::ObjectId &id,
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      bool &wait_occurred_restart_call
+      int &wait_occurred_restart_call
       ACE_ENV_ARG_DECL
     );
 
diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl
index a371c377ed0..daadaa4a612 100644
--- a/TAO/tao/PortableServer/ServantActivator.pidl
+++ b/TAO/tao/PortableServer/ServantActivator.pidl
@@ -9,7 +9,7 @@
  * ServantActivatorC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
+ *     -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl
index acdc7ad6894..19221cde6f8 100644
--- a/TAO/tao/PortableServer/ServantLocator.pidl
+++ b/TAO/tao/PortableServer/ServantLocator.pidl
@@ -9,7 +9,7 @@
  * ServantLocatorC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
+ *     -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/ServantManager.pidl b/TAO/tao/PortableServer/ServantManager.pidl
index 991328ac24d..52c3707f543 100644
--- a/TAO/tao/PortableServer/ServantManager.pidl
+++ b/TAO/tao/PortableServer/ServantManager.pidl
@@ -9,7 +9,7 @@
  * ServantManagerC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
+ *     -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
index 106e91dcd65..b4301aef697 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -1,5 +1,5 @@
-
-#include "tao/orbconf.h"
+#include "tao/PortableServer/ServantRetentionPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            ServantRetentionPolicy,
@@ -7,9 +7,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-#include "tao/PortableServer/ServantRetentionPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
index c6223d3a30e..79f6b54bd46 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
@@ -6,7 +6,7 @@
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
+ *     -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index 77377a53539..053fcb8961e 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -42,7 +42,7 @@ namespace TAO
       virtual CORBA::ULong waiting_servant_deactivation (void) const = 0;
 
       virtual int is_servant_in_map (PortableServer::Servant servant,
-                                     bool &wait_occurred_restart_call) = 0;
+                                     int &wait_occurred_restart_call) = 0;
 
       virtual TAO_SERVANT_LOCATION servant_present (
         const PortableServer::ObjectId &system_id,
@@ -63,7 +63,7 @@ namespace TAO
       virtual PortableServer::ObjectId *activate_object (
         PortableServer::Servant servant,
         CORBA::Short priority,
-        bool &wait_occurred_restart_call
+        int &wait_occurred_restart_call
         ACE_ENV_ARG_DECL)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantAlreadyActive,
@@ -74,7 +74,7 @@ namespace TAO
         const PortableServer::ObjectId &id,
         PortableServer::Servant servant,
         CORBA::Short priority,
-        bool &wait_occurred_restart_call
+        int &wait_occurred_restart_call
         ACE_ENV_ARG_DECL)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantAlreadyActive,
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
index 3b48b5ab1bf..a0a365fd003 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -149,7 +149,7 @@ namespace TAO
     int
     ServantRetentionStrategyNonRetain::is_servant_in_map (
       PortableServer::Servant /*servant*/,
-      bool &/*wait_occurred_restart_call*/)
+      int &/*wait_occurred_restart_call*/)
     {
       return 0;
     }
@@ -196,7 +196,7 @@ namespace TAO
     ServantRetentionStrategyNonRetain::activate_object (
       PortableServer::Servant /*servant*/,
       CORBA::Short /*priority*/,
-      bool &/*wait_occurred_restart_call*/
+      int &/*wait_occurred_restart_call*/
       ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
@@ -212,7 +212,7 @@ namespace TAO
       const PortableServer::ObjectId &/*id*/,
       PortableServer::Servant /*servant*/,
       CORBA::Short /*priority*/,
-      bool &/*wait_occurred_restart_call*/
+      int &/*wait_occurred_restart_call*/
       ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
@@ -345,4 +345,3 @@ namespace TAO
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
-
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
index 2b8780343dc..1b26e36fe54 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -46,7 +46,7 @@ namespace TAO
       PortableServer::ObjectId *
       activate_object (PortableServer::Servant servant,
                        CORBA::Short priority,
-                       bool &wait_occurred_restart_call
+                       int &wait_occurred_restart_call
                             ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
@@ -58,7 +58,7 @@ namespace TAO
       activate_object_with_id (const PortableServer::ObjectId &id,
                                PortableServer::Servant servant,
                                CORBA::Short priority,
-                               bool &wait_occurred_restart_call
+                               int &wait_occurred_restart_call
                                ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
@@ -74,7 +74,7 @@ namespace TAO
         ACE_ENV_ARG_DECL);
 
       virtual int is_servant_in_map (PortableServer::Servant servant,
-                                     bool &wait_occurred_restart_call);
+                                      int &wait_occurred_restart_call);
 
       virtual PortableServer::ObjectId *system_id_to_object_id (
         const PortableServer::ObjectId &system_id
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index 8da6d151764..bc3a3510554 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "tao/orbconf.h"
-
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategyNonRetainFactoryImpl,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-
 #include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h"
 #include "tao/PortableServer/ServantRetentionStrategy.h"
 #include "tao/PortableServer/ServantRetentionStrategyNonRetain.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (PortableServer,
+           ServantRetentionStrategyNonRetainFactoryImpl,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -71,4 +69,4 @@ ACE_FACTORY_NAMESPACE_DEFINE (
   ServantRetentionStrategyNonRetainFactoryImpl,
   TAO::Portable_Server::ServantRetentionStrategyNonRetainFactoryImpl)
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 && !CORBA_E_COMPACT && !CORBA_E_MICRO */
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
index 407d148d4b0..688e49cbeec 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
@@ -23,7 +23,7 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/ServantRetentionStrategyFactory.h"
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index fb660291d17..3543a783c74 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -105,7 +105,7 @@ namespace TAO
       ACE_ENV_ARG_DECL)
     {
       // Decrement the reference count.
-      CORBA::UShort const new_count = --active_object_map_entry->reference_count_;
+      CORBA::UShort new_count = --active_object_map_entry->reference_count_;
 
       // Inform the custom servant dispatching (CSD) strategy that the
       // servant is deactivated. This would be called just once when the
@@ -173,7 +173,7 @@ namespace TAO
       TAO_Active_Object_Map_Entry *entry = 0;
       PortableServer::Servant servant = 0;
 
-      int const result =
+      int result =
         active_object_map_->
           find_servant_using_system_id_and_user_id (system_id,
                                                     user_id.in(),
@@ -224,7 +224,7 @@ namespace TAO
       // associated with that object in the Active Object Map.
       PortableServer::Servant servant = 0;
 
-      int const result =
+      int result =
         this->active_object_map_->find_servant_using_user_id (id,
                                                               servant);
 
@@ -297,7 +297,7 @@ namespace TAO
         }
 
       TAO_Active_Object_Map_Entry *entry = 0;
-      int const result = this->active_object_map_->
+      int result = this->active_object_map_->
         find_servant_using_system_id_and_user_id (system_id,
                                                   user_id.in(),
                                                   servant,
@@ -340,7 +340,7 @@ namespace TAO
       // POA invokes the appropriate method on the servant.
       PortableServer::Servant servant = 0;
       TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
-      int const result = this->active_object_map_->
+      int result = this->active_object_map_->
         find_servant_using_system_id_and_user_id (system_id,
                                                   user_id,
                                                   servant,
@@ -381,7 +381,7 @@ namespace TAO
       // POA invokes the appropriate method on the servant.
       PortableServer::Servant servant = 0;
       TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
-      int const result = this->active_object_map_->
+      int result = this->active_object_map_->
         find_servant_using_system_id_and_user_id (system_id,
                                                   user_id,
                                                   servant,
@@ -399,12 +399,12 @@ namespace TAO
     int
     ServantRetentionStrategyRetain::is_servant_in_map (
       PortableServer::Servant servant,
-      bool &wait_occurred_restart_call)
+      int &wait_occurred_restart_call)
     {
-      bool deactivated = false;
+      int deactivated = 0;
       int servant_in_map =
         this->active_object_map_->is_servant_in_map (servant,
-                                                     deactivated);
+                                                      deactivated);
 
       if (!servant_in_map)
         {
@@ -422,7 +422,7 @@ namespace TAO
               // state may change by the time we get the lock again.
               // Therefore, indicate to the caller that all conditions
               // need to be checked again.
-              wait_occurred_restart_call = true;
+              wait_occurred_restart_call = 1;
 
               ++this->waiting_servant_deactivation_;
 
@@ -444,11 +444,11 @@ namespace TAO
     ServantRetentionStrategyRetain::is_user_id_in_map (
       const PortableServer::ObjectId &id,
       CORBA::Short priority,
-      bool &priorities_match,
-      bool &wait_occurred_restart_call)
+      int &priorities_match,
+      int &wait_occurred_restart_call)
     {
-      bool deactivated = false;
-      bool user_id_in_map =
+      int deactivated = 0;
+      int user_id_in_map =
         this->active_object_map_->is_user_id_in_map (id,
                                                       priority,
                                                       priorities_match,
@@ -779,7 +779,7 @@ namespace TAO
     ServantRetentionStrategyRetain::activate_object (
       PortableServer::Servant servant,
       CORBA::Short priority,
-      bool &wait_occurred_restart_call
+      int &wait_occurred_restart_call
       ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
@@ -851,7 +851,7 @@ namespace TAO
       const PortableServer::ObjectId &id,
       PortableServer::Servant servant,
       CORBA::Short priority,
-      bool &wait_occurred_restart_call
+      int &wait_occurred_restart_call
       ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
@@ -876,8 +876,8 @@ namespace TAO
       // If the CORBA object denoted by the Object Id value is already
       // active in this POA (there is a servant bound to it in the Active
       // Object Map), the ObjectAlreadyActive exception is raised.
-      bool priorities_match = true;
-      bool result =
+      int priorities_match = 1;
+      int result =
         this->is_user_id_in_map (id,
                                  priority,
                                  priorities_match,
@@ -910,7 +910,7 @@ namespace TAO
                                            CORBA::COMPLETED_NO));
         }
 
-      bool const may_activate =
+      bool may_activate =
         this->poa_->is_servant_activation_allowed (servant, wait_occurred_restart_call);
 
       if (!may_activate)
@@ -929,8 +929,8 @@ namespace TAO
       // association between the specified Object Id and the specified
       // servant in the Active Object Map.
       if (this->active_object_map_->bind_using_user_id (servant,
-                                                        id,
-                                                        priority) != 0)
+                                                         id,
+                                                         priority) != 0)
         {
           ACE_THROW (CORBA::OBJ_ADAPTER ());
         }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index a34d82c52b0..a82ba0aa20a 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -41,13 +41,13 @@ namespace TAO
       virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
 
       virtual int is_servant_in_map (PortableServer::Servant servant,
-                                     bool &wait_occurred_restart_call);
+                                     int &wait_occurred_restart_call);
 
       virtual
       PortableServer::ObjectId *
       activate_object (PortableServer::Servant servant,
                        CORBA::Short priority,
-                       bool &wait_occurred_restart_call
+                       int &wait_occurred_restart_call
                             ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
@@ -59,7 +59,7 @@ namespace TAO
       activate_object_with_id (const PortableServer::ObjectId &id,
                                PortableServer::Servant servant,
                                CORBA::Short priority,
-                               bool &wait_occurred_restart_call
+                               int &wait_occurred_restart_call
                                ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
@@ -153,8 +153,8 @@ namespace TAO
       int
       is_user_id_in_map (const PortableServer::ObjectId &id,
                          CORBA::Short priority,
-                         bool &priorities_match,
-                         bool &wait_occurred_restart_call);
+                         int &priorities_match,
+                         int &wait_occurred_restart_call);
 
       void
       deactivate_map_entry (TAO_Active_Object_Map_Entry *active_object_map_entry
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index 8cf4469939e..9e5ef598e2b 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -57,7 +57,7 @@ namespace TAO
     {
       while (1)
         {
-          bool wait_occurred_restart_call = false;
+          int wait_occurred_restart_call = 0;
 
           int result =
             this->prepare_for_upcall_i (key,
@@ -90,7 +90,7 @@ namespace TAO
       const TAO::ObjectKey &key,
       const char *operation,
       CORBA::Object_out forward_to,
-      bool &wait_occurred_restart_call
+      int &wait_occurred_restart_call
       ACE_ENV_ARG_DECL)
     {
       // Acquire the object adapter lock first.
diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h
index 94b91f4368f..427934e4faa 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Servant_Upcall.h
@@ -107,7 +107,7 @@ namespace TAO
       int prepare_for_upcall_i (const TAO::ObjectKey &key,
                                 const char *operation,
                                 CORBA::Object_out forward_to,
-                                bool &wait_occurred_restart_call
+                                int &wait_occurred_restart_call
                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       /// Run pre_invoke for a remote request.
diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp
index e5fca921aaa..e5fca921aaa 100644..100755
--- a/TAO/tao/PortableServer/Servant_var.cpp
+++ b/TAO/tao/PortableServer/Servant_var.cpp
diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h
index 5004ae93159..a734e1e018e 100644..100755
--- a/TAO/tao/PortableServer/Servant_var.h
+++ b/TAO/tao/PortableServer/Servant_var.h
@@ -133,8 +133,8 @@ namespace PortableServer
      * It is safe to pass in a null pointer, the pointer is simply
      * returned in that case.
      *
-     * @todo We might want to catch all (potential) exceptions in
-     *       _add_ref().
+     * @todo We might want to add a throw spec and catch all (potential)
+     *       exceptions in _add_ref()
      *
      * @todo It might be useful to add a _release() method that handles
      *       any potential exceptions...
diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl
index 66796f4499a..66796f4499a 100644..100755
--- a/TAO/tao/PortableServer/Servant_var.inl
+++ b/TAO/tao/PortableServer/Servant_var.inl
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index ce53b971ea4..747e4b42ef3 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -1,4 +1,5 @@
-#include "tao/orbconf.h"
+#include "tao/PortableServer/ThreadPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            ThreadPolicy,
@@ -6,9 +7,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-#include "tao/PortableServer/ThreadPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl
index cd25ed3cc30..253a7b8dcbb 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.pidl
+++ b/TAO/tao/PortableServer/ThreadPolicy.pidl
@@ -6,7 +6,7 @@
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
+ *     -o orig -Gp -Gd -Ge 1 -Sci -GA -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
index 65bbfc2e847..2a903d2876b 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "tao/orbconf.h"
+#include "tao/PortableServer/ThreadStrategySingle.h"
+#include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            ThreadStrategySingle,
            "$Id$")
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-
-#include "tao/PortableServer/ThreadStrategySingle.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
+#if (TAO_HAS_MINIMUM_POA == 0)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h
index 08489c7df75..0836472a09e 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.h
@@ -33,7 +33,7 @@
 #include "ace/Null_Mutex.h"
 
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index e5561d2bed8..b718ea02ef2 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "tao/orbconf.h"
-
-ACE_RCSID (PortableServer,
-           ThreadStrategyFactoryImpl,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-
 #include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h"
 #include "tao/PortableServer/ThreadStrategy.h"
 #include "tao/PortableServer/ThreadStrategySingle.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (PortableServer,
+           ThreadStrategyFactoryImpl,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
index 3dbcce78a99..e04f0995a42 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
@@ -23,7 +23,7 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/ThreadStrategyFactory.h"
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
index fadc64f5c72..cb8864f7859 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -73,9 +73,6 @@ template<typename S,
 CORBA::Boolean
 TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
-  if (0 == this->x_.ptr())
-    ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false); 
-
   return cdr << this->x_.in ();
 }
 
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 0a6026f543c..c8f6a31b4d5 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -39,7 +39,7 @@ namespace TAO
         this->profile_->_decr_refcnt ();
       }
 
-    if (this->transport_.get ())
+    if (this->transport_)
       {
         if (this->is_released_ == false)
           {
@@ -93,7 +93,7 @@ namespace TAO
                          ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    if (this->transport_.get () == 0)
+    if (this->transport_ == 0)
       {
         ACE_THROW (CORBA::INTERNAL ());
       }
@@ -187,20 +187,20 @@ namespace TAO
     ACE_ASSERT(con != 0);
     if (parallel)
       {
-        this->transport_.set (con->parallel_connect (this, desc, timeout
-                                                     ACE_ENV_ARG_PARAMETER));
+        this->transport_ = con->parallel_connect (this, desc, timeout
+                                                  ACE_ENV_ARG_PARAMETER);
       }
     else
       {
-        this->transport_.set (con->connect (this, desc, timeout
-                                            ACE_ENV_ARG_PARAMETER));
+        this->transport_ = con->connect (this, desc, timeout
+                                         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_.get () == 0 &&
+    if (this->transport_ == 0 &&
         has_con_timeout == false &&
         errno == ETIME)
       {
@@ -211,7 +211,7 @@ namespace TAO
                             CORBA::COMPLETED_NO),
                           false);
       }
-    else if (this->transport_.get () == 0)
+    else if (this->transport_ == 0)
       {
         return false;
       }
@@ -269,17 +269,13 @@ namespace TAO
     TAO::Transport_Cache_Manager & cache =
       this->profile_->orb_core()->lane_resources ().transport_cache();
 
-    // the cache increments the reference count on the transport if
-    // the find is successful. Cache.find_transport returns 0 on success.
-    // but we want to return a "boolean" of 0 for failure, 1 for success.
-    TAO_Transport* tmp = this->transport_.get ();
-    if (cache.find_transport(desc, tmp) != 0)
-      return 0;
-
-    this->transport_.set (tmp);
-    return 1;
+    // the cache increments the reference count on the transport if the
+    // find is successful. Find_transport uses negative logic in its return,
+    // 0 for success
+    return (cache.find_transport(desc,this->transport_) == 0);
   }
 
+
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 2816f63dc2c..34cef016395 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -24,7 +24,6 @@
 #include "ace/CORBA_macros.h"
 
 #include "tao/SystemException.h"
-#include "tao/Transport_Selection_Guard.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
@@ -179,10 +178,7 @@ namespace TAO
     TAO_Stub *stub_;
 
     /// The transport selected for this invocation.
-
-    /// Using the wrapper guard ensures it is available for use with
-    /// the Transport Current interfaces.
-    TAO::Transport_Selection_Guard transport_;
+    TAO_Transport *transport_;
 
     /// The profile that has been selected for this invocation.
     TAO_Profile *profile_;
diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl
index 07e89301fa5..3617d71e3da 100644
--- a/TAO/tao/Profile_Transport_Resolver.inl
+++ b/TAO/tao/Profile_Transport_Resolver.inl
@@ -43,7 +43,7 @@ namespace TAO
   ACE_INLINE TAO_Transport *
   Profile_Transport_Resolver::transport (void) const
   {
-    return this->transport_.get ();
+    return this->transport_;
   }
 
   ACE_INLINE bool
diff --git a/TAO/tao/QtResource.mpc b/TAO/tao/QtResource.mpc
index d593352ae2f..9a2f0c5eeb2 100644
--- a/TAO/tao/QtResource.mpc
+++ b/TAO/tao/QtResource.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qtreactor, tao_versioning_idl_defaults {
+project(TAO_QtResource) : acelib, taolib, core, tao_output, taodefaults, ace_qtreactor, tao_versioning_idl_defaults {
 
   sharedname   = TAO_QtResource
   dynamicflags += TAO_QTRESOURCE_BUILD_DLL
diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
index d8ba19c57d0..e14004464f1 100644
--- a/TAO/tao/QtResource/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource/QtResource_Factory.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/QtResource/QtResource_Factory.h"
 #include "tao/debug.h"
-#include "ace/QtReactor/QtReactor.h"
+#include "ace/QtReactor.h"
 
 ACE_RCSID (TAO_QtResource,
            QtResource_Factory,
@@ -25,7 +25,7 @@ namespace TAO
       {
         ACE_ERROR ((LM_ERROR,
                     "TAO (%P|%t) - QApplication is undefined.",
-                    " Cannot create ACE_QtReactor \n"));
+                    " Cannot create ACE_XtReactor \n"));
         return 0;
       }
 
diff --git a/TAO/tao/QtResource/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h
index 8c63bc68f18..8af126b607a 100644
--- a/TAO/tao/QtResource/QtResource_Factory.h
+++ b/TAO/tao/QtResource/QtResource_Factory.h
@@ -21,7 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include <qapplication.h>
-#include "ace/QtReactor/QtReactor.h"
+#include "ace/QtReactor.h"
 #include "tao/GUIResource_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
index 406b27ced86..9ecfe53e17b 100644
--- a/TAO/tao/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, pi {
+project : taolib, core, pi {
   sharedname   = TAO_RTCORBA
   dynamicflags = TAO_RTCORBA_BUILD_DLL
   requires    += rt_corba
@@ -29,7 +29,7 @@ project : taolib, install, pi {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Sorb -Sa -GX \
+    idlflags += -Ge 1 -Sci -SS -Sorb -Sa -GX \
                 -Wb,export_macro=TAO_RTCORBA_Export \
                 -Wb,export_include=tao/RTCORBA/rtcorba_export.h \
                 -Wb,unique_include=tao/RTCORBA/RTCORBA.h \
diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
index b8cde7545e0..1523826b809 100644
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA/RTCORBA.pidl
@@ -24,7 +24,7 @@
  *   1. Run the tao_idl compiler on the pidl file.  The command used for
  *   this is:
  *
- *     tao_idl -o orig -Gp -Gd -Sci -I../..
+ *     tao_idl -o orig -Gp -Gd -Ge 1 -Sci -I../..
  *          -Wb,export_macro=TAO_RTCORBA_Export
  *          -Wb,export_include="rtcorba_export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
index b6d05b5e064..03b121800fc 100644
--- a/TAO/tao/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, rtcorba, portableserver, avoids_corba_e_micro {
+project : taolib, core, rtcorba, portableserver {
   sharedname   = TAO_RTPortableServer
   dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : taolib, install, rtcorba, portableserver, avoids_corba_e_micro {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GX \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX \
                 -Wb,export_macro=TAO_RTPortableServer_Export \
                 -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \
                 -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE \
@@ -38,7 +38,7 @@ project : taolib, install, rtcorba, portableserver, avoids_corba_e_micro {
   }
 
   IDL_Files {
-    idlflags += -SS -Sorb -GX -Sci \
+    idlflags += -Ge 1 -SS -Sorb -GX -Sci \
                 -Wb,export_macro=TAO_RTPortableServer_Export \
                 -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \
                 -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h \
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl
index 9f9c13651d1..24d24cd5302 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.pidl
+++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl
@@ -12,7 +12,7 @@
  *   this is:
  *
  *     tao_idl
- *          -o orig -GA -Sci
+ *          -o orig -Ge 1 -GA -Sci
  *          -Wb,export_macro=TAO_RTPortableServer_Export
  *          -Wb,export_include="rtportableserver_export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/RTPortableServer/RT_POA.inl b/TAO/tao/RTPortableServer/RT_POA.inl
index bc0d00c7114..9197a39d399 100644
--- a/TAO/tao/RTPortableServer/RT_POA.inl
+++ b/TAO/tao/RTPortableServer/RT_POA.inl
@@ -72,7 +72,7 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
 
   while (1)
     {
-      bool wait_occurred_restart_call = false;
+      int wait_occurred_restart_call = 0;
 
       // Lock access for the duration of this transaction.
       TAO_POA_GUARD_RETURN (0);
@@ -113,7 +113,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
 
   while (1)
     {
-      bool wait_occurred_restart_call = false;
+      int wait_occurred_restart_call = 0;
 
       // Lock access for the duration of this transaction.
       TAO_POA_GUARD;
diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc
index 63937599a3c..7fc464fb643 100644
--- a/TAO/tao/RTScheduler.mpc
+++ b/TAO/tao/RTScheduler.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, rtcorba, pi, pi_server, portableserver, install, corba_messaging, tao_versioning_idl_defaults, avoids_corba_e_micro {
+project : taolib, rtcorba, pi, pi_server, portableserver, core, corba_messaging, tao_versioning_idl_defaults {
   sharedname   = TAO_RTScheduler
   dynamicflags = TAO_RTSCHEDULER_BUILD_DLL
 
@@ -28,7 +28,7 @@ project : taolib, rtcorba, pi, pi_server, portableserver, install, corba_messagi
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GX \
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX \
                 -Wb,export_macro=TAO_RTScheduler_Export \
                 -Wb,export_include=tao/RTScheduling/rtscheduler_export.h \
                 -Wb,include_guard=TAO_RTSCHEDULER_SAFE_INCLUDE \
@@ -38,7 +38,7 @@ project : taolib, rtcorba, pi, pi_server, portableserver, install, corba_messagi
   }
 
   IDL_Files {
-    idlflags += -SS -Sorb -GX -Sci \
+    idlflags += -Ge 1 -SS -Sorb -GX -Sci \
                 -Wb,export_macro=TAO_RTScheduler_Export \
                 -Wb,export_include=tao/RTScheduling/rtscheduler_export.h \
                 -Wb,unique_include=tao/RTScheduling/RTScheduler.h \
diff --git a/TAO/tao/RTScheduling/RTScheduler.pidl b/TAO/tao/RTScheduling/RTScheduler.pidl
index 2e821ec8160..72551c8785b 100644
--- a/TAO/tao/RTScheduling/RTScheduler.pidl
+++ b/TAO/tao/RTScheduling/RTScheduler.pidl
@@ -14,7 +14,7 @@
 //   is:
 //
 //     tao_idl
-//        -o orig -GA -Sa -Gp -Gd -Sci
+//        -o orig -GA -Sa -Gp -Gd -Ge 1 -Sci
 //          -Wb,export_macro=TAO_RTScheduler_Export
 //          -Wb,export_include="rtscheduler_export.h"
 //          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index f4ee888505b..5105a76b7df 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -2,12 +2,14 @@
 
 #include "tao/Unbounded_Octet_Sequence_T.h"
 #include "tao/Unbounded_Value_Sequence_T.h"
-#include "tao/Unbounded_Basic_String_Sequence_T.h"
+#include "tao/Unbounded_Wstring_Sequence_T.h"
+#include "tao/Unbounded_String_Sequence_T.h"
 #include "tao/Unbounded_Object_Reference_Sequence_T.h"
 #include "tao/Unbounded_Array_Sequence_T.h"
 #include "tao/Unbounded_Sequence_CDR_T.h"
 #include "tao/Bounded_Value_Sequence_T.h"
-#include "tao/Bounded_Basic_String_Sequence_T.h"
+#include "tao/Bounded_Wstring_Sequence_T.h"
+#include "tao/Bounded_String_Sequence_T.h"
 #include "tao/Bounded_Object_Reference_Sequence_T.h"
 #include "tao/Bounded_Array_Sequence_T.h"
 #include "tao/Bounded_Sequence_CDR_T.h"
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index 53a12caf6e0..0e9b89c9ff1 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -16,12 +16,19 @@ TAO_Service_Callbacks::~TAO_Service_Callbacks (void)
 }
 
 CORBA::Boolean
-TAO_Service_Callbacks::select_profile (const TAO_MProfile & /*mprofile*/,
+TAO_Service_Callbacks::select_profile (TAO_MProfile * /*mprofile*/,
                                        TAO_Profile *& /*pfile*/)
 {
   return false;
 }
 
+CORBA::Boolean
+TAO_Service_Callbacks::reselect_profile (TAO_Stub * /*stub*/,
+                                         TAO_Profile *& /*pfile*/)
+{
+  return false;
+}
+
 
 CORBA::Boolean
 TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
@@ -31,6 +38,12 @@ TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
   return true;
 }
 
+void
+TAO_Service_Callbacks::reset_profile_flags (void)
+{
+  return;
+}
+
 
 TAO_Service_Callbacks::Profile_Equivalence
 TAO_Service_Callbacks::is_profile_equivalent (const TAO_Profile *,
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 1c9e89ff0a3..60b5ac1df3b 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -77,9 +77,17 @@ public:
 
   /// Select the profile from MProfile as the needs of the services
   /// may be. Return the profile in <pfile>
-  virtual CORBA::Boolean select_profile (const TAO_MProfile &mprofile,
+  virtual CORBA::Boolean select_profile (TAO_MProfile *mprofile,
                                          TAO_Profile *&pfile);
 
+  /// Select the profile from MProfile as the needs of the services
+  /// may be. Return the profile in <pfile>
+  virtual CORBA::Boolean reselect_profile (TAO_Stub *stub,
+                                           TAO_Profile *&pfile);
+
+  /// Reset the profile flags that the services could have
+  virtual void reset_profile_flags (void);
+
   /// Check whether <obj> is nil or not.
   virtual CORBA::Boolean object_is_nil (CORBA::Object_ptr obj);
 
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
index a20166a5c8a..c855d525ca0 100644
--- a/TAO/tao/Services.pidl
+++ b/TAO/tao/Services.pidl
@@ -8,7 +8,7 @@
 //   The command used to generate code is:
 //
 //     tao_idl
-//        -o orig -GA -SS -Sci
+//        -o orig -Ge 1 -GA -SS -Sci
 //          -Wb,export_macro="tao/TAO_Export"
 //          -Wb,pre_include="ace/pre.h"
 //          -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/ShortSeq.pidl b/TAO/tao/ShortSeq.pidl
index ca11d10c026..cef83a5f810 100644
--- a/TAO/tao/ShortSeq.pidl
+++ b/TAO/tao/ShortSeq.pidl
@@ -8,7 +8,7 @@
  * The command used to generate code is:
  *
  *     tao_idl
- *        -o orig -GA -SS -Sci
+ *        -o orig -Ge 1 -GA -SS -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc
index 9077d3b3672..bf0850d9fe7 100644
--- a/TAO/tao/SmartProxies.mpc
+++ b/TAO/tao/SmartProxies.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, tao_versioning_idl_defaults {
+project : taolib, core, tao_versioning_idl_defaults {
   sharedname   = TAO_SmartProxies
   dynamicflags = TAO_SMARTPROXIES_BUILD_DLL
 
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index 7a7b467f180..15a60e3197b 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -1,6 +1,7 @@
 //$Id$
 
-project : taolib, install, core_anytypecode, core_strategies, tao_versioning_idl_defaults {
+project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
+  avoids      += ace_for_tao    // Requires Unix domain sockets and MEM stuff
   sharedname   = TAO_Strategies
   dynamicflags = TAO_STRATEGIES_BUILD_DLL
 
@@ -25,10 +26,11 @@ project : taolib, install, core_anytypecode, core_strategies, tao_versioning_idl
   }
 
   PIDL_Files {
+    Strategies
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -DCORBA3 \
+    idlflags += -Sci -SS -Gp -Gd -Ge 1 -Sorb -DCORBA3 \
                 -Wb,export_macro=TAO_Strategies_Export \
                 -Wb,export_include=tao/Strategies/strategies_export.h \
                 -o Strategies
diff --git a/TAO/tao/Strategies/COIOP_Endpoints.pidl b/TAO/tao/Strategies/COIOP_Endpoints.pidl
index e68dcb8b690..6bdb9181b99 100644
--- a/TAO/tao/Strategies/COIOP_Endpoints.pidl
+++ b/TAO/tao/Strategies/COIOP_Endpoints.pidl
@@ -14,7 +14,7 @@
  * is:
  *
  * tao_idl
- *          -o orig -GA -Sci \
+ *          -o orig -Ge 1 -GA -Sci \
  *          -Wb,export_macro=TAO_Export \
  *          -Wb,export_include="tao/TAO_Export.h" \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index 5b0938be1df..ad864ad1b9f 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -12,7 +12,7 @@
 #include "tao/Profile_Transport_Resolver.h"
 
 ACE_RCSID (tao,
-           Optimized_Connection_Endpoint_Selector,
+           Invocation_Endpoint_Selectors,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 72d72832118..040052ea256 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -94,9 +94,6 @@ TAO_SCIOP_Connection_Handler::open_handler (void *v)
 int
 TAO_SCIOP_Connection_Handler::open (void*)
 {
-  if (this->shared_open() == -1)
-    return -1;
-
   TAO_SCIOP_Protocol_Properties protocol_properties;
 
   // Initialize values from ORB params.
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index c045c772059..d5facd3b3de 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -263,15 +263,9 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (svc_handler->keep_waiting ())
+  if (transport->connection_handler ()->keep_waiting ())
     {
-      svc_handler->connection_pending ();
-    }
-
-  if (svc_handler->error_detected ())
-    {
-      svc_handler->cancel_pending_connection ();
-      return 0;
+      svc_handler->add_reference ();
     }
 
   // At this point, the connection has be successfully connected.
@@ -305,13 +299,6 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (svc_handler->error_detected ())
-    {
-      svc_handler->cancel_pending_connection ();
-      transport->purge_entry();
-      return 0;
-    }
-
   if (transport->is_connected () &&
       transport->wait_strategy ()->register_handler () != 0)
     {
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index fa502e57458..895df2ad9b2 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -238,7 +238,7 @@ TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 
 int
 TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix,
-                                       ACE_OFF_T size)
+                                       off_t size)
 {
   this->mmap_file_prefix_ = prefix;
   this->mmap_size_ = size;
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index d48b2ec0326..acb57ed33fe 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -87,7 +87,7 @@ public:
   /// Set the MMAP options the MEM_Stream this acceptor creates will
   /// use.
   int set_mmap_options (const ACE_TCHAR *prefix,
-                        ACE_OFF_T size);
+                        off_t size);
 
 private:
   /// Implement the common part of the open*() methods.
@@ -139,7 +139,7 @@ private:
 
   /// Determine the minimum size of mmap file.  This dictate the
   /// maximum size of a CORBA method invocation.
-  ACE_OFF_T mmap_size_;
+  off_t mmap_size_;
 
   /// Should we use GIOP lite??
   CORBA::Boolean lite_flag_;
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 272ebbeab56..cb922a25c8d 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -78,9 +78,6 @@ TAO_SHMIOP_Connection_Handler::open_handler (void *v)
 int
 TAO_SHMIOP_Connection_Handler::open (void*)
 {
-  if (this->shared_open() == -1)
-    return -1;
-
   TAO_SHMIOP_Protocol_Properties protocol_properties;
 
   // Initialize values from ORB params.
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 9b0490b6c26..adba9338dc1 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -190,30 +190,19 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       return 0;
     }
 
-  if (svc_handler->keep_waiting ())
-    {
-      svc_handler->connection_pending ();
-    }
-
-  if (svc_handler->error_detected ())
-    {
-      svc_handler->cancel_pending_connection ();
-    }
-
-  TAO_Transport *transport =
-    svc_handler->transport ();
-
   // At this point, the connection has be successfully connected.
   // #REFCOUNT# is one.
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
-                "new %s connection to <%s:%d> on Transport[%d]\n",
-                transport->is_connected() ? "connected" : "not connected",
+                "new connection to <%s:%d> on Transport[%d]\n",
                 ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
                 shmiop_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,
@@ -228,20 +217,13 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT("TAO (%P|%t) - SHMIOP_Connector::make_connection, ")
-                      ACE_TEXT("could not add the new connection to cache\n")));
+                      "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
+                      "could not add the new connection to cache\n"));
         }
 
       return 0;
     }
 
-  if (svc_handler->error_detected ())
-    {
-      svc_handler->cancel_pending_connection ();
-      transport->purge_entry();
-      return 0;
-    }
-
   if (transport->is_connected () &&
       transport->wait_strategy ()->register_handler () != 0)
     {
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h
index 3f063f0ef4a..382282475b6 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.h
+++ b/TAO/tao/Strategies/SHMIOP_Factory.h
@@ -79,7 +79,7 @@ private:
   ACE_TCHAR *mmap_prefix_;
 
   /// Minimum bytes of the mmap files.
-  ACE_OFF_T min_bytes_;
+  off_t min_bytes_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 66ad7e60780..0c2b9354005 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -77,9 +77,6 @@ TAO_UIOP_Connection_Handler::open_handler (void *v)
 int
 TAO_UIOP_Connection_Handler::open (void*)
 {
-  if (this->shared_open() == -1)
-    return -1;
-
   TAO_UIOP_Protocol_Properties protocol_properties;
 
   // Initialize values from ORB params.
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 5a9ded4d3c7..26fdd07992a 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -94,6 +94,15 @@ TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len
                     str));
       return 0;
     }
+  if (*(separator+1) != ',' && *(separator+1) != '/')
+    {
+      if (TAO_debug_level)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) TAO_UIOP_CONNECTOR::corbaloc_scan warning: "
+                    "terminating charactor '|' should be followed by a ','"
+                    "or a '/' in <%s>",
+                    str));
+    }
   len = (separator - str) + 1;
   return this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
@@ -234,14 +243,9 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (svc_handler->keep_waiting ())
-    {
-      svc_handler->connection_pending ();
-    }
-
-  if (svc_handler->error_detected ())
+  if (transport->connection_handler ()->keep_waiting ())
     {
-      svc_handler->cancel_pending_connection ();
+      svc_handler->add_reference ();
     }
 
   // At this point, the connection has be successfully created
@@ -274,13 +278,6 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (svc_handler->error_detected ())
-    {
-      svc_handler->cancel_pending_connection ();
-      transport->purge_entry();
-      return 0;
-    }
-
   if (transport->is_connected () &&
       transport->wait_strategy ()->register_handler () != 0)
     {
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 30543397d63..f440e60cc8e 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -29,7 +29,6 @@
 #include "ace/WFMO_Reactor.h"
 #include "ace/Msg_WFMO_Reactor.h"
 #include "ace/TP_Reactor.h"
-#include "ace/Dev_Poll_Reactor.h"
 #include "ace/Malloc_T.h"
 #include "ace/Local_Memory_Pool.h"
 #include "ace/Null_Mutex.h"
@@ -165,26 +164,15 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 #endif /* ACE_WIN32 */
           else if (ACE_OS::strcasecmp (current_arg,
                                        ACE_TEXT("msg_wfmo")) == 0)
-#if defined(ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
+#if defined(ACE_WIN32)
             this->reactor_type_ = TAO_REACTOR_MSGWFMO;
 #else
             this->report_unsupported_error (ACE_TEXT("MsgWFMO Reactor"));
-#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
+#endif /* ACE_WIN32 */
 
           else if (ACE_OS::strcasecmp (current_arg,
                                        ACE_TEXT("tp")) == 0)
             this->reactor_type_ = TAO_REACTOR_TP;
-
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("dev_poll")) == 0)
-            {
-#if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
-              this->reactor_type_ = TAO_REACTOR_DEV_POLL;
-#else
-              this->report_unsupported_error (ACE_TEXT ("Dev_Poll Reactor"));
-#endif  /* ACE_HAS_EVENT_POLL || ACE_HAS_DEV_POLL */
-            }
-
           else if (ACE_OS::strcasecmp (current_arg,
                                        ACE_TEXT("fl")) == 0)
             this->report_option_value_error (
@@ -443,39 +431,21 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
       break;
 
     case TAO_REACTOR_WFMO:
-#if defined(ACE_WIN32)
+#if defined(ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
       ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0);
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
       break;
 
-#if defined(ACE_WIN32) \
-  && !defined (ACE_LACKS_MSG_WFMO) \
-  && !defined (ACE_HAS_WINCE)      \
-  && !defined (ACE_HAS_PHARLAP)
     case TAO_REACTOR_MSGWFMO:
+#if defined(ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP)
       ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor, 0);
+#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
       break;
-#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
-
-#if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
-    case TAO_REACTOR_DEV_POLL:
-      ACE_NEW_RETURN (impl,
-                      ACE_Dev_Poll_Reactor (ACE::max_handles (),
-                                            1,  // restart
-                                            (ACE_Sig_Handler*)0,
-                                            (ACE_Timer_Queue*)0,
-                                            0, // Do not disable notify
-                                            0, // Allocate notify handler
-                                            this->reactor_mask_signals_,
-                                            ACE_Select_Reactor_Token::LIFO),
-                      0);
-      break;
-#endif  /* ACE_HAS_EVENT_POLL || ACE_HAS_DEV_POLL */
 
     default:
     case TAO_REACTOR_TP:
       ACE_NEW_RETURN (impl,
-          ACE_TP_Reactor (ACE::max_handles (),
+          ACE_TP_Reactor (ACE_TP_Reactor::DEFAULT_SIZE,
               1,
               (ACE_Sig_Handler*)0,
               (ACE_Timer_Queue*)0,
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index d8befc55809..98dde1143d3 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
 // $Id$
 
 #ifndef TAO_ADVANCED_RESOURCE_H
@@ -67,8 +65,7 @@ public:
     TAO_REACTOR_SELECT_ST = 2,
     TAO_REACTOR_WFMO      = 3,
     TAO_REACTOR_MSGWFMO   = 4,
-    TAO_REACTOR_TP        = 5,
-    TAO_REACTOR_DEV_POLL  = 6
+    TAO_REACTOR_TP        = 5
   };
 
   /// Thread queueing Strategy
diff --git a/TAO/tao/Strategies/sciop_endpoints.pidl b/TAO/tao/Strategies/sciop_endpoints.pidl
index 40f9c29a639..4649ca5d751 100644
--- a/TAO/tao/Strategies/sciop_endpoints.pidl
+++ b/TAO/tao/Strategies/sciop_endpoints.pidl
@@ -14,7 +14,7 @@
  * is:
  *
  * tao_idl
- *          -o orig -Gp -Gd -Sa -DCORBA3 -Sci
+ *          -o orig -Gp -Gd -Ge 1 -Sa -DCORBA3 -Sci
  *           -Wb,export_macro=TAO_Strategies_Export \
  *           -Wb,export_include="strategies_export.h" \
  *           -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/Strategies/uiop_endpoints.pidl b/TAO/tao/Strategies/uiop_endpoints.pidl
index 96e6411328b..239a54b7824 100644
--- a/TAO/tao/Strategies/uiop_endpoints.pidl
+++ b/TAO/tao/Strategies/uiop_endpoints.pidl
@@ -13,7 +13,7 @@
  * is:
  *
  * tao_idl
- *          -o orig -Gp -Gd -Sa -DCORBA3 -Sci
+ *          -o orig -Gp -Gd -Ge 1 -Sa -DCORBA3 -Sci
  *           -Wb,export_macro=TAO_Strategies_Export \
  *           -Wb,export_include="strategies_export.h" \
  *           -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl
index 79f53269a99..7140ff2ac44 100644
--- a/TAO/tao/StringSeq.pidl
+++ b/TAO/tao/StringSeq.pidl
@@ -8,7 +8,7 @@
 //   The command used to generate code is:
 //
 //     tao_idl
-//       -o orig -GA -SS -Sci
+//       -o orig -Ge 1 -GA -SS -Sci
 //          -Wb,export_macro=TAO_Export
 //          -Wb,pre_include="ace/pre.h"
 //          -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 5cf600ee90c..567542945ca 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -152,6 +152,10 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles,
   // Since we have been forwarded, we must set profile_success_ to false
   // since we are starting a new with a new set of profiles!
   this->profile_success_ = false;
+
+  // Reset any flags that may be appropriate in the services that
+  // selects profiles for invocation
+  this->orb_core_->reset_service_profile_flags ();
 }
 
 int
@@ -259,7 +263,7 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
 
 
   // Get the number of elements
-  CORBA::ULong const count = profiles.profile_count ();
+  CORBA::ULong count = profiles.profile_count ();
 
   // Set the number of elements in the sequence of tagged_profile
   ior_info->profiles.length (count);
@@ -409,6 +413,53 @@ TAO_Stub::forward_back_one (void)
 // routines need only ensure that the data being passed in is not
 // being modified by any other thread.
 //
+// As an _experiment_ (to estimate the performance cost) remote calls
+// are currently deemed "cancel-safe".  That means that they can be
+// called by threads when they're in asynchronous cancellation mode.
+// The only effective way to do this is to disable async cancellation
+// for the duration of the call.  There are numerous rude interactions
+// with code generators for C++ ... cancellation handlers just do
+// normal stack unwinding like exceptions, but exceptions are purely
+// synchronous and sophisticated code generators rely on that to
+// generate better code, which in some cases may be very hard to
+// unwind.
+
+class TAO_Synchronous_Cancellation_Required
+// = TITLE
+//     Stick one of these at the beginning of a block that can't
+//     support asynchronous cancellation, and which must be
+//     cancel-safe.
+//
+// = EXAMPLE
+//     somefunc()
+//     {
+//       TAO_Synchronous_Cancellation_Required NOT_USED;
+//       ...
+//     }
+{
+public:
+  // These should probably be in a separate inline file, but they're
+  // only used within this one file right now, and we always want them
+  // inlined, so here they sit.
+  TAO_Synchronous_Cancellation_Required (void)
+    : old_type_ (0)
+  {
+#if !defined (VXWORKS)
+    ACE_OS::thr_setcanceltype (THR_CANCEL_DEFERRED, &old_type_);
+#endif /* ! VXWORKS */
+  }
+
+  ~TAO_Synchronous_Cancellation_Required (void)
+  {
+#if !defined (VXWORKS)
+    int dont_care;
+    ACE_OS::thr_setcanceltype(old_type_, &dont_care);
+#endif /* ! VXWORKS */
+  }
+private:
+  int old_type_;
+};
+
 // ****************************************************************
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -536,20 +587,10 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types
                                 ACE_ENV_ARG_DECL)
 {
   if (this->policies_ == 0)
-    {
-      CORBA::PolicyList *policy_list_ptr = 0;
-      ACE_NEW_THROW_EX (policy_list_ptr,
-                        CORBA::PolicyList (),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
+    return 0;
 
-      return policy_list_ptr;
-    }
-  else
-    {
-      return this->policies_->get_policy_overrides (types
-                                                    ACE_ENV_ARG_PARAMETER);
-    }
+  return this->policies_->get_policy_overrides (types
+                                                ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
@@ -588,7 +629,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr)
     {
       const TAO_MProfile& mprofile = this->base_profiles_;
 
-      CORBA::ULong const profile_count = mprofile.profile_count ();
+      CORBA::ULong profile_count = mprofile.profile_count ();
       if ((cdr << profile_count) == 0)
         return 0;
 
@@ -617,7 +658,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr)
         ? *(this->forward_profiles_perm_)
         : this->base_profiles_;
 
-      CORBA::ULong const profile_count = mprofile.profile_count ();
+      CORBA::ULong profile_count = mprofile.profile_count ();
       if ((cdr << profile_count) == 0)
            return 0;
 
diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl
index 265d599d312..51bc7a28e27 100644
--- a/TAO/tao/Stub.inl
+++ b/TAO/tao/Stub.inl
@@ -212,6 +212,24 @@ TAO_Stub::next_profile_retry (void)
     }
 
   return false;
+#if 0
+  else
+    {
+      // Check whether the loaded services have something to say about
+      // this condition
+      TAO_Profile *prof = 0;
+      this->orb_core_->service_profile_reselection (this,
+                                                    prof);
+
+      // If the service is loaded and has a profile then try it.
+      if (prof)
+        {
+          return true;
+        }
+      this->reset_profiles_i ();
+      return false;
+    }
+#endif /*If 0 */
 }
 
 ACE_INLINE const TAO_MProfile&
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index abe453e0d0c..e38207cdbfa 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -178,7 +178,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
         if (s == TAO_INVOKE_RESTART)
           {
-            Invocation_Status const tmp =
+            Invocation_Status tmp =
               this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
@@ -228,7 +228,7 @@ namespace TAO
     ACE_CATCHANY
       {
 #if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus const status =
+        const PortableInterceptor::ReplyStatus status =
           this->handle_any_exception (&ACE_ANY_EXCEPTION
                                       ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
@@ -246,7 +246,7 @@ namespace TAO
     ACE_CATCHALL
       {
 #if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus const st =
+        const PortableInterceptor::ReplyStatus st =
           this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
@@ -410,13 +410,13 @@ namespace TAO
         {
           // Unmarshal the location forward object and set the
           // variable this->forward_to_.
-          Invocation_Status const s
+          const Invocation_Status s
             = this->location_forward (cdr
                                       ACE_ENV_ARG_PARAMETER);
           if (s != TAO_INVOKE_FAILURE)
             {
               // de-marshalling of permanent object reference was successfull
-              CORBA::Boolean const permanent_forward_condition =
+              const CORBA::Boolean permanent_forward_condition =
                 this->orb_core ()->is_permanent_forward_condition
                   (this->forwarded_to_.in (),
                    this->request_service_context ());
@@ -785,7 +785,7 @@ namespace TAO
     ACE_CATCHANY
       {
 #if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus const status =
+        PortableInterceptor::ReplyStatus status =
           this->handle_any_exception (&ACE_ANY_EXCEPTION
                                       ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
@@ -803,7 +803,7 @@ namespace TAO
     ACE_CATCHALL
       {
 #if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus const st =
+        PortableInterceptor::ReplyStatus st =
           this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index dd2bc0c19d9..d36d045a4e5 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -241,12 +241,12 @@ CORBA::SystemException::_info (void) const
   info += this->_rep_id ();
   info += "'\n";
 
-  CORBA::ULong const VMCID = this->minor () & 0xFFFFF000u;
+  const CORBA::ULong VMCID = this->minor () & 0xFFFFF000u;
 
   if (VMCID == TAO::VMCID)
     {
       // @@ Move the following code to a subroutine, it is too long already!
-      const char *location = 0;
+      const char *location;
       switch (this->minor () & 0x00000F80u)
         {
         case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE:
@@ -409,7 +409,7 @@ CORBA::SystemException::_info (void) const
     }
   else if (VMCID == CORBA::OMGVMCID)
     {
-      CORBA::ULong const minor_code = this->minor () & 0xFFFU;
+      const CORBA::ULong minor_code = this->minor () & 0xFFFU;
 
       const char *minor_description = 0;
 
@@ -512,7 +512,7 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "ORB output stream does not support ValueOutputStream interface.", // 40
       "ORB input stream does not support ValueInputStream interface.",    // 41
       "Character support limited to ISO 8859-1 for this object reference", // 42
-      "Attempt to add a Pollable to a second PollableSet." // 43
+      "Attempt to add a Pollable to a second PollableSet."
     };
 
   static const char *IMP_LIMIT_TABLE[] =
diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl
index 9e46e062047..db7dd9b348a 100644
--- a/TAO/tao/TAO.pidl
+++ b/TAO/tao/TAO.pidl
@@ -15,7 +15,7 @@
  *   this is:
  *
  *   tao_idl
- *       -o orig -Gp -Gd -GA -SS -Sci
+ *       -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
  *       -Wb,export_macro=TAO_Export
  *       -Wb,pre_include="ace/pre.h"
  *       -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 73c596f02d9..5c8582c2f82 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -10,7 +10,6 @@
 #include "tao/CORBANAME_Parser.h"
 #include "tao/CORBALOC_Parser.h"
 #include "tao/FILE_Parser.h"
-#include "tao/HTTP_Parser.h"
 #include "tao/DLL_Parser.h"
 #include "tao/ORB_Core.h"
 #include "tao/Adapter_Factory.h"
@@ -177,8 +176,14 @@ class TAO_Ubergestalt_Ready_Condition
 public:
   static TAO_Ubergestalt_Ready_Condition* instance (void)
   {
-    return TAO_Singleton <TAO_Ubergestalt_Ready_Condition,
-      TAO_SYNCH_RECURSIVE_MUTEX>::instance ();
+    // The first thread to get here will initialize the static
+    // local. Any subsequent threads synchronizaton will be handled by
+    // TAO_Singleton
+    static TAO_Ubergestalt_Ready_Condition *i_ =
+      TAO_Singleton <TAO_Ubergestalt_Ready_Condition,
+                     TAO_SYNCH_RECURSIVE_MUTEX>::instance ();
+
+    return i_;
   };
 
   TAO_Ubergestalt_Ready_Condition (void)
@@ -534,7 +539,6 @@ namespace
     pcfg->process_directive (ace_svc_desc_TAO_CORBALOC_Parser);
     pcfg->process_directive (ace_svc_desc_TAO_FILE_Parser);
     pcfg->process_directive (ace_svc_desc_TAO_DLL_Parser);
-    pcfg->process_directive (ace_svc_desc_TAO_HTTP_Parser);
     pcfg->process_directive (ace_svc_desc_TAO_Default_Stub_Factory);
     pcfg->process_directive (
       ace_svc_desc_TAO_Default_Endpoint_Selector_Factory);
@@ -634,6 +638,7 @@ namespace
       {
         rtscheduler_loader->init (0, 0);
       }
+
   } /* register_additional_services_i */
 
   int
@@ -713,61 +718,63 @@ namespace
     while (arg_shifter.is_anything_left ())
       {
         const ACE_TCHAR *current_arg = 0;
-        if (0 == arg_shifter.cur_arg_strncasecmp
-            (ACE_TEXT ("-ORBSkipServiceConfigOpen")))
-          {
-            skip_service_config_open = true;
+        int result =
+          arg_shifter.cur_arg_strncasecmp (
+            ACE_TEXT ("-ORBSkipServiceConfigOpen"));
 
-            arg_shifter.consume_arg ();
-          }
-        else if (0 != (current_arg = arg_shifter.get_the_parameter
-                       (ACE_TEXT ("-ORBSvcConfDirective"))))
+        if (0 == result)  // Start with the parameterless flags.
           {
-            len = svc_config_argv.length ();
-            svc_config_argv.length (len + 2);  // 2 arguments to add
-
-            // This is used to pass arguments to the Service
-            // Configurator using the "command line" to provide
-            // configuration information rather than using a svc.conf
-            // file.  Pass the "-S" to the service configurator.
-            svc_config_argv[len] = CORBA::string_dup ("-S");
-            svc_config_argv[len + 1] =
-              CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (current_arg));
+            skip_service_config_open = true;
 
             arg_shifter.consume_arg ();
           }
-        else if (0 != (current_arg = arg_shifter.get_the_parameter
-                       (ACE_TEXT ("-ORBServiceConfigLoggerKey"))))
+        else  // Continue with flags that accept parameters.
           {
-            len = svc_config_argv.length ();
-            svc_config_argv.length (len + 2);  // 2 arguments to add
-
-            svc_config_argv[len] = CORBA::string_dup ("-k");
-            svc_config_argv[len + 1] =
-              CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (current_arg));
+            current_arg =
+              arg_shifter.get_the_parameter (
+                ACE_TEXT ("-ORBSvcConfDirective"));
 
-            arg_shifter.consume_arg ();
-          }
-        else if (0 == arg_shifter.cur_arg_strncasecmp
-                       (ACE_TEXT ("-ORBNegotiateCodesets")))
-          {
-            // Negotiate codesets must be evaluated prior to calling
-            // register_global_services_i.
+            if (0 != current_arg)
+              {
+                len = svc_config_argv.length ();
+                svc_config_argv.length (len + 2);  // 2 arguments to add
 
-            // Don't consume, the ORB_Core::init will use it again.
-            arg_shifter.ignore_arg();
+                // This is used to pass arguments to the Service
+                // Configurator using the "command line" to provide
+                // configuration information rather than using a svc.conf
+                // file.  Pass the "-S" to the service configurator.
+                svc_config_argv[len] = CORBA::string_dup ("-S");
+                svc_config_argv[len + 1] =
+                  CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (current_arg));
 
-            if (0 != (current_arg = arg_shifter.get_current()))
-              negotiate_codesets = (ACE_OS::atoi (current_arg));
-            arg_shifter.ignore_arg();
-          }
-        // Can't interpret this argument.
-        // Move on to the next argument.
-        else
-          {
-            // Any arguments that don't match are ignored so that
-            // the caller can still use them.
-            arg_shifter.ignore_arg ();
+                arg_shifter.consume_arg ();
+              }
+            else
+              {
+                current_arg =
+                  arg_shifter.get_the_parameter (
+                    ACE_TEXT ("-ORBServiceConfigLoggerKey"));
+
+                if (0 != current_arg)
+                  {
+                    len = svc_config_argv.length ();
+                    svc_config_argv.length (len + 2);  // 2 arguments to add
+
+                    svc_config_argv[len] = CORBA::string_dup ("-k");
+                    svc_config_argv[len + 1] =
+                      CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (current_arg));
+
+                    arg_shifter.consume_arg ();
+                  }
+                // Can't interpret this argument.
+                // Move on to the next argument.
+                else
+                  {
+                    // Any arguments that don't match are ignored so that
+                    // the caller can still use them.
+                    arg_shifter.ignore_arg ();
+                  }
+              }
           }
       }
 
@@ -816,7 +823,10 @@ namespace
     while (arg_shifter.is_anything_left ())
       {
         const ACE_TCHAR *current_arg = 0;
-        if (0 == arg_shifter.cur_arg_strncasecmp (ACE_TEXT ("-ORBDebug")))
+        int strcmp_result =
+          arg_shifter.cur_arg_strncasecmp (ACE_TEXT ("-ORBDebug"));
+
+        if (0 == strcmp_result)
           {
             if (apply_values)
               {
@@ -827,41 +837,69 @@ namespace
 
             arg_shifter.consume_arg ();
           }
-        else if (0 != (current_arg =
-                       arg_shifter.get_the_parameter
-                       (ACE_TEXT ("-ORBDebugLevel"))))
+        else
           {
-            if (apply_values)
+            current_arg =
+              arg_shifter.get_the_parameter (
+                ACE_TEXT ("-ORBNegotiateCodesets"));
+
+            if (0 != current_arg)
               {
-                TAO_debug_level =
-                  ACE_OS::atoi (current_arg);
+                if (apply_values)
+                  {
+                    // Don't consume, the ORB_Core::init will use it again.
+                    negotiate_codesets = (ACE_OS::atoi (current_arg));
+                  }
               }
-            arg_shifter.consume_arg ();
-          }
-        else if (0 == arg_shifter.cur_arg_strncasecmp
-                 (ACE_TEXT ("-ORBDaemon")))
-          {
-            // Be a daemon.
-            if (apply_values)
+            else
               {
-                len = svc_config_argv.length ();
-                svc_config_argv.length (len + 1);
-
-                svc_config_argv[len] =
-                  CORBA::string_dup ("-b");
+                current_arg =
+                  arg_shifter.get_the_parameter (
+                    ACE_TEXT ("-ORBDebugLevel"));
+
+                if (0 != current_arg)
+                  {
+                    if (apply_values)
+                      {
+                        TAO_debug_level =
+                          ACE_OS::atoi (current_arg);
+                      }
+
+                    arg_shifter.consume_arg ();
+                  }
+                else
+                  {
+                    strcmp_result =
+                      arg_shifter.cur_arg_strncasecmp (
+                        ACE_TEXT ("-ORBDaemon"));
+
+                    if (0 == strcmp_result)
+                      {
+                        // Be a daemon.
+                        if (apply_values)
+                          {
+                            len = svc_config_argv.length ();
+                            svc_config_argv.length (len + 1);
+
+                            svc_config_argv[len] =
+                              CORBA::string_dup ("-b");
+                          }
+
+                        arg_shifter.consume_arg ();
+                      }
+                    // Can't interpret this argument.
+                    // Move on to the next argument.
+                    else
+                      {
+                        // Any arguments that don't match are ignored so
+                        // that the caller can still use them.
+                        arg_shifter.ignore_arg ();
+                      }
+                  }
               }
-
-            arg_shifter.consume_arg ();
-          }
-        // Can't interpret this argument.
-        // Move on to the next argument.
-        else
-          {
-            // Any arguments that don't match are ignored so
-            // that the caller can still use them.
-            arg_shifter.ignore_arg ();
           }
       }
+
     return 0;
   } /* parse_global_args_i */
 } // anonymous namespace.
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 18666d56946..da67133fec9 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -82,7 +82,6 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
     , caught_exception_ (0)
     , reply_status_ (-1)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-    , transport_selection_guard_ (transport)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_SERVER_REQUEST_START);
   // No-op.
@@ -127,7 +126,6 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
   , caught_exception_ (0)
   , reply_status_ (-1)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  , transport_selection_guard_ (transport)
 {
   this->profile_.object_key (object_key);
   parse_error = 0;
@@ -165,7 +163,6 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
   , caught_exception_ (0)
   , reply_status_ (-1)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  , transport_selection_guard_ (0)
 {
   // Have to use a const_cast<>.  *sigh*
   this->profile_.object_key (
@@ -204,8 +201,6 @@ TAO_ServerRequest::~TAO_ServerRequest (void)
         }
     }
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  if (this->release_operation_)
-    CORBA::string_free (const_cast<char*> (this->operation_));
 }
 
 CORBA::ORB_ptr
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 8034d920b28..7cd383f5dd5 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -29,7 +29,6 @@
 #include "tao/Tagged_Profile.h"
 #include "tao/Service_Context.h"
 #include "tao/Object.h"
-#include "tao/Transport_Selection_Guard.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -376,10 +375,6 @@ private:
   /// Reply status for the current request.
   PortableInterceptor::ReplyStatus reply_status_;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-  /// An RAII (resource acquisition is initialization) class instance
-  /// for interfacing with TSS storage for the "current" transport.
-  TAO::Transport_Selection_Guard transport_selection_guard_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Server_Request.inl b/TAO/tao/TAO_Server_Request.inl
index 45c05553533..34d7096e65d 100644
--- a/TAO/tao/TAO_Server_Request.inl
+++ b/TAO/tao/TAO_Server_Request.inl
@@ -35,8 +35,9 @@ TAO_ServerRequest::TAO_ServerRequest (void)
   , caught_exception_ (0)
   , reply_status_ (-1)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  , transport_selection_guard_ (0)
 {
+  if (this->release_operation_)
+    CORBA::string_free (const_cast<char*> (this->operation_));
 }
 
 ACE_INLINE TAO_ORB_Core *
diff --git a/TAO/tao/TC.mpc b/TAO/tao/TC.mpc
deleted file mode 100644
index 33e94224c50..00000000000
--- a/TAO/tao/TC.mpc
+++ /dev/null
@@ -1,44 +0,0 @@
-//$Id$
-
-project(*) : taolib_with_idl, tao_versioning_idl_defaults, install, interceptors, pi {
-
-  sharedname   = TAO_TC
-  dynamicflags = TAO_TRANSPORT_CURRENT_BUILD_DLL
-
-  Source_Files {
-    TransportCurrent/Current_Impl.cpp
-    TransportCurrent/Current_Loader.cpp
-    TransportCurrent/Current_ORBInitializer_Base.cpp
-  }
-
-  Header_Files {
-    TransportCurrent/Current_Impl.h
-    TransportCurrent/Current_Loader.h
-    TransportCurrent/Current_ORBInitializer.h
-    TransportCurrent/Current_ORBInitializer_Base.h
-    TransportCurrent/Transport_Current.h
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-    TransportCurrent/Current_ORBInitializer.cpp
-  }
-
-  IDL_Files {
-    idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \
-                -Wb,export_macro=TAO_Transport_Current_Export \
-                -o TransportCurrent -I./TransportCurrent
-    idlflags -= -Sa -St
-
-    TransportCurrent/TC.idl
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-}
-
diff --git a/TAO/tao/TC_IIOP.mpc b/TAO/tao/TC_IIOP.mpc
deleted file mode 100644
index 1fb04a36329..00000000000
--- a/TAO/tao/TC_IIOP.mpc
+++ /dev/null
@@ -1,40 +0,0 @@
-//$Id$
-
-project(*) : taolib_with_idl, tao_versioning_idl_defaults, install, tc, interceptors, pi {
-
-  sharedname   = TAO_TC_IIOP
-
-  dynamicflags = TAO_TRANSPORT_CURRENT_BUILD_DLL
-
-  Source_Files {
-    TransportCurrent/IIOP_Current_Impl.cpp
-    TransportCurrent/IIOP_Current_Loader.cpp
-  }
-
-  Header_Files {
-    TransportCurrent/IIOP_Current_Impl.h
-    TransportCurrent/IIOP_Current_Loader.h
-    TransportCurrent/IIOP_Transport_Current.h
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  IDL_Files {
-    idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \
-                -Wb,export_macro=TAO_Transport_Current_Export \
-                -o TransportCurrent -I./TransportCurrent
-    idlflags -= -Sa -St
-
-    TransportCurrent/TC_IIOP.idl
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-}
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index 55bcde08649..73ec7175070 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -23,9 +23,7 @@ TAO_TSS_Resources::TAO_TSS_Resources (void)
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
   , gui_resource_factory_ (0)
-#if (TAO_HAS_TRANSPORT_CURRENT == 1)
-  , tsg_ (0)
-#endif /* TAO_HAS_TRANSPORT_CURRENT */
+
 {
 }
 
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index 3212040ead3..0891f1e43da 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   class GUIResource_Factory;
-  class Transport_Selection_Guard;
 }
 /**
  * @class TAO_TSS_Resources
@@ -106,17 +105,6 @@ public:
    * are operational only in within the context of GUI event loops.
    */
   TAO::GUIResource_Factory * gui_resource_factory_;
-
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-  /// A TSS for a pointer to the current transport guard (see
-  /// below). The guard keeps track of the Transport, if any that has
-  /// been selected for use by the current thread, in the context of
-  /// an upcall or client-side interceptor.
-
-  TAO::Transport_Selection_Guard* tsg_;
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index d6cd7005f67..be87fc6def5 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -88,7 +88,7 @@ public:
   /// threads up.
   void cleanup_rw_transports (void);
 
-  /// @name Accessors
+  /// @named Accessors
   //@{
 
   TAO_Acceptor_Registry &acceptor_registry (void);
diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl
index eb85bf0b8ca..da4c27139c4 100644
--- a/TAO/tao/TimeBase.pidl
+++ b/TAO/tao/TimeBase.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -GA -SS -Sci
+ *        -o orig -Ge 1 -GA -SS -Sci
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/TkResource.mpc b/TAO/tao/TkResource.mpc
index f7808b1f5d2..b658cc67f83 100644
--- a/TAO/tao/TkResource.mpc
+++ b/TAO/tao/TkResource.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(TAO_TkResource) : acelib, taolib, install, tao_output, taodefaults, ace_tkreactor, tao_versioning_idl_defaults {
+project(TAO_TkResource) : acelib, taolib, core, tao_output, taodefaults, ace_tkreactor, tao_versioning_idl_defaults {
 
   sharedname   = TAO_TkResource
   dynamicflags += TAO_TKRESOURCE_BUILD_DLL
diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp
index 32ad31eacb2..622a0fb45cf 100644
--- a/TAO/tao/TkResource/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource/TkResource_Factory.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/TkResource/TkResource_Factory.h"
 #include "tao/debug.h"
-#include "ace/TkReactor/TkReactor.h"
+#include "ace/TkReactor.h"
 
 ACE_RCSID( TAO_TkResource,
            TkResource_Factory,
diff --git a/TAO/tao/TkResource/TkResource_Factory.h b/TAO/tao/TkResource/TkResource_Factory.h
index fd2f5461556..f4aab08db60 100644
--- a/TAO/tao/TkResource/TkResource_Factory.h
+++ b/TAO/tao/TkResource/TkResource_Factory.h
@@ -13,7 +13,7 @@
 #ifndef TAO_TKRESOURCE_FACTORY_H
 #define TAO_TKRESOURCE_FACTORY_H
 #include /**/ "ace/pre.h"
-#include "ace/TkReactor/TkReactor.h"
+#include "ace/TkReactor.h"
 #include "tao/TkResource/TAO_TkResource_Export.h"
 #include "tao/GUIResource_Factory.h"
 
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 83f2a3f114d..3de85e421c9 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -160,13 +160,6 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   // Create TMS now.
   this->tms_ = cf->create_transport_mux_strategy (this);
 
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-  // Allocate stats
-  ACE_NEW_THROW_EX (this->stats_,
-                    TAO::Transport::Stats,
-                    CORBA::NO_MEMORY ());
-#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-
   /*
    * Hook to add code that initializes components that
    * belong to the concrete protocol implementation.
@@ -1216,33 +1209,21 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
                                       const ACE_Message_Block *message_block,
                                       ACE_Time_Value *max_wait_time)
 {
-  int ret = 0;
-  size_t message_length = message_block->length ();
-
   switch (message_semantics)
     {
       case TAO_Transport::TAO_TWOWAY_REQUEST:
-        ret = this->send_synchronous_message_i (message_block,
-                                                max_wait_time);
-        break;
-
+        return this->send_synchronous_message_i (message_block,
+                                                 max_wait_time);
       case TAO_Transport::TAO_REPLY:
-        ret = this->send_reply_message_i (message_block,
-                                          max_wait_time);
-        break;
-
+        return this->send_reply_message_i (message_block,
+                                           max_wait_time);
       case TAO_Transport::TAO_ONEWAY_REQUEST:
-        ret = this->send_asynchronous_message_i (stub,
-                                                 message_block,
-                                                 max_wait_time);
-        break;
+        return this->send_asynchronous_message_i (stub,
+                                                  message_block,
+                                                  max_wait_time);
     }
 
-  // "Count" the message, only if no error was encountered.
-  if (ret != -1 && this->stats_ != 0)
-    this->stats_->messages_sent (message_length);
-
-  return ret;
+  return -1;
 }
 
 int
@@ -2212,9 +2193,7 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
   // Get the <message_type> that we have received
   const TAO_Pluggable_Message_Type t = qd->msg_type_;
 
-  // Update stats, if any
-  if (this->stats_ != 0)
-    this->stats_->messages_received (qd->msg_block_->length ());
+  // int result = 0;
 
   if (t == TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION)
     {
@@ -2468,17 +2447,6 @@ TAO_Transport::out_stream (void)
   return this->messaging_object ()->out_stream ();
 }
 
-void
-TAO_Transport::pre_close (void)
-{
-  this->is_connected_ = false;
-  this->purge_entry ();
-  {
-    ACE_MT (ACE_GUARD (ACE_Lock, guard, *this->handler_lock_));
-    this->cleanup_queue_i ();
-  }
-}
-
 bool
 TAO_Transport::post_open (size_t id)
 {
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index ad9a8a25155..ea5623072c3 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -28,7 +28,6 @@
 #include "tao/Incoming_Message_Queue.h"
 #include "tao/Incoming_Message_Stack.h"
 #include "ace/Time_Value.h"
-#include "ace/Basic_Stats.h"
 
 struct iovec;
 
@@ -61,13 +60,6 @@ namespace TAO
       TAO_SERVER_ROLE = 1,
       TAO_CLIENT_ROLE = 2
     };
-
-  namespace Transport
-  {
-    /// Transport-level statistics. Initially introduced to support
-    /// the "Transport Current" functionality.
-    class Stats;
-  }
 }
 
 /*
@@ -540,9 +532,6 @@ public:
   /// Perform all the actions when this transport get opened
   bool post_open (size_t id);
 
-  /// do what needs to be done when closing the transport
-  void pre_close (void);
-
   /// Get the connection handler for this transport
   TAO_Connection_Handler * connection_handler (void);
 
@@ -778,9 +767,6 @@ public:
   /// connection is closed.
   void send_connection_closed_notifications (void);
 
-  /// Transport statistics
-  TAO::Transport::Stats* stats (void) const;
-
 private:
 
   /// Helper method that returns the Transport Cache Manager.
@@ -1076,9 +1062,6 @@ private:
   TAO_MMAP_Allocator * const mmap_allocator_;
 #endif  /* TAO_HAS_SENDFILE==1 */
 
-  /// Statistics
-  TAO::Transport::Stats* stats_;
-
   /*
    * specialization hook to add class members from concrete
    * transport class onto the base transport class. Please
@@ -1094,61 +1077,6 @@ private:
 
 //@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK
 
-namespace TAO
-{
-  namespace Transport
-  {
-    /*
-     * @class Stats
-     *
-     * @brief Used to collect stats on a transport.
-     *
-     * The base class in (potentialy) extensible hierarchy used to
-     * specialize the information available for a specific protocol.
-     *
-     * This class is necessary for the implementation of the Transport
-     * Current feature.
-     *
-     * <B>See Also:</B>
-     *
-     * https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/TAO/docs/transport_current/index.html?revision=HEAD
-     *
-     */
-    class TAO_Export Stats
-    {
-    public:
-      Stats ();
-
-      void messages_sent (size_t message_length);
-      CORBA::LongLong messages_sent (void) const;
-      CORBA::LongLong bytes_sent (void) const;
-
-      void messages_received (size_t message_length);
-      CORBA::LongLong messages_received (void) const;
-      CORBA::LongLong bytes_received (void) const;
-
-      void opened_since (const ACE_Time_Value& tv);
-      const ACE_Time_Value& opened_since (void) const;
-
-    private:
-      // @NOTE: I could have used bytes_rcvd_.samples_count() instead,
-      // however there was a suspicion that 32 bits would be
-      // insufficient.
-      CORBA::LongLong messages_rcvd_;
-
-      // @NOTE: I could have used bytes_sent_.samples_count() instead,
-      // however there was a suspicion that 32 bits would be
-      // insufficient.
-      CORBA::LongLong messages_sent_;
-
-      ACE_Basic_Stats bytes_rcvd_;
-      ACE_Basic_Stats bytes_sent_;
-
-      ACE_Time_Value  opened_since_;
-    };
-  }
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index e53d2848830..ef9faafb1ac 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -189,71 +189,4 @@ TAO_Transport::sent_byte_count (void) const
   return this->sent_byte_count_;
 }
 
-ACE_INLINE TAO::Transport::Stats*
-TAO_Transport::stats (void) const
-{
-  return this->stats_;
-}
-
-ACE_INLINE
-TAO::Transport::Stats::Stats ()
-  : messages_rcvd_ (0)
-  , messages_sent_ (0)
-  , bytes_rcvd_()
-  , bytes_sent_ ()
-  , opened_since_ ()
-{
-}
-
-ACE_INLINE void
-TAO::Transport::Stats::messages_sent (size_t message_length)
-{
-  this->messages_sent_++;
-  this->bytes_sent_.sample (message_length);
-}
-
-ACE_INLINE CORBA::LongLong
-TAO::Transport::Stats::messages_sent (void) const
-{
-  return this->messages_sent_;
-}
-
-ACE_INLINE CORBA::LongLong
-TAO::Transport::Stats::bytes_sent (void) const
-{
-  return this->bytes_sent_.sum_;
-}
-
-ACE_INLINE void
-TAO::Transport::Stats::messages_received (size_t message_length)
-{
-  this->messages_rcvd_++;
-  this->bytes_rcvd_.sample (message_length);
-}
-
-ACE_INLINE CORBA::LongLong
-TAO::Transport::Stats::messages_received (void) const
-{
-  return this->messages_rcvd_;
-}
-
-ACE_INLINE CORBA::LongLong
-TAO::Transport::Stats::bytes_received (void) const
-{
-  return this->bytes_rcvd_.sum_;
-}
-
-ACE_INLINE void
-TAO::Transport::Stats::opened_since (const ACE_Time_Value& tv)
-{
-  this->opened_since_ = tv;
-}
-
-ACE_INLINE const ACE_Time_Value&
-TAO::Transport::Stats::opened_since (void) const
-{
-  return this->opened_since_;
-}
-
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp
deleted file mode 100644
index 3dab7b8c310..00000000000
--- a/TAO/tao/TransportCurrent/Current_Impl.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-#include "tao/Transport.h"
-#include "tao/Transport_Selection_Guard.h"
-
-#include "tao/TransportCurrent/Current_Loader.h"
-#include "tao/TransportCurrent/Current_Impl.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace Transport
-  {
-
-    /// ctor
-    Current_Impl::Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id)
-      : core_ (core)
-      , tss_slot_id_ (tss_slot_id)
-    {
-    }
-
-    /// dtor
-    Current_Impl::~Current_Impl (void)
-    {
-    }
-
-    /// Obtains the current transport. Throws a NoContext exception
-    /// if, there was no "current" transport selected on the current
-    /// thread.
-    const TAO_Transport*
-    Current_Impl::transport (ACE_ENV_SINGLE_ARG_DECL) const
-      ACE_THROW_SPEC ((NoContext))
-    {
-      Transport_Selection_Guard* topguard =
-        Transport_Selection_Guard::current (this->core_, this->tss_slot_id_);
-
-      if (topguard == 0)
-        ACE_THROW (NoContext());
-      ACE_CHECK;
-
-      return topguard->get ();
-    }
-
-    /// Obtains the current transport's stats
-    const TAO::Transport::Stats*
-    Current_Impl::transport_stats (ACE_ENV_SINGLE_ARG_DECL) const
-      ACE_THROW_SPEC ((NoContext))
-    {
-      static const TAO::Transport::Stats dummy;
-
-      const TAO_Transport* t =
-        this->transport (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return (t==0 || t->stats () == 0) ? &dummy : t->stats ();
-    }
-
-    CORBA::Long Current_Impl::id (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-      const TAO_Transport* t =
-        this->transport (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return (t==0) ? 0 : t->id ();
-    }
-
-    CounterT Current_Impl::bytes_sent (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-      return transport_stats ()->bytes_sent ();
-    }
-
-    CounterT Current_Impl::bytes_received (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-      return transport_stats ()->bytes_received ();
-    }
-
-    CounterT Current_Impl::messages_sent (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-      return transport_stats ()->messages_sent ();
-    }
-
-    CounterT Current_Impl::messages_received (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-      return transport_stats ()->messages_received ();
-    }
-
-    TimeBase::TimeT Current_Impl::open_since (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-      TimeBase::TimeT msecs = 0;
-      transport_stats ()->opened_since ().msec (msecs);
-      return msecs;
-    }
-
-  }
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
deleted file mode 100644
index 68731b626ec..00000000000
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// $Id$
-
-#ifndef CURRENT_IMPL_H
-#define CURRENT_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TransportCurrent/TCC.h"
-#include "tao/LocalObject.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Transport;
-
-namespace TAO
-{
-  namespace Transport
-  {
-
-    // Forward decl
-    class Stats;
-
-    /**
-     * @class Current_impl
-     *
-     * @brief Implementation of the TAO::Transport::Current
-     * interface.
-     *
-     * Current_Impl is useful for obtaining information about the
-     * Transport, associated with the calling thread.
-     */
-    class TAO_Transport_Current_Export Current_Impl
-      : public virtual Current
-      , public virtual TAO_Local_RefCounted_Object
-      {
-      public:
-
-        /// Constructor.
-        Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
-
-        /**
-         * These are methods exposed by the
-         * PortableInterceptor::Current interface.
-         */
-        //@{
-        virtual CORBA::Long id (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual CounterT bytes_sent (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual CounterT bytes_received (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual CounterT messages_sent (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual CounterT messages_received (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual ::TimeBase::TimeT open_since (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-        //@}
-
-      protected:
-
-        /**
-         * Some helper methods
-         */
-        //@{
-        /// A (strategy) method used to obtain the transport ptr
-        const TAO_Transport* transport (ACE_ENV_SINGLE_ARG_DECL) const
-          ACE_THROW_SPEC ((NoContext));
-
-        /// A Stats instance. If protocol is unavailable (0) or the
-        /// TAO_HAS_TRANSPORT_CURRENT macro is defined as anything but
-        /// 1, a single static instance will be used.
-        const TAO::Transport::Stats* transport_stats (ACE_ENV_SINGLE_ARG_DECL) const
-          ACE_THROW_SPEC ((NoContext));
-        //@}
-
-        /// Destructor is protected to enforce the fact this class is
-        /// reference counted, and should not be destroyed using
-        /// delete() by anything other than the reference counting
-        /// mechanism.
-        virtual ~Current_Impl (void);
-
-      private:
-
-        /// Prevent copying through the copy constructor and the
-        /// assignment operator.
-        //@{
-        Current_Impl (const Current_Impl &);
-        void operator= (const Current_Impl &);
-        //@}
-
-      private:
-
-        // The ORB (core) that owes us.
-        TAO_ORB_Core* core_;
-
-        // The ORB's TSS slot id for the Transport ptr
-        size_t tss_slot_id_;
-
-      };
-
-  }
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* CURRENT_IMPL_H */
diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp
deleted file mode 100644
index f2ff2564616..00000000000
--- a/TAO/tao/TransportCurrent/Current_Loader.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- C++ -*- */
-
-// =================================================================
-/**
- * @file Current_Loader.cpp
- *
- * $Id$
- *
- * @author Iliyan Jeliazkov <iliyan@ociweb.com>
- *
- */
-// =================================================================
-
-
-#include "ace/Service_Config.h"
-
-#include "tao/ORB_Constants.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "tao/TransportCurrent/Current_ORBInitializer.h"
-#include "tao/TransportCurrent/Current_Loader.h"
-#include "tao/TransportCurrent/Current_Impl.h"
-
-ACE_RCSID (TC,
-           Current_Loader,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace Transport
-  {
-
-    /// dtor
-    Current_Loader::~Current_Loader (void)
-    {
-    }
-
-
-
-    /// Initializes object when dynamic linking occurs.
-    int
-    Current_Loader::init (int, ACE_TCHAR *[])
-    {
-      PortableInterceptor::ORBInitializer_ptr tmp = 0;
-      ACE_NEW_THROW_EX (tmp,
-                        Current_ORBInitializer<Current_Impl>
-                          (ACE_TEXT ("TAO::Transport::Current")),
-                        CORBA::NO_MEMORY
-                          (CORBA::SystemException::_tao_minor_code (TAO::VMCID,
-                                                                    ENOMEM),
-                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
-
-      PortableInterceptor::ORBInitializer_var initializer (tmp);
-
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-
-  } /* namespace Transport */
-
-} /* namespace TAO */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-
-
-
-#if defined (TAO_AS_STATIC_LIBS)
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_REQUIRE (TAO_Transport_Current_Loader)
-
-namespace TAO
-{
-  namespace Transport
-  {
-    int current_static_initializer (void)
-    {
-      ACE_STATIC_SVC_REGISTER (TAO_Transport_Current_Loader);
-      return 0;
-    }
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (TAO_AS_STATIC_LIBS) */
-
-
-
-
-ACE_STATIC_SVC_DEFINE (TAO_Transport_Current_Loader,
-                       ACE_TEXT ("TAO_Transport_Current_Loader"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Transport_Current_Loader),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_NAMESPACE_DEFINE (TAO_Transport_Current,
-                              TAO_Transport_Current_Loader,
-                              TAO::Transport::Current_Loader)
diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h
deleted file mode 100644
index 1cb998ebcd7..00000000000
--- a/TAO/tao/TransportCurrent/Current_Loader.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Current_Loader.h
- *
- *  $Id$
- *
- *  @author Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_TRANSPORT_CURRENT_LOADER_H
-#define TAO_TRANSPORT_CURRENT_LOADER_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
-#include "tao/Versioned_Namespace.h"
-#include "tao/TransportCurrent/Transport_Current_Export.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  class ORBInitializer_Registry_Adapter;
-
-  namespace Transport
-  {
-
-    class TAO_Transport_Current_Export Current_Loader
-      : public ACE_Service_Object
-    {
-    public:
-
-      /// Initializes object when dynamic linking occurs.
-      virtual int init (int argc, ACE_TCHAR *argv[]);
-
-    protected:
-
-      // Protected destructor to enforce reference counting discipline
-      virtual ~Current_Loader (void);
-
-      ORBInitializer_Registry_Adapter* orbinitializer_registry (void);
-
-    private:
-
-      /// A cache for the registry pointer
-      ORBInitializer_Registry_Adapter* oir_;
-    };
-
-  }
-}
-
-
-#if defined (TAO_AS_STATIC_LIBS)
-namespace TAO
-{
-  namespace Transport
-  {
-    int current_static_initializer (void);
-  }
-}
-
-#endif /* defined (TAO_AS_STATIC_LIBS) */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Transport_Current,
-                               TAO_Transport_Current_Loader)
-
-ACE_FACTORY_DECLARE (TAO_Transport_Current,
-                     TAO_Transport_Current_Loader)
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TRANSPORT_CURRENT_LOADER_H */
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
deleted file mode 100644
index 7df02188655..00000000000
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-
-#ifndef CURRENT_ORBINITIALIZER_CPP
-#define CURRENT_ORBINITIALIZER_CPP
-
-#include "tao/ORB_Constants.h"
-#include "tao/TransportCurrent/Current_ORBInitializer.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace Transport
-  {
-
-    template <typename Impl>
-    Current_ORBInitializer<Impl>::Current_ORBInitializer(const ACE_TCHAR* id)
-      : Current_ORBInitializer_Base (id)
-    {
-    }
-
-
-    template <typename Impl>
-    TAO::Transport::Current_ptr
-    Current_ORBInitializer<Impl>::make_current_instance (TAO_ORB_Core* core,
-                                                         size_t tss_slot_id
-                                                         ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Create the Current
-        Current_ptr tmp = 0;
-        ACE_NEW_THROW_EX (tmp,
-                          Impl (core, tss_slot_id),
-                          CORBA::NO_MEMORY
-                            (CORBA::SystemException::_tao_minor_code (TAO::VMCID,
-                                                                      ENOMEM),
-                             CORBA::COMPLETED_NO));
-        ACE_CHECK;
-
-        return tmp;
-      }
-
-  }
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* CURRENT_ORBINITIALIZER_CPP */
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
deleted file mode 100644
index bf4d4dda30d..00000000000
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Current_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef CURRENT_ORBINITIALIZER_H
-#define CURRENT_ORBINITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TransportCurrent/Current_ORBInitializer_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace Transport
-  {
-
-    template <typename Impl>
-    class TAO_Transport_Current_Export Current_ORBInitializer
-      : public Current_ORBInitializer_Base
-    {
-    public:
-      Current_ORBInitializer (const ACE_TCHAR* id);
-
-
-    protected:
-      virtual TAO::Transport::Current_ptr
-      make_current_instance (TAO_ORB_Core* c,
-                             size_t s
-                             ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    };
-
-  }
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/TransportCurrent/Current_ORBInitializer.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("tao/TransportCurrent/Current_ORBInitializer.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* CURRENT_ORBINITIALIZER_H */
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
deleted file mode 100644
index bcd2e7d3d3c..00000000000
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-#include "tao/PI/ORBInitInfo.h"
-#include "tao/TransportCurrent/Current_ORBInitializer_Base.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace Transport
-  {
-
-    Current_ORBInitializer_Base::Current_ORBInitializer_Base(const ACE_TCHAR* id)
-      : id_ (id)
-    {
-    }
-
-    Current_ORBInitializer_Base::~Current_ORBInitializer_Base(void)
-    {
-    }
-
-
-
-    void
-    Current_ORBInitializer_Base::pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                                           ACE_ENV_ARG_DECL_NOT_USED )
-      ACE_THROW_SPEC( (CORBA::SystemException) )
-    {
-      // Narrow to a TAO_ORBInitInfo object to get access to the
-      // allocate_tss_slot_id() TAO extension.
-      TAO_ORBInitInfo_var tao_info =
-        TAO_ORBInitInfo::_narrow (info
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil (tao_info.in ()))
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        "TAO (%P|%t) TAO::Transport::ORBInitializer::pre_init - "
-                        "Panic: unable to narrow the ORBInitInfo_ptr\n"));
-
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-
-      // Reserve a TSS slot in the ORB core internal TSS resources for the
-      // thread-specific portion of the Current object.
-      size_t tss_slot = tao_info->allocate_tss_slot_id (0
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Create the Current
-      Current_var current (this->make_current_instance (tao_info->orb_core (),
-                                                        tss_slot
-                                                        ACE_ENV_ARG_PARAMETER));
-      ACE_CHECK;
-
-
-      info->register_initial_reference (ACE_TEXT_ALWAYS_CHAR (this->id_.fast_rep ()),
-                                        current.in ());
-
-    }
-
-    void
-    Current_ORBInitializer_Base::post_init (PortableInterceptor::ORBInitInfo_ptr
-                                            ACE_ENV_ARG_DECL_NOT_USED )
-      ACE_THROW_SPEC( (CORBA::SystemException) )
-    {
-    }
-
-  }
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
deleted file mode 100644
index 38b6cc903dc..00000000000
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Current_ORBInitializer_Base.h
- *
- *  $Id$
- *
- *  @author Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef CURRENT_ORBINITIALIZER_BASE_H
-#define CURRENT_ORBINITIALIZER_BASE_H
-
-#include /**/ "ace/pre.h"
-#include /**/ "tao/TransportCurrent/Transport_Current_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include "tao/PI/PI.h"
-
-#include "tao/TransportCurrent/TCC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace Transport
-  {
-
-    class TAO_Transport_Current_Export Current_ORBInitializer_Base :
-      public  PortableInterceptor::ORBInitializer
-      {
-      public:
-        Current_ORBInitializer_Base (const ACE_TCHAR* id);
-        virtual ~Current_ORBInitializer_Base (void);
-
-        virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED )
-          ACE_THROW_SPEC( (CORBA::SystemException) );
-
-        virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                                ACE_ENV_ARG_DECL_NOT_USED )
-          ACE_THROW_SPEC( (CORBA::SystemException) );
-
-      protected:
-        virtual TAO::Transport::Current_ptr
-        make_current_instance (TAO_ORB_Core* core,
-                               size_t tss_slot_id
-                               ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-      protected:
-        const ACE_TString id_;
-      };
-
-  }
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* CURRENT_ORBINITIALIZER_BASE_H */
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
deleted file mode 100644
index 97129f16539..00000000000
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// $Id$
-
-#include "ace/INET_Addr.h"
-#include "tao/IIOP_Connection_Handler.h"
-#include "tao/IIOP_Transport.h"
-#include "tao/Transport_Selection_Guard.h"
-
-#include "IIOP_Current_Impl.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-namespace TAO
-{
-  namespace Transport
-  {
-
-
-    /// Obtains the IIOP_Connection_Handler associated with the
-    /// Transport. Will throw NO_IMPLEMENT if the (selected) transport
-    /// () == 0, or if transport->connection_handler () == 0. Will
-    /// throw NoContext, if no transport has been selected yet.
-
-    TAO_IIOP_Connection_Handler*
-    IIOP_Current_Impl::handler (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
-      const TAO_Transport* t = this->transport ();
-      if (t == 0)
-        ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-
-      TAO_Connection_Handler *ch = const_cast<TAO_Transport*>(t)->connection_handler ();
-      if (ch == 0)
-        ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-
-      return dynamic_cast <TAO_IIOP_Connection_Handler*> (ch);
-#else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-#endif
-    }
-
-
-    /// Ctor
-
-    IIOP_Current_Impl::IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id)
-      : Current_Impl (core, tss_slot_id)
-    {
-    }
-
-
-    /// Dtor
-
-    IIOP_Current_Impl::~IIOP_Current_Impl (void)
-    {
-    }
-
-    CORBA::Long
-    IIOP_Current_Impl::id (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
-      // Need to use cast to pacify windows compilers complaining
-      // about the implicit HANDLE -> CORBA::Long conversion.
-      return (CORBA::Long) this->handler ()->get_handle ();
-#else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-#endif
-    }
-
-    ::SSLIOP::Current_ptr
-    IIOP_Current_Impl::ssliop_current (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-        ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-    }
-
-
-    CORBA::Long
-    IIOP_Current_Impl::remote_port (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
-      TAO_IIOP_Connection_Handler *iiopch =
-        this->handler ();
-
-      ACE_INET_Addr a;
-      iiopch->peer ().get_remote_addr (a);
-
-      return a.get_port_number ();
-#else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-#endif
-    }
-
-    char*
-    IIOP_Current_Impl::remote_host (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
-      TAO_IIOP_Connection_Handler *iiopch =
-        this->handler ();
-
-      ACE_INET_Addr a;
-      iiopch->peer ().get_remote_addr (a);
-
-      return CORBA::string_dup (a.get_host_addr ());
-#else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-#endif
-    }
-
-    CORBA::Long
-    IIOP_Current_Impl::local_port (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
-      TAO_IIOP_Connection_Handler *iiopch =
-        this->handler ();
-
-      ACE_INET_Addr a;
-      iiopch->peer ().get_local_addr (a);
-
-      return a.get_port_number ();
-#else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-#endif
-    }
-
-    char*
-    IIOP_Current_Impl::local_host (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
-    {
-#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
-      TAO_IIOP_Connection_Handler *iiopch =
-        this->handler ();
-
-      ACE_INET_Addr a;
-      iiopch->peer ().get_local_addr (a);
-
-      return CORBA::string_dup (a.get_host_addr ());
-#else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-#endif
-    }
-
-  }
-}
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
deleted file mode 100644
index a39f527b50e..00000000000
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * @file IIOP_Current_Impl.h
- *
- * @brief Provide implementation for the IIOPTraits interface
- *
- * $Id$
- *
- * @author Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-
-#ifndef IIOP_CURRENT_IMPL_H
-#define IIOP_CURRENT_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TransportCurrent/TC_IIOPC.h"
-#include "tao/TransportCurrent/Current_Impl.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Transport;
-class TAO_IIOP_Connection_Handler;
-
-namespace TAO
-{
-  namespace Transport
-  {
-
-    /**
-     * @class IIOP_Current_Impl
-     *
-     * @brief Implementation of the TAO::Transport::IIOPCurrent
-     * interface.
-     *
-     * IIOP_Current_Impl is useful for obtaining information about the
-     * IIOP Transport, associated with the calling thread.
-     */
-    class TAO_Transport_Current_Export IIOP_Current_Impl
-      : public virtual IIOP::Current
-      , public virtual Current_Impl
-      {
-      public:
-
-        /// Constructor.
-        IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
-
-        //@{
-        virtual ::CORBA::Long id (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual ::SSLIOP::Current_ptr ssliop_current (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual ::CORBA::Long remote_port (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual char* remote_host (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual ::CORBA::Long local_port (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-        virtual char* local_host (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-        //@}
-
-
-      protected:
-
-        /// Destructor
-        /**
-         * Protected destructor to enforce the fact this class is reference
-         * counted, and should not be destroyed using delete() by anything
-         * other than the reference counting mechanism.
-         */
-        virtual ~IIOP_Current_Impl (void);
-
-      private:
-
-        /// Returns the IIOP connection handler associated with the
-        /// Transport. Will throw NO_IMPLEMENT if the (selected) transport
-        /// () == 0, or if transport->connection_handler () == 0. Will
-        /// throw NoContext, if no transport has been selected yet.
-        TAO_IIOP_Connection_Handler* handler (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
-
-      private:
-
-        /// Prevent copying through the copy constructor and
-        /// assignment operator.
-        //@{
-        IIOP_Current_Impl (const IIOP_Current_Impl &);
-        void operator= (const IIOP_Current_Impl &);
-        //@}
-
-      };
-  }
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* IIOP_CURRENT_IMPL_H */
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
deleted file mode 100644
index 97d2a1071d4..00000000000
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- C++ -*- */
-
-// =================================================================
-/**
- * @file IIOP_Current_Loader.cpp
- *
- * $Id$
- *
- * @author Iliyan Jeliazkov <iliyan@ociweb.com>
- *
- */
-// =================================================================
-
-
-#include "ace/Service_Config.h"
-
-#include "tao/ORBInitializer_Registry.h"
-#include "tao/ORB_Constants.h"
-
-#include "tao/PI/PI.h"
-
-#include "tao/TransportCurrent/Current_ORBInitializer.h"
-#include "tao/TransportCurrent/IIOP_Current_Loader.h"
-#include "tao/TransportCurrent/IIOP_Current_Impl.h"
-
-ACE_RCSID (Transport_Current,
-           IIOP_Current_Loader,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace Transport
-  {
-    namespace IIOP
-    {
-      /// Initializes object when dynamic linking occurs.
-      int
-      Current_Loader::init (int, ACE_TCHAR *[])
-      {
-        PortableInterceptor::ORBInitializer_ptr tmp = 0;
-        ACE_NEW_THROW_EX (tmp,
-                          Current_ORBInitializer<IIOP_Current_Impl> (ACE_TEXT ("TAO::Transport::IIOP::Current")),
-                          CORBA::NO_MEMORY (CORBA::SystemException::_tao_minor_code (TAO::VMCID,
-                                                                                     ENOMEM),
-                                            CORBA::COMPLETED_NO));
-        ACE_TRY_CHECK;
-
-        PortableInterceptor::ORBInitializer_var initializer (tmp);
-
-        PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        return 0;
-      }
-
-      Current_Loader::Current_Loader ()
-      {
-      }
-
-      Current_Loader::~Current_Loader ()
-      {
-      }
-
-    }
-
-  }
-}
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-
-#if defined (TAO_AS_STATIC_LIBS)
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_REQUIRE (TAO_Transport_IIOP_Current_Loader)
-
-namespace TAO
-{
-  namespace Transport
-  {
-    namespace IIOP
-    {
-      int current_static_initializer (void)
-      {
-        ACE_STATIC_SVC_REGISTER (TAO_Transport_IIOP_Current_Loader);
-        return 0;
-      }
-    }
-  }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-}
-#endif /* defined (TAO_AS_STATIC_LIBS) */
-
-
-ACE_STATIC_SVC_DEFINE (TAO_Transport_IIOP_Current_Loader,
-                       ACE_TEXT ("TAO_Transport_IIOP_Current_Loader"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Transport_IIOP_Current_Loader),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_NAMESPACE_DEFINE (TAO_Transport_Current,
-                              TAO_Transport_IIOP_Current_Loader,
-                              TAO::Transport::IIOP::Current_Loader)
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
deleted file mode 100644
index 2199de74781..00000000000
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    IIOP_Current_Loader.h
- *
- *  $Id$
- *
- *  @author Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_TRANSPORT_IIOP_TRAITS_LOADER_H
-#define TAO_TRANSPORT_IIOP_TRAITS_LOADER_H
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TransportCurrent/Current_Loader.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-
-  namespace Transport
-  {
-
-    namespace IIOP
-    {
-      class TAO_Transport_Current_Export Current_Loader
-        : public TAO::Transport::Current_Loader
-      {
-      public:
-        /// Initializes object when dynamic linking occurs.
-        virtual int init (int argc, ACE_TCHAR *argv[]);
-        virtual ~Current_Loader ();
-        Current_Loader ();
-      };
-    }
-  }
-}
-
-
-
-#if defined (TAO_AS_STATIC_LIBS)
-namespace TAO
-{
-  namespace Transport
-  {
-    namespace IIOP
-    {
-      int current_static_initializer (void);
-    }
-  }
-}
-
-#endif /* defined (TAO_AS_STATIC_LIBS) */
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Transport_Current,
-                               TAO_Transport_IIOP_Current_Loader)
-
-ACE_FACTORY_DECLARE (TAO_Transport_Current,
-                     TAO_Transport_IIOP_Current_Loader)
-
-#endif /* TAO_TRANSPORT_IIOP_TRAITS_LOADER_H */
diff --git a/TAO/tao/TransportCurrent/IIOP_Transport_Current.h b/TAO/tao/TransportCurrent/IIOP_Transport_Current.h
deleted file mode 100644
index 9a59cc00f27..00000000000
--- a/TAO/tao/TransportCurrent/IIOP_Transport_Current.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-
-#include "tao/TransportCurrent/TCC.h"
-#include "tao/TransportCurrent/TC_IIOPC.h"
-#include "tao/TransportCurrent/IIOP_Current_Loader.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-
-// Only do this for static builds. It causes a circular dependency for
-// dynamic builds.
-static int tao_iiop_transport_current_initializer_called =
-  TAO::Transport::IIOP::current_static_initializer ();
-
-#endif /* TAO_AS_STATIC_LIBS */
-
diff --git a/TAO/tao/TransportCurrent/TC.idl b/TAO/tao/TransportCurrent/TC.idl
deleted file mode 100644
index 152da12caa6..00000000000
--- a/TAO/tao/TransportCurrent/TC.idl
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @file TC.idl
- *
- * @brief Defines the TAO::Transport::Current interface
- *
- * $Id$
- *
- * @author Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-
-#ifndef TAO_TRANSPORT_CURRENT_IDL
-#define TAO_TRANSPORT_CURRENT_IDL
-
-#include "tao/IOP.pidl"
-#include "tao/TimeBase.pidl"
-
-module TAO
-{
-  /// A type used to represent counters
-  typedef unsigned long long CounterT;
-
-  module Transport
-  {
-    /// Used to signal that a call was made within improper invocation
-    /// context.  Also, this exception is thrown if no Transport has
-    /// been selected for the current thread, for example in a
-    /// collocated invocation.
-
-    exception NoContext
-    {
-    };
-
-    // The primary interface, providing access to Transport
-    // information, available to the current thread.
-
-    local interface Current
-    {
-      /// Transport ID, unique within the process.
-      readonly attribute long id raises (NoContext);
-
-      /// Bytes sent/received through the transport.
-      readonly attribute CounterT bytes_sent raises (NoContext);
-      readonly attribute CounterT bytes_received raises (NoContext);
-
-      /// Messages (requests and replies) sent/received using the current
-      /// protocol.
-      readonly attribute CounterT messages_sent raises (NoContext);
-      readonly attribute CounterT messages_received raises (NoContext);
-
-      /// The absolute time (miliseconds) since the transport has been
-      /// open.
-      readonly attribute TimeBase::TimeT open_since raises (NoContext);
-    };
-  };
-};
-
-#endif /* TAO_TRANSPORT_CURRENT_IDL */
diff --git a/TAO/tao/TransportCurrent/TC_IIOP.idl b/TAO/tao/TransportCurrent/TC_IIOP.idl
deleted file mode 100644
index 91dfe1f43d5..00000000000
--- a/TAO/tao/TransportCurrent/TC_IIOP.idl
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @file TC_IIOP.idl
- *
- * @brief Defines the TAO::Transport::IIOP::Current interface
- *
- * $Id$
- *
- * @author Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-
-#ifndef TAO_TRANSPORT_IIOP_CURRENT_IDL
-#define TAO_TRANSPORT_IIOP_CURRENT_IDL
-
-#include "tao/TransportCurrent/TC.idl"
-
-/// Provide a forward reference for the SSLIOP::Current
-module SSLIOP
-{
-  interface Current;
-};
-
-
-module TAO
-{
-  module Transport
-  {
-    module IIOP
-    {
-      // The primary interface, providing access to IIOP-specific
-      // transport information, if it is indeed an IIOP (-like) transport
-      // that has been selected.
-
-      local interface Current : TAO::Transport::Current
-      {
-        /// Remote host
-        readonly attribute string remote_host raises (NoContext);
-
-        /// Remote port Using long (signed) type to better accomodate
-        /// the Java mapping, which has no support for unsigned values
-        readonly attribute long remote_port raises (NoContext);
-
-        /// Local host
-        readonly attribute string local_host raises (NoContext);
-
-        /// Local port
-        readonly attribute long local_port raises (NoContext);
-
-        /// If this is a "secure" transport, this method will give you
-        /// the corresponding SSLIOP::Current
-        readonly attribute ::SSLIOP::Current ssliop_current raises (NoContext);
-      };
-    };
-  };
-};
-
-#endif /* TAO_TRANSPORT_IIOP_CURRENT_IDL */
diff --git a/TAO/tao/TransportCurrent/Transport_Current.h b/TAO/tao/TransportCurrent/Transport_Current.h
deleted file mode 100644
index 2d776e8d6b6..00000000000
--- a/TAO/tao/TransportCurrent/Transport_Current.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-
-#include "tao/TransportCurrent/TCC.h"
-#include "tao/TransportCurrent/Current_Loader.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-
-// Only do this for static builds. It causes a circular dependency for
-// dynamic builds.
-static int tao_transport_current_initializer_called =
-  TAO::Transport::current_static_initializer ();
-
-#endif /* TAO_AS_STATIC_LIBS */
-
diff --git a/TAO/tao/TransportCurrent/Transport_Current_Export.h b/TAO/tao/TransportCurrent/Transport_Current_Export.h
deleted file mode 100644
index 8a80e0992f8..00000000000
--- a/TAO/tao/TransportCurrent/Transport_Current_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id:$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -d TAO_Transport_Current
-// ------------------------------
-#ifndef TAO_TRANSPORT_CURRENT_EXPORT_H
-#define TAO_TRANSPORT_CURRENT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_TRANSPORT_CURRENT_HAS_DLL)
-#  define TAO_TRANSPORT_CURRENT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_TRANSPORT_CURRENT_HAS_DLL */
-
-#if !defined (TAO_TRANSPORT_CURRENT_HAS_DLL)
-#  define TAO_TRANSPORT_CURRENT_HAS_DLL 1
-#endif /* ! TAO_TRANSPORT_CURRENT_HAS_DLL */
-
-#if defined (TAO_TRANSPORT_CURRENT_HAS_DLL) && (TAO_TRANSPORT_CURRENT_HAS_DLL == 1)
-#  if defined (TAO_TRANSPORT_CURRENT_BUILD_DLL)
-#    define TAO_Transport_Current_Export ACE_Proper_Export_Flag
-#    define TAO_TRANSPORT_CURRENT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_TRANSPORT_CURRENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_TRANSPORT_CURRENT_BUILD_DLL */
-#    define TAO_Transport_Current_Export ACE_Proper_Import_Flag
-#    define TAO_TRANSPORT_CURRENT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_TRANSPORT_CURRENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_TRANSPORT_CURRENT_BUILD_DLL */
-#else /* TAO_TRANSPORT_CURRENT_HAS_DLL == 1 */
-#  define TAO_Transport_Current_Export
-#  define TAO_TRANSPORT_CURRENT_SINGLETON_DECLARATION(T)
-#  define TAO_TRANSPORT_CURRENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_TRANSPORT_CURRENT_HAS_DLL == 1 */
-
-// Set TAO_TRANSPORT_CURRENT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_TRANSPORT_CURRENT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_TRANSPORT_CURRENT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_TRANSPORT_CURRENT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_TRANSPORT_CURRENT_NTRACE */
-
-#if (TAO_TRANSPORT_CURRENT_NTRACE == 1)
-#  define TAO_TRANSPORT_CURRENT_TRACE(X)
-#else /* (TAO_TRANSPORT_CURRENT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_TRANSPORT_CURRENT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_TRANSPORT_CURRENT_NTRACE == 1) */
-
-#endif /* TAO_TRANSPORT_CURRENT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 1fd2461becb..9047a30bf1b 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -94,6 +94,11 @@ TAO_Connector::corbaloc_scan (const char *str,
   const char *slash_pos = ACE_OS::strchr (str,'/');
   if (comma_pos == 0 && slash_pos == 0)
     {
+      if (TAO_debug_level)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT("TAO (%P|%t) TAO_Connector::corbaloc_scan warning: ")
+                    ACE_TEXT("supplied string contains no comma or slash: %s\n"),
+                    str));
       len = ACE_OS::strlen (str);
     }
   else if (comma_pos == 0 || comma_pos > slash_pos)
diff --git a/TAO/tao/Transport_Selection_Guard.cpp b/TAO/tao/Transport_Selection_Guard.cpp
deleted file mode 100644
index 6f29477d5c4..00000000000
--- a/TAO/tao/Transport_Selection_Guard.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-#include "tao/Transport_Selection_Guard.h"
-#include "tao/TSS_Resources.h"
-
-ACE_RCSID (tao,
-           Transport_Selection_Guard.cpp,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-
-  Transport_Selection_Guard*
-  Transport_Selection_Guard::current (TAO_ORB_Core* core, size_t tss_slot_id)
-  {
-    // @NOTE: (Iliyan) Started making this method aware of the core
-    // and the tss slot that correspond to the "current" transport,
-    // influenced by a general design preference to keep things
-    // local. The idea was to make the current TSG part of the TSS
-    // storage for a specific ORB Core, as opposed to using the global
-    // TSS Resources. However, it really doesn't offer any benefit to
-    // store a Transport pointer locally, for each ORB. There is
-    // always only one current Transport per thread. Period. The
-    // number of ORB Core instances in existence does not change that
-    // fact, so keeping a separate pointer would have been an
-    // over-kill.
-    ACE_UNUSED_ARG (core);
-    ACE_UNUSED_ARG (tss_slot_id);
-
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-    return TAO_TSS_Resources::instance ()->tsg_;
-
-#else  /* TAO_HAS_TRANSPORT_CURRENT != 1 */
-
-    return 0;
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-  }
-
-
-
-  /// Ctor
-  Transport_Selection_Guard::Transport_Selection_Guard (TAO_Transport* t)
-    :
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-    prev_ (TAO_TSS_Resources::instance ()->tsg_)
-    ,
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-    curr_ (t)
-  {
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-    TAO_TSS_Resources::instance ()->tsg_ = this;
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-
-  }
-
-
-
-  /// Dtor
-  Transport_Selection_Guard::~Transport_Selection_Guard (void)
-  {
-
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-    TAO_TSS_Resources::instance ()->tsg_ = prev_;
-    this->prev_ = 0;
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-    this->curr_ = 0;
-  }
-
-} /* namespace TAO */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h
deleted file mode 100644
index 96f3deac271..00000000000
--- a/TAO/tao/Transport_Selection_Guard.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Transport_Selection_Guard.h
- *
- *  $Id$
- *
- *  @author Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-// ===================================================================
-
-#ifndef TAO_TRANSPORT_SELECTION_GUARD_H
-#define TAO_TRANSPORT_SELECTION_GUARD_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Environment.h"
-
-/* #include "tao/Policy_Current_Impl.h" */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Forward declarations
-class TAO_Transport;
-
-namespace TAO
-{
-  /**
-   * @class Transport_Selection_Guard
-   *
-   * @brief Used by the Transport Current feature to keep track of
-   * which Transport is currently active.
-   *
-   * Whenever a Transport is selected: during an upcall, or prior to a
-   * client invocation an instance of this class is created [on the
-   * stack, or as a member of another class] to keep track of the said
-   * Transport.  The class implements the RAII idiom, which makes it
-   * possible to build a stack of these instances as the thread is
-   * doing nested upcalls or client invocations.
-   *
-   * It utilizes TAO_TSS_Resources::tsg_ member pointer to keep track
-   * of stack-linked Transport_Selection_Guard instances.
-   *
-   * If the Transport Current feature is disabled most methods are
-   * no-ops and add no overhead on the critical path.
-   *
-   * <B>See Also:</B>
-   *
-   * https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/TAO/docs/transport_current/index.html?revision=HEAD
-   *
-   */
-  class TAO_Export Transport_Selection_Guard
-  {
-  public:
-
-    static Transport_Selection_Guard* current (TAO_ORB_Core* core,
-                                               size_t tss_slot_id);
-
-  public:
-
-    /// Ctor
-    Transport_Selection_Guard (TAO_Transport* t);
-
-    /// Dtor
-    ~Transport_Selection_Guard (void);
-
-    /// getter
-    TAO_Transport* operator-> (void) const
-    {
-      return this->get ();
-    };
-
-    /// getter
-    TAO_Transport& operator* (void) const
-    {
-      return *this->get ();
-    };
-
-    /// Getter
-    TAO_Transport* get (void) const
-    {
-      return this->curr_;
-    };
-
-    /// Setter
-    Transport_Selection_Guard& set (TAO_Transport* t)
-    {
-      this->curr_ = t;
-      return *this;
-    };
-
-  private:
-    ACE_UNIMPLEMENTED_FUNC (Transport_Selection_Guard (const Transport_Selection_Guard&))
-    ACE_UNIMPLEMENTED_FUNC (Transport_Selection_Guard& operator=(const Transport_Selection_Guard&))
-
-#if TAO_HAS_TRANSPORT_CURRENT == 1
-
-    /// This is pointing to the guard that was active prior to
-    /// instantiating us.
-
-    Transport_Selection_Guard* prev_;
-
-#endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-
-    /// The "real" Transport, i.e. the one selected at present
-    TAO_Transport* curr_;
-  };
-
-} /* namespace TAO */
-
-
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TRANSPORT_SELECTION_GUARD_H */
diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc
index 96bfb2cfb71..d6cf7fa82fe 100644
--- a/TAO/tao/TypeCodeFactory.mpc
+++ b/TAO/tao/TypeCodeFactory.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, ifr_client, tao_versioning_idl_defaults {
+project : taolib, core, ifr_client, tao_versioning_idl_defaults {
   sharedname   = TAO_TypeCodeFactory
   dynamicflags = TAO_TYPECODEFACTORY_BUILD_DLL
 
@@ -27,7 +27,7 @@ project : taolib, install, ifr_client, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -SS -Sci -Sorb \
+    idlflags += -SS -Sci -Ge 1 -Sorb \
                 -Wb,export_macro=TAO_TypeCodeFactory_Export \
                 -Wb,export_include=tao/TypeCodeFactory/typecodefactory_export.h \
                 -o TypeCodeFactory
diff --git a/TAO/tao/ULongLongSeq.pidl b/TAO/tao/ULongLongSeq.pidl
index 508fede9408..319ecb57382 100644
--- a/TAO/tao/ULongLongSeq.pidl
+++ b/TAO/tao/ULongLongSeq.pidl
@@ -8,7 +8,7 @@
  *
  *     tao_idl
  *          -oA AnyTypeCode
- *          -GA -SS -Sci
+ *          -Ge 1 -GA -SS -Sci
  *          -Wb,pre_include=ace/pre.h
  *          -Wb,post_include=ace/post.h
  *          -Wb,export_macro=TAO_Export
diff --git a/TAO/tao/ULongSeq.pidl b/TAO/tao/ULongSeq.pidl
index 28222f49129..1c026ceb332 100644
--- a/TAO/tao/ULongSeq.pidl
+++ b/TAO/tao/ULongSeq.pidl
@@ -9,7 +9,7 @@
  * The command used to generate code is:
  *
  * tao_idl
- *   -o orig -GA -SS -Sci
+ *   -o orig -Ge 1 -GA -SS -Sci
  *      -Wb,export_macro=TAO_Export
  *      -Wb,export_include=tao/TAO_Export.h
  *      -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl
index 2a966767ae0..9a6e6bd9667 100644
--- a/TAO/tao/UShortSeq.pidl
+++ b/TAO/tao/UShortSeq.pidl
@@ -8,12 +8,15 @@
  * The command used to generate code is:
  *
  *     tao_idl
- *        -o orig -GA -SS -Sci
+ *        -o orig -Ge 1 -GA -SS -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include=tao/TAO_Export.h
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          UShortSeq.pidl
+ *
+ * Patches for changes to the generated code are available in the
+ * `diffs' directory.
  */
 // ================================================================
 
diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp
new file mode 100644
index 00000000000..53db618d251
--- /dev/null
+++ b/TAO/tao/UShortSeqC.cpp
@@ -0,0 +1,127 @@
+// -*- 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:291
+
+
+#include "tao/UShortSeqC.h"
+#include "tao/CDR.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:70
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/sequence_cs.cpp:65
+
+#if !defined (_CORBA_USHORTSEQ_CS_)
+#define _CORBA_USHORTSEQ_CS_
+
+CORBA::UShortSeq::UShortSeq (void)
+{}
+
+CORBA::UShortSeq::UShortSeq (
+    CORBA::ULong max
+  )
+  : TAO::unbounded_value_sequence<
+        CORBA::UShort
+      >
+    (max)
+{}
+
+CORBA::UShortSeq::UShortSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::UShort * buffer,
+    CORBA::Boolean release
+  )
+  : TAO::unbounded_value_sequence<
+        CORBA::UShort
+      >
+    (max, length, buffer, release)
+{}
+
+CORBA::UShortSeq::UShortSeq (
+    const UShortSeq &seq
+  )
+  : TAO::unbounded_value_sequence<
+        CORBA::UShort
+      >
+    (seq)
+{}
+
+CORBA::UShortSeq::~UShortSeq (void)
+{}
+
+void CORBA::UShortSeq::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  UShortSeq * _tao_tmp_pointer =
+    static_cast<UShortSeq *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
+
+#if !defined _TAO_CDR_OP_CORBA_UShortSeq_CPP_
+#define _TAO_CDR_OP_CORBA_UShortSeq_CPP_
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::UShortSeq &_tao_sequence
+  )
+{
+  return TAO::marshal_sequence(strm, _tao_sequence);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::UShortSeq &_tao_sequence
+  )
+{
+  return TAO::demarshal_sequence(strm, _tao_sequence);
+}
+
+#endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h
new file mode 100644
index 00000000000..71584f71a87
--- /dev/null
+++ b/TAO/tao/UShortSeqC.h
@@ -0,0 +1,177 @@
+// -*- 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:153
+
+#ifndef _TAO_IDL_ORIG_USHORTSEQC_H_
+#define _TAO_IDL_ORIG_USHORTSEQC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+#include "tao/Sequence_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+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
+      >
+    UShortSeq_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        UShortSeq
+      >
+    UShortSeq_out;
+
+  class TAO_Export UShortSeq
+    : public
+        TAO::unbounded_value_sequence<
+            CORBA::UShort
+          >
+  {
+  public:
+    UShortSeq (void);
+    UShortSeq (CORBA::ULong max);
+    UShortSeq (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::UShort* buffer,
+        CORBA::Boolean release = false
+      );
+    UShortSeq (const UShortSeq &);
+    ~UShortSeq (void);
+
+    static void _tao_any_destructor (void *);
+
+    typedef UShortSeq_var _var_type;
+    typedef UShortSeq_out _out_type;
+  };
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+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_value_sequence<CORBA::UShortSeq>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
+
+#if !defined _TAO_CDR_OP_CORBA_UShortSeq_H_
+#define _TAO_CDR_OP_CORBA_UShortSeq_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::UShortSeq &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::UShortSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:955
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/UShortSeqS.h b/TAO/tao/UShortSeqS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/UShortSeqS.h
@@ -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
+
+// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Unbounded_Basic_String_Sequence_T.h b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
index badabecacd5..79aed91cb64 100644
--- a/TAO/tao/Unbounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
@@ -18,6 +18,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
+namespace details
+{
+
 template<typename charT>
 class unbounded_basic_string_sequence
 {
@@ -36,13 +39,9 @@ public:
   typedef element_type subscript_type;
   typedef const_value_type const_subscript_type;
 
-
-  /// @copydoc details::generic_sequence::generic_sequence
   inline unbounded_basic_string_sequence()
     : impl_()
   {}
-
-
   inline explicit unbounded_basic_string_sequence(CORBA::ULong maximum)
     : impl_(maximum)
   {}
@@ -55,36 +54,28 @@ public:
   {}
 
   /* Use default ctor, operator= and dtor */
-
-  /// @copydoc details::generic_sequence::maximum
   inline CORBA::ULong maximum() const {
     return impl_.maximum();
   }
-  /// @copydoc details::generic_sequence::release
   inline CORBA::Boolean release() const {
     return impl_.release();
   }
-  /// @copydoc details::generic_sequence::length
   inline CORBA::ULong length() const {
     return impl_.length();
   }
-  /// @copydoc details::generic_sequence::length
+
   inline void length(CORBA::ULong length) {
     impl_.length(length);
   }
-  /// @copydoc details::generic_sequence::operator[]
   inline const_value_type operator[](CORBA::ULong i) const {
     return impl_[i];
   }
-  /// @copydoc details::generic_sequence::operator[]
   inline element_type operator[](CORBA::ULong i) {
     return element_type(impl_[i], release());
   }
-  /// @copydoc details::generic_sequence::get_buffer
   inline const_value_type const * get_buffer() const {
     return impl_.get_buffer();
   }
-  /// @copydoc details::generic_sequence::replace
   inline void replace(
       CORBA::ULong maximum,
       CORBA::ULong length,
@@ -92,11 +83,9 @@ public:
       CORBA::Boolean release = false) {
     impl_.replace(maximum, length, data, release);
   }
-  /// @copydoc details::generic_sequence::get_buffer(CORBA::Boolean)
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  /// @copydoc details::generic_sequence::swap
   inline void swap(unbounded_basic_string_sequence & rhs) throw() {
     impl_.swap(rhs.impl_);
   }
@@ -114,6 +103,8 @@ public:
 private:
   implementation_type impl_;
 };
+
+} // namespace details
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h
index 9d5235f2230..2122011291f 100644
--- a/TAO/tao/Unbounded_Octet_Sequence_T.h
+++ b/TAO/tao/Unbounded_Octet_Sequence_T.h
@@ -15,7 +15,6 @@
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
 
-#include /**/ "tao/TAO_Export.h"
 #include "tao/Unbounded_Value_Allocation_Traits_T.h"
 #include "tao/Value_Traits_T.h"
 #include "tao/Range_Checking_T.h"
@@ -30,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 template<>
-class TAO_Export unbounded_value_sequence<CORBA::Octet>
+class unbounded_value_sequence<CORBA::Octet>
 {
 public:
   typedef CORBA::Octet value_type;
@@ -220,11 +219,15 @@ public:
         return false;
       }
 
-    const CORBA::Octet * rhs_buff = rhs.get_buffer ();
-    const CORBA::Octet * lhs_buff = this->get_buffer ();
-    const bool result = (ACE_OS::memcmp (lhs_buff, rhs_buff, rlen) == 0);
+    for (::CORBA::ULong i = 0; i < rlen; ++i)
+      {
+        if (rhs[i] != this->buffer_[i])
+          {
+            return false;
+          }
+      }
 
-    return result;
+    return true;
   }
 
   inline bool operator!= (const unbounded_value_sequence<CORBA::Octet> & rhs) const
@@ -338,11 +341,15 @@ operator== (const TAO_VERSIONED_NAMESPACE_NAME::TAO::unbounded_value_sequence<CO
       return false;
     }
 
-  const CORBA::Octet * rhs_buff = rhs.get_buffer ();
-  const CORBA::Octet * lhs_buff = lhs.get_buffer ();
-  const bool result = (ACE_OS::memcmp (lhs_buff, rhs_buff, rlen) == 0);
+  for (::CORBA::ULong i = 0; i < rlen; ++i)
+    {
+      if (rhs[i] != lhs[i])
+        {
+          return false;
+        }
+    }
 
-  return result;
+  return true;
 }
 
 inline
diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h
index 77bdef93629..519a1a1b989 100644
--- a/TAO/tao/Unbounded_Sequence_CDR_T.h
+++ b/TAO/tao/Unbounded_Sequence_CDR_T.h
@@ -12,6 +12,7 @@
  */
 
 #include "tao/orbconf.h"
+#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -316,8 +317,8 @@ namespace TAO {
   }
 
   template <typename stream, typename charT>
-  bool demarshal_sequence(stream & strm, TAO::unbounded_basic_string_sequence <charT> & target) {
-    typedef TAO::unbounded_basic_string_sequence <charT> sequence;
+  bool demarshal_sequence(stream & strm, TAO::details::unbounded_basic_string_sequence <charT> & target) {
+    typedef TAO::details::unbounded_basic_string_sequence <charT> sequence;
     typedef typename sequence::element_traits::string_var string_var;
     ::CORBA::ULong new_length = 0;
     if (!(strm >> new_length)) {
@@ -367,6 +368,8 @@ namespace TAO {
 namespace TAO {
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Short> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -376,6 +379,8 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Long> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -385,6 +390,8 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::ULong> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -394,6 +401,8 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::UShort> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -404,6 +413,8 @@ namespace TAO {
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Octet> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -416,6 +427,8 @@ namespace TAO {
 #else
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Octet> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -426,6 +439,8 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Char> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -436,6 +451,8 @@ namespace TAO {
 # if (defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)) && !defined (ACE_LACKS_NATIVE_WCHAR_T)
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::WChar> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -446,6 +463,8 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Float> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -455,6 +474,8 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Double> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -464,6 +485,8 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::ULongLong> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -473,6 +496,8 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::LongDouble> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -482,6 +507,8 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Boolean> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -491,6 +518,8 @@ namespace TAO {
 
   template <typename stream, typename value_t>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <value_t> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -504,7 +533,9 @@ namespace TAO {
   }
 
   template <typename stream, typename charT>
-  bool marshal_sequence(stream & strm, const TAO::unbounded_basic_string_sequence <charT> & source) {
+  bool marshal_sequence(stream & strm, const TAO::details::unbounded_basic_string_sequence <charT> & source) {
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -520,6 +551,8 @@ namespace TAO {
   template <typename stream, typename object_t, typename object_t_var>
   bool marshal_sequence(stream & strm, const TAO::unbounded_object_reference_sequence<object_t, object_t_var> & source) {
     typedef typename TAO::unbounded_object_reference_sequence<object_t, object_t_var>::object_type objec_t;
+    if (0 == &source)
+      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
diff --git a/TAO/tao/Unbounded_String_Sequence_T.h b/TAO/tao/Unbounded_String_Sequence_T.h
new file mode 100644
index 00000000000..9b126308dcd
--- /dev/null
+++ b/TAO/tao/Unbounded_String_Sequence_T.h
@@ -0,0 +1,43 @@
+#ifndef guard_unbounded_string_sequence_hpp
+#define guard_unbounded_string_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement unbounded sequences for strings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "tao/Unbounded_Basic_String_Sequence_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+class unbounded_string_sequence
+  : public details::unbounded_basic_string_sequence<char>
+{
+public:
+  inline unbounded_string_sequence()
+    : details::unbounded_basic_string_sequence<char>()
+  {}
+  inline explicit unbounded_string_sequence(CORBA::ULong maximum)
+    : details::unbounded_basic_string_sequence<char>(maximum)
+  {}
+  inline unbounded_string_sequence(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false)
+    : details::unbounded_basic_string_sequence<char>(
+        maximum, length, data, release)
+  {}
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_unbounded_string_sequence_hpp
diff --git a/TAO/tao/Unbounded_Wstring_Sequence_T.h b/TAO/tao/Unbounded_Wstring_Sequence_T.h
new file mode 100644
index 00000000000..fe8bd1d14b2
--- /dev/null
+++ b/TAO/tao/Unbounded_Wstring_Sequence_T.h
@@ -0,0 +1,43 @@
+#ifndef guard_unbounded_wstring_sequence_hpp
+#define guard_unbounded_wstring_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement unbounded sequences for wide strings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "tao/Unbounded_Basic_String_Sequence_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+class unbounded_wstring_sequence
+  : public details::unbounded_basic_string_sequence<CORBA::WChar>
+{
+public:
+  inline unbounded_wstring_sequence()
+    : details::unbounded_basic_string_sequence<CORBA::WChar>()
+  {}
+  inline /* explicit */ unbounded_wstring_sequence(CORBA::ULong maximum)
+    : details::unbounded_basic_string_sequence<CORBA::WChar>(maximum)
+  {}
+  inline unbounded_wstring_sequence(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false)
+    : details::unbounded_basic_string_sequence<CORBA::WChar>(
+        maximum, length, data, release)
+  {}
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_unbounded_wstring_sequence_hpp
diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc
index 53f2d817438..d5f8308c9a6 100644
--- a/TAO/tao/Utils.mpc
+++ b/TAO/tao/Utils.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : taolib, install, portableserver, pi {
+project : taolib, core, portableserver, pi {
   sharedname    = TAO_Utils
   dynamicflags  = TAO_UTILS_BUILD_DLL
 
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index d777b683ab8..7485985f09b 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -97,7 +97,19 @@ TAO_ORB_Manager::init (int &argc,
   return 0;
 }
 
-#if !defined (CORBA_E_MICRO)
+int
+TAO_ORB_Manager::init_child_poa (int& argc,
+                                 char **argv,
+                                 const char *poa_name
+                                 ACE_ENV_ARG_DECL)
+{
+  return this->init_child_poa (argc,
+                               argv,
+                               poa_name,
+                               0
+                               ACE_ENV_ARG_PARAMETER);
+}
+
 int
 TAO_ORB_Manager::init_child_poa (int& argc,
                                  char **argv,
@@ -105,11 +117,13 @@ TAO_ORB_Manager::init_child_poa (int& argc,
                                  const char *orb_name
                                  ACE_ENV_ARG_DECL)
 {
+  int init_result;
+
   // check to see if root poa has to be created.
-  int init_result = this->init (argc,
-                                argv,
-                                orb_name
-                                ACE_ENV_ARG_PARAMETER);
+  init_result = this->init (argc,
+                            argv,
+                            orb_name
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (init_result == -1)
@@ -157,7 +171,6 @@ TAO_ORB_Manager::init_child_poa (int& argc,
     }
   return 0;
 }
-#endif /* CORBA_E_MICRO */
 
 // Activate POA manager.
 
@@ -211,8 +224,8 @@ TAO_ORB_Manager::deactivate (const char *id
                                  ACE_ENV_ARG_PARAMETER);
 }
 
-#if !defined (CORBA_E_MICRO)
 // Activate the object with the object_name under the child POA.
+
 char *
 TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
                                            PortableServer::Servant servant
@@ -263,7 +276,6 @@ TAO_ORB_Manager::deactivate_under_child_poa (const char *id
   this->child_poa_->deactivate_object (object_id.in ()
                                        ACE_ENV_ARG_PARAMETER);
 }
-#endif /* CORBA_E_MICRO */
 
 // Enter the ORB event loop.
 
diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h
index 9f06fe7d3ba..520ca1af26e 100644
--- a/TAO/tao/Utils/ORB_Manager.h
+++ b/TAO/tao/Utils/ORB_Manager.h
@@ -82,7 +82,19 @@ public:
             const char *orb_name
             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-#if !defined (CORBA_E_MICRO)
+  /**
+   * Creates a child poa under the root poa with PERSISTENT and
+   * USER_ID policies.  Call this if you want a @c child_poa with the
+   * above policies, otherwise call init.
+   *
+   * @retval -1 Failure
+   * @retval 0 Success
+   */
+  int init_child_poa (int &argc,
+                      char *argv[],
+                      const char *poa_name
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
   /**
    * Creates a child poa under the root poa with PERSISTENT and
    * USER_ID policies.  Call this if you want a @a child_poa with the
@@ -94,9 +106,8 @@ public:
   int init_child_poa (int &argc,
                       char *argv[],
                       const char *poa_name,
-                      const char *orb_name = 0
+                      const char *orb_name
                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-#endif /* CORBA_E_MICRO */
 
   /**
    * Shut down.  Invoke the destroy() methods on the orb and poa.
@@ -142,7 +153,6 @@ public:
   void deactivate (const char *id
                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-#if !defined (CORBA_E_MICRO)
   /**
    * Precondition: init_child_poa has been called.  Activate <servant>
    * using the POA <activate_object_with_id> created from the string
@@ -169,7 +179,6 @@ public:
    */
   void deactivate_under_child_poa (const char *id
                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-#endif /* CORBA_E_MICRO */
 
   /**
    * Run the ORB event loop with the specified @a tv time value.
diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc
index a10c050f1dc..244d31c87ad 100644
--- a/TAO/tao/Valuetype.mpc
+++ b/TAO/tao/Valuetype.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, install, core_anytypecode, avoids_corba_e_micro, tao_versioning_idl_defaults {
+project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
   sharedname    = TAO_Valuetype
   dynamicflags  = TAO_VALUETYPE_BUILD_DLL
 
@@ -27,7 +27,7 @@ project : taolib, install, core_anytypecode, avoids_corba_e_micro, tao_versionin
   }
 
   IDL_Files {
-    idlflags += -SS -Sorb \
+    idlflags += -SS -Ge 1 -Sorb \
                 -Wb,export_macro=TAO_Valuetype_Export \
                 -Wb,export_include=tao/Valuetype/valuetype_export.h \
                 -o Valuetype
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index bcb98847975..24e7347e7f0 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -3,7 +3,6 @@
 #include "tao/Valuetype/AbstractBase.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/ValueFactory.h"
-#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
@@ -173,18 +172,10 @@ CORBA::AbstractBase::_to_value (void)
 
 CORBA::Boolean
 CORBA::AbstractBase::_is_a (const char *type_id
-                            ACE_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL_NOT_USED)
 {
-  if (! CORBA::is_nil (this->equivalent_obj_.in ()))
-    {
-      return this->equivalent_obj_->_is_a (type_id
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-    
-  int cmp = ACE_OS::strcmp (type_id,
-                            "IDL:omg.org/CORBA/AbstractBase:1.0");
-                            
-  return (cmp == 0);
+  return ! ACE_OS::strcmp (type_id,
+                           "IDL:omg.org/CORBA/AbstractBase:1.0");
 }
 
 const char *
@@ -441,25 +432,5 @@ CORBA::AbstractBase::equivalent_objref (void)
   return this->equivalent_obj_.in ();
 }
 
-// ================== Typecode initializations ==================
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    char const tc_object_id[]   = "IDL:omg.org/CORBA/AbstractBase:1.0";
-    char const tc_object_name[] = "AbstractBase";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy>
-      tc_AbstractBase (CORBA::tk_abstract_interface,
-                       tc_object_id,
-                       tc_object_name);
-  }
-}
-
-namespace CORBA
-{
-  TypeCode_ptr const _tc_AbstractBase = &TAO::TypeCode::tc_AbstractBase;
-}
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index b8f039290e7..11e33d0419c 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -92,7 +92,7 @@ namespace CORBA
     virtual const char* _tao_obv_repository_id (void) const;
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm) const;
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm);
-    virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t) const;
+    virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
 
     /// Memmory management operations
     virtual void _add_ref (void);
@@ -145,8 +145,6 @@ namespace CORBA
     /// version of  CORBA::ValueBase
     CORBA::Object_var equivalent_obj_;
   };
-
-  extern TAO_Valuetype_Export TypeCode_ptr const _tc_AbstractBase;
 }
 
 TAO_Valuetype_Export CORBA::Boolean
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index 3b7376ea2bf..58e5512d413 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -12,7 +12,6 @@
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
-
 #include "ace/OS_NS_string.h"
 #include "ace/CORBA_macros.h"
 
@@ -20,10 +19,12 @@
 # include "tao/Valuetype/ValueBase.inl"
 #endif /* ! __ACE_INLINE__ */
 
+
 ACE_RCSID (Valuetype,
            ValueBase,
            "$Id$")
 
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Static operations in namespace CORBA.
@@ -48,8 +49,8 @@ CORBA::remove_ref (CORBA::ValueBase *val)
 
 // ***********************************************************************
 
-TAO_ChunkInfo::TAO_ChunkInfo (CORBA::Boolean do_chunking,
-                              CORBA::Long init_level)
+TAO_ChunkInfo::TAO_ChunkInfo(CORBA::Boolean do_chunking,
+                             CORBA::Long init_level)
   : chunking_(do_chunking),
     value_nesting_level_(init_level),
     chunk_size_pos_ (0),
@@ -65,8 +66,8 @@ CORBA::ValueBase::ValueBase (void)
 }
 
 CORBA::ValueBase::ValueBase (const ValueBase& val)
-  : is_truncatable_ (val.is_truncatable_),
-    chunking_ (val.chunking_)
+  :  is_truncatable_(val.is_truncatable_),
+     chunking_(val.chunking_)
 {
 }
 
@@ -182,9 +183,7 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
   if (new_object != 0)
     {
       if (!new_object->_tao_unmarshal_v (strm))
-        {
-          return false;
-        }
+        return false;
     }
 
   return retval;
@@ -225,42 +224,32 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
   CORBA::Long valuetag;
   Repository_Id_List ids;
 
-  if (! strm.read_long (valuetag))
-    {
-      return false;
-    }
+  if (! strm.read_long(valuetag))
+    return false;
 
   if (TAO_OBV_GIOP_Flags::is_indirection_tag (valuetag))
-    {
-      //@@TODO: read indirection value.
-        if (TAO_debug_level > 0)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("TAO does not currently ")
-                        ACE_TEXT ("support valuetype indirecton\n")));
-          }
-
-      return false;
+        {
+    //@@TODO: read indirection value.
+      if (TAO_debug_level > 0)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("TAO does not currently support valuetype indirecton\n")));
+    return false;
     }
   else if (TAO_OBV_GIOP_Flags::is_null_ref (valuetag))
     {
-      // null reference is unmarshalled.
-      valuetype = 0;
-      return true;
+    // null reference is unmarshalled.
+    valuetype = 0;
+    return true;
     }
   else if (TAO_OBV_GIOP_Flags::has_single_type_info (valuetag))
     {
       if (! _tao_read_repository_id(strm, ids))
-        {
-          return false;
-        }
+        return false;
     }
   else if (TAO_OBV_GIOP_Flags::has_list_type_info (valuetag))
     {
       if (! _tao_read_repository_id_list(strm, ids))
-        {
-          return false;
-        }
+        return false;
     }
   else if (TAO_OBV_GIOP_Flags::has_no_type_info (valuetag))
     {
@@ -269,12 +258,8 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
   else
     {
       if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) unknown value tag: %x\n"),
-                      valuetag));
-        }
-
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("TAO (%P|%t) unknown value tag: %x\n"), valuetag));
       return false;
     }
 
@@ -293,17 +278,15 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
     }
 
   CORBA::Boolean require_truncation = false;
-  CORBA::Boolean const chunking =
-    TAO_OBV_GIOP_Flags::is_chunked (valuetag);
-  CORBA::ULong const num_ids = ids.size ();
+  CORBA::Boolean const chunking = TAO_OBV_GIOP_Flags::is_chunked (valuetag);
 
+  CORBA::ULong const num_ids = ids.size ();
   // Find the registered factory for this unmarshalling valuetype. If any
   // factory for the valuetype in its truncatable derivation hierarchy
   // is registered, the factory is used to create value for unmarshalling.
   for (CORBA::ULong i = 0; i < num_ids; ++i)
     {
       factory = orb_core->orb ()->lookup_value_factory (ids[i].c_str ());
-
       if (factory.in() != 0)
         {
           if (i != 0 && chunking)
@@ -318,23 +301,19 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
     {
       if (TAO_debug_level > 0)
         {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) OBV factory ")
-                      ACE_TEXT ("is null, id = %s\n"),
-                      repo_id));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) OBV factory is null, id = %s\n"), repo_id));
         }
-
       ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::OMGVMCID | 1,
                                         CORBA::COMPLETED_MAYBE),
                                         false);
-    }
+     }
+
 
   valuetype = factory->create_for_unmarshal ();
 
   if (require_truncation)
-    {
-      valuetype->truncation_hook ();
-    }
+    valuetype->truncation_hook ();
 
   if (valuetype == 0)
     {
@@ -385,7 +364,6 @@ CORBA::ValueBase::_tao_validate_box_type (TAO_InputCDR &strm,
       null_object = true;
       return true;
     }
-
   null_object = false;
 
   if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag))
@@ -418,9 +396,9 @@ CORBA::ValueBase::_tao_validate_box_type (TAO_InputCDR &strm,
      CORBA::String_var repo_id_stream;
 
      if (!strm.read_string (repo_id_stream.inout ()))
-      {
+     {
         return false;
-      }
+     }
 
      if (!ACE_OS::strcmp (repo_id_stream.in (), repo_id_expected))
        {  // Repository ids matched as expected
@@ -442,8 +420,8 @@ CORBA::ValueBase::_tao_validate_box_type (TAO_InputCDR &strm,
 
 
 CORBA::Boolean
-CORBA::ValueBase::_tao_write_special_value (TAO_OutputCDR &strm,
-                                            const CORBA::ValueBase *value)
+CORBA::ValueBase::_tao_write_special_value(TAO_OutputCDR &strm,
+                                      const CORBA::ValueBase *value)
 {
   // If the 'value' is null then write the null value to the stream.
   if (value == 0)
@@ -462,29 +440,25 @@ CORBA::ValueBase::_tao_write_special_value (TAO_OutputCDR &strm,
 
 
 CORBA::Boolean
-CORBA::ValueBase::_tao_write_value (TAO_OutputCDR &strm,
-                                    const CORBA::ValueBase * value,
-                                    ptrdiff_t formal_type_id)
+CORBA::ValueBase::_tao_write_value(TAO_OutputCDR &strm,
+                              const CORBA::ValueBase * value,
+                              ptrdiff_t formal_type_id)
 {
   if (! value->_tao_write_value_header (strm, formal_type_id))
-    {
-      return false;
-    }
+    return false;
 
   if (! value->_tao_marshal_v (strm))
-    {
-      return false;
-    }
+    return false;
 
   return true;
 }
 
 
 CORBA::Boolean
-CORBA::ValueBase::_tao_write_value_header (TAO_OutputCDR &strm,
-                                           ptrdiff_t formal_type_id) const
+CORBA::ValueBase::_tao_write_value_header(TAO_OutputCDR &strm,
+                                     ptrdiff_t formal_type_id) const
 {
-#ifdef TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING
+#if defined (TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING)
   // this case allows TAO to avoid marshaling the typeID for values
   // where the actual type matches the formal type (ie not a derived
   // type).
@@ -501,15 +475,15 @@ CORBA::ValueBase::_tao_write_value_header (TAO_OutputCDR &strm,
   // support unmarshaling of valuetypes that did not explicitly
   // marshal the type id. At least it is benign to always encode the
   // typecode value, even if it can be a little verbose.
-  CORBA::Boolean const is_formal_type = false;
+  CORBA::Boolean const is_formal_type =
+    false;
   ACE_UNUSED_ARG (formal_type_id);
 #endif /* TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING */
 
   // Get the list of repository ids for this valuetype.
   Repository_Id_List repository_ids;
   this->_tao_obv_truncatable_repo_ids (repository_ids);
-  CORBA::Long const num_ids =
-    static_cast <CORBA::Long> (repository_ids.size ());
+  CORBA::Long const num_ids = static_cast <CORBA::Long> (repository_ids.size ());
 
   // Build <value-tag>, which states if chunking is used
   // and if type information ((list of) repository id(s))
@@ -526,35 +500,26 @@ CORBA::ValueBase::_tao_write_value_header (TAO_OutputCDR &strm,
     valuetag |= TAO_OBV_GIOP_Flags::Type_info_single;
 
   if (num_ids > 1)
-    {
-      valuetag |= TAO_OBV_GIOP_Flags::Type_info_list;
-    }
+    valuetag |= TAO_OBV_GIOP_Flags::Type_info_list;
 
-  if (! strm.write_long (valuetag)                    // Write <value-tag>.
-      || (num_ids > 1 && !strm.write_long (num_ids))) // Write <num-ids>.
-    {
-      return false;
-    }
+  // Write <value-tag>.
+  if (!strm.write_long (valuetag))
+    return false;
 
-#ifndef TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING
-  if (this->is_truncatable_
-      || !is_formal_type  /* Always evaluates to true in the
-                             !TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING
-                             case */
-      || num_ids > 1)
+  if (num_ids > 1 && !strm.write_long (num_ids))
+    return false;
+
+  if (this->is_truncatable_ ||
+      !is_formal_type ||
+      num_ids > 1)
     {
-#endif  /* !TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING */
       // Marshal type information.
-      for (CORBA::Long i = 0; i < num_ids; ++i )
+      for( CORBA::Long i = 0; i < num_ids; ++i )
         {
           if (! strm.write_string (repository_ids[i]))
-            {
-              return false;
-            }
+            return false;
         }
-#ifndef TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING
     }
-#endif  /* !TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING */
 
   return true;
 }
@@ -568,13 +533,9 @@ TAO_ChunkInfo::start_chunk(TAO_OutputCDR &strm)
   if (this->chunking_)
     {
       if (! reserve_chunk_size(strm))
-        {
-          return false;
-        }
-
+        return false;
       this->value_nesting_level_ ++;
     }
-
   return true;
 }
 
@@ -586,15 +547,11 @@ TAO_ChunkInfo::end_chunk(TAO_OutputCDR &strm)
     {
       // Write actual chunk size at the reserved chunk size place.
       if (! this->write_previous_chunk_size(strm))
-        {
-          return false;
-        }
+        return false;
 
       // Write an end tag which is negation of value_nesting_level_.
       if (! strm.write_long(- this->value_nesting_level_))
-        {
-          return false;
-        }
+        return false;
 
       //      -- this->value_nesting_level_;
       if ( -- this->value_nesting_level_ == 0 )
@@ -611,30 +568,26 @@ CORBA::Boolean
 TAO_ChunkInfo::write_previous_chunk_size(TAO_OutputCDR &strm)
 {
   if (this->chunk_size_pos_ != 0)
-    {
-      // Calculate the chunk size.
-      CORBA::Long const chunk_size = strm.total_length () - this->length_to_chunk_octets_pos_;
-
-      // This should not happen since this is called in end_chunk() and
-      // the idl generated code always have the matched start_chunk() and
-      // end_chunk() pair. There is always data written to the stream between
-      // the start_chunk() and end_chunk() calls.
-      if (chunk_size == 0)
-        {
-          return false;
-        }
+  {
+    // Calculate the chunk size.
+    CORBA::Long const chunk_size = strm.total_length () - this->length_to_chunk_octets_pos_;
+
+    // This should not happen since this is called in end_chunk() and
+    // the idl generated code always have the matched start_chunk() and
+    // end_chunk() pair. There is always data written to the stream between
+    // the start_chunk() and end_chunk() calls.
+    if (chunk_size == 0)
+      return false;
 
-      // Write the actual chunk size to the reserved chunk size position
-      // in the stream.
-      if (!strm.replace (chunk_size, this->chunk_size_pos_))
-        {
-          return false;
-        }
+    // Write the actual chunk size to the reserved chunk size position
+    // in the stream.
+    if (!strm.replace (chunk_size, this->chunk_size_pos_))
+      return false;
 
-      // We finish writing the actual chunk size, now we need reset the state.
-      this->chunk_size_pos_ = 0;
-      this->length_to_chunk_octets_pos_ = 0;
-    }
+    // We finish writing the actual chunk size, now we need reset the state.
+    this->chunk_size_pos_ = 0;
+    this->length_to_chunk_octets_pos_ = 0;
+  }
 
   return true;
 }
@@ -660,9 +613,7 @@ TAO_ChunkInfo::reserve_chunk_size(TAO_OutputCDR &strm)
       // Insert four bytes here as a place-holder, we need to go back
       // later and write the actual size.
       if (! strm.write_long (0))
-        {
-          return false;
-        }
+        return false;
 
       // Remember length before writing chunk data. This is used to calculate
       // the actual size of the chunk.
@@ -676,9 +627,7 @@ CORBA::Boolean
 TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm)
 {
   if (!this->chunking_)
-    {
-      return true;
-    }
+    return true;
 
   char* the_rd_ptr = strm.start()->rd_ptr ();
 
@@ -694,59 +643,50 @@ TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm)
     }
 
   //Safty check if reading is out of range of current chunk.
-  if (this->chunk_octets_end_pos_ != 0
-      && the_rd_ptr > this->chunk_octets_end_pos_)
-    {
-      return false;
-    }
+  if (this->chunk_octets_end_pos_ != 0 && the_rd_ptr > this->chunk_octets_end_pos_)
+    return false;
 
   // Read a long value that might be an endtag, the chunk size or the value tag
   // of the nested valuetype.
   CORBA::Long tag;
-  
-  if (!strm.read_long (tag))
-    {
-      return false;
-    }
+  if (!strm.read_long(tag))
+    return false;
 
   if (tag < 0)
+  {
+    // tag is an end tag
+    if (-tag > this->value_nesting_level_)
     {
-      // tag is an end tag
-      if (-tag > this->value_nesting_level_)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("%P|%t) received end tag ")
-                             ACE_TEXT ("%d > value_nesting_level %d\n"),
-                             -tag,
-                             this->value_nesting_level_),
-                            false);
-        }
-        
-      this->value_nesting_level_ = - tag;
-      this->value_nesting_level_--;
+      ACE_ERROR_RETURN ((LM_ERROR,
+        ACE_TEXT ("%P|%t) received end tag %d > value_nesting_level %d\n"),
+        -tag, this->value_nesting_level_),
+        false);
+    }
+    this->value_nesting_level_ = - tag;
+    this->value_nesting_level_--;
 
 
-      this->chunk_octets_end_pos_ = 0;
+    this->chunk_octets_end_pos_ = 0;
 
-      // Continue reading so that we can read the outmost endtag. This
-      // would simplify the implementation in the derived valuetype.
-      if (this->value_nesting_level_ > 0)
-        {
-          this->handle_chunking(strm);
-        }
-    }
-  else if (tag < TAO_OBV_GIOP_Flags::Value_tag_base)
+    // Continue reading so that we can read the outmost endtag. This would
+    // simplify the implementation in the derived valuetype.
+    if (this->value_nesting_level_ > 0)
     {
-      // Read the chunk size of another chunk.
-      this->chunk_octets_end_pos_ = strm.rd_ptr () + tag;
-      this->value_nesting_level_ ++;
+      this->handle_chunking(strm);
     }
+  }
+  else if (tag < TAO_OBV_GIOP_Flags::Value_tag_base)
+  {
+    // Read the chunk size of another chunk.
+    this->chunk_octets_end_pos_ = strm.rd_ptr () + tag;
+    this->value_nesting_level_ ++;
+  }
   else // (tag >= 0x7fffff00)
-    {
-      // This should not happen since the valuetag of the nested values
-      // are always unmarshalled in the ValueBase::_tao_unmarshal_pre().
-      return false;
-    }
+  {
+    // This should not happen since the valuetag of the nested values are always
+    // unmarshalled in the ValueBase::_tao_unmarshal_pre().
+    return false;
+  }
 
   return true;
 }
@@ -756,24 +696,18 @@ CORBA::Boolean
 TAO_ChunkInfo::skip_chunks (TAO_InputCDR &strm)
 {
   if (!this->chunking_)
-    {
-      return true;
-    }
+    return true;
 
   // This function is called after reading data of the truncated parent and
   // skips the remaining chunks until the outmost endtag (-1).
   // The tag read here is suppoused to be an endtag.
   CORBA::Long tag;
   if (!strm.read_long(tag))
-    {
-      return false;
-    }
+    return false;
 
   // end of the whole valuetype.
   if (tag == -1)
-    {
-      return true;
-    }
+    return true;
   else if (tag < 0)
     {
       // continue skip the chunk.
@@ -782,8 +716,7 @@ TAO_ChunkInfo::skip_chunks (TAO_InputCDR &strm)
   else if (tag < TAO_OBV_GIOP_Flags::Value_tag_base)
     {
       // Read the chunk size and move forward to skip the data.
-      ACE_Message_Block* current =
-        const_cast<ACE_Message_Block*>(strm.start ());
+      ACE_Message_Block* current = const_cast<ACE_Message_Block*>(strm.start ());
       current->rd_ptr (tag);
       return this->skip_chunks (strm);
     }
@@ -796,27 +729,22 @@ CORBA::ValueBase::_tao_read_repository_id_list (ACE_InputCDR& strm,
                                                 Repository_Id_List& ids)
 {
   CORBA::Long num_ids;
-  
-  if (!strm.read_long (num_ids))
-    {
-      return false;
-    }
+  if (!strm.read_long(num_ids))
+    return false;
 
   if (num_ids == TAO_OBV_GIOP_Flags::Indirection_tag)
-    {
-      //@@TODO: read indirection repository ids and return true.
-      return false;
-    }
+  {
+    //@@TODO: read indirection repository ids and return true.
+    return false;
+  }
   else
+  {
+    //@@TODO: map repository id for indirection
+    for (CORBA::Long i = 0; i < num_ids; i ++)
     {
-      //@@TODO: map repository id for indirection
-      for (CORBA::Long i = 0; i < num_ids; ++i)
-        {
-          if (!_tao_read_repository_id (strm,ids))
-            {
-              return false;
-            }
-        }
+      if (!_tao_read_repository_id (strm,ids))
+        return false;
+    }
   }
 
   return true;
@@ -826,7 +754,7 @@ CORBA::Boolean
 CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm,
                                            Repository_Id_List& ids)
 {
-  ACE_CString id;
+      ACE_CString id;
   CORBA::ULong length = 0;
 
   CORBA::Long offset = 0;
@@ -834,7 +762,7 @@ CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm,
 
   if (!strm.read_ulong (length))
     {
-      return false;
+        return false;
     }
 
   // 'length' may not be the repo id length - it could be the
@@ -849,7 +777,6 @@ CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm,
         {
           return false;
         }
-        
       buffer_size = -(offset) + sizeof (CORBA::Long);
     }
 
@@ -861,23 +788,22 @@ CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm,
   if (!indir_stream.good_bit ())
     {
       return false;
-    }
-    
-  indir_stream.read_string (id);
+  }
+  indir_stream.read_string(id);
 
   // Since the ID is always read from the indirection cdr we have to skip
   // the main CDR forward if we were in fact reading from the current
   // location and not rewinding back some offset.
 
   if (offset == 0)
-    {
-      strm.skip_bytes (length);
-    }
+    strm.skip_bytes (length);
 
   ids.push_back (id);
+
   return true;
 }
 
+
 void
 CORBA::ValueBase::truncation_hook ()
 {
@@ -925,8 +851,8 @@ namespace TAO
 
 namespace CORBA
 {
-  TypeCode_ptr const _tc_ValueBase = &TAO::TypeCode::tc_ValueBase;
-  TypeCode_ptr const _tc_EventBase = &TAO::TypeCode::tc_EventBase;
+  TypeCode_ptr const _tc_ValueBase     = &TAO::TypeCode::tc_ValueBase;
+  TypeCode_ptr const _tc_EventBase     = &TAO::TypeCode::tc_EventBase;
 }
 
 // member functions for CORBA::DefaultValueRefCountBase ============
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index b732014f8ca..50229951b3c 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -47,8 +47,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Valuetype_Export TAO_ChunkInfo
 {
 public:
-  TAO_ChunkInfo (CORBA::Boolean do_chunking = 0,
-                 CORBA::Long init_level = 0);
+  TAO_ChunkInfo(CORBA::Boolean do_chunking = 0, CORBA::Long init_level = 0);
 
   /// Methods to support chunking.
   /// Note: These methods are called for both chunking and non-chunking
@@ -62,14 +61,14 @@ public:
   /// nesting level. The reservasion actually occurs the first time that
   /// the start_chunk is called if there are multiple continuous start_chunk()
   /// calls without the close_chunk() called in between.
-  CORBA::Boolean start_chunk (TAO_OutputCDR &strm);
+  CORBA::Boolean start_chunk(TAO_OutputCDR &strm);
 
   /// This is called in the _tao_marshal_state (). This method writes the
   /// actual chunk size to the reserved chunk size space and writes an end
   /// tag with the negation value of current nesting level. A start_chunk()
   /// needs an end_chunk() to close the current chunk. It's also needed for
   /// writing the outmost endtag to the stream.
-  CORBA::Boolean end_chunk (TAO_OutputCDR &strm);
+  CORBA::Boolean end_chunk(TAO_OutputCDR &strm);
 
   /// Methods for unmarshalling a valuetype.
 
@@ -82,12 +81,12 @@ public:
   CORBA::Boolean skip_chunks (TAO_InputCDR &strm);
   /// This is called in end_chunk(). It writes the actual chunk size to the
   /// reserved chunk size space.
-  CORBA::Boolean write_previous_chunk_size (TAO_OutputCDR &strm);
+  CORBA::Boolean write_previous_chunk_size(TAO_OutputCDR &strm);
   /// Reserve space for chunk size. The memory in the stream will be
   /// overwritten after all the chunk data is written. This method
   /// only allows the reservasion being made once if the reserved
   /// space has not been overwritten.
-  CORBA::Boolean reserve_chunk_size (TAO_OutputCDR &strm);
+  CORBA::Boolean reserve_chunk_size(TAO_OutputCDR &strm);
 
   /// A flag to indicate that this instance is actually involved in a chunked
   /// or truncatable valuetype.
@@ -143,11 +142,10 @@ namespace CORBA
     // dynamic casting
     static CORBA::ValueBase* _downcast (CORBA::ValueBase *);
 
-    /// TAO extension
-
     /// Used in the implementation of CORBA::Any
     static void _tao_any_destructor (void *);
-    virtual CORBA::TypeCode_ptr _tao_type (void) const = 0;
+
+    /// TAO extension
 
     /// Return the repository id of this valuetype.
     virtual const char * _tao_obv_repository_id (void) const = 0;
@@ -187,16 +185,16 @@ namespace CORBA
     /// Check repository id for value box type against what is
     /// in the CDR stream.
     static CORBA::Boolean _tao_validate_box_type (
-      TAO_InputCDR &strm,
-      const char * const repo_id_expected,
-      CORBA::Boolean & null_object);
+                                  TAO_InputCDR &strm,
+                                  const char * const repo_id_expected,
+                                  CORBA::Boolean & null_object);
 
   public:  // otherwise these cannot be called from a static function
 
-    /// During marshal jump to the most derived part
+    /// during marshal jump to the most derived part
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const = 0;
 
-    /// Called after obtaining the fresh object from create_for_unmarshal ()
+    /// called after obtaining the fresh object from create_for_unmarshal ()
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) = 0;
 
     /// Notify the truncated parent valuetype to skip the rest of the chunks
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 40bc92b1281..8664bdbf90b 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -5,5 +5,5 @@
 
 #define TAO_MAJOR_VERSION 1
 #define TAO_MINOR_VERSION 5 
-#define TAO_BETA_VERSION 4 
-#define TAO_VERSION "1.5.4"
+#define TAO_BETA_VERSION 3 
+#define TAO_VERSION "1.5.3"
diff --git a/TAO/tao/WCharSeq.pidl b/TAO/tao/WCharSeq.pidl
index 46a0b156c43..d10333981c1 100644
--- a/TAO/tao/WCharSeq.pidl
+++ b/TAO/tao/WCharSeq.pidl
@@ -8,7 +8,7 @@
  *
  *     tao_idl
  *          -oA AnyTypeCode
- *          -GA -SS -Sci
+ *          -Ge 1 -GA -SS -Sci
  *          -Wb,pre_include=ace/pre.h
  *          -Wb,post_include=ace/post.h
  *          -Wb,export_macro=TAO_Export
diff --git a/TAO/tao/WStringSeq.pidl b/TAO/tao/WStringSeq.pidl
index 99a5c3d8ae7..392d7e9854e 100644
--- a/TAO/tao/WStringSeq.pidl
+++ b/TAO/tao/WStringSeq.pidl
@@ -8,7 +8,7 @@
  *
  *     tao_idl
  *          -oA AnyTypeCode
- *          -GA -SS -Sci
+ *          -Ge 1 -GA -SS -Sci
  *          -Wb,pre_include=ace/pre.h
  *          -Wb,post_include=ace/post.h
  *          -Wb,export_macro=TAO_Export
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index 6b1237b5b8b..90b9d41df88 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -22,14 +22,6 @@ TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower (void)
 {
 }
 
-/*
- * Hook to specialize the wait strategy when the concrete strategy is
- * a simple "lf" strategy. Add all public/protected/private methods
- * within the *COPY* hooks.
- */
-
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
-
 int
 TAO_Wait_On_Leader_Follower::register_handler (void)
 {
@@ -58,7 +50,6 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
     }
 
   // Send the request.
-//@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
   return this->TAO_Wait_Strategy::sending_request (orb_core,
                                                    two_way);
 }
@@ -80,9 +71,4 @@ TAO_Wait_On_Leader_Follower::can_process_upcalls (void) const
   return true;
 }
 
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_END
-/*
- * End copy hook.
- */
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index 2de7e599ff3..59148d35766 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -76,7 +76,7 @@ TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time,
 
   if (rd.successful ())
      {
-       TAO_ORB_Core * const oc =
+       TAO_ORB_Core *oc =
          this->transport_->orb_core ();
 
        if (!oc->client_factory ()->use_cleanup_options ())
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index 25c4b0af51e..73fda58a00f 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -2,8 +2,6 @@
 
 #include "tao/Wait_Strategy.h"
 
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
-
 ACE_RCSID (tao,
            Wait_Strategy,
            "$Id$")
@@ -12,6 +10,7 @@ ACE_RCSID (tao,
 # include "tao/Wait_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
@@ -27,17 +26,12 @@ TAO_Wait_Strategy::~TAO_Wait_Strategy (void)
 {
 }
 
-/*
- * Hook to comment out this method in the lf wait strategy
- */
-//@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_START
 int
 TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */,
                                     int            /* two_way */)
 {
   return 0;
 }
-//@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_END
 
 /*
  * Hook to specialize the Wait Strategy
diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl
index 6b9b26a0e09..6fa5bf56a6d 100644
--- a/TAO/tao/WrongTransaction.pidl
+++ b/TAO/tao/WrongTransaction.pidl
@@ -10,7 +10,7 @@
  * following command:
  *
  *   tao_idl
- *        -o orig -GA -Sci -SS
+ *        -o orig -Ge 1 -GA -Sci -SS
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/XtResource.mpc b/TAO/tao/XtResource.mpc
index 28e0c508a4c..158da848ec9 100644
--- a/TAO/tao/XtResource.mpc
+++ b/TAO/tao/XtResource.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(TAO_XtResource) : acelib, taolib, install, tao_output, taodefaults, ace_xtreactor, tao_versioning_idl_defaults {
+project(TAO_XtResource) : acelib, taolib, core, tao_output, taodefaults, ace_xtreactor, tao_versioning_idl_defaults {
 
   sharedname   = TAO_XtResource
   dynamicflags += TAO_XTRESOURCE_BUILD_DLL
diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp
index 3a3ad30376e..0bd2f417292 100644
--- a/TAO/tao/XtResource/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource/XtResource_Factory.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/XtResource/XtResource_Factory.h"
 #include "tao/debug.h"
-#include "ace/XtReactor/XtReactor.h"
+#include "ace/XtReactor.h"
 
 ACE_RCSID( TAO_XtResource,
            XtResource_Factory,
diff --git a/TAO/tao/XtResource/XtResource_Factory.h b/TAO/tao/XtResource/XtResource_Factory.h
index 85f184ae631..5099969e25c 100644
--- a/TAO/tao/XtResource/XtResource_Factory.h
+++ b/TAO/tao/XtResource/XtResource_Factory.h
@@ -15,7 +15,7 @@
 #include /**/ "ace/pre.h"
 #include /**/ <X11/Intrinsic.h>
 #include "tao/XtResource/TAO_XtResource_Export.h"
-#include "ace/XtReactor/XtReactor.h"
+#include "ace/XtReactor.h"
 #include "tao/GUIResource_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/tao/ZlibCompressor.mpc b/TAO/tao/ZlibCompressor.mpc
deleted file mode 100644
index 25f0400daac..00000000000
--- a/TAO/tao/ZlibCompressor.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project : taolib, install, compression, tao_versioning_idl_defaults, zlib {
-  requires += zlib
-  sharedname   = TAO_ZlibCompressor
-  dynamicflags = TAO_ZLIBCOMPRESSOR_BUILD_DLL
-
-  Source_Files {
-    Compression/zlib
-  }
-
-  Header_Files {
-    Compression/zlib
-  }
-
-  Inline_Files {
-    Compression/zlib
-  }
-
-  Template_Files {
-    Compression/zlib
-  }
-
-  Resource_Files {
-    Compression/zlib
-  }
-
-  PIDL_Files {
-    Compression/zlib
-  }
-
-  IDL_Files {
-    Compression/zlib
-  }
-
-  Pkgconfig_Files {
-    Compression/zlib/TAO_ZlibCompressor.pc.in
-  }
-}
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index b9e2aaa057b..5cb42f50a01 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -322,11 +322,6 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp
 {
   TAO_Wait_Strategy *ws = 0;
 
-/*
- * Hook to customize the wait strategy object when the concrete wait strategy
- * object is known a priori.
- */
-//@@ WAIT_STRATEGY_SPL_COMMENT_HOOK_START
   if (this->wait_strategy_ == TAO_WAIT_ON_READ)
     ACE_NEW_RETURN (ws,
                     TAO_Wait_On_Read (transport),
@@ -347,7 +342,6 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp
                       TAO_Wait_On_Leader_Follower (transport),
                       0);
     }
-//@@ WAIT_STRATEGY_SPL_COMMENT_HOOK_END
 
   return ws;
 }
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 29082bada75..34418e1b0d5 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -601,7 +601,7 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names,
     }
 
   // OK fallback on the hardcoded ones....
-  this->parser_names_count_ = 6; // HOW MANY DO WE HAVE?
+  this->parser_names_count_ = 5; // HOW MANY DO WE HAVE?
   ACE_NEW_RETURN (this->parser_names_,
                   char *[this->parser_names_count_],
                   -1);
@@ -623,9 +623,6 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names,
   this->parser_names_[index] = CORBA::string_dup ("MCAST_Parser");
   ++index;
 
-  this->parser_names_[index] = CORBA::string_dup ("HTTP_Parser");
-  ++index;
-
   names = this->parser_names_;
 
   number_of_names = index;
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index ea703bf82b3..e2f072bbf84 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -16,7 +16,6 @@
 #define TAO_DEFAULT_RESOURCE_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Copy_Disabled.h"
 #include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -37,7 +36,7 @@ class TAO_LF_Strategy;
 class TAO_Codeset_Descriptor_Base;
 
 /**
- * @class TAO_Codeset_Parameters
+ * @class TAO_Codeset_Parametes
  *
  * @brief A simple storage class for the native codeset and any
  * translators that must be configured when creating an instance of
@@ -53,32 +52,27 @@ class TAO_Codeset_Descriptor_Base;
  *
  */
 class TAO_Export TAO_Codeset_Parameters
-  : ACE_Copy_Disabled
 {
+private:
+  ACE_Unbounded_Queue<ACE_TCHAR*> translators_;
+  ACE_TCHAR* native_;
+
+private:
+  TAO_Codeset_Parameters (const TAO_Codeset_Parameters&);
+  TAO_Codeset_Parameters& operator= (const TAO_Codeset_Parameters&);
+
+  typedef ACE_Unbounded_Queue_Iterator<ACE_TCHAR*> iterator;
+
 public:
   TAO_Codeset_Parameters (void);
   ~TAO_Codeset_Parameters (void);
-
-  /// The native codeset (getter)
   const ACE_TCHAR* native (void);
-
-  /// The native codeset (setter)
   void native (const ACE_TCHAR* n);
-
-  /// Add a new codeset
-  void add_translator (const ACE_TCHAR* name);
-
-  typedef ACE_Unbounded_Queue_Iterator<ACE_TCHAR*> iterator;
-
-  /// Iterate through the registered translators
+  void add_translator (const ACE_TCHAR*name);
   iterator translators (void);
 
   /// Apply the parameters to the said descriptor
   void apply_to (TAO_Codeset_Descriptor_Base *csd);
-
-private:
-  ACE_Unbounded_Queue<ACE_TCHAR*> translators_;
-  ACE_TCHAR* native_;
 };
 
 
@@ -281,6 +275,8 @@ protected:
   bool use_local_memory_pool_;
 
 private:
+  //  void init_codeset_descriptors (void);
+
   enum Lock_Type
   {
     TAO_NULL_LOCK,
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff
new file mode 100644
index 00000000000..fb15f742a61
--- /dev/null
+++ b/TAO/tao/diffs/OctetSeq.diff
@@ -0,0 +1,21 @@
+--- orig/OctetSeqC.h	2005-04-08 10:17:34.108726400 +0200
++++ OctetSeqC.h	2005-04-08 10:17:41.829828800 +0200
+@@ -141,6 +141,18 @@
+ {
+ }
+ 
++// Workaround for a Visual Studio .NET bug where this class is not
++// properly imported by an application if typedef'd or subclassed,
++// resulting in 'multiply defined' link errors. The export macro
++// here forces an explicit import by the application. Please see
++// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
++// The problem stems from use of the type below in PortableServer,
++// but we put the instantiation here because the application will
++// need to see it in *C.h to avoid the error.
++#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
++  template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>;
++#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/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff
new file mode 100644
index 00000000000..1938744506a
--- /dev/null
+++ b/TAO/tao/diffs/UShortSeq.diff
@@ -0,0 +1,21 @@
+--- orig/UShortSeqC.h	2005-04-08 10:17:34.909878400 +0200
++++ UShortSeqC.h	2005-04-08 10:17:41.759728000 +0200
+@@ -133,6 +133,18 @@
+ {
+ }
+ 
++// Workaround for a Visual Studio .NET bug where this class is not
++// properly imported by an application if typedef'd or subclassed,
++// resulting in 'multiply defined' link errors. The export macro
++// here forces an explicit import by the application. Please see
++// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
++// The problem stems from use of the type below in 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/extra_anytypecode.mpb b/TAO/tao/extra_anytypecode.mpb
index ece5169967e..ece5169967e 100644..100755
--- a/TAO/tao/extra_anytypecode.mpb
+++ b/TAO/tao/extra_anytypecode.mpb
diff --git a/TAO/tao/objectid.h b/TAO/tao/objectid.h
index 3f72b30e563..33f45d31659 100644
--- a/TAO/tao/objectid.h
+++ b/TAO/tao/objectid.h
@@ -68,7 +68,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 #define TAO_OBJID_CODECFACTORY        "CodecFactory"
 #define TAO_OBJID_PICurrent           "PICurrent"
 #define TAO_OBJID_POAMANAGERFACTORY   "POAManagerFactory"
-#define TAO_OBJID_COMPRESSIONMANAGER  "CompressionManager"
 
 // Comma separated list of the above ObjectIDs.
 // DO NOT include unimplemented services!
@@ -86,8 +85,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
         TAO_OBJID_IORMANIPULATION, \
         TAO_OBJID_IORTABLE, \
         TAO_OBJID_DYNANYFACTORY, \
-        TAO_OBJID_TYPECODEFACTORY, \
-        TAO_OBJID_COMPRESSIONMANAGER
+        TAO_OBJID_TYPECODEFACTORY
 // @@ Some initial references are added via other means, such as
 //    ORBInitInfo::register_initial_references().  Those should not be
 //    placed in the above list.  Ideally, we should no longer need the
diff --git a/TAO/tao/orb_types.pidl b/TAO/tao/orb_types.pidl
index 21bf5cd006c..d879b3bd40a 100644
--- a/TAO/tao/orb_types.pidl
+++ b/TAO/tao/orb_types.pidl
@@ -10,7 +10,7 @@
  *   used to generate code is:
  *
  *     tao_idl
- *        -o orig -SS -Sci
+ *        -o orig -SS -Ge 1 -Sci
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 69404326b05..541e08b56fd 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -839,12 +839,6 @@ enum TAO_Policy_Scope
 #  define TAO_USE_OUTPUT_CDR_MMAP_MEMORY_POOL 0
 #endif /* TAO_USE_LOCAL_MEMORY_POOL */
 
-// Enable TransportCurrent by default
-#if !defined (TAO_HAS_TRANSPORT_CURRENT)
-#    define TAO_HAS_TRANSPORT_CURRENT 1
-#  else
-#    define TAO_HAS_TRANSPORT_CURRENT 0
-#endif  /* ! TAO_HAS_TRANSPORT_CURRENT */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 313daa223f6..0296cdbe1b7 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -1,16 +1,9 @@
 //$Id$
 
-project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_versioning_idl_defaults, corba_e_micro, corba_e_compact, core_minimum_corba, tao_no_iiop {
+project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_versioning_idl_defaults, corba_e_micro, corba_e_compact, core_minimum_corba, tao_no_iiop {
   sharedname   = TAO
   dynamicflags = TAO_BUILD_DLL
 
-  idlflags += -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode \
-              -Wb,export_macro=TAO_Export \
-              -Wb,export_include=tao/TAO_Export.h \
-              -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \
-              -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
-  idlflags -= -Sa -St
-
   Source_Files(TAO_COMPONENTS) {
     Abstract_Servant_Base.cpp
     Acceptor_Filter.cpp
@@ -85,9 +78,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     GIOP_Message_State.cpp
     GIOP_Message_Version.cpp
     GIOPC.cpp
-    HTTP_Client.cpp
-    HTTP_Handler.cpp
-    HTTP_Parser.cpp
     IFR_Client_Adapter.cpp
     IIOP_Acceptor.cpp
     IIOP_Connection_Handler.cpp
@@ -222,7 +212,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     Transport_Descriptor_Interface.cpp
     Transport_Mux_Strategy.cpp
     Transport_Queueing_Strategies.cpp
-    Transport_Selection_Guard.cpp
     Transport_Timer.cpp
     TSS_Resources.cpp
     TypeCodeFactory_Adapter.cpp
@@ -279,8 +268,10 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     Bounded_Object_Reference_Sequence_T.h
     Bounded_Reference_Allocation_Traits_T.h
     Bounded_Sequence_CDR_T.h
+    Bounded_String_Sequence_T.h
     Bounded_Value_Allocation_Traits_T.h
     Bounded_Value_Sequence_T.h
+    Bounded_Wstring_Sequence_T.h
     Buffer_Allocator_T.h
     Buffering_Constraint_Policy.h
     Cache_Entries.h
@@ -358,9 +349,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     GIOPS.h
     GIOP_Utils.h
     GUIResource_Factory.h
-    HTTP_Client.h
-    HTTP_Handler.h
-    HTTP_Parser.h
     IFR_Client_Adapter.h
     IIOP_Acceptor.h
     IIOPC.h
@@ -530,7 +518,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     Transport.h
     Transport_Mux_Strategy.h
     Transport_Queueing_Strategies.h
-    Transport_Selection_Guard.h
     Transport_Timer.h
     TSS_Resources.h
     TypeCodeFactory_Adapter.h
@@ -550,8 +537,10 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     Unbounded_Octet_Sequence_T.h
     Unbounded_Reference_Allocation_Traits_T.h
     Unbounded_Sequence_CDR_T.h
+    Unbounded_String_Sequence_T.h
     Unbounded_Value_Allocation_Traits_T.h
     Unbounded_Value_Sequence_T.h
+    Unbounded_Wstring_Sequence_T.h
     UserException.h
     UShortSeqC.h
     UShortSeqS.h
@@ -577,7 +566,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     WStringSeqS.h
   }
 
-
   Inline_Files {
     *.i
     *.inl
@@ -593,17 +581,35 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
   }
 
   IDL_Files {
+    idlflags += -Gp -Gd -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \
+                -Wb,export_macro=TAO_Export \
+                -Wb,export_include=tao/TAO_Export.h \
+                -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \
+                -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+    idlflags -= -Sa -St
     GIOP.pidl >> AnyTypeCode/GIOPA.h AnyTypeCode/GIOPA.cpp
   }
 
   IDL_Files {
-    idlflags += -Sci
+    idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \
+                -Wb,export_macro=TAO_Export \
+                -Wb,export_include=tao/TAO_Export.h \
+                -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \
+                -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+    idlflags -= -Sa -St
+    BooleanSeq.pidl >> AnyTypeCode/BooleanSeqA.h AnyTypeCode/BooleanSeqA.cpp
+    CharSeq.pidl >> AnyTypeCode/CharSeqA.h AnyTypeCode/CharSeqA.cpp
     CONV_FRAME.pidl >> AnyTypeCode/CONV_FRAMEA.h AnyTypeCode/CONV_FRAMEA.cpp
     Current.pidl >> AnyTypeCode/CurrentA.h AnyTypeCode/CurrentA.cpp
+    DoubleSeq.pidl >> AnyTypeCode/DoubleSeqA.h AnyTypeCode/DoubleSeqA.cpp
+    FloatSeq.pidl >> AnyTypeCode/FloatSeqA.h AnyTypeCode/FloatSeqA.cpp
     IIOP.pidl >> AnyTypeCode/IIOPA.h AnyTypeCode/IIOPA.cpp
     IIOP_Endpoints.pidl >> AnyTypeCode/IIOP_EndpointsA.h AnyTypeCode/IIOP_EndpointsA.cpp
     IOP.pidl >> AnyTypeCode/IOPA.h AnyTypeCode/IOPA.cpp
     IOP_IOR.pidl >> AnyTypeCode/IOP_IORA.h AnyTypeCode/IOP_IORA.cpp
+    LongDoubleSeq.pidl >> AnyTypeCode/LongDoubleSeqA.h AnyTypeCode/LongDoubleSeqA.cpp
+    LongLongSeq.pidl >> AnyTypeCode/LongLongSeqA.h AnyTypeCode/LongLongSeqA.cpp
+    LongSeq.pidl >> AnyTypeCode/LongSeqA.h AnyTypeCode/LongSeqA.cpp
     Messaging_PolicyValue.pidl >> AnyTypeCode/Messaging_PolicyValueA.h AnyTypeCode/Messaging_PolicyValueA.cpp
     Messaging_SyncScope.pidl >> AnyTypeCode/Messaging_SyncScopeA.h AnyTypeCode/Messaging_SyncScopeA.cpp
     ObjectIdList.pidl >> AnyTypeCode/ObjectIdListA.h AnyTypeCode/ObjectIdListA.cpp
@@ -613,25 +619,12 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     PI_Forward.pidl >> AnyTypeCode/PI_ForwardA.h AnyTypeCode/PI_ForwardA.cpp
     PortableInterceptor.pidl >> AnyTypeCode/PortableInterceptorA.h AnyTypeCode/PortableInterceptorA.cpp
     Services.pidl >> AnyTypeCode/ServicesA.h AnyTypeCode/ServicesA.cpp
-    TAO.pidl >> AnyTypeCode/TAOA.h AnyTypeCode/TAOA.cpp
-    TimeBase.pidl >> AnyTypeCode/TimeBaseA.h AnyTypeCode/TimeBaseA.cpp
-  }
-
-  IDL_Files {
-    idlflags += -Sci -Gse
-    BooleanSeq.pidl >> AnyTypeCode/BooleanSeqA.h AnyTypeCode/BooleanSeqA.cpp
-    CharSeq.pidl >> AnyTypeCode/CharSeqA.h AnyTypeCode/CharSeqA.cpp
-    DoubleSeq.pidl >> AnyTypeCode/DoubleSeqA.h AnyTypeCode/DoubleSeqA.cpp
-    FloatSeq.pidl >> AnyTypeCode/FloatSeqA.h AnyTypeCode/FloatSeqA.cpp
-    LongDoubleSeq.pidl >> AnyTypeCode/LongDoubleSeqA.h AnyTypeCode/LongDoubleSeqA.cpp
-    LongLongSeq.pidl >> AnyTypeCode/LongLongSeqA.h AnyTypeCode/LongLongSeqA.cpp
-    LongSeq.pidl >> AnyTypeCode/LongSeqA.h AnyTypeCode/LongSeqA.cpp
-    OctetSeq.pidl >> AnyTypeCode/OctetSeqA.h AnyTypeCode/OctetSeqA.cpp
     ShortSeq.pidl >> AnyTypeCode/ShortSeqA.h AnyTypeCode/ShortSeqA.cpp
     StringSeq.pidl >> AnyTypeCode/StringSeqA.h AnyTypeCode/StringSeqA.cpp
+    TAO.pidl >> AnyTypeCode/TAOA.h AnyTypeCode/TAOA.cpp
+    TimeBase.pidl >> AnyTypeCode/TimeBaseA.h AnyTypeCode/TimeBaseA.cpp
     ULongLongSeq.pidl >> AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongLongSeqA.cpp
     ULongSeq.pidl >> AnyTypeCode/ULongSeqA.h AnyTypeCode/ULongSeqA.cpp
-    UShortSeq.pidl >> AnyTypeCode/UShortSeqA.h AnyTypeCode/UShortSeqA.cpp
     WCharSeq.pidl >> AnyTypeCode/WCharSeqA.h AnyTypeCode/WCharSeqA.cpp
     WStringSeq.pidl >> AnyTypeCode/WStringSeqA.h AnyTypeCode/WStringSeqA.cpp
   }
diff --git a/TAO/tests/AMH_Exceptions/.cvsignore b/TAO/tests/AMH_Exceptions/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/AMH_Exceptions/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
index 40ae9a4d2a7..5188e4a669b 100644
--- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
+++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
@@ -1,21 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, amh {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, amh, strategies {
-  after += *idl
   Source_Files {
     server.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
   }
 }
 
@@ -23,9 +11,5 @@ project(*Client): taoexe, amh, portableserver, strategies {
   after += *Server
   Source_Files {
     client.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/AMH_Exceptions/Makefile.am b/TAO/tests/AMH_Exceptions/Makefile.am
deleted file mode 100644
index 7641cf89759..00000000000
--- a/TAO/tests/AMH_Exceptions/Makefile.am
+++ /dev/null
@@ -1,125 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMH_Exceptions_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AMH_Exceptions_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AMH_Exceptions_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/AMH_Exceptions/Test.idl b/TAO/tests/AMH_Exceptions/Test.idl
index 6a9ae77044b..c3ffd609ca4 100644
--- a/TAO/tests/AMH_Exceptions/Test.idl
+++ b/TAO/tests/AMH_Exceptions/Test.idl
@@ -23,8 +23,6 @@ module Test
   {
     Timestamp test_method (in Timestamp send_time)
       raises (InvalidTimestamp, ServerOverload);
-
-    oneway void shutdown ();
   };
 
 };
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 60dbc3e8da3..9ff92b2933d 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -30,19 +30,14 @@ main (int argc, char *argv[])
                             1);
         }
 
-      ACE_TRY {
-          Test::Timestamp time = 10;
-          roundtrip->test_method (time ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH(Test::ServerOverload, ov)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Received expected exception\n"));
-          received_expected_exception = 1;
-
-          roundtrip->shutdown ();
-        }
-      ACE_ENDTRY;
+      Test::Timestamp time = 10;
+      roundtrip->test_method (time ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH(Test::ServerOverload, ov)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Received expected exception\n"));
+      received_expected_exception = 1;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/AMH_Exceptions/run_test.pl b/TAO/tests/AMH_Exceptions/run_test.pl
index 7bd307293bf..11dc1f3e86a 100755
--- a/TAO/tests/AMH_Exceptions/run_test.pl
+++ b/TAO/tests/AMH_Exceptions/run_test.pl
@@ -42,7 +42,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
 $client = $CL->SpawnWaitKill (30);
 
 # Clean up.
-$amhserver= $AMH->WaitKill (15);
+$amhserver= $AMH->TerminateWaitKill (5);
 
 if ($amhserver != 0) {
     print STDERR "ERROR: AMH Server returned $amhserver\n";
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 4bc543e5537..05d82934074 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -3,7 +3,6 @@
 
 #include "ace/OS_NS_stdio.h"
 #include "TestS.h"
-#include "tao/ORB_Core.h"
 
 /***************************/
 /*** Servant Declaration ***/
@@ -19,9 +18,6 @@ public:
                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
 protected:
   CORBA::ORB_ptr orb_;
 };
@@ -60,12 +56,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
   ACE_UNUSED_ARG (send_time);
 }
 
-void
-ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/ ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
 
 /*** Server Declaration ***/
 
@@ -202,7 +192,7 @@ ST_AMH_Server::run_event_loop ()
   ACE_TRY
     {
       ACE_Time_Value period (0, 11000);
-      while (!this->orb_->orb_core ()->has_shutdown ())
+      while (1)
         {
               this->orb_->perform_work (&period);
               ACE_TRY_CHECK;
diff --git a/TAO/tests/AMH_Oneway/.cvsignore b/TAO/tests/AMH_Oneway/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/AMH_Oneway/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
index fb289ca96cb..a0a1fbb883e 100644
--- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
+++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
@@ -1,21 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl) : taoidldefaults, amh {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*client) : taoexe, portableserver, amh {
-  after += *idl
   source_files {
     client.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
   }
 }
 
@@ -23,9 +11,5 @@ project(*server) : taoserver, amh, strategies {
   after += *client
   source_files {
     server.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/AMH_Oneway/Makefile.am b/TAO/tests/AMH_Oneway/Makefile.am
deleted file mode 100644
index bfb5b5cda46..00000000000
--- a/TAO/tests/AMH_Oneway/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMH_Oneway_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AMH_Oneway_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AMH_Oneway_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/AMI/.cvsignore b/TAO/tests/AMI/.cvsignore
new file mode 100644
index 00000000000..92a316986cf
--- /dev/null
+++ b/TAO/tests/AMI/.cvsignore
@@ -0,0 +1,3 @@
+client
+server
+simple_client
diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc
index 69265f72525..894442827ba 100644
--- a/TAO/tests/AMI/AMI.mpc
+++ b/TAO/tests/AMI/AMI.mpc
@@ -1,33 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, ami {
-  IDL_Files {
-    ami_test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging, ami {
-  after += *idl
   Source_Files {
     ami_test_i.cpp
-    ami_testS.cpp
-    ami_testC.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): messaging, taoexe, portableserver, ami {
   after += *Server
   Source_Files {
     client.cpp
-    ami_testS.cpp
-    ami_testC.cpp
-  }
-  IDL_Files {
   }
 }
 
@@ -35,9 +19,5 @@ project(*Simple Client): messaging, taoexe, portableserver, ami {
   after += *Server
   Source_Files {
     simple_client.cpp
-    ami_testS.cpp
-    ami_testC.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/AMI/Makefile.am b/TAO/tests/AMI/Makefile.am
deleted file mode 100644
index 3f15bbd9d7d..00000000000
--- a/TAO/tests/AMI/Makefile.am
+++ /dev/null
@@ -1,166 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  server.cpp \
-  ami_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Simple_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += simple_client
-
-simple_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-simple_client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  simple_client.cpp \
-  ami_test_i.h
-
-simple_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/AMI_Buffering/.cvsignore b/TAO/tests/AMI_Buffering/.cvsignore
new file mode 100644
index 00000000000..5c0ae7e0d7e
--- /dev/null
+++ b/TAO/tests/AMI_Buffering/.cvsignore
@@ -0,0 +1,3 @@
+admin
+client
+server
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
index 5fb820f88c7..a4156b9a83f 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -1,22 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, ami {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, ami {
-  after += *idl
   Source_Files {
     AMI_Buffering.cpp
     server.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
   }
 }
 
@@ -27,10 +15,6 @@ project(*Client): taoserver, ami {
     Client_Task.cpp
     Reply_Handler.cpp
     client.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
   }
 }
 
@@ -40,9 +24,5 @@ project(*Admin): taoserver, ami {
   Source_Files {
     AMI_Buffering_Admin.cpp
     admin.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/AMI_Buffering/Makefile.am b/TAO/tests/AMI_Buffering/Makefile.am
deleted file mode 100644
index aa8c2e7ef34..00000000000
--- a/TAO/tests/AMI_Buffering/Makefile.am
+++ /dev/null
@@ -1,170 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Buffering_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Buffering_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  AMI_Buffering.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  AMI_Buffering.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Buffering_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Reply_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Reply_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Buffering_Admin.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += admin
-
-admin_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-admin_SOURCES = \
-  AMI_Buffering_Admin.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  admin.cpp \
-  AMI_Buffering_Admin.h
-
-admin_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/AMI_Timeouts/.cvsignore b/TAO/tests/AMI_Timeouts/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/AMI_Timeouts/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
index ae39f7b15c7..bf72e8baca6 100644
--- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
+++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
@@ -1,36 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, ami {
-  IDL_Files {
-    timeout.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, ami {
-  after += *idl
   Source_Files {
     timeout_i.cpp
     timeout_client.cpp
     server.cpp
-    timeoutS.cpp
-    timeoutC.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoserver, ami {
-  after += *Server
   exename = client
   Source_Files {
     timeout_i.cpp
     timeout_client.cpp
     client.cpp
-    timeoutS.cpp
-    timeoutC.cpp
-  }
-  IDL_Files {
   }
 }
+
diff --git a/TAO/tests/AMI_Timeouts/Makefile.am b/TAO/tests/AMI_Timeouts/Makefile.am
deleted file mode 100644
index 8695c412368..00000000000
--- a/TAO/tests/AMI_Timeouts/Makefile.am
+++ /dev/null
@@ -1,137 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Timeouts_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  timeoutC.cpp \
-  timeoutC.h \
-  timeoutC.inl \
-  timeoutS.cpp \
-  timeoutS.h \
-  timeoutS.inl
-
-CLEANFILES = \
-  timeout-stamp \
-  timeoutC.cpp \
-  timeoutC.h \
-  timeoutC.inl \
-  timeoutS.cpp \
-  timeoutS.h \
-  timeoutS.inl
-
-timeoutC.cpp timeoutC.h timeoutC.inl timeoutS.cpp timeoutS.h timeoutS.inl: timeout-stamp
-
-timeout-stamp: $(srcdir)/timeout.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/timeout.idl
-	@touch $@
-
-noinst_HEADERS = \
-  timeout.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Timeouts_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  timeoutC.cpp \
-  timeoutS.cpp \
-  timeout_client.cpp \
-  timeout_i.cpp \
-  timeout_client.h \
-  timeout_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Timeouts_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  timeoutC.cpp \
-  timeoutS.cpp \
-  timeout_client.cpp \
-  timeout_i.cpp \
-  timeout_client.h \
-  timeout_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Abstract_Interface/.cvsignore b/TAO/tests/Abstract_Interface/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Abstract_Interface/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
index 38681100160..d6846a4b229 100644
--- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
+++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
@@ -1,18 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, valuetype {
-  IDL_Files {
-    test.idl
-  }
-
-  custom_only = 1
-}
-
 project(*client) : taoclient, valuetype {
-  after += *idl
-
   IDL_Files {
+    test.idl
   }
 
   Source_Files {
@@ -27,9 +18,9 @@ project(*client) : taoclient, valuetype {
 
 project(*server) : taoserver, valuetype {
   after += *client
-  after += *idl
 
   IDL_Files {
+    test.idl
   }
 
   Source_Files {
diff --git a/TAO/tests/Abstract_Interface/Makefile.am b/TAO/tests/Abstract_Interface/Makefile.am
deleted file mode 100644
index a170672dcbd..00000000000
--- a/TAO/tests/Abstract_Interface/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Abstract_Interface_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Abstract_Interface_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testC.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Abstract_Interface_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  testC.h \
-  testS.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Any/Makefile.am b/TAO/tests/Any/Makefile.am
deleted file mode 100644
index 3f2d34af807..00000000000
--- a/TAO/tests/Any/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Recursive
-
diff --git a/TAO/tests/Any/Recursive/Makefile.am b/TAO/tests/Any/Recursive/Makefile.am
deleted file mode 100644
index 12f227990da..00000000000
--- a/TAO/tests/Any/Recursive/Makefile.am
+++ /dev/null
@@ -1,143 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.RecursiveHello_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  NonRecursiveC.cpp \
-  NonRecursiveC.h \
-  NonRecursiveC.inl \
-  NonRecursiveS.cpp \
-  NonRecursiveS.h \
-  NonRecursiveS.inl
-
-CLEANFILES += \
-  NonRecursive-stamp \
-  NonRecursiveC.cpp \
-  NonRecursiveC.h \
-  NonRecursiveC.inl \
-  NonRecursiveS.cpp \
-  NonRecursiveS.h \
-  NonRecursiveS.inl
-
-NonRecursiveC.cpp NonRecursiveC.h NonRecursiveC.inl NonRecursiveS.cpp NonRecursiveS.h NonRecursiveS.inl: NonRecursive-stamp
-
-NonRecursive-stamp: $(srcdir)/NonRecursive.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/NonRecursive.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  NonRecursive.idl \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.RecursiveHello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  NonRecursiveC.cpp \
-  NonRecursiveS.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.RecursiveHello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  NonRecursiveC.cpp \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc
index 00c51507577..739a66df566 100644
--- a/TAO/tests/Any/Recursive/RecursiveHello.mpc
+++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc
@@ -2,38 +2,20 @@
 //
 // $Id$
 
-project(*idl): taoidldefaults, valuetype {
-  IDL_Files {
-    NonRecursive.idl
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, valuetype {
-  after += *idl
-
   Source_Files {
     Hello.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-    NonRecursiveC.cpp
-    NonRecursiveS.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*Client): taoclient, valuetype, typecodefactory {
-  after += *idl
+project(*Client): taoclient, valuetype, typecodefactory, ifr_client {
   after += *Server
-
+  
   Source_Files {
     TestC.cpp
     NonRecursiveC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/BiDirectional/.cvsignore b/TAO/tests/BiDirectional/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/BiDirectional/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc
index bb389945946..55e22534e4a 100644
--- a/TAO/tests/BiDirectional/BiDirectional.mpc
+++ b/TAO/tests/BiDirectional/BiDirectional.mpc
@@ -1,34 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1;
-}
-
-project(*Server): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
-  after += *idl
+project(*Server): taoserver, anytypecode, minimum_corba, bidir_giop {
   Source_Files {
     test_i.cpp
     server.cpp
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*Client): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
+project(*Client): taoserver, anytypecode, minimum_corba, bidir_giop {
   exename = client
-  after += *idl
+  after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
   }
 }
+
diff --git a/TAO/tests/BiDirectional/Makefile.am b/TAO/tests/BiDirectional/Makefile.am
deleted file mode 100644
index 996008bc27a..00000000000
--- a/TAO/tests/BiDirectional/Makefile.am
+++ /dev/null
@@ -1,117 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.BiDirectional_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.BiDirectional_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.BiDirectional_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
index a76649bfc17..abcf650df1b 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
+++ b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
@@ -1,34 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
-  after += *idl
+project(*Server): taoserver, minimum_corba, bidir_giop {
   Source_Files {
     test_i.cpp
     server.cpp
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
-  after += *idl
+project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
+  after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
   }
 }
 
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/Makefile.am b/TAO/tests/BiDirectional_DelayedUpcall/Makefile.am
deleted file mode 100644
index 4b2dc0eb6d4..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/Makefile.am
+++ /dev/null
@@ -1,117 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.BiDir_DelayedUpcall_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.BiDir_DelayedUpcall_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.BiDir_DelayedUpcall_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/BiDirectional_MultipleORB/.cvsignore b/TAO/tests/BiDirectional_MultipleORB/.cvsignore
new file mode 100644
index 00000000000..96882f0dbca
--- /dev/null
+++ b/TAO/tests/BiDirectional_MultipleORB/.cvsignore
@@ -0,0 +1 @@
+destroy
diff --git a/TAO/tests/BiDirectional_MultipleORB/Makefile.am b/TAO/tests/BiDirectional_MultipleORB/Makefile.am
deleted file mode 100644
index 99a47f9ef1d..00000000000
--- a/TAO/tests/BiDirectional_MultipleORB/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.destroy.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = destroy
-
-destroy_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-destroy_SOURCES = \
-  destroy.cpp
-
-destroy_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
index 5b30ddc1b1c..b8dd7761667 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoserver, anytypecode, bidir_giop, avoids_corba_e_micro {
+project: taoserver, anytypecode, bidir_giop {
   exename = destroy
   Source_Files {
     destroy.cpp
diff --git a/TAO/tests/BiDirectional_NestedUpcall/.cvsignore b/TAO/tests/BiDirectional_NestedUpcall/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/BiDirectional_NestedUpcall/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
index 7d7848bccd9..abcf650df1b 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
+++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
@@ -1,33 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
-  after += *idl
+project(*Server): taoserver, minimum_corba, bidir_giop {
   Source_Files {
     test_i.cpp
     server.cpp
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
-  after += *idl
+project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
+  after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
   }
 }
+
diff --git a/TAO/tests/BiDirectional_NestedUpcall/Makefile.am b/TAO/tests/BiDirectional_NestedUpcall/Makefile.am
deleted file mode 100644
index b7c0afa2f6d..00000000000
--- a/TAO/tests/BiDirectional_NestedUpcall/Makefile.am
+++ /dev/null
@@ -1,117 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.BiDir_NestedUpcall_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.BiDir_NestedUpcall_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.BiDir_NestedUpcall_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc
index 106dd5900d8..2493ddfb825 100644
--- a/TAO/tests/Big_AMI/Big_AMI.mpc
+++ b/TAO/tests/Big_AMI/Big_AMI.mpc
@@ -1,34 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, ami {
-  IDL_Files {
-    ami_test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging, ami {
-  after += *idl
   Source_Files {
     ami_test_i.cpp
-    ami_testC.cpp
-    ami_testS.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoserver, messaging, ami {
   exename = client
-  after += *idl
   after += *Server
   Source_Files {
-    ami_testC.cpp
-    ami_testS.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Big_AMI/Makefile.am b/TAO/tests/Big_AMI/Makefile.am
deleted file mode 100644
index db96e2ed6d9..00000000000
--- a/TAO/tests/Big_AMI/Makefile.am
+++ /dev/null
@@ -1,132 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Big_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  server.cpp \
-  ami_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Big_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Big_Oneways/.cvsignore b/TAO/tests/Big_Oneways/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Big_Oneways/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc
index 6ce9fa45d76..5cf458a0b1e 100644
--- a/TAO/tests/Big_Oneways/Big_Oneways.mpc
+++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc
@@ -1,37 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     Coordinator.cpp
     Session_Control.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoexe, portableserver {
-  after += *idl
   after += *Server
   Source_Files {
     Peer.cpp
     Session.cpp
     Session_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
+
diff --git a/TAO/tests/Big_Oneways/Makefile.am b/TAO/tests/Big_Oneways/Makefile.am
deleted file mode 100644
index ccd06c2e748..00000000000
--- a/TAO/tests/Big_Oneways/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Oneways_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Big_Oneways_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Coordinator.cpp \
-  Session_Control.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Coordinator.h \
-  Session_Control.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Big_Oneways_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Peer.cpp \
-  Session.cpp \
-  Session_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Peer.h \
-  Session.h \
-  Session_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Big_Reply/.cvsignore b/TAO/tests/Big_Reply/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Big_Reply/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc
index ca9b2157786..648403b35a4 100644
--- a/TAO/tests/Big_Reply/Big_Reply.mpc
+++ b/TAO/tests/Big_Reply/Big_Reply.mpc
@@ -1,34 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
   after += *Client
   Source_Files {
     Big_Reply_i.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient {
-  after += *idl
   Source_Files {
     TestC.cpp
     Client_Task.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Big_Reply/Makefile.am b/TAO/tests/Big_Reply/Makefile.am
deleted file mode 100644
index c6b26c68326..00000000000
--- a/TAO/tests/Big_Reply/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Reply_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Big_Reply_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Big_Reply_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Big_Reply_i.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Big_Reply_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Big_Request_Muxing/.cvsignore b/TAO/tests/Big_Request_Muxing/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Big_Request_Muxing/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
index 1e41a5c9274..5d5b10de0c1 100644
--- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
@@ -1,33 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     Payload_Receiver.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient, messaging {
-  after += *idl
   after += *Server
   Source_Files {
     TestC.cpp
     Client_Task.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Big_Request_Muxing/Makefile.am b/TAO/tests/Big_Request_Muxing/Makefile.am
deleted file mode 100644
index 854de3a0a4c..00000000000
--- a/TAO/tests/Big_Request_Muxing/Makefile.am
+++ /dev/null
@@ -1,120 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Request_Muxing_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Big_Request_Muxing_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Payload_Receiver.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Payload_Receiver.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Big_Request_Muxing_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Big_Twoways/.cvsignore b/TAO/tests/Big_Twoways/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Big_Twoways/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc
index 6ce9fa45d76..5cf458a0b1e 100644
--- a/TAO/tests/Big_Twoways/Big_Twoways.mpc
+++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc
@@ -1,37 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     Coordinator.cpp
     Session_Control.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoexe, portableserver {
-  after += *idl
   after += *Server
   Source_Files {
     Peer.cpp
     Session.cpp
     Session_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
+
diff --git a/TAO/tests/Big_Twoways/Makefile.am b/TAO/tests/Big_Twoways/Makefile.am
deleted file mode 100644
index 8892badb59a..00000000000
--- a/TAO/tests/Big_Twoways/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Twoways_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Big_Twoways_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Coordinator.cpp \
-  Session_Control.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Coordinator.h \
-  Session_Control.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Big_Twoways_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Peer.cpp \
-  Session.cpp \
-  Session_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Peer.h \
-  Session.h \
-  Session_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Blocking_Sync_None/.cvsignore b/TAO/tests/Blocking_Sync_None/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Blocking_Sync_None/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
index 9bdc2b936c5..f2870ef39d9 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
@@ -1,32 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     Blocking_Sync_None.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient, messaging {
-  after += *idl
   after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Blocking_Sync_None/Makefile.am b/TAO/tests/Blocking_Sync_None/Makefile.am
deleted file mode 100644
index 94403919f0c..00000000000
--- a/TAO/tests/Blocking_Sync_None/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Blocking_Sync_None_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Blocking_Sync_None_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Blocking_Sync_None.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Blocking_Sync_None.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Blocking_Sync_None_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Blocking_Sync_None.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1020_Basic_Regression/.cvsignore b/TAO/tests/Bug_1020_Basic_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1020_Basic_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
index e34a19f5abc..792a118237c 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
+++ b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
@@ -1,36 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     Echo_Caller.cpp
     Server_Task.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient, messaging {
-  after += *idl
   after += *Server
   Source_Files {
     Echo.cpp
     Client_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Makefile.am b/TAO/tests/Bug_1020_Basic_Regression/Makefile.am
deleted file mode 100644
index 2cf5823bc29..00000000000
--- a/TAO/tests/Bug_1020_Basic_Regression/Makefile.am
+++ /dev/null
@@ -1,125 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1020_Basic_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1020_Basic_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Caller.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo_Caller.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1020_Basic_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Echo.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Echo.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1020_Regression/.cvsignore b/TAO/tests/Bug_1020_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1020_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
index 33bc4b81e31..02b8056c191 100644
--- a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
+++ b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
@@ -1,36 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     ORB_Task.cpp
     Server_i.cpp
     Server_Task.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoexe, messaging {
-  after += *idl
   Source_Files {
     Echo.cpp
     ORB_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1020_Regression/Makefile.am b/TAO/tests/Bug_1020_Regression/Makefile.am
deleted file mode 100644
index 57b64ceb1d0..00000000000
--- a/TAO/tests/Bug_1020_Regression/Makefile.am
+++ /dev/null
@@ -1,127 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1020_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1020_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo.cpp \
-  ORB_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Echo.h \
-  ORB_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1020_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ORB_Task.cpp \
-  Server_Task.cpp \
-  Server_i.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  ORB_Task.h \
-  Server_Task.h \
-  Server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
index 86c800e8fef..106400400ae 100644
--- a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
+++ b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
@@ -1,35 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags += -Sa -St
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     BlobServer.cpp
     server.cpp
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoserver {
   exename = client
-  after += *idl
   after += *Server
   Source_Files {
     client.cpp
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
   }
 }
+
diff --git a/TAO/tests/Bug_1254_Regression/Makefile.am b/TAO/tests/Bug_1254_Regression/Makefile.am
deleted file mode 100644
index 558d743db78..00000000000
--- a/TAO/tests/Bug_1254_Regression/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1254_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_1254_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  BlobServer.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  BlobServer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1254_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  BlobServer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1269_Regression/.cvsignore b/TAO/tests/Bug_1269_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1269_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
index 1a4a34003bc..e38622c756d 100644
--- a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
+++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
@@ -1,35 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only =1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     Echo_Caller.cpp
     Server_Timer.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient, messaging {
-  after += *idl
   after += *Server
   Source_Files {
     Echo.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1269_Regression/Makefile.am b/TAO/tests/Bug_1269_Regression/Makefile.am
deleted file mode 100644
index 0522a5fb3c2..00000000000
--- a/TAO/tests/Bug_1269_Regression/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1269_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1269_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Caller.cpp \
-  Server_Timer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo_Caller.h \
-  Server_Timer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1269_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Echo.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1270_Regression/.cvsignore b/TAO/tests/Bug_1270_Regression/.cvsignore
new file mode 100644
index 00000000000..d955c473987
--- /dev/null
+++ b/TAO/tests/Bug_1270_Regression/.cvsignore
@@ -0,0 +1,3 @@
+client
+server
+shutdown
diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
index a594a344e69..146c41a5026 100644
--- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
+++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
@@ -1,47 +1,25 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only =1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     Echo_Caller.cpp
     Server_Timer.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient, messaging {
-  after += *idl
   after += *Server
   Source_Files {
     Echo.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Shutdown): taoexe, messaging {
-  after += *idl
   after += *Client
   Source_Files {
     shutdown.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1270_Regression/Makefile.am b/TAO/tests/Bug_1270_Regression/Makefile.am
deleted file mode 100644
index 444f9979eae..00000000000
--- a/TAO/tests/Bug_1270_Regression/Makefile.am
+++ /dev/null
@@ -1,158 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1270_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1270_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Caller.cpp \
-  Server_Timer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo_Caller.h \
-  Server_Timer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1270_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Echo.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1270_Regression_Shutdown.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += shutdown
-
-shutdown_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-shutdown_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  shutdown.cpp \
-  Echo.h \
-  Echo_Caller.h \
-  ORB_Task.h \
-  Server_Timer.h
-
-shutdown_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1330_Regression/.cvsignore b/TAO/tests/Bug_1330_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1330_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
index 803bdf58c37..93a6bb0d168 100644
--- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
+++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
@@ -1,32 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, iortable {
-  after += *idl
   Source_Files {
     Test_i.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Bug_1330_Regression/Makefile.am b/TAO/tests/Bug_1330_Regression/Makefile.am
deleted file mode 100644
index a32d8094a1d..00000000000
--- a/TAO/tests/Bug_1330_Regression/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1330_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1330_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1330_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1361_Regression/.cvsignore b/TAO/tests/Bug_1361_Regression/.cvsignore
new file mode 100644
index 00000000000..d955c473987
--- /dev/null
+++ b/TAO/tests/Bug_1361_Regression/.cvsignore
@@ -0,0 +1,3 @@
+client
+server
+shutdown
diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
index 3e3ececcc65..f0247d4c080 100644
--- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -1,49 +1,27 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     Server_Thread_Pool.cpp
     Echo_Caller.cpp
     ORB_Task.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient, messaging {
-  after += *idl
   after += *Server
   Source_Files {
     Echo.cpp
     ORB_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Shutdown): taoexe, messaging {
-  after += *idl
   after += *Client
   Source_Files {
     shutdown.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1361_Regression/Makefile.am b/TAO/tests/Bug_1361_Regression/Makefile.am
deleted file mode 100644
index d20be7f6810..00000000000
--- a/TAO/tests/Bug_1361_Regression/Makefile.am
+++ /dev/null
@@ -1,163 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1361_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1361_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Caller.cpp \
-  ORB_Task.cpp \
-  Server_Thread_Pool.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo_Caller.h \
-  ORB_Task.h \
-  Server_Thread_Pool.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1361_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo.cpp \
-  ORB_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Echo.h \
-  ORB_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1361_Regression_Shutdown.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += shutdown
-
-shutdown_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-shutdown_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  shutdown.cpp \
-  Echo.h \
-  Echo_Caller.h \
-  ORB_Task.h \
-  Server_Thread_Pool.h \
-  Server_Timer.h
-
-shutdown_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1476_Regression/.cvsignore b/TAO/tests/Bug_1476_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1476_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
index 7fecacc059b..a149ce848c3 100644
--- a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
+++ b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
@@ -1,37 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging  {
-  after += *idl
   Source_Files {
     Server_Task.cpp
     Sender_i.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient, messaging {
-  after += *idl
   after += *Server
   Source_Files {
     Client_Task.cpp
     Server_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
diff --git a/TAO/tests/Bug_1476_Regression/Makefile.am b/TAO/tests/Bug_1476_Regression/Makefile.am
deleted file mode 100644
index e3dca0c929b..00000000000
--- a/TAO/tests/Bug_1476_Regression/Makefile.am
+++ /dev/null
@@ -1,125 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1476_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1476_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Sender_i.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Sender_i.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1476_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Server_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1476_Test/Makefile.am b/TAO/tests/Bug_1476_Test/Makefile.am
deleted file mode 100644
index 46e058524d2..00000000000
--- a/TAO/tests/Bug_1476_Test/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1476_Test_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  HelloC.cpp \
-  client.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1482_Regression/.cvsignore b/TAO/tests/Bug_1482_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1482_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
index aa7e626cec2..26363b5c9bc 100644
--- a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
+++ b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
@@ -1,37 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, amh, ami {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, amh, ami, iortable, portableserver {
-  after += *idl
   Source_Files {
     Hello.cpp
     Server_Task.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoserver, amh, ami {
   exename = client
-  after += *idl
   after += *Server
   Source_Files {
     Client_Task.cpp
     Reply_Handler.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1482_Regression/Makefile.am b/TAO/tests/Bug_1482_Regression/Makefile.am
deleted file mode 100644
index b15548828a0..00000000000
--- a/TAO/tests/Bug_1482_Regression/Makefile.am
+++ /dev/null
@@ -1,138 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1482_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1482_Regression_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1482_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Reply_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Reply_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1495_Regression/.cvsignore b/TAO/tests/Bug_1495_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1495_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
index 15cb99367e1..7e7cfd67199 100644
--- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
+++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
@@ -1,30 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, pi_server, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
-    testC.cpp
-    testS.cpp
     Server_ORBInitializer.cpp
     server_interceptor.cpp
     Threaded_Server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoserver, pi, interceptors {
   exename = client
-  after += *idl
   after += *Server
   Source_Files {
     test_i.cpp
@@ -36,7 +23,5 @@ project(*Client): taoserver, pi, interceptors {
     Server_Task.cpp
     Client_Task.cpp
   }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Bug_1495_Regression/Makefile.am b/TAO/tests/Bug_1495_Regression/Makefile.am
deleted file mode 100644
index 5afb4e57f93..00000000000
--- a/TAO/tests/Bug_1495_Regression/Makefile.am
+++ /dev/null
@@ -1,128 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1495_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_1495_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Threaded_Server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1495_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Server_Task.cpp \
-  Threaded_Client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Client_Task.h \
-  Server_Task.h \
-  client_interceptor.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1535_Regression/.cvsignore b/TAO/tests/Bug_1535_Regression/.cvsignore
new file mode 100644
index 00000000000..4f843084647
--- /dev/null
+++ b/TAO/tests/Bug_1535_Regression/.cvsignore
@@ -0,0 +1 @@
+bug_1535_regression
diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
index 354a6efdb94..7d7eaacb597 100644
--- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
+++ b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(bug_1535_regression) : taoserver, utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(bug_1535_regression) : taoserver, utils, minimum_corba {
   exename = bug_1535_regression
   Source_Files {
     bug_1535_regression.cpp
diff --git a/TAO/tests/Bug_1535_Regression/Makefile.am b/TAO/tests/Bug_1535_Regression/Makefile.am
deleted file mode 100644
index 3f384346b81..00000000000
--- a/TAO/tests/Bug_1535_Regression/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.bug_1535_regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = bug_1535_regression
-
-bug_1535_regression_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-bug_1535_regression_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  bug_1535_regression.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-bug_1535_regression_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1551_Regression/.cvsignore b/TAO/tests/Bug_1551_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1551_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
index 676093874cc..96a4dfabd63 100644
--- a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
+++ b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
@@ -1,37 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, ami {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, ami, iortable {
-  after += *idl
   Source_Files {
     Hello.cpp
     Server_Task.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoserver, ami {
   exename = client
-  after += *idl
   after += *Server
   Source_Files {
     Client_Task.cpp
     Reply_Handler.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1551_Regression/Makefile.am b/TAO/tests/Bug_1551_Regression/Makefile.am
deleted file mode 100644
index 68d833bd470..00000000000
--- a/TAO/tests/Bug_1551_Regression/Makefile.am
+++ /dev/null
@@ -1,138 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1551_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1551_Regression_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1551_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Reply_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Reply_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1568_Regression/.cvsignore b/TAO/tests/Bug_1568_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1568_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
index 579c46280fa..d6430831e00 100644
--- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
+++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
@@ -1,35 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, amh {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, amh {
-  after += *idl
   Source_Files {
     server.cpp
-
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoserver, amh {
-  after += *idl
   after += *Server
   exename = client
   Source_Files {
     client.cpp
-
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1568_Regression/Makefile.am b/TAO/tests/Bug_1568_Regression/Makefile.am
deleted file mode 100644
index 831beb93e46..00000000000
--- a/TAO/tests/Bug_1568_Regression/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1568_Regression_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1568_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1568_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1627_Regression/.cvsignore b/TAO/tests/Bug_1627_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1627_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
index 19a373b79c9..93a6bb0d168 100644
--- a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
+++ b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
@@ -1,32 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, iortable {
-  after += *idl
   Source_Files {
     Test_i.cpp
-    TestC.cpp
-    TestS.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Bug_1627_Regression/Makefile.am b/TAO/tests/Bug_1627_Regression/Makefile.am
deleted file mode 100644
index 4f291e1234b..00000000000
--- a/TAO/tests/Bug_1627_Regression/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1627_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1627_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1627_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1635_Regression/.cvsignore b/TAO/tests/Bug_1635_Regression/.cvsignore
new file mode 100644
index 00000000000..b051c6c57fa
--- /dev/null
+++ b/TAO/tests/Bug_1635_Regression/.cvsignore
@@ -0,0 +1 @@
+client
diff --git a/TAO/tests/Bug_1635_Regression/Makefile.am b/TAO/tests/Bug_1635_Regression/Makefile.am
deleted file mode 100644
index 3ba24415721..00000000000
--- a/TAO/tests/Bug_1635_Regression/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1635_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1636_Regression/.cvsignore b/TAO/tests/Bug_1636_Regression/.cvsignore
new file mode 100644
index 00000000000..b051c6c57fa
--- /dev/null
+++ b/TAO/tests/Bug_1636_Regression/.cvsignore
@@ -0,0 +1 @@
+client
diff --git a/TAO/tests/Bug_1636_Regression/Makefile.am b/TAO/tests/Bug_1636_Regression/Makefile.am
deleted file mode 100644
index c2aaf3eff02..00000000000
--- a/TAO/tests/Bug_1636_Regression/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.bug_1636_testclient.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1636_Regression/test.mpc b/TAO/tests/Bug_1636_Regression/test.mpc
index 79a8483b3d4..ab891487d3f 100644
--- a/TAO/tests/Bug_1636_Regression/test.mpc
+++ b/TAO/tests/Bug_1636_Regression/test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, minimum_corba {
    exename = client
 
    IDL_Files {
diff --git a/TAO/tests/Bug_1639_Regression/.cvsignore b/TAO/tests/Bug_1639_Regression/.cvsignore
new file mode 100644
index 00000000000..b051c6c57fa
--- /dev/null
+++ b/TAO/tests/Bug_1639_Regression/.cvsignore
@@ -0,0 +1 @@
+client
diff --git a/TAO/tests/Bug_1639_Regression/Makefile.am b/TAO/tests/Bug_1639_Regression/Makefile.am
deleted file mode 100644
index 810ca0bbbce..00000000000
--- a/TAO/tests/Bug_1639_Regression/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1639_testclient.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  structC.cpp \
-  structC.h \
-  structC.inl \
-  structS.cpp \
-  structS.h \
-  structS.inl
-
-CLEANFILES = \
-  struct-stamp \
-  structC.cpp \
-  structC.h \
-  structC.inl \
-  structS.cpp \
-  structS.h \
-  structS.inl
-
-structC.cpp structC.h structC.inl structS.cpp structS.h structS.inl: struct-stamp
-
-struct-stamp: $(srcdir)/struct.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/struct.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  structC.cpp \
-  structS.cpp \
-  struct_client.cpp \
-  structC.h \
-  structC.inl \
-  structS.h \
-  structS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1639_Regression/test.mpc b/TAO/tests/Bug_1639_Regression/test.mpc
index 883fc1c4bd0..f0d95132c29 100644
--- a/TAO/tests/Bug_1639_Regression/test.mpc
+++ b/TAO/tests/Bug_1639_Regression/test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (Bug_1639_testclient) : taoserver, dynamicany {
+project (Bug_1639_testclient) : taoserver, dynamicany, exceptions {
    exename    = client
    Source_Files {
       struct_client.cpp
diff --git a/TAO/tests/Bug_1670_Regression/.cvsignore b/TAO/tests/Bug_1670_Regression/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Bug_1670_Regression/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
index a7ebd6af44a..5e8364ab993 100644
--- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
+++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
@@ -1,37 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, amh {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, amh {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoserver, amh {
   exename = client
-  after += *idl
   after += *Server
   Source_Files {
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Bug_1670_Regression/Makefile.am b/TAO/tests/Bug_1670_Regression/Makefile.am
deleted file mode 100644
index ad7e1dd0f3f..00000000000
--- a/TAO/tests/Bug_1670_Regression/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1670_Regression_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1670_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1670_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
index a2357ad295c..9a1892855d9 100644
--- a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
+++ b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
@@ -1,32 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     Hello.cpp
-    TestC.cpp
-    TestS.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Bug_1676_Regression/Makefile.am b/TAO/tests/Bug_1676_Regression/Makefile.am
deleted file mode 100644
index fb8e4382416..00000000000
--- a/TAO/tests/Bug_1676_Regression/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1676_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1676_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1676_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1693_Test/.cvsignore b/TAO/tests/Bug_1693_Test/.cvsignore
new file mode 100644
index 00000000000..b051c6c57fa
--- /dev/null
+++ b/TAO/tests/Bug_1693_Test/.cvsignore
@@ -0,0 +1 @@
+client
diff --git a/TAO/tests/Bug_1693_Test/Makefile.am b/TAO/tests/Bug_1693_Test/Makefile.am
deleted file mode 100644
index d58763326a0..00000000000
--- a/TAO/tests/Bug_1693_Test/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1693_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc
index 679a47c31c8..679a47c31c8 100644..100755
--- a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc
+++ b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc
diff --git a/TAO/tests/Bug_1812_Regression/Makefile.am b/TAO/tests/Bug_1812_Regression/Makefile.am
deleted file mode 100644
index db26b241d43..00000000000
--- a/TAO/tests/Bug_1812_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1812_Regession_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  test.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1812_Regression/Test.idl b/TAO/tests/Bug_1812_Regression/Test.idl
index 176f713989b..176f713989b 100644..100755
--- a/TAO/tests/Bug_1812_Regression/Test.idl
+++ b/TAO/tests/Bug_1812_Regression/Test.idl
diff --git a/TAO/tests/Bug_1812_Regression/test.cpp b/TAO/tests/Bug_1812_Regression/test.cpp
index d3b463ab1f1..d3b463ab1f1 100644..100755
--- a/TAO/tests/Bug_1812_Regression/test.cpp
+++ b/TAO/tests/Bug_1812_Regression/test.cpp
diff --git a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
index 679a47c31c8..679a47c31c8 100644..100755
--- a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
+++ b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
diff --git a/TAO/tests/Bug_1813_Regression/Makefile.am b/TAO/tests/Bug_1813_Regression/Makefile.am
deleted file mode 100644
index 960681b78e7..00000000000
--- a/TAO/tests/Bug_1813_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1813_Regession_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  test.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1813_Regression/Test.idl b/TAO/tests/Bug_1813_Regression/Test.idl
index 2b47d41dd97..2b47d41dd97 100644..100755
--- a/TAO/tests/Bug_1813_Regression/Test.idl
+++ b/TAO/tests/Bug_1813_Regression/Test.idl
diff --git a/TAO/tests/Bug_1813_Regression/test.cpp b/TAO/tests/Bug_1813_Regression/test.cpp
index d3b463ab1f1..d3b463ab1f1 100644..100755
--- a/TAO/tests/Bug_1813_Regression/test.cpp
+++ b/TAO/tests/Bug_1813_Regression/test.cpp
diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
index 7bb66c7b450..15f79878b23 100644
--- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
+++ b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
@@ -1,32 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, ami {
-  IDL_Files {
-    AMI.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, iortable, ami {
-  after += *idl
+project(*Server): taoserver, iortable, ami, exceptions {
   Source_Files {
     server.cpp
-    AMIC.cpp
-    AMIS.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*Client): taoclient, ami {
-  after += *idl
-  after += *Server
+project(*Client): taoclient, ami, exceptions {
   Source_Files {
     client.cpp
-    AMIC.cpp
-    AMIS.cpp
-  }
-  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1869_Regression/Makefile.am b/TAO/tests/Bug_1869_Regression/Makefile.am
deleted file mode 100644
index 2002f708ab0..00000000000
--- a/TAO/tests/Bug_1869_Regression/Makefile.am
+++ /dev/null
@@ -1,130 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1869_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  AMIC.cpp \
-  AMIC.h \
-  AMIC.inl \
-  AMIS.cpp \
-  AMIS.h \
-  AMIS.inl
-
-CLEANFILES = \
-  AMI-stamp \
-  AMIC.cpp \
-  AMIC.h \
-  AMIC.inl \
-  AMIS.cpp \
-  AMIS.h \
-  AMIS.inl
-
-AMIC.cpp AMIC.h AMIC.inl AMIS.cpp AMIS.h AMIS.inl: AMI-stamp
-
-AMI-stamp: $(srcdir)/AMI.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/AMI.idl
-	@touch $@
-
-noinst_HEADERS = \
-  AMI.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1869_Regression_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  AMIC.cpp \
-  AMIS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1869_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  AMIC.cpp \
-  AMIS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_1904_Regression/.cvsignore b/TAO/tests/Bug_1904_Regression/.cvsignore
new file mode 100644
index 00000000000..9daeafb9864
--- /dev/null
+++ b/TAO/tests/Bug_1904_Regression/.cvsignore
@@ -0,0 +1 @@
+test
diff --git a/TAO/tests/Bug_1904_Regression/Makefile.am b/TAO/tests/Bug_1904_Regression/Makefile.am
deleted file mode 100644
index efa696c355c..00000000000
--- a/TAO/tests/Bug_1904_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2084_Regression/Makefile.am b/TAO/tests/Bug_2084_Regression/Makefile.am
deleted file mode 100644
index f7a5270b4e2..00000000000
--- a/TAO/tests/Bug_2084_Regression/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2084_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  EventNode.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  EventNode.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2119_Regression/Makefile.am b/TAO/tests/Bug_2119_Regression/Makefile.am
deleted file mode 100644
index 19e4384ed45..00000000000
--- a/TAO/tests/Bug_2119_Regression/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.tao67_test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libtao67_test.la
-
-libtao67_test_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-libtao67_test_la_SOURCES = \
-  testC.cpp \
-  testS.cpp
-
-noinst_HEADERS = \
-  test.idl \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2122_Regression/Makefile.am b/TAO/tests/Bug_2122_Regression/Makefile.am
deleted file mode 100644
index adc3f2c0a3f..00000000000
--- a/TAO/tests/Bug_2122_Regression/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2122_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  test.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2124_Regression/Makefile.am b/TAO/tests/Bug_2124_Regression/Makefile.am
deleted file mode 100644
index b532b96a6f9..00000000000
--- a/TAO/tests/Bug_2124_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2124_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  test.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2126_Regression/Makefile.am b/TAO/tests/Bug_2126_Regression/Makefile.am
deleted file mode 100644
index 49f4b18b5fd..00000000000
--- a/TAO/tests/Bug_2126_Regression/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2126_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  test.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
index 7ade436bd07..2a3a953d97a 100644
--- a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
+++ b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (*Test) : taoserver, iortable, avoids_minimum_corba, messaging {
+project (*Test) : taoserver, iortable, minimum_corba {
   Source_Files {
     Hello.cpp
   }
diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp
index e5979299664..53eb63216e5 100644
--- a/TAO/tests/Bug_2134_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2134_Regression/Hello.cpp
@@ -2,8 +2,6 @@
 
 #include "tao/corba.h"
 #include "tao/IORTable/IORTable.h"
-#include "tao/Messaging/Messaging.h"
-#include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
 
@@ -21,7 +19,6 @@ public:
 
 int main(int argc, char* argv[])
 {
-  int status = 0;
   CORBA::ORB_var orb = CORBA::ORB::_nil();
 
   ACE_TRY_NEW_ENV
@@ -85,41 +82,13 @@ int main(int argc, char* argv[])
       CORBA::Object_var obj = orb->string_to_object (friendly_corbaloc.c_str ());
       ACE_TRY_CHECK;
 
-      TimeBase::TimeT timeout = 10000000;
-
-      CORBA::Any timeout_any;
-      timeout_any <<= timeout;
-
-      CORBA::PolicyList policy_list (1);
-      policy_list.length (1);
-
-      policy_list[0] = orb->create_policy (
-                              Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                              timeout_any);
-
-      CORBA::Object_var rtt_obj = obj->_set_policy_overrides (
-                                                  policy_list,
-                                                  CORBA::SET_OVERRIDE);
-
-      policy_list[0]->destroy();
+      Test::Hello_var hello2 = Test::Hello::_narrow (obj.in ());
+      ACE_TRY_CHECK;
 
-      Test::Hello_var hello2 = Test::Hello::_narrow (rtt_obj.in ());
+      hello2->say_hello ();
       ACE_TRY_CHECK;
 
-      if (CORBA::is_nil (hello2.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Unable to narrow from "
-                      "corbaloc with policy override\n"));
-          status = 1;
-        }
-      else
-        {
-          hello2->say_hello ();
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG, "Test succeeded !!!\n"));
-        }
+      ACE_DEBUG ((LM_DEBUG, "Test succeeded !!!\n"));
 
       orb->destroy();
       ACE_TRY_CHECK;
@@ -128,9 +97,9 @@ int main(int argc, char* argv[])
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                           "Error - test failed - exception caught:");
-      status = 1;
+      return 1;
     }
   ACE_ENDTRY;
 
-  return status;
+  return 0;
 }
diff --git a/TAO/tests/Bug_2134_Regression/Makefile.am b/TAO/tests/Bug_2134_Regression/Makefile.am
deleted file mode 100644
index 0b62e9f7bd9..00000000000
--- a/TAO/tests/Bug_2134_Regression/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2134_Regression_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  HelloC.cpp \
-  HelloS.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc
index 3fcbdd9dee2..3fcbdd9dee2 100644..100755
--- a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc
+++ b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc
diff --git a/TAO/tests/Bug_2144_Regression/Makefile.am b/TAO/tests/Bug_2144_Regression/Makefile.am
deleted file mode 100644
index e93928a2855..00000000000
--- a/TAO/tests/Bug_2144_Regression/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2144_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2144_Regression/README b/TAO/tests/Bug_2144_Regression/README
index 78e177a24c7..78e177a24c7 100644..100755
--- a/TAO/tests/Bug_2144_Regression/README
+++ b/TAO/tests/Bug_2144_Regression/README
diff --git a/TAO/tests/Bug_2144_Regression/test.cpp b/TAO/tests/Bug_2144_Regression/test.cpp
index c7b795b0d04..c7b795b0d04 100644..100755
--- a/TAO/tests/Bug_2144_Regression/test.cpp
+++ b/TAO/tests/Bug_2144_Regression/test.cpp
diff --git a/TAO/tests/Bug_2144_Regression/test.idl b/TAO/tests/Bug_2144_Regression/test.idl
index 28335e7e932..28335e7e932 100644..100755
--- a/TAO/tests/Bug_2144_Regression/test.idl
+++ b/TAO/tests/Bug_2144_Regression/test.idl
diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
index fed64e9b29a..c01584c3559 100644
--- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
@@ -1,33 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     test_i.cpp
-    testC.cpp
-    testS.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): taoclient, anytypecode, minimum_corba {
   after += *Server
   Source_Files {
     testC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Bug_2174_Regression/Makefile.am b/TAO/tests/Bug_2174_Regression/Makefile.am
deleted file mode 100644
index 9943bfcdddc..00000000000
--- a/TAO/tests/Bug_2174_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2174_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2174_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2174_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2174_Regression/run_test.pl b/TAO/tests/Bug_2174_Regression/run_test.pl
index e321d0a888c..5c1415515e4 100755
--- a/TAO/tests/Bug_2174_Regression/run_test.pl
+++ b/TAO/tests/Bug_2174_Regression/run_test.pl
@@ -70,9 +70,6 @@ if ($client != 3) {
 
 # Test C: server does not run (_non_existent() throws TRANSIENT)
 
-# This test was failing on win32 without this sleep.
-sleep 1;
-
 $client = $CL->SpawnWaitKill (10);
 unlink $iorfile;
 if ($client != 5) {
diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
index d4c612baee2..ff28e59983f 100644..100755
--- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
+++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
@@ -1,33 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, strategies {
-  after += *idl
   Source_Files {
     Hello.cpp
-    TestC.cpp
-    TestS.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp
index 65df3934e3a..65df3934e3a 100644..100755
--- a/TAO/tests/Bug_2183_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2183_Regression/Hello.cpp
diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h
index 7e1c3042968..7e1c3042968 100644..100755
--- a/TAO/tests/Bug_2183_Regression/Hello.h
+++ b/TAO/tests/Bug_2183_Regression/Hello.h
diff --git a/TAO/tests/Bug_2183_Regression/Makefile.am b/TAO/tests/Bug_2183_Regression/Makefile.am
deleted file mode 100644
index ce1fddacc1d..00000000000
--- a/TAO/tests/Bug_2183_Regression/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2183_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2183_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2183_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2183_Regression/README b/TAO/tests/Bug_2183_Regression/README
index 4e54c27822b..4e54c27822b 100644..100755
--- a/TAO/tests/Bug_2183_Regression/README
+++ b/TAO/tests/Bug_2183_Regression/README
diff --git a/TAO/tests/Bug_2183_Regression/Test.idl b/TAO/tests/Bug_2183_Regression/Test.idl
index 3c0976e106d..3c0976e106d 100644..100755
--- a/TAO/tests/Bug_2183_Regression/Test.idl
+++ b/TAO/tests/Bug_2183_Regression/Test.idl
diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp
index 913d3153ae9..913d3153ae9 100644..100755
--- a/TAO/tests/Bug_2183_Regression/client.cpp
+++ b/TAO/tests/Bug_2183_Regression/client.cpp
diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp
index 4853611a134..4853611a134 100644..100755
--- a/TAO/tests/Bug_2183_Regression/server.cpp
+++ b/TAO/tests/Bug_2183_Regression/server.cpp
diff --git a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
index 874a0bb77df..0f6d8164108 100644
--- a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
+++ b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
@@ -1,40 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, strategies {
-  after += *idl
   Source_Files {
     Hello.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoserver, strategies {
-  after += *idl
-  after += *Server
   exename = client
   Source_Files {
     Hello.cpp
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Bug_2186_Regression/Makefile.am b/TAO/tests/Bug_2186_Regression/Makefile.am
deleted file mode 100644
index 82f5d21c814..00000000000
--- a/TAO/tests/Bug_2186_Regression/Makefile.am
+++ /dev/null
@@ -1,111 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2186_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2186_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2186_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2188_Regression/Makefile.am b/TAO/tests/Bug_2188_Regression/Makefile.am
deleted file mode 100644
index 3afd84b2118..00000000000
--- a/TAO/tests/Bug_2188_Regression/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.broken_idl.am
-
-BUILT_SOURCES = \
-  brokenC.cpp \
-  brokenC.h \
-  brokenC.inl \
-  brokenS.cpp \
-  brokenS.h \
-  brokenS.inl
-
-CLEANFILES = \
-  broken-stamp \
-  brokenC.cpp \
-  brokenC.h \
-  brokenC.inl \
-  brokenS.cpp \
-  brokenS.h \
-  brokenS.inl
-
-brokenC.cpp brokenC.h brokenC.inl brokenS.cpp brokenS.h brokenS.inl: broken-stamp
-
-broken-stamp: $(srcdir)/broken.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/broken.idl
-	@touch $@
-
-noinst_HEADERS = \
-  broken.idl
-
-## Makefile.Broken_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  brokenC.cpp \
-  brokenS.cpp \
-  broken_i.cpp \
-  server.cpp \
-  broken_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Broken_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  brokenC.cpp \
-  client.cpp \
-  broken_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2188_Regression/broken.idl b/TAO/tests/Bug_2188_Regression/broken.idl
index bc1eaa77e75..3337478fa51 100644
--- a/TAO/tests/Bug_2188_Regression/broken.idl
+++ b/TAO/tests/Bug_2188_Regression/broken.idl
@@ -1,7 +1,7 @@
 //
-// broken.idl -- Test IDL for array type CCA regressions
+// arrayTest.idl -- Test IDL for array type CCA regressions
 //
-// $Id$
+// $Revision$	$Date$
 //
 
 enum enum1
diff --git a/TAO/tests/Bug_2188_Regression/broken.mpc b/TAO/tests/Bug_2188_Regression/broken.mpc
index dbcd24841bb..184d57d6c73 100644
--- a/TAO/tests/Bug_2188_Regression/broken.mpc
+++ b/TAO/tests/Bug_2188_Regression/broken.mpc
@@ -1,32 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    broken.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
+
   Source_Files {
     broken_i.cpp
-    brokenC.cpp
-    brokenS.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
+
   Source_Files {
     brokenC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Bug_2201_Regression/Makefile.am b/TAO/tests/Bug_2201_Regression/Makefile.am
deleted file mode 100644
index eadcaef70b1..00000000000
--- a/TAO/tests/Bug_2201_Regression/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2201_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestDataC.cpp \
-  TestDataC.h \
-  TestDataC.inl \
-  TestDataS.cpp \
-  TestDataS.h \
-  TestDataS.inl
-
-CLEANFILES = \
-  TestData-stamp \
-  TestDataC.cpp \
-  TestDataC.h \
-  TestDataC.inl \
-  TestDataS.cpp \
-  TestDataS.h \
-  TestDataS.inl
-
-TestDataC.cpp TestDataC.h TestDataC.inl TestDataS.cpp TestDataS.h TestDataS.inl: TestData-stamp
-
-TestData-stamp: $(srcdir)/TestData.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestData.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  TestDataC.cpp \
-  TestDataS.cpp \
-  test.cpp \
-  TestDataC.h \
-  TestDataC.inl \
-  TestDataS.h \
-  TestDataS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc
index cff84ebf492..cff84ebf492 100644..100755
--- a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc
+++ b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc
diff --git a/TAO/tests/Bug_2222_Regression/Makefile.am b/TAO/tests/Bug_2222_Regression/Makefile.am
deleted file mode 100644
index f0f01af2578..00000000000
--- a/TAO/tests/Bug_2222_Regression/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2222_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestCaseC.cpp \
-  TestCaseC.h \
-  TestCaseC.inl \
-  TestCaseS.h \
-  TestCaseS.inl
-
-CLEANFILES += \
-  TestCase-stamp \
-  TestCaseC.cpp \
-  TestCaseC.h \
-  TestCaseC.inl \
-  TestCaseS.h \
-  TestCaseS.inl
-
-TestCaseC.cpp TestCaseC.h TestCaseC.inl TestCaseS.h TestCaseS.inl: TestCase-stamp
-
-TestCase-stamp: $(srcdir)/TestCase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestCase.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TestTypeC.cpp \
-  TestTypeC.h \
-  TestTypeC.inl \
-  TestTypeS.h \
-  TestTypeS.inl
-
-CLEANFILES += \
-  TestType-stamp \
-  TestTypeC.cpp \
-  TestTypeC.h \
-  TestTypeC.inl \
-  TestTypeS.h \
-  TestTypeS.inl
-
-TestTypeC.cpp TestTypeC.h TestTypeC.inl TestTypeS.h TestTypeS.inl: TestType-stamp
-
-TestType-stamp: $(srcdir)/TestType.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestType.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestCaseC.cpp \
-  TestTypeC.cpp \
-  test.cpp \
-  TestCaseC.h \
-  TestCaseC.inl \
-  TestCaseS.h \
-  TestCaseS.inl \
-  TestTypeC.h \
-  TestTypeC.inl \
-  TestTypeS.h \
-  TestTypeS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2222_Regression/TestCase.idl b/TAO/tests/Bug_2222_Regression/TestCase.idl
index 119634fdc21..119634fdc21 100644..100755
--- a/TAO/tests/Bug_2222_Regression/TestCase.idl
+++ b/TAO/tests/Bug_2222_Regression/TestCase.idl
diff --git a/TAO/tests/Bug_2222_Regression/TestType.idl b/TAO/tests/Bug_2222_Regression/TestType.idl
index 408e5cf6d97..408e5cf6d97 100644..100755
--- a/TAO/tests/Bug_2222_Regression/TestType.idl
+++ b/TAO/tests/Bug_2222_Regression/TestType.idl
diff --git a/TAO/tests/Bug_2222_Regression/test.cpp b/TAO/tests/Bug_2222_Regression/test.cpp
index 8e6a7bec7ff..8e6a7bec7ff 100644..100755
--- a/TAO/tests/Bug_2222_Regression/test.cpp
+++ b/TAO/tests/Bug_2222_Regression/test.cpp
diff --git a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
index 447b7f6dd43..26c4972e1db 100644
--- a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
+++ b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
@@ -1,33 +1,25 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults,anytypecode {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
 
 project (*client) : taoclient,anytypecode {
-  after += *idl
-
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  } 
+   IDL_Files {
+      Test.idl
+   }
+   
+   Source_Files {
+      TestC.cpp
+      client.cpp
+   }
 }
 
 project (*server) : taoserver,pi_server {
-  after += *idl
   after += *client
+   IDL_Files {
+      Test.idl
+   }
    
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
+   Source_Files {
+     server.cpp
+   }
 }
diff --git a/TAO/tests/Bug_2234_Regression/Makefile.am b/TAO/tests/Bug_2234_Regression/Makefile.am
deleted file mode 100644
index c6c4fe0c5e0..00000000000
--- a/TAO/tests/Bug_2234_Regression/Makefile.am
+++ /dev/null
@@ -1,110 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2234_Regression_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2234_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2234_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
index e2d0b8a08cc..bf8946a0384 100644
--- a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
+++ b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
@@ -1,37 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags += -Gp -Gd -Sa -St
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, iortable {
   exename = server
-  after += *idl
+  idlflags += -Gp -Gd -Sa -St
   Source_Files {
     server.cpp
-    TestC.cpp
-    TestS.cpp
     MyInterfaceImpl.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoserver, iortable {
   exename = client
-  after += *idl
+  idlflags += -Gp -Gd -Sa -St
   after += *Server
   Source_Files {
     client.cpp
-    TestC.cpp
-    TestS.cpp
     MyInterfaceImpl.cpp
   }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Bug_2289_Regression/Makefile.am b/TAO/tests/Bug_2289_Regression/Makefile.am
deleted file mode 100644
index a92bfd1ebe9..00000000000
--- a/TAO/tests/Bug_2289_Regression/Makefile.am
+++ /dev/null
@@ -1,111 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2289_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gp -Gd -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2289_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  MyInterfaceImpl.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  MyInterfaceImpl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2289_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  MyInterfaceImpl.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  MyInterfaceImpl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2319_Regression/Makefile.am b/TAO/tests/Bug_2319_Regression/Makefile.am
deleted file mode 100644
index d9a6b38d532..00000000000
--- a/TAO/tests/Bug_2319_Regression/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2319_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
index 9fdbd894b7d..5fce9b69306 100644
--- a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
+++ b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
@@ -1,32 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, codeset {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     Hello.cpp
-    TestC.cpp
-    TestS.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Bug_2328_Regression/Makefile.am b/TAO/tests/Bug_2328_Regression/Makefile.am
deleted file mode 100644
index d0bdb432204..00000000000
--- a/TAO/tests/Bug_2328_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2328_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2328_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2328_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
index 1f4dbfe25ff..7223fb9069c 100644
--- a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
+++ b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server) : taoserver, imr_client, avoids_corba_e_micro {
+project(*Server) : taoserver, imr_client, exceptions {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/tests/Bug_2345_Regression/Makefile.am b/TAO/tests/Bug_2345_Regression/Makefile.am
deleted file mode 100644
index 0d7fa56e753..00000000000
--- a/TAO/tests/Bug_2345_Regression/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2345_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
index c01afd5aedd..3d5cf5b5deb 100644
--- a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
+++ b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
@@ -1,31 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    foo.idl
-  }
-  custom_only = 1
-}
-
-project(*server): taoserver {
-  after += *idl
+project(*server): taoserver, exceptions {
+  idlflags += -Sa -St
   Source_Files {
-    fooC.cpp
-    fooS.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
-project(*client): taoclient {
-  after += *idl
+project(*client): taoclient, exceptions {
   after += *Server
   Source_Files {
     fooC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Bug_2349_Regression/Makefile.am b/TAO/tests/Bug_2349_Regression/Makefile.am
deleted file mode 100644
index e2de872410d..00000000000
--- a/TAO/tests/Bug_2349_Regression/Makefile.am
+++ /dev/null
@@ -1,102 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2349_Regression_Idl.am
-
-BUILT_SOURCES = \
-  fooC.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.cpp \
-  fooS.h \
-  fooS.inl
-
-CLEANFILES = \
-  foo-stamp \
-  fooC.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.cpp \
-  fooS.h \
-  fooS.inl
-
-fooC.cpp fooC.h fooC.inl fooS.cpp fooS.h fooS.inl: foo-stamp
-
-foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  foo.idl
-
-## Makefile.Bug_2349_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  fooC.cpp \
-  fooS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2349_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  fooC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
index d428b0fce50..d428b0fce50 100644..100755
--- a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
+++ b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
diff --git a/TAO/tests/Bug_2375_Regression/Makefile.am b/TAO/tests/Bug_2375_Regression/Makefile.am
deleted file mode 100644
index d42df4ae267..00000000000
--- a/TAO/tests/Bug_2375_Regression/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2375_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2375_Regression/README b/TAO/tests/Bug_2375_Regression/README
index 97b642530a1..97b642530a1 100644..100755
--- a/TAO/tests/Bug_2375_Regression/README
+++ b/TAO/tests/Bug_2375_Regression/README
diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp
index 2a2d57db0e7..2a2d57db0e7 100644..100755
--- a/TAO/tests/Bug_2375_Regression/test.cpp
+++ b/TAO/tests/Bug_2375_Regression/test.cpp
diff --git a/TAO/tests/Bug_2375_Regression/test.idl b/TAO/tests/Bug_2375_Regression/test.idl
index a6ee7413825..a6ee7413825 100644..100755
--- a/TAO/tests/Bug_2375_Regression/test.idl
+++ b/TAO/tests/Bug_2375_Regression/test.idl
diff --git a/TAO/tests/Bug_2399_Regression/Makefile.am b/TAO/tests/Bug_2399_Regression/Makefile.am
deleted file mode 100644
index 32003a5ed50..00000000000
--- a/TAO/tests/Bug_2399_Regression/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2399_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  includedC.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.cpp \
-  includedS.h \
-  includedS.inl
-
-CLEANFILES += \
-  included-stamp \
-  includedC.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.cpp \
-  includedS.h \
-  includedS.inl
-
-includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl: included-stamp
-
-included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -t ./mytmp $(srcdir)/included.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -t ./mytmp $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  includedC.cpp \
-  includedS.cpp \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.h \
-  includedS.inl \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
index e2bd6d206cd..27d1cc5fd95 100644
--- a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
+++ b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
@@ -1,37 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, anytypecode {
-  IDL_Files {
-    publisher.idl
-    subscriber.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging, threads {
-  after += *idl
   Source_Files {
     publisher_impl.cpp
-    publisherS.cpp
-    publisherC.cpp
-    subscriberC.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoserver, threads {
   exename = client
-  after += *idl
+  after += *Server
   Source_Files {
     subscriber_impl.cpp
-    subscriberS.cpp
-    subscriberC.cpp
-    publisherC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Bug_2417_Regression/Makefile.am b/TAO/tests/Bug_2417_Regression/Makefile.am
deleted file mode 100644
index de92d5ab5b5..00000000000
--- a/TAO/tests/Bug_2417_Regression/Makefile.am
+++ /dev/null
@@ -1,151 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2417_Regression_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  publisherC.cpp \
-  publisherC.h \
-  publisherC.inl \
-  publisherS.cpp \
-  publisherS.h \
-  publisherS.inl
-
-CLEANFILES += \
-  publisher-stamp \
-  publisherC.cpp \
-  publisherC.h \
-  publisherC.inl \
-  publisherS.cpp \
-  publisherS.h \
-  publisherS.inl
-
-publisherC.cpp publisherC.h publisherC.inl publisherS.cpp publisherS.h publisherS.inl: publisher-stamp
-
-publisher-stamp: $(srcdir)/publisher.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/publisher.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  subscriberC.cpp \
-  subscriberC.h \
-  subscriberC.inl \
-  subscriberS.cpp \
-  subscriberS.h \
-  subscriberS.inl
-
-CLEANFILES += \
-  subscriber-stamp \
-  subscriberC.cpp \
-  subscriberC.h \
-  subscriberC.inl \
-  subscriberS.cpp \
-  subscriberS.h \
-  subscriberS.inl
-
-subscriberC.cpp subscriberC.h subscriberC.inl subscriberS.cpp subscriberS.h subscriberS.inl: subscriber-stamp
-
-subscriber-stamp: $(srcdir)/subscriber.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/subscriber.idl
-	@touch $@
-
-noinst_HEADERS = \
-  publisher.idl \
-  subscriber.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2417_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  publisherC.cpp \
-  subscriberC.cpp \
-  subscriberS.cpp \
-  subscriber_impl.cpp \
-  subscriber_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2417_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  publisherC.cpp \
-  publisherS.cpp \
-  publisher_impl.cpp \
-  server.cpp \
-  subscriberC.cpp \
-  publisher_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2419_Regression/Makefile.am b/TAO/tests/Bug_2419_Regression/Makefile.am
deleted file mode 100644
index 03c28405bdb..00000000000
--- a/TAO/tests/Bug_2419_Regression/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2419_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  local_childC.cpp \
-  local_childC.h \
-  local_childC.inl \
-  local_childS.cpp \
-  local_childS.h \
-  local_childS.inl
-
-CLEANFILES += \
-  local_child-stamp \
-  local_childC.cpp \
-  local_childC.h \
-  local_childC.inl \
-  local_childS.cpp \
-  local_childS.h \
-  local_childS.inl
-
-local_childC.cpp local_childC.h local_childC.inl local_childS.cpp local_childS.h local_childS.inl: local_child-stamp
-
-local_child-stamp: $(srcdir)/local_child.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/local_child.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  abstract_parentC.cpp \
-  abstract_parentC.h \
-  abstract_parentC.inl \
-  abstract_parentS.cpp \
-  abstract_parentS.h \
-  abstract_parentS.inl
-
-CLEANFILES += \
-  abstract_parent-stamp \
-  abstract_parentC.cpp \
-  abstract_parentC.h \
-  abstract_parentC.inl \
-  abstract_parentS.cpp \
-  abstract_parentS.h \
-  abstract_parentS.inl
-
-abstract_parentC.cpp abstract_parentC.h abstract_parentC.inl abstract_parentS.cpp abstract_parentS.h abstract_parentS.inl: abstract_parent-stamp
-
-abstract_parent-stamp: $(srcdir)/abstract_parent.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/abstract_parent.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  abstract_parentC.cpp \
-  abstract_parentS.cpp \
-  client.cpp \
-  local_childC.cpp \
-  local_childS.cpp \
-  abstract_parentC.h \
-  abstract_parentC.inl \
-  abstract_parentS.h \
-  abstract_parentS.inl \
-  local_childC.h \
-  local_childC.inl \
-  local_childS.h \
-  local_childS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2424_Regression/Makefile.am b/TAO/tests/Bug_2424_Regression/Makefile.am
deleted file mode 100644
index 396d95ffc09..00000000000
--- a/TAO/tests/Bug_2424_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2424_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  OneLineCosNamingC.cpp \
-  OneLineCosNamingC.h \
-  OneLineCosNamingC.inl \
-  OneLineCosNamingS.cpp \
-  OneLineCosNamingS.h \
-  OneLineCosNamingS.inl
-
-CLEANFILES = \
-  OneLineCosNaming-stamp \
-  OneLineCosNamingC.cpp \
-  OneLineCosNamingC.h \
-  OneLineCosNamingC.inl \
-  OneLineCosNamingS.cpp \
-  OneLineCosNamingS.h \
-  OneLineCosNamingS.inl
-
-OneLineCosNamingC.cpp OneLineCosNamingC.h OneLineCosNamingC.inl OneLineCosNamingS.cpp OneLineCosNamingS.h OneLineCosNamingS.inl: OneLineCosNaming-stamp
-
-OneLineCosNaming-stamp: $(srcdir)/OneLineCosNaming.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/OneLineCosNaming.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  OneLineCosNamingC.cpp \
-  OneLineCosNamingS.cpp \
-  client.cpp \
-  OneLineCosNamingC.h \
-  OneLineCosNamingC.inl \
-  OneLineCosNamingS.h \
-  OneLineCosNamingS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
index 71c3f8a21bb..27af500c3e6 100644
--- a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
+++ b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
@@ -1,46 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags += -GC
-
-  IDL_Files {
-    Child.idl
-    Parent.idl
-  }
-  custom_only = 1
-}
-
 project(*Server) : taoserver, messaging {
   exename   = server
-  after += *idl
+  idlflags += -Ge 1 -GC
+
   Source_Files {
     server.cpp
     ChildServant.cpp
   }
-  Source_Files {
-    ChildC.cpp
-    ChildS.cpp
-    ParentC.cpp
-    ParentS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client) : taoclient, messaging {
   exename   = client
-  after += *idl
-  after += *Server
+  idlflags += -Ge 1 -GC
+
   Source_Files {
     client.cpp
   }
-  Source_Files {
-    ChildC.cpp
-    ChildS.cpp
-    ParentC.cpp
-    ParentS.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Bug_2429_Regression/Makefile.am b/TAO/tests/Bug_2429_Regression/Makefile.am
deleted file mode 100644
index 35cb48ba541..00000000000
--- a/TAO/tests/Bug_2429_Regression/Makefile.am
+++ /dev/null
@@ -1,148 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2429_Regression_Idl.am
-
-BUILT_SOURCES = \
-  ChildC.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.cpp \
-  ChildS.h \
-  ChildS.inl
-
-CLEANFILES = \
-  Child-stamp \
-  ChildC.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.cpp \
-  ChildS.h \
-  ChildS.inl
-
-ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp
-
-Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GC $(srcdir)/Child.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  ParentC.cpp \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.cpp \
-  ParentS.h \
-  ParentS.inl
-
-CLEANFILES += \
-  Parent-stamp \
-  ParentC.cpp \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.cpp \
-  ParentS.h \
-  ParentS.inl
-
-ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp
-
-Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GC $(srcdir)/Parent.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Child.idl \
-  Parent.idl
-
-## Makefile.Bug_2429_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ChildC.cpp \
-  ChildS.cpp \
-  ChildServant.cpp \
-  ParentC.cpp \
-  ParentS.cpp \
-  server.cpp \
-  ChildServant.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2429_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ChildC.cpp \
-  ChildS.cpp \
-  ParentC.cpp \
-  ParentS.cpp \
-  client.cpp \
-  ChildServant.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
index 1214006b391..0049fc035e7 100644
--- a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
+++ b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
@@ -1,37 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags += -St
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -St
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
+  idlflags += -St
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/Bug_2494_Regression/Makefile.am b/TAO/tests/Bug_2494_Regression/Makefile.am
deleted file mode 100644
index c1e1f21f1bb..00000000000
--- a/TAO/tests/Bug_2494_Regression/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2494_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2494_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2494_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
index 538d116a20e..8541c4b3c74 100644
--- a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
+++ b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
@@ -1,41 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, ami {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): messaging, taoserver, ami {
-  after += *idl
+project(*Server): messaging, taoserver, exceptions, ami {
   Source_Files {
     test_i.cpp
     common.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): messaging, taoexe, portableserver, ami {
-  after += *idl
+project(*Client): messaging, taoexe, portableserver, exceptions, ami {
   after += *Server
   Source_Files {
     test_i.cpp
     common.cpp
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Bug_2503_Regression/Makefile.am b/TAO/tests/Bug_2503_Regression/Makefile.am
deleted file mode 100644
index 6a9a0245ebe..00000000000
--- a/TAO/tests/Bug_2503_Regression/Makefile.am
+++ /dev/null
@@ -1,137 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2503_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_2503_Regression_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  common.cpp \
-  server.cpp \
-  test_i.cpp \
-  common.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_2503_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  common.cpp \
-  test_i.cpp \
-  common.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2542_Regression/Makefile.am b/TAO/tests/Bug_2542_Regression/Makefile.am
deleted file mode 100644
index ca096232806..00000000000
--- a/TAO/tests/Bug_2542_Regression/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2542_Regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  bug_2542_regression.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2543_Regression/Makefile.am b/TAO/tests/Bug_2543_Regression/Makefile.am
deleted file mode 100644
index e0e209d54bd..00000000000
--- a/TAO/tests/Bug_2543_Regression/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2543_Regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  bug_2543_regression.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
index c023d511de6..e5a057e822b 100644
--- a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
+++ b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
@@ -31,6 +31,7 @@ int main (int argc, char* argv[])
 
        IOP::Codec_var codec = codec_factory->create_codec(e);
 
+
        CORBA::Any any_o;
        BaseSeq values;
        values.length(1);
@@ -54,7 +55,7 @@ int main (int argc, char* argv[])
             ACE_ERROR_RETURN ((LM_ERROR, "Error: wrong type!\n"), 1);
          }
 
-         orb->destroy();
+       orb->destroy();
      }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/Bug_2549_Regression/Makefile.am b/TAO/tests/Bug_2549_Regression/Makefile.am
deleted file mode 100644
index 6d3cceca5f0..00000000000
--- a/TAO/tests/Bug_2549_Regression/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2549_Regression_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc
index 31a88d65d5e..401f837e1d6 100644
--- a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc
+++ b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc
@@ -1,37 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Quoter.idl
-  }
-  custom_only = 1
-}
-
 project(*client) : taoclient {
-  after += *idl
+  after += *Server
   exename = client
   source_files {
-    client.cpp
-  }
-  source_files {
     QuoterC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
-project(*server) : taoserver, avoids_corba_e_micro {
-  after += *idl
+project(*server) : taoserver {
+  idlflags += -Sa -St
   source_files {
     server.cpp
     Stock_Factory_i.cpp
     Stock_i.cpp
   }
-  source_files {
-    QuoterC.cpp
-    QuoterS.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Bug_2560_Regression/Makefile.am b/TAO/tests/Bug_2560_Regression/Makefile.am
deleted file mode 100644
index 71b77a9aa54..00000000000
--- a/TAO/tests/Bug_2560_Regression/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2560_Regression_Idl.am
-
-BUILT_SOURCES = \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-CLEANFILES = \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Quoter.idl
-
-## Makefile.Bug_2560_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  QuoterC.cpp \
-  client.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2560_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
index 209f14c1f17..cd7cfb7f305 100644
--- a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
+++ b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
@@ -1,36 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, strategies {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     Hello.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Bug_2593_Regression/Makefile.am b/TAO/tests/Bug_2593_Regression/Makefile.am
deleted file mode 100644
index a305106633f..00000000000
--- a/TAO/tests/Bug_2593_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2593_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2593_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2593_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
index 02e2ddc1120..9a1892855d9 100644
--- a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
+++ b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
@@ -1,36 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     Hello.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Bug_2595_Regression/Makefile.am b/TAO/tests/Bug_2595_Regression/Makefile.am
deleted file mode 100644
index 1ed398d6f50..00000000000
--- a/TAO/tests/Bug_2595_Regression/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2595_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2595_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2595_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
deleted file mode 100644
index 5350e88e5a1..00000000000
--- a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
-  idlflags += -Sa -St
-
-  IDL_Files {
-    Hello.idl
-  }
-
-  custom_only = 1
-}
-
-project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, bidir_giop {
-  after += *idl
-
-  Source_Files {
-    Hello.cpp
-    HelloS.cpp
-    HelloC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-
-project(*Client): taoclient, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, messaging, bidir_giop {
-  after += *idl
-
-  Source_Files {
-    HelloS.cpp
-    HelloC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp
deleted file mode 100644
index da7f32dd4df..00000000000
--- a/TAO/tests/Bug_2654_Regression/Hello.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// $Id$
-//
-#include "Hello.h"
-#include "ace/Task.h"
-
-class Killer : public ACE_Task_Base
-{
-public:
-  Killer (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-  {
-  }
-
-  int svc (void)
-  {
-    ACE_DEBUG ((LM_DEBUG,"(%P|%t) server exiting\n"));
-    this->orb_->shutdown (1);
-    return 0;
-  }
-
-private:
-  CORBA::ORB_var orb_;
-};
-
-Hello::Hello (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    count_(0)
-
-{
-}
-
-void
-Hello::set_callback (Test::CallBack_ptr cb
-                     ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG,"(%P|%t) got callback \n"));
-  this->callback_ = Test::CallBack::_duplicate(cb);
-  this->callback_->method2();
-}
-
-void
-Hello::method (CORBA::Short count ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (++this->count_ > 10)
-    {
-      ACE_DEBUG ((LM_DEBUG, "{%P| %t) supplied count = %d\n", count));
-      PortableServer::POA_var poa = this->_default_POA();
-      PortableServer::POAManager_var mgr = poa->the_POAManager();
-      mgr->hold_requests(false);
-      Killer *k = new Killer (orb_.in ());
-      k->activate();
-    }
-}
diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h
deleted file mode 100644
index e6ab2e6e949..00000000000
--- a/TAO/tests/Bug_2654_Regression/Hello.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef HELLO_H
-#define HELLO_H
-#include /**/ "ace/pre.h"
-
-#include "HelloS.h"
-
-/// Implement the Test::Hello interface
-class Hello
-  : public virtual POA_Test::Hello
-{
-public:
-  /// Constructor
-  Hello (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual void method (CORBA::Short count ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void set_callback (Test::CallBack_ptr cb
-                             ACE_ENV_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_;
-  Test::CallBack_var callback_;
-  int count_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* HELLO_H */
diff --git a/TAO/tests/Bug_2654_Regression/Hello.idl b/TAO/tests/Bug_2654_Regression/Hello.idl
deleted file mode 100644
index 1cd21f1773e..00000000000
--- a/TAO/tests/Bug_2654_Regression/Hello.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// $Id$
-//
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-
-  interface CallBack
-  {
-    oneway void method2 ();
-  };
-
-  /// A very simple interface
-  interface Hello
-  {
-    void set_callback (in CallBack cb);
-
-    oneway void method (in short count);
-
-  };
-};
diff --git a/TAO/tests/Bug_2654_Regression/Makefile.am b/TAO/tests/Bug_2654_Regression/Makefile.am
deleted file mode 100644
index d34e605aa8f..00000000000
--- a/TAO/tests/Bug_2654_Regression/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2654_Regression_Idl.am
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Hello.idl
-
-## Makefile.Bug_2654_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  HelloC.cpp \
-  HelloS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2654_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  HelloC.cpp \
-  HelloS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2654_Regression/README b/TAO/tests/Bug_2654_Regression/README
deleted file mode 100644
index dbda07fd6a9..00000000000
--- a/TAO/tests/Bug_2654_Regression/README
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-
-@page Bug_2654_Regression README File
-
-This test is for Bug 2654. Since bug 2654 is very difficult to
-reproduce with an ordinary TAO build, hooks have been added to
-tao/IIOP_Connector.cpp to enable slight delays durring the connection
-process. See the bugzilla entry for more details. Enable the
-INDUCE_BUG_2654_A flag and disable the fix (find "Fix for bug 2654")
-in IIOP_Connector.cpp to see a pure virtual call. Otherwise the test
-should always run to completion.
-
-The essense of this test is the relationship between reference counted
-ACE_Event_Handlers and the entities that refer to them. During the
-development of the fix for bug 2654, the
-ACE_Event_Handler::[add|remove]_reference methods were modified to
-take the name of a calling function as a string and to print out the
-current count as well as the identity of the caller. The following
-code shows how this was done. Obviously all code that called add or
-remove ref had to be modified to pass the caller name.
-
-ACE_Event_Handler::Reference_Count
-ACE_Event_Handler::add_reference (const char * caller)
-{
-  int reference_counting_required =
-    this->reference_counting_policy ().value () ==
-    ACE_Event_Handler::Reference_Counting_Policy::ENABLED;
-
-  if (reference_counting_required)
-    {
-      Reference_Count result =
-        ++this->reference_count_;
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)EH[0x%x]::add_ref called by %s, now %d\n",
-                  this,caller, result));
-      return result;
-    }
-  else
-    return 1;
-}
-
-ACE_Event_Handler::Reference_Count
-ACE_Event_Handler::remove_reference (const char * caller)
-{
-  int reference_counting_required =
-    this->reference_counting_policy ().value () ==
-    ACE_Event_Handler::Reference_Counting_Policy::ENABLED;
-
-  if (reference_counting_required)
-    {
-      Reference_Count result =
-        --this->reference_count_;
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t)EH[0x%x]::remove_ref called by %s, now %d\n",
-                  this, caller, result));
-
-      if (result == 0)
-        delete this;
-
-      return result;
-    }
-  else
-    {
-      return 1;
-    }
-}
-
-To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful.
-
-*/
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
deleted file mode 100644
index b7ce8ac336a..00000000000
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-// $Id$
-
-#include "HelloS.h"
-
-#include "ace/OS_NS_time.h"
-
-#include "tao/Messaging/Messaging.h"
-
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/ORB_Core.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "tao/Transport.h"
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
-
-#include "ace/Task.h"
-#include "ace/Synch.h"
-
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-class Callback_i : public POA_Test::CallBack
-{
-public:
-  void method2(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_DEBUG ((LM_DEBUG,"(%t) Callback_i::method2 called\n"));
-  }
-};
-
-class Worker : public ACE_Task_Base
-{
-public:
-  CORBA::ORB_var orb_;
-  Test::Hello_var hello_;
-  Test::Hello_var asynch_hello_;
-  Test::CallBack_var callback_;
-
-private:
-  ACE_Mutex lock_;
-  int orb_threads_;
-  int busy_threads_;
-  int message_counter_;
-
-  int run_test (void);
-public:
-  Worker( int ot);
-  ~Worker();
-
-  int svc (void);
-};
-
-Worker::Worker(int ot)
-  :orb_threads_ (ot),
-   busy_threads_ (0),
-   message_counter_ (0)
-{
-}
-
-Worker::~Worker()
-{
-  this->orb_->destroy();
-}
-
-int
-Worker::svc()
-{
-  {
-    ACE_Guard<ACE_Mutex> g(this->lock_);
-    if (this->orb_threads_ > 0)
-      {
-        --this->orb_threads_;
-        hello_->set_callback(this->callback_.in());
-        g.release();
-        this->orb_->run();
-        return 0;
-      }
-    else
-      ++this->busy_threads_;
-  }
-  bool excep = false;
-  ACE_DEBUG ((LM_DEBUG, "(%t) starting loop\n"));
-  for (int i = 0; i < 40; i++)
-    {
-      try
-        {
-          CORBA::Short n = 0;
-          {
-            ACE_Guard<ACE_Mutex> g(this->lock_);
-            n = ++this->message_counter_;
-          }
-          this->asynch_hello_->method (n);
-
-          ACE_Time_Value udelay(0,400);
-          struct timespec ts = udelay;
-          ACE_OS::nanosleep (&ts);
-
-        }
-      catch (CORBA::Exception &ex)
-        {
-          excep = true;
-          ACE_ERROR ((LM_ERROR,
-                      "(%t) Exception caught: %s after %d invocations \n",
-                      ex._name(), i));
-          i = 39;
-        }
-    }
-  if (!excep)
-    ACE_DEBUG ((LM_DEBUG, "(%t) Did all iterations\n"));
-
-  {
-    ACE_Guard<ACE_Mutex> g(this->lock_);
-    --this->busy_threads_;
-    if (this->busy_threads_)
-      return 0;
-  }
-
-  try
-    {
-      this->orb_->shutdown();
-    }
-  catch (CORBA::Exception &)
-    {
-    }
-
-  return 0;
-}
-
-int
-init_callback (Worker &w)
-{
-  CORBA::Object_var obj =
-    w.orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  if (CORBA::is_nil (obj.in ()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) Unable to initialize the POA.\n"),
-                      1);
-
-  PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.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;
-
-  // Policies for the childPOA to be created.
-  CORBA::PolicyList policies (1);
-  policies.length (1);
-
-  CORBA::Any pol;
-  pol <<= BiDirPolicy::BOTH;
-  policies[0] =
-    w.orb_->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                        pol
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  // Create POA as child of RootPOA with the above policies.  This POA
-  // will receive request in the same connection in which it sent
-  // the request
-  PortableServer::POA_var child_poa =
-    root_poa->create_POA ("childPOA",
-                          poa_manager.in (),
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-
-  Callback_i *servant = new Callback_i;
-  PortableServer::ServantBase_var owner = servant;
-
-  PortableServer::ObjectId_var id = child_poa->activate_object (servant);
-  obj = child_poa->id_to_reference (id.in());
-  w.callback_ = Test::CallBack::_narrow(obj.in());
-
-  // Creation of childPOA is over. Destroy the Policy objects.
-  for (CORBA::ULong i = 0;
-       i < policies.length ();
-       ++i)
-    {
-      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  return 0;
-}
-
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  Worker worker (5);
-  try
-    {
-      worker.orb_ =
-        CORBA::ORB_init (argc, argv, "test");
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      ACE_DEBUG ((LM_DEBUG,"using ior = %s\n",ior));
-
-      CORBA::Object_var tmp = worker.orb_->string_to_object(ior);
-
-      if (CORBA::is_nil (tmp.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, "Invalid IOR.\n")
-                            ,1);
-        }
-      worker.hello_ = Test::Hello::_narrow(tmp.in ());
-
-      if (CORBA::is_nil (worker.hello_.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Hello reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-//       bool x = worker.hello_->_non_existent();
-//       ACE_DEBUG ((LM_DEBUG, "_non_existent returned %d\n",x));
-
-      {
-        // Set the Synch Scopes
-
-        CORBA::Any scope_as_any;
-
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying SYNC_NONE.\n"));
-        scope_as_any <<= Messaging::SYNC_NONE;
-        CORBA::PolicyList policies (1);
-        policies.length (1);
-        policies[0] =
-          worker.orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                              scope_as_any);
-
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) - Applying Synch Scope at Object level.\n"));
-        tmp = tmp->_set_policy_overrides (policies, CORBA::SET_OVERRIDE);
-        policies[0]->destroy ();
-      }
-
-      worker.asynch_hello_ = Test::Hello::_narrow(tmp.in ());
-
-      if (CORBA::is_nil (worker.asynch_hello_.in ())) {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Nil Test::Hello reference <%s>\n",
-                           ior),
-                          1);
-      }
-
-      init_callback(worker);
-
-    }
-  catch (CORBA::Exception &ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Exception caught: %s\"%s\"\n"
-                  , ex._name(), ex._rep_id ()));
-      return 1;
-    }
-
-  worker.activate (THR_NEW_LWP | THR_JOINABLE,15);
-  worker.wait();
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2654_Regression/run_test.pl b/TAO/tests/Bug_2654_Regression/run_test.pl
deleted file mode 100755
index d4110fcaef3..00000000000
--- a/TAO/tests/Bug_2654_Regression/run_test.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$debug_level = '0';
-
-foreach $i (@ARGV) {
-    if ($i eq '-debug') {
-        $debug_level = '10';
-    } 
-}
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-ORBDebuglevel $debug_level -o server.ior");
-}
-else {
-    $SV = new PerlACE::Process ("server", "-ORBdebuglevel $debug_level -o $iorfile");
-}
-$CL = new PerlACE::Process ("client", " -k file://$iorfile");
-    
-$server = $SV->Spawn ();
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    exit 1;
-}
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp
deleted file mode 100644
index 3b0c7e4528a..00000000000
--- a/TAO/tests/Bug_2654_Regression/server.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-// $Id$
-
-#include "Hello.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
-
-ACE_RCSID (Hello,
-           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[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Policies for the childPOA to be created.
-      CORBA::PolicyList policies (1);
-      policies.length (1);
-
-      CORBA::Any pol;
-      pol <<= BiDirPolicy::BOTH;
-      policies[0] =
-        orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create POA as child of RootPOA with the above policies.  This POA
-      // will receive request in the same connection in which it sent
-      // the request
-      PortableServer::POA_var child_poa =
-        root_poa->create_POA ("childPOA",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Creation of childPOA is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < policies.length ();
-           ++i)
-        {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner(hello_impl);
-
-      PortableServer::ObjectId_var id =
-        child_poa->activate_object(hello_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      obj = child_poa->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Hello_var hello =
-        Test::Hello::_narrow(obj.in() ACE_ENV_ARG_PARAMETER)
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s\n",
-                           ior_output_file),
-                           1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (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/tests/Bug_2669_Regression/Bug_2669_Regression.mpc b/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc
deleted file mode 100644
index 0cafec5b7d4..00000000000
--- a/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Test) : taoserver, messaging, ami {
-  exename   = client
-
-  Source_Files {
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_2669_Regression/Child.idl b/TAO/tests/Bug_2669_Regression/Child.idl
deleted file mode 100644
index fd35fee57e6..00000000000
--- a/TAO/tests/Bug_2669_Regression/Child.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-//=============================================================================
-/**
- *  $Id$
- */
-//=============================================================================
-
-#pragma prefix "child.pragma.prefix"
-
-#include "Parent.idl"
-
-interface ChildInterface : ParentInterface {};
-
-module ChildModule
-  {
-    interface ChildInterface : ParentModule::ParentInterface {};
-  };
diff --git a/TAO/tests/Bug_2669_Regression/Makefile.am b/TAO/tests/Bug_2669_Regression/Makefile.am
deleted file mode 100644
index d2e38b33d23..00000000000
--- a/TAO/tests/Bug_2669_Regression/Makefile.am
+++ /dev/null
@@ -1,117 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2669_Regression_Test.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  ParentC.cpp \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.cpp \
-  ParentS.h \
-  ParentS.inl
-
-CLEANFILES += \
-  Parent-stamp \
-  ParentC.cpp \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.cpp \
-  ParentS.h \
-  ParentS.inl
-
-ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp
-
-Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Parent.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  ChildC.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.cpp \
-  ChildS.h \
-  ChildS.inl
-
-CLEANFILES += \
-  Child-stamp \
-  ChildC.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.cpp \
-  ChildS.h \
-  ChildS.inl
-
-ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp
-
-Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Child.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ChildC.cpp \
-  ChildS.cpp \
-  ParentC.cpp \
-  ParentS.cpp \
-  client.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.h \
-  ChildS.inl \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.h \
-  ParentS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2669_Regression/Parent.idl b/TAO/tests/Bug_2669_Regression/Parent.idl
deleted file mode 100644
index e16e96124ec..00000000000
--- a/TAO/tests/Bug_2669_Regression/Parent.idl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-//=============================================================================
-/**
- *  $Id$
- */
-//=============================================================================
-
-#pragma prefix "parent.pragma.prefix"
-
-interface ParentInterface {};
-
-module ParentModule
-  {
-    interface ParentInterface {};
-  };
diff --git a/TAO/tests/Bug_2669_Regression/README b/TAO/tests/Bug_2669_Regression/README
deleted file mode 100644
index 5e2c1e0cf9e..00000000000
--- a/TAO/tests/Bug_2669_Regression/README
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-This test checks that the repository ID is correct for generated AMI reply handler servant classes when different pragma prefixes are used.
-
-It does this by checking that handlers for interfaces in an IDL inheritance relationship can be narrowed to their parents handler types.
-
-_Expected Success Output_
-
-E:\sm\worcvs\tao14\prism\tests\tao439_regression>run_test.pl
-Test Passed.
-
-_Expected Regression Output_
-
-E:\sm\worcvs\tao14\prism\tests\tao439_regression>run_test.pl
-Error: REGRESSION - Cannot narrow ChildModule::ChildInterface reply handler to i
-ts parent handler type.
-Error: REGRESSION - Cannot narrow ChildInterface reply handler to its parent han
-dler type.
-ERROR: client returned 1
-
-(or anything else with the word REGRESSION in)
-
-All other output is an unexpected problem.
\ No newline at end of file
diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp
deleted file mode 100644
index f840ef82b8b..00000000000
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-
-//=============================================================================
-/**
- *  $Id$
- */
-//=============================================================================
-
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-#include "ace/OS_NS_string.h"
-
-#include "ChildS.h"
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-class ChildHandler : public POA_ChildModule::AMI_ChildInterfaceHandler
-{
-public:
-  ChildHandler (void) {};
-  ~ChildHandler (void) {};
-};
-
-class NonRelatedChildHandler : public POA_AMI_ChildInterfaceHandler
-{
-public:
-  NonRelatedChildHandler (void) {};
-  ~NonRelatedChildHandler (void) {};
-};
-
-int
-main (int argc, char *argv[])
-{
-  int result = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var object_var =
-        orb->resolve_initial_references ("RootPOA");
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var poa_var =
-        PortableServer::POA::_narrow (object_var.in ());
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager_var =
-        poa_var->the_POAManager ();
-      ACE_TRY_CHECK;
-
-      poa_manager_var->activate ();
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      // Create two handlers
-      ChildHandler child_handler;
-      NonRelatedChildHandler non_related_child_handler;
-
-      ChildModule::AMI_ChildInterfaceHandler_var the_child_handler_var =
-        child_handler._this ();
-
-      const char * expectedid = "IDL:child.pragma.prefix/ChildModule/AMI_ChildInterfaceHandler:1.0";
-      if (ACE_OS::strcmp (the_child_handler_var->_interface_repository_id (), expectedid) != 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::repository id is "
-                                "incorrectly generated, received %s\n",
-                                the_child_handler_var->_interface_repository_id ()));
-          result = 1;
-        }
-
-      // This handler has no relationship with the above in IDL.
-      AMI_ChildInterfaceHandler_var the_non_related_child_handler_var =
-        non_related_child_handler._this ();
-
-      // Check that both handler objects narrow successfully to their parent
-      // handler types...
-      ParentModule::AMI_ParentInterfaceHandler_var the_parent_handler_var =
-        ParentModule::AMI_ParentInterfaceHandler::_narrow (the_child_handler_var.in ());
-
-      if (CORBA::is_nil (the_parent_handler_var.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildModule::ChildInterface "
-                                "reply handler to its parent handler type.\n"));
-          result = 1;
-        }
-
-      AMI_ParentInterfaceHandler_var the_non_related_parent_handler_var =
-        AMI_ParentInterfaceHandler::_narrow (the_non_related_child_handler_var.in ());
-
-      if (CORBA::is_nil (the_non_related_parent_handler_var.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildInterface "
-                                "reply handler to its parent handler type.\n"));
-          result = 1;
-        }
-
-      // Check that both handler objects *won't* narrow to each other's parent
-      // handler types...
-      the_parent_handler_var =
-        ParentModule::AMI_ParentInterfaceHandler::_narrow (the_non_related_child_handler_var.in ());
-
-      if (! CORBA::is_nil (the_parent_handler_var.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler "
-                                "narrows to unrelated type.\n"));
-          result = 1;
-        }
-
-      the_non_related_parent_handler_var =
-        AMI_ParentInterfaceHandler::_narrow (the_child_handler_var.in ());
-
-      if (! CORBA::is_nil (the_non_related_parent_handler_var.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler "
-                                "narrows to unrelated type.\n"));
-          result = 1;
-        }
-
-      poa_var->destroy (1,0);
-
-      orb->destroy ();
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return result;
-}
diff --git a/TAO/tests/Bug_2669_Regression/run_test.pl b/TAO/tests/Bug_2669_Regression/run_test.pl
deleted file mode 100755
index fdb7759230c..00000000000
--- a/TAO/tests/Bug_2669_Regression/run_test.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-
-if (PerlACE::is_vxworks_test()) {
-    $CL = new PerlACE::ProcessVX ("client", "");
-}
-else {
-    $CL = new PerlACE::Process ("client", "");
-}
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-else
-{
-    print "Test Passed.\n"
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_2683_Regression/IORTable.mpc b/TAO/tests/Bug_2683_Regression/IORTable.mpc
index 621b224312e..669363e1eac 100644
--- a/TAO/tests/Bug_2683_Regression/IORTable.mpc
+++ b/TAO/tests/Bug_2683_Regression/IORTable.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, iortable {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/Bug_2683_Regression/Makefile.am b/TAO/tests/Bug_2683_Regression/Makefile.am
deleted file mode 100644
index fe325d6b9fb..00000000000
--- a/TAO/tests/Bug_2683_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IORTable_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.IORTable_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IORTable_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index 4dba7549ff4..31349e3b1b9 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -69,12 +69,11 @@ public:
 };
 
 int port = 0;
-char const * target_host = "localhost";
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:h:");
+  ACE_Get_Opt get_opts (argc, argv, "p:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -83,9 +82,7 @@ parse_args (int argc, char *argv[])
       case 'p':
         port = ACE_OS::atoi (get_opts.opt_arg ());
         break;
-      case 'h':
-        target_host = get_opts.opt_arg ();
-        break;
+
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -112,7 +109,7 @@ main (int argc, char *argv[])
         return 1;
 
       char ior[100];
-      ACE_OS::sprintf (ior,"corbaloc::%s:%d/Racer",target_host,port);
+      ACE_OS::sprintf (ior,"corbaloc::localhost:%d/Racer",port);
 
       Pinger pinger(orb, ior);
 
diff --git a/TAO/tests/Bug_2683_Regression/run_test.pl b/TAO/tests/Bug_2683_Regression/run_test.pl
index 2fa15818757..b47caa3c5bd 100755
--- a/TAO/tests/Bug_2683_Regression/run_test.pl
+++ b/TAO/tests/Bug_2683_Regression/run_test.pl
@@ -18,17 +18,15 @@ foreach $i (@ARGV) {
 }
 
 unlink $iorfile;
-$TARGETHOSTNAME = "localhost";
 
 if (PerlACE::is_vxworks_test()) {
-    $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'};
-    $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210");
+    $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint iiop://localhost:43210");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210");
+    $SV = new PerlACE::Process ("server", "-ORBEndpoint iiop://localhost:43210");
 }
 
-$CL = new PerlACE::Process ("client", " -p 43210 -h $TARGETHOSTNAME");
+$CL = new PerlACE::Process ("client", " -p 43210");
 
 $server = $SV->Spawn ();
 
diff --git a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc b/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
deleted file mode 100644
index 9ec64bd7118..00000000000
--- a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Client): taoexe {
-  exename = client
-  idlflags += -GA
-
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/Bug_2702_Regression/Makefile.am b/TAO/tests/Bug_2702_Regression/Makefile.am
deleted file mode 100644
index e373be645ba..00000000000
--- a/TAO/tests/Bug_2702_Regression/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CloseConnection_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestA.h \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestA.h \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-TestA.h TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GA $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  TestA.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2702_Regression/README b/TAO/tests/Bug_2702_Regression/README
deleted file mode 100644
index 6418f2d4413..00000000000
--- a/TAO/tests/Bug_2702_Regression/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This test simulates the sending of a GIOP CloseConnection message.
-Since TAO does not send this GIOP message, a perl script
-(fakeserver2.pl) is used to simulate a CORBA server.  Since it isn't
-really a CORBA server, it has no way to generate an IOR, and instead
-listens on a pre-selected fixed port (1192).  Thus, part of this test
-includes an IOR for a server listening on endpoint
-iiop://127.0.0.1:1192.
-
-If the port number must be changed at some point in the future, one
-will have to generate a new IOR file as well.  The original was
-generated using the "server" from the "Hello" test
-($ACE_ROOT/TAO/tests/Hello) with ORB arguments
-
-    -ORBDottedDecimalAddresses 1 -ORBendpoint iiop://127.0.0.1:1192
-
-Something similar could be used to re-generate.
-
-
diff --git a/TAO/tests/Bug_2702_Regression/Test.idl b/TAO/tests/Bug_2702_Regression/Test.idl
deleted file mode 100644
index 3c0976e106d..00000000000
--- a/TAO/tests/Bug_2702_Regression/Test.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// $Id$
-//
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-  /// A very simple interface
-  interface Hello
-  {
-    /// Return a simple string
-    string get_string ();
-
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp
deleted file mode 100644
index 3b2d214029c..00000000000
--- a/TAO/tests/Bug_2702_Regression/client.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (hello.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Test::Hello reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_Time_Value duration(20, 0);
-      orb->run(duration);
-      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/tests/Bug_2702_Regression/closeconnection.dat b/TAO/tests/Bug_2702_Regression/closeconnection.dat
deleted file mode 100644
index 478fbbc2fcd..00000000000
--- a/TAO/tests/Bug_2702_Regression/closeconnection.dat
+++ /dev/null
diff --git a/TAO/tests/Bug_2702_Regression/fakeserver.pm b/TAO/tests/Bug_2702_Regression/fakeserver.pm
deleted file mode 100644
index 87f2a676f81..00000000000
--- a/TAO/tests/Bug_2702_Regression/fakeserver.pm
+++ /dev/null
@@ -1,151 +0,0 @@
-package fakeserver;
-
-use Socket;
-use IO::Socket;
-
-sub new {
-  my $self = { };
-  $self->{'filebits'} = '';
-  $self->{'connections'} = { };
-  $self->{'server'} = '';
-  $self->{'server_fileno'} = '';
-  $self->{''} = '';
-}
-
-sub run {
-  my $self = shift;
-  my $timeoutafter = shift; # in seconds
-  my $rout;
-  while ( 1 ) {
-    print STDERR "fakeserver: Loop\n";
-
-    select( undef, undef, undef, 1 );
-
-    my ($n, $left) = select( $rout = $filebits, undef, undef, $timeoutafter); # Time out after 15 seconds
-    if ($n == 0) {
-      print STDERR "fakeserver: Terminating normally\n";
-      exit 0;
-    }
-
-    my $routs = unpack("b*", $rout);
-    print STDERR "fakeserver: Select $routs\n";
-    my $pos = index( $routs,'1');
-    while ( $pos >= 0 ) {
-      $self->HandleFile( $pos );
-      $pos = index( $routs,'1', $pos+1);
-    }
-  }
-}
-
-sub CloseServer {
-  my $self = shift;
-  vec($self->{'filebits'},$self->{'server_fileno'},1) = 0;
-  $server->close();
-  undef $server;
-}
-
-sub OpenServer {
-  my $self = shift;
-  my $server = IO::Socket::INET->new(Listen    => 5,
-                                     LocalPort => 1192,
-                                     Reuse => 1,
-                                     ReuseAddr => 1,
-                                     Timeout   => 0,
-                                     Proto     => 'tcp');
-
-  die "Could not create socket $!" unless $server;
-
-  $server->blocking(0);
-  my $server_fileno = fileno($server);
-  vec($filebits,$server_fileno,1) = 1;
-
-  print STDERR "fakeserver: Starting $server_fileno\n";
-
-  open (DATA, 'closeconnection.dat') or die "couldn't open closeconnection.dat: $!\n";
-  my $n = read(DATA, $closeconnectionmessage, 100);
-  close(DATA);
-
-  print STDERR "fakeserver: read $n <$closeconnectionmessage> ", length($closeconnectionmessage), "\n";
-  $self->{'server'} = $server;
-  $self->{'server_fileno'} = $server_fileno;
-}
-
-sub SendMessage {
-  my $self = shift;
-  my( $message ) = @_;
-
-  print STDERR "fakeserver: SendMessage $message\n";
-  $message .= "\r\n";
-
-  foreach my $fileno (keys %{$self->{'connections'}}) {
-    if ( ${$self->{'connections'}}{$fileno} ) {
-      my $client = ${$self->{'connections'}}{$fileno}{client};
-      print $client $message;
-    }
-  }
-}
-
-sub HandleFile {
-  my $self = shift;
-  my ( $fileno ) = @_;
-
-  print STDERR "fakeserver: HandleFile $fileno\n";
-  if ( $fileno == $self->{'server_fileno'} ) {
-    HandleServer();
-  } elsif ( ${$self->{'connections'}}{$fileno} ) {
-    HandleClient( $fileno );
-  } else {
-    print STDERR "fakeserver: Weird fileno $fileno\n";
-  }
-}
-
-sub HandleServer {
-  my $self = shift;
-  my $client = $server->accept();
-
-  print STDERR "fakeserver: HandleServer\n";
-
-  if ( $client ) {
-    my $fileno = fileno($client);
-    $client->blocking(0);
-    ${$self->{'connections'}}{$fileno}{client} = $client;
-    ${$self->{'connections'}}{$fileno}{loggedin} = 0;
-    vec($self->{'filebits'},$fileno,1) = 1;
-    print STDERR "fakeserver: New client on $fileno\n";
-  } else {
-    print STDERR "fakeserver: No accept for server, reopen\n";
-    $self->CloseServer();
-    $self->OpenServer();
-  }
-}
-
-sub HandleClient {
-  my $self = shift;
-  my ( $fileno ) = @_;
-
-  print STDERR "fakeserver: HandleClient $fileno\n";
-  my $receive;
-  my $n = recv( ${$self->{'connections'}}{$fileno}{client}, $receive, 200, 0 );
-  my $rlen = length($receive);
-  if ( $receive ) {
-    if ($receive =~ /^GIOP/) {
-      print STDERR "fakeserver:   Got $rlen byte GIOP message from client $fileno\n";
-    }
-    else {
-      print STDERR "fakeserver:   Got $rlen bytes from client $fileno\n";
-    }
-    ${$self->{'connections'}}{$fileno}{receive} = $receive;
-    my $slen = length($closeconnectionmessage);
-    print STDERR "fakeserver:   Sending $slen bytes GIOP closeconnection to $fileno\n";
-    sleep(3);
-    $n = send(${$self->{'connections'}}{$fileno}{client}, $closeconnectionmessage, 0);
-    print STDERR "fakeserver:   Sent $n bytes GIOP closeconnection to $fileno\n";
-  } else {
-    print STDERR "fakeserver: Close client $fileno\n";
-    vec(${$self->{'filebits'}},$fileno,1) = 0;
-    ${$self->{'connections'}}{$fileno}{client}->close();
-    undef ${$self->{'connections'}}{$fileno};
-    $self->SendMessage( "Close Client" );
-  }
-}
-
diff --git a/TAO/tests/Bug_2702_Regression/fakeserver2.pl b/TAO/tests/Bug_2702_Regression/fakeserver2.pl
deleted file mode 100755
index 4b4a261dbf9..00000000000
--- a/TAO/tests/Bug_2702_Regression/fakeserver2.pl
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/perl
-
-# $Id$
-
-use Socket;
-use IO::Socket;
-
-$filebits = '';
-
-OpenServer();
-
-my $rout;
-while( 1 ) {
-  print STDERR "fakeserver: Loop\n";
-
-  select( undef, undef, undef, 1 );
-
-  ($n, $left) = select( $rout = $filebits, undef, undef, 15 ); # Time out after 15 seconds
-  if ($n == 0) {
-    print STDERR "fakeserver: Terminating normally\n";
-    exit 0;
-  }
-
-  my $routs = unpack("b*", $rout);
-  print STDERR "fakeserver: Select $routs\n";
-  my $pos = index( $routs,'1');
-  while ( $pos >= 0 ) {
-    HandleFile( $pos );
-    $pos = index( $routs,'1', $pos+1);
-  }
-}
-
-sub SendMessage {
-  local( $message ) = @_;
-
-  print STDERR "fakeserver: SendMessage $message\n";
-  $message .= "\r\n";
-
-  foreach $fileno (keys %connections) {
-    if ( $connections{$fileno} ) {
-      my $client = $connections{$fileno}{client};
-      print $client $message;
-    }
-  }
-}
-
-
-sub HandleFile {
-  local( $fileno ) = @_;
-
-  print STDERR "fakeserver: HandleFile $fileno\n";
-  if ( $fileno == $server_fileno ) {
-    HandleServer();
-  } elsif ( $connections{$fileno} ) {
-    HandleClient( $fileno );
-  } else {
-    print STDERR "fakeserver: Weird fileno $fileno\n";
-  }
-}
-
-sub HandleServer {
-  my $client = $server->accept();
-
-  print STDERR "fakeserver: HandleServer\n";
-
-  if ( $client ) {
-    my $fileno = fileno($client);
-    $client->blocking(0);
-    $connections{$fileno}{client} = $client;
-    $connections{$fileno}{loggedin} = 0;
-    vec($filebits,$fileno,1) = 1;
-#    print $client "Welcome $fileno\r\n";
-#    my $n = send($client, $closeconnectionmessage, 0);
-    print STDERR "fakeserver: New client on $fileno\n";
-#    SendMessage( "New Client" );
-  } else {
-    print STDERR "fakeserver: No accept for server, reopen\n";
-    CloseServer();
-    OpenServer();
-  }
-}
-
-sub HandleClient {
-  local( $fileno ) = @_;
-
-  print STDERR "fakeserver: HandleClient $fileno\n";
-  $n = recv( $connections{$fileno}{client}, $receive, 200, 0 );
-  $rlen = length($receive);
-  if ( $receive ) {
-    if ($receive =~ /^GIOP/) {
-      print STDERR "fakeserver:   Got $rlen byte GIOP message from client $fileno\n";
-    }
-    else {
-      print STDERR "fakeserver:   Got $rlen bytes from client $fileno\n";
-    }
-    $connections{$fileno}{receive} = $receive;
-    $slen = length($closeconnectionmessage);
-    print STDERR "fakeserver:   Sending $slen bytes GIOP closeconnection to $fileno\n";
-    sleep(3);
-    $n = send($connections{$fileno}{client}, $closeconnectionmessage, 0);
-    print STDERR "fakeserver:   Sent $n bytes GIOP closeconnection to $fileno\n";
-  } else {
-    print STDERR "fakeserver: Close client $fileno\n";
-    vec($filebits,$fileno,1) = 0;
-    $connections{$fileno}{client}->close();
-    undef $connections{$fileno};
-    SendMessage( "Close Client" );
-  }
-
-}
-
-sub CloseServer {
-  vec($filebits,$server_fileno,1) = 0;
-  $server->close();
-  undef $server;
-}
-
-sub OpenServer {
-
-  $server = IO::Socket::INET->new(Listen    => 5,
-							LocalPort => 1192,
-							Reuse => 1,
-							ReuseAddr => 1,
-							Timeout   => 0,
-							Proto     => 'tcp');
-
-  die "Could not create socket $!" unless $server;
-
-  $server->blocking(0);
-  $server_fileno = fileno($server);
-  vec($filebits,$server_fileno,1) = 1;
-
-  print STDERR "fakeserver: Starting $server_fileno\n";
-
-  open (DATA, 'closeconnection.dat') or die "couldn't open closeconnection.dat: $!\n";
-  my $n = read(DATA, $closeconnectionmessage, 100);
-  close(DATA);
-
-  print STDERR "fakeserver: read $n <$closeconnectionmessage> ", length($closeconnectionmessage), "\n";
-}
diff --git a/TAO/tests/Bug_2702_Regression/run_test.pl b/TAO/tests/Bug_2702_Regression/run_test.pl
deleted file mode 100755
index 883eab373e3..00000000000
--- a/TAO/tests/Bug_2702_Regression/run_test.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("server_on_localhost_1192.ior");
-$status = 0;
-
-## Get the perl interpreter that invoked us and remove any
-## executable extension (if there is one).
-my($perl) = $^X;
-$perl =~ s/\.exe$//i;
-
-$SV = new PerlACE::Process ($perl, "fakeserver2.pl");
-$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBdebuglevel 1 -ORBlogfile client.log");
-unlink "client.log";
-
-$SV->IgnoreExeSubDir(1);
-$SV->Spawn ();
-sleep(1);  # give the server a chance to come up
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-# We expect to have to kill both client and server.
-
-#if ($client != 0) {
-#    print STDERR "ERROR: client returned $client\n";
-#    $status = 1;
-#}
-
-$server = $SV->WaitKill (10);
-
-#if ($server != 0) {
-#    print STDERR "ERROR: server returned $server\n";
-#    $status = 1;
-#}
-
-open (LOG, "client.log") or die "Couldn't open client log file client.log: $!\n";
-while (<LOG>) {
-  $ccmsgfound = 1 if (/process_parsed_messages, received CloseConnection message/);
-}
-close (LOG);
-if (not $ccmsgfound) {
-  print STDERR "ERROR: didn't find CloseConnection debug message in client log.\n";
-  $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_2702_Regression/server_on_localhost_1192.ior b/TAO/tests/Bug_2702_Regression/server_on_localhost_1192.ior
deleted file mode 100644
index c86e691b251..00000000000
--- a/TAO/tests/Bug_2702_Regression/server_on_localhost_1192.ior
+++ /dev/null
@@ -1 +0,0 @@
-IOR:012a2a2a1300000049444c3a546573742f48656c6c6f3a312e30002a0100000000000000680000000101022a0a0000003132372e302e302e3100a8041b00000014010f00525354f6fc6444bd600c000000000001000000010000002a020000000000000008000000012a2a2a004f41540100000018000000012a2a2a0100010001000000010001050901010000000000
\ No newline at end of file
diff --git a/TAO/tests/CDR/.cvsignore b/TAO/tests/CDR/.cvsignore
new file mode 100644
index 00000000000..3ea558ca364
--- /dev/null
+++ b/TAO/tests/CDR/.cvsignore
@@ -0,0 +1,6 @@
+alignment
+allocator
+basic_types
+growth
+octet_sequence
+tc
diff --git a/TAO/tests/CDR/Makefile.am b/TAO/tests/CDR/Makefile.am
deleted file mode 100644
index 35c44b161a1..00000000000
--- a/TAO/tests/CDR/Makefile.am
+++ /dev/null
@@ -1,152 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CDR_Alignment.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += alignment
-
-alignment_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-alignment_SOURCES = \
-  alignment.cpp
-
-alignment_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Allocator.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += allocator
-
-allocator_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-allocator_SOURCES = \
-  allocator.cpp
-
-allocator_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Basic_Types.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += basic_types
-
-basic_types_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-basic_types_SOURCES = \
-  basic_types.cpp
-
-basic_types_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Growth.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += growth
-
-growth_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-growth_SOURCES = \
-  growth.cpp
-
-growth_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Octet_Sequence.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += octet_sequence
-
-octet_sequence_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-octet_sequence_SOURCES = \
-  octet_sequence.cpp
-
-octet_sequence_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Tc.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += tc
-
-tc_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-tc_SOURCES = \
-  tc.cpp
-
-tc_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/COIOP/Makefile.am b/TAO/tests/COIOP/Makefile.am
deleted file mode 100644
index c0a0a106366..00000000000
--- a/TAO/tests/COIOP/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.COIOP_Tests.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = COIOP_Test
-
-COIOP_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-COIOP_Test_SOURCES = \
-  COIOP_Test.cpp \
-  Client_Task.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-COIOP_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/COIOP/run_test.pl b/TAO/tests/COIOP/run_test.pl
index 98605585458..e888f2cab33 100755
--- a/TAO/tests/COIOP/run_test.pl
+++ b/TAO/tests/COIOP/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "$ENV{ACE_ROOT}/bin";
+use lib '../../../bin';
 use PerlACE::Run_Test;
 
 $iorfile = PerlACE::LocalFile ("test.ior");
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am b/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am
deleted file mode 100644
index 8ffaa073566..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_TP_Broken_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Broken_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/Makefile.am b/TAO/tests/CSD_Strategy_Tests/Makefile.am
deleted file mode 100644
index a8ba990b33b..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        TP_Common \
-        TP_Foo_A \
-        TP_Foo_B \
-        Broken \
-        TP_Foo_C \
-        TP_Test_1 \
-        TP_Test_2 \
-        TP_Test_3 \
-        TP_Test_4 \
-        TP_Test_Dynamic \
-        TP_Test_Static
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc
index 0f75c48c394..453ea84a1f0 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro {
+project : taolib_with_idl, csd_threadpool {
   sharedname   = CSD_TP_Test
   dynamicflags = CSD_TP_TEST_BUILD_DLL
   idlflags  += -Wb,export_macro=CSD_TP_Test_Export \
@@ -9,8 +9,8 @@ project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro {
   IDL_Files {
     FooException.idl
     TestAppException.idl
-    CancelledException.idl
-    CustomException.idl
+    CancelledException.idl  
+    CustomException.idl     
   }
 
   Source_Files {
@@ -29,8 +29,8 @@ project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro {
     TestAppExceptionS.cpp
     CancelledExceptionC.cpp
     CancelledExceptionS.cpp
-    CustomExceptionC.cpp
-    CustomExceptionS.cpp
+    CustomExceptionC.cpp  
+    CustomExceptionS.cpp  
   }
 
   Template_Files {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Common/Makefile.am
deleted file mode 100644
index b9225dcd7c9..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/Makefile.am
+++ /dev/null
@@ -1,190 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.CSD_TP_Test_Lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES += \
-  FooExceptionC.cpp \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.cpp \
-  FooExceptionS.h \
-  FooExceptionS.inl
-
-CLEANFILES += \
-  FooException-stamp \
-  FooExceptionC.cpp \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.cpp \
-  FooExceptionS.h \
-  FooExceptionS.inl
-
-FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.inl: FooException-stamp
-
-FooException-stamp: $(srcdir)/FooException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/FooException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TestAppExceptionC.cpp \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.cpp \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl
-
-CLEANFILES += \
-  TestAppException-stamp \
-  TestAppExceptionC.cpp \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.cpp \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl
-
-TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.inl: TestAppException-stamp
-
-TestAppException-stamp: $(srcdir)/TestAppException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/TestAppException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CancelledExceptionC.cpp \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.cpp \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl
-
-CLEANFILES += \
-  CancelledException-stamp \
-  CancelledExceptionC.cpp \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.cpp \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl
-
-CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.inl: CancelledException-stamp
-
-CancelledException-stamp: $(srcdir)/CancelledException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/CancelledException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CustomExceptionC.cpp \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.cpp \
-  CustomExceptionS.h \
-  CustomExceptionS.inl
-
-CLEANFILES += \
-  CustomException-stamp \
-  CustomExceptionC.cpp \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.cpp \
-  CustomExceptionS.h \
-  CustomExceptionS.inl
-
-CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.inl: CustomException-stamp
-
-CustomException-stamp: $(srcdir)/CustomException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/CustomException.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_TP_Test.la
-
-libCSD_TP_Test_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_TP_TEST_BUILD_DLL
-
-libCSD_TP_Test_la_SOURCES = \
-  AppHelper.cpp \
-  AppShutdown.cpp \
-  CancelledExceptionC.cpp \
-  CancelledExceptionS.cpp \
-  ClientEngine.cpp \
-  ClientTask.cpp \
-  CustomExceptionC.cpp \
-  CustomExceptionS.cpp \
-  FooExceptionC.cpp \
-  FooExceptionS.cpp \
-  OrbRunner.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  StatisticsHelper.cpp \
-  TestAppBase.cpp \
-  TestAppExceptionC.cpp \
-  TestAppExceptionS.cpp
-
-noinst_HEADERS = \
-  AppHelper.h \
-  AppShutdown.h \
-  CancelledException.idl \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl \
-  ClientEngine.h \
-  ClientTask.h \
-  CustomException.idl \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.h \
-  CustomExceptionS.inl \
-  FooException.idl \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.h \
-  FooExceptionS.inl \
-  OrbRunner.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServantList_T.cpp \
-  ServantList_T.h \
-  StatisticsHelper.h \
-  TestAppBase.h \
-  TestAppException.idl \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am
deleted file mode 100644
index 5a848bb8c5e..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.csd_tp_foo_a_lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES = \
-  Foo_AC.cpp \
-  Foo_AC.h \
-  Foo_AC.inl \
-  Foo_AS.cpp \
-  Foo_AS.h \
-  Foo_AS.inl
-
-CLEANFILES = \
-  Foo_A-stamp \
-  Foo_AC.cpp \
-  Foo_AC.h \
-  Foo_AC.inl \
-  Foo_AS.cpp \
-  Foo_AS.h \
-  Foo_AS.inl
-
-Foo_AC.cpp Foo_AC.h Foo_AC.inl Foo_AS.cpp Foo_AS.h Foo_AS.inl: Foo_A-stamp
-
-Foo_A-stamp: $(srcdir)/Foo_A.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -Wb,export_macro=CSD_TP_Foo_A_Export -Wb,export_include=CSD_TP_Foo_A_Export.h $(srcdir)/Foo_A.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_TP_Foo_A.la
-
-libCSD_TP_Foo_A_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_TP_FOO_A_BUILD_DLL
-
-libCSD_TP_Foo_A_la_SOURCES = \
-  Foo_AC.cpp \
-  Foo_AS.cpp \
-  Foo_A_ClientEngine.cpp \
-  Foo_A_Statistics.cpp \
-  Foo_A_i.cpp
-
-libCSD_TP_Foo_A_la_LDFLAGS = \
- -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common
-
-noinst_HEADERS = \
-  Foo_A.idl \
-  Foo_AC.h \
-  Foo_AC.inl \
-  Foo_AS.h \
-  Foo_AS.inl \
-  Foo_A_ClientEngine.h \
-  Foo_A_Statistics.h \
-  Foo_A_i.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc
index 6c796285d72..7f2027a9f5d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc
@@ -1,9 +1,9 @@
 //$Id$
-project : csd_tp_test_lib, avoids_corba_e_micro {
+project : csd_tp_test_lib {
   sharedname   = CSD_TP_Foo_A
   dynamicflags = CSD_TP_FOO_A_BUILD_DLL
   idlflags  += -Wb,export_macro=CSD_TP_Foo_A_Export -Wb,export_include=CSD_TP_Foo_A_Export.h
-  includes  += $(TAO_ROOT)/tao
+  includes  += $(TAO_ROOT)/tao   
 
   IDL_Files {
     Foo_A.idl
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am
deleted file mode 100644
index 4446b965cde..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.csd_tp_foo_b_lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES += \
-  Foo_BC.cpp \
-  Foo_BC.h \
-  Foo_BC.inl \
-  Foo_BS.cpp \
-  Foo_BS.h \
-  Foo_BS.inl
-
-CLEANFILES += \
-  Foo_B-stamp \
-  Foo_BC.cpp \
-  Foo_BC.h \
-  Foo_BC.inl \
-  Foo_BS.cpp \
-  Foo_BS.h \
-  Foo_BS.inl
-
-Foo_BC.cpp Foo_BC.h Foo_BC.inl Foo_BS.cpp Foo_BS.h Foo_BS.inl: Foo_B-stamp
-
-Foo_B-stamp: $(srcdir)/Foo_B.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h $(srcdir)/Foo_B.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl
-
-CLEANFILES += \
-  Callback-stamp \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl
-
-CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp
-
-Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h $(srcdir)/Callback.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_TP_Foo_B.la
-
-libCSD_TP_Foo_B_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_TP_FOO_B_BUILD_DLL
-
-libCSD_TP_Foo_B_la_SOURCES = \
-  CallbackC.cpp \
-  CallbackS.cpp \
-  Callback_i.cpp \
-  Foo_BC.cpp \
-  Foo_BS.cpp \
-  Foo_B_ClientEngine.cpp \
-  Foo_B_SimpleClientEngine.cpp \
-  Foo_B_Statistics.cpp \
-  Foo_B_i.cpp
-
-libCSD_TP_Foo_B_la_LDFLAGS = \
- -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common
-
-noinst_HEADERS = \
-  Callback.idl \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.h \
-  CallbackS.inl \
-  Callback_i.h \
-  Foo_B.idl \
-  Foo_BC.h \
-  Foo_BC.inl \
-  Foo_BS.h \
-  Foo_BS.inl \
-  Foo_B_ClientEngine.h \
-  Foo_B_SimpleClientEngine.h \
-  Foo_B_Statistics.h \
-  Foo_B_i.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc
index 61ccdd335f1..f89d2b0db78 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc
@@ -1,9 +1,9 @@
 //$Id$
-project : csd_tp_test_lib, avoids_corba_e_micro {
+project : csd_tp_test_lib {
   sharedname   = CSD_TP_Foo_B
   dynamicflags = CSD_TP_FOO_B_BUILD_DLL
   idlflags  += -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h
-  includes  += $(TAO_ROOT)/tao
+  includes  += $(TAO_ROOT)/tao   
 
   IDL_Files {
     Foo_B.idl
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am
deleted file mode 100644
index 4b967142bcc..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am
+++ /dev/null
@@ -1,102 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.csd_tp_foo_c_lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES = \
-  Foo_CC.cpp \
-  Foo_CC.h \
-  Foo_CC.inl \
-  Foo_CS.cpp \
-  Foo_CS.h \
-  Foo_CS.inl
-
-CLEANFILES = \
-  Foo_C-stamp \
-  Foo_CC.cpp \
-  Foo_CC.h \
-  Foo_CC.inl \
-  Foo_CS.cpp \
-  Foo_CS.h \
-  Foo_CS.inl
-
-Foo_CC.cpp Foo_CC.h Foo_CC.inl Foo_CS.cpp Foo_CS.h Foo_CS.inl: Foo_C-stamp
-
-Foo_C-stamp: $(srcdir)/Foo_C.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_C_Export -Wb,export_include=CSD_TP_Foo_C_Export.h $(srcdir)/Foo_C.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_TP_Foo_C.la
-
-libCSD_TP_Foo_C_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_TP_FOO_C_BUILD_DLL
-
-libCSD_TP_Foo_C_la_SOURCES = \
-  Foo_CC.cpp \
-  Foo_CS.cpp \
-  Foo_C_ClientEngine.cpp \
-  Foo_C_Custom_ClientEngine.cpp \
-  Foo_C_Custom_Proxy.cpp \
-  Foo_C_Statistics.cpp \
-  Foo_C_cust_op1.cpp \
-  Foo_C_cust_op2.cpp \
-  Foo_C_cust_op3.cpp \
-  Foo_C_cust_op4.cpp \
-  Foo_C_cust_op5.cpp \
-  Foo_C_i.cpp
-
-libCSD_TP_Foo_C_la_LDFLAGS = \
- -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common
-
-noinst_HEADERS = \
-  Foo_C.idl \
-  Foo_CC.h \
-  Foo_CC.inl \
-  Foo_CS.h \
-  Foo_CS.inl \
-  Foo_C_ClientEngine.h \
-  Foo_C_Custom_ClientEngine.h \
-  Foo_C_Custom_Proxy.h \
-  Foo_C_Statistics.h \
-  Foo_C_cust_op1.h \
-  Foo_C_cust_op2.h \
-  Foo_C_cust_op3.h \
-  Foo_C_cust_op4.h \
-  Foo_C_cust_op5.h \
-  Foo_C_i.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc
index 5c9a666e847..3cdd74fbb1f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : csd_tp_test_lib, avoids_corba_e_micro {
+project : csd_tp_test_lib {
   sharedname   = CSD_TP_Foo_C
   dynamicflags = CSD_TP_FOO_C_BUILD_DLL
   idlflags  += -b -Wb,export_macro=CSD_TP_Foo_C_Export -Wb,export_include=CSD_TP_Foo_C_Export.h
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am
deleted file mode 100644
index 4c5b0c144ab..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_TP_Test_1_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_1_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am
deleted file mode 100644
index cbff6e8ac08..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_TP_Test_2_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_2_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am
deleted file mode 100644
index 36717d2d1f3..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_TP_Test_3_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_3_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am
deleted file mode 100644
index b83caed15d3..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_TP_Test_4_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_C/libCSD_TP_Foo_C.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_4_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_C/libCSD_TP_Foo_C.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am
deleted file mode 100644
index fdd11b182a6..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am
+++ /dev/null
@@ -1,130 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.CSD_TP_Test_Dynamic_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_Dynamic_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am
deleted file mode 100644
index 2d6c7c8e170..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_TP_Test_Static_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_Static_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Cache_Growth_Test/.cvsignore b/TAO/tests/Cache_Growth_Test/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Cache_Growth_Test/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
index 9e3a806413a..e64ad8d08a8 100644
--- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
+++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
@@ -1,37 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     Hello.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/Cache_Growth_Test/Makefile.am b/TAO/tests/Cache_Growth_Test/Makefile.am
deleted file mode 100644
index eb274fe7465..00000000000
--- a/TAO/tests/Cache_Growth_Test/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Cache_Growth_Test_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Cache_Growth_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Cache_Growth_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc
index 186510c1f55..9bf640dd2b3 100644
--- a/TAO/tests/CallbackTest/CallbackTest.mpc
+++ b/TAO/tests/CallbackTest/CallbackTest.mpc
@@ -1,38 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     Service.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, portableserver, messaging {
-  after += *idl
   after += *Server
   Source_Files {
     Callback.cpp
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/CallbackTest/Makefile.am b/TAO/tests/CallbackTest/Makefile.am
deleted file mode 100644
index 6712a3408cc..00000000000
--- a/TAO/tests/CallbackTest/Makefile.am
+++ /dev/null
@@ -1,121 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CallbackTest_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.CallbackTest_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Service.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Service.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CallbackTest_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Callback.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Callback.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Client_Leaks/.cvsignore b/TAO/tests/Client_Leaks/.cvsignore
new file mode 100644
index 00000000000..7fc225a9334
--- /dev/null
+++ b/TAO/tests/Client_Leaks/.cvsignore
@@ -0,0 +1,3 @@
+child
+client
+server
diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc
index 87611da09ef..a83a41950f3 100644
--- a/TAO/tests/Client_Leaks/Client_Leaks.mpc
+++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc
@@ -1,55 +1,30 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     Process_Factory.cpp
     Startup_Callback.cpp
     Server_Task.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
+    TestC.cpp
     Client_Task.cpp
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Child): taoserver {
   exename = child
-  after += *idl
   after += *Client
   Source_Files {
     Process.cpp
     child.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Client_Leaks/Makefile.am b/TAO/tests/Client_Leaks/Makefile.am
deleted file mode 100644
index 05a2b8c0a6d..00000000000
--- a/TAO/tests/Client_Leaks/Makefile.am
+++ /dev/null
@@ -1,138 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Client_Leaks_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Client_Leaks_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Process_Factory.cpp \
-  Server_Task.cpp \
-  Startup_Callback.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Process_Factory.h \
-  Server_Task.h \
-  Startup_Callback.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Client_Leaks_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Client_Leaks_Child.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += child
-
-child_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-child_SOURCES = \
-  Process.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  child.cpp \
-  Process.h
-
-child_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CodeSets/Makefile.am b/TAO/tests/CodeSets/Makefile.am
deleted file mode 100644
index 2ba3df85b6f..00000000000
--- a/TAO/tests/CodeSets/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        libs \
-        simple
-
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am
deleted file mode 100644
index 8ad94bd2def..00000000000
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CodeSets_libs_IMB1047_ISO8859.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libIBM1047_ISO8859.la
-
-libIBM1047_ISO8859_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DIBM1047_ISO8859_BUILD_DLL
-
-libIBM1047_ISO8859_la_SOURCES = \
-  Char_IBM1047_ISO8859_Factory.cpp \
-  Char_IBM1047_ISO8859_Translator.cpp \
-  Wchar_IBM1047_ISO8859_Factory.cpp \
-  Wchar_IBM1047_ISO8859_Translator.cpp
-
-noinst_HEADERS = \
-  Char_IBM1047_ISO8859_Factory.h \
-  Char_IBM1047_ISO8859_Translator.h \
-  IBM1047_ISO8859_export.h \
-  Wchar_IBM1047_ISO8859_Factory.h \
-  Wchar_IBM1047_ISO8859_Translator.h
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CodeSets/libs/Makefile.am b/TAO/tests/CodeSets/libs/Makefile.am
deleted file mode 100644
index e1a65ab4510..00000000000
--- a/TAO/tests/CodeSets/libs/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        IBM1047_ISO8859 \
-        UCS4_UTF16
-
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.am b/TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.am
deleted file mode 100644
index 5875d3dd899..00000000000
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CodeSets_Libs_UCS4_UTF16.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libUCS4_UTF16.la
-
-libUCS4_UTF16_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DUCS4_UTF16_BUILD_DLL
-
-libUCS4_UTF16_la_SOURCES = \
-  WUCS4_UTF16.cpp \
-  WUCS4_UTF16_Factory.cpp
-
-noinst_HEADERS = \
-  WUCS4_UTF16.h \
-  WUCS4_UTF16_Factory.h \
-  WUCS4_UTF16_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CodeSets/simple/.cvsignore b/TAO/tests/CodeSets/simple/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/CodeSets/simple/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
index 6dac99613f4..a0a9ca666ce 100644
--- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
+++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
@@ -1,42 +1,38 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
+project(*client) : taoclient, anytypecode {
+  after += *server
   IDL_Files {
     simple.idl
   }
-  custom_only = 1
-}
-
-project(*client) : taoclient, anytypecode {
-  after += *idl
-  after += *server
 
   Source_Files {
     client.cpp
-  }
-
-  Source_Files {
     simpleC.cpp
   }
 
-  IDL_Files {
+  Header_Files {
+    simpleC.h
   }
-}
 
-project(*server) : taoserver {
 
-  after += *idl
+}
 
-  Source_Files {
-    server.cpp
+project(*server) : taoserver {
+  IDL_Files {
+    simple.idl
   }
 
-  Source_Files {
+  source_files {
+    server.cpp
     simpleC.cpp
     simpleS.cpp
   }
 
-  IDL_Files {
+  Header_Files {
+    simpleC.h
+    simpleS.h
   }
+
 }
diff --git a/TAO/tests/CodeSets/simple/Makefile.am b/TAO/tests/CodeSets/simple/Makefile.am
deleted file mode 100644
index b9d0540cb9a..00000000000
--- a/TAO/tests/CodeSets/simple/Makefile.am
+++ /dev/null
@@ -1,103 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CodeSets_Simple_Idl.am
-
-BUILT_SOURCES = \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-CLEANFILES = \
-  simple-stamp \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp
-
-simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl
-	@touch $@
-
-noinst_HEADERS = \
-  simple.idl
-
-## Makefile.CodeSets_Simple_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  simpleC.cpp \
-  simpleS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CodeSets_Simple_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  simpleC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index bc016b1755d..edf6a3ab091 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -127,8 +127,6 @@ int main (int argc, char *argv[])
       ACE_OS::free (wide_string);
       CORBA::wstring_free (wide_reply);
 #endif /* ACE_HAS_WCHAR */
-
-      server->shutdown ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/CodeSets/simple/run_test.pl b/TAO/tests/CodeSets/simple/run_test.pl
index 3988d59ed3a..4f100136ad2 100755
--- a/TAO/tests/CodeSets/simple/run_test.pl
+++ b/TAO/tests/CodeSets/simple/run_test.pl
@@ -33,7 +33,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (10);
+$server = $SV->TerminateWaitKill (5);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
@@ -63,7 +63,7 @@ if ($client2 != 0) {
     $status = 1;
 }
 
-$server2 = $SV2->WaitKill (10);
+$server2 = $SV2->TerminateWaitKill (5);
 
 if ($server2 != 0) {
     print STDERR "ERROR: server returned $server2\n";
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index 1f8cb2c10c2..d8a23526773 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -31,9 +31,6 @@
 class SimpleImpl : public POA_simple
 {
 public:
-  SimpleImpl (CORBA::ORB_ptr orb)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-  {}
 
   // implementation of corba interface
   char * op1 (const char * name,
@@ -65,17 +62,6 @@ public:
   {
     return CORBA::wstring_dup (s1);
   };
-
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  };
-
-private:
-  /// Use an ORB reference to shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
 };
 
 // ------------------------------------------------------------
@@ -121,7 +107,7 @@ int main(int argc, char *argv[])
       // Create a C++ implementation of CORBA object
       SimpleImpl* my_impl = 0;
       ACE_NEW_RETURN (my_impl,
-                      SimpleImpl (orb.in ()),
+                      SimpleImpl,
                       -1);
 
       // Create CORBA object for servant and REGISTER with POA
diff --git a/TAO/tests/CodeSets/simple/simple.idl b/TAO/tests/CodeSets/simple/simple.idl
index 9f58cc8869f..0f44ed62cce 100644
--- a/TAO/tests/CodeSets/simple/simple.idl
+++ b/TAO/tests/CodeSets/simple/simple.idl
@@ -7,10 +7,4 @@ interface simple
                out any outany);
 
   wstring op2 (in wstring s1);
-
-  /// A method to shutdown the ORB
-  /**
-    * This method is used to simplify the test shutdown process
-    */
-  oneway void shutdown ();
 };
diff --git a/TAO/tests/Codec/.cvsignore b/TAO/tests/Codec/.cvsignore
new file mode 100644
index 00000000000..b051c6c57fa
--- /dev/null
+++ b/TAO/tests/Codec/.cvsignore
@@ -0,0 +1 @@
+client
diff --git a/TAO/tests/Codec/Makefile.am b/TAO/tests/Codec/Makefile.am
deleted file mode 100644
index 8d2743e0a03..00000000000
--- a/TAO/tests/Codec/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Codec_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Collocation/.cvsignore b/TAO/tests/Collocation/.cvsignore
new file mode 100644
index 00000000000..bee89094a99
--- /dev/null
+++ b/TAO/tests/Collocation/.cvsignore
@@ -0,0 +1 @@
+Collocation
diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc
index b2c60b8b1b8..2bb76c43a80 100644
--- a/TAO/tests/Collocation/Collocation.mpc
+++ b/TAO/tests/Collocation/Collocation.mpc
@@ -1,50 +1,39 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
+project(*Test Stub): taolib_with_idl {
+  sharedname   = Collocation_Test_Stub
   idlflags    += -Wb,skel_export_macro=Diamond_Export \
                  -Wb,stub_export_macro=MY_Stub_Export \
                  -Wb,skel_export_include=diamond_export.h \
                  -Wb,stub_export_include=stub_export.h \
                  -Gd -St -Sa
-  IDL_Files {
-    Diamond.idl
-  }
-  custom_only = 1
-}
-
-project(*Test_Stub): taolib_with_idl {
-  after += *idl
-
-  sharedname   = Collocation_Test_Stub
   dynamicflags = MY_STUB_BUILD_DLL
 
   Source_Files {
     DiamondC.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Diamond) : taolib_with_idl, portableserver {
-  after       += *idl *Test_Stub
   after       += Collocation_Test_Stub
-
   sharedname   = Collocation_Diamond
-  dynamicflags = DIAMOND_BUILD_DLL
-
   libs        += Collocation_Test_Stub
+  idlflags    += -Wb,skel_export_macro=Diamond_Export \
+                 -Wb,stub_export_macro=MY_Stub_Export \
+                 -Wb,skel_export_include=diamond_export.h \
+                 -Wb,stub_export_include=stub_export.h \
+                 -Gd -St -Sa
+  dynamicflags = DIAMOND_BUILD_DLL
 
   Source_Files {
     Diamond_i.cpp
     DiamondS.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Server) : taoserver, strategies {
-  after   += *Test_Stub *Diamond
+  after   += Collocation_Test_Stub Collocation_Diamond
   libs    += Collocation_Test_Stub Collocation_Diamond
   exename  = Collocation
   IDL_Files {
diff --git a/TAO/tests/Collocation/Makefile.am b/TAO/tests/Collocation/Makefile.am
deleted file mode 100644
index 1c43131fcab..00000000000
--- a/TAO/tests/Collocation/Makefile.am
+++ /dev/null
@@ -1,129 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-
-## Makefile.Collocation_Idl.am
-
-BUILT_SOURCES = \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-CLEANFILES = \
-  Diamond-stamp \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp
-
-Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa $(srcdir)/Diamond.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Diamond.idl
-
-## Makefile.Collocation_Test_Stub.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libCollocation_Test_Stub.la
-
-libCollocation_Test_Stub_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DMY_STUB_BUILD_DLL
-
-libCollocation_Test_Stub_la_SOURCES = \
-  DiamondC.cpp
-
-noinst_HEADERS += \
-  Collocation_Tester.h \
-  Diamond_i.h \
-  diamond_export.h \
-  stub_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Collocation_Diamond.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libCollocation_Diamond.la
-
-libCollocation_Diamond_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DDIAMOND_BUILD_DLL
-
-libCollocation_Diamond_la_SOURCES = \
-  DiamondS.cpp \
-  Diamond_i.cpp
-
-noinst_HEADERS += \
-  Diamond_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Collocation_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Collocation
-
-Collocation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocation_SOURCES = \
-  Collocation.cpp \
-  Collocation_Tester.cpp \
-  Collocation_Tester.h
-
-Collocation_LDADD = \
-  libCollocation_Test_Stub.la \
-  libCollocation_Diamond.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/CollocationLockup/AB.idl b/TAO/tests/CollocationLockup/AB.idl
index fe65905edb6..92b2822b872 100644
--- a/TAO/tests/CollocationLockup/AB.idl
+++ b/TAO/tests/CollocationLockup/AB.idl
@@ -3,6 +3,6 @@
 interface A {
 };
 
-interface C {
+interface B {
   A makeA ();
 };
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index f943951cefa..6f4e11ec90a 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -39,7 +39,7 @@ class A_i : public virtual POA_A
 {
 };
 
-class B_i : public virtual POA_C
+class B_i : public virtual POA_B
 {
 public:
   virtual A_ptr
@@ -134,7 +134,7 @@ TestThread (void*)
       for (size_t i (0); i < N_ITERATIONS; ++i)
         {
           CORBA::Object_var obj = g_pNameService->resolve ();
-          C_var b = C::_narrow (obj.in ());
+          B_var b = B::_narrow (obj.in ());
           b->makeA ();
           if (i % 50 == 0)
             ACE_DEBUG ((LM_INFO, "(%t) collocated call returned\n"));
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.mpc b/TAO/tests/CollocationLockup/CollocationLockup.mpc
index 84844be2a3d..517321c3d53 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.mpc
+++ b/TAO/tests/CollocationLockup/CollocationLockup.mpc
@@ -1,48 +1,27 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    AB.idl
-    SimpleNamingService.idl
-  }
-  custom_only = 1
-}
-
 project: taoserver {
+  idlflags += -St
   exename = CollocationLockup
 
-  after += *idl
-  after += *SimpleNamingService
-
-  Source_Files {
-    CollocationLockup.cpp
-  }
   Source_Files {
     ABC.cpp
     ABS.cpp
-  }
-  Source_Files {
     SimpleNamingServiceC.cpp
-  }
-
-  IDL_Files {
+    CollocationLockup.cpp
   }
 }
 
 project(*SimpleNamingService): taoserver {
+  idlflags += -St
   exename = SimpleNamingService
 
-  after += *idl
+  IDL_Files {
+    SimpleNamingService.idl
+  }
 
   Source_Files {
     SimpleNamingService.cpp
   }
-  Source_Files {
-    SimpleNamingServiceC.cpp
-    SimpleNamingServiceS.cpp
-  }
-
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/CollocationLockup/Makefile.am b/TAO/tests/CollocationLockup/Makefile.am
deleted file mode 100644
index e9f847fb214..00000000000
--- a/TAO/tests/CollocationLockup/Makefile.am
+++ /dev/null
@@ -1,130 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CollocationLockup_Idl.am
-
-BUILT_SOURCES = \
-  ABC.cpp \
-  ABC.h \
-  ABC.inl \
-  ABS.cpp \
-  ABS.h \
-  ABS.inl
-
-CLEANFILES = \
-  AB-stamp \
-  ABC.cpp \
-  ABC.h \
-  ABC.inl \
-  ABS.cpp \
-  ABS.h \
-  ABS.inl
-
-ABC.cpp ABC.h ABC.inl ABS.cpp ABS.h ABS.inl: AB-stamp
-
-AB-stamp: $(srcdir)/AB.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/AB.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  SimpleNamingServiceC.cpp \
-  SimpleNamingServiceC.h \
-  SimpleNamingServiceC.inl \
-  SimpleNamingServiceS.cpp \
-  SimpleNamingServiceS.h \
-  SimpleNamingServiceS.inl
-
-CLEANFILES += \
-  SimpleNamingService-stamp \
-  SimpleNamingServiceC.cpp \
-  SimpleNamingServiceC.h \
-  SimpleNamingServiceC.inl \
-  SimpleNamingServiceS.cpp \
-  SimpleNamingServiceS.h \
-  SimpleNamingServiceS.inl
-
-SimpleNamingServiceC.cpp SimpleNamingServiceC.h SimpleNamingServiceC.inl SimpleNamingServiceS.cpp SimpleNamingServiceS.h SimpleNamingServiceS.inl: SimpleNamingService-stamp
-
-SimpleNamingService-stamp: $(srcdir)/SimpleNamingService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/SimpleNamingService.idl
-	@touch $@
-
-noinst_HEADERS = \
-  AB.idl \
-  SimpleNamingService.idl
-
-## Makefile.CollocationLockup_SimpleNamingService.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += SimpleNamingService
-
-SimpleNamingService_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-SimpleNamingService_SOURCES = \
-  SimpleNamingService.cpp \
-  SimpleNamingServiceC.cpp \
-  SimpleNamingServiceS.cpp
-
-SimpleNamingService_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CollocationLockup.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += CollocationLockup
-
-CollocationLockup_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-CollocationLockup_SOURCES = \
-  ABC.cpp \
-  ABS.cpp \
-  CollocationLockup.cpp \
-  SimpleNamingServiceC.cpp
-
-CollocationLockup_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Collocation_Exception_Test/Makefile.am b/TAO/tests/Collocation_Exception_Test/Makefile.am
deleted file mode 100644
index d82ad291953..00000000000
--- a/TAO/tests/Collocation_Exception_Test/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Collocation_Excep_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Collocation_Oneway_Tests/Makefile.am b/TAO/tests/Collocation_Oneway_Tests/Makefile.am
deleted file mode 100644
index 0d4a3039a4f..00000000000
--- a/TAO/tests/Collocation_Oneway_Tests/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Collocation_Oneway_Tests.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Collocation_Opportunities/.cvsignore b/TAO/tests/Collocation_Opportunities/.cvsignore
new file mode 100644
index 00000000000..3189327922a
--- /dev/null
+++ b/TAO/tests/Collocation_Opportunities/.cvsignore
@@ -0,0 +1 @@
+Collocation_Opportunities
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc
index 244a8cc2c48..6abbe5ef004 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(Collocation Opportunities): taoserver, avoids_corba_e_micro {
+project(Collocation Opportunities): taoserver {
   exename = Collocation_Opportunities
 }
diff --git a/TAO/tests/Collocation_Opportunities/Makefile.am b/TAO/tests/Collocation_Opportunities/Makefile.am
deleted file mode 100644
index ad55d8464c2..00000000000
--- a/TAO/tests/Collocation_Opportunities/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Collocation_Opportunities.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocation_Opportunities
-
-Collocation_Opportunities_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocation_Opportunities_SOURCES = \
-  Collocation_Opportunities.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Collocation_Opportunities_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Collocation_Tests/.cvsignore b/TAO/tests/Collocation_Tests/.cvsignore
new file mode 100644
index 00000000000..307259b4b57
--- /dev/null
+++ b/TAO/tests/Collocation_Tests/.cvsignore
@@ -0,0 +1 @@
+Collocated_Test
diff --git a/TAO/tests/Collocation_Tests/Makefile.am b/TAO/tests/Collocation_Tests/Makefile.am
deleted file mode 100644
index 71500818c25..00000000000
--- a/TAO/tests/Collocation_Tests/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Collocation_Tests.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Compression/Compression_Test.mpc b/TAO/tests/Compression/Compression_Test.mpc
deleted file mode 100644
index ce461817d7c..00000000000
--- a/TAO/tests/Compression/Compression_Test.mpc
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, compression, zlibcompressor {
-  Source_Files {
-    server.cpp
-  }
-}
-
diff --git a/TAO/tests/Compression/Makefile.am b/TAO/tests/Compression/Makefile.am
deleted file mode 100644
index fe3b9c6381f..00000000000
--- a/TAO/tests/Compression/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Compression_Test_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_ZLIB
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_ZLIB_CPPFLAGS)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
-  $(ACE_ZLIB_LDFLAGS)
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ZlibCompressor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Compression.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_ZLIB_LIBS)
-
-endif BUILD_ZLIB
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Compression/run_test.pl b/TAO/tests/Compression/run_test.pl
deleted file mode 100755
index 13b74229e7b..00000000000
--- a/TAO/tests/Compression/run_test.pl
+++ /dev/null
@@ -1,29 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-
-print STDOUT "Collocation\n\n";
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server");
-}
-else {
-    $SV = new PerlACE::Process ("server");
-}
-
-$server = $SV->SpawnWaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: Collocation returned $server \n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Compression/server.cpp b/TAO/tests/Compression/server.cpp
deleted file mode 100644
index ee820eeca2d..00000000000
--- a/TAO/tests/Compression/server.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "tao/ORB.h"
-#include "tao/Compression/Compression.h"
-#include "tao/Compression/zlib/ZlibCompressor_Factory.h"
-
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
-bool
-test_invalid_compression_factory (Compression::CompressionManager_ptr cm)
-{
-  bool succeed = false;
-  ACE_TRY_NEW_ENV
-    {
-      // Get an invalid compression factory
-      Compression::CompressorFactory_var factory = 
-        cm->get_factory (100);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (Compression::UnknownCompressorId, ex)
-    {
-      ACE_UNUSED_ARG (ex);
-      succeed = true;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  if (!succeed)
-  {
-    ACE_ERROR ((LM_ERROR,
-                "(%t) ERROR, get invalid compression factory failed\n"));
-  }
-
-  return succeed;
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  int retval = 0;
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var compression_manager =
-        orb->resolve_initial_references("CompressionManager");
-
-      Compression::CompressionManager_var manager =
-        Compression::CompressionManager::_narrow (compression_manager.in ());
-
-      if (CORBA::is_nil(manager.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil compression manager\n"),
-                          1);
-
-      manager->register_factory(new TAO::Zlib_CompressorFactory ());
-
-      CORBA::ULong const nelements = 1024;
-      CORBA::OctetSeq mytest;
-      mytest.length (1024);
-      for (CORBA::ULong j = 0; j != nelements; ++j)
-        {
-          mytest[j] = 'a';
-        }
-
-      Compression::Compressor_var compressor = manager->get_compressor (4, 6);
-
-      CORBA::OctetSeq myout;
-      myout.length (1300);
-
-      compressor->compress (mytest, myout);
-
-      CORBA::OctetSeq decompress;
-      decompress.length (1024);
-
-      compressor->decompress (myout, decompress);
-
-      if (decompress != mytest)
-        {
-          ACE_ERROR ((LM_ERROR, "Error, decompress not working\n"));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "Compression worked, original size %d, compressed size %d\n", mytest.length(), myout.length ()));
-        }
-  
-      if (!test_invalid_compression_factory (manager.in ()))
-        retval = 1;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      retval = 1;
-    }
-  ACE_ENDTRY;
-
-  return retval;
-}
diff --git a/TAO/tests/Connect_Strategy_Test/.cvsignore b/TAO/tests/Connect_Strategy_Test/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Connect_Strategy_Test/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
index 9e3a806413a..e64ad8d08a8 100644
--- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
+++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
@@ -1,37 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     Hello.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/Connect_Strategy_Test/Makefile.am b/TAO/tests/Connect_Strategy_Test/Makefile.am
deleted file mode 100644
index 9d787d5980b..00000000000
--- a/TAO/tests/Connect_Strategy_Test/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Connect_Strategy_Test_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Connect_Strategy_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Connect_Strategy_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Connection_Failure/.cvsignore b/TAO/tests/Connection_Failure/.cvsignore
new file mode 100644
index 00000000000..b051c6c57fa
--- /dev/null
+++ b/TAO/tests/Connection_Failure/.cvsignore
@@ -0,0 +1 @@
+client
diff --git a/TAO/tests/Connection_Failure/Makefile.am b/TAO/tests/Connection_Failure/Makefile.am
deleted file mode 100644
index 6892e3edcb7..00000000000
--- a/TAO/tests/Connection_Failure/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Connection_Failure_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Connection_Purging/.cvsignore b/TAO/tests/Connection_Purging/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Connection_Purging/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc
index c0bd6da0fde..321e97dff47 100644
--- a/TAO/tests/Connection_Purging/Connection_Purging.mpc
+++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): strategies, taoserver {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): strategies, taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Connection_Purging/Makefile.am b/TAO/tests/Connection_Purging/Makefile.am
deleted file mode 100644
index da869a9f816..00000000000
--- a/TAO/tests/Connection_Purging/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Connection_Purging_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Connection_Purging_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Connection_Purging_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Connection_Timeout/.cvsignore b/TAO/tests/Connection_Timeout/.cvsignore
new file mode 100644
index 00000000000..b051c6c57fa
--- /dev/null
+++ b/TAO/tests/Connection_Timeout/.cvsignore
@@ -0,0 +1 @@
+client
diff --git a/TAO/tests/Connection_Timeout/Makefile.am b/TAO/tests/Connection_Timeout/Makefile.am
deleted file mode 100644
index 0f3128c9bfd..00000000000
--- a/TAO/tests/Connection_Timeout/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Connection_Timeout_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Crash_On_Write/.cvsignore b/TAO/tests/Crash_On_Write/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Crash_On_Write/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
index ce52c6776dc..2398d1eac4c 100644
--- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
+++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
@@ -1,37 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     Oneway_Receiver.cpp
     Crash_Task.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Crash_On_Write/Makefile.am b/TAO/tests/Crash_On_Write/Makefile.am
deleted file mode 100644
index f62ca91d3a7..00000000000
--- a/TAO/tests/Crash_On_Write/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Crash_On_Write_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Crash_On_Write_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Crash_Task.cpp \
-  Oneway_Receiver.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Crash_Task.h \
-  Oneway_Receiver.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Crash_On_Write_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Crash_Task.h \
-  Oneway_Receiver.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Crashed_Callback/.cvsignore b/TAO/tests/Crashed_Callback/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Crashed_Callback/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
index fb46b04e3df..34711dbef67 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
@@ -1,39 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     Service.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, portableserver, messaging {
-  after += *idl
   after += *Server
   Source_Files {
     Crashed_Callback.cpp
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Crashed_Callback/Makefile.am b/TAO/tests/Crashed_Callback/Makefile.am
deleted file mode 100644
index 46a2479da67..00000000000
--- a/TAO/tests/Crashed_Callback/Makefile.am
+++ /dev/null
@@ -1,121 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Crashed_Callback_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Crashed_Callback_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Service.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Service.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Crashed_Callback_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Crashed_Callback.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Crashed_Callback.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/DII_Collocation_Tests/Makefile.am b/TAO/tests/DII_Collocation_Tests/Makefile.am
deleted file mode 100644
index 2ceb2638651..00000000000
--- a/TAO/tests/DII_Collocation_Tests/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        oneway \
-        twoway
-
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc
index 18ac4d8cc04..afa9884eed8 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc
+++ b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(*oneway) : taoserver,  dynamicinterface, avoids_minimum_corba{
+project(*oneway) : taoserver,  dynamicinterface, minimum_corba{
   exename = Collocated_Test
 }
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Makefile.am b/TAO/tests/DII_Collocation_Tests/oneway/Makefile.am
deleted file mode 100644
index 06743355dad..00000000000
--- a/TAO/tests/DII_Collocation_Tests/oneway/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DII_Collocation_Tests_Oneway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc
index 931635159a9..c77ecfa435b 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc
+++ b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(*twoway) : taoserver,  dynamicinterface, avoids_minimum_corba{
+project(*twoway) : taoserver,  dynamicinterface, minimum_corba{
   exename = Collocated_Test
 }
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Makefile.am b/TAO/tests/DII_Collocation_Tests/twoway/Makefile.am
deleted file mode 100644
index 01b381486b4..00000000000
--- a/TAO/tests/DII_Collocation_Tests/twoway/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DII_Collocation_Tests_Twoway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/DLL_ORB/.cvsignore b/TAO/tests/DLL_ORB/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/DLL_ORB/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/DLL_ORB/Makefile.am b/TAO/tests/DLL_ORB/Makefile.am
deleted file mode 100644
index d45e111db2b..00000000000
--- a/TAO/tests/DLL_ORB/Makefile.am
+++ /dev/null
@@ -1,184 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-noinst_HEADERS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.DLL_ORB_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  Test_Client_Module.h \
-  Test_Client_Module_Export.h \
-  Test_Server_Module.h \
-  Test_Server_Module_Export.h \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DLL_ORB_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  Test_Client_Module.h \
-  Test_Client_Module_Export.h \
-  Test_Server_Module.h \
-  Test_Server_Module_Export.h \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DLL_ORB_Test_Client_Module.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libTest_Client_Module.la
-
-libTest_Client_Module_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_CLIENT_MODULE_BUILD_DLL
-
-libTest_Client_Module_la_SOURCES = \
-  TestC.cpp \
-  Test_Client_Module.cpp
-
-noinst_HEADERS += \
-  Test.idl \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl \
-  Test_Client_Module.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DLL_ORB_Test_Server_Module.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libTest_Server_Module.la
-
-libTest_Server_Module_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_SERVER_MODULE_BUILD_DLL
-
-libTest_Server_Module_la_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_Server_Module.cpp \
-  Test_i.cpp
-
-noinst_HEADERS += \
-  Test.idl \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl \
-  Test_Server_Module.h \
-  Test_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/DLL_ORB/run_test.pl b/TAO/tests/DLL_ORB/run_test.pl
index 6509c641b43..e3b6539985a 100755
--- a/TAO/tests/DLL_ORB/run_test.pl
+++ b/TAO/tests/DLL_ORB/run_test.pl
@@ -6,7 +6,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 #
 # $Id$
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/tests/DSI_Gateway/.cvsignore b/TAO/tests/DSI_Gateway/.cvsignore
new file mode 100644
index 00000000000..173dd5296f5
--- /dev/null
+++ b/TAO/tests/DSI_Gateway/.cvsignore
@@ -0,0 +1,3 @@
+client
+gateway
+server
diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
index 7703b170041..c5deacad25b 100644
--- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
+++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
@@ -1,51 +1,25 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface {
-  after += *idl
+project(*Server): taoserver, messaging, minimum_corba, dynamicinterface {
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface {
-  after += *idl
+project(*Client): taoclient, messaging, minimum_corba, dynamicinterface {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
-project(*Gateway): taoexe, portableserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface {
-  after += *idl
+project(*Gateway): taoexe, portableserver, messaging, minimum_corba, dynamicinterface {
   after += *Client
   Source_Files {
     test_dsi.cpp
     gateway.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/DSI_Gateway/Makefile.am b/TAO/tests/DSI_Gateway/Makefile.am
deleted file mode 100644
index a1bdefdaada..00000000000
--- a/TAO/tests/DSI_Gateway/Makefile.am
+++ /dev/null
@@ -1,160 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DSI_Gateway_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.DSI_Gateway_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DSI_Gateway_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_dsi.h \
-  test_dsi.inl \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DSI_Gateway_Gateway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += gateway
-
-gateway_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-gateway_SOURCES = \
-  gateway.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_dsi.cpp \
-  test_dsi.h \
-  test_dsi.inl
-
-gateway_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index 8d1d133fb22..4919809f944 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -107,30 +107,12 @@ main (int argc, char *argv[])
         {
           for (int i = 0; i != niterations; ++i)
             {
-              CORBA::Long const tv = i + 100;
-              server->test_val(tv);
-              CORBA::Long const rtv = server->test_val ();
+              the_in_structure.i = i;
+              CORBA::String_var name = CORBA::string_dup ("the name");
 
-              if (TAO_debug_level > 0)
-                {
-                   ACE_DEBUG ((LM_DEBUG,
-                               "DSI_Simpler_Server ==== Expected result = %d for %d\n",
-                               rtv, tv));
-                }
-
-              if (rtv != tv)
-                {
-                   ACE_ERROR ((LM_ERROR,
-                             "(%P|%t) ERROR: unexpected result = %d for %d\n",
-                             rtv, tv));
-               }
-
-             the_in_structure.i = i;
-             CORBA::String_var name = CORBA::string_dup ("the name");
+              Structure_var the_out_structure;
 
-             Structure_var the_out_structure;
-
-             CORBA::Long const r =
+              CORBA::Long r =
                 server->test_method (i,
                                      the_in_structure,
                                      the_out_structure.out (),
@@ -154,8 +136,8 @@ main (int argc, char *argv[])
 
               if (r != i)
                 {
-                  ACE_ERROR ((LM_ERROR,
-                              "(%P|%t) ERROR: unexpected result = %d for %d",
+                  ACE_DEBUG ((LM_DEBUG,
+                              "(%P|%t) unexpected result = %d for %d",
                               r, i));
                 }
             }
diff --git a/TAO/tests/DSI_Gateway/test.idl b/TAO/tests/DSI_Gateway/test.idl
index 29cdc6f4d15..d35c073b70d 100644
--- a/TAO/tests/DSI_Gateway/test.idl
+++ b/TAO/tests/DSI_Gateway/test.idl
@@ -19,8 +19,6 @@ exception test_exception
 
 interface Simple_Server
 {
-  attribute long test_val;
-
   long test_method (in long x,
                     in Structure the_in_structure,
                     out Structure the_out_structure,
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index 759578e6f6a..68759674acf 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -61,24 +61,3 @@ Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
-
-CORBA::Long
-Simple_Server_i::test_val (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return vlong_;
-}
-
-void
-Simple_Server_i::test_val (CORBA::Long tv ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Simpler_Server_i ====test_val: %d\n", tv
-                 ));
-    }
-    vlong_ = tv;
-}
-
diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h
index 776a385b9e1..499ee8f0dc4 100644
--- a/TAO/tests/DSI_Gateway/test_i.h
+++ b/TAO/tests/DSI_Gateway/test_i.h
@@ -38,12 +38,6 @@ public:
                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-   CORBA::Long test_val (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-     ACE_THROW_SPEC (( CORBA::SystemException));
-
-   void test_val (CORBA::Long test_val ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-     ACE_THROW_SPEC ((CORBA::SystemException));
-
   void raise_user_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      test_exception));
@@ -55,9 +49,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  // The ORB
   CORBA::ORB_var orb_;
-  CORBA::Long  vlong_;
+  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/tests/DSI_Gateway/test_i.inl b/TAO/tests/DSI_Gateway/test_i.inl
index bd51e3a42bd..97524552ff4 100644
--- a/TAO/tests/DSI_Gateway/test_i.inl
+++ b/TAO/tests/DSI_Gateway/test_i.inl
@@ -2,7 +2,6 @@
 
 ACE_INLINE
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb)),
-     vlong_ (0)
+  :  orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
diff --git a/TAO/tests/DynAny_Test/.cvsignore b/TAO/tests/DynAny_Test/.cvsignore
new file mode 100644
index 00000000000..bc7530a9314
--- /dev/null
+++ b/TAO/tests/DynAny_Test/.cvsignore
@@ -0,0 +1 @@
+basic_test
diff --git a/TAO/tests/DynAny_Test/Makefile.am b/TAO/tests/DynAny_Test/Makefile.am
deleted file mode 100644
index fe7a27f390d..00000000000
--- a/TAO/tests/DynAny_Test/Makefile.am
+++ /dev/null
@@ -1,99 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DynAny_Test_Basic.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  da_testsC.cpp \
-  da_testsC.h \
-  da_testsC.inl \
-  da_testsS.cpp \
-  da_testsS.h \
-  da_testsS.inl
-
-CLEANFILES = \
-  da_tests-stamp \
-  da_testsC.cpp \
-  da_testsC.h \
-  da_testsC.inl \
-  da_testsS.cpp \
-  da_testsS.h \
-  da_testsS.inl
-
-da_testsC.cpp da_testsC.h da_testsC.inl da_testsS.cpp da_testsS.h da_testsS.inl: da_tests-stamp
-
-da_tests-stamp: $(srcdir)/da_tests.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/da_tests.idl
-	@touch $@
-
-noinst_PROGRAMS = basic_test
-
-basic_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-basic_test_SOURCES = \
-  analyzer.cpp \
-  da_testsC.cpp \
-  da_testsS.cpp \
-  data.cpp \
-  driver.cpp \
-  test_dynany.cpp \
-  test_dynarray.cpp \
-  test_dynenum.cpp \
-  test_dynsequence.cpp \
-  test_dynstruct.cpp \
-  test_dynunion.cpp \
-  test_wrapper.cpp \
-  analyzer.h \
-  da_testsC.h \
-  da_testsC.inl \
-  da_testsS.h \
-  da_testsS.inl \
-  data.h \
-  driver.h \
-  test_dynany.h \
-  test_dynarray.h \
-  test_dynenum.h \
-  test_dynsequence.h \
-  test_dynstruct.h \
-  test_dynunion.h \
-  test_wrapper.h
-
-basic_test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp
index 55bad99ed41..08c1c9e4fd3 100644
--- a/TAO/tests/DynAny_Test/analyzer.cpp
+++ b/TAO/tests/DynAny_Test/analyzer.cpp
@@ -15,45 +15,18 @@
 
 #include "analyzer.h"
 
-#include "tao/DynamicAny/DynCommon.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
-
 #define CASEE(type,CT,str) case CORBA::tk_##type: {\
   CORBA::CT b = da->get_##type() ; \
-  tab (level_); \
+  tab(level_);\
   if (debug_) \
     ACE_DEBUG ((LM_DEBUG, str , b)); \
   } break;
 
-#define CASEBS(type,CT,str) case CORBA::tk_##type: \
-  {\
-    CORBA::CT##Seq_var seq = da->get_##type##_seq (); \
-    ++level_; \
-    CORBA::ULong len = seq->length (); \
-    tab (level_); \
-    if (debug_) \
-      { \
-        ACE_DEBUG ((LM_DEBUG, "length = %u\n", len)); \
-      } \
-    for (CORBA::ULong i = 0; i < len; ++i) \
-      { \
-        CORBA::CT b = seq[i]; \
-        tab (level_); \
-        if (debug_) \
-          { \
-            ACE_DEBUG ((LM_DEBUG, "[%d]\n", i)); \
-            ACE_DEBUG ((LM_DEBUG, str, b)); \
-          } \
-      } \
-    --level_; \
-  } \
-  break;
-
 DynAnyAnalyzer::DynAnyAnalyzer (CORBA::ORB_ptr orb,
                                 DynamicAny::DynAnyFactory_ptr dynany_factory,
                                 int debug)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    dynany_factory_ (DynamicAny::DynAnyFactory::_duplicate (dynany_factory)),
+  : orb_ (CORBA::ORB::_duplicate(orb)),
+    dynany_factory_ (DynamicAny::DynAnyFactory::_duplicate(dynany_factory)),
     level_ (0),
     debug_ (debug)
 {
@@ -63,38 +36,35 @@ void DynAnyAnalyzer::tab (int t)
 {
   if (debug_)
     {
-      for (int i = 0 ; i < t ; ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG, "\t"));
-        }
+      for( int i = 0 ; i < t ; i++ )
+          ACE_DEBUG ((LM_DEBUG,
+                      "\t"));
     }
 }
 
-DynAnyAnalyzer::~DynAnyAnalyzer (void)
+DynAnyAnalyzer::~DynAnyAnalyzer()
 {
 }
 
-void DynAnyAnalyzer::resetTab (void)
+void DynAnyAnalyzer::resetTab()
 {
   level_ = 0;
 }
 
 void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
 {
-  CORBA::TypeCode_var tc = da->type ();
+  CORBA::TypeCode_var tc = da->type();
 
   CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var dup = CORBA::TypeCode::_duplicate (tc.in ());
-
   // strip aliases
   while (kind == CORBA::tk_alias)
     {
-      dup = dup->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      tc = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      kind = dup->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -103,302 +73,230 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
      case CORBA::tk_struct:
       {
         DynamicAny::DynStruct_var ds
-          = DynamicAny::DynStruct::_narrow (da ACE_ENV_ARG_PARAMETER);
+          = DynamicAny::DynStruct::_narrow(da ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        tab (level_);
+        tab(level_);
 
         if (debug_)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                      "STRUCT\n"));
-          }
+          ACE_DEBUG ((LM_DEBUG,
+                     "STRUCT\n"));
 
-        if (da->seek (0) )
+        if( da->seek(0) )
           {
             level_++;
-
             do
               {
-                DynamicAny::DynAny_var cc =
-                  ds->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+                DynamicAny::DynAny_var cc    = ds->current_component(ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_CHECK;
 
-                DynamicAny::FieldName_var fn =
-                  ds->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+                DynamicAny::FieldName_var fn = ds->current_member_name(ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_CHECK;
 
                 tab(level_);
 
                 if (debug_)
-                  {
-                    ACE_DEBUG ((LM_DEBUG,
-                              "Member = %s\n", fn.in ()));
-                  }
+                  ACE_DEBUG ((LM_DEBUG,
+                             "Member = %s\n", fn.in()));
 
                 if (!CORBA::is_nil (cc.in ()))
                   {
-                    this->analyze (cc.in () ACE_ENV_ARG_PARAMETER);
+                    this->analyze (cc.in() ACE_ENV_ARG_PARAMETER);
                     ACE_CHECK;
                   }
 
-              } while (da->next ());
-
+              } while( da->next() );
             level_--;
           }
       }
       break; // end tk_struct
 
-    case CORBA::tk_sequence:
-      {
-        if (TAO_DynCommon::is_basic_type_seq (tc.in ()))
-          {
-            this->analyze_basic_seq (dup.in (), da);
-          }
-        else
-          {
-            DynamicAny::DynSequence_var ds =
-              DynamicAny::DynSequence::_narrow (da ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
-
-            int i = 0;
-            tab(level_);
-
-            if (debug_)
-              {
-                ACE_DEBUG ((LM_DEBUG,
-                            "SEQUENCE\n"));
-              }
-
-            if (ds->seek (0UL))
-              {
-                level_++;
-
-                do
-                  {
-                    tab(level_);
-
-                    if (debug_)
-                      ACE_DEBUG ((LM_DEBUG,
-                                  "[%d]\n", i));
-
-                    DynamicAny::DynAny_var cc (ds->current_component ());
-                    ACE_CHECK;
-
-                    if (!CORBA::is_nil (cc.in ()))
-                      {
-                        analyze (cc.in () ACE_ENV_ARG_PARAMETER);
-                        ACE_CHECK;
-                      }
-
-                    i++;
-                  } while (da->next ());
+     case CORBA::tk_sequence:
+       {
+         DynamicAny::DynSequence_var ds
+           = DynamicAny::DynSequence::_narrow(da ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
 
-                level_--;
-              }
-          }
-      }
-      break; // end tk_sequence
+        int i = 0;
 
-    case CORBA::tk_array:
-      {
-        tab (level_);
+        tab(level_);
 
         if (debug_)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "ARRAY\n"));
-          }
-
-        level_++;
-
-        CORBA::ULong const len =
-          dup->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          ACE_DEBUG ((LM_DEBUG,
+                      "SEQUENCE\n"));
 
-        for (CORBA::ULong i = 0 ; i < len; ++i)
+        if( ds->seek(0) )
           {
-            tab (level_);
-
-            if (debug_)
-              {
-                ACE_DEBUG ((LM_DEBUG, "[%d]\n", i));
-              }
-
-            DynamicAny::DynAny_var cc = da->current_component();
-
-            if (!CORBA::is_nil (cc.in ()))
+            level_++;
+            do
               {
-                analyze (cc.in () ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
-              }
-
-            da->next ();
-          }
-        level_--;
-      }
-      break;
-
-    case CORBA::tk_union:
-      {
-        DynamicAny::DynUnion_var value =
-          DynamicAny::DynUnion::_narrow (da ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                tab(level_);
 
-        if (!value->has_no_active_member ())
-          {
-            DynamicAny::DynAny_var disc = value->member ();
+                if (debug_)
+                  ACE_DEBUG ((LM_DEBUG,
+                              "[%d]\n", i));
 
-            if (!CORBA::is_nil (disc.in ()))
-              {
-                this->analyze (disc.in () ACE_ENV_ARG_PARAMETER);
+                DynamicAny::DynAny_var cc( ds->current_component() );
                 ACE_CHECK;
-              }
-          }
-      }
-      break;
-
-    case CORBA::tk_any:
-      {
-        DynamicAny::DynAny_var dynany;
-        CORBA::Any_var any = da->get_any ();
 
-        dynany =
-          dynany_factory_->create_dyn_any (any.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (!CORBA::is_nil (dynany.in ()))
-          {
-            this->analyze (dynany.in () ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
-          }
-
-        dynany->destroy ();
-      }
-      break;
-
-    case CORBA::tk_enum:
-      {
-        DynamicAny::DynEnum_var value =
-          DynamicAny::DynEnum::_narrow (da ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        CORBA::String_var s = value->get_as_string ();
-        tab (level_);
-
-        if (debug_)
-          {
-            ACE_DEBUG ((LM_DEBUG, "  Value (enum) = %s\n", s.in()));
-          }
-      }
-      break;
-
-    CASEE (boolean, Boolean, "  Value (bool) = %d\n");
-    CASEE (short, Short, "  Value (short) = %d\n");
-    CASEE (ushort, UShort, "  Value (ushort) = %u\n");
-    CASEE (long, Long, "  Value (long) = %d\n");
-    CASEE (ulong, ULong, "  Value (ulong) = %u\n");
-    CASEE (longlong, LongLong, "  Value (longlong) %Ld\n");
-    CASEE (ulonglong, ULongLong, "  Value (ulonglong) %Lu\n");
-    CASEE (char, Char, "  Value (char) = %c\n");
-    CASEE (float, Float, "  Value (float) = %f\n");
-    CASEE (double, Double, "  Value (double) = %f\n");
-    CASEE (octet, Octet, "  Value (octet) = %c\n");
-
-    case CORBA::tk_string:
-      {
-        CORBA::String_var b (da->get_string ());
-        tab (level_);
-
-        if (debug_)
-          {
-            ACE_DEBUG ((LM_DEBUG, "  Value (string) = %s\n", b.in ()));
-          }
-      }
-      break;
-
-    case CORBA::tk_TypeCode:
-      {
-        tab (level_);
-
-        if (debug_)
-          {
-            CORBA::TCKind const kind =
-              da->get_typecode ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
-
-            ACE_DEBUG ((LM_DEBUG,
-                        "  Value (TypeCode) = %d\n",
-                        static_cast<int> (kind)));
-          }
-      }
-      break;
+                if (!CORBA::is_nil (cc.in ()))
+                  {
+                    analyze(cc.in() ACE_ENV_ARG_PARAMETER);
+                    ACE_CHECK;
+                  }
 
-    default:
-      {
-        tab (level_);
+                i++;
+              } while( da->next() );
+            level_--;
+         }
+       }
+       break; // end tk_sequence
 
-        if (debug_)
-          {
-            CORBA::TCKind const kind =
-              tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+     case CORBA::tk_array:
+       {
+          tab(level_);
 
+          if (debug_)
             ACE_DEBUG ((LM_DEBUG,
-                        "  unhandled typecode = %d\n",
-                        static_cast<int> (kind)));
-          }
-      }
-      break;
-  }
-
-  if (debug_)
-    {
-      ACE_DEBUG ((LM_DEBUG, "\n"));
-    }
-}
-
-void
-DynAnyAnalyzer::analyze_basic_seq (CORBA::TypeCode_ptr tc,
-                                   DynamicAny::DynAny_ptr da)
-{
-  CORBA::TypeCode_var ct = tc->content_type ();
-  CORBA::TCKind tk = ct->kind ();
+                       "ARRAY\n"));
 
-  tab (level_);
+          level_++;
 
-  if (debug_)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "BASIC TYPE SEQUENCE\n"));
-    }
+          CORBA::ULong const len =
+            tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
 
-  switch (tk)
-    {
-      CASEBS (boolean, Boolean, "  Value (bool) = %d\n");
-      CASEBS (octet, Octet, "  Value (octet) = %c\n");
-      CASEBS (char, Char, "  Value (char) = %c\n");
-      CASEBS (wchar, WChar, "  Value (wchar) = %u\n");
-      CASEBS (short, Short, "  Value (short) = %d\n");
-      CASEBS (ushort, UShort, "  Value (ushort) = %u\n");
-      CASEBS (long, Long, "  Value (long) = %d\n");
-      CASEBS (ulong, ULong, "  Value (ulong) = %u\n");
-      CASEBS (longlong, LongLong, "  Value (longlong) = %Ld\n");
-      CASEBS (ulonglong, ULongLong, "  Value (ulonglong) = %Lu\n");
-      CASEBS (float, Float, "  Value (float) = %f\n");
-      CASEBS (double, Double, "  Value (double) = %f\n");
-      case CORBA::tk_longdouble:
-      default:
-        tab (level_);
+          for( unsigned int i = 0 ; i < len; ++i)
+            {
+              tab(level_);
 
-        if (debug_)
-          {
+              if (debug_)
+                ACE_DEBUG ((LM_DEBUG,
+                            "[%d]\n", i));
+
+              DynamicAny::DynAny_var cc = da->current_component();
+
+              if (!CORBA::is_nil (cc.in ()))
+                {
+                  analyze(cc.in() ACE_ENV_ARG_PARAMETER);
+                  ACE_CHECK;
+                }
+
+              da->next();
+            }
+          level_--;
+       }
+       break;
+
+     case CORBA::tk_union:
+       {
+         DynamicAny::DynUnion_var value
+           = DynamicAny::DynUnion::_narrow(da ACE_ENV_ARG_PARAMETER);
+         ACE_CHECK;
+
+         if( !value->has_no_active_member() )
+           {
+             DynamicAny::DynAny_var disc = value->member();
+
+              if (!CORBA::is_nil (disc.in ()))
+                {
+                  this->analyze(disc.in() ACE_ENV_ARG_PARAMETER);
+                  ACE_CHECK;
+                }
+           }
+       }
+       break;
+
+     case CORBA::tk_any:
+       {
+         DynamicAny::DynAny_var dynany;
+         CORBA::Any_var any = da->get_any();
+
+         dynany = dynany_factory_->create_dyn_any(any.in() ACE_ENV_ARG_PARAMETER);
+         ACE_CHECK;
+
+         if (!CORBA::is_nil (dynany.in ()))
+           {
+             this->analyze(dynany.in() ACE_ENV_ARG_PARAMETER);
+             ACE_CHECK;
+           }
+
+         dynany->destroy();
+       }
+       break;
+
+     case CORBA::tk_enum:
+       {
+         DynamicAny::DynEnum_var value
+           = DynamicAny::DynEnum::_narrow(da ACE_ENV_ARG_PARAMETER);
+         ACE_CHECK;
+
+          CORBA::String_var s = value->get_as_string();
+          tab(level_);
+
+          if (debug_)
             ACE_DEBUG ((LM_DEBUG,
-                        "  unhandled typecode = %d\n",
-                        static_cast<int> (tk)));
-          }
-
-        break;
-    }
+                       "  Value (enum) = %s\n", s.in()));
+       }
+       break;
+
+     CASEE(boolean,Boolean,"  Value (bool) = %d\n");
+     CASEE(short,Short,"  Value (short) = %d\n");
+     CASEE(ushort,UShort,"  Value (ushort) = %u\n");
+     CASEE(long,Long,"  Value (long) = %d\n");
+     CASEE(ulong,ULong,"  Value (ulong) = %u\n");
+     CASEE(longlong,LongLong,"  Value (longlong) %Ld\n");
+     CASEE(ulonglong,ULongLong,"  Value (ulonglong) %Lu\n");
+     CASEE(char,Char,"  Value (char) = %c\n");
+     CASEE(float,Float,"  Value (float) = %f\n");
+     CASEE(double,Double,"  Value (double) = %f\n");
+     CASEE(octet,Octet,"  Value (octet) = %c\n");
+
+     case CORBA::tk_string:
+       {
+         CORBA::String_var b( da->get_string() );
+
+         tab(level_);
+         if (debug_)
+           ACE_DEBUG ((LM_DEBUG,
+                      "  Value (string) = %s\n", b.in()));
+       }
+       break;
+
+     case CORBA::tk_TypeCode:
+       {
+         tab(level_);
+         if (debug_)
+           {
+             CORBA::TCKind const kind =
+               da->get_typecode ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+             ACE_CHECK;
+
+             ACE_DEBUG ((LM_DEBUG,
+                         "  Value (TypeCode) = %d\n",
+                         static_cast<int> (kind)));
+           }
+       }
+       break;
+
+     default:
+       {
+         tab(level_);
+         if (debug_)
+           {
+             CORBA::TCKind const kind =
+               tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+             ACE_CHECK;
+
+             ACE_DEBUG ((LM_DEBUG,
+                         "  unhandled typecode = %d\n",
+                         static_cast<int> (kind)));
+           }
+       }
+       break;
+   }
+
+   if (debug_)
+     ACE_DEBUG ((LM_DEBUG,
+                 "\n"));
 }
diff --git a/TAO/tests/DynAny_Test/analyzer.h b/TAO/tests/DynAny_Test/analyzer.h
index 776c24ee9e6..da1d08b1476 100644
--- a/TAO/tests/DynAny_Test/analyzer.h
+++ b/TAO/tests/DynAny_Test/analyzer.h
@@ -23,18 +23,15 @@
 class DynAnyAnalyzer
 {
 public:
-  DynAnyAnalyzer (CORBA::ORB_ptr orb, DynamicAny::DynAnyFactory_ptr dynany_factory, int debug);
+  DynAnyAnalyzer(CORBA::ORB_ptr orb, DynamicAny::DynAnyFactory_ptr dynany_factory, int debug);
 
-  void tab (int t);
+  void tab(int t);
 
-  ~DynAnyAnalyzer (void);
+  ~DynAnyAnalyzer();
 
-  void resetTab (void);
+  void resetTab();
 
-  void analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL);
-  
-  void analyze_basic_seq (CORBA::TypeCode_ptr tc,
-                          DynamicAny::DynAny_ptr da);
+  void analyze(DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/da_tests.idl b/TAO/tests/DynAny_Test/da_tests.idl
index cc271b5778b..4d0e5d4747f 100644
--- a/TAO/tests/DynAny_Test/da_tests.idl
+++ b/TAO/tests/DynAny_Test/da_tests.idl
@@ -15,7 +15,7 @@ module DynAnyTests
   struct test_struct
   {
     char c;
-    CORBA::ShortSeq ss;
+    long l;
     enclosed_struct es;
   };
 
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index 55422d128f6..f58e6d39d77 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -40,11 +40,6 @@ Data::Data (CORBA::ORB_var orb)
 
   ACE_TRY
     {
-      m_shortseq1.length (3UL);
-      m_shortseq1[0UL] = 0;
-      m_shortseq1[1UL] = 1;
-      m_shortseq1[2UL] = 2;
-    
       labels[0] = "type boolean";
       labels[1] = "type octet";
       labels[2] = "type char";
@@ -61,8 +56,6 @@ Data::Data (CORBA::ORB_var orb)
       labels[13] = "type wchar";
       labels[14] = "type any";
       labels[15] = "type objref";
-      labels[16] = "type short sequence";
-      
 
       // Getting the RootPOA so we can generate object references.
       CORBA::Object_var obj =
diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h
index 07f58b19794..4cd12f257e3 100644
--- a/TAO/tests/DynAny_Test/data.h
+++ b/TAO/tests/DynAny_Test/data.h
@@ -15,7 +15,6 @@
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
-#include "tao/ShortSeqC.h"
 
 class Data
 {
@@ -38,10 +37,8 @@ public:
   CORBA::TypeCode_ptr   m_typecode1,  m_typecode2;
   CORBA::WChar          m_wchar1,     m_wchar2;
   CORBA::Object_var     m_objref1,    m_objref2;
-  CORBA::ShortSeq       m_shortseq1;
-  CORBA::ShortSeq_var   m_shortseq2;
 
-const char* labels[17];
+const char* labels[16];
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index b235f0d1872..5eae425f78a 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -100,38 +100,31 @@ Driver::parse_args (int argc, char* argv[])
 {
   if (argc == 1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "usage:  %s\n"
-                       " -t [dynany|dynarray|dynenum|dynsequence|dynstruct|dynunion]\n"
-                       " -d\n",
+                       "usage:  %s"
+                       " -t [dynany|dynarray|dynenum|dynsequence|dynstruct|dynunion]"
+                       "\n",
                        argv [0]),
                       -1);
 
   ACE_Get_Opt get_opts (argc, argv, "t:d");
   int c;
-  const char *test_str = 0;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
       case 't':
-        test_str = get_opts.opt_arg ();
-        
-        if (!ACE_OS::strcmp (test_str, "dynany"))
+        if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynany"))
           this->test_type_ = TEST_DYNANY;
-        else if (!ACE_OS::strcmp (test_str, "dynarray"))
+        else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynarray"))
           this->test_type_ = TEST_DYNARRAY;
-        else if (!ACE_OS::strcmp (test_str, "dynenum"))
+        else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynenum"))
           this->test_type_ = TEST_DYNENUM;
-        else if (!ACE_OS::strcmp (test_str, "dynsequence"))
+        else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynsequence"))
           this->test_type_ = TEST_DYNSEQUENCE;
-        else if (!ACE_OS::strcmp (test_str, "dynstruct"))
+        else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynstruct"))
           this->test_type_ = TEST_DYNSTRUCT;
-        else if (!ACE_OS::strcmp (test_str, "dynunion"))
+        else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynunion"))
           this->test_type_ = TEST_DYNUNION;
-        else
-          ACE_DEBUG ((LM_DEBUG,
-                      "I don't recognize test type %s\n",
-                      test_str));
         break;
 
       case 'd':
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 35d7e1d1677..43796025447 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -11,7 +11,6 @@
 //=============================================================================
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "tao/AnyTypeCode/ShortSeqA.h"
 #include "tao/DynamicAny/DynamicAny.h"
 
 #include "test_dynany.h"
@@ -69,9 +68,7 @@ Test_DynAny::run_test (void)
                             -1);
         }
 
-      DynAnyAnalyzer analyzer (this->orb_.in (),
-                               dynany_factory.in (),
-                               debug_);
+      DynAnyAnalyzer analyzer(this->orb_.in(), dynany_factory.in(), debug_);
 
       CORBA::Any in1;
       in1 <<= data.m_double2;
@@ -83,8 +80,7 @@ Test_DynAny::run_test (void)
                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Double d_out =
-        fa1->get_double (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Double d_out = fa1->get_double (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (d_out == data.m_double1)
@@ -110,7 +106,7 @@ Test_DynAny::run_test (void)
       ftc1->from_any (in_any1
                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER);
+      analyzer.analyze(ftc1.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -147,8 +143,7 @@ Test_DynAny::run_test (void)
       fa2->insert_typecode (data.m_typecode1
                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_var tc_out =
-        fa2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var tc_out = fa2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (tc_out->equal (data.m_typecode1
@@ -176,7 +171,7 @@ Test_DynAny::run_test (void)
       ftc2->from_any (in_any2
                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      analyzer.analyze (ftc2.in() ACE_ENV_ARG_PARAMETER);
+      analyzer.analyze(ftc2.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Any_var out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -203,107 +198,6 @@ Test_DynAny::run_test (void)
       ACE_TRY_CHECK;
       ftc2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      ACE_DEBUG ((LM_DEBUG,
-                 "\t*=*=*=*= %s =*=*=*=*\n",
-                 data.labels[16]));
-
-      ACE_DEBUG ((LM_DEBUG,
-                 "testing: constructor(Any)/insert/get\n"));
-
-      CORBA::Any in3;
-      CORBA::ShortSeq ss;
-      ss.length (0UL);
-      in3 <<= ss;
-      DynamicAny::DynAny_var fa3 =
-        dynany_factory->create_dyn_any (in3
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      fa3->insert_short_seq (data.m_shortseq1
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      data.m_shortseq2 =
-        fa3->get_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      bool good =
-        data.m_shortseq2->length () == data.m_shortseq1.length ();
-        
-      if (good)
-        {
-          for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i)
-            {
-              if (data.m_shortseq2[i] != data.m_shortseq1[i])
-                {
-                  good = false;
-                  break;
-                }
-            }
-        }
-
-     if (good)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                     "++ OK ++\n"));
-        }
-      else
-        {
-          ++this->error_count_;
-        }
-
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                 "testing: constructor(TypeCode)/from_any/to_any\n"));
-
-      DynamicAny::DynAny_var ftc3 =
-        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_ShortSeq
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Any in_any3;
-      in_any3 <<= data.m_shortseq1;
-      ftc3->from_any (in_any3
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      analyzer.analyze (ftc3.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Any_var out_any3 = ftc3->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::ShortSeq *outseq = 0;
-      out_any3.in () >>= outseq;
-
-      good =
-        outseq->length () == data.m_shortseq1.length ();
-        
-      if (good)
-        {
-          for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i)
-            {
-              if ((*outseq)[i] != data.m_shortseq1[i])
-                {
-                  good = false;
-                  break;
-                }
-            }
-        }
-
-      if (good)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                     "++ OK ++\n"));
-        }
-      else
-        {
-          ++this->error_count_;
-        }
-
-      ACE_TRY_CHECK;
-
-      fa3->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ftc3->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index 26f792b417c..805a78e61f1 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -71,9 +71,7 @@ Test_DynArray::run_test (void)
                             -1);
         }
 
-      DynAnyAnalyzer analyzer (this->orb_.in (),
-                               dynany_factory.in (),
-                               debug_);
+      DynAnyAnalyzer analyzer(this->orb_.in(), dynany_factory.in(), debug_);
 
       CORBA::Any in_any1;
       in_any1 <<= DynAnyTests::test_array_forany (ta);
@@ -81,26 +79,21 @@ Test_DynArray::run_test (void)
         dynany_factory->create_dyn_any (in_any1
                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      DynamicAny::DynArray_var fa1 =
-        DynamicAny::DynArray::_narrow (dp1.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+      DynamicAny::DynArray_var fa1 = DynamicAny::DynArray::_narrow (dp1.in ()
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      fa1->seek (1 ACE_ENV_ARG_PARAMETER);
+      fa1->seek (1
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       fa1->insert_long (data.m_long1
                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       CORBA::Long l_out1 = data.m_long2;
-      fa1->seek (1 ACE_ENV_ARG_PARAMETER);
+      fa1->seek (1
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       l_out1 = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -143,11 +136,10 @@ Test_DynArray::run_test (void)
 
       ACE_TRY_CHECK;
 
-      analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER);
+      analyzer.analyze(ftc1.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Any_var out_any1 =
-        ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynAnyTests::test_array_forany ta_out;
@@ -175,9 +167,7 @@ Test_DynArray::run_test (void)
       ftc1->set_elements (as_in
                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      DynamicAny::AnySeq_var as_out =
-        ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Any out_any2 = as_out[1U];
       CORBA::Long l_out2;
@@ -195,7 +185,6 @@ Test_DynArray::run_test (void)
 
       fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 229e1460c24..ddef182f80c 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -63,9 +63,7 @@ Test_DynEnum::run_test (void)
                             -1);
         }
 
-      DynAnyAnalyzer analyzer (this->orb_.in(),
-                               dynany_factory.in (),
-                               debug_);
+      DynAnyAnalyzer analyzer(this->orb_.in(), dynany_factory.in(), debug_);
 
       DynAnyTests::test_enum te = DynAnyTests::TE_ZEROTH;
       CORBA::Any in_any1;
@@ -74,7 +72,6 @@ Test_DynEnum::run_test (void)
         dynany_factory->create_dyn_any (in_any1
                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       DynamicAny::DynEnum_var de1 =
         DynamicAny::DynEnum::_narrow (dp1.in ()
                                       ACE_ENV_ARG_PARAMETER);
@@ -87,15 +84,13 @@ Test_DynEnum::run_test (void)
                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ULong ul_out1 =
-        de1->get_as_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong ul_out1 = de1->get_as_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       analyzer.analyze(de1.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Any_var out_any2 =
-        de1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var out_any2 = de1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ul_out1 == 1)
@@ -115,8 +110,7 @@ Test_DynEnum::run_test (void)
       de1->set_as_ulong (3
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::String_var s =
-        de1->get_as_string (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var s = de1->get_as_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (s.in (), "TE_THIRD") == 0)
@@ -159,10 +153,8 @@ Test_DynEnum::run_test (void)
       analyzer.analyze(de2.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Any_var out_any1 =
-        de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var out_any1 = de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       out_any1.in () >>= te;
 
       if (te == DynAnyTests::TE_THIRD)
@@ -195,7 +187,6 @@ Test_DynEnum::run_test (void)
 
       de1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       de2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index f9b79d7b952..ce68f01c925 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -105,25 +105,21 @@ Test_DynSequence::run_test (void)
         dynany_factory->create_dyn_any (in_any1
                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       DynamicAny::DynSequence_var fa1 =
         DynamicAny::DynSequence::_narrow (dp1.in ()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      fa1->seek (1 ACE_ENV_ARG_PARAMETER);
+      fa1->seek (1
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       fa1->insert_string (data.m_string1
                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      fa1->seek (1 ACE_ENV_ARG_PARAMETER);
+      fa1->seek (1
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       CORBA::String_var out_str1 =
         fa1->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -183,7 +179,7 @@ Test_DynSequence::run_test (void)
           return -1;
         }
 
-      analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER);
+      analyzer.analyze(fa1.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var out_str;
@@ -244,13 +240,11 @@ Test_DynSequence::run_test (void)
                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER);
+      analyzer.analyze(ftc1.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Any_var out_any1 =
-        ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       DynAnyTests::test_seq *ts_out;
       out_any1.in () >>= ts_out;
 
@@ -289,11 +283,8 @@ Test_DynSequence::run_test (void)
       ftc1->set_elements (as_in
                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      DynamicAny::AnySeq_var as_out =
-        ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       CORBA::ULong index = 2;
       CORBA::Any out_any2 = as_out[index];
       char* out_str2;
@@ -312,7 +303,6 @@ Test_DynSequence::run_test (void)
 
       fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 1281471c19e..c5d5d9780e8 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -46,7 +46,7 @@ Test_DynStruct::run_test (void)
 
   DynAnyTests::test_struct ts;
   ts.c = data.m_char2;
-  ts.ss.length (0UL);
+  ts.l = data.m_long2;
   ts.es.f = data.m_float2;
   ts.es.s = data.m_short2;
 
@@ -73,9 +73,7 @@ Test_DynStruct::run_test (void)
                             -1);
         }
 
-      DynAnyAnalyzer analyzer (this->orb_.in (),
-                               dynany_factory.in (),
-                               debug_);
+      DynAnyAnalyzer analyzer(this->orb_.in(), dynany_factory.in(), debug_);
 
       CORBA::Any in_any1;
       in_any1 <<= ts;
@@ -83,37 +81,29 @@ Test_DynStruct::run_test (void)
         dynany_factory->create_dyn_any (in_any1
                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       DynamicAny::DynStruct_var fa1 =
         DynamicAny::DynStruct::_narrow (dp1.in ()
                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       fa1->insert_char (data.m_char1
                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      fa1->insert_short_seq (data.m_shortseq1
-                             ACE_ENV_ARG_PARAMETER);
+      fa1->insert_long (data.m_long1
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAny_var cc =
         fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       cc->insert_float (data.m_float1
                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       cc->next (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       cc->insert_short (data.m_short1
                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -127,7 +117,6 @@ Test_DynStruct::run_test (void)
 
       fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       CORBA::Char c = fa1->get_char (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -138,26 +127,10 @@ Test_DynStruct::run_test (void)
 
       fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      data.m_shortseq2 =
-        fa1->get_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Long l = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      bool good =
-        data.m_shortseq2->length () == data.m_shortseq1.length ();
-        
-      if (good)
-        {
-          for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i)
-            {
-              if (data.m_shortseq2[i] != data.m_shortseq1[i])
-                {
-                  ++this->error_count_;
-                  break;
-                }
-            }
-        }
-      else
+      if (l != data.m_long1)
         {
           ++this->error_count_;
         }
@@ -167,8 +140,8 @@ Test_DynStruct::run_test (void)
 
       cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      cc->seek (1 ACE_ENV_ARG_PARAMETER);
+      cc->seek (1
+                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Short s = cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -208,7 +181,7 @@ Test_DynStruct::run_test (void)
         }
 
       ts.c = data.m_char1;
-      ts.ss.length (0UL);
+      ts.l = data.m_long1;
       ts.es.f = data.m_float1;
       ts.es.s = data.m_short1;
       CORBA::Any in_any2;
@@ -217,11 +190,10 @@ Test_DynStruct::run_test (void)
                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER);
+      analyzer.analyze(ftc1.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Any_var out_any1 =
-        ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynAnyTests::test_struct* ts_out;
@@ -266,7 +238,7 @@ Test_DynStruct::run_test (void)
             }
 
           ts.c = data.m_char1;
-          ts.ss.length (0UL);
+          ts.l = data.m_long1;
           ts.es.f = data.m_float1;
           ts.es.s = data.m_short1;
           CORBA::Any in_any3;
@@ -278,13 +250,13 @@ Test_DynStruct::run_test (void)
 //          char c = ftc2->get_char ();
 //          CORBA::Boolean status = ftc2->next ();
 //          CORBA::Long lo = ftc2->get_long ();
-//          analyzer.analyze (ftc2.in () ACE_ENV_ARG_PARAMETER);
-//          ACE_TRY_CHECK;
+          analyzer.analyze(ftc2.in() ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
           out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bad_kind);
 
-          if (!(out_any2.in () >>= ts_out2)) // problem
+          if ((out_any2.in () >>= ts_out2) != 1) // problem
             {
               ts_out2 = 0;
             }
@@ -309,9 +281,9 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                   "testing: current_member_name/current_member_kind\n"));
 
-      ftc1->seek (2 ACE_ENV_ARG_PARAMETER);
+      ftc1->seek (2
+                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       DynamicAny::FieldName_var fn =
         ftc1->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 269f161e974..21cc5e1ad58 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -140,7 +140,7 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER);
+      analyzer.analyze(fa1.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any_var out_any1 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -152,7 +152,7 @@ Test_DynUnion::run_test (void)
 
       DynamicAny::DynUnion_var ftc1 =
         DynamicAny::DynUnion::_narrow (ftc1_base.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ftc1.in ()))
@@ -165,10 +165,9 @@ Test_DynUnion::run_test (void)
       ftc1->from_any (out_any1.in ()
                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      ftc1->seek (1 ACE_ENV_ARG_PARAMETER);
+      ftc1->seek (1
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       CORBA::TypeCode_var s_out2 =
         ftc1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -191,7 +190,7 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode alias)/from_any/to_any\n"));
 
-      analyzer.analyze( fa1.in() ACE_ENV_ARG_PARAMETER);
+      analyzer.analyze(fa1.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any_var out_any2 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -205,7 +204,6 @@ Test_DynUnion::run_test (void)
             dynany_factory->create_dyn_any_from_type_code
             (DynAnyTests::_tc_test_union_alias ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bad_kind);
-          
           DynamicAny::DynUnion_var ftc2 =
             DynamicAny::DynUnion::_narrow (ftc2_base.in ()
                                            ACE_ENV_ARG_PARAMETER);
@@ -221,10 +219,9 @@ Test_DynUnion::run_test (void)
           ftc2->from_any (out_any2.in ()
                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bad_kind);
-          
-          ftc2->seek (1 ACE_ENV_ARG_PARAMETER);
+          ftc2->seek (1
+                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bad_kind);
-          
           s_out3 = ftc2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bad_kind);
         }
@@ -260,18 +257,14 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing:discriminator/discriminator_kind\n"));
 
-      DynamicAny::DynAny_var dp2 =
-        ftc1->get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TypeCode_var tc2 =
-        dp2->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var tc2 = dp2->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TCKind tc1kind =
-        ftc1->discriminator_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind tc1kind = ftc1->discriminator_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       CORBA::TCKind tc2kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -288,20 +281,13 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing:member/member_kind/member_name\n"));
 
-      DynamicAny::DynAny_var dp3 =
-        ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var dp3 = ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      CORBA::String_var m_nm =
-        ftc1->member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var m_nm = ftc1->member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      CORBA::TCKind tk =
-        ftc1->member_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind tk = ftc1->member_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      CORBA::TypeCode_var tc3 =
-        dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var tc3 = dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean const equal_tc3 =
@@ -327,21 +313,15 @@ Test_DynUnion::run_test (void)
 
       ftc1->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       ftc1->seek (1
                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       ftc1->insert_short (data.m_short1
                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      DynamicAny::DynAny_var mem =
-        ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var mem = ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      CORBA::Short out_s =
-        mem->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Short out_s = mem->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (out_s == data.m_short1)
@@ -356,7 +336,6 @@ Test_DynUnion::run_test (void)
 
       fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
       ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -367,7 +346,6 @@ Test_DynUnion::run_test (void)
 
       test_implicit_def_union._default();
       ACE_TRY_CHECK;
-      
       any_union <<= test_implicit_def_union;
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/Explicit_Event_Loop/.cvsignore b/TAO/tests/Explicit_Event_Loop/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Explicit_Event_Loop/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
index 3c94b1f5d10..6da42a65f4b 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -1,36 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    time.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    timeC.cpp
-    timeS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     timeC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/Explicit_Event_Loop/Makefile.am b/TAO/tests/Explicit_Event_Loop/Makefile.am
deleted file mode 100644
index 54bb3d18750..00000000000
--- a/TAO/tests/Explicit_Event_Loop/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Explicit_Event_Loop_Idl.am
-
-BUILT_SOURCES = \
-  timeC.cpp \
-  timeC.h \
-  timeC.inl \
-  timeS.cpp \
-  timeS.h \
-  timeS.inl
-
-CLEANFILES = \
-  time-stamp \
-  timeC.cpp \
-  timeC.h \
-  timeC.inl \
-  timeS.cpp \
-  timeS.h \
-  timeS.inl
-
-timeC.cpp timeC.h timeC.inl timeS.cpp timeS.h timeS.inl: time-stamp
-
-time-stamp: $(srcdir)/time.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/time.idl
-	@touch $@
-
-noinst_HEADERS = \
-  time.idl
-
-## Makefile.Explicit_Event_Loop_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  timeC.cpp \
-  timeS.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Explicit_Event_Loop_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  timeC.cpp \
-  server.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Exposed_Policies/.cvsignore b/TAO/tests/Exposed_Policies/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Exposed_Policies/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
index 343ee82c6ce..6e9c5283fe0 100644
--- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
+++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
@@ -1,43 +1,25 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Counter.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): strategies, rt_server {
-  after += *idl
   Source_Files {
     Policy_Tester.cpp
     Policy_Verifier.cpp
     RT_Properties.cpp
     server.cpp
   }
-  Source_Files {
-    CounterC.cpp
-    CounterS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): strategies, rt_server {
   exename = client
-  after += *idl
   after += *Server
+
   Source_Files {
+    CounterC.cpp
     Policy_Tester.cpp
     Policy_Verifier.cpp
     RT_Properties.cpp
     client.cpp
   }
-  Source_Files {
-    CounterC.cpp
-  }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Exposed_Policies/Makefile.am b/TAO/tests/Exposed_Policies/Makefile.am
deleted file mode 100644
index 7086be3f5cb..00000000000
--- a/TAO/tests/Exposed_Policies/Makefile.am
+++ /dev/null
@@ -1,130 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Exposed_Policies_Idl.am
-
-BUILT_SOURCES = \
-  CounterC.cpp \
-  CounterC.h \
-  CounterC.inl \
-  CounterS.cpp \
-  CounterS.h \
-  CounterS.inl
-
-CLEANFILES = \
-  Counter-stamp \
-  CounterC.cpp \
-  CounterC.h \
-  CounterC.inl \
-  CounterS.cpp \
-  CounterS.h \
-  CounterS.inl
-
-CounterC.cpp CounterC.h CounterC.inl CounterS.cpp CounterS.h CounterS.inl: Counter-stamp
-
-Counter-stamp: $(srcdir)/Counter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Counter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Counter.idl
-
-## Makefile.Exposed_Policies_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  CounterC.cpp \
-  CounterS.cpp \
-  Policy_Tester.cpp \
-  Policy_Verifier.cpp \
-  RT_Properties.cpp \
-  server.cpp \
-  Policy_Tester.h \
-  Policy_Verifier.h \
-  RT_Properties.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Exposed_Policies_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  CounterC.cpp \
-  Policy_Tester.cpp \
-  Policy_Verifier.cpp \
-  RT_Properties.cpp \
-  client.cpp \
-  Policy_Tester.h \
-  Policy_Verifier.h \
-  RT_Properties.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/FL_Cube/.cvsignore b/TAO/tests/FL_Cube/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/FL_Cube/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/FL_Cube/Makefile.am b/TAO/tests/FL_Cube/Makefile.am
deleted file mode 100644
index cd15f0bedbb..00000000000
--- a/TAO/tests/FL_Cube/Makefile.am
+++ /dev/null
@@ -1,169 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.FL_Cube_Client.am
-
-if BUILD_ACE_FLREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_FL
-if BUILD_GL
-if BUILD_TAO_FLRESOURCE
-if BUILD_X11
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_FLTK_CPPFLAGS)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDFLAGS = \
- $(ACE_FLTK_LDFLAGS)
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_FLTK_LIBS)
-
-endif BUILD_X11
-endif BUILD_TAO_FLRESOURCE
-endif BUILD_GL
-endif BUILD_FL
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_FLREACTOR
-
-## Makefile.FL_Cube_Server.am
-
-if BUILD_ACE_FLREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_FL
-if BUILD_GL
-if BUILD_TAO_FLRESOURCE
-if BUILD_X11
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_FLTK_CPPFLAGS)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-server_LDFLAGS = \
- $(ACE_FLTK_LDFLAGS)
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_FLTK_LIBS)
-
-endif BUILD_X11
-endif BUILD_TAO_FLRESOURCE
-endif BUILD_GL
-endif BUILD_FL
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_FLREACTOR
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Faults/.cvsignore b/TAO/tests/Faults/.cvsignore
new file mode 100644
index 00000000000..c347b958f8e
--- /dev/null
+++ b/TAO/tests/Faults/.cvsignore
@@ -0,0 +1,5 @@
+client
+middle
+ping
+pong
+server
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index 8c2ae1263cc..0bc0ae29bce 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -1,88 +1,71 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
+project(*Server): taoserver, minimum_corba {
   IDL_Files {
     test.idl
-    ping.idl
   }
-  custom_only = 1
-}
 
-project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
-
-  Source_Files {
-    test_i.cpp
-    server.cpp
-  }
   Source_Files {
     testC.cpp
     testS.cpp
-  }
-  IDL_Files {
+    test_i.cpp
+    server.cpp
   }
 }
 
-project(*Middle): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Middle): taoexe, portableserver, minimum_corba {
   after += *Server
-
-  Source_Files {
-    test_i.cpp
-    middle.cpp
+  IDL_Files {
+    test.idl
   }
+
   Source_Files {
     testC.cpp
     testS.cpp
-  }
-  IDL_Files {
+    test_i.cpp
+    middle.cpp
   }
 }
 
-project(*Client): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): taoexe, portableserver, minimum_corba {
   after += *Middle
-
-  Source_Files {
-    test_i.cpp
-    client.cpp
+  IDL_Files {
+    test.idl
   }
+
   Source_Files {
     testC.cpp
     testS.cpp
-  }
-  IDL_Files {
+    test_i.cpp
+    client.cpp
   }
 }
 
-project(*Ping): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
-
-  Source_Files {
-    ping_i.cpp
-    ping.cpp
+project(*Ping): taoexe, portableserver, minimum_corba {
+  IDL_Files {
+    ping.idl
   }
+
   Source_Files {
     pingC.cpp
     pingS.cpp
-  }
-  IDL_Files {
+    ping_i.cpp
+    ping.cpp
   }
 }
 
-project(*Pong): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Pong): taoexe, portableserver, minimum_corba {
   after += *Ping
-
-  Source_Files {
-    ping_i.cpp
-    pong.cpp
+  IDL_Files {
+    ping.idl
   }
+
   Source_Files {
     pingC.cpp
     pingS.cpp
-  }
-  IDL_Files {
+    ping_i.cpp
+    pong.cpp
   }
 }
+
diff --git a/TAO/tests/Faults/Makefile.am b/TAO/tests/Faults/Makefile.am
deleted file mode 100644
index 10d474796cc..00000000000
--- a/TAO/tests/Faults/Makefile.am
+++ /dev/null
@@ -1,219 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Faults_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  pingC.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.cpp \
-  pingS.h \
-  pingS.inl
-
-CLEANFILES += \
-  ping-stamp \
-  pingC.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.cpp \
-  pingS.h \
-  pingS.inl
-
-pingC.cpp pingC.h pingC.inl pingS.cpp pingS.h pingS.inl: ping-stamp
-
-ping-stamp: $(srcdir)/ping.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ping.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ping.idl \
-  test.idl
-
-## Makefile.Faults_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Faults_Middle.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += middle
-
-middle_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-middle_SOURCES = \
-  middle.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-middle_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Faults_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Faults_Ping.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ping
-
-ping_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ping_SOURCES = \
-  ping.cpp \
-  pingC.cpp \
-  pingS.cpp \
-  ping_i.cpp \
-  ping_i.h \
-  ping_i.inl
-
-ping_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Faults_Pong.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += pong
-
-pong_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-pong_SOURCES = \
-  pingC.cpp \
-  pingS.cpp \
-  ping_i.cpp \
-  pong.cpp \
-  ping_i.h \
-  ping_i.inl
-
-pong_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/File_IO/.cvsignore b/TAO/tests/File_IO/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/File_IO/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index 194e99a4b04..0f597f3533e 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -1,37 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    File.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): taoserver, minimum_corba {
   Source_Files {
     File_i.cpp
     server.cpp
   }
-  Source_Files {
-    FileC.cpp
-    FileS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): taoclient, anytypecode, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     FileC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/File_IO/Makefile.am b/TAO/tests/File_IO/Makefile.am
deleted file mode 100644
index 6fafa73de5d..00000000000
--- a/TAO/tests/File_IO/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.File_IO_Idl.am
-
-BUILT_SOURCES = \
-  FileC.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.cpp \
-  FileS.h \
-  FileS.inl
-
-CLEANFILES = \
-  File-stamp \
-  FileC.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.cpp \
-  FileS.h \
-  FileS.inl
-
-FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl: File-stamp
-
-File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/File.idl
-	@touch $@
-
-noinst_HEADERS = \
-  File.idl
-
-## Makefile.File_IO_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  FileC.cpp \
-  FileS.cpp \
-  File_i.cpp \
-  server.cpp \
-  File_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.File_IO_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  FileC.cpp \
-  client.cpp \
-  File_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Forwarding/.cvsignore b/TAO/tests/Forwarding/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Forwarding/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index 869c1d241c4..c0830f61571 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, iortable {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Forwarding/Makefile.am b/TAO/tests/Forwarding/Makefile.am
deleted file mode 100644
index a36b5d5761c..00000000000
--- a/TAO/tests/Forwarding/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Forwarding_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Forwarding_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Forwarding_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am
deleted file mode 100644
index 00861fb0155..00000000000
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Java_Big_Reply_IDL.am
-
-if BUILD_JAVA
-
-BUILT_SOURCES += \
-  Test/
-
-CLEANFILES += \
-  Test/
-
-Test/: $(srcdir)/Test.idl
-	mkdir -p Test
-	idlj -fall $(srcdir)/Test.idl
-
-endif BUILD_JAVA
-
-## Makefile.Java_Big_Reply.am
-
-if BUILD_EXCEPTIONS
-if BUILD_JAVA
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  server.class
-
-CLEANFILES += \
-  server.class
-
-server.class: $(srcdir)/server.java
-	javac -d . $(srcdir)/server.java
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_JAVA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am b/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am
deleted file mode 100644
index 9755a7f0030..00000000000
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Java_Big_Request_IDL.am
-
-if BUILD_JAVA
-
-BUILT_SOURCES += \
-  Test/
-
-CLEANFILES += \
-  Test/
-
-Test/: $(srcdir)/Test.idl
-	mkdir -p Test
-	idlj  $(srcdir)/Test.idl
-
-endif BUILD_JAVA
-
-## Makefile.Java_Big_Request.am
-
-if BUILD_EXCEPTIONS
-if BUILD_JAVA
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  client.class
-
-CLEANFILES += \
-  client.class
-
-client.class: $(srcdir)/client.java
-	javac -d . $(srcdir)/client.java
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Payload_Receiver.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Payload_Receiver.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_JAVA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/GIOP_Fragments/Makefile.am b/TAO/tests/GIOP_Fragments/Makefile.am
deleted file mode 100644
index a3b8104e475..00000000000
--- a/TAO/tests/GIOP_Fragments/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Java_Big_Reply \
-        Java_Big_Request \
-        PMB_With_Fragments
-
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.cvsignore b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.cvsignore
new file mode 100644
index 00000000000..254defddb53
--- /dev/null
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.cvsignore
@@ -0,0 +1 @@
+server
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am
deleted file mode 100644
index b475617d0ac..00000000000
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PMB_With_Fragments.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Payload_Receiver.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Payload_Receiver.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc
index 567e50ee4f5..85905a99a88 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoserver, avoids_corba_e_micro {
+project: taoserver {
 }
diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc
index bbebd287918..9d58d8df81e 100644
--- a/TAO/tests/Hang_Shutdown/Hang.mpc
+++ b/TAO/tests/Hang_Shutdown/Hang.mpc
@@ -1,22 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     server.cpp
     TestS.cpp
     TestC.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
@@ -26,6 +16,5 @@ project(*Client): taoclient, anytypecode {
     TestC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Hang_Shutdown/Makefile.am b/TAO/tests/Hang_Shutdown/Makefile.am
deleted file mode 100644
index 2d86df5a36f..00000000000
--- a/TAO/tests/Hang_Shutdown/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Hang_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Hang_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Hang_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Hello/.cvsignore b/TAO/tests/Hello/.cvsignore
new file mode 100644
index 00000000000..83770c96269
--- /dev/null
+++ b/TAO/tests/Hello/.cvsignore
@@ -0,0 +1,3 @@
+TestA.cpp
+client
+server
diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc
index 066f4725953..9a1892855d9 100644
--- a/TAO/tests/Hello/Hello.mpc
+++ b/TAO/tests/Hello/Hello.mpc
@@ -1,37 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     Hello.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/Hello/Makefile.am b/TAO/tests/Hello/Makefile.am
deleted file mode 100644
index 692871fcb95..00000000000
--- a/TAO/tests/Hello/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Hello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Hello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ICMG_Any_Bug/.cvsignore b/TAO/tests/ICMG_Any_Bug/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/ICMG_Any_Bug/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp
index bfa97ea05a1..bfa97ea05a1 100644..100755
--- a/TAO/tests/ICMG_Any_Bug/Hello.cpp
+++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h
index 429a7e10963..429a7e10963 100644..100755
--- a/TAO/tests/ICMG_Any_Bug/Hello.h
+++ b/TAO/tests/ICMG_Any_Bug/Hello.h
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc
index d22d23a1041..a41e64733b8 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.mpc
+++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc
@@ -1,34 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(ICMG_Any_Bug_Hello_IDL): taoidldefaults {
-  idlflags -= -St
-  idlflags -= -Sa
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(ICMG_Any_Bug_Hello_Server): taoserver {
-  after += ICMG_Any_Bug_Hello_IDL
   Source_Files {
     Hello.cpp
     HelloWorld.cpp
     server.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += ICMG_Any_Bug_Hello_IDL
+project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, minimum_corba {
+  after += ICMG_Any_Bug_Hello_Server
   Source_Files {
     TestC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
index ad60160af2d..ad60160af2d 100644..100755
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
diff --git a/TAO/tests/ICMG_Any_Bug/Makefile.am b/TAO/tests/ICMG_Any_Bug/Makefile.am
deleted file mode 100644
index 7491e787408..00000000000
--- a/TAO/tests/ICMG_Any_Bug/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ICMG_Any_Bug_Hello_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.ICMG_Any_Bug_Hello_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h \
-  HelloWorld.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ICMG_Any_Bug_Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  HelloWorld.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  HelloWorld.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index 3457c09156a..3457c09156a 100644..100755
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.cpp
diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp
index e32f495349a..e32f495349a 100644..100755
--- a/TAO/tests/ICMG_Any_Bug/server.cpp
+++ b/TAO/tests/ICMG_Any_Bug/server.cpp
diff --git a/TAO/tests/IDL_Test/.cvsignore b/TAO/tests/IDL_Test/.cvsignore
new file mode 100644
index 00000000000..e04cf61fd06
--- /dev/null
+++ b/TAO/tests/IDL_Test/.cvsignore
@@ -0,0 +1,23 @@
+anonymousA.cpp
+arrayA.cpp
+constantsA.cpp
+enum_in_structA.cpp
+fullA.cpp
+fwdA.cpp
+generic_objectA.cpp
+gperfA.cpp
+includedA.cpp
+includingA.cpp
+interfaceA.cpp
+keywordsA.cpp
+main
+nested_scopeA.cpp
+paramsA.cpp
+pragmaA.cpp
+reopen_include1A.cpp
+reopen_include2A.cpp
+reopened_modulesA.cpp
+repo_id_modA.cpp
+sequenceA.cpp
+typedefA.cpp
+unionA.cpp
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index 3e58b5b00c5..f3aaf8572ef 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -5,7 +5,7 @@ project(*Main): taoserver, messaging {
   exename = main
 
   IDL_Files {
-    idlflags += -GC -GH -Gd -GT
+    idlflags += -GC -GH -Gd
     array.idl
     Bug_2577_Regression.idl
     Bug_2582_Regression.idl
@@ -30,7 +30,7 @@ project(*Main): taoserver, messaging {
   }
 
   IDL_Files {
-    idlflags += -GC -GH -Gd -GA -GT
+    idlflags += -GC -GH -Gd -GA
     anonymous.idl
     constants.idl
     generic_object.idl
@@ -44,12 +44,5 @@ project(*Main): taoserver, messaging {
 
   Source_Files {
     main.cpp
-    *C.cpp
-    *S.cpp
-    *A.cpp
-  }
-
-  Template_Files {
-    *S_T.cpp
   }
 }
diff --git a/TAO/tests/IDL_Test/Makefile.am b/TAO/tests/IDL_Test/Makefile.am
deleted file mode 100644
index 303aad830f8..00000000000
--- a/TAO/tests/IDL_Test/Makefile.am
+++ /dev/null
@@ -1,1131 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.IDL_Test_Main.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  arrayC.cpp \
-  arrayC.h \
-  arrayC.inl \
-  arrayS.cpp \
-  arrayS.h \
-  arrayS.inl \
-  arrayS_T.cpp \
-  arrayS_T.h
-
-CLEANFILES += \
-  array-stamp \
-  arrayC.cpp \
-  arrayC.h \
-  arrayC.inl \
-  arrayS.cpp \
-  arrayS.h \
-  arrayS.inl \
-  arrayS_T.cpp \
-  arrayS_T.h
-
-arrayC.cpp arrayC.h arrayC.inl arrayS.cpp arrayS.h arrayS.inl arrayS_T.cpp arrayS_T.h: array-stamp
-
-array-stamp: $(srcdir)/array.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/array.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2577_RegressionC.cpp \
-  Bug_2577_RegressionC.h \
-  Bug_2577_RegressionC.inl \
-  Bug_2577_RegressionS.cpp \
-  Bug_2577_RegressionS.h \
-  Bug_2577_RegressionS.inl \
-  Bug_2577_RegressionS_T.cpp \
-  Bug_2577_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2577_Regression-stamp \
-  Bug_2577_RegressionC.cpp \
-  Bug_2577_RegressionC.h \
-  Bug_2577_RegressionC.inl \
-  Bug_2577_RegressionS.cpp \
-  Bug_2577_RegressionS.h \
-  Bug_2577_RegressionS.inl \
-  Bug_2577_RegressionS_T.cpp \
-  Bug_2577_RegressionS_T.h
-
-Bug_2577_RegressionC.cpp Bug_2577_RegressionC.h Bug_2577_RegressionC.inl Bug_2577_RegressionS.cpp Bug_2577_RegressionS.h Bug_2577_RegressionS.inl Bug_2577_RegressionS_T.cpp Bug_2577_RegressionS_T.h: Bug_2577_Regression-stamp
-
-Bug_2577_Regression-stamp: $(srcdir)/Bug_2577_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2577_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2582_RegressionC.cpp \
-  Bug_2582_RegressionC.h \
-  Bug_2582_RegressionC.inl \
-  Bug_2582_RegressionS.cpp \
-  Bug_2582_RegressionS.h \
-  Bug_2582_RegressionS.inl \
-  Bug_2582_RegressionS_T.cpp \
-  Bug_2582_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2582_Regression-stamp \
-  Bug_2582_RegressionC.cpp \
-  Bug_2582_RegressionC.h \
-  Bug_2582_RegressionC.inl \
-  Bug_2582_RegressionS.cpp \
-  Bug_2582_RegressionS.h \
-  Bug_2582_RegressionS.inl \
-  Bug_2582_RegressionS_T.cpp \
-  Bug_2582_RegressionS_T.h
-
-Bug_2582_RegressionC.cpp Bug_2582_RegressionC.h Bug_2582_RegressionC.inl Bug_2582_RegressionS.cpp Bug_2582_RegressionS.h Bug_2582_RegressionS.inl Bug_2582_RegressionS_T.cpp Bug_2582_RegressionS_T.h: Bug_2582_Regression-stamp
-
-Bug_2582_Regression-stamp: $(srcdir)/Bug_2582_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2582_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2583_RegressionC.cpp \
-  Bug_2583_RegressionC.h \
-  Bug_2583_RegressionC.inl \
-  Bug_2583_RegressionS.cpp \
-  Bug_2583_RegressionS.h \
-  Bug_2583_RegressionS.inl \
-  Bug_2583_RegressionS_T.cpp \
-  Bug_2583_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2583_Regression-stamp \
-  Bug_2583_RegressionC.cpp \
-  Bug_2583_RegressionC.h \
-  Bug_2583_RegressionC.inl \
-  Bug_2583_RegressionS.cpp \
-  Bug_2583_RegressionS.h \
-  Bug_2583_RegressionS.inl \
-  Bug_2583_RegressionS_T.cpp \
-  Bug_2583_RegressionS_T.h
-
-Bug_2583_RegressionC.cpp Bug_2583_RegressionC.h Bug_2583_RegressionC.inl Bug_2583_RegressionS.cpp Bug_2583_RegressionS.h Bug_2583_RegressionS.inl Bug_2583_RegressionS_T.cpp Bug_2583_RegressionS_T.h: Bug_2583_Regression-stamp
-
-Bug_2583_Regression-stamp: $(srcdir)/Bug_2583_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2583_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2616_RegressionC.cpp \
-  Bug_2616_RegressionC.h \
-  Bug_2616_RegressionC.inl \
-  Bug_2616_RegressionS.cpp \
-  Bug_2616_RegressionS.h \
-  Bug_2616_RegressionS.inl \
-  Bug_2616_RegressionS_T.cpp \
-  Bug_2616_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2616_Regression-stamp \
-  Bug_2616_RegressionC.cpp \
-  Bug_2616_RegressionC.h \
-  Bug_2616_RegressionC.inl \
-  Bug_2616_RegressionS.cpp \
-  Bug_2616_RegressionS.h \
-  Bug_2616_RegressionS.inl \
-  Bug_2616_RegressionS_T.cpp \
-  Bug_2616_RegressionS_T.h
-
-Bug_2616_RegressionC.cpp Bug_2616_RegressionC.h Bug_2616_RegressionC.inl Bug_2616_RegressionS.cpp Bug_2616_RegressionS.h Bug_2616_RegressionS.inl Bug_2616_RegressionS_T.cpp Bug_2616_RegressionS_T.h: Bug_2616_Regression-stamp
-
-Bug_2616_Regression-stamp: $(srcdir)/Bug_2616_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2616_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2619_RegressionC.cpp \
-  Bug_2619_RegressionC.h \
-  Bug_2619_RegressionC.inl \
-  Bug_2619_RegressionS.cpp \
-  Bug_2619_RegressionS.h \
-  Bug_2619_RegressionS.inl \
-  Bug_2619_RegressionS_T.cpp \
-  Bug_2619_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2619_Regression-stamp \
-  Bug_2619_RegressionC.cpp \
-  Bug_2619_RegressionC.h \
-  Bug_2619_RegressionC.inl \
-  Bug_2619_RegressionS.cpp \
-  Bug_2619_RegressionS.h \
-  Bug_2619_RegressionS.inl \
-  Bug_2619_RegressionS_T.cpp \
-  Bug_2619_RegressionS_T.h
-
-Bug_2619_RegressionC.cpp Bug_2619_RegressionC.h Bug_2619_RegressionC.inl Bug_2619_RegressionS.cpp Bug_2619_RegressionS.h Bug_2619_RegressionS.inl Bug_2619_RegressionS_T.cpp Bug_2619_RegressionS_T.h: Bug_2619_Regression-stamp
-
-Bug_2619_Regression-stamp: $(srcdir)/Bug_2619_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2619_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  enum_in_structC.cpp \
-  enum_in_structC.h \
-  enum_in_structC.inl \
-  enum_in_structS.cpp \
-  enum_in_structS.h \
-  enum_in_structS.inl \
-  enum_in_structS_T.cpp \
-  enum_in_structS_T.h
-
-CLEANFILES += \
-  enum_in_struct-stamp \
-  enum_in_structC.cpp \
-  enum_in_structC.h \
-  enum_in_structC.inl \
-  enum_in_structS.cpp \
-  enum_in_structS.h \
-  enum_in_structS.inl \
-  enum_in_structS_T.cpp \
-  enum_in_structS_T.h
-
-enum_in_structC.cpp enum_in_structC.h enum_in_structC.inl enum_in_structS.cpp enum_in_structS.h enum_in_structS.inl enum_in_structS_T.cpp enum_in_structS_T.h: enum_in_struct-stamp
-
-enum_in_struct-stamp: $(srcdir)/enum_in_struct.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/enum_in_struct.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  fullC.cpp \
-  fullC.h \
-  fullC.inl \
-  fullS.cpp \
-  fullS.h \
-  fullS.inl \
-  fullS_T.cpp \
-  fullS_T.h
-
-CLEANFILES += \
-  full-stamp \
-  fullC.cpp \
-  fullC.h \
-  fullC.inl \
-  fullS.cpp \
-  fullS.h \
-  fullS.inl \
-  fullS_T.cpp \
-  fullS_T.h
-
-fullC.cpp fullC.h fullC.inl fullS.cpp fullS.h fullS.inl fullS_T.cpp fullS_T.h: full-stamp
-
-full-stamp: $(srcdir)/full.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/full.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  fwdC.cpp \
-  fwdC.h \
-  fwdC.inl \
-  fwdS.cpp \
-  fwdS.h \
-  fwdS.inl \
-  fwdS_T.cpp \
-  fwdS_T.h
-
-CLEANFILES += \
-  fwd-stamp \
-  fwdC.cpp \
-  fwdC.h \
-  fwdC.inl \
-  fwdS.cpp \
-  fwdS.h \
-  fwdS.inl \
-  fwdS_T.cpp \
-  fwdS_T.h
-
-fwdC.cpp fwdC.h fwdC.inl fwdS.cpp fwdS.h fwdS.inl fwdS_T.cpp fwdS_T.h: fwd-stamp
-
-fwd-stamp: $(srcdir)/fwd.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/fwd.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  gperfC.cpp \
-  gperfC.h \
-  gperfC.inl \
-  gperfS.cpp \
-  gperfS.h \
-  gperfS.inl \
-  gperfS_T.cpp \
-  gperfS_T.h
-
-CLEANFILES += \
-  gperf-stamp \
-  gperfC.cpp \
-  gperfC.h \
-  gperfC.inl \
-  gperfS.cpp \
-  gperfS.h \
-  gperfS.inl \
-  gperfS_T.cpp \
-  gperfS_T.h
-
-gperfC.cpp gperfC.h gperfC.inl gperfS.cpp gperfS.h gperfS.inl gperfS_T.cpp gperfS_T.h: gperf-stamp
-
-gperf-stamp: $(srcdir)/gperf.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/gperf.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  includingC.cpp \
-  includingC.h \
-  includingC.inl \
-  includingS.cpp \
-  includingS.h \
-  includingS.inl \
-  includingS_T.cpp \
-  includingS_T.h
-
-CLEANFILES += \
-  including-stamp \
-  includingC.cpp \
-  includingC.h \
-  includingC.inl \
-  includingS.cpp \
-  includingS.h \
-  includingS.inl \
-  includingS_T.cpp \
-  includingS_T.h
-
-includingC.cpp includingC.h includingC.inl includingS.cpp includingS.h includingS.inl includingS_T.cpp includingS_T.h: including-stamp
-
-including-stamp: $(srcdir)/including.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/including.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  interfaceC.cpp \
-  interfaceC.h \
-  interfaceC.inl \
-  interfaceS.cpp \
-  interfaceS.h \
-  interfaceS.inl \
-  interfaceS_T.cpp \
-  interfaceS_T.h
-
-CLEANFILES += \
-  interface-stamp \
-  interfaceC.cpp \
-  interfaceC.h \
-  interfaceC.inl \
-  interfaceS.cpp \
-  interfaceS.h \
-  interfaceS.inl \
-  interfaceS_T.cpp \
-  interfaceS_T.h
-
-interfaceC.cpp interfaceC.h interfaceC.inl interfaceS.cpp interfaceS.h interfaceS.inl interfaceS_T.cpp interfaceS_T.h: interface-stamp
-
-interface-stamp: $(srcdir)/interface.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/interface.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  includedC.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.cpp \
-  includedS.h \
-  includedS.inl \
-  includedS_T.cpp \
-  includedS_T.h
-
-CLEANFILES += \
-  included-stamp \
-  includedC.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.cpp \
-  includedS.h \
-  includedS.inl \
-  includedS_T.cpp \
-  includedS_T.h
-
-includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl includedS_T.cpp includedS_T.h: included-stamp
-
-included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/included.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  unionC.cpp \
-  unionC.h \
-  unionC.inl \
-  unionS.cpp \
-  unionS.h \
-  unionS.inl \
-  unionS_T.cpp \
-  unionS_T.h
-
-CLEANFILES += \
-  union-stamp \
-  unionC.cpp \
-  unionC.h \
-  unionC.inl \
-  unionS.cpp \
-  unionS.h \
-  unionS.inl \
-  unionS_T.cpp \
-  unionS_T.h
-
-unionC.cpp unionC.h unionC.inl unionS.cpp unionS.h unionS.inl unionS_T.cpp unionS_T.h: union-stamp
-
-union-stamp: $(srcdir)/union.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/union.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  nested_scopeC.cpp \
-  nested_scopeC.h \
-  nested_scopeC.inl \
-  nested_scopeS.cpp \
-  nested_scopeS.h \
-  nested_scopeS.inl \
-  nested_scopeS_T.cpp \
-  nested_scopeS_T.h
-
-CLEANFILES += \
-  nested_scope-stamp \
-  nested_scopeC.cpp \
-  nested_scopeC.h \
-  nested_scopeC.inl \
-  nested_scopeS.cpp \
-  nested_scopeS.h \
-  nested_scopeS.inl \
-  nested_scopeS_T.cpp \
-  nested_scopeS_T.h
-
-nested_scopeC.cpp nested_scopeC.h nested_scopeC.inl nested_scopeS.cpp nested_scopeS.h nested_scopeS.inl nested_scopeS_T.cpp nested_scopeS_T.h: nested_scope-stamp
-
-nested_scope-stamp: $(srcdir)/nested_scope.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/nested_scope.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  paramsC.cpp \
-  paramsC.h \
-  paramsC.inl \
-  paramsS.cpp \
-  paramsS.h \
-  paramsS.inl \
-  paramsS_T.cpp \
-  paramsS_T.h
-
-CLEANFILES += \
-  params-stamp \
-  paramsC.cpp \
-  paramsC.h \
-  paramsC.inl \
-  paramsS.cpp \
-  paramsS.h \
-  paramsS.inl \
-  paramsS_T.cpp \
-  paramsS_T.h
-
-paramsC.cpp paramsC.h paramsC.inl paramsS.cpp paramsS.h paramsS.inl paramsS_T.cpp paramsS_T.h: params-stamp
-
-params-stamp: $(srcdir)/params.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/params.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  reopened_modulesC.cpp \
-  reopened_modulesC.h \
-  reopened_modulesC.inl \
-  reopened_modulesS.cpp \
-  reopened_modulesS.h \
-  reopened_modulesS.inl \
-  reopened_modulesS_T.cpp \
-  reopened_modulesS_T.h
-
-CLEANFILES += \
-  reopened_modules-stamp \
-  reopened_modulesC.cpp \
-  reopened_modulesC.h \
-  reopened_modulesC.inl \
-  reopened_modulesS.cpp \
-  reopened_modulesS.h \
-  reopened_modulesS.inl \
-  reopened_modulesS_T.cpp \
-  reopened_modulesS_T.h
-
-reopened_modulesC.cpp reopened_modulesC.h reopened_modulesC.inl reopened_modulesS.cpp reopened_modulesS.h reopened_modulesS.inl reopened_modulesS_T.cpp reopened_modulesS_T.h: reopened_modules-stamp
-
-reopened_modules-stamp: $(srcdir)/reopened_modules.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopened_modules.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  sequenceC.cpp \
-  sequenceC.h \
-  sequenceC.inl \
-  sequenceS.cpp \
-  sequenceS.h \
-  sequenceS.inl \
-  sequenceS_T.cpp \
-  sequenceS_T.h
-
-CLEANFILES += \
-  sequence-stamp \
-  sequenceC.cpp \
-  sequenceC.h \
-  sequenceC.inl \
-  sequenceS.cpp \
-  sequenceS.h \
-  sequenceS.inl \
-  sequenceS_T.cpp \
-  sequenceS_T.h
-
-sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl sequenceS_T.cpp sequenceS_T.h: sequence-stamp
-
-sequence-stamp: $(srcdir)/sequence.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/sequence.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  reopen_include1C.cpp \
-  reopen_include1C.h \
-  reopen_include1C.inl \
-  reopen_include1S.cpp \
-  reopen_include1S.h \
-  reopen_include1S.inl \
-  reopen_include1S_T.cpp \
-  reopen_include1S_T.h
-
-CLEANFILES += \
-  reopen_include1-stamp \
-  reopen_include1C.cpp \
-  reopen_include1C.h \
-  reopen_include1C.inl \
-  reopen_include1S.cpp \
-  reopen_include1S.h \
-  reopen_include1S.inl \
-  reopen_include1S_T.cpp \
-  reopen_include1S_T.h
-
-reopen_include1C.cpp reopen_include1C.h reopen_include1C.inl reopen_include1S.cpp reopen_include1S.h reopen_include1S.inl reopen_include1S_T.cpp reopen_include1S_T.h: reopen_include1-stamp
-
-reopen_include1-stamp: $(srcdir)/reopen_include1.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include1.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  reopen_include2C.cpp \
-  reopen_include2C.h \
-  reopen_include2C.inl \
-  reopen_include2S.cpp \
-  reopen_include2S.h \
-  reopen_include2S.inl \
-  reopen_include2S_T.cpp \
-  reopen_include2S_T.h
-
-CLEANFILES += \
-  reopen_include2-stamp \
-  reopen_include2C.cpp \
-  reopen_include2C.h \
-  reopen_include2C.inl \
-  reopen_include2S.cpp \
-  reopen_include2S.h \
-  reopen_include2S.inl \
-  reopen_include2S_T.cpp \
-  reopen_include2S_T.h
-
-reopen_include2C.cpp reopen_include2C.h reopen_include2C.inl reopen_include2S.cpp reopen_include2S.h reopen_include2S.inl reopen_include2S_T.cpp reopen_include2S_T.h: reopen_include2-stamp
-
-reopen_include2-stamp: $(srcdir)/reopen_include2.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include2.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  typeprefixC.cpp \
-  typeprefixC.h \
-  typeprefixC.inl \
-  typeprefixS.cpp \
-  typeprefixS.h \
-  typeprefixS.inl \
-  typeprefixS_T.cpp \
-  typeprefixS_T.h
-
-CLEANFILES += \
-  typeprefix-stamp \
-  typeprefixC.cpp \
-  typeprefixC.h \
-  typeprefixC.inl \
-  typeprefixS.cpp \
-  typeprefixS.h \
-  typeprefixS.inl \
-  typeprefixS_T.cpp \
-  typeprefixS_T.h
-
-typeprefixC.cpp typeprefixC.h typeprefixC.inl typeprefixS.cpp typeprefixS.h typeprefixS.inl typeprefixS_T.cpp typeprefixS_T.h: typeprefix-stamp
-
-typeprefix-stamp: $(srcdir)/typeprefix.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/typeprefix.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  anonymousA.cpp \
-  anonymousA.h \
-  anonymousC.cpp \
-  anonymousC.h \
-  anonymousC.inl \
-  anonymousS.cpp \
-  anonymousS.h \
-  anonymousS.inl \
-  anonymousS_T.cpp \
-  anonymousS_T.h
-
-CLEANFILES += \
-  anonymous-stamp \
-  anonymousA.cpp \
-  anonymousA.h \
-  anonymousC.cpp \
-  anonymousC.h \
-  anonymousC.inl \
-  anonymousS.cpp \
-  anonymousS.h \
-  anonymousS.inl \
-  anonymousS_T.cpp \
-  anonymousS_T.h
-
-anonymousA.cpp anonymousA.h anonymousC.cpp anonymousC.h anonymousC.inl anonymousS.cpp anonymousS.h anonymousS.inl anonymousS_T.cpp anonymousS_T.h: anonymous-stamp
-
-anonymous-stamp: $(srcdir)/anonymous.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/anonymous.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  constantsA.cpp \
-  constantsA.h \
-  constantsC.cpp \
-  constantsC.h \
-  constantsC.inl \
-  constantsS.cpp \
-  constantsS.h \
-  constantsS.inl \
-  constantsS_T.cpp \
-  constantsS_T.h
-
-CLEANFILES += \
-  constants-stamp \
-  constantsA.cpp \
-  constantsA.h \
-  constantsC.cpp \
-  constantsC.h \
-  constantsC.inl \
-  constantsS.cpp \
-  constantsS.h \
-  constantsS.inl \
-  constantsS_T.cpp \
-  constantsS_T.h
-
-constantsA.cpp constantsA.h constantsC.cpp constantsC.h constantsC.inl constantsS.cpp constantsS.h constantsS.inl constantsS_T.cpp constantsS_T.h: constants-stamp
-
-constants-stamp: $(srcdir)/constants.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/constants.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  generic_objectA.cpp \
-  generic_objectA.h \
-  generic_objectC.cpp \
-  generic_objectC.h \
-  generic_objectC.inl \
-  generic_objectS.cpp \
-  generic_objectS.h \
-  generic_objectS.inl \
-  generic_objectS_T.cpp \
-  generic_objectS_T.h
-
-CLEANFILES += \
-  generic_object-stamp \
-  generic_objectA.cpp \
-  generic_objectA.h \
-  generic_objectC.cpp \
-  generic_objectC.h \
-  generic_objectC.inl \
-  generic_objectS.cpp \
-  generic_objectS.h \
-  generic_objectS.inl \
-  generic_objectS_T.cpp \
-  generic_objectS_T.h
-
-generic_objectA.cpp generic_objectA.h generic_objectC.cpp generic_objectC.h generic_objectC.inl generic_objectS.cpp generic_objectS.h generic_objectS.inl generic_objectS_T.cpp generic_objectS_T.h: generic_object-stamp
-
-generic_object-stamp: $(srcdir)/generic_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/generic_object.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  keywordsA.cpp \
-  keywordsA.h \
-  keywordsC.cpp \
-  keywordsC.h \
-  keywordsC.inl \
-  keywordsS.cpp \
-  keywordsS.h \
-  keywordsS.inl \
-  keywordsS_T.cpp \
-  keywordsS_T.h
-
-CLEANFILES += \
-  keywords-stamp \
-  keywordsA.cpp \
-  keywordsA.h \
-  keywordsC.cpp \
-  keywordsC.h \
-  keywordsC.inl \
-  keywordsS.cpp \
-  keywordsS.h \
-  keywordsS.inl \
-  keywordsS_T.cpp \
-  keywordsS_T.h
-
-keywordsA.cpp keywordsA.h keywordsC.cpp keywordsC.h keywordsC.inl keywordsS.cpp keywordsS.h keywordsS.inl keywordsS_T.cpp keywordsS_T.h: keywords-stamp
-
-keywords-stamp: $(srcdir)/keywords.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/keywords.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  pragmaA.cpp \
-  pragmaA.h \
-  pragmaC.cpp \
-  pragmaC.h \
-  pragmaC.inl \
-  pragmaS.cpp \
-  pragmaS.h \
-  pragmaS.inl \
-  pragmaS_T.cpp \
-  pragmaS_T.h
-
-CLEANFILES += \
-  pragma-stamp \
-  pragmaA.cpp \
-  pragmaA.h \
-  pragmaC.cpp \
-  pragmaC.h \
-  pragmaC.inl \
-  pragmaS.cpp \
-  pragmaS.h \
-  pragmaS.inl \
-  pragmaS_T.cpp \
-  pragmaS_T.h
-
-pragmaA.cpp pragmaA.h pragmaC.cpp pragmaC.h pragmaC.inl pragmaS.cpp pragmaS.h pragmaS.inl pragmaS_T.cpp pragmaS_T.h: pragma-stamp
-
-pragma-stamp: $(srcdir)/pragma.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/pragma.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  repo_id_modA.cpp \
-  repo_id_modA.h \
-  repo_id_modC.cpp \
-  repo_id_modC.h \
-  repo_id_modC.inl \
-  repo_id_modS.cpp \
-  repo_id_modS.h \
-  repo_id_modS.inl \
-  repo_id_modS_T.cpp \
-  repo_id_modS_T.h
-
-CLEANFILES += \
-  repo_id_mod-stamp \
-  repo_id_modA.cpp \
-  repo_id_modA.h \
-  repo_id_modC.cpp \
-  repo_id_modC.h \
-  repo_id_modC.inl \
-  repo_id_modS.cpp \
-  repo_id_modS.h \
-  repo_id_modS.inl \
-  repo_id_modS_T.cpp \
-  repo_id_modS_T.h
-
-repo_id_modA.cpp repo_id_modA.h repo_id_modC.cpp repo_id_modC.h repo_id_modC.inl repo_id_modS.cpp repo_id_modS.h repo_id_modS.inl repo_id_modS_T.cpp repo_id_modS_T.h: repo_id_mod-stamp
-
-repo_id_mod-stamp: $(srcdir)/repo_id_mod.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/repo_id_mod.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  typedefA.cpp \
-  typedefA.h \
-  typedefC.cpp \
-  typedefC.h \
-  typedefC.inl \
-  typedefS.cpp \
-  typedefS.h \
-  typedefS.inl \
-  typedefS_T.cpp \
-  typedefS_T.h
-
-CLEANFILES += \
-  typedef-stamp \
-  typedefA.cpp \
-  typedefA.h \
-  typedefC.cpp \
-  typedefC.h \
-  typedefC.inl \
-  typedefS.cpp \
-  typedefS.h \
-  typedefS.inl \
-  typedefS_T.cpp \
-  typedefS_T.h
-
-typedefA.cpp typedefA.h typedefC.cpp typedefC.h typedefC.inl typedefS.cpp typedefS.h typedefS.inl typedefS_T.cpp typedefS_T.h: typedef-stamp
-
-typedef-stamp: $(srcdir)/typedef.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/typedef.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  valuetypeA.cpp \
-  valuetypeA.h \
-  valuetypeC.cpp \
-  valuetypeC.h \
-  valuetypeC.inl \
-  valuetypeS.cpp \
-  valuetypeS.h \
-  valuetypeS.inl \
-  valuetypeS_T.cpp \
-  valuetypeS_T.h
-
-CLEANFILES += \
-  valuetype-stamp \
-  valuetypeA.cpp \
-  valuetypeA.h \
-  valuetypeC.cpp \
-  valuetypeC.h \
-  valuetypeC.inl \
-  valuetypeS.cpp \
-  valuetypeS.h \
-  valuetypeS.inl \
-  valuetypeS_T.cpp \
-  valuetypeS_T.h
-
-valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl valuetypeS_T.cpp valuetypeS_T.h: valuetype-stamp
-
-valuetype-stamp: $(srcdir)/valuetype.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/valuetype.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  array_onlyA.cpp \
-  array_onlyA.h \
-  array_onlyC.cpp \
-  array_onlyC.h \
-  array_onlyC.inl \
-  array_onlyS.cpp \
-  array_onlyS.h \
-  array_onlyS.inl \
-  array_onlyS_T.cpp \
-  array_onlyS_T.h
-
-CLEANFILES += \
-  array_only-stamp \
-  array_onlyA.cpp \
-  array_onlyA.h \
-  array_onlyC.cpp \
-  array_onlyC.h \
-  array_onlyC.inl \
-  array_onlyS.cpp \
-  array_onlyS.h \
-  array_onlyS.inl \
-  array_onlyS_T.cpp \
-  array_onlyS_T.h
-
-array_onlyA.cpp array_onlyA.h array_onlyC.cpp array_onlyC.h array_onlyC.inl array_onlyS.cpp array_onlyS.h array_onlyS.inl array_onlyS_T.cpp array_onlyS_T.h: array_only-stamp
-
-array_only-stamp: $(srcdir)/array_only.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/array_only.idl
-	@touch $@
-
-noinst_PROGRAMS = main
-
-main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-main_SOURCES = \
-  Bug_2577_RegressionC.cpp \
-  Bug_2577_RegressionS.cpp \
-  Bug_2582_RegressionC.cpp \
-  Bug_2582_RegressionS.cpp \
-  Bug_2583_RegressionC.cpp \
-  Bug_2583_RegressionS.cpp \
-  Bug_2616_RegressionC.cpp \
-  Bug_2616_RegressionS.cpp \
-  Bug_2619_RegressionC.cpp \
-  Bug_2619_RegressionS.cpp \
-  anonymousA.cpp \
-  anonymousC.cpp \
-  anonymousS.cpp \
-  arrayC.cpp \
-  arrayS.cpp \
-  array_onlyA.cpp \
-  array_onlyC.cpp \
-  array_onlyS.cpp \
-  constantsA.cpp \
-  constantsC.cpp \
-  constantsS.cpp \
-  enum_in_structC.cpp \
-  enum_in_structS.cpp \
-  fullC.cpp \
-  fullS.cpp \
-  fwdC.cpp \
-  fwdS.cpp \
-  generic_objectA.cpp \
-  generic_objectC.cpp \
-  generic_objectS.cpp \
-  gperfC.cpp \
-  gperfS.cpp \
-  includedC.cpp \
-  includedS.cpp \
-  includingC.cpp \
-  includingS.cpp \
-  interfaceC.cpp \
-  interfaceS.cpp \
-  keywordsA.cpp \
-  keywordsC.cpp \
-  keywordsS.cpp \
-  main.cpp \
-  nested_scopeC.cpp \
-  nested_scopeS.cpp \
-  paramsC.cpp \
-  paramsS.cpp \
-  pragmaA.cpp \
-  pragmaC.cpp \
-  pragmaS.cpp \
-  reopen_include1C.cpp \
-  reopen_include1S.cpp \
-  reopen_include2C.cpp \
-  reopen_include2S.cpp \
-  reopened_modulesC.cpp \
-  reopened_modulesS.cpp \
-  repo_id_modA.cpp \
-  repo_id_modC.cpp \
-  repo_id_modS.cpp \
-  sequenceC.cpp \
-  sequenceS.cpp \
-  typedefA.cpp \
-  typedefC.cpp \
-  typedefS.cpp \
-  typeprefixC.cpp \
-  typeprefixS.cpp \
-  unionC.cpp \
-  unionS.cpp \
-  valuetypeA.cpp \
-  valuetypeC.cpp \
-  valuetypeS.cpp \
-  Bug_2577_RegressionC.h \
-  Bug_2577_RegressionC.inl \
-  Bug_2577_RegressionS.h \
-  Bug_2577_RegressionS.inl \
-  Bug_2577_RegressionS_T.h \
-  Bug_2582_RegressionC.h \
-  Bug_2582_RegressionC.inl \
-  Bug_2582_RegressionS.h \
-  Bug_2582_RegressionS.inl \
-  Bug_2582_RegressionS_T.h \
-  Bug_2583_RegressionC.h \
-  Bug_2583_RegressionC.inl \
-  Bug_2583_RegressionS.h \
-  Bug_2583_RegressionS.inl \
-  Bug_2583_RegressionS_T.h \
-  Bug_2616_RegressionC.h \
-  Bug_2616_RegressionC.inl \
-  Bug_2616_RegressionS.h \
-  Bug_2616_RegressionS.inl \
-  Bug_2616_RegressionS_T.h \
-  Bug_2619_RegressionC.h \
-  Bug_2619_RegressionC.inl \
-  Bug_2619_RegressionS.h \
-  Bug_2619_RegressionS.inl \
-  Bug_2619_RegressionS_T.h \
-  anonymousA.h \
-  anonymousC.h \
-  anonymousC.inl \
-  anonymousS.h \
-  anonymousS.inl \
-  anonymousS_T.h \
-  arrayC.h \
-  arrayC.inl \
-  arrayS.h \
-  arrayS.inl \
-  arrayS_T.h \
-  array_onlyA.h \
-  array_onlyC.h \
-  array_onlyC.inl \
-  array_onlyS.h \
-  array_onlyS.inl \
-  array_onlyS_T.h \
-  constantsA.h \
-  constantsC.h \
-  constantsC.inl \
-  constantsS.h \
-  constantsS.inl \
-  constantsS_T.h \
-  enum_in_structC.h \
-  enum_in_structC.inl \
-  enum_in_structS.h \
-  enum_in_structS.inl \
-  enum_in_structS_T.h \
-  fullC.h \
-  fullC.inl \
-  fullS.h \
-  fullS.inl \
-  fullS_T.h \
-  fwdC.h \
-  fwdC.inl \
-  fwdS.h \
-  fwdS.inl \
-  fwdS_T.h \
-  generic_objectA.h \
-  generic_objectC.h \
-  generic_objectC.inl \
-  generic_objectS.h \
-  generic_objectS.inl \
-  generic_objectS_T.h \
-  gperfC.h \
-  gperfC.inl \
-  gperfS.h \
-  gperfS.inl \
-  gperfS_T.h \
-  includedC.h \
-  includedC.inl \
-  includedS.h \
-  includedS.inl \
-  includedS_T.h \
-  includingC.h \
-  includingC.inl \
-  includingS.h \
-  includingS.inl \
-  includingS_T.h \
-  interfaceC.h \
-  interfaceC.inl \
-  interfaceS.h \
-  interfaceS.inl \
-  interfaceS_T.h \
-  keywordsA.h \
-  keywordsC.h \
-  keywordsC.inl \
-  keywordsS.h \
-  keywordsS.inl \
-  keywordsS_T.h \
-  nested_scopeC.h \
-  nested_scopeC.inl \
-  nested_scopeS.h \
-  nested_scopeS.inl \
-  nested_scopeS_T.h \
-  paramsC.h \
-  paramsC.inl \
-  paramsS.h \
-  paramsS.inl \
-  paramsS_T.h \
-  pragmaA.h \
-  pragmaC.h \
-  pragmaC.inl \
-  pragmaS.h \
-  pragmaS.inl \
-  pragmaS_T.h \
-  reopen_include1C.h \
-  reopen_include1C.inl \
-  reopen_include1S.h \
-  reopen_include1S.inl \
-  reopen_include1S_T.h \
-  reopen_include2C.h \
-  reopen_include2C.inl \
-  reopen_include2S.h \
-  reopen_include2S.inl \
-  reopen_include2S_T.h \
-  reopened_modulesC.h \
-  reopened_modulesC.inl \
-  reopened_modulesS.h \
-  reopened_modulesS.inl \
-  reopened_modulesS_T.h \
-  repo_id_modA.h \
-  repo_id_modC.h \
-  repo_id_modC.inl \
-  repo_id_modS.h \
-  repo_id_modS.inl \
-  repo_id_modS_T.h \
-  sequenceC.h \
-  sequenceC.inl \
-  sequenceS.h \
-  sequenceS.inl \
-  sequenceS_T.h \
-  typedefA.h \
-  typedefC.h \
-  typedefC.inl \
-  typedefS.h \
-  typedefS.inl \
-  typedefS_T.h \
-  typeprefixC.h \
-  typeprefixC.inl \
-  typeprefixS.h \
-  typeprefixS.inl \
-  typeprefixS_T.h \
-  unionC.h \
-  unionC.inl \
-  unionS.h \
-  unionS.inl \
-  unionS_T.h \
-  valuetypeA.h \
-  valuetypeC.h \
-  valuetypeC.inl \
-  valuetypeS.h \
-  valuetypeS.inl \
-  valuetypeS_T.h
-
-main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/IDL_Test/array_only.idl b/TAO/tests/IDL_Test/array_only.idl
index bb791128223..bb791128223 100644..100755
--- a/TAO/tests/IDL_Test/array_only.idl
+++ b/TAO/tests/IDL_Test/array_only.idl
diff --git a/TAO/tests/IDL_Test/included.idl b/TAO/tests/IDL_Test/included.idl
index 09bbab318ad..a8da94acedc 100644
--- a/TAO/tests/IDL_Test/included.idl
+++ b/TAO/tests/IDL_Test/included.idl
@@ -43,15 +43,4 @@ module VT_Def
   valuetype VT {};
 };
 
-// A valuetype in valuetype.idl inherits from this one.
-// In the original bug, the name for this valuetype's
-// anonymous sequence member was not created in the derived
-// valuetype's AST, so when the arglist for the derived
-// valuetype's constructor w/arglist was generated, the member
-// below was named 'sequence', which of course didn't compile.
-valuetype IncludedBase
-{
-  public sequence<long> DeprecatedMember;
-};
-
 #endif /* IDL_TEST_INCLUDED_IDL */
diff --git a/TAO/tests/IDL_Test/nested_scope.idl b/TAO/tests/IDL_Test/nested_scope.idl
index b36ce32cdb1..d0e3dc6d966 100644
--- a/TAO/tests/IDL_Test/nested_scope.idl
+++ b/TAO/tests/IDL_Test/nested_scope.idl
@@ -9,7 +9,7 @@
 //    nested_scope.idl
 //
 // = DESCRIPTION
-//    This file contains examples of IDL code that has
+//    This file contains examples of IDL code that has 
 //    caused problems in the past for the TAO IDL
 //    compiler. This test is to make sure the problems
 //    stay fixed.
@@ -26,7 +26,7 @@ module skip
 {
   module hump
   {
-    struct skip {short s;};
+    struct skip {short s;};      
   };
 };
 
@@ -142,11 +142,11 @@ module bug_1985_c
 // This one caused several problems - in the stub declaration of
 // the operation, and in the skeleton body's allocation of return type.
 module Negotiator
-{
+{ 
   interface UAV_Negotiator {};
 
   interface UAV_Negotiator_Factory : ::Negotiator::UAV_Negotiator
-  {
+  { 
     ::Negotiator::UAV_Negotiator make_negotiator (in string bitrate_sc);
   };
 };
@@ -154,19 +154,19 @@ module Negotiator
 // Caught some generation of arg helper template parameters not using
 // the qualifying '::' on scoped names.
 
-module bug_2125
+module bug_2125 
 {
-  module Bar
+  module Bar 
   {
     enum Stuff {ONE, TWO};
   };
 };
 
-module Wow
+module Wow 
 {
-  module bug_2125
+  module bug_2125 
   {
-    interface MyInterface
+    interface MyInterface 
     {
       void op1 (in bug_2125::Bar::Stuff fbs);
       void op2 (in ::bug_2125::Bar::Stuff fbs);
@@ -180,8 +180,6 @@ module Company
 {
   module CORBA
   {
-    typedef unsigned long LongU;
-
     module Inner
     {
       struct Foo
diff --git a/TAO/tests/IDL_Test/valuetype.idl b/TAO/tests/IDL_Test/valuetype.idl
index a31a8eb7938..eb594ec23cf 100644
--- a/TAO/tests/IDL_Test/valuetype.idl
+++ b/TAO/tests/IDL_Test/valuetype.idl
@@ -9,7 +9,7 @@
 //    valuetype.idl
 //
 // = DESCRIPTION
-//    This file contains examples of IDL code that has
+//    This file contains examples of IDL code that has 
 //    caused problems in the past for the TAO IDL
 //    compiler. This test is to make sure the problems
 //    stay fixed.
@@ -20,14 +20,9 @@
 //
 // ============================================================================
 
-#ifndef IDL_TEST_VALUETYPE_IDL
-#define IDL_TEST_VALUETYPE_IDL
-
-#include "included.idl"
-
 // A valuetype factory can have exceptions, so the declaration must pull in
 // an #include of SystemException.h.
-valuetype MyValueType
+valuetype MyValueType 
 {
   public string my_string_value;
   factory make_one ();
@@ -45,12 +40,3 @@ valuetype RecValueType
   private sequence<RecValueType> rec_value_types;
 };
 
-// Inherits an anonymous sequence member, which was not named
-// correctly in the original bug when used in the arglist for
-// this valuetype's constructor from values.
-valuetype GetsDeprecatedMember : IncludedBase
-{
-  public string StringMember;
-};
-
-#endif /* IDL_TEST_VALUETYPE_IDL */
diff --git a/TAO/tests/IORManipulation/.cvsignore b/TAO/tests/IORManipulation/.cvsignore
new file mode 100644
index 00000000000..7fde61cf549
--- /dev/null
+++ b/TAO/tests/IORManipulation/.cvsignore
@@ -0,0 +1 @@
+IORTest
diff --git a/TAO/tests/IORManipulation/Makefile.am b/TAO/tests/IORManipulation/Makefile.am
deleted file mode 100644
index 6ce89cee981..00000000000
--- a/TAO/tests/IORManipulation/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IORManipulation_IORTest.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = IORTest
-
-IORTest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-IORTest_SOURCES = \
-  IORTest.cpp
-
-IORTest_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am b/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am
deleted file mode 100644
index dff8bc9b49b..00000000000
--- a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am
+++ /dev/null
@@ -1,96 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.generate_ior.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  bogusC.cpp \
-  bogusC.h \
-  bogusC.inl \
-  bogusS.cpp \
-  bogusS.h \
-  bogusS.inl
-
-CLEANFILES = \
-  bogus-stamp \
-  bogusC.cpp \
-  bogusC.h \
-  bogusC.inl \
-  bogusS.cpp \
-  bogusS.h \
-  bogusS.inl
-
-bogusC.cpp bogusC.h bogusC.inl bogusS.cpp bogusS.h bogusS.inl: bogus-stamp
-
-bogus-stamp: $(srcdir)/bogus.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/bogus.idl
-	@touch $@
-
-noinst_PROGRAMS += generate_ior
-
-generate_ior_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-generate_ior_SOURCES = \
-  bogusC.cpp \
-  bogusS.cpp \
-  bogus_i.cpp \
-  generate_ior.cpp \
-  bogusC.h \
-  bogusC.inl \
-  bogusS.h \
-  bogusS.inl \
-  bogus_i.h
-
-generate_ior_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.list_interfaces.am
-
-noinst_PROGRAMS += list_interfaces
-
-list_interfaces_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-list_interfaces_SOURCES = \
-  list_interfaces.cpp \
-  bogus_i.h
-
-list_interfaces_LDADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/IPV6/IPV6_Hello.mpc b/TAO/tests/IPV6/IPV6_Hello.mpc
index 02e2ddc1120..9a1892855d9 100644
--- a/TAO/tests/IPV6/IPV6_Hello.mpc
+++ b/TAO/tests/IPV6/IPV6_Hello.mpc
@@ -1,36 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     Hello.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/IPV6/Makefile.am b/TAO/tests/IPV6/Makefile.am
deleted file mode 100644
index 787fd73222f..00000000000
--- a/TAO/tests/IPV6/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IPV6_Hello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.IPV6_Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IPV6_Hello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/InterOp-Naming/.cvsignore b/TAO/tests/InterOp-Naming/.cvsignore
new file mode 100644
index 00000000000..aa5c0fd4566
--- /dev/null
+++ b/TAO/tests/InterOp-Naming/.cvsignore
@@ -0,0 +1,2 @@
+INS_test_client
+INS_test_server
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index 47fba039d91..163fd3de1c3 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -1,39 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    INS.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, utils, iortable, avoids_corba_e_micro {
+project(*Server): taoserver, utils, iortable {
   exename = INS_test_server
-  after += *idl
   Source_Files {
     INS_i.cpp
     Server_i.cpp
     INS_test_server.cpp
   }
-  Source_Files {
-    INSC.cpp
-    INSS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
   exename = INS_test_client
-  after += *idl
   after += *Server
   Source_Files {
-    INS_test_client.cpp
-  }
-  Source_Files {
     INSC.cpp
-  }
-  IDL_Files {
+    INS_test_client.cpp
   }
 }
+
diff --git a/TAO/tests/InterOp-Naming/Makefile.am b/TAO/tests/InterOp-Naming/Makefile.am
deleted file mode 100644
index c7005e99c6c..00000000000
--- a/TAO/tests/InterOp-Naming/Makefile.am
+++ /dev/null
@@ -1,113 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.InterOp_Naming_Idl.am
-
-BUILT_SOURCES = \
-  INSC.cpp \
-  INSC.h \
-  INSC.inl \
-  INSS.cpp \
-  INSS.h \
-  INSS.inl
-
-CLEANFILES = \
-  INS-stamp \
-  INSC.cpp \
-  INSC.h \
-  INSC.inl \
-  INSS.cpp \
-  INSS.h \
-  INSS.inl
-
-INSC.cpp INSC.h INSC.inl INSS.cpp INSS.h INSS.inl: INS-stamp
-
-INS-stamp: $(srcdir)/INS.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/INS.idl
-	@touch $@
-
-noinst_HEADERS = \
-  INS.idl
-
-## Makefile.InterOp_Naming_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += INS_test_server
-
-INS_test_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-INS_test_server_SOURCES = \
-  INSC.cpp \
-  INSS.cpp \
-  INS_i.cpp \
-  INS_test_server.cpp \
-  Server_i.cpp \
-  INS_i.h \
-  Server_i.h
-
-INS_test_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.InterOp_Naming_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += INS_test_client
-
-INS_test_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-INS_test_client_SOURCES = \
-  INSC.cpp \
-  INS_test_client.cpp \
-  INS_i.h \
-  Server_i.h
-
-INS_test_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Leader_Followers/.cvsignore b/TAO/tests/Leader_Followers/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Leader_Followers/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc
index d9ff8a0f0df..a3b794ac88f 100644
--- a/TAO/tests/Leader_Followers/Leader_Followers.mpc
+++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, strategies {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, strategies {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Leader_Followers/Makefile.am b/TAO/tests/Leader_Followers/Makefile.am
deleted file mode 100644
index e63688a3796..00000000000
--- a/TAO/tests/Leader_Followers/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Leader_Followers_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Leader_Followers_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Leader_Followers_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/LongUpcalls/.cvsignore b/TAO/tests/LongUpcalls/.cvsignore
new file mode 100644
index 00000000000..263d5e84f49
--- /dev/null
+++ b/TAO/tests/LongUpcalls/.cvsignore
@@ -0,0 +1,4 @@
+ami_client
+ami_server
+blocking_client
+blocking_server
diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc
index 050e6e72952..13a0c026057 100644
--- a/TAO/tests/LongUpcalls/LongUpcalls.mpc
+++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc
@@ -1,71 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, ami {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging, ami {
   exename = blocking_server
-  after += *idl
   Source_Files {
     Manager.cpp
     blocking_server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): messaging, taoexe, portableserver, ami {
-  after += *idl
   after += *Server
   Source_Files {
     Controller.cpp
     blocking_client.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*AMI_Server): taoserver, messaging, ami {
   exename = ami_server
-  after += *idl
   after += *Client
   Source_Files {
     AMI_Manager.cpp
     ami_server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*AMI_Client): messaging, taoexe, portableserver, ami {
-  after += *idl
   after += *AMI_Server
   Source_Files {
     Controller.cpp
     Manager_Handler.cpp
     ami_client.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/LongUpcalls/Makefile.am b/TAO/tests/LongUpcalls/Makefile.am
deleted file mode 100644
index 06171bdb762..00000000000
--- a/TAO/tests/LongUpcalls/Makefile.am
+++ /dev/null
@@ -1,205 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.LongUpcalls_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += blocking_server
-
-blocking_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-blocking_server_SOURCES = \
-  Manager.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  blocking_server.cpp \
-  Manager.h
-
-blocking_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += blocking_client
-
-blocking_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-blocking_client_SOURCES = \
-  Controller.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  blocking_client.cpp \
-  Controller.h
-
-blocking_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ami_server
-
-ami_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ami_server_SOURCES = \
-  AMI_Manager.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  ami_server.cpp \
-  AMI_Manager.h
-
-ami_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ami_client
-
-ami_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ami_client_SOURCES = \
-  Controller.cpp \
-  Manager_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  ami_client.cpp \
-  Controller.h \
-  Manager_Handler.h
-
-ami_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/MProfile/.cvsignore b/TAO/tests/MProfile/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/MProfile/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc
index 6f0f5e0df59..e48d767fd5c 100644
--- a/TAO/tests/MProfile/MProfile.mpc
+++ b/TAO/tests/MProfile/MProfile.mpc
@@ -1,36 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, iormanip {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, iormanip {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, iormanip {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/MProfile/Makefile.am b/TAO/tests/MProfile/Makefile.am
deleted file mode 100644
index e8a8b75a660..00000000000
--- a/TAO/tests/MProfile/Makefile.am
+++ /dev/null
@@ -1,112 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MProfile_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/MProfile_Connection_Timeout/.cvsignore b/TAO/tests/MProfile_Connection_Timeout/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/MProfile_Connection_Timeout/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
index 57409e95046..e4abfd734d6 100644
--- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
+++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
@@ -1,36 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging, iormanip {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, messaging, iormanip {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/MProfile_Connection_Timeout/Makefile.am b/TAO/tests/MProfile_Connection_Timeout/Makefile.am
deleted file mode 100644
index 3154b18da39..00000000000
--- a/TAO/tests/MProfile_Connection_Timeout/Makefile.am
+++ /dev/null
@@ -1,121 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MProfile_Connection_Timeout_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MProfile_Connection_Timeout_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.MProfile_Connection_Timeout_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/MProfile_Forwarding/.cvsignore b/TAO/tests/MProfile_Forwarding/.cvsignore
new file mode 100644
index 00000000000..74e19e1c1de
--- /dev/null
+++ b/TAO/tests/MProfile_Forwarding/.cvsignore
@@ -0,0 +1,3 @@
+Manager
+client
+server
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index a8cd11740a7..d6f4df5acc4 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -1,52 +1,28 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): taoserver, minimum_corba {
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Client): taoclient, anytypecode, minimum_corba {
   exename = client
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
-project(*Manager): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iormanip {
+project(*Manager): taoserver, minimum_corba, iormanip {
   exename = manager
-  after += *idl
   after += *Client
   Source_Files {
+    testC.cpp
     Servant_Locator.cpp
     Manager.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/MProfile_Forwarding/Makefile.am b/TAO/tests/MProfile_Forwarding/Makefile.am
deleted file mode 100644
index d7b57f22c0b..00000000000
--- a/TAO/tests/MProfile_Forwarding/Makefile.am
+++ /dev/null
@@ -1,139 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MProfile_Forwarding_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MProfile_Forwarding_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Forwarding_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  Manager.h \
-  Servant_Locator.h \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Forwarding_Manager.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += manager
-
-manager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-manager_SOURCES = \
-  Manager.cpp \
-  Servant_Locator.cpp \
-  testC.cpp \
-  Manager.h \
-  Servant_Locator.h \
-  test_i.inl
-
-manager_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
index fc690fa5cf4..fc690fa5cf4 100644..100755
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
index ac226fda180..ac226fda180 100644..100755
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index 04c27ae739f..04c27ae739f 100644..100755
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
diff --git a/TAO/tests/MProfile_Forwarding/test.idl b/TAO/tests/MProfile_Forwarding/test.idl
index 1f1e6389faf..1f1e6389faf 100644..100755
--- a/TAO/tests/MProfile_Forwarding/test.idl
+++ b/TAO/tests/MProfile_Forwarding/test.idl
diff --git a/TAO/tests/MProfile_Forwarding/test_i.inl b/TAO/tests/MProfile_Forwarding/test_i.inl
index b11bb431e1f..b11bb431e1f 100644..100755
--- a/TAO/tests/MProfile_Forwarding/test_i.inl
+++ b/TAO/tests/MProfile_Forwarding/test_i.inl
diff --git a/TAO/tests/MT_BiDir/.cvsignore b/TAO/tests/MT_BiDir/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/MT_BiDir/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc
index f04bbed84ce..ab023c419a3 100644
--- a/TAO/tests/MT_BiDir/MT_BiDir.mpc
+++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc
@@ -1,42 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Receiver.idl
-    Sender.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
-  after += *idl
-  Source_Files {
-    Sender_i.cpp
-    Server_Task.cpp
-    server.cpp
-  }
+project(*Server): taoexe, portableserver, minimum_corba, bidir_giop {
   Source_Files {
     ReceiverC.cpp
     SenderC.cpp
     SenderS.cpp
-  }
-  IDL_Files {
+    Sender_i.cpp
+    Server_Task.cpp
+    server.cpp
   }
 }
 
-project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
-  after += *idl
-  Source_Files {
-    Client_Task.cpp
-    Receiver_i.cpp
-    client.cpp
-  }
+project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
+  after += *Server
   Source_Files {
     ReceiverC.cpp
     ReceiverS.cpp
     SenderC.cpp
-  }
-  IDL_Files {
+    Client_Task.cpp
+    Receiver_i.cpp
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/MT_BiDir/Makefile.am b/TAO/tests/MT_BiDir/Makefile.am
deleted file mode 100644
index 52dc0f6042e..00000000000
--- a/TAO/tests/MT_BiDir/Makefile.am
+++ /dev/null
@@ -1,145 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_BiDir_Idl.am
-
-BUILT_SOURCES = \
-  ReceiverC.cpp \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.cpp \
-  ReceiverS.h \
-  ReceiverS.inl
-
-CLEANFILES = \
-  Receiver-stamp \
-  ReceiverC.cpp \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.cpp \
-  ReceiverS.h \
-  ReceiverS.inl
-
-ReceiverC.cpp ReceiverC.h ReceiverC.inl ReceiverS.cpp ReceiverS.h ReceiverS.inl: Receiver-stamp
-
-Receiver-stamp: $(srcdir)/Receiver.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Receiver.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  SenderC.cpp \
-  SenderC.h \
-  SenderC.inl \
-  SenderS.cpp \
-  SenderS.h \
-  SenderS.inl
-
-CLEANFILES += \
-  Sender-stamp \
-  SenderC.cpp \
-  SenderC.h \
-  SenderC.inl \
-  SenderS.cpp \
-  SenderS.h \
-  SenderS.inl
-
-SenderC.cpp SenderC.h SenderC.inl SenderS.cpp SenderS.h SenderS.inl: Sender-stamp
-
-Sender-stamp: $(srcdir)/Sender.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Sender.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Receiver.idl \
-  Sender.idl
-
-## Makefile.MT_BiDir_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  ReceiverC.cpp \
-  ReceiverS.cpp \
-  Receiver_i.cpp \
-  SenderC.cpp \
-  client.cpp \
-  Client_Task.h \
-  Receiver_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_BiDir_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ReceiverC.cpp \
-  SenderC.cpp \
-  SenderS.cpp \
-  Sender_i.cpp \
-  Server_Task.cpp \
-  server.cpp \
-  Sender_i.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/MT_Client/.cvsignore b/TAO/tests/MT_Client/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/MT_Client/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
index 4c7c0e8f0a7..1974ade69bd 100644
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ b/TAO/tests/MT_Client/MT_Client.mpc
@@ -1,36 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/MT_Client/Makefile.am b/TAO/tests/MT_Client/Makefile.am
deleted file mode 100644
index 12314a2dccf..00000000000
--- a/TAO/tests/MT_Client/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Client_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MT_Client_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_Client_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/MT_Server/.cvsignore b/TAO/tests/MT_Server/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/MT_Server/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc
index aa28b25107f..bfb96e8b536 100644
--- a/TAO/tests/MT_Server/MT_Server.mpc
+++ b/TAO/tests/MT_Server/MT_Server.mpc
@@ -1,37 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/MT_Server/Makefile.am b/TAO/tests/MT_Server/Makefile.am
deleted file mode 100644
index 1a9ac25de1c..00000000000
--- a/TAO/tests/MT_Server/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Server_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MT_Server_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_Server_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/MT_Timeout/.cvsignore b/TAO/tests/MT_Timeout/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/MT_Timeout/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index dbf0552a387..634030e4814 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -1,38 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): messaging, taoserver {
-  after += *idl
   Source_Files {
     Sleep_Service.cpp
     Server_Task.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): messaging, taoexe, portableserver {
-  after += *idl
   after += *Server
   Source_Files {
+    TestC.cpp
     Client_Task.cpp
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/MT_Timeout/Makefile.am b/TAO/tests/MT_Timeout/Makefile.am
deleted file mode 100644
index 550a8987388..00000000000
--- a/TAO/tests/MT_Timeout/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Timeout_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.MT_Timeout_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_Task.cpp \
-  Sleep_Service.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Server_Task.h \
-  Sleep_Service.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.MT_Timeout_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Makefile.am b/TAO/tests/Makefile.am
deleted file mode 100644
index dbbfea23a83..00000000000
--- a/TAO/tests/Makefile.am
+++ /dev/null
@@ -1,191 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMH_Exceptions \
-        AMH_Oneway \
-        AMI \
-        AMI_Buffering \
-        AMI_Timeouts \
-        Abstract_Interface \
-        Any \
-        BiDirectional \
-        BiDirectional_DelayedUpcall \
-        BiDirectional_MultipleORB \
-        BiDirectional_NestedUpcall \
-        Big_AMI \
-        Big_Oneways \
-        Big_Reply \
-        Big_Request_Muxing \
-        Big_Twoways \
-        Blocking_Sync_None \
-        Bug_1020_Basic_Regression \
-        Bug_1020_Regression \
-        Bug_1254_Regression \
-        Bug_1269_Regression \
-        Bug_1270_Regression \
-        Bug_1330_Regression \
-        Bug_1361_Regression \
-        Bug_1476_Regression \
-        Bug_1476_Test \
-        Bug_1482_Regression \
-        Bug_1495_Regression \
-        Bug_1535_Regression \
-        Bug_1551_Regression \
-        Bug_1568_Regression \
-        Bug_1627_Regression \
-        Bug_1635_Regression \
-        Bug_1636_Regression \
-        Bug_1639_Regression \
-        Bug_1670_Regression \
-        Bug_1676_Regression \
-        Bug_1693_Test \
-        Bug_1812_Regression \
-        Bug_1813_Regression \
-        Bug_1869_Regression \
-        Bug_1904_Regression \
-        Bug_2084_Regression \
-        Bug_2119_Regression \
-        Bug_2122_Regression \
-        Bug_2124_Regression \
-        Bug_2126_Regression \
-        Bug_2134_Regression \
-        Bug_2144_Regression \
-        Bug_2174_Regression \
-        Bug_2183_Regression \
-        Bug_2186_Regression \
-        Bug_2188_Regression \
-        Bug_2201_Regression \
-        Bug_2222_Regression \
-        Bug_2234_Regression \
-        Bug_2289_Regression \
-        Bug_2319_Regression \
-        Bug_2328_Regression \
-        Bug_2345_Regression \
-        Bug_2349_Regression \
-        Bug_2375_Regression \
-        Bug_2417_Regression \
-        Bug_2419_Regression \
-        Bug_2424_Regression \
-        Bug_2429_Regression \
-        Bug_2494_Regression \
-        Bug_2503_Regression \
-        Bug_2542_Regression \
-        Bug_2543_Regression \
-        Bug_2549_Regression \
-        Bug_2560_Regression \
-        Bug_2593_Regression \
-        Bug_2595_Regression \
-        Bug_2654_Regression \
-        Bug_2669_Regression \
-        Bug_2683_Regression \
-	Bug_2702_Regression \
-        CDR \
-        COIOP \
-        Cache_Growth_Test \
-        CallbackTest \
-        Client_Leaks \
-        CodeSets \
-        Codec \
-        Collocation \
-        CollocationLockup \
-        Collocation_Exception_Test \
-        Collocation_Oneway_Tests \
-        Collocation_Opportunities \
-        Collocation_Tests \
-        Compression \
-        Connect_Strategy_Test \
-        Connection_Failure \
-        Connection_Purging \
-        Connection_Timeout \
-        Crash_On_Write \
-        Crashed_Callback \
-        DII_Collocation_Tests \
-        DLL_ORB \
-        DSI_Gateway \
-        DynAny_Test \
-        Explicit_Event_Loop \
-        Exposed_Policies \
-        FL_Cube \
-        Faults \
-        File_IO \
-        Forwarding \
-        GIOP_Fragments \
-        Hang_Shutdown \
-        Hello \
-        ICMG_Any_Bug \
-        IDL_Test \
-        IORManipulation \
-        IOR_Endpoint_Hostnames \
-        IPV6 \
-        InterOp-Naming \
-        Leader_Followers \
-        LongUpcalls \
-        MProfile \
-        MProfile_Connection_Timeout \
-        MProfile_Forwarding \
-        MT_BiDir \
-        MT_Client \
-        MT_Server \
-        MT_Timeout \
-        Multiple \
-        Multiple_Inheritance \
-        Muxed_GIOP_Versions \
-        Muxing \
-        Native_Exceptions \
-        NestedUpcall \
-        Nested_Event_Loop \
-        Nested_Upcall_Crash \
-        No_Server_MT_Connect_Test \
-        OBV \
-        ORB_Local_Config \
-        ORB_destroy \
-        ORB_init \
-        ORB_shutdown \
-        ORT \
-        Object_Loader \
-        Objref_Sequence_Test \
-        OctetSeq \
-        Ondemand_Write \
-        Oneway_Buffering \
-        Oneway_Timeouts \
-        Oneways_Invoking_Twoways \
-        Optimized_Connection \
-        POA \
-        Parallel_Connect_Strategy \
-        Param_Test \
-        Permanent_Forward \
-        Policies \
-        Portable_Interceptors \
-        QtTests \
-        Queued_Message_Test \
-        RTCORBA \
-        RTScheduling \
-        Reliable_Oneways \
-        Sequence_Unit_Tests \
-        Servant_To_Reference_Test \
-        Server_Connection_Purging \
-        Server_Leaks \
-        Server_Port_Zero \
-        Single_Read \
-        Smart_Proxies \
-        Stack_Recursion \
-        Strategies \
-        Timed_Buffered_Oneways \
-        Timeout \
-        TransportCurrent \
-        Two_Objects \
-        Typedef_String_Array \
-        UNKNOWN_Exception \
-        Xt_Stopwatch
-
-# SUBDIRS += \
-#         Bug_2399_Regression \
-#         CSD_Strategy_Tests 
diff --git a/TAO/tests/Multiple/.cvsignore b/TAO/tests/Multiple/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Multiple/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Multiple/Makefile.am b/TAO/tests/Multiple/Makefile.am
deleted file mode 100644
index 62626563bbf..00000000000
--- a/TAO/tests/Multiple/Makefile.am
+++ /dev/null
@@ -1,113 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Multiple_Idl.am
-
-BUILT_SOURCES = \
-  MultipleC.cpp \
-  MultipleC.h \
-  MultipleC.inl \
-  MultipleS.cpp \
-  MultipleS.h \
-  MultipleS.inl
-
-CLEANFILES = \
-  Multiple-stamp \
-  MultipleC.cpp \
-  MultipleC.h \
-  MultipleC.inl \
-  MultipleS.cpp \
-  MultipleS.h \
-  MultipleS.inl
-
-MultipleC.cpp MultipleC.h MultipleC.inl MultipleS.cpp MultipleS.h MultipleS.inl: Multiple-stamp
-
-Multiple-stamp: $(srcdir)/Multiple.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gd $(srcdir)/Multiple.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Multiple.idl
-
-## Makefile.Multiple_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Collocation_Tester.cpp \
-  MultipleC.cpp \
-  MultipleS.cpp \
-  Multiple_Impl.cpp \
-  server.cpp \
-  Collocation_Tester.h \
-  Multiple_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Multiple_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Collocation_Tester.cpp \
-  MultipleC.cpp \
-  MultipleS.cpp \
-  Multiple_Impl.cpp \
-  client.cpp \
-  Collocation_Tester.h \
-  Multiple_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index fff5e12d1e2..47b388a8e0f 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -1,32 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags += -Gd
-  IDL_Files {
-    Multiple.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Gd
 
   Source_Files {
     Multiple_Impl.cpp
     Collocation_Tester.cpp
     server.cpp
   }
-  Source_Files {
-     MultipleC.cpp    
-     MultipleS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoexe, portableserver {
-  after += *idl
+  idlflags += -Gd
   after += *Server
 
   Source_Files {
@@ -34,10 +20,5 @@ project(*Client): taoexe, portableserver {
     Collocation_Tester.cpp
     client.cpp
   }
-  Source_Files {
-     MultipleC.cpp    
-     MultipleS.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Multiple_Inheritance/.cvsignore b/TAO/tests/Multiple_Inheritance/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Multiple_Inheritance/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Multiple_Inheritance/Makefile.am b/TAO/tests/Multiple_Inheritance/Makefile.am
deleted file mode 100644
index f8a34582f24..00000000000
--- a/TAO/tests/Multiple_Inheritance/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Multiple_Inheritance_Idl.am
-
-BUILT_SOURCES = \
-  Multiple_InheritanceC.cpp \
-  Multiple_InheritanceC.h \
-  Multiple_InheritanceC.inl \
-  Multiple_InheritanceS.cpp \
-  Multiple_InheritanceS.h \
-  Multiple_InheritanceS.inl
-
-CLEANFILES = \
-  Multiple_Inheritance-stamp \
-  Multiple_InheritanceC.cpp \
-  Multiple_InheritanceC.h \
-  Multiple_InheritanceC.inl \
-  Multiple_InheritanceS.cpp \
-  Multiple_InheritanceS.h \
-  Multiple_InheritanceS.inl
-
-Multiple_InheritanceC.cpp Multiple_InheritanceC.h Multiple_InheritanceC.inl Multiple_InheritanceS.cpp Multiple_InheritanceS.h Multiple_InheritanceS.inl: Multiple_Inheritance-stamp
-
-Multiple_Inheritance-stamp: $(srcdir)/Multiple_Inheritance.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Multiple_Inheritance.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Multiple_Inheritance.idl
-
-## Makefile.Multiple_Inheritance_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Multiple_InheritanceC.cpp \
-  Multiple_InheritanceS.cpp \
-  server.cpp \
-  Multiple_Inheritance_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Multiple_Inheritance_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Multiple_InheritanceC.cpp \
-  client.cpp \
-  Multiple_Inheritance_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
index a045d5540d8..df5e183c1da 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
@@ -5,7 +5,7 @@ interface A
   string method1 ();
 };
 
-interface intB : A
+interface B : A
 {
   string method2 ();
 };
@@ -15,7 +15,7 @@ interface C : A
   string method3 ();
 };
 
-interface D : intB, C
+interface D : B, C
 {
   string method4 ();
 };
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index 7a02f54b12f..f818ca1c940 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Multiple_Inheritance.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, utils, avoids_corba_e_micro {
-  after += *idl
+project(*Server): taoserver, utils {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    Multiple_InheritanceC.cpp
-    Multiple_InheritanceS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     Multiple_InheritanceC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index ce7f8434a2f..8406386f614 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -114,7 +114,7 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Narrow the object reference
-      intB_var b = intB::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
+      B_var b = B::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference
diff --git a/TAO/tests/Muxed_GIOP_Versions/.cvsignore b/TAO/tests/Muxed_GIOP_Versions/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Muxed_GIOP_Versions/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Muxed_GIOP_Versions/Makefile.am b/TAO/tests/Muxed_GIOP_Versions/Makefile.am
deleted file mode 100644
index 62f1b5d76cb..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Muxed_GIOP_Versions_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Muxed_GIOP_Versions_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Muxed_GIOP_Versions_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
index 95c18b6becb..bfb96e8b536 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -1,37 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
     testC.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Muxing/.cvsignore b/TAO/tests/Muxing/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Muxing/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Muxing/Makefile.am b/TAO/tests/Muxing/Makefile.am
deleted file mode 100644
index 39d793b9b0a..00000000000
--- a/TAO/tests/Muxing/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Muxing_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Muxing_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Receiver.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Receiver.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Muxing_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index f920367a5b4..1d115e8dc19 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -1,38 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     Receiver.cpp
     Server_Task.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
+    TestC.cpp
     Client_Task.cpp
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index d1cd37643c1..6ffff418f91 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -5,10 +5,9 @@
 
 ACE_RCSID(Muxing, Receiver, "$Id$")
 
-Receiver::Receiver (CORBA::ORB_ptr orb)
+Receiver::Receiver (void)
   :  message_count_ (0)
   ,  byte_count_ (0)
-  , orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
@@ -40,10 +39,3 @@ Receiver::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
 }
-
-void
-Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index c297521ed30..d8db9cc926b 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -22,7 +22,7 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (CORBA::ORB_ptr orb);
+  Receiver (void);
 
   /// Print out the results
   void dump_results (void);
@@ -34,16 +34,10 @@ public:
   virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
 private:
   ACE_SYNCH_MUTEX mutex_;
   CORBA::ULong message_count_;
   CORBA::ULong byte_count_;
-  /// Use an ORB reference to shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index b0b3408f831..828f010158d 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -20,13 +20,8 @@ Server_Task::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-#if defined (ACE_OPENVMS)
-      // OpenVMS typically takes a lot longer...
-      ACE_Time_Value tv (360, 0);
-#else
       // run the test for at most 120 seconds...
       ACE_Time_Value tv (120, 0);
-#endif
       this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Muxing/Test.idl b/TAO/tests/Muxing/Test.idl
index af7010bd6c0..6a3b8921c78 100644
--- a/TAO/tests/Muxing/Test.idl
+++ b/TAO/tests/Muxing/Test.idl
@@ -12,8 +12,5 @@ module Test
 
     /// Return the number of messages received so far
     long get_event_count ();
-
-    /// A method to shutdown the ORB
-    oneway void shutdown ();
   };
 };
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e149b323d49..01e0b962d78 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -6,12 +6,11 @@
 ACE_RCSID(Muxing, client, "$Id$")
 
 const char *ior = "file://test.ior";
-bool shutdown_srv = false;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
+  ACE_Get_Opt get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -20,15 +19,11 @@ parse_args (int argc, char *argv[])
       case 'k':
         ior = get_opts.opt_arg ();
         break;
-      case 'x':
-        shutdown_srv = true;
-        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-                           "-k <ior> "
-                           "[-x]"
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
@@ -65,34 +60,24 @@ main (int argc, char *argv[])
                             1);
         }
 
-      if (shutdown_srv)
-        {
-          receiver->shutdown ();
-        }
-      else
+
+      Client_Task client_task (receiver.in (),
+                               1000,
+                               32768,
+                               ACE_Thread_Manager::instance ());
+
+      if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
         {
-        
-          Client_Task client_task (receiver.in (),
-#if defined (ACE_OPENVMS)
-                                  750, /* test takes much longer on OpenVMS */
-#else
-                                  1000,
-#endif
-                                  32768,
-                                  ACE_Thread_Manager::instance ());
-        
-          if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
-              {
-              ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
-              }
-          ACE_Thread_Manager::instance ()->wait ();
-        
-          CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        
-          ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
-                      count));
+          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
         }
+      ACE_Thread_Manager::instance ()->wait ();
+
+      CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
+                  count));
+
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Muxing/run_test.pl b/TAO/tests/Muxing/run_test.pl
index 4dd9dbdc537..32264a0bf51 100755
--- a/TAO/tests/Muxing/run_test.pl
+++ b/TAO/tests/Muxing/run_test.pl
@@ -23,7 +23,7 @@ $CL2 = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
@@ -32,31 +32,21 @@ if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_cr
 $CL1->Spawn (60);
 $CL2->Spawn (60);
 
-$max_wait = 60;
-if ($^O == 'VMS') {
-    $max_wait = 360;
-}
-
-$client1 = $CL1->WaitKill ($max_wait);
+$client1 = $CL1->WaitKill (60);
 
 if ($client1 != 0) {
     print STDERR "ERROR: client 1 returned $client1\n";
     $status = 1;
 }
 
-$client2 = $CL2->WaitKill ($max_wait);
+$client2 = $CL2->WaitKill (60);
 
 if ($client2 != 0) {
     print STDERR "ERROR: client 2 returned $client2\n";
     $status = 1;
 }
 
-# shutdown
-$CLx = new PerlACE::Process ("client", " -k file://$iorfile -x");
-$CLx->Spawn (60);
-$CLx->WaitKill (15);
-
-$server = $SV->WaitKill (15);
+$server = $SV->TerminateWaitKill (5);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index ad2a9a98241..06a120b2183 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
 
       Receiver *receiver_impl;
       ACE_NEW_RETURN (receiver_impl,
-                      Receiver (orb.in ()),
+                      Receiver,
                       1);
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
diff --git a/TAO/tests/Native_Exceptions/.cvsignore b/TAO/tests/Native_Exceptions/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Native_Exceptions/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Native_Exceptions/Makefile.am b/TAO/tests/Native_Exceptions/Makefile.am
deleted file mode 100644
index 6b5becb8e1c..00000000000
--- a/TAO/tests/Native_Exceptions/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Native_Exceptions_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Native_Exceptions_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Native_Exceptions_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index 98f1c7fa090..1b292027ede 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  Source_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, anytypecode {
-  after += *idl
+project(*Server): taoserver, anytypecode, exceptions {
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, anytypecode {
-  after += *idl
+project(*Client): taoclient, anytypecode, exceptions {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/.cvsignore b/TAO/tests/NestedUpcall/MT_Client_Test/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
index 954d4141fff..35e6a89edfd 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
@@ -1,39 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Nested_Upcall_Idl): taoidldefaults {
-  IDL_Files {
-    MT_Client_Test.idl
-  }
-  custom_only = 1
-}
-
-project(*Nested_Upcall_Server): taoserver, utils, avoids_corba_e_micro {
-  after += *Nested_Upcall_Idl
+project(*Nested_Upcall_Server): taoserver, utils {
   Source_Files {
     MT_Object_i.cpp
     server.cpp
   }
-  Source_Files {
-    MT_Client_TestC.cpp
-    MT_Client_TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Nested_Upcall_Client): taoexe, utils, portableserver, avoids_corba_e_micro {
-  after += *Nested_Upcall_Idl
+project(*Nested_Upcall_Client): taoexe, utils, portableserver {
   after += *Nested_Upcall_Server
   Source_Files {
     MT_Object_i.cpp
     local_server.cpp
     client.cpp
   }
-  Source_Files {
-    MT_Client_TestC.cpp
-    MT_Client_TestS.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am
deleted file mode 100644
index 4b7236d4dbb..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Client_Test_Nested_Upcall_Idl.am
-
-BUILT_SOURCES = \
-  MT_Client_TestC.cpp \
-  MT_Client_TestC.h \
-  MT_Client_TestC.inl \
-  MT_Client_TestS.cpp \
-  MT_Client_TestS.h \
-  MT_Client_TestS.inl
-
-CLEANFILES = \
-  MT_Client_Test-stamp \
-  MT_Client_TestC.cpp \
-  MT_Client_TestC.h \
-  MT_Client_TestC.inl \
-  MT_Client_TestS.cpp \
-  MT_Client_TestS.h \
-  MT_Client_TestS.inl
-
-MT_Client_TestC.cpp MT_Client_TestC.h MT_Client_TestC.inl MT_Client_TestS.cpp MT_Client_TestS.h MT_Client_TestS.inl: MT_Client_Test-stamp
-
-MT_Client_Test-stamp: $(srcdir)/MT_Client_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MT_Client_Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  MT_Client_Test.idl
-
-## Makefile.MT_Client_Test_Nested_Upcall_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  MT_Client_TestC.cpp \
-  MT_Client_TestS.cpp \
-  MT_Object_i.cpp \
-  server.cpp \
-  MT_Object_i.h \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_Client_Test_Nested_Upcall_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  MT_Client_TestC.cpp \
-  MT_Client_TestS.cpp \
-  MT_Object_i.cpp \
-  client.cpp \
-  local_server.cpp \
-  MT_Object_i.h \
-  client.h \
-  local_server.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/NestedUpcall/Makefile.am b/TAO/tests/NestedUpcall/Makefile.am
deleted file mode 100644
index 5cd4e889a89..00000000000
--- a/TAO/tests/NestedUpcall/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        MT_Client_Test \
-        Simple \
-        Triangle_Test
-
diff --git a/TAO/tests/NestedUpcall/Simple/.cvsignore b/TAO/tests/NestedUpcall/Simple/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Simple/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/NestedUpcall/Simple/Makefile.am b/TAO/tests/NestedUpcall/Simple/Makefile.am
deleted file mode 100644
index 70f7fc41fab..00000000000
--- a/TAO/tests/NestedUpcall/Simple/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Simple_Nested_Upcall_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Simple_Nested_Upcall_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  server_i.cpp \
-  testC.cpp \
-  testS.cpp \
-  server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Simple_Nested_Upcall_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  client_i.cpp \
-  testC.cpp \
-  testS.cpp \
-  client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc
index 06a89698d66..766f62db832 100644
--- a/TAO/tests/NestedUpcall/Simple/Simple.mpc
+++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc
@@ -1,38 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Nested_Upcall_Idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Nested_Upcall_Server): taoexe, portableserver {
-  after += *Nested_Upcall_Idl
   Source_Files {
     server_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Nested_Upcall_Client): taoexe, portableserver {
-  after += *Nested_Upcall_Idl
   after += *Nested_Upcall_Server
   Source_Files {
     client_i.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/.cvsignore b/TAO/tests/NestedUpcall/Triangle_Test/.cvsignore
new file mode 100644
index 00000000000..67a66b46f69
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Triangle_Test/.cvsignore
@@ -0,0 +1,3 @@
+initiator
+server_A
+server_B
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile.am b/TAO/tests/NestedUpcall/Triangle_Test/Makefile.am
deleted file mode 100644
index 34901f48553..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile.am
+++ /dev/null
@@ -1,148 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.TT_Nested_Upcall_Server_Idl.am
-
-BUILT_SOURCES = \
-  Triangle_TestC.cpp \
-  Triangle_TestC.h \
-  Triangle_TestC.inl \
-  Triangle_TestS.cpp \
-  Triangle_TestS.h \
-  Triangle_TestS.inl
-
-CLEANFILES = \
-  Triangle_Test-stamp \
-  Triangle_TestC.cpp \
-  Triangle_TestC.h \
-  Triangle_TestC.inl \
-  Triangle_TestS.cpp \
-  Triangle_TestS.h \
-  Triangle_TestS.inl
-
-Triangle_TestC.cpp Triangle_TestC.h Triangle_TestC.inl Triangle_TestS.cpp Triangle_TestS.h Triangle_TestS.inl: Triangle_Test-stamp
-
-Triangle_Test-stamp: $(srcdir)/Triangle_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Triangle_Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Triangle_Test.idl
-
-## Makefile.TT_Nested_Upcall_Initiator.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += initiator
-
-initiator_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-initiator_SOURCES = \
-  Initiator_i.cpp \
-  Triangle_TestC.cpp \
-  Triangle_TestS.cpp \
-  initiator.cpp \
-  Initiator_i.h \
-  initiator.h
-
-initiator_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.TT_Nested_Upcall_Server_A.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server_A
-
-server_A_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_A_SOURCES = \
-  Object_A_i.cpp \
-  Triangle_TestC.cpp \
-  Triangle_TestS.cpp \
-  server_A.cpp \
-  Object_A_i.h \
-  server_A.h
-
-server_A_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.TT_Nested_Upcall_Server_B.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server_B
-
-server_B_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_B_SOURCES = \
-  Object_B_i.cpp \
-  Triangle_TestC.cpp \
-  Triangle_TestS.cpp \
-  server_B.cpp \
-  Object_B_i.h \
-  server_B.h
-
-server_B_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
index 1bb97bfa9d3..e8b0864ecd5 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
+++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
@@ -1,52 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Nested_Upcall_Server_Idl): taoidldefaults {
-  IDL_Files {
-    Triangle_Test.idl
-  }
-  custom_only = 1
-}
-
-project(*Nested_Upcall_Server_A): taoexe, utils, portableserver, avoids_corba_e_micro {
-  after += *Nested_Upcall_Server_Idl
+project(*Nested_Upcall_Server_A): taoexe, utils, portableserver {
   Source_Files {
     Object_A_i.cpp
     server_A.cpp
   }
-  Source_Files {
-    Triangle_TestC.cpp
-    Triangle_TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Nested_Upcall_Server_B): taoexe, utils, portableserver, avoids_corba_e_micro {
-  after += *Nested_Upcall_Server_Idl
+project(*Nested_Upcall_Server_B): taoexe, utils, portableserver {
+  after += *Nested_Upcal_Server_A
   Source_Files {
     Object_B_i.cpp
     server_B.cpp
   }
-  Source_Files {
-    Triangle_TestC.cpp
-    Triangle_TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Nested_Upcall_Initiator): taoexe, utils, portableserver, avoids_corba_e_micro {
-  after += *Nested_Upcall_Server_Idl
+project(*Nested_Upcall_Initiator): taoexe, utils, portableserver {
+  after += *Nested_Upcall_Server_B
   Source_Files {
     Initiator_i.cpp
     initiator.cpp
   }
-  Source_Files {
-    Triangle_TestC.cpp
-    Triangle_TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Nested_Event_Loop/.cvsignore b/TAO/tests/Nested_Event_Loop/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Nested_Event_Loop/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Nested_Event_Loop/Makefile.am b/TAO/tests/Nested_Event_Loop/Makefile.am
deleted file mode 100644
index 98113306dc5..00000000000
--- a/TAO/tests/Nested_Event_Loop/Makefile.am
+++ /dev/null
@@ -1,111 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Nested_Event_Loop_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Nested_Event_Loop_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Nested_Event_Loop_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
index 73c8c902fc0..50ef58ea252 100644
--- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
+++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
@@ -1,38 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): strategies, taoexe, portableserver {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): strategies, taoexe, portableserver {
-  after += *idl
   after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Nested_Upcall_Crash/.cvsignore b/TAO/tests/Nested_Upcall_Crash/.cvsignore
new file mode 100644
index 00000000000..553990c9618
--- /dev/null
+++ b/TAO/tests/Nested_Upcall_Crash/.cvsignore
@@ -0,0 +1,3 @@
+client
+scavenger
+server
diff --git a/TAO/tests/Nested_Upcall_Crash/Makefile.am b/TAO/tests/Nested_Upcall_Crash/Makefile.am
deleted file mode 100644
index f8a95f21305..00000000000
--- a/TAO/tests/Nested_Upcall_Crash/Makefile.am
+++ /dev/null
@@ -1,159 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Nested_Upcall_Crash_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Nested_Upcall_Crash_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Clock_Ticks.cpp \
-  Server_Peer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Clock_Ticks.h \
-  Server_Peer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Nested_Upcall_Crash_Scavenger.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += scavenger
-
-scavenger_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-scavenger_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  scavenger.cpp \
-  Client_Peer.h \
-  Clock_Ticks.h \
-  Server_Peer.h
-
-scavenger_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Nested_Upcall_Crash_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Peer.cpp \
-  Clock_Ticks.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Peer.h \
-  Clock_Ticks.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
index a07b5d528e7..68469dc0fff 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -1,15 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   specific(bmake, borland, nmake, em3, vc6, vc71, vc8) {
     // Use a roughly 16MB stack to avoid stack overflow in this test
     StackReserveSize = 16000000
@@ -19,42 +11,23 @@ project(*Server): taoserver, messaging {
     Server_Peer.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Scavenger): taoserver, messaging {
   exename = scavenger
-  after += *idl
   after += *Server
   Source_Files {
     scavenger.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoserver, messaging {
   exename = client
-  after += *idl
   after += *Scavenger
   Source_Files {
     Clock_Ticks.cpp
     Client_Peer.cpp
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/No_Server_MT_Connect_Test/.cvsignore b/TAO/tests/No_Server_MT_Connect_Test/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/No_Server_MT_Connect_Test/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/No_Server_MT_Connect_Test/Makefile.am b/TAO/tests/No_Server_MT_Connect_Test/Makefile.am
deleted file mode 100644
index 599c26f9a46..00000000000
--- a/TAO/tests/No_Server_MT_Connect_Test/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.No_Server_Connect_Test_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.No_Server_Connect_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.No_Server_Connect_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
index aa28b25107f..bfb96e8b536 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
@@ -1,37 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/OBV/Any/.cvsignore b/TAO/tests/OBV/Any/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/OBV/Any/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/OBV/Any/Makefile.am b/TAO/tests/OBV/Any/Makefile.am
deleted file mode 100644
index ba5caa6ec5a..00000000000
--- a/TAO/tests/OBV/Any/Makefile.am
+++ /dev/null
@@ -1,112 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OBV_Any_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  AnyC.cpp \
-  AnyC.h \
-  AnyC.inl \
-  AnyS.cpp \
-  AnyS.h \
-  AnyS.inl
-
-CLEANFILES = \
-  Any-stamp \
-  AnyC.cpp \
-  AnyC.h \
-  AnyC.inl \
-  AnyS.cpp \
-  AnyS.h \
-  AnyS.inl
-
-AnyC.cpp AnyC.h AnyC.inl AnyS.cpp AnyS.h AnyS.inl: Any-stamp
-
-Any-stamp: $(srcdir)/Any.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Any.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Any.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Any_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  AnyC.cpp \
-  AnyS.cpp \
-  AnyS_impl.cpp \
-  server.cpp \
-  AnyS_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Any_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  AnyC.cpp \
-  client.cpp \
-  AnyS_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc
index f930c31a9d5..62083fb37f5 100644
--- a/TAO/tests/OBV/Any/OBV_Any.mpc
+++ b/TAO/tests/OBV/Any/OBV_Any.mpc
@@ -1,36 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, valuetype {
-  IDL_Files {
-    Any.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoexe, portableserver, valuetype {
-  after += *idl
   Source_Files {
     AnyS_impl.cpp
     server.cpp
   }
-  Source_Files {
-    AnyC.cpp
-    AnyS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoexe, valuetype {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     AnyC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/OBV/Collocated/Forward/.cvsignore b/TAO/tests/OBV/Collocated/Forward/.cvsignore
new file mode 100644
index 00000000000..9b04cc7c341
--- /dev/null
+++ b/TAO/tests/OBV/Collocated/Forward/.cvsignore
@@ -0,0 +1 @@
+collocated
diff --git a/TAO/tests/OBV/Collocated/Forward/Makefile.am b/TAO/tests/OBV/Collocated/Forward/Makefile.am
deleted file mode 100644
index 3342f2616ea..00000000000
--- a/TAO/tests/OBV/Collocated/Forward/Makefile.am
+++ /dev/null
@@ -1,145 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.OBV_Forward_Collocated.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TreeBaseC.cpp \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.cpp \
-  TreeBaseS.h \
-  TreeBaseS.inl
-
-CLEANFILES += \
-  TreeBase-stamp \
-  TreeBaseC.cpp \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.cpp \
-  TreeBaseS.h \
-  TreeBaseS.inl
-
-TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.cpp TreeBaseS.h TreeBaseS.inl: TreeBase-stamp
-
-TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TreeControllerC.cpp \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.cpp \
-  TreeControllerS.h \
-  TreeControllerS.inl
-
-CLEANFILES += \
-  TreeController-stamp \
-  TreeControllerC.cpp \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.cpp \
-  TreeControllerS.h \
-  TreeControllerS.inl
-
-TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.cpp TreeControllerS.h TreeControllerS.inl: TreeController-stamp
-
-TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-CLEANFILES += \
-  TreeNode-stamp \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp
-
-TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl
-	@touch $@
-
-noinst_PROGRAMS = collocated
-
-collocated_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-collocated_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Server_Task.cpp \
-  Test_impl.cpp \
-  TreeBaseC.cpp \
-  TreeBaseS.cpp \
-  TreeControllerC.cpp \
-  TreeControllerS.cpp \
-  TreeNodeC.cpp \
-  TreeNodeS.cpp \
-  Client_Task.h \
-  Server_Task.h \
-  Test_impl.h \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.h \
-  TreeBaseS.inl \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.h \
-  TreeControllerS.inl \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-collocated_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/OBV/Collocated/Makefile.am b/TAO/tests/OBV/Collocated/Makefile.am
deleted file mode 100644
index b00fc1a19f3..00000000000
--- a/TAO/tests/OBV/Collocated/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Forward
-
diff --git a/TAO/tests/OBV/Factory/.cvsignore b/TAO/tests/OBV/Factory/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/OBV/Factory/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/OBV/Factory/Makefile.am b/TAO/tests/OBV/Factory/Makefile.am
deleted file mode 100644
index 463ec0a7659..00000000000
--- a/TAO/tests/OBV/Factory/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OBV_Factory_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  FactoryC.cpp \
-  FactoryC.h \
-  FactoryC.inl \
-  FactoryS.cpp \
-  FactoryS.h \
-  FactoryS.inl
-
-CLEANFILES = \
-  Factory-stamp \
-  FactoryC.cpp \
-  FactoryC.h \
-  FactoryC.inl \
-  FactoryS.cpp \
-  FactoryS.h \
-  FactoryS.inl
-
-FactoryC.cpp FactoryC.h FactoryC.inl FactoryS.cpp FactoryS.h FactoryS.inl: Factory-stamp
-
-Factory-stamp: $(srcdir)/Factory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Factory.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Factory.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Factory_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  FactoryC.cpp \
-  FactoryC_impl.cpp \
-  FactoryS.cpp \
-  FactoryS_impl.cpp \
-  server.cpp \
-  FactoryC_impl.h \
-  FactoryS_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Factory_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  FactoryC.cpp \
-  FactoryC_impl.cpp \
-  client.cpp \
-  FactoryC_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc
index b12ca4f383f..e257b945987 100644
--- a/TAO/tests/OBV/Factory/OBV_Factory.mpc
+++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc
@@ -1,38 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, valuetype {
-  IDL_Files {
-    Factory.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, valuetype {
-  after += *idl
   Source_Files {
     FactoryC_impl.cpp
     FactoryS_impl.cpp
     server.cpp
   }
-  Source_Files {
-    FactoryC.cpp
-    FactoryS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, valuetype {
-  after += *idl
   after += *Server
   Source_Files {
+    FactoryC.cpp
     FactoryC_impl.cpp
     client.cpp
   }
-  Source_Files {
-    FactoryC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/OBV/Forward/.cvsignore b/TAO/tests/OBV/Forward/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/OBV/Forward/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/OBV/Forward/Makefile.am b/TAO/tests/OBV/Forward/Makefile.am
deleted file mode 100644
index f76f3d922b3..00000000000
--- a/TAO/tests/OBV/Forward/Makefile.am
+++ /dev/null
@@ -1,168 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.OBV_Forward_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TreeBaseC.cpp \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.cpp \
-  TreeBaseS.h \
-  TreeBaseS.inl
-
-CLEANFILES += \
-  TreeBase-stamp \
-  TreeBaseC.cpp \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.cpp \
-  TreeBaseS.h \
-  TreeBaseS.inl
-
-TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.cpp TreeBaseS.h TreeBaseS.inl: TreeBase-stamp
-
-TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TreeControllerC.cpp \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.cpp \
-  TreeControllerS.h \
-  TreeControllerS.inl
-
-CLEANFILES += \
-  TreeController-stamp \
-  TreeControllerC.cpp \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.cpp \
-  TreeControllerS.h \
-  TreeControllerS.inl
-
-TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.cpp TreeControllerS.h TreeControllerS.inl: TreeController-stamp
-
-TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-CLEANFILES += \
-  TreeNode-stamp \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp
-
-TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl
-	@touch $@
-
-noinst_HEADERS = \
-  TreeBase.idl \
-  TreeController.idl \
-  TreeNode.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Forward_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Test_impl.cpp \
-  TreeBaseC.cpp \
-  TreeBaseS.cpp \
-  TreeControllerC.cpp \
-  TreeControllerS.cpp \
-  TreeNodeC.cpp \
-  TreeNodeS.cpp \
-  server.cpp \
-  Test_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Forward_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TreeBaseC.cpp \
-  TreeControllerC.cpp \
-  TreeNodeC.cpp \
-  client.cpp \
-  Test_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc
index 5068a915e27..ee6e2623910 100644
--- a/TAO/tests/OBV/Forward/OBV_Forward.mpc
+++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc
@@ -1,44 +1,25 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, valuetype {
+project(*Server): taoserver, valuetype {
   IDL_Files {
     TreeBase.idl
     TreeController.idl
     TreeNode.idl
   }
-  custom_only = 1
-}
-
-project(*Server): taoserver, valuetype {
-  after += *idl
   Source_Files {
     Test_impl.cpp
     server.cpp
   }
-  Source_Files {
-    TreeBaseC.cpp
-    TreeBaseS.cpp
-    TreeControllerC.cpp
-    TreeControllerS.cpp
-    TreeNodeC.cpp
-    TreeNodeS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, valuetype {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TreeBaseC.cpp
     TreeControllerC.cpp
     TreeNodeC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/OBV/Makefile.am b/TAO/tests/OBV/Makefile.am
deleted file mode 100644
index 4e18d90f362..00000000000
--- a/TAO/tests/OBV/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Any \
-        Collocated \
-        Factory \
-        Forward \
-        Simple \
-        TC_Alignment \
-        Truncatable \
-        ValueBox
-
diff --git a/TAO/tests/OBV/Simple/Makefile.am b/TAO/tests/OBV/Simple/Makefile.am
deleted file mode 100644
index 33f001ede17..00000000000
--- a/TAO/tests/OBV/Simple/Makefile.am
+++ /dev/null
@@ -1,121 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OBV_Simple_IDL.am
-
-BUILT_SOURCES = \
-  OBVC.cpp \
-  OBVC.h \
-  OBVC.inl \
-  OBVS.cpp \
-  OBVS.h \
-  OBVS.inl
-
-CLEANFILES = \
-  OBV-stamp \
-  OBVC.cpp \
-  OBVC.h \
-  OBVC.inl \
-  OBVS.cpp \
-  OBVS.h \
-  OBVS.inl
-
-OBVC.cpp OBVC.h OBVC.inl OBVS.cpp OBVS.h OBVS.inl: OBV-stamp
-
-OBV-stamp: $(srcdir)/OBV.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/OBV.idl
-	@touch $@
-
-noinst_HEADERS = \
-  OBV.idl
-
-## Makefile.OBV_Simple_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_i.cpp \
-  OBVC.cpp \
-  OBVS.cpp \
-  OBV_impl.cpp \
-  client.cpp \
-  Client_i.h \
-  OBV_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Simple_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  OBVC.cpp \
-  OBVS.cpp \
-  OBV_impl.cpp \
-  Server_i.cpp \
-  server.cpp \
-  OBV_impl.h \
-  Server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/OBV/Simple/OBV_Simple.mpc b/TAO/tests/OBV/Simple/OBV_Simple.mpc
index 661a72fb220..f8c08720d20 100644
--- a/TAO/tests/OBV/Simple/OBV_Simple.mpc
+++ b/TAO/tests/OBV/Simple/OBV_Simple.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*IDL): taoidldefaults {
-  idlflags -= -St
   IDL_Files {
     OBV.idl
   }
diff --git a/TAO/tests/OBV/TC_Alignment/.cvsignore b/TAO/tests/OBV/TC_Alignment/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/OBV/TC_Alignment/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/OBV/TC_Alignment/Makefile.am b/TAO/tests/OBV/TC_Alignment/Makefile.am
deleted file mode 100644
index 1b21e048ad5..00000000000
--- a/TAO/tests/OBV/TC_Alignment/Makefile.am
+++ /dev/null
@@ -1,112 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OBV_TC_Alignment_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_TC_Alignment_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_TC_Alignment_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
index 27e71e69ea6..f9e3d32dc18 100644
--- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
+++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
@@ -1,36 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, valuetype {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, valuetype {
-  after += *idl
   Source_Files {
+    testS.cpp
+    testC.cpp
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, valuetype {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/OBV/Truncatable/Makefile.am b/TAO/tests/OBV/Truncatable/Makefile.am
deleted file mode 100644
index 97cbaf84abd..00000000000
--- a/TAO/tests/OBV/Truncatable/Makefile.am
+++ /dev/null
@@ -1,141 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.OBV_Truncatable_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  ExtraC.cpp \
-  ExtraC.h \
-  ExtraC.inl \
-  ExtraS.cpp \
-  ExtraS.h \
-  ExtraS.inl
-
-CLEANFILES += \
-  Extra-stamp \
-  ExtraC.cpp \
-  ExtraC.h \
-  ExtraC.inl \
-  ExtraS.cpp \
-  ExtraS.h \
-  ExtraS.inl
-
-ExtraC.cpp ExtraC.h ExtraC.inl ExtraS.cpp ExtraS.h ExtraS.inl: Extra-stamp
-
-Extra-stamp: $(srcdir)/Extra.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Extra.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TruncatableC.cpp \
-  TruncatableC.h \
-  TruncatableC.inl \
-  TruncatableS.cpp \
-  TruncatableS.h \
-  TruncatableS.inl
-
-CLEANFILES += \
-  Truncatable-stamp \
-  TruncatableC.cpp \
-  TruncatableC.h \
-  TruncatableC.inl \
-  TruncatableS.cpp \
-  TruncatableS.h \
-  TruncatableS.inl
-
-TruncatableC.cpp TruncatableC.h TruncatableC.inl TruncatableS.cpp TruncatableS.h TruncatableS.inl: Truncatable-stamp
-
-Truncatable-stamp: $(srcdir)/Truncatable.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Truncatable.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Extra.idl \
-  Truncatable.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Truncatable_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ExtraC.cpp \
-  ExtraS.cpp \
-  TruncatableC.cpp \
-  TruncatableS.cpp \
-  TruncatableS_impl.cpp \
-  server.cpp \
-  TruncatableS_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Truncatable_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ExtraC.cpp \
-  TruncatableC.cpp \
-  client.cpp \
-  TruncatableS_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
index 9d26a4b386b..1dbf29bc7f6 100644
--- a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
+++ b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
@@ -1,40 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, valuetype {
-  IDL_Files {
-    Extra.idl
-    Truncatable.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoexe, portableserver, valuetype {
-  after += *idl
   Source_Files {
     TruncatableS_impl.cpp
     server.cpp
   }
-  Source_Files {
-    ExtraC.cpp
-    ExtraS.cpp
-    TruncatableC.cpp
-    TruncatableS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoexe, valuetype {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     ExtraC.cpp
     TruncatableC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index 4f75c2cd7c8..c372ce85579 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -12,10 +12,6 @@ int fail = 0;
 int pretest = 0;
 int verbose = 0;
 
-#if defined (VERIFY)
-#undef VERIFY
-#endif /* VERIFY */
-
 #define VERIFY(Condition) \
 { \
     if ((Condition)==0) \
diff --git a/TAO/tests/OBV/ValueBox/Makefile.am b/TAO/tests/OBV/ValueBox/Makefile.am
deleted file mode 100644
index 4f382b3ec31..00000000000
--- a/TAO/tests/OBV/ValueBox/Makefile.am
+++ /dev/null
@@ -1,195 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.valuebox_idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  vb_basicC.cpp \
-  vb_basicC.h \
-  vb_basicC.inl \
-  vb_basicS.cpp \
-  vb_basicS.h \
-  vb_basicS.inl
-
-CLEANFILES += \
-  vb_basic-stamp \
-  vb_basicC.cpp \
-  vb_basicC.h \
-  vb_basicC.inl \
-  vb_basicS.cpp \
-  vb_basicS.h \
-  vb_basicS.inl
-
-vb_basicC.cpp vb_basicC.h vb_basicC.inl vb_basicS.cpp vb_basicS.h vb_basicS.inl: vb_basic-stamp
-
-vb_basic-stamp: $(srcdir)/vb_basic.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_basic.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  vb_structC.cpp \
-  vb_structC.h \
-  vb_structC.inl \
-  vb_structS.cpp \
-  vb_structS.h \
-  vb_structS.inl
-
-CLEANFILES += \
-  vb_struct-stamp \
-  vb_structC.cpp \
-  vb_structC.h \
-  vb_structC.inl \
-  vb_structS.cpp \
-  vb_structS.h \
-  vb_structS.inl
-
-vb_structC.cpp vb_structC.h vb_structC.inl vb_structS.cpp vb_structS.h vb_structS.inl: vb_struct-stamp
-
-vb_struct-stamp: $(srcdir)/vb_struct.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_struct.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  vb_unionC.cpp \
-  vb_unionC.h \
-  vb_unionC.inl \
-  vb_unionS.cpp \
-  vb_unionS.h \
-  vb_unionS.inl
-
-CLEANFILES += \
-  vb_union-stamp \
-  vb_unionC.cpp \
-  vb_unionC.h \
-  vb_unionC.inl \
-  vb_unionS.cpp \
-  vb_unionS.h \
-  vb_unionS.inl
-
-vb_unionC.cpp vb_unionC.h vb_unionC.inl vb_unionS.cpp vb_unionS.h vb_unionS.inl: vb_union-stamp
-
-vb_union-stamp: $(srcdir)/vb_union.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_union.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  valueboxC.cpp \
-  valueboxC.h \
-  valueboxC.inl \
-  valueboxS.cpp \
-  valueboxS.h \
-  valueboxS.inl
-
-CLEANFILES += \
-  valuebox-stamp \
-  valueboxC.cpp \
-  valueboxC.h \
-  valueboxC.inl \
-  valueboxS.cpp \
-  valueboxS.h \
-  valueboxS.inl
-
-valueboxC.cpp valueboxC.h valueboxC.inl valueboxS.cpp valueboxS.h valueboxS.inl: valuebox-stamp
-
-valuebox-stamp: $(srcdir)/valuebox.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/valuebox.idl
-	@touch $@
-
-noinst_HEADERS = \
-  valuebox.idl \
-  vb_basic.idl \
-  vb_struct.idl \
-  vb_union.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Valuebox_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Test_impl.cpp \
-  server.cpp \
-  valueboxC.cpp \
-  valueboxS.cpp \
-  vb_basicC.cpp \
-  vb_basicS.cpp \
-  vb_structC.cpp \
-  vb_structS.cpp \
-  vb_unionC.cpp \
-  vb_unionS.cpp \
-  Test_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Valuebox_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  valueboxC.cpp \
-  vb_basicC.cpp \
-  vb_structC.cpp \
-  vb_unionC.cpp \
-  Test_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index bc264fa3110..12a3eb2bbd9 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
 }
 
 
-#define OBV_VERITY(Condition) \
+#define VERIFY(Condition) \
 { \
     if ((Condition)==0) \
     { \
@@ -62,36 +62,36 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
                     1);
 
     // should be a deep copy of val1...
-    OBV_VERITY ( &valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout () );
+    VERIFY ( &valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout () );
 
     // but values should be equal
-    OBV_VERITY ( valuebox_clone->_value () == valuebox->_value () );
+    VERIFY ( valuebox_clone->_value () == valuebox->_value () );
 
     // Check that modifier is working.
     valuebox_clone->_value ( val2 );
-    OBV_VERITY ( valuebox_clone->_value () != valuebox->_value () );
+    VERIFY ( valuebox_clone->_value () != valuebox->_value () );
 
     // use operator=
     *valuebox = val2;
-    OBV_VERITY ( valuebox_clone->_value () == valuebox->_value () );
+    VERIFY ( valuebox_clone->_value () == valuebox->_value () );
 
     // Check that _value and _boxed_in are the same.
-    OBV_VERITY ( valuebox_clone->_value () == valuebox_clone->_boxed_in () );
-    OBV_VERITY ( valuebox->_value () == valuebox->_boxed_in () );
+    VERIFY ( valuebox_clone->_value () == valuebox_clone->_boxed_in () );
+    VERIFY ( valuebox->_value () == valuebox->_boxed_in () );
 
     // Used _boxed_inout to change the value
-    OBV_VERITY ( valuebox->_value () != val1 );
+    VERIFY ( valuebox->_value () != val1 );
     valuebox->_boxed_inout () = val1;
-    OBV_VERITY ( valuebox->_value () == val1 );
+    VERIFY ( valuebox->_value () == val1 );
 
     // Use _boxed_out to access the value
-    OBV_VERITY ( valuebox_clone->_value () != val1 );
+    VERIFY ( valuebox_clone->_value () != val1 );
     valuebox_clone->_boxed_out () = val1;
-    OBV_VERITY ( valuebox_clone->_value () == val1 );
+    VERIFY ( valuebox_clone->_value () == val1 );
 
     // Test _copy_value
     CORBA::ValueBase *copy = valuebox->_copy_value ();
-    OBV_VERITY ( copy != 0 );
+    VERIFY ( copy != 0 );
     // check add_ref, remove_ref
     copy->_add_ref ();
     copy->_remove_ref ();
@@ -105,10 +105,10 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
       }
     else
       {
-        OBV_VERITY ( down->_value () == val1 );
+        VERIFY ( down->_value () == val1 );
         down->_value ( val2 );
-        OBV_VERITY ( down->_value () != valuebox->_value () );
-         OBV_VERITY ( down->_value () == val2 );
+        VERIFY ( down->_value () != valuebox->_value () );
+         VERIFY ( down->_value () == val2 );
       }
 
     CORBA::remove_ref (copy);
@@ -148,13 +148,13 @@ int box_test_ref (BoxT *valuebox, UT &val1, UT &val2)
                     1);
 
     // should be a deep copy of val1...
-    OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
+    VERIFY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
 
     p->_value ( val2 ); // deep copy
-    OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
+    VERIFY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
 
     *valuebox = val2;      // deep copy, too.
-    OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
+    VERIFY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
 
     CORBA::remove_ref (p);
 
@@ -287,16 +287,16 @@ int test_basic_invocations (Test * test_object)
                         1);
         VBlong *p3;
 
-        OBV_VERITY (p1->_value () == 25);
-        OBV_VERITY (p2->_value () == 53);
+        VERIFY (p1->_value () == 25);
+        VERIFY (p2->_value () == 53);
 
         VBlong_var result =
           test_object->basic_op1(p1, p2, p3);
         ACE_TRY_CHECK;
 
-        OBV_VERITY (p2->_value () == (53*3));
-        OBV_VERITY (p3->_value () == (53*5));
-        OBV_VERITY (result->_value () == (p1->_value () *3));
+        VERIFY (p2->_value () == (53*3));
+        VERIFY (p3->_value () == (53*5));
+        VERIFY (result->_value () == (p1->_value () *3));
 
         //============================================================
         // Test method invocation with boxed value from nested module
@@ -314,16 +314,16 @@ int test_basic_invocations (Test * test_object)
 
         vb_basic::M_VBlong *mp3;
 
-        OBV_VERITY (mp1->_value () == 25);
-        OBV_VERITY (mp2->_value () == 53);
+        VERIFY (mp1->_value () == 25);
+        VERIFY (mp2->_value () == 53);
 
         vb_basic::M_VBlong_var mresult =
           test_object->basic_op2(mp1, mp2, mp3);
         ACE_TRY_CHECK;
 
-        OBV_VERITY (mp2->_value () == (53*3));
-        OBV_VERITY (mp3->_value () == (53*5));
-        OBV_VERITY (mresult->_value () == (mp1->_value () *3));
+        VERIFY (mp2->_value () == (53*3));
+        VERIFY (mp3->_value () == (53*5));
+        VERIFY (mresult->_value () == (mp1->_value () *3));
 
         //============================================================
         // Test _boxed_in(), _boxed_inout(), and _boxed_out())
@@ -337,9 +337,9 @@ int test_basic_invocations (Test * test_object)
                                  p3->_boxed_out());
         ACE_TRY_CHECK;
 
-        OBV_VERITY (p2->_value () == (93*3));
-        OBV_VERITY (p3->_value () == (93*5));
-        OBV_VERITY (lresult == (p1->_value()*3));
+        VERIFY (p2->_value () == (93*3));
+        VERIFY (p3->_value () == (93*5));
+        VERIFY (lresult == (p1->_value()*3));
 
         p1->_remove_ref ();
         p2->_remove_ref ();
@@ -373,9 +373,9 @@ int test_boxed_string()
   const char *string2 = "Second-string";
 
   // Establish that we have data setup correctly...
-  OBV_VERITY (strcmp (string1, string2) <  0);
-  OBV_VERITY (strcmp (string2, string1) >  0);
-  OBV_VERITY (strcmp (string1, string1) == 0);
+  VERIFY (strcmp (string1, string2) <  0);
+  VERIFY (strcmp (string2, string1) >  0);
+  VERIFY (strcmp (string1, string1) == 0);
 
   // Make some objects, using our data
   VBstring *temp = 0;
@@ -389,8 +389,8 @@ int test_boxed_string()
                   VBstring(string1), // tests const char * ctor.
                   1);
 
-  OBV_VERITY (strcmp (vbstring1->_value(), string1) == 0);
-  OBV_VERITY (strcmp (vbstring2->_value(), string1) == 0);
+  VERIFY (strcmp (vbstring1->_value(), string1) == 0);
+  VERIFY (strcmp (vbstring2->_value(), string1) == 0);
 
   // Test assignment operators
   char *carray1 = 0;
@@ -399,12 +399,12 @@ int test_boxed_string()
                   1);
   memcpy(carray1, string2, strlen(string2));
   *vbstring2 = carray1;              // char * (adopted by box)
-  OBV_VERITY ((*vbstring2)[0] == 'S');
+  VERIFY ((*vbstring2)[0] == 'S');
   *vbstring2 = string1;
-  OBV_VERITY ((*vbstring2)[0] == 'F');
+  VERIFY ((*vbstring2)[0] == 'F');
   CORBA::String_var svar(string2);
   *vbstring2 = svar;
-  OBV_VERITY ((*vbstring2)[0] == 'S');
+  VERIFY ((*vbstring2)[0] == 'S');
 
   // Test _value modifiers--like assignment drill above.
   char *carray2 = 0;
@@ -413,15 +413,15 @@ int test_boxed_string()
                   1);
   memcpy(carray2, string1, strlen(string1));
   vbstring2->_value(carray2);        // char * (adopted by box)
-  OBV_VERITY ((*vbstring2)[0] == 'F');
+  VERIFY ((*vbstring2)[0] == 'F');
   vbstring2->_value(string2);       // const char *
-  OBV_VERITY ((*vbstring2)[0] == 'S');
+  VERIFY ((*vbstring2)[0] == 'S');
   (*vbstring2)[0] = 'Y';
-  OBV_VERITY ((*vbstring2)[0] != 'S');
+  VERIFY ((*vbstring2)[0] != 'S');
   vbstring2->_value(svar);
-  OBV_VERITY ((*vbstring2)[0] == 'S');
+  VERIFY ((*vbstring2)[0] == 'S');
   // test value accessor
-  OBV_VERITY ( (vbstring2->_value())[0] == 'S' );
+  VERIFY ( (vbstring2->_value())[0] == 'S' );
 
   //
   // Test ctors.
@@ -430,9 +430,9 @@ int test_boxed_string()
   ACE_NEW_RETURN (vbstring3,
                   VBstring(*vbstring2),
                   1);
-  OBV_VERITY ((*vbstring3)[0] == 'S');
+  VERIFY ((*vbstring3)[0] == 'S');
   (*vbstring3)[0] = 'W';
-  OBV_VERITY ((*vbstring3)[0] == 'W' && (*vbstring2)[0] == 'S');
+  VERIFY ((*vbstring3)[0] == 'W' && (*vbstring2)[0] == 'S');
   vbstring3->_remove_ref ();
 
   //
@@ -446,7 +446,7 @@ int test_boxed_string()
   ACE_NEW_RETURN (vbstring4,
                   VBstring(carray3),
                   1);
-  OBV_VERITY ((*vbstring4)[0] == 'F');
+  VERIFY ((*vbstring4)[0] == 'F');
   vbstring4->_remove_ref ();
 
   //
@@ -455,9 +455,9 @@ int test_boxed_string()
   ACE_NEW_RETURN (vbstring5,
                   VBstring(svar),
                   1);
-  OBV_VERITY ((*vbstring5)[0] == 'S');
+  VERIFY ((*vbstring5)[0] == 'S');
   (*vbstring5)[0] = 'W';
-  OBV_VERITY ((*vbstring5)[0] == 'W' && (svar.in())[0] == 'S');
+  VERIFY ((*vbstring5)[0] == 'W' && (svar.in())[0] == 'S');
   vbstring5->_remove_ref ();
 
   // release, as usual
@@ -487,15 +487,15 @@ int test_boxed_string_invocations (Test * test_object)
                         1);
         VBstring *p3 = 0;
 
-        OBV_VERITY (strcmp(p1->_value (), "string1") == 0);
-        OBV_VERITY (strcmp(p2->_value (), "string2") == 0);
+        VERIFY (strcmp(p1->_value (), "string1") == 0);
+        VERIFY (strcmp(p2->_value (), "string2") == 0);
 
         VBstring_var result = test_object->string_op1(p1, p2, p3);
         ACE_TRY_CHECK;
 
-        OBV_VERITY (strcmp(p2->_value (), "2string") == 0);
-        OBV_VERITY (strcmp(p3->_value (), "2string") == 0);
-        OBV_VERITY (strcmp(result->_value (), "1string") == 0);
+        VERIFY (strcmp(p2->_value (), "2string") == 0);
+        VERIFY (strcmp(p3->_value (), "2string") == 0);
+        VERIFY (strcmp(result->_value (), "1string") == 0);
 
         //============================================================
         // Test _boxed_in(), _boxed_inout(), and _boxed_out())
@@ -508,9 +508,9 @@ int test_boxed_string_invocations (Test * test_object)
                                   p3->_boxed_out());
         ACE_TRY_CHECK;
 
-        OBV_VERITY (strcmp(p2->_value (), "2second string") == 0);
-        OBV_VERITY (strcmp(p3->_value (), "2second string") == 0);
-        OBV_VERITY (strcmp(sresult.in (), "1string") == 0);
+        VERIFY (strcmp(p2->_value (), "2second string") == 0);
+        VERIFY (strcmp(p3->_value (), "2second string") == 0);
+        VERIFY (strcmp(sresult.in (), "1string") == 0);
 
         p1->_remove_ref ();
         p2->_remove_ref ();
@@ -551,8 +551,8 @@ int test_boxed_sequence (void)
                   1);
 
   VBseqlong_var  vbseqlong2 (temp);
-  OBV_VERITY (vbseqlong1->length() == 0);
-  OBV_VERITY (vbseqlong2->length() == 0);
+  VERIFY (vbseqlong1->length() == 0);
+  VERIFY (vbseqlong2->length() == 0);
   CORBA::Long *longarray = 0;
   ACE_NEW_RETURN (longarray,
                   CORBA::Long[3],
@@ -567,7 +567,7 @@ int test_boxed_sequence (void)
                   TDseqlong(10, 3, longarray, 1),
                   1);
   TDseqlong_var seqlong1 (temp2);
-  OBV_VERITY (seqlong1[0] == 101 && seqlong1[2] == 303);
+  VERIFY (seqlong1[0] == 101 && seqlong1[2] == 303);
 
   VBseqlong *vbseqlong3 = 0;
   ACE_NEW_RETURN (vbseqlong3,
@@ -582,18 +582,18 @@ int test_boxed_sequence (void)
 
   // Test assignment and subscript operators
   vbseqlong2 = vbseqlong3;
-  OBV_VERITY (vbseqlong2->length() == 3);
+  VERIFY (vbseqlong2->length() == 3);
   VBseqlong &vbseqlong5 = *vbseqlong2.inout();
-  OBV_VERITY (vbseqlong5[2] == 303);
+  VERIFY (vbseqlong5[2] == 303);
   vbseqlong5[2] = 444;
-  OBV_VERITY (vbseqlong5[2] == 444);
-  OBV_VERITY (seqlong1[0] == 101 && seqlong1[2] == 303);
-  OBV_VERITY ((*vbseqlong4)[0] == 101 && (*vbseqlong4)[2] == 303);
+  VERIFY (vbseqlong5[2] == 444);
+  VERIFY (seqlong1[0] == 101 && seqlong1[2] == 303);
+  VERIFY ((*vbseqlong4)[0] == 101 && (*vbseqlong4)[2] == 303);
   seqlong1[0] = 111;
-  OBV_VERITY ((*vbseqlong4)[0] == 111);
-  OBV_VERITY (vbseqlong4->maximum() == 10);
+  VERIFY ((*vbseqlong4)[0] == 111);
+  VERIFY (vbseqlong4->maximum() == 10);
   *vbseqlong4 = vbseqlong1->_value();
-  OBV_VERITY (vbseqlong4->length() == 0);
+  VERIFY (vbseqlong4->length() == 0);
 
   // Test copy_value
   VBseqlong *vbseqlong6 = VBseqlong::_downcast( vbseqlong4->_copy_value() );
@@ -604,7 +604,7 @@ int test_boxed_sequence (void)
     }
   else
     {
-      OBV_VERITY (vbseqlong6->length() == 0);
+      VERIFY (vbseqlong6->length() == 0);
       vbseqlong6->_remove_ref ();
     }
 
@@ -649,24 +649,24 @@ int test_boxed_sequence_invocations (Test * test_object)
         (*p2)[1] = 99;
         (*p2)[2] = 98;
 
-        OBV_VERITY ((*p1)[0] == 10);
-        OBV_VERITY ((*p1)[1] ==  9);
-        OBV_VERITY ((*p1)[2] ==  8);
-        OBV_VERITY ((*p1)[3] ==  7);
+        VERIFY ((*p1)[0] == 10);
+        VERIFY ((*p1)[1] ==  9);
+        VERIFY ((*p1)[2] ==  8);
+        VERIFY ((*p1)[3] ==  7);
 
         VBseqlong_var result = test_object->seq_op1(p1, p2, p3);
         ACE_TRY_CHECK;
 
-        OBV_VERITY ((*p2)[0] == 100*3);
-        OBV_VERITY ((*p2)[1] == 99*3);
-        OBV_VERITY ((*p2)[2] == 98*3);
-        OBV_VERITY ((*p3)[0] == 100*5);
-        OBV_VERITY ((*p3)[1] == 99*5);
-        OBV_VERITY ((*p3)[2] == 98*5);
-        OBV_VERITY ((*result.in ())[0] == 10);
-        OBV_VERITY ((*result.in ())[1] ==  9);
-        OBV_VERITY ((*result.in ())[2] ==  8);
-        OBV_VERITY ((*result.in ())[3] ==  7);
+        VERIFY ((*p2)[0] == 100*3);
+        VERIFY ((*p2)[1] == 99*3);
+        VERIFY ((*p2)[2] == 98*3);
+        VERIFY ((*p3)[0] == 100*5);
+        VERIFY ((*p3)[1] == 99*5);
+        VERIFY ((*p3)[2] == 98*5);
+        VERIFY ((*result.in ())[0] == 10);
+        VERIFY ((*result.in ())[1] ==  9);
+        VERIFY ((*result.in ())[2] ==  8);
+        VERIFY ((*result.in ())[3] ==  7);
 
         //============================================================
         // Test _boxed_in(), _boxed_inout(), and _boxed_out())
@@ -676,13 +676,13 @@ int test_boxed_sequence_invocations (Test * test_object)
                              p3->_boxed_out());
         ACE_TRY_CHECK;
 
-        OBV_VERITY ((*p2)[0] == 100*3*3);
-        OBV_VERITY ((*p2)[1] == 99*3*3);
-        OBV_VERITY ((*p2)[2] == 98*3*3);
-        OBV_VERITY ((*p3)[0] == (*p1)[0]*5);
-        OBV_VERITY ((*p3)[1] == (*p1)[1]*5);
-        OBV_VERITY ((*p3)[2] == (*p1)[2]*5);
-        OBV_VERITY ((*p3)[3] == (*p1)[3]*5);
+        VERIFY ((*p2)[0] == 100*3*3);
+        VERIFY ((*p2)[1] == 99*3*3);
+        VERIFY ((*p2)[2] == 98*3*3);
+        VERIFY ((*p3)[0] == (*p1)[0]*5);
+        VERIFY ((*p3)[1] == (*p1)[1]*5);
+        VERIFY ((*p3)[2] == (*p1)[2]*5);
+        VERIFY ((*p3)[3] == (*p1)[3]*5);
 
         p1->_remove_ref ();
         p2->_remove_ref ();
@@ -735,19 +735,19 @@ int test_boxed_struct (void)
                     1);
     VBfixed_struct1_var valuebox2 = valuebox2_ptr;
 
-    OBV_VERITY (valuebox1->l () == valuebox2->l ());
-    OBV_VERITY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1 );
-    OBV_VERITY ((valuebox1->abstruct ()).s2 == (valuebox2->abstruct ()).s2 );
+    VERIFY (valuebox1->l () == valuebox2->l ());
+    VERIFY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1 );
+    VERIFY ((valuebox1->abstruct ()).s2 == (valuebox2->abstruct ()).s2 );
 
     // Change an element
     valuebox1->l (505);
-    OBV_VERITY (valuebox1->l () != valuebox2->l ());
+    VERIFY (valuebox1->l () != valuebox2->l ());
 
     // Change some more, to test other types.
     (valuebox2->abstruct ()).s1 = 667;
-    OBV_VERITY ((valuebox1->abstruct ()).s1 != (valuebox2->abstruct ()).s1 );
+    VERIFY ((valuebox1->abstruct ()).s1 != (valuebox2->abstruct ()).s1 );
     (valuebox2->abstruct ()).s2 = 1667;
-    OBV_VERITY ((valuebox1->abstruct ()).s2 != (valuebox2->abstruct ()).s2 );
+    VERIFY ((valuebox1->abstruct ()).s2 != (valuebox2->abstruct ()).s2 );
 
     Fixed_Struct1 *fixed_struct_b = 0;
     ACE_NEW_RETURN (fixed_struct_b,
@@ -766,15 +766,15 @@ int test_boxed_struct (void)
     // Test assignment operator
     *valuebox3 = *fixed_struct_b;
 
-    OBV_VERITY (valuebox3->l () == fixed_struct_b->l);
-    OBV_VERITY ((valuebox3->abstruct ()).s1 == fixed_struct_b->abstruct.s1);
-    OBV_VERITY ((valuebox3->abstruct ()).s2 == fixed_struct_b->abstruct.s2);
+    VERIFY (valuebox3->l () == fixed_struct_b->l);
+    VERIFY ((valuebox3->abstruct ()).s1 == fixed_struct_b->abstruct.s1);
+    VERIFY ((valuebox3->abstruct ()).s2 == fixed_struct_b->abstruct.s2);
 
     // Test _value modifier method
     valuebox2->_value (*fixed_struct_b);
-    OBV_VERITY (valuebox2->l () == fixed_struct_b->l);
-    OBV_VERITY ((valuebox2->abstruct ()).s1 == fixed_struct_b->abstruct.s1);
-    OBV_VERITY ((valuebox2->abstruct ()).s2 == fixed_struct_b->abstruct.s2);
+    VERIFY (valuebox2->l () == fixed_struct_b->l);
+    VERIFY ((valuebox2->abstruct ()).s1 == fixed_struct_b->abstruct.s1);
+    VERIFY ((valuebox2->abstruct ()).s2 == fixed_struct_b->abstruct.s2);
 
     // Test _copy_value and _downcast
     VBfixed_struct1_var valuebox4 =
@@ -786,9 +786,9 @@ int test_boxed_struct (void)
       }
     else
       {
-        OBV_VERITY (valuebox4->l () == fixed_struct_b->l);
-        OBV_VERITY ((valuebox4->abstruct ()).s1 == fixed_struct_b->abstruct.s1);
-        OBV_VERITY ((valuebox4->abstruct ()).s2 == fixed_struct_b->abstruct.s2);
+        VERIFY (valuebox4->l () == fixed_struct_b->l);
+        VERIFY ((valuebox4->abstruct ()).s1 == fixed_struct_b->abstruct.s1);
+        VERIFY ((valuebox4->abstruct ()).s2 == fixed_struct_b->abstruct.s2);
       }
 
     //
@@ -843,24 +843,24 @@ int test_boxed_struct_invocations (Test * test_object)
 
         VBfixed_struct1 *p3;
 
-        OBV_VERITY (p1->l() == 29);
-        OBV_VERITY ((p1->abstruct()).s1 ==  117);
-        OBV_VERITY ((p1->abstruct()).s2 ==  21);
+        VERIFY (p1->l() == 29);
+        VERIFY ((p1->abstruct()).s1 ==  117);
+        VERIFY ((p1->abstruct()).s2 ==  21);
 
         VBfixed_struct1_var result = test_object->struct_op1(p1, p2, p3);
         ACE_TRY_CHECK;
 
-        OBV_VERITY (p2->l() == 92*3);
-        OBV_VERITY ((p2->abstruct()).s1 == 171*3);
-        OBV_VERITY ((p2->abstruct()).s2 == 12*3);
+        VERIFY (p2->l() == 92*3);
+        VERIFY ((p2->abstruct()).s1 == 171*3);
+        VERIFY ((p2->abstruct()).s2 == 12*3);
 
-        OBV_VERITY (p3->l() == 92*5);
-        OBV_VERITY ((p3->abstruct()).s1 == 171*5);
-        OBV_VERITY ((p3->abstruct()).s2 == 12*5);
+        VERIFY (p3->l() == 92*5);
+        VERIFY ((p3->abstruct()).s1 == 171*5);
+        VERIFY ((p3->abstruct()).s2 == 12*5);
 
-        OBV_VERITY (result->l() == fs1.l);
-        OBV_VERITY ((result->abstruct()).s1 == fs1.abstruct.s1);
-        OBV_VERITY ((result->abstruct()).s2 == fs1.abstruct.s2);
+        VERIFY (result->l() == fs1.l);
+        VERIFY ((result->abstruct()).s1 == fs1.abstruct.s1);
+        VERIFY ((result->abstruct()).s2 == fs1.abstruct.s2);
 
         //============================================================
         // Fixed struct
@@ -870,13 +870,13 @@ int test_boxed_struct_invocations (Test * test_object)
         test_object->struct_op2(p1->_boxed_in(), p2->_boxed_inout(),
                                 p3->_boxed_out());
 
-        OBV_VERITY (p2->l() == 92*3*3);
-        OBV_VERITY ((p2->abstruct()).s1 == 171*3*3);
-        OBV_VERITY ((p2->abstruct()).s2 == 12*3*3);
+        VERIFY (p2->l() == 92*3*3);
+        VERIFY ((p2->abstruct()).s1 == 171*3*3);
+        VERIFY ((p2->abstruct()).s2 == 12*3*3);
 
-        OBV_VERITY (p3->l() == fs1.l);
-        OBV_VERITY ((p3->abstruct()).s1 == fs1.abstruct.s1);
-        OBV_VERITY ((p3->abstruct()).s2 == fs1.abstruct.s2);
+        VERIFY (p3->l() == fs1.l);
+        VERIFY ((p3->abstruct()).s1 == fs1.abstruct.s1);
+        VERIFY ((p3->abstruct()).s2 == fs1.abstruct.s2);
 
 
         p1->_remove_ref ();
@@ -910,20 +910,20 @@ int test_boxed_struct_invocations (Test * test_object)
         VBvariable_struct1 *p6;
 
 
-        OBV_VERITY (p4->l() == 29);
-        OBV_VERITY (strcmp(p4->str(), "variable1") == 0);
+        VERIFY (p4->l() == 29);
+        VERIFY (strcmp(p4->str(), "variable1") == 0);
 
         VBvariable_struct1_var result2 = test_object->struct_op3(p4, p5, p6);
         ACE_TRY_CHECK;
 
-        OBV_VERITY (p5->l() == vs2.l*3);
-        OBV_VERITY (strcmp(p5->str(), "2variable") == 0);
+        VERIFY (p5->l() == vs2.l*3);
+        VERIFY (strcmp(p5->str(), "2variable") == 0);
 
-        OBV_VERITY (p6->l() == vs2.l*3);
-        OBV_VERITY (strcmp(p6->str(), "2variable") == 0);
+        VERIFY (p6->l() == vs2.l*3);
+        VERIFY (strcmp(p6->str(), "2variable") == 0);
 
-        OBV_VERITY (result2->l() == vs1.l);
-        OBV_VERITY (strcmp(result2->str(), vs1.str) == 0);
+        VERIFY (result2->l() == vs1.l);
+        VERIFY (strcmp(result2->str(), vs1.str) == 0);
 
 
         //============================================================
@@ -935,11 +935,11 @@ int test_boxed_struct_invocations (Test * test_object)
                                 p6->_boxed_out());
         ACE_TRY_CHECK;
 
-        OBV_VERITY (p5->l() == vs2.l*3*3);
-        OBV_VERITY (strcmp(p5->str(), "e2variabl") == 0);
+        VERIFY (p5->l() == vs2.l*3*3);
+        VERIFY (strcmp(p5->str(), "e2variabl") == 0);
 
-        OBV_VERITY (p6->l() == vs1.l);
-        OBV_VERITY (strcmp(p6->str(), vs1.str) == 0);
+        VERIFY (p6->l() == vs1.l);
+        VERIFY (strcmp(p6->str(), vs1.str) == 0);
 
 
         p4->_remove_ref ();
@@ -988,34 +988,34 @@ int test_boxed_array()
                     VBlongarray(*valuebox2),
                     1);
 
-    OBV_VERITY ((*valuebox2)[0] == 101
+    VERIFY ((*valuebox2)[0] == 101
             && valuebox2->_value()[1] == 202
             && valuebox2->_value()[2] == 303);
 
-    OBV_VERITY ((*valuebox3)[0] == 101
+    VERIFY ((*valuebox3)[0] == 101
             && (*valuebox3)[1] == 202
             && (*valuebox3)[2] == 303);
 
     (*valuebox3)[0] = 111;
     valuebox3->_value()[1] = 222;
 
-    OBV_VERITY ((*valuebox2)[0] == 101
+    VERIFY ((*valuebox2)[0] == 101
             && (*valuebox2)[1] == 202
             && (*valuebox2)[2] == 303);
 
-    OBV_VERITY ((*valuebox3)[0] == 111
+    VERIFY ((*valuebox3)[0] == 111
             && (*valuebox3)[1] == 222
             && (*valuebox3)[2] == 303);
 
     *valuebox1 = la;
 
-    OBV_VERITY ((*valuebox1)[0] == 101
+    VERIFY ((*valuebox1)[0] == 101
             && valuebox1->_value()[1] == 202
             && valuebox1->_value()[2] == 303);
 
     valuebox2->_value(la);
 
-    OBV_VERITY ((*valuebox2)[0] == 101
+    VERIFY ((*valuebox2)[0] == 101
             && valuebox2->_value()[1] == 202
             && valuebox2->_value()[2] == 303);
 
@@ -1024,7 +1024,7 @@ int test_boxed_array()
 
     *valuebox2 = valuebox3->_value();
     valuebox3->_value()[1] = 777;
-    OBV_VERITY ((*valuebox2)[0] == 111
+    VERIFY ((*valuebox2)[0] == 111
             && valuebox2->_value()[1] == 222
             && valuebox2->_value()[2] == 303);
 
@@ -1069,7 +1069,7 @@ int test_boxed_array_invocations (Test * test_object)
                         VBlongarray (la2),
                         1);
 
-        OBV_VERITY ((*p1)[0] == 101
+        VERIFY ((*p1)[0] == 101
                 && (*p1)[1] == 202
                 && (*p1)[2] == 303);
 
@@ -1078,15 +1078,15 @@ int test_boxed_array_invocations (Test * test_object)
         VBlongarray_var result = test_object->array_op1 (p1, p2, p3);
         ACE_TRY_CHECK;
 
-        OBV_VERITY ((*p2)[0] == (3101*3)
+        VERIFY ((*p2)[0] == (3101*3)
                 && (*p2)[1] == (3202*3)
                 && (*p3)[2] == (3303*3));
 
-        OBV_VERITY ((*p3)[0] == (3101*3)
+        VERIFY ((*p3)[0] == (3101*3)
                 && (*p3)[1] == (3202*3)
                 && (*p3)[2] == (3303*3));
 
-        OBV_VERITY ((*result.in ())[0] == 101
+        VERIFY ((*result.in ())[0] == 101
                 && (*result.in ())[1] == 202
                 && (*result.in ())[2] == 303);
 
@@ -1102,11 +1102,11 @@ int test_boxed_array_invocations (Test * test_object)
                                p3->_boxed_out());
         ACE_TRY_CHECK;
 
-        OBV_VERITY ((*p2)[0] == (3101*3*3)
+        VERIFY ((*p2)[0] == (3101*3*3)
                 && (*p2)[1] == (3202*3*3)
                 && (*p2)[2] == (3303*3*3));
 
-        OBV_VERITY ((*p3)[0] == (*p1)[0]
+        VERIFY ((*p3)[0] == (*p1)[0]
                 && (*p3)[1] == (*p1)[1]
                 && (*p3)[2] == (*p1)[2]);
 #endif
@@ -1138,19 +1138,19 @@ int test_boxed_array_invocations (Test * test_object)
                         VBstringarray (sa2),
                         1);
 
-        OBV_VERITY (strcmp((*p4)[0], sa[0]) == 0);
-        OBV_VERITY (strcmp((*p4)[1], sa[1]) == 0);
+        VERIFY (strcmp((*p4)[0], sa[0]) == 0);
+        VERIFY (strcmp((*p4)[1], sa[1]) == 0);
 
         VBstringarray *p6;
 
         VBstringarray_var result2 = test_object->array_op3 (p4, p5, p6);
 
-        OBV_VERITY (strcmp((*p5)[0], "1inout string") == 0);
-        OBV_VERITY (strcmp((*p5)[1], "2inout string") == 0);
-        OBV_VERITY (strcmp((*p6)[0], "1inout string") == 0);
-        OBV_VERITY (strcmp((*p6)[1], "2inout string") == 0);
-        OBV_VERITY (strcmp((*result2.in ())[0], sa[0]) == 0);
-        OBV_VERITY (strcmp((*result2.in ())[1], sa[1]) == 0);
+        VERIFY (strcmp((*p5)[0], "1inout string") == 0);
+        VERIFY (strcmp((*p5)[1], "2inout string") == 0);
+        VERIFY (strcmp((*p6)[0], "1inout string") == 0);
+        VERIFY (strcmp((*p6)[1], "2inout string") == 0);
+        VERIFY (strcmp((*result2.in ())[0], sa[0]) == 0);
+        VERIFY (strcmp((*result2.in ())[1], sa[1]) == 0);
 
         //============================================================
         // Array (variable)
@@ -1177,10 +1177,10 @@ int test_boxed_array_invocations (Test * test_object)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) p5[1]=%s\n", (const char *)((*p5)[1])));
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) p6[0]=%s\n", (const char *)((*p6)[0])));
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) p6[1]=%s\n", (const char *)((*p6)[1])));
-        OBV_VERITY (strcmp((*p5)[0], "g1inout strin") == 0);
-        OBV_VERITY (strcmp((*p5)[1], "g2inout strin") == 0);
-        OBV_VERITY (strcmp((*p6)[0],  sa[0]) == 0);
-        OBV_VERITY (strcmp((*p6)[1],  sa[1]) == 0);
+        VERIFY (strcmp((*p5)[0], "g1inout strin") == 0);
+        VERIFY (strcmp((*p5)[1], "g2inout strin") == 0);
+        VERIFY (strcmp((*p6)[0],  sa[0]) == 0);
+        VERIFY (strcmp((*p6)[1],  sa[1]) == 0);
 #endif
 
         p4->_remove_ref ();
@@ -1228,25 +1228,25 @@ int test_boxed_union()
 
     // Test modifiers, accessors, discriminant access
     valuebox1->m1 (37);
-    OBV_VERITY (valuebox1->m1 () == 37);
-    OBV_VERITY (valuebox1->_d () == 1 || valuebox1->_d () == 2);
+    VERIFY (valuebox1->m1 () == 37);
+    VERIFY (valuebox1->_d () == 1 || valuebox1->_d () == 2);
 
     // Explicitly set discriminant, make sure thats the only thing
     // that changes.
     valuebox1->_d (2);
-    OBV_VERITY (valuebox1->_d () == 2);
-    OBV_VERITY (valuebox1->m1 () == 37);
+    VERIFY (valuebox1->_d () == 2);
+    VERIFY (valuebox1->m1 () == 37);
     valuebox1->_d (1);
-    OBV_VERITY (valuebox1->_d () == 1);
-    OBV_VERITY (valuebox1->m1 () == 37);
+    VERIFY (valuebox1->_d () == 1);
+    VERIFY (valuebox1->m1 () == 37);
 
     // Use _value() to access
     valuebox1->_value ()._d (2);
-    OBV_VERITY (valuebox1->_d () == 2);
+    VERIFY (valuebox1->_d () == 2);
 
     // Use _value as modifier.
     valuebox1->_value (fixed_union1.in());
-    OBV_VERITY (valuebox1->_d () != 1 && valuebox1->_d () != 2);
+    VERIFY (valuebox1->_d () != 1 && valuebox1->_d () != 2);
 
     //
     VBfixed_union1* valuebox2_ptr = 0;
@@ -1255,7 +1255,7 @@ int test_boxed_union()
                     1);
     VBfixed_union1_var valuebox2 (valuebox2_ptr);
     valuebox2->m2(333);
-    OBV_VERITY (valuebox2->_d () == 2);
+    VERIFY (valuebox2->_d () == 2);
 
     // Test copy ctor
     VBfixed_union1* valuebox3_ptr = 0;
@@ -1263,14 +1263,14 @@ int test_boxed_union()
                     VBfixed_union1 (*valuebox2.in ()),
                     1);
     VBfixed_union1_var valuebox3 (valuebox3_ptr);
-    OBV_VERITY (valuebox3->_d () == 2);
-    OBV_VERITY (valuebox3->m2 () == 333);
+    VERIFY (valuebox3->_d () == 2);
+    VERIFY (valuebox3->m2 () == 333);
 
     // Test assignment op
     valuebox3->m2 (456);
     *valuebox3.in () = valuebox2->_value ();
-    OBV_VERITY (valuebox3->_d () == 2);
-    OBV_VERITY (valuebox3->m2 () == 333);
+    VERIFY (valuebox3->_d () == 2);
+    VERIFY (valuebox3->m2 () == 333);
 
     // Test constructor taking union argument
     fixed_union1->m2 (137);
@@ -1279,8 +1279,8 @@ int test_boxed_union()
                     VBfixed_union1 (fixed_union1.in ()),
                     1);
     VBfixed_union1_var valuebox4 (valuebox4_ptr);
-    OBV_VERITY (valuebox4->m2 () == 137);
-    OBV_VERITY (valuebox4->_d () == 1 || valuebox4->_d () == 2);
+    VERIFY (valuebox4->m2 () == 137);
+    VERIFY (valuebox4->_d () == 1 || valuebox4->_d () == 2);
 
     return fail;
 }
@@ -1322,22 +1322,22 @@ int test_boxed_union_invocations (Test * test_object)
                         VBfixed_union1 (fixed_union2.in ()),
                         1);
 
-        OBV_VERITY (p1->_d () == 1);
-        OBV_VERITY (p1->m1 () == 321);
-        OBV_VERITY (p2->_d () == 2);
-        OBV_VERITY (p2->m2 () == 789);
+        VERIFY (p1->_d () == 1);
+        VERIFY (p1->m1 () == 321);
+        VERIFY (p2->_d () == 2);
+        VERIFY (p2->m2 () == 789);
 
         VBfixed_union1 * p3;
 
         VBfixed_union1_var result = test_object->union_op1 (p1, p2, p3);
         ACE_TRY_CHECK;
 
-        OBV_VERITY (p2->_d () == 2);
-        OBV_VERITY (p2->m2 () == 789*3);
-        OBV_VERITY (p3->_d () == 1);
-        OBV_VERITY (p3->m1 () == 321*3);
-        OBV_VERITY (result->_d () == 1);
-        OBV_VERITY (result->m1 () == 321*3);
+        VERIFY (p2->_d () == 2);
+        VERIFY (p2->m2 () == 789*3);
+        VERIFY (p3->_d () == 1);
+        VERIFY (p3->m1 () == 321*3);
+        VERIFY (result->_d () == 1);
+        VERIFY (result->m1 () == 321*3);
 
 
         //============================================================
@@ -1348,11 +1348,11 @@ int test_boxed_union_invocations (Test * test_object)
         test_object->union_op2(p1->_boxed_in(), p2->_boxed_inout(),
                                p3->_boxed_out());
 
-        OBV_VERITY (p2->_d () == 2);
-        OBV_VERITY (p2->m2 () == 789*3*3);
+        VERIFY (p2->_d () == 2);
+        VERIFY (p2->m2 () == 789*3*3);
 
-        OBV_VERITY (p3->_d () == 1);
-        OBV_VERITY (p3->m1 () == 321);
+        VERIFY (p3->_d () == 1);
+        VERIFY (p3->m1 () == 321);
 
         p1->_remove_ref ();
         p2->_remove_ref ();
@@ -1383,22 +1383,22 @@ int test_boxed_union_invocations (Test * test_object)
                         VBvariable_union1 (variable_union2.in ()),
                         1);
 
-        OBV_VERITY (p4->_d () == 1);
-        OBV_VERITY (p4->m1 () == 321);
-        OBV_VERITY (p5->_d () == 2);
-        OBV_VERITY (strcmp(p5->m2 (), "abracadabra") == 0);
+        VERIFY (p4->_d () == 1);
+        VERIFY (p4->m1 () == 321);
+        VERIFY (p5->_d () == 2);
+        VERIFY (strcmp(p5->m2 (), "abracadabra") == 0);
 
         VBvariable_union1 * p6;
 
         VBvariable_union1_var result2 = test_object->union_op3 (p4, p5, p6);
         ACE_TRY_CHECK;
 
-        OBV_VERITY (p5->_d () == 2);
-        OBV_VERITY (strcmp(p5->m2 (), "aabracadabr") == 0);
-        OBV_VERITY (p6->_d () == 1);
-        OBV_VERITY (p6->m1 () == 321);
-        OBV_VERITY (result2->_d () == 1);
-        OBV_VERITY (result2->m1 () == 321);
+        VERIFY (p5->_d () == 2);
+        VERIFY (strcmp(p5->m2 (), "aabracadabr") == 0);
+        VERIFY (p6->_d () == 1);
+        VERIFY (p6->m1 () == 321);
+        VERIFY (result2->_d () == 1);
+        VERIFY (result2->m1 () == 321);
 
         //============================================================
         // Union (variable)
@@ -1411,11 +1411,11 @@ int test_boxed_union_invocations (Test * test_object)
                                p6->_boxed_out());
         ACE_TRY_CHECK;
 
-        OBV_VERITY (p5->_d () == 2);
-        OBV_VERITY (strcmp(p5->m2 (), "raabracadab") == 0);
+        VERIFY (p5->_d () == 2);
+        VERIFY (strcmp(p5->m2 (), "raabracadab") == 0);
 
-        OBV_VERITY (p6->_d () == 1);
-        OBV_VERITY (p6->m1 () == 1722);
+        VERIFY (p6->_d () == 1);
+        VERIFY (p6->m1 () == 1722);
 
         p4->_remove_ref ();
         p5->_remove_ref ();
diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc
index f776106f692..64145b1880f 100644
--- a/TAO/tests/OBV/ValueBox/valuebox.mpc
+++ b/TAO/tests/OBV/ValueBox/valuebox.mpc
@@ -1,22 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, valuetype {
+project(*Server): taoserver, valuetype {
   IDL_Files {
     vb_basic.idl
     vb_struct.idl
     vb_union.idl
     valuebox.idl
   }
-  custom_only = 1
-}
-
-project(*Server): taoserver, valuetype {
-  after += *idl
-  Source_Files {
-    Test_impl.cpp
-    server.cpp
-  }
   Source_Files {
     vb_basicC.cpp
     vb_basicS.cpp
@@ -26,23 +17,18 @@ project(*Server): taoserver, valuetype {
     vb_unionS.cpp
     valueboxC.cpp
     valueboxS.cpp
-  }
-  IDL_Files {
+    Test_impl.cpp
+    server.cpp
   }
 }
 
 project(*Client): taoclient, valuetype {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     vb_basicC.cpp
     vb_structC.cpp
     vb_unionC.cpp
     valueboxC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
index b1f403cb3ff..31c098be24e 100644
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
@@ -4,13 +4,7 @@
 
 project(*) : taoserver {
   exename = Test
-
-  specific(automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
-
+  includes += ../lib
   Source_Files {
     Test.cpp
   }
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Makefile.am b/TAO/tests/ORB_Local_Config/Bug_1459/Makefile.am
deleted file mode 100644
index 07f2cdbbe15..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1459.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc b/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
deleted file mode 100644
index 88f1ede13cf..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// $Id$
-
-project (DllOrb) : taolib, portableserver {
-
-        dynamicflags = DLLORB_BUILD_DLL
-
-        source_files {
-                DllOrb.cpp
-        }
-        header_files {
-                DllOrb.h
-                DllOrb_Export.h
-        }
-}
-
-project : taoexe {
-
-        exename = Test
-
-        after += DllOrb
-
-        source_files {
-                Test.cpp
-        }
-}
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
deleted file mode 100644
index fe629b8d48d..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * @author Iliyan jeliazkov <iliyan@ociweb.com>
- * @author Lothar Werzinger <lothar@tradescape.biz>
- *
- * $Id$
- */
-
-
-#include "ace/Arg_Shifter.h"
-#include "ace/SString.h"
-#include "ace/OS_NS_unistd.h"
-
-#include "tao/corba.h"
-#include "tao/TAO_Singleton_Manager.h"
-
-#include "DllOrb.h"
-
-
-DllOrb::DllOrb (int nthreads)
-:
-  m_nthreads_ (nthreads),
-  m_failPrePostInit(0),
-#if defined (ACE_HAS_THREADS)
-  mp_barrier(0),
-#endif
-  mv_orb(),
-  mv_rootPOA()
-{
-}
-
-DllOrb::~DllOrb ( )
-  throw ()
-{
-#if defined (ACE_HAS_THREADS)
-  delete mp_barrier;
-#endif
-}
-
-
-int DllOrb::init (int argc, char *argv[])
-{
-  int result = 0;
-  int threadCnt = this->m_nthreads_;
-
-  try
-  {
-    ACE_Arg_Shifter as(argc, argv);
-    const ACE_TCHAR *currentArg = 0;
-    while(as.is_anything_left())
-      {
-        if((currentArg = as.get_the_parameter("-t")))
-          {
-            int num = ACE_OS::atoi(currentArg);
-            if(num >= 1)
-              threadCnt = num;
-            as.consume_arg();
-          }
-        else
-          as.ignore_arg();
-      }
-
-    if (m_failPrePostInit < 3)
-      {
-        ACE_DEBUG((LM_DEBUG, "TEST (%P|%t) Pre-ORB initialization ...\n"));
-
-        // -----------------------------------------------------------------
-        // Pre-ORB initialization steps necessary for proper DLL ORB
-        // support.
-        // -----------------------------------------------------------------
-        // 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.  If we register with the
-        // ACE_Object_Manager, then the ACE_Object_Manager will still hold
-        // (dangling) references to instances of objects created by this
-        // module and destroyed by this object when it is dynamically
-        // unloaded.
-        int register_with_object_manager = 0;
-        TAO_Singleton_Manager * p_tsm = TAO_Singleton_Manager::instance();
-        result = p_tsm->init(register_with_object_manager);
-
-        if (result == -1 && m_failPrePostInit == 0)
-          return -1;
-      }
-
-    // Initialize the ORB
-    mv_orb = CORBA::ORB_init(argc, argv, 0);
-    if (CORBA::is_nil(mv_orb.in()))
-      return -1;
-
-    CORBA::Object_var v_poa = mv_orb->resolve_initial_references("RootPOA");
-
-    mv_rootPOA = PortableServer::POA::_narrow(v_poa.in ());
-    if (CORBA::is_nil(mv_rootPOA.in()))
-      return -1;
-
-    mv_poaManager = mv_rootPOA->the_POAManager();
-    if (CORBA::is_nil(mv_poaManager.in()))
-      return -1;
-
-    mv_poaManager->activate();
-  }
-  catch(CORBA::Exception& ex)
-  {
-    ACE_PRINT_EXCEPTION (ex,
-                         ACE_TEXT ("(%P|%t) init failed:"));
-    return -1;
-  }
-  catch(...)
-  {
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%P|%t) init failed\n")),
-                      -1);
-  }
-
-#if defined (ACE_HAS_THREADS)
-  mp_barrier = new ACE_Thread_Barrier(threadCnt + 1);
-
-  this->activate(
-                 THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-                 threadCnt
-                 );
-  mp_barrier->wait();
-#endif
-
-  return 0;
-}
-
-
-int DllOrb::fini (void)
-{
-  int result;
-
-  try
-    {
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA)
-      mv_poaManager->deactivate(1, 1);
-#endif
-      mv_poaManager = PortableServer::POAManager::_nil();
-
-      // attempt to protect against sporadic BAD_INV_ORDER exceptions
-      ACE_OS::sleep(ACE_Time_Value(0, 500));
-
-      mv_orb->shutdown(1);
-    }
-  catch(CORBA::Exception& ex)
-  {
-    ACE_PRINT_EXCEPTION (ex,
-                         ACE_TEXT ("(%P|%t) fini failed:"));
-    return -1;
-  }
-  catch(...)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) fini failed to deactivate/shutdown\n")),
-                        -1);
-    }
-
-
-  // wait for our threads to finish
-  wait();
-
-#if defined (ACE_HAS_THREADS)
-  delete mp_barrier;
-  mp_barrier = 0;
-#endif
-
-  try
-    {
-      mv_orb->destroy();
-      mv_orb = CORBA::ORB::_nil();
-    }
-  catch(CORBA::Exception& ex)
-  {
-    ACE_PRINT_EXCEPTION (ex,
-                         ACE_TEXT ("(%P|%t) init failed to destroy the orb:"));
-    return -1;
-  }
-
-  if (m_failPrePostInit < 3)
-    {
-      ACE_DEBUG((LM_DEBUG, "TEST (%P|%t) Post-ORB finalization ...\n"));
-
-      // -----------------------------------------------------------------
-      // Post-ORB finalization steps necessary for proper DLL ORB
-      // support.
-      // -----------------------------------------------------------------
-      // Explicitly clean up singletons created by TAO before
-      // unloading this module.
-      TAO_Singleton_Manager * p_tsm = TAO_Singleton_Manager::instance();
-      result = p_tsm->fini();
-      if (result == -1 && m_failPrePostInit == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("(%P|%t) fini failed to destroy TAO_Singleton_Manager\n")),
-                          -1);
-    } /* end of if */
-
-  return 0;
-}
-
-
-int DllOrb::svc (void)
-{
-#if defined (ACE_HAS_THREADS)
-  mp_barrier->wait();
-#endif
-
-  try
-    {
-      mv_orb->run();
-    }
-  catch(CORBA::BAD_INV_ORDER const & rc_ex)
-    {
-      const CORBA::ULong VMCID = rc_ex.minor() & 0xFFFFF000U;
-      const CORBA::ULong minorCode = rc_ex.minor() & 0xFFFU;
-      if (VMCID != CORBA::OMGVMCID || minorCode != 4)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("(%P|%t) svc exits (-1)\n")),
-                          -1);
-    }
-  catch(CORBA::Exception& ex)
-  {
-    ACE_PRINT_EXCEPTION (ex,
-                         ACE_TEXT ("(%P|%t) svc - orb->run() failed:"));
-    return -1;
-  }
-  catch(...)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) svc got some exception\n")),
-                        -1);
-    }
-  return 0;
-}
-
-
-ACE_FACTORY_DEFINE (DllOrb, DllOrb)
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
deleted file mode 100644
index 9832228d6e4..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * @author Iliyan jeliazkov <iliyan@ociweb.com>
- * @author Lothar Werzinger <lothar@tradescape.biz>
- *
- * $Id$
- */
-
-#ifndef DllOrb_h
-#define DllOrb_h
-
-#include "ace/Barrier.h"
-#include "ace/Task.h"
-
-#include "tao/ORB.h"
-#include "tao/PortableServer/PortableServer.h"
-
-#include "DllOrb_Export.h"
-
-/** The CORBA ORB as a dynamic loadable module.
-  *
-  */
-class DllOrb_Export DllOrb
-:
-  public ACE_Task_Base
-{
-  public:
-    /// Default constructor.
-    DllOrb (int nthreads = 1);
-
-    /// Destructor.
-    ~DllOrb (void) throw ();
-
-    CORBA::ORB_ptr orb (void) const;
-
-    virtual int init (int argc, char *argv[]);
-
-    virtual int fini (void);
-
-  // protected types and methods
-  protected:
-    virtual int svc (void);
-
-  // private methods and instance variables
-  private:
-    int                            m_nthreads_;
-    unsigned int                   m_failPrePostInit;
-
-#if defined (ACE_HAS_THREADS)
-    ACE_Thread_Barrier *           mp_barrier;
-#endif
-
-    CORBA::ORB_var                 mv_orb;
-    PortableServer::POA_var        mv_rootPOA;
-    PortableServer::POAManager_var mv_poaManager;
-}; /* end of DllOrb */
-
-
-ACE_FACTORY_DECLARE (DllOrb, DllOrb)
-
-
-#endif /* DllOrb_h */
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h
deleted file mode 100644
index 9eb5083ea7b..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DllOrb
-// ------------------------------
-#ifndef DLLORB_EXPORT_H
-#define DLLORB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DLLORB_HAS_DLL)
-#  define DLLORB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DLLORB_HAS_DLL */
-
-#if !defined (DLLORB_HAS_DLL)
-#  define DLLORB_HAS_DLL 1
-#endif /* ! DLLORB_HAS_DLL */
-
-#if defined (DLLORB_HAS_DLL) && (DLLORB_HAS_DLL == 1)
-#  if defined (DLLORB_BUILD_DLL)
-#    define DllOrb_Export ACE_Proper_Export_Flag
-#    define DLLORB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DLLORB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DLLORB_BUILD_DLL */
-#    define DllOrb_Export ACE_Proper_Import_Flag
-#    define DLLORB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DLLORB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DLLORB_BUILD_DLL */
-#else /* DLLORB_HAS_DLL == 1 */
-#  define DllOrb_Export
-#  define DLLORB_SINGLETON_DECLARATION(T)
-#  define DLLORB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DLLORB_HAS_DLL == 1 */
-
-// Set DLLORB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DLLORB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DLLORB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DLLORB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DLLORB_NTRACE */
-
-#if (DLLORB_NTRACE == 1)
-#  define DLLORB_TRACE(X)
-#else /* (DLLORB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DLLORB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DLLORB_NTRACE == 1) */
-
-#endif /* DLLORB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Makefile.am b/TAO/tests/ORB_Local_Config/Bug_2612/Makefile.am
deleted file mode 100644
index 3c877a90e26..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_2612/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DllOrb.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libDllOrb.la
-
-libDllOrb_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DDLLORB_BUILD_DLL
-
-libDllOrb_la_SOURCES = \
-  DllOrb.cpp
-
-noinst_HEADERS = \
-  DllOrb.h \
-  DllOrb_Export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2612.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Test_SOURCES = \
-  Test.cpp \
-  DllOrb.h \
-  DllOrb_Export.h
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
deleted file mode 100644
index f0bf0a340eb..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * @author Iliyan jeliazkov <iliyan@ociweb.com>
- * @author Lothar Werzinger <lothar@tradescape.biz>
- *
- * $Id$
- */
-
-#include "ace/OS.h"
-#include "ace/Service_Config.h"
-#include "tao/corba.h"
-
-char const * const scpc_loadOrb =
-  ACE_DYNAMIC_SERVICE_DIRECTIVE ("testDllOrb",
-                                 "DllOrb",
-                                 "_make_DllOrb",
-                                 "DllOrb -t 1 -ORBDebugLevel 3 -ORBId testORB -ORBInitRef "
-                                 "NameService=file:///tmp/test-ns.ior -ORBDottedDecimalAddresses 1"
-                                 );
-
-char const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE ("testDllOrb");
-
-int ACE_TMAIN(int, char **)
-{
-  if (0 > ACE_Service_Config::process_directive(scpc_loadOrb))
-    return -1;
-
-  ACE_OS::sleep(2);
-
-  if (0 > ACE_Service_Config::process_directive(scpc_unloadOrb))
-    return -1;
-
-  ACE_OS::sleep(2);
-  ACE_DEBUG ((LM_DEBUG, "MAIN (%P|%t) Lather, Rince, Repeat ...\n"));
-
-  if (0 > ACE_Service_Config::process_directive(scpc_loadOrb))
-    return -1;
-
-  ACE_OS::sleep(2);
-
-  if (0 > ACE_Service_Config::process_directive(scpc_unloadOrb))
-    return -1;
-
-  return 0;
-}
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl b/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl
deleted file mode 100755
index 672625fa515..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl
+++ /dev/null
@@ -1,49 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-
-sub add_path {
-  my($name)  = shift;
-  my($value) = shift;
-  if (defined $ENV{$name}) {
-    $ENV{$name} .= ':' . $value
-  }
-  else {
-    $ENV{$name} = $value;
-  }
-}
-
-# Set the library path for the client to be able to load
-# the Time_Date library.
-add_path('LD_LIBRARY_PATH', '../lib');
-add_path('LIBPATH', '../lib');
-add_path('SHLIB_PATH', '../lib');
-
-sub test($)
-{
-    (my $executable, my $arguments) = @_;
-    my $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : ""));
-    my $status = $t1->SpawnWaitKill (10);
-    if ($status != 0) {
-        print STDERR "ERROR: test failed, status=$status\n";
-    }
-    return $status;
-} 
-
-my $status = 0;
-$status |= test("Test");
-
-if ($status == 0) {
-    print STDERR "SUCCESS: All tests passed\n";
-}
-else {
-    print STDERR "ERROR: Some test failed, status=$status\n";
-}
-exit $status;
-
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
index b1f403cb3ff..31c098be24e 100644
--- a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
+++ b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
@@ -4,13 +4,7 @@
 
 project(*) : taoserver {
   exename = Test
-
-  specific(automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
-
+  includes += ../lib
   Source_Files {
     Test.cpp
   }
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Makefile.am b/TAO/tests/ORB_Local_Config/Bunch/Makefile.am
deleted file mode 100644
index 88dd5cfe315..00000000000
--- a/TAO/tests/ORB_Local_Config/Bunch/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bunch.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_Local_Config/Makefile.am b/TAO/tests/ORB_Local_Config/Makefile.am
deleted file mode 100644
index 72468788ad8..00000000000
--- a/TAO/tests/ORB_Local_Config/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Bug_1459 \
-        Bug_2612 \
-        Bunch \
-        Separation \
-        Service_Dependency \
-        Shared \
-        Simple \
-        Two_DLL_ORB
-
diff --git a/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc b/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc
index b9b3417f5ee..b5b8a6b963e 100644
--- a/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc
+++ b/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc
@@ -5,7 +5,6 @@ workspace {
   lib
   Bunch
   Bug_1459
-  Bug_2612
   Separation
   Service_Dependency
   Shared
diff --git a/TAO/tests/ORB_Local_Config/Separation/Makefile.am b/TAO/tests/ORB_Local_Config/Separation/Makefile.am
deleted file mode 100644
index b80cba26183..00000000000
--- a/TAO/tests/ORB_Local_Config/Separation/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Separation.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
index 5db3489b76f..31c098be24e 100644
--- a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
+++ b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
@@ -4,13 +4,7 @@
 
 project(*) : taoserver {
   exename = Test
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
-
+  includes += ../lib
   Source_Files {
     Test.cpp
   }
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Makefile.am b/TAO/tests/ORB_Local_Config/Service_Dependency/Makefile.am
deleted file mode 100644
index fd006206d71..00000000000
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Service_Config_Dependent_DLL.am
-
-noinst_LTLIBRARIES = libService_Config_Dependent_DLL.la
-
-libService_Config_Dependent_DLL_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(srcdir)/../lib \
-  -DSERVICE_CONFIG_DLL_BUILD_DLL
-
-libService_Config_Dependent_DLL_la_SOURCES = \
-  Service_Config_DLL.cpp
-
-noinst_HEADERS = \
-  Service_Config_DLL.h \
-  Service_Config_DLL_Export.h
-
-## Makefile.Service_Dependency.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp \
-  Service_Config_DLL.h \
-  Service_Config_DLL_Export.h
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
index d4c4107ac83..4db591a7c44 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
@@ -4,13 +4,7 @@
 project(*) : taoserver {
   after += Service_Config_Dependent_DLL TAO
   exename = Test
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
-
+  includes += ../lib
   Source_Files {
     Test.cpp
   }
@@ -20,11 +14,7 @@ project(Service Config Dependent DLL) : acelib {
   sharedname   = Service_Config_Dependent_DLL
   dynamicflags = SERVICE_CONFIG_DLL_BUILD_DLL
 
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Service_Config_DLL.cpp
diff --git a/TAO/tests/ORB_Local_Config/Shared/Makefile.am b/TAO/tests/ORB_Local_Config/Shared/Makefile.am
deleted file mode 100644
index 73fa3a5805b..00000000000
--- a/TAO/tests/ORB_Local_Config/Shared/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Shared.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
index 5db3489b76f..31c098be24e 100644
--- a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
+++ b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
@@ -4,13 +4,7 @@
 
 project(*) : taoserver {
   exename = Test
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
-
+  includes += ../lib
   Source_Files {
     Test.cpp
   }
diff --git a/TAO/tests/ORB_Local_Config/Simple/Makefile.am b/TAO/tests/ORB_Local_Config/Simple/Makefile.am
deleted file mode 100644
index 9c20f390524..00000000000
--- a/TAO/tests/ORB_Local_Config/Simple/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Simple.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
index 5db3489b76f..31c098be24e 100644
--- a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
+++ b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
@@ -4,13 +4,7 @@
 
 project(*) : taoserver {
   exename = Test
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
-
+  includes += ../lib
   Source_Files {
     Test.cpp
   }
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am
deleted file mode 100644
index 03650e6d2d8..00000000000
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am
+++ /dev/null
@@ -1,195 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-noinst_HEADERS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.ORB_DLL_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libORB_DLL_Client.la
-
-libORB_DLL_Client_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DSERVICE_CONFIG_ORB_DLL_BUILD_DLL
-
-libORB_DLL_Client_la_SOURCES = \
-  ORB_DLL.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  client.cpp \
-  server.cpp
-
-noinst_HEADERS += \
-  ORB_DLL.h \
-  ORB_DLL_Export.h \
-  Test.idl \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl \
-  Test_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ORB_DLL_Server.am
-
-if BUILD_THREADS
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libORB_DLL_Server.la
-
-libORB_DLL_Server_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DSERVICE_CONFIG_ORB_DLL_BUILD_DLL
-
-libORB_DLL_Server_la_SOURCES = \
-  ORB_DLL.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  client.cpp \
-  server.cpp
-
-noinst_HEADERS += \
-  ORB_DLL.h \
-  ORB_DLL_Export.h \
-  Test.idl \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl \
-  Test_i.h
-
-endif BUILD_THREADS
-
-## Makefile.Two_DLL_ORB.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
index 49f3825dea5..ff5720826da 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
@@ -54,13 +54,7 @@ project(ORB DLL Client) : taolib_with_idl, portableserver {
 project(*) : taoserver {
   after += lib ORB_DLL_Client ORB_DLL_Server
   exename = Test
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
-
+  includes += ../lib
   Source_Files {
     Test.cpp
   }
diff --git a/TAO/tests/ORB_Local_Config/run_tests_all.pl b/TAO/tests/ORB_Local_Config/run_tests_all.pl
index 1cd3ae6a50c..8a33c9da9ef 100755
--- a/TAO/tests/ORB_Local_Config/run_tests_all.pl
+++ b/TAO/tests/ORB_Local_Config/run_tests_all.pl
@@ -44,7 +44,6 @@ sub test($)
 
 my $status = 0;
 $status += test("Bug_1459");
-$status += test("Bug_2612");
 $status += test("Bunch");
 $status += test("Separation");
 $status += test("Service_Dependency");
diff --git a/TAO/tests/ORB_destroy/.cvsignore b/TAO/tests/ORB_destroy/.cvsignore
new file mode 100644
index 00000000000..4a33aac7808
--- /dev/null
+++ b/TAO/tests/ORB_destroy/.cvsignore
@@ -0,0 +1 @@
+ORB_destroy
diff --git a/TAO/tests/ORB_destroy/Makefile.am b/TAO/tests/ORB_destroy/Makefile.am
deleted file mode 100644
index 254e3a073b4..00000000000
--- a/TAO/tests/ORB_destroy/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ORB_destroy.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = ORB_destroy
-
-ORB_destroy_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ORB_destroy_SOURCES = \
-  ORB_destroy.cpp
-
-ORB_destroy_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_init/.cvsignore b/TAO/tests/ORB_init/.cvsignore
new file mode 100644
index 00000000000..c32f7b71039
--- /dev/null
+++ b/TAO/tests/ORB_init/.cvsignore
@@ -0,0 +1 @@
+ORB_init
diff --git a/TAO/tests/ORB_init/Makefile.am b/TAO/tests/ORB_init/Makefile.am
deleted file mode 100644
index 78920636fba..00000000000
--- a/TAO/tests/ORB_init/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        Portspan
-
-
-## Makefile.ORB_init.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = ORB_init
-
-ORB_init_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ORB_init_SOURCES = \
-  ORB_init.cpp
-
-ORB_init_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_init/Portspan/.cvsignore b/TAO/tests/ORB_init/Portspan/.cvsignore
new file mode 100644
index 00000000000..254defddb53
--- /dev/null
+++ b/TAO/tests/ORB_init/Portspan/.cvsignore
@@ -0,0 +1 @@
+server
diff --git a/TAO/tests/ORB_init/Portspan/Makefile.am b/TAO/tests/ORB_init/Portspan/Makefile.am
deleted file mode 100644
index 7d2a3740475..00000000000
--- a/TAO/tests/ORB_init/Portspan/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ORB_Init_Portspan_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-CLEANFILES = \
-  simple-stamp \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp
-
-simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/simple.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  simpleC.cpp \
-  simpleI.cpp \
-  simpleS.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleI.h \
-  simpleS.h \
-  simpleS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORB_shutdown/.cvsignore b/TAO/tests/ORB_shutdown/.cvsignore
new file mode 100644
index 00000000000..254defddb53
--- /dev/null
+++ b/TAO/tests/ORB_shutdown/.cvsignore
@@ -0,0 +1 @@
+server
diff --git a/TAO/tests/ORB_shutdown/Makefile.am b/TAO/tests/ORB_shutdown/Makefile.am
deleted file mode 100644
index 7a0e505354e..00000000000
--- a/TAO/tests/ORB_shutdown/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ORB_Shutdown_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Foo_Bar.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Foo_Bar.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORT/.cvsignore b/TAO/tests/ORT/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/ORT/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/ORT/Makefile.am b/TAO/tests/ORT/Makefile.am
deleted file mode 100644
index c4cf9222ba0..00000000000
--- a/TAO/tests/ORT/Makefile.am
+++ /dev/null
@@ -1,149 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Test_ORT_IDL.am
-
-BUILT_SOURCES = \
-  ORT_testC.cpp \
-  ORT_testC.h \
-  ORT_testC.inl \
-  ORT_testS.cpp \
-  ORT_testS.h \
-  ORT_testS.inl
-
-CLEANFILES = \
-  ORT_test-stamp \
-  ORT_testC.cpp \
-  ORT_testC.h \
-  ORT_testC.inl \
-  ORT_testS.cpp \
-  ORT_testS.h \
-  ORT_testS.inl
-
-ORT_testC.cpp ORT_testC.h ORT_testC.inl ORT_testS.cpp ORT_testS.h ORT_testS.inl: ORT_test-stamp
-
-ORT_test-stamp: $(srcdir)/ORT_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ORT_test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  ObjectReferenceFactoryC.cpp \
-  ObjectReferenceFactoryC.h \
-  ObjectReferenceFactoryC.inl \
-  ObjectReferenceFactoryS.h
-
-CLEANFILES += \
-  ObjectReferenceFactory-stamp \
-  ObjectReferenceFactoryC.cpp \
-  ObjectReferenceFactoryC.h \
-  ObjectReferenceFactoryC.inl \
-  ObjectReferenceFactoryS.h
-
-ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.h: ObjectReferenceFactory-stamp
-
-ObjectReferenceFactory-stamp: $(srcdir)/ObjectReferenceFactory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -SS $(srcdir)/ObjectReferenceFactory.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ORT_test.idl \
-  ObjectReferenceFactory.idl
-
-## Makefile.Test_ORT_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ORT_testC.cpp \
-  ORT_testS.cpp \
-  ORT_test_IORInterceptor.cpp \
-  ORT_test_i.cpp \
-  ObjectReferenceFactory.cpp \
-  ObjectReferenceFactoryC.cpp \
-  ServerORBInitializer.cpp \
-  ServerRequestInterceptor.cpp \
-  server.cpp \
-  ORT_test_IORInterceptor.h \
-  ORT_test_i.h \
-  ObjectReferenceFactory.h \
-  ServerORBInitializer.h \
-  ServerRequestInterceptor.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Test_ORT_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ORT_testC.cpp \
-  client.cpp \
-  ORT_test_IORInterceptor.h \
-  ORT_test_i.h \
-  ObjectReferenceFactory.h \
-  ServerORBInitializer.h \
-  ServerRequestInterceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc
index 4d4b4688fc0..461f03a1a7b 100644
--- a/TAO/tests/ORT/ORT.mpc
+++ b/TAO/tests/ORT/ORT.mpc
@@ -1,20 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(Test_ORT_IDL): taoidldefaults {
+project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server, interceptors {
   IDL_Files {
     ORT_test.idl
-  }
-  IDL_Files {
-    idlflags += -SS
     ObjectReferenceFactory.idl
   }
-  custom_only = 1
-}
 
-project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server, interceptors {
-  after += Test_ORT_IDL
   Source_Files {
+    ORT_testC.cpp
+    ORT_testS.cpp
+    ObjectReferenceFactoryC.cpp
     ObjectReferenceFactory.cpp
     ORT_test_i.cpp
     ServerORBInitializer.cpp
@@ -22,26 +18,18 @@ project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server,
     ORT_test_IORInterceptor.cpp
     server.cpp
   }
-  Source_Files {
-    ORT_testC.cpp
-    ORT_testS.cpp
-    ObjectReferenceFactoryC.cpp
-  }
-  IDL_Files {
-  }
 }
 
 
 project(Test_ORT_Client): taoclient, anytypecode, interceptors {
-  after += Test_ORT_IDL
   after += Test_ORT_Server
 
-  Source_Files {
-    client.cpp
+  IDL_Files {
+    ORT_test.idl
   }
+
   Source_Files {
     ORT_testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/Object_Loader/.cvsignore b/TAO/tests/Object_Loader/.cvsignore
new file mode 100644
index 00000000000..e54525b1ee9
--- /dev/null
+++ b/TAO/tests/Object_Loader/.cvsignore
@@ -0,0 +1 @@
+driver
diff --git a/TAO/tests/Object_Loader/Makefile.am b/TAO/tests/Object_Loader/Makefile.am
deleted file mode 100644
index 6d2c20acc26..00000000000
--- a/TAO/tests/Object_Loader/Makefile.am
+++ /dev/null
@@ -1,130 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Object_Loader_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libTest_DLL.la
-
-libTest_DLL_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DOLT_BUILD_DLL
-
-libTest_DLL_la_SOURCES = \
-  Loader.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp
-
-noinst_HEADERS = \
-  Loader.h \
-  Test.idl \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl \
-  Test_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Object_Loader_Driver.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = driver
-
-driver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-driver_SOURCES = \
-  TestC.cpp \
-  driver.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-driver_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Objref_Sequence_Test/.cvsignore b/TAO/tests/Objref_Sequence_Test/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Objref_Sequence_Test/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Objref_Sequence_Test/Makefile.am b/TAO/tests/Objref_Sequence_Test/Makefile.am
deleted file mode 100644
index 45eddfc67f0..00000000000
--- a/TAO/tests/Objref_Sequence_Test/Makefile.am
+++ /dev/null
@@ -1,103 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Objref_Sequence_Test_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Objref_Sequence_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Objref_Sequence_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index dbd009c2f59..650b6c70356 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/OctetSeq/.cvsignore b/TAO/tests/OctetSeq/.cvsignore
new file mode 100644
index 00000000000..25e07224e39
--- /dev/null
+++ b/TAO/tests/OctetSeq/.cvsignore
@@ -0,0 +1,3 @@
+OctetSeq
+client
+server
diff --git a/TAO/tests/OctetSeq/Makefile.am b/TAO/tests/OctetSeq/Makefile.am
deleted file mode 100644
index 53c6f2fd798..00000000000
--- a/TAO/tests/OctetSeq/Makefile.am
+++ /dev/null
@@ -1,137 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OctetSeq_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.OctetSeq_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.OctetSeq_OctetSeq.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += OctetSeq
-
-OctetSeq_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-OctetSeq_SOURCES = \
-  OctetSeq.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-OctetSeq_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OctetSeq_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index ddad93f5747..4a526ffae60 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -1,44 +1,29 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
   avoids += ace_for_tao
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
-    testS.cpp
-    testC.cpp
-  }
-  IDL_Files {
   }
 }
 
 project(*Client): taoclient, anytypecode {
   avoids += ace_for_tao
-  after += *idl
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*OctetSeq): taoclient, anytypecode {
   exename = OctetSeq
-  after += *idl
+  after += *Client
   Source_Files {
     testC.cpp
     OctetSeq.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Ondemand_Write/Makefile.am b/TAO/tests/Ondemand_Write/Makefile.am
deleted file mode 100644
index b4ecf07defe..00000000000
--- a/TAO/tests/Ondemand_Write/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Ondemand_Write_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Ondemand_Write_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Ondemand_Write_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
index 066f4725953..9a1892855d9 100644
--- a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
+++ b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
@@ -1,37 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     Hello.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/Oneway_Buffering/.cvsignore b/TAO/tests/Oneway_Buffering/.cvsignore
new file mode 100644
index 00000000000..5c0ae7e0d7e
--- /dev/null
+++ b/TAO/tests/Oneway_Buffering/.cvsignore
@@ -0,0 +1,3 @@
+admin
+client
+server
diff --git a/TAO/tests/Oneway_Buffering/Makefile.am b/TAO/tests/Oneway_Buffering/Makefile.am
deleted file mode 100644
index 0811306207e..00000000000
--- a/TAO/tests/Oneway_Buffering/Makefile.am
+++ /dev/null
@@ -1,153 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Oneway_Buffering_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Oneway_Buffering_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Oneway_Buffering.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Oneway_Buffering.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Oneway_Buffering_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Oneway_Buffering.h \
-  Oneway_Buffering_Admin.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Oneway_Buffering_Admin.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += admin
-
-admin_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-admin_SOURCES = \
-  Oneway_Buffering_Admin.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  admin.cpp \
-  Oneway_Buffering_Admin.h
-
-admin_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index b2577e7317c..ee95112f143 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -1,53 +1,35 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): messaging, taoexe, portableserver {
-  after += *idl
   Source_Files {
     Oneway_Buffering.cpp
     server.cpp
   }  
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
+// These next two projects depend on *Server (the above project)
+// due to the possibility of parallelism for the GNUACE type.  If
+// -j 2 or more is used to build this project, multiple instances
+// of tao_idl are invoked for Test.idl.  They begin to overwrite the
+// generated source files and cause problems for the processes that
+// have gone on to build the generated files. By depending on *Server,
+// only one process is allowed to compile Test.idl and thus the build
+// succeeds.
 project(*Client): messaging, taoexe, portableserver {
   requires += corba_messaging
-  after += *idl
   after += *Server
 
   Source_Files {
+    TestC.cpp
     client.cpp
   }  
-  Source_Files {
-    TestC.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Admin): messaging, taoexe, portableserver {
-  after += *idl
   after += *Client
   Source_Files {
     Oneway_Buffering_Admin.cpp
     admin.cpp
   }  
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Oneway_Timeouts/Makefile.am b/TAO/tests/Oneway_Timeouts/Makefile.am
deleted file mode 100644
index 62acaa96f5d..00000000000
--- a/TAO/tests/Oneway_Timeouts/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.test_server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.test_client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  TestC.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Oneway_Timeouts/Test.idl b/TAO/tests/Oneway_Timeouts/Test.idl
index 30a517bde36..d076114e7c6 100644
--- a/TAO/tests/Oneway_Timeouts/Test.idl
+++ b/TAO/tests/Oneway_Timeouts/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 interface Tester {
   oneway void test(in long id);
   long test2(in long id);
diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp
index 75a7042094e..8a3a74950d1 100644
--- a/TAO/tests/Oneway_Timeouts/client.cpp
+++ b/TAO/tests/Oneway_Timeouts/client.cpp
@@ -1,10 +1,9 @@
-// $Id$
-
 #include "TestS.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/TAOA.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "tao/IIOP_Connector.h"
 
 #include "ace/streams.h"
 #include "ace/High_Res_Timer.h"
@@ -18,7 +17,7 @@ using namespace PortableServer;
 namespace
 {
   const char *non_existent_ior = "corbaloc:iiop:1.2@63.246.9.65:12345/test";
-  const int TIME_THRESHOLD = 100; //ms
+  const int TIME_THRESHOLD = 50; //ms
 
   int request_timeout = 0;
   Messaging::SyncScope sync_scope;
@@ -43,27 +42,16 @@ namespace
   bool retry_transients = false;
   bool retry_timeouts = false;
 
-  void print_usage (const char *argv0)
+  void print_usage ()
   {
-    ACE_ERROR ((LM_ERROR,
-                "%s [-request_timeout ms=0] "
-                "[-connect_timeout ms=0] "
-                "[-request_interval ms=100] "
-                "[-run_orb_delay ms=0] "
-                "[-run_orb_time ms=0] "
-                "[-max_request_time ms=0] "
-                "[-num_requests n=10] "
-                "[-use_twoway] "
-                "[-retry_transients] "
-                "[-retry_timeouts] "
-                "[-use_sleep] "
-                "[-force_timeout] "
-                "[-force_connect] "
-                "[-buffer_count n=0]"
-                "[-buffer_bytes n=0] "
-                "[-buffer_timeout ms=0] "
-                "[-sync delayed|eager|none]\n",
-                argv0));
+    cout << "client [-request_timeout ms=0] [-connect_timeout ms=0] "
+      "[-request_interval ms=100]\n\t[-run_orb_delay ms=0] "
+      "[-run_orb_time ms=0] [-max_request_time ms=0]\n"
+      "\t[-num_requests n=10] [-use_twoway] [-retry_transients] "
+      "[-retry_timeouts]\n"
+      "\t[-use_sleep] [-force_timeout] [-force_connect] [-buffer_count n=0]\n"
+      "\t[-buffer_bytes n=0] [-buffer_timeout ms=0] [-sync delayed|eager|none]"
+         << endl;
   }
 
   bool parse_command_line (int ac, char *av[])
@@ -186,7 +174,7 @@ namespace
               }
             else
               {
-                print_usage (av[0]);
+                print_usage ();
                 return false;
               }
 
@@ -194,9 +182,9 @@ namespace
           }
         else
           {
-            ACE_ERROR ((LM_ERROR, "Error: Unknown argument \"%s\"\n",
-                        args.get_current ()));
-            print_usage (av[0]);
+            cerr << "Error: Unknown argument \""
+                 << args.get_current () << "\"" << endl;
+            print_usage ();
             return false;
           }
 
@@ -205,6 +193,20 @@ namespace
     return true;
   }
 
+
+  POA_ptr create_poa (ORB_ptr orb)
+  {
+    POA_var poa;
+    PolicyList pols;
+    Object_var obj = orb->resolve_initial_references ("RootPOA");
+    POA_var root = POA::_narrow (obj.in ());
+    ACE_ASSERT (! is_nil (root.in ()));
+    POAManager_var man = root->the_POAManager ();
+    poa = root->create_POA ("X", man.in (), pols);
+    return poa._retn ();
+  }
+
+
   Tester_ptr set_request_timeout (Tester_ptr tst, ORB_ptr orb)
   {
     if (request_timeout <= 0)
@@ -326,7 +328,7 @@ int main (int ac, char *av[])
         {
           tmp_tester = Tester::_narrow (obj.in ());
           tmp_tester->test2 (-2);
-          ACE_DEBUG ((LM_DEBUG, "Connected...\n"));
+          cout << "Connected..." << endl;
         }
       else
         tmp_tester = Tester::_unchecked_narrow (obj.in ());
@@ -354,23 +356,21 @@ int main (int ac, char *av[])
             }
           catch (CORBA::TRANSIENT&)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Transient exception during test () invocation %d\n",
-                          i));
-              if (retry_transients)
-                ACE_DEBUG ((LM_DEBUG,"retrying\n"));
-              else
-                throw;
+              cerr << "Transient exception during test () invocation " << i << endl;
+              if (! retry_transients)
+                {
+                  throw;
+                }
+
             }
           catch (CORBA::TIMEOUT&)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Timeout exception during test () invocation %d\n",
-                          i));
-              if (retry_timeouts)
-                ACE_DEBUG ((LM_DEBUG,"retrying\n"));
-              else
-                throw;
+              cerr << "Timeout exception during test () invocation " << i << endl;
+              if (! retry_timeouts)
+                {
+                  throw;
+                }
+
             }
 
           ++num_requests_sent;
@@ -379,14 +379,13 @@ int main (int ac, char *av[])
           if (max_request_time > 0 &&
               (after - before).msec () > max_request_time)
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Error: test() took %d ms, max is %d ms\n",
-                                 (after - before).msec (), max_request_time),
-                                1);
+              cerr << "Error : test () took " << (after - before).msec ()
+                   << endl;
+              return 1;
             }
 
-          ACE_DEBUG ((LM_DEBUG, "c%d\n", i));
 
+          cout << 'c' << i << endl;
           if (request_interval > 0)
             {
               ACE_Time_Value tv (0, request_interval * 1000);
@@ -408,8 +407,6 @@ int main (int ac, char *av[])
             }
         }
 
-      ACE_DEBUG ((LM_DEBUG,"request loop complete\n"));
-
 
       if (run_orb_delay > 0)
         {
@@ -424,14 +421,8 @@ int main (int ac, char *av[])
           orb->run (tv);
         }
 
-      ACE_DEBUG ((LM_DEBUG,"Sending synch request to shutdown server\n"));
-      if (force_timeout)
-        // we have one more invocation that may time out.
-        before = ACE_High_Res_Timer::gettimeofday_hr ();
-      use_twoway = true;
-      use_sync_scope = false;
-      // Let the server know we're finished. This will timeout if
-      // force_timeout is true.
+
+      // Let the server know we're finished.
       tester->test2 (-1);
 
       orb->shutdown (1);
@@ -440,18 +431,19 @@ int main (int ac, char *av[])
 
       if (force_timeout)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Error: Connection did not time out.\n"),
-                            1);
+          cerr << "Error: Connection did not timeout." << endl;
+          return 1;
         }
 
+
       return 0;
+
     }
-  catch (CORBA::TRANSIENT &)
+  catch (CORBA::TRANSIENT &ex)
     {
-      ACE_DEBUG ((LM_DEBUG, "caught transient exception\n"));
       if (force_timeout)
         {
+          ACE_DEBUG ((LM_DEBUG, "caught exception\n"));
           ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr ();
           long ms = (after - before).msec ();
           if ( (use_twoway || !use_sync_scope)
@@ -464,33 +456,30 @@ int main (int ac, char *av[])
             {
               if (ms > TIME_THRESHOLD)
                 {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "Error: Buffered request took %dms\n",
-                                     ms),1);
+                  cerr << "Error: Buffered request took " << ms << endl;
+                  return 1;
                 }
 
               ms = num_requests_sent * request_interval;
             }
 
-          if (ms - connect_timeout > TIME_THRESHOLD ||
-              connect_timeout - ms > TIME_THRESHOLD)
+          if (std::abs (static_cast<int>(ms - connect_timeout))
+              > TIME_THRESHOLD)
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Error: Timeout expected in %d ms, "
-                                 "but took %d ms\n", connect_timeout, ms),
-                                1);
+              cerr << "Error: Timeout expected in " << connect_timeout
+                   << "ms, but took " << ms << "ms" << endl;
+              return 1;
             }
 
           return 0;
         }
       else
         {
-          ACE_ERROR_RETURN ((LM_ERROR, "Error: Unexpected\n"), 1);
+          cerr << "Error: Unexpected transient\n" << ex << endl;
         }
     }
-  catch (CORBA::TIMEOUT &)
+  catch (CORBA::TIMEOUT &ex)
     {
-      ACE_DEBUG ((LM_DEBUG, "caught timeout exception\n"));
       if (force_timeout)
         {
           ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr ();
@@ -505,36 +494,36 @@ int main (int ac, char *av[])
             {
               if (ms > TIME_THRESHOLD)
                 {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                    "Error: Buffered request took %d ms\n",
-                                    ms),1);
+                  cerr << "Error: Buffered request took " << ms << endl;
+                  return 1;
                 }
 
               ms = num_requests_sent * request_interval;
             }
 
-          if (ms - connect_timeout > TIME_THRESHOLD ||
-              connect_timeout - ms > TIME_THRESHOLD)
+          if (std::abs (static_cast<int>(ms - connect_timeout))
+              > TIME_THRESHOLD)
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Error: Timeout expected in %d ms, "
-                                 "but took %d ms\n", connect_timeout, ms),
-                                1);
+              cerr << "Error: Timeout expected in " << connect_timeout
+                   << "ms, but took " << ms << "ms" << endl;
+              return 1;
             }
 
           return 0;
         }
       else
         {
-          ACE_ERROR_RETURN ((LM_ERROR, "Error: Unexpected\n"), 1);
+          cerr << "Error: Unexpected timeout\n" << ex << endl;
         }
 
     }
   catch (Exception &ex)
     {
-      ACE_ERROR ((LM_ERROR, "client: %s\n\nLast operation took %d ms.\n",
-                  ex._name(),
-                  (ACE_High_Res_Timer::gettimeofday_hr () - before).msec ()));
+      cerr << "client: " << ex << endl;
+      cerr << "\nLast operation took "
+           << (ACE_High_Res_Timer::gettimeofday_hr () - before).msec ()
+           << "ms"
+           << endl;
     }
 
   return 1;
diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp
index c84c0745c28..ac9e6dadee2 100644
--- a/TAO/tests/Oneway_Timeouts/server.cpp
+++ b/TAO/tests/Oneway_Timeouts/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestS.h"
 
 #include "tao/Strategies/advanced_resource.h"
@@ -23,12 +21,12 @@ int elapsed_min = 0;
 int first_min = 0;
 int first_max = 0;
 
-class Tester_i
+class Tester_i 
   : public virtual POA_Tester
   , public virtual ACE_Event_Handler
 {
 public:
-  Tester_i (CORBA::ORB_ptr orb)
+  Tester_i (CORBA::ORB_ptr orb) 
     : orb_ (orb)
     , id1_ (0)
     , id2_ (0)
@@ -68,14 +66,14 @@ public:
         // Signals the end of a test run
         if (num_expected > 0 && count_ != num_expected)
           {
-            cerr << "Error: Expected " << num_expected
+            cerr << "Error: Expected " << num_expected 
                  << ", but received " << count_ << endl;
             this->failed_ = true;
           }
         long ms = (last_ - first_).msec ();
         if (elapsed_max > 0 && ms > elapsed_max)
           {
-            cerr << "Error: Expected  < " << elapsed_max
+            cerr << "Error: Expected  < " << elapsed_max 
                  << "ms, but was " << ms << "ms" << endl;
             this->failed_ = true;
           }
@@ -88,7 +86,7 @@ public:
         ms = (first_ - start_).msec ();
         if (first_max > 0 && ms > first_max)
           {
-            cerr << "Error: Expected first < " << first_max
+            cerr << "Error: Expected first < " << first_max 
                  << "ms, but was " << ms << "ms" << endl;
             this->failed_ = true;
           }
@@ -161,9 +159,9 @@ namespace {
       "\t[-expected n=0] [-elapsed_max ms=0] [-elapsed_min ms=0] "
       "[-first_min ms=0]\n"
       "\t[-first_max ms=0]\n"
-      "\tactivate_delay Millisecond delay before POAManager::activate.\n"
-      "\trun_delay Millisecond delay before ORB::run ().\n"
-      "\trequest_delay Millisecond delay within each servant request.\n"
+      "\tactivate_delay Millisecond delay before POAManager::activate.\n" 
+      "\trun_delay Millisecond delay before ORB::run ().\n" 
+      "\trequest_delay Millisecond delay within each servant request.\n" 
       "\tabort_after abort () after N requests.\n" << endl;
   }
 
diff --git a/TAO/tests/Oneway_Timeouts/test.mpc b/TAO/tests/Oneway_Timeouts/test.mpc
index 2ff1d62ad2d..bc999788463 100644
--- a/TAO/tests/Oneway_Timeouts/test.mpc
+++ b/TAO/tests/Oneway_Timeouts/test.mpc
@@ -1,6 +1,3 @@
-// -*- MPC -*-
-// $Id$
-
 project (*client) : taoexe, messaging, portableserver, strategies {
   exename = client
   after = *server
@@ -15,7 +12,8 @@ project (*client) : taoexe, messaging, portableserver, strategies {
   }
 }
 
-project (*server) : taoserver, messaging, strategies {
+project (*server) : taoexe, messaging, portableserver, strategies {
+  exename = server
   source_files {
     server.cpp
     TestS.cpp
diff --git a/TAO/tests/Oneways_Invoking_Twoways/.cvsignore b/TAO/tests/Oneways_Invoking_Twoways/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Oneways_Invoking_Twoways/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Makefile.am b/TAO/tests/Oneways_Invoking_Twoways/Makefile.am
deleted file mode 100644
index eeb22ae1d15..00000000000
--- a/TAO/tests/Oneways_Invoking_Twoways/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Oneways_Invoking_Twoways_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Oneways_Invoking_Twoways_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Sender_i.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Sender_i.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Oneways_Invoking_Twoways_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Receiver_i.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Receiver_i.h \
-  Server_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index 2f2b3a6e1c7..bd6dfbc4ff5 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -1,30 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     Server_Task.cpp
     Sender_i.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoexe, portableserver {
-  after += *idl
   after += *Server
   Source_Files {
     Client_Task.cpp
@@ -32,10 +17,5 @@ project(*Client): taoexe, portableserver {
     Receiver_i.cpp
     client.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Optimized_Connection/Makefile.am b/TAO/tests/Optimized_Connection/Makefile.am
deleted file mode 100644
index 9b7015e2cf0..00000000000
--- a/TAO/tests/Optimized_Connection/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Optimized_Connection_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  oc_client.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
index 91146f271ff..8bd676130d6 100644
--- a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
+++ b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoserver, minimum_corba {
 }
diff --git a/TAO/tests/POA/Bug_2511_Regression/Makefile.am b/TAO/tests/POA/Bug_2511_Regression/Makefile.am
deleted file mode 100644
index 06398d5da19..00000000000
--- a/TAO/tests/POA/Bug_2511_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Bug_2511_Regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Current/.cvsignore b/TAO/tests/POA/Current/.cvsignore
new file mode 100644
index 00000000000..d8a2b853f2c
--- /dev/null
+++ b/TAO/tests/POA/Current/.cvsignore
@@ -0,0 +1 @@
+Current
diff --git a/TAO/tests/POA/Current/Makefile.am b/TAO/tests/POA/Current/Makefile.am
deleted file mode 100644
index ed1e544b1a9..00000000000
--- a/TAO/tests/POA/Current/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Current.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Current
-
-Current_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Current_SOURCES = \
-  Current.cpp
-
-Current_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Deactivate_Object/Makefile.am b/TAO/tests/POA/Deactivate_Object/Makefile.am
deleted file mode 100644
index dcde647032c..00000000000
--- a/TAO/tests/POA/Deactivate_Object/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Deactivate_Object_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Default_Servant/.cvsignore b/TAO/tests/POA/Default_Servant/.cvsignore
new file mode 100644
index 00000000000..1a4929b3b80
--- /dev/null
+++ b/TAO/tests/POA/Default_Servant/.cvsignore
@@ -0,0 +1 @@
+Default_Servant
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
index 582c1f14733..c96018f073f 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA Default Servant): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA Default Servant): taoserver, minimum_corba {
   exename = Default_Servant
 }
diff --git a/TAO/tests/POA/Default_Servant/Makefile.am b/TAO/tests/POA/Default_Servant/Makefile.am
deleted file mode 100644
index f55f9ec8940..00000000000
--- a/TAO/tests/POA/Default_Servant/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Default_Servant.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Default_Servant
-
-Default_Servant_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Default_Servant_SOURCES = \
-  Default_Servant.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Default_Servant_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
index a3db1635f9c..5411e0e656f 100644
--- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
@@ -1,37 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
+project(*Server): taoserver, endpointpolicy, pi_server, minimum_corba {
   idlflags += -Sa -St
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, endpointpolicy, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
   Source_Files {
     Hello.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/POA/EndpointPolicy/Makefile.am b/TAO/tests/POA/EndpointPolicy/Makefile.am
deleted file mode 100644
index c59078cc840..00000000000
--- a/TAO/tests/POA/EndpointPolicy/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EndpointPolicy_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.EndpointPolicy_Server.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.EndpointPolicy_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Etherealization/.cvsignore b/TAO/tests/POA/Etherealization/.cvsignore
new file mode 100644
index 00000000000..3e143a96f1d
--- /dev/null
+++ b/TAO/tests/POA/Etherealization/.cvsignore
@@ -0,0 +1 @@
+Etherealization
diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc
index 3aa46e5d4cf..5400bf85c9b 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.mpc
+++ b/TAO/tests/POA/Etherealization/Etherealization.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoserver, minimum_corba {
   exename = Etherealization
 }
diff --git a/TAO/tests/POA/Etherealization/Makefile.am b/TAO/tests/POA/Etherealization/Makefile.am
deleted file mode 100644
index 7e48dfb8170..00000000000
--- a/TAO/tests/POA/Etherealization/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Etherealization.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Etherealization
-
-Etherealization_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Etherealization_SOURCES = \
-  Etherealization.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Etherealization_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore b/TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore
new file mode 100644
index 00000000000..2733a260597
--- /dev/null
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore
@@ -0,0 +1 @@
+Excessive_Object_Deactivations
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
index 6136555334d..8b143029fd2 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver {
 }
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am b/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am
deleted file mode 100644
index 81a0191efed..00000000000
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Excessive_Object_Deactivations.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Excessive_Object_Deactivations
-
-Excessive_Object_Deactivations_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Excessive_Object_Deactivations_SOURCES = \
-  Excessive_Object_Deactivations.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Excessive_Object_Deactivations_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Identity/.cvsignore b/TAO/tests/POA/Identity/.cvsignore
new file mode 100644
index 00000000000..58cf73e05e2
--- /dev/null
+++ b/TAO/tests/POA/Identity/.cvsignore
@@ -0,0 +1 @@
+Identity
diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc
index be9b7edff28..8e2c99d1610 100644
--- a/TAO/tests/POA/Identity/Identity.mpc
+++ b/TAO/tests/POA/Identity/Identity.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoserver, avoids_corba_e_micro {
+project(POA*): taoserver {
   exename = Identity
 }
diff --git a/TAO/tests/POA/Identity/Makefile.am b/TAO/tests/POA/Identity/Makefile.am
deleted file mode 100644
index 0233b450a07..00000000000
--- a/TAO/tests/POA/Identity/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Identity.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Identity
-
-Identity_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Identity_SOURCES = \
-  Identity.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Identity_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/MT_Servant_Locator/.cvsignore b/TAO/tests/POA/MT_Servant_Locator/.cvsignore
new file mode 100644
index 00000000000..3a06a6508b0
--- /dev/null
+++ b/TAO/tests/POA/MT_Servant_Locator/.cvsignore
@@ -0,0 +1 @@
+MT_Servant_Locator
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 a2ddf365db4..6443ce82a36 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,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, minimum_corba {
 }
diff --git a/TAO/tests/POA/MT_Servant_Locator/Makefile.am b/TAO/tests/POA/MT_Servant_Locator/Makefile.am
deleted file mode 100644
index 5d7183bdbe1..00000000000
--- a/TAO/tests/POA/MT_Servant_Locator/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_MT_Servant_Locator.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = MT_Servant_Locator
-
-MT_Servant_Locator_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-MT_Servant_Locator_SOURCES = \
-  MT_Servant_Locator.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-MT_Servant_Locator_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Makefile.am b/TAO/tests/POA/Makefile.am
deleted file mode 100644
index baa8f3833d1..00000000000
--- a/TAO/tests/POA/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Bug_2511_Regression \
-        Current \
-        Deactivate_Object \
-        Default_Servant \
-        EndpointPolicy \
-        Etherealization \
-        Excessive_Object_Deactivations \
-        Identity \
-        MT_Servant_Locator \
-        Nested_Non_Servant_Upcalls \
-        Non_Servant_Upcalls \
-        Object_Reactivation \
-        POAManagerFactory \
-        POA_Destruction \
-        Persistent_ID \
-        Policies \
-        Reference_Counting \
-        Single_Threaded_POA \
-        wait_for_completion
-
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore b/TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore
new file mode 100644
index 00000000000..482d2468c35
--- /dev/null
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore
@@ -0,0 +1 @@
+Nested_Non_Servant_Upcalls
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am
deleted file mode 100644
index 09eb04269e5..00000000000
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Nested_Non_Servant_Upcalls.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Nested_Non_Servant_Upcalls
-
-Nested_Non_Servant_Upcalls_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Nested_Non_Servant_Upcalls_SOURCES = \
-  Nested_Non_Servant_Upcalls.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Nested_Non_Servant_Upcalls_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
index a2ddf365db4..6443ce82a36 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, minimum_corba {
 }
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/.cvsignore b/TAO/tests/POA/Non_Servant_Upcalls/.cvsignore
new file mode 100644
index 00000000000..37d45be2816
--- /dev/null
+++ b/TAO/tests/POA/Non_Servant_Upcalls/.cvsignore
@@ -0,0 +1 @@
+Non_Servant_Upcalls
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am
deleted file mode 100644
index 7e0bc5f933a..00000000000
--- a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Non_Servant_Upcalls.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Non_Servant_Upcalls
-
-Non_Servant_Upcalls_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Non_Servant_Upcalls_SOURCES = \
-  Non_Servant_Upcalls.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Non_Servant_Upcalls_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Object_Reactivation/.cvsignore b/TAO/tests/POA/Object_Reactivation/.cvsignore
new file mode 100644
index 00000000000..ccf778224c8
--- /dev/null
+++ b/TAO/tests/POA/Object_Reactivation/.cvsignore
@@ -0,0 +1 @@
+Object_Reactivation
diff --git a/TAO/tests/POA/Object_Reactivation/Makefile.am b/TAO/tests/POA/Object_Reactivation/Makefile.am
deleted file mode 100644
index 57ad776232c..00000000000
--- a/TAO/tests/POA/Object_Reactivation/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Object_Reactivation.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Object_Reactivation
-
-Object_Reactivation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Object_Reactivation_SOURCES = \
-  Object_Reactivation.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Object_Reactivation_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
index 6136555334d..8b143029fd2 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver {
 }
diff --git a/TAO/tests/POA/POAManagerFactory/Makefile.am b/TAO/tests/POA/POAManagerFactory/Makefile.am
deleted file mode 100644
index c2a1826f118..00000000000
--- a/TAO/tests/POA/POAManagerFactory/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_POAManagerFactory.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = POAManagerFactory
-
-POAManagerFactory_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-POAManagerFactory_SOURCES = \
-  POAManagerFactory.cpp
-
-POAManagerFactory_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
index 10139dc0d5e..b6c6400e52f 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, pi_server, minimum_corba {
 }
diff --git a/TAO/tests/POA/POA_Destruction/.cvsignore b/TAO/tests/POA/POA_Destruction/.cvsignore
new file mode 100644
index 00000000000..0b6ca378266
--- /dev/null
+++ b/TAO/tests/POA/POA_Destruction/.cvsignore
@@ -0,0 +1 @@
+POA_Destruction
diff --git a/TAO/tests/POA/POA_Destruction/Makefile.am b/TAO/tests/POA/POA_Destruction/Makefile.am
deleted file mode 100644
index 9a3da85c363..00000000000
--- a/TAO/tests/POA/POA_Destruction/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_POA_Destruction.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = POA_Destruction
-
-POA_Destruction_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-POA_Destruction_SOURCES = \
-  POA_Destruction.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-POA_Destruction_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Persistent_ID/.cvsignore b/TAO/tests/POA/Persistent_ID/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/POA/Persistent_ID/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/POA/Persistent_ID/Makefile.am b/TAO/tests/POA/Persistent_ID/Makefile.am
deleted file mode 100644
index d1ac453cd0c..00000000000
--- a/TAO/tests/POA/Persistent_ID/Makefile.am
+++ /dev/null
@@ -1,104 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.POA_IDL_Persistent_ID.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.POA_Server_Persistent_ID.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.POA_Client_Persistent_ID.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
index da50f0ec27f..de531ab3649 100644
--- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
+++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
@@ -1,36 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA_IDL*): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(POA_server*): taoserver, avoids_corba_e_micro {
-  after += POA_IDL*
+project(POA_server*): taoserver {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(POA_client*): taoserver {
   exename = client
-  after += POA_IDL*
   after += POA_server*
   Source_Files {
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/POA/Policies/.cvsignore b/TAO/tests/POA/Policies/.cvsignore
new file mode 100644
index 00000000000..a5bf361f073
--- /dev/null
+++ b/TAO/tests/POA/Policies/.cvsignore
@@ -0,0 +1 @@
+Policies
diff --git a/TAO/tests/POA/Policies/Makefile.am b/TAO/tests/POA/Policies/Makefile.am
deleted file mode 100644
index 716682b4339..00000000000
--- a/TAO/tests/POA/Policies/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Policies.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Policies
-
-Policies_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Policies_SOURCES = \
-  Policies.cpp
-
-Policies_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index 59db0b1e922..095c1dca356 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -60,7 +60,7 @@ main (int argc, char **argv)
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
 
       {
         PortableServer::ThreadPolicy_var policy1 =
@@ -156,7 +156,7 @@ main (int argc, char **argv)
         ACE_ASSERT (policy1->value () == policy2->value ());
       }
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
 
       {
         PortableServer::ImplicitActivationPolicy_var policy1 =
diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc
index 2ff338b723d..49fcc0fc6a3 100644
--- a/TAO/tests/POA/Policies/Policies.mpc
+++ b/TAO/tests/POA/Policies/Policies.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, pi_server, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, pi_server {
 }
diff --git a/TAO/tests/POA/Reference_Counting/Makefile.am b/TAO/tests/POA/Reference_Counting/Makefile.am
deleted file mode 100644
index 7d254b6c7e2..00000000000
--- a/TAO/tests/POA/Reference_Counting/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Reference_Counting_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  HelloC.cpp \
-  HelloS.cpp \
-  test.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Single_Threaded_POA/.cvsignore b/TAO/tests/POA/Single_Threaded_POA/.cvsignore
new file mode 100644
index 00000000000..e376b320c12
--- /dev/null
+++ b/TAO/tests/POA/Single_Threaded_POA/.cvsignore
@@ -0,0 +1 @@
+Single_Threaded_POA
diff --git a/TAO/tests/POA/Single_Threaded_POA/Makefile.am b/TAO/tests/POA/Single_Threaded_POA/Makefile.am
deleted file mode 100644
index d9745f895e2..00000000000
--- a/TAO/tests/POA/Single_Threaded_POA/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Single_Threaded_POA.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Single_Threaded_POA
-
-Single_Threaded_POA_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Single_Threaded_POA_SOURCES = \
-  Single_Threaded_POA.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Single_Threaded_POA_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
index a2ddf365db4..6443ce82a36 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, minimum_corba {
 }
diff --git a/TAO/tests/POA/wait_for_completion/.cvsignore b/TAO/tests/POA/wait_for_completion/.cvsignore
new file mode 100644
index 00000000000..8386b39bdc5
--- /dev/null
+++ b/TAO/tests/POA/wait_for_completion/.cvsignore
@@ -0,0 +1 @@
+wait_for_completion
diff --git a/TAO/tests/POA/wait_for_completion/Makefile.am b/TAO/tests/POA/wait_for_completion/Makefile.am
deleted file mode 100644
index 6aebb6f3cfa..00000000000
--- a/TAO/tests/POA/wait_for_completion/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Wait_For_Completion.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = wait_for_completion
-
-wait_for_completion_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-wait_for_completion_SOURCES = \
-  testC.cpp \
-  testS.cpp \
-  wait_for_completion.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-wait_for_completion_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Parallel_Connect_Strategy/Makefile.am b/TAO/tests/Parallel_Connect_Strategy/Makefile.am
deleted file mode 100644
index e80d891d217..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Parallel_Connect_Strategy_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Parallel_Connect_Strategy_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Parallel_Connect_Strategy_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
index c81746d1e47..29d26448590 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
+++ b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, iortable {
-  after += *idl
+  idlflags += -Sa -St
   Source_Files {
     Test_i.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/Param_Test/.cvsignore b/TAO/tests/Param_Test/.cvsignore
new file mode 100644
index 00000000000..3e5043763cd
--- /dev/null
+++ b/TAO/tests/Param_Test/.cvsignore
@@ -0,0 +1,4 @@
+anyop
+client
+param_testA.cpp
+server
diff --git a/TAO/tests/Param_Test/Makefile.am b/TAO/tests/Param_Test/Makefile.am
deleted file mode 100644
index 8fdd6cf3480..00000000000
--- a/TAO/tests/Param_Test/Makefile.am
+++ /dev/null
@@ -1,263 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Param_Test_Idl.am
-
-BUILT_SOURCES = \
-  param_testC.cpp \
-  param_testC.h \
-  param_testC.inl \
-  param_testS.cpp \
-  param_testS.h \
-  param_testS.inl
-
-CLEANFILES = \
-  param_test-stamp \
-  param_testC.cpp \
-  param_testC.h \
-  param_testC.inl \
-  param_testS.cpp \
-  param_testS.h \
-  param_testS.inl
-
-param_testC.cpp param_testC.h param_testC.inl param_testS.cpp param_testS.h param_testS.inl: param_test-stamp
-
-param_test-stamp: $(srcdir)/param_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/param_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  param_test.idl
-
-## Makefile.Param_Test_Anyop.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += anyop
-
-anyop_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-anyop_SOURCES = \
-  anyop.cpp \
-  param_testC.cpp \
-  any.h \
-  bd_array_seq.h \
-  bd_long_seq.h \
-  bd_short_seq.h \
-  bd_str_seq.h \
-  bd_string.h \
-  bd_struct_seq.h \
-  bd_wstr_seq.h \
-  bd_wstring.h \
-  big_union.h \
-  client.h \
-  complex_any.h \
-  driver.h \
-  except.h \
-  fixed_array.h \
-  fixed_struct.h \
-  helper.h \
-  multdim_array.h \
-  nested_struct.h \
-  objref.h \
-  objref_struct.h \
-  options.h \
-  param_test_i.h \
-  recursive_struct.h \
-  recursive_union.h \
-  results.h \
-  short.h \
-  small_union.h \
-  tests.h \
-  typecode.h \
-  ub_any_seq.h \
-  ub_array_seq.h \
-  ub_long_seq.h \
-  ub_objref_seq.h \
-  ub_short_seq.h \
-  ub_str_seq.h \
-  ub_string.h \
-  ub_struct_seq.h \
-  ub_wstr_seq.h \
-  ub_wstring.h \
-  ulonglong.h \
-  var_array.h \
-  var_struct.h
-
-anyop_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Param_Test_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  any.cpp \
-  bd_array_seq.cpp \
-  bd_long_seq.cpp \
-  bd_short_seq.cpp \
-  bd_str_seq.cpp \
-  bd_string.cpp \
-  bd_struct_seq.cpp \
-  bd_wstr_seq.cpp \
-  bd_wstring.cpp \
-  big_union.cpp \
-  client.cpp \
-  complex_any.cpp \
-  driver.cpp \
-  except.cpp \
-  fixed_array.cpp \
-  fixed_struct.cpp \
-  helper.cpp \
-  multdim_array.cpp \
-  nested_struct.cpp \
-  objref.cpp \
-  objref_struct.cpp \
-  options.cpp \
-  param_testC.cpp \
-  recursive_struct.cpp \
-  recursive_union.cpp \
-  results.cpp \
-  short.cpp \
-  small_union.cpp \
-  typecode.cpp \
-  ub_any_seq.cpp \
-  ub_array_seq.cpp \
-  ub_long_seq.cpp \
-  ub_objref_seq.cpp \
-  ub_short_seq.cpp \
-  ub_str_seq.cpp \
-  ub_string.cpp \
-  ub_struct_seq.cpp \
-  ub_wstr_seq.cpp \
-  ub_wstring.cpp \
-  ulonglong.cpp \
-  var_array.cpp \
-  var_struct.cpp \
-  any.h \
-  bd_array_seq.h \
-  bd_long_seq.h \
-  bd_short_seq.h \
-  bd_str_seq.h \
-  bd_string.h \
-  bd_struct_seq.h \
-  bd_wstr_seq.h \
-  bd_wstring.h \
-  big_union.h \
-  client.h \
-  complex_any.h \
-  driver.h \
-  except.h \
-  fixed_array.h \
-  fixed_struct.h \
-  helper.h \
-  multdim_array.h \
-  nested_struct.h \
-  objref.h \
-  objref_struct.h \
-  options.h \
-  recursive_struct.h \
-  recursive_union.h \
-  results.h \
-  short.h \
-  small_union.h \
-  typecode.h \
-  ub_any_seq.h \
-  ub_array_seq.h \
-  ub_long_seq.h \
-  ub_objref_seq.h \
-  ub_short_seq.h \
-  ub_str_seq.h \
-  ub_string.h \
-  ub_struct_seq.h \
-  ub_wstr_seq.h \
-  ub_wstring.h \
-  ulonglong.h \
-  var_array.h \
-  var_struct.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Param_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  param_testC.cpp \
-  param_testS.cpp \
-  param_test_i.cpp \
-  server.cpp \
-  param_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 26a4dfa50d7..4ad4fa1ba44 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -1,33 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    idlflags -= -Sa -St
-    param_test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after  += *idl
+project(*Server): taoserver, minimum_corba {
   Source_Files {
     param_test_i.cpp
-    param_testS.cpp
-    param_testC.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoserver, avoids_minimum_corba, dynamicinterface {
+project(*Client): taoserver, minimum_corba, dynamicinterface {
   avoids += ace_for_tao
   exename = client
-  after  += *idl
+  after  += *Server
 
   Source_Files {
-    param_testC.cpp
     any.cpp
     bd_array_seq.cpp
     bd_long_seq.cpp
@@ -70,19 +56,15 @@ project(*Client): taoserver, avoids_minimum_corba, dynamicinterface {
     var_array.cpp
     var_struct.cpp
   }
-  IDL_Files {
-  }
 }
 
-project(*Anyop): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Anyop): taoserver, minimum_corba {
   exename = anyop
-  after  += *idl
+  after += *Client
 
   Source_Files {
     param_testC.cpp
     anyop.cpp
   }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Permanent_Forward/Makefile.am b/TAO/tests/Permanent_Forward/Makefile.am
deleted file mode 100644
index 06863c3a49e..00000000000
--- a/TAO/tests/Permanent_Forward/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Permanent_Forward_StubTest.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = StubTest
-
-StubTest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-StubTest_SOURCES = \
-  StubTest.cpp
-
-StubTest_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
index ab5cf4db05d..ab5cf4db05d 100644..100755
--- a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
+++ b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
diff --git a/TAO/tests/Permanent_Forward/README b/TAO/tests/Permanent_Forward/README
index 283aa20a87d..283aa20a87d 100644..100755
--- a/TAO/tests/Permanent_Forward/README
+++ b/TAO/tests/Permanent_Forward/README
diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp
index 21fbd5409bd..21fbd5409bd 100644..100755
--- a/TAO/tests/Permanent_Forward/StubTest.cpp
+++ b/TAO/tests/Permanent_Forward/StubTest.cpp
diff --git a/TAO/tests/Policies/.cvsignore b/TAO/tests/Policies/.cvsignore
new file mode 100644
index 00000000000..a3f7ddb3860
--- /dev/null
+++ b/TAO/tests/Policies/.cvsignore
@@ -0,0 +1 @@
+Manipulation
diff --git a/TAO/tests/Policies/Makefile.am b/TAO/tests/Policies/Makefile.am
deleted file mode 100644
index 5d4f420caa7..00000000000
--- a/TAO/tests/Policies/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Policies_Manipulation.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Manipulation
-
-Manipulation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Manipulation_SOURCES = \
-  Manipulation.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Manipulation_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/AMI/.cvsignore b/TAO/tests/Portable_Interceptors/AMI/.cvsignore
new file mode 100644
index 00000000000..e17d953477e
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/AMI/.cvsignore
@@ -0,0 +1,12 @@
+TestC.cpp
+TestC.h
+TestC.i
+TestS.cpp
+TestS.h
+TestS.i
+TestS_T.cpp
+TestS_T.h
+TestS_T.i
+client
+server
+test.ior
diff --git a/TAO/tests/Portable_Interceptors/AMI/Makefile.am b/TAO/tests/Portable_Interceptors/AMI/Makefile.am
deleted file mode 100644
index 48385aeafc0..00000000000
--- a/TAO/tests/Portable_Interceptors/AMI/Makefile.am
+++ /dev/null
@@ -1,146 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.PI_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Interceptor.cpp \
-  Client_ORBInitializer.cpp \
-  Echo_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Interceptor.h \
-  Client_ORBInitializer.h \
-  Echo_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.PI_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo.cpp \
-  Server_Interceptor.cpp \
-  Server_ORBInitializer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo.h \
-  Server_Interceptor.h \
-  Server_ORBInitializer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
index 2e1954944aa..f55237bc40f 100644
--- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
+++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
@@ -1,33 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, ami {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Client) : taoserver, ami, pi, interceptors {
   exename = client
-  after += *idl
   source_files {
     client.cpp
     Client_Interceptor.cpp
     Client_ORBInitializer.cpp
     Echo_Handler.cpp
   }
-  source_files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*server) : taoserver, ami, pi_server, interceptors {
   exename = server
-  after += *idl
   after += *Client
   source_files {
     server.cpp
@@ -35,10 +20,4 @@ project(*server) : taoserver, ami, pi_server, interceptors {
     Server_ORBInitializer.cpp
     Echo.cpp
   }
-  source_files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
index 375ecea5930..d53cfd5839c 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
@@ -6,7 +6,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, pi_server {
+project(*Server): taoserver, pi_server, exceptions {
   after += *idl
   Source_Files {
     StateTransferS.cpp
@@ -17,7 +17,7 @@ project(*Server): taoserver, pi_server {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, exceptions {
   after += *idl
   Source_Files {
     StateTransferC.cpp
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/Makefile.am b/TAO/tests/Portable_Interceptors/AdvSlot/Makefile.am
deleted file mode 100644
index 00719a979a5..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlot/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AdvSlot_Idl.am
-
-BUILT_SOURCES = \
-  StateTransferC.cpp \
-  StateTransferC.h \
-  StateTransferC.inl \
-  StateTransferS.cpp \
-  StateTransferS.h \
-  StateTransferS.inl
-
-CLEANFILES = \
-  StateTransfer-stamp \
-  StateTransferC.cpp \
-  StateTransferC.h \
-  StateTransferC.inl \
-  StateTransferS.cpp \
-  StateTransferS.h \
-  StateTransferS.inl
-
-StateTransferC.cpp StateTransferC.h StateTransferC.inl StateTransferS.cpp StateTransferS.h StateTransferS.inl: StateTransfer-stamp
-
-StateTransfer-stamp: $(srcdir)/StateTransfer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/StateTransfer.idl
-	@touch $@
-
-noinst_HEADERS = \
-  StateTransfer.idl
-
-## Makefile.AdvSlot_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  StateTransferC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.AdvSlot_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  StateTransferC.cpp \
-  StateTransferS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
index 6956b78b5fe..0242f6d3360 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
@@ -6,7 +6,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, pi_server {
+project(*Server): taoserver, pi_server, exceptions {
   after += *idl
   Source_Files {
     InvokeMeS.cpp
@@ -17,7 +17,7 @@ project(*Server): taoserver, pi_server {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, exceptions {
   after += *idl
   Source_Files {
     InvokeMeC.cpp
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am
deleted file mode 100644
index e9e8158026a..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AdvSlotDblCpy_Idl.am
-
-BUILT_SOURCES = \
-  InvokeMeC.cpp \
-  InvokeMeC.h \
-  InvokeMeC.inl \
-  InvokeMeS.cpp \
-  InvokeMeS.h \
-  InvokeMeS.inl
-
-CLEANFILES = \
-  InvokeMe-stamp \
-  InvokeMeC.cpp \
-  InvokeMeC.h \
-  InvokeMeC.inl \
-  InvokeMeS.cpp \
-  InvokeMeS.h \
-  InvokeMeS.inl
-
-InvokeMeC.cpp InvokeMeC.h InvokeMeC.inl InvokeMeS.cpp InvokeMeS.h InvokeMeS.inl: InvokeMe-stamp
-
-InvokeMe-stamp: $(srcdir)/InvokeMe.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/InvokeMe.idl
-	@touch $@
-
-noinst_HEADERS = \
-  InvokeMe.idl
-
-## Makefile.AdvSlotDblCpy_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  InvokeMeC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.AdvSlotDblCpy_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  InvokeMeC.cpp \
-  InvokeMeS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
index 375ecea5930..d53cfd5839c 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
@@ -6,7 +6,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, pi_server {
+project(*Server): taoserver, pi_server, exceptions {
   after += *idl
   Source_Files {
     StateTransferS.cpp
@@ -17,7 +17,7 @@ project(*Server): taoserver, pi_server {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, exceptions {
   after += *idl
   Source_Files {
     StateTransferC.cpp
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/Makefile.am b/TAO/tests/Portable_Interceptors/AdvSlotExt/Makefile.am
deleted file mode 100644
index d4d07600bf8..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AdvSlotExt_Idl.am
-
-BUILT_SOURCES = \
-  StateTransferC.cpp \
-  StateTransferC.h \
-  StateTransferC.inl \
-  StateTransferS.cpp \
-  StateTransferS.h \
-  StateTransferS.inl
-
-CLEANFILES = \
-  StateTransfer-stamp \
-  StateTransferC.cpp \
-  StateTransferC.h \
-  StateTransferC.inl \
-  StateTransferS.cpp \
-  StateTransferS.h \
-  StateTransferS.inl
-
-StateTransferC.cpp StateTransferC.h StateTransferC.inl StateTransferS.cpp StateTransferS.h StateTransferS.inl: StateTransfer-stamp
-
-StateTransfer-stamp: $(srcdir)/StateTransfer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/StateTransfer.idl
-	@touch $@
-
-noinst_HEADERS = \
-  StateTransfer.idl
-
-## Makefile.AdvSlotExt_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  StateTransferC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.AdvSlotExt_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  StateTransferC.cpp \
-  StateTransferS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/.cvsignore b/TAO/tests/Portable_Interceptors/Benchmark/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/Benchmark/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am b/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am
deleted file mode 100644
index e3ae964d33b..00000000000
--- a/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am
+++ /dev/null
@@ -1,130 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Benchmark_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Benchmark_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Interceptor_Type.cpp \
-  Server_ORBInitializer.cpp \
-  marker.cpp \
-  server.cpp \
-  server_interceptors.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Interceptor_Type.h \
-  Server_ORBInitializer.h \
-  marker.h \
-  server_interceptors.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Benchmark_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Interceptor_Type.cpp \
-  client.cpp \
-  client_interceptors.cpp \
-  marker.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Interceptor_Type.h \
-  client_interceptors.h \
-  marker.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
index 0604ee09b21..59737568104 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
+++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
@@ -1,17 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags -= -Sa -St
-
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, pi_server, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
     server_interceptors.cpp
@@ -20,27 +10,17 @@ project(*Server): taoserver, pi_server, interceptors {
     Interceptor_Type.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, pi, interceptors {
-  after += *idl
   after += *Server
   Source_Files {
+    testC.cpp
     client_interceptors.cpp
     marker.cpp
     Client_ORBInitializer.cpp
     Interceptor_Type.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/.cvsignore b/TAO/tests/Portable_Interceptors/Bug_1559/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
index e631e5a425a..2e992878fcb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
@@ -1,40 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, pi_server, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
     Server_ORBInitializer.cpp
     server_interceptor.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, pi, interceptors {
-  after += *idl
   after += *Server
   Source_Files {
+    testC.cpp
     Client_ORBInitializer.cpp
     client_interceptor.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am
deleted file mode 100644
index 28ac6654edf..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1559_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_1559_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1559_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  client_interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_2088/Makefile.am
deleted file mode 100644
index 4ecbd165473..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2088_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  Client_ORBInitializer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
index f1de1f0c531..faffbc6078a 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
@@ -1,41 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, pi_server, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
     server_interceptor.cpp
     Server_ORBInitializer.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, pi, interceptors {
-  after += *idl
   after += *Server
   Source_Files {
+    testC.cpp
     Client_ORBInitializer.cpp
     client_interceptor.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am
deleted file mode 100644
index f3f7397ed1d..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2510_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2510_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2510_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  client_interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
index f2f1ff2ea50..ab6c039dcd1 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
@@ -1,4 +1,4 @@
-// $Id$
+// test.idl,v 1.1 2003/08/27 22:43:35 edwardgt Exp
 
 module Test_Interceptors
 {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.cvsignore b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.cvsignore
new file mode 100644
index 00000000000..307259b4b57
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.cvsignore
@@ -0,0 +1 @@
+Collocated_Test
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am
deleted file mode 100644
index 70a6732b77f..00000000000
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am
+++ /dev/null
@@ -1,93 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_Dynamic_Collocated.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Echo_Collocated_ORBInitializer.cpp \
-  Server_Task.cpp \
-  interceptors.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Client_Task.h \
-  Echo_Collocated_ORBInitializer.h \
-  Server_Task.h \
-  interceptors.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Makefile.am b/TAO/tests/Portable_Interceptors/Collocated/Makefile.am
deleted file mode 100644
index 18a11126170..00000000000
--- a/TAO/tests/Portable_Interceptors/Collocated/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Dynamic \
-        Service_Context_Manipulation
-
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.cvsignore b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.cvsignore
new file mode 100644
index 00000000000..9b04cc7c341
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.cvsignore
@@ -0,0 +1 @@
+collocated
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am
deleted file mode 100644
index 87bf1432baa..00000000000
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am
+++ /dev/null
@@ -1,93 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_Svc_Context_Manip_Collocated.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = collocated
-
-collocated_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-collocated_SOURCES = \
-  Client_Task.cpp \
-  Collocated_ORBInitializer.cpp \
-  Collocated_Test.cpp \
-  Server_Task.cpp \
-  interceptors.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Client_Task.h \
-  Collocated_ORBInitializer.h \
-  Server_Task.h \
-  interceptors.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-collocated_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/.cvsignore b/TAO/tests/Portable_Interceptors/Dynamic/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/Dynamic/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am b/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am
deleted file mode 100644
index e1c0ea0ba38..00000000000
--- a/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Dynamic_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Dynamic_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Server_ORBInitializer.cpp \
-  server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Echo_Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Dynamic_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo_Client_ORBInitializer.cpp \
-  client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  Echo_Client_ORBInitializer.h \
-  client_interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
index 05a373172fb..a55faf91bbf 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
@@ -1,42 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags -= -Sa -St
-
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, pi_server, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
     server_interceptor.cpp
     Echo_Server_ORBInitializer.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, pi, interceptors {
-  after += *idl
   after += *Server
   Source_Files {
+    testC.cpp
     client_interceptor.cpp
     Echo_Client_ORBInitializer.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/.cvsignore b/TAO/tests/Portable_Interceptors/ForwardRequest/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am
deleted file mode 100644
index 04a079929aa..00000000000
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am
+++ /dev/null
@@ -1,126 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_ForwardRequest_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_ForwardRequest_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_ForwardRequest_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
index 4c941060cd3..57393219165 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
@@ -1,15 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
-  after += *idl
 
   Source_Files {
     test_i.cpp
@@ -17,27 +9,16 @@ project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
     Server_Request_Interceptor.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, valuetype, pi, pi_server, interceptors {
-  after += *idl
   after += *Server
   
   Source_Files {
+    testC.cpp
     Client_ORBInitializer.cpp
     Client_Request_Interceptor.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/.cvsignore b/TAO/tests/Portable_Interceptors/IORInterceptor/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am b/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am
deleted file mode 100644
index e1f580ff532..00000000000
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_IORInterceptor_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_IORInterceptor_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  FOO_IORInterceptor.cpp \
-  FOO_IORInterceptor_ORBInitializer.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  FOO_IORInterceptor.h \
-  FOO_IORInterceptor_ORBInitializer.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_IORInterceptor_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  FOO_ClientRequestInterceptor.cpp \
-  FOO_Client_ORBInitializer.cpp \
-  client.cpp \
-  testC.cpp \
-  FOO_ClientRequestInterceptor.h \
-  FOO_Client_ORBInitializer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
index 260a73794bd..fddc7298207 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -1,40 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, iorinterceptor, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
     FOO_IORInterceptor_ORBInitializer.cpp
     FOO_IORInterceptor.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, pi, interceptors {
-  after += *idl
   after += *Server
   Source_Files {
+    testC.cpp
     FOO_Client_ORBInitializer.cpp
     FOO_ClientRequestInterceptor.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
index 88d843a1a96..d6c417c48cb 100755
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 # $Id$
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/tests/Portable_Interceptors/Makefile.am b/TAO/tests/Portable_Interceptors/Makefile.am
deleted file mode 100644
index bd17fa3898d..00000000000
--- a/TAO/tests/Portable_Interceptors/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMI \
-        AdvSlot \
-        AdvSlotDblCpy \
-        AdvSlotExt \
-        Benchmark \
-        Bug_1559 \
-        Bug_2088 \
-        Bug_2510_Regression \
-        Collocated \
-        Dynamic \
-        ForwardRequest \
-        IORInterceptor \
-        ORB_Shutdown \
-        PICurrent \
-        PolicyFactory \
-        Processing_Mode_Policy \
-        Recursive_ORBInitializer \
-        Redirection \
-        Register_Initial_References \
-        Request_Interceptor_Flow \
-        Service_Context_Manipulation \
-        Slot
-
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/.cvsignore b/TAO/tests/Portable_Interceptors/ORB_Shutdown/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am
deleted file mode 100644
index 31f1515f381..00000000000
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am
+++ /dev/null
@@ -1,117 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_ORB_Shutdown_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_ORB_Shutdown_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_ORB_Shutdown_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
index c7da0da2ba0..600ba5c118b 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
@@ -1,33 +1,22 @@
 // -*- MPC -*-
+//
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, pi_server, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
-    testS.cpp
-    testC.cpp
     Server_ORBInitializer.cpp
     Server_Request_Interceptor.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
+  after += *Server
+
   Source_Files {
     testC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/.cvsignore b/TAO/tests/Portable_Interceptors/PICurrent/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/PICurrent/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am b/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am
deleted file mode 100644
index 3f20b1f4671..00000000000
--- a/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_PICurrent_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_PICurrent_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ClientRequestInterceptor2.cpp \
-  ServerORBInitializer.cpp \
-  ServerRequestInterceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  ClientRequestInterceptor2.h \
-  ServerORBInitializer.h \
-  ServerRequestInterceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_PICurrent_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ClientORBInitializer.cpp \
-  ClientRequestInterceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  ClientORBInitializer.h \
-  ClientRequestInterceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
index c638d946a1a..39a60cd5c75 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
+++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
@@ -1,15 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, pi_server, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
     ServerORBInitializer.cpp
@@ -17,25 +9,15 @@ project(*Server): taoserver, pi_server, interceptors {
     ClientRequestInterceptor2.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, pi, interceptors {
-  after += *idl
   after += *Server
   Source_Files {
+    testC.cpp
     ClientORBInitializer.cpp
     ClientRequestInterceptor.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index 2cd36a5cd9c..4d98648a2ac 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -1,7 +1,6 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
-#include "ace/OS_NS_unistd.h"
 
 #include "testC.h"
 #include "ClientORBInitializer.h"
@@ -116,28 +115,6 @@ main (int argc, char *argv[])
                             1);
         }
 
-      // BUG 2656 testing - _get_policy_overrides() should return an empty
-      // sequence rather than nill.
-      CORBA::PolicyTypeSeq types;
-      CORBA::PolicyList_var policies = server->_get_policy_overrides(types);
-
-      if (policies.ptr () == 0)
-        {
-            ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) _get_policy_overrides returned nill pointer\n"));
-            ACE_TRY_THROW (CORBA::INTERNAL ());
-        }
-      else
-        {
-          CORBA::ULong const list_size = policies->length();
-          if (list_size != 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) _get_policy_overrides returned list with size not equal 0\n"));
-              ACE_TRY_THROW (CORBA::INTERNAL ());
-            }
-        }
-
       server->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -172,7 +149,6 @@ main (int argc, char *argv[])
       server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_OS::sleep(1);
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl
index 64932b1e51d..8c021fc59c4 100755
--- a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl
@@ -5,71 +5,46 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 # $Id$
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
 $file = PerlACE::LocalFile ("test.ior");
-$cvsfile= PerlACE::LocalFile ("svc.conf");
-unlink $cvsfile;
 
-sub DoTest
-{
-  $status = 0;
-
-  if (PerlACE::is_vxworks_test()) {
-      $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
-  }
-  else {
-      $SV = new PerlACE::Process ("server", "-o $file");    
-  }
-  $CL = new PerlACE::Process ("client", "-k file://$file");
-
-  print STDERR "\n\n==== Running PICurrent test\n";
+unlink $file;
 
-  unlink $file;
-  $SV->Spawn ();
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
+}
+else {
+    $SV = new PerlACE::Process ("server", "-o $file");    
+}
+$CL = new PerlACE::Process ("client", "-k file://$file");
 
-  if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-      print STDERR "ERROR: cannot find file <$file>\n";
-      $SV->Kill (); 
-      return 1;
-  }
+print STDERR "\n\n==== Running PICurrent test\n";
 
-  $client = $CL->SpawnWaitKill (60);
+$SV->Spawn ();
 
-  if ($client != 0) {
-      print STDERR "ERROR: client returned $client\n";
-      $status = 1;
-  }
+if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+    print STDERR "ERROR: cannot find file <$file>\n";
+    $SV->Kill (); 
+    exit 1;
+}
 
-  $serverexit = $SV->WaitKill (20);
+$client = $CL->SpawnWaitKill (60);
 
-  if ($serverexit != 0) {
-      print STDERR "ERROR: server returned $serverexit\n";
-      $status = $serverexit;
-  }
-  
-  return $status;
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
 }
 
-print STDERR "\n\n==== Without svc.conf (single-threaded)\n";
-$status= DoTest();
-if (0 != $status) {
-   exit $status
-}
+$server = $SV->WaitKill (5);
 
-$line= "static Server_Strategy_Factory \"-ORBConcurrency thread-per-connection\"\n";
-open ($fh, '>', $cvsfile);
-syswrite ($fh, $line);
-close ($fh);
-print STDERR "\n\n==== With svc.conf (thread-per-connection)\n";
-$status= DoTest();
-if (0 != $status) {
-   exit $status
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
 }
 
 unlink $file;
-unlink $cvsfile;
 
 exit $status;
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index 46f5cde72a1..3e0b650480f 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -1,7 +1,6 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
-#include "ace/OS_NS_unistd.h"
 
 #include "test_i.h"
 #include "ServerORBInitializer.h"
@@ -145,7 +144,6 @@ main (int argc, char *argv[])
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_OS::sleep(1);
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/.cvsignore b/TAO/tests/Portable_Interceptors/PolicyFactory/.cvsignore
new file mode 100644
index 00000000000..254defddb53
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/.cvsignore
@@ -0,0 +1 @@
+server
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Makefile.am b/TAO/tests/Portable_Interceptors/PolicyFactory/Makefile.am
deleted file mode 100644
index 842cae5254b..00000000000
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_PolicyFactory_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  IORInterceptor.cpp \
-  Policy.cpp \
-  PolicyFactory.cpp \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  testC.cpp \
-  IORInterceptor.h \
-  Policy.h \
-  PolicyFactory.h \
-  Server_ORBInitializer.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
index c82b4816ef0..58fa821c094 100755
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
@@ -6,7 +6,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 #
 # $Id$
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am
deleted file mode 100644
index f82da09602d..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am
+++ /dev/null
@@ -1,93 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_ProcMode_Collocated_Collocated.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = PI_ProcMode_Collocated_Test
-
-PI_ProcMode_Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-PI_ProcMode_Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Echo_Collocated_ORBInitializer.cpp \
-  Server_Task.cpp \
-  interceptors.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Client_Task.h \
-  Echo_Collocated_ORBInitializer.h \
-  Server_Task.h \
-  interceptors.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-PI_ProcMode_Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am
deleted file mode 100644
index 40e67c75e8c..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Collocated \
-        Remote
-
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am
deleted file mode 100644
index 2cda399ffa0..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am
+++ /dev/null
@@ -1,127 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_ProcMode_Remote_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_ProcMode_Remote_RemoteServer.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += PI_ProcMode_Remote_TestServer
-
-PI_ProcMode_Remote_TestServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-PI_ProcMode_Remote_TestServer_SOURCES = \
-  Echo_Server_ORBInitializer.cpp \
-  Server_Task.cpp \
-  server_interceptor.cpp \
-  server_main.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Echo_Server_ORBInitializer.h \
-  Server_Task.h \
-  server_interceptor.h \
-  test_i.h
-
-PI_ProcMode_Remote_TestServer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_ProcMode_Remote_RemoteClient.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += PI_ProcMode_Remote_TestClient
-
-PI_ProcMode_Remote_TestClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-PI_ProcMode_Remote_TestClient_SOURCES = \
-  Client_Task.cpp \
-  Echo_Client_ORBInitializer.cpp \
-  client_interceptor.cpp \
-  client_main.cpp \
-  testC.cpp \
-  Client_Task.h \
-  Echo_Client_ORBInitializer.h \
-  client_interceptor.h
-
-PI_ProcMode_Remote_TestClient_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
index 240208b4dda..deab03af74f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
@@ -1,45 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags -= -St
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*RemoteServer): taoserver, pi_server, interceptors {
   exename = PI_ProcMode_Remote_TestServer
-  after += *idl
   Source_Files {
+    testC.cpp
+    testS.cpp
     test_i.cpp
     server_interceptor.cpp
     Echo_Server_ORBInitializer.cpp
     server_main.cpp
     Server_Task.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*RemoteClient): taoclient, portableserver, pi, interceptors {
   exename = PI_ProcMode_Remote_TestClient
-  after += *idl
-  after += *RemoteServer
   Source_Files {
+    testC.cpp
     client_interceptor.cpp
     Echo_Client_ORBInitializer.cpp
     client_main.cpp
     Client_Task.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
index 9889379c63d..a1928755bec 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
@@ -154,6 +154,8 @@ Echo_Server_Request_Interceptor::send_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
+  ++server_interceptor_check_;
+
   CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -168,15 +170,6 @@ Echo_Server_Request_Interceptor::send_exception (
   ACE_CHECK;
 
   CORBA::TypeCode_var type = any->type ();
-  if (0 == type.in())
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "No TypeCode information available; perhaps the user IDL\n"
-                  "  has been compiled with TAO_IDL \"-St -Sa\" options?\n"));
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
-
-  ++server_interceptor_check_;
 
   const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am
deleted file mode 100644
index bffd8a890b0..00000000000
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Register_ORBInitializer_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  Client_ORBInitializer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
deleted file mode 100644
index 9633a8d5413..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-
-#include "Client_ORBInitializer.h"
-
-ACE_RCSID (Redirection,
-           Client_ORBInitializer,
-           "$Id$")
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "Client_Request_Interceptor.h"
-#include "tao/StringSeqC.h"
-#include "tao/ORB_Constants.h"
-#include "ace/OS_NS_string.h"
-
-void
-Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::String_var forward_str;
-
-  // Extract the last forward reference from the argument list.
-  CORBA::ULong args_len = args->length ();
-  for (CORBA::ULong i = 0; i < args_len; ++i)
-    if (ACE_OS::strcmp ("-s", args[i]) == 0
-        && i < (args_len - 1))
-      forward_str = args[i + 1];
-
-  PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
-    PortableInterceptor::ClientRequestInterceptor::_nil ();
-
-  // Install the client request interceptor.
-  ACE_NEW_THROW_EX (interceptor,
-                    Client_Request_Interceptor (orb_id.in (),
-                                                forward_str.in ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  PortableInterceptor::ClientRequestInterceptor_var
-    client_interceptor = interceptor;
-
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-}
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
deleted file mode 100644
index dde588fb113..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef TAO_CLIENT_ORB_INITIALIZER_H
-#define TAO_CLIENT_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/PI.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#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)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Client side ORB initializer.
-class Client_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CLIENT_ORB_INITIALIZER_H */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
deleted file mode 100644
index 9cf394aa5b5..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-
-#include "Client_Request_Interceptor.h"
-#include "testC.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (Redirection,
-           Client_Request_Interceptor,
-           "$Id$")
-
-Client_Request_Interceptor::Client_Request_Interceptor (
-  const char *orb_id,
-  const char *forward_str)
-  : orb_id_ (CORBA::string_dup (orb_id)),
-    orb_ (),
-    request_count_ (0),
-    forward_str_ (CORBA::string_dup (forward_str))
-{
-}
-
-char *
-Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup ("Client_Request_Interceptor");
-}
-
-void
-Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Client_Request_Interceptor::send_request (
-      PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  ++this->request_count_;
-}
-
-void
-Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  if (CORBA::is_nil (this->orb_.in ()))
-  {
-    int argc = 0;
-    this->orb_ = CORBA::ORB_init (argc,
-                                  0,
-                                  this->orb_id_.in ());
-  }
-
-  CORBA::Object_var forward =
-  this->orb_->string_to_object (this->forward_str_.in ());
-
-  // Notice that this is not a permanent forward.
-  ACE_THROW (PortableInterceptor::ForwardRequest (forward.in ()));
-}
-
-void
-Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
deleted file mode 100644
index fc6786cc224..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef CLIENT_REQUEST_INTERCEPTOR_H
-#define CLIENT_REQUEST_INTERCEPTOR_H
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI/PI.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-#include "tao/ORB.h"
-#include "tao/CORBA_String.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class Client_Request_Interceptor
- */
-class Client_Request_Interceptor
-  : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor.
-  Client_Request_Interceptor (const char *orb_id,
-                              const char *forward_str);
-
-  /**
-   * @name Methods Required by the Client Request Interceptor
-   * Interface
-   *
-   * These are methods that must be implemented since they are pure
-   * virtual in the abstract base class.  They are the canonical
-   * methods required for all client request interceptors.
-   */
-  //@{
-  /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-  //@}
-
-private:
-
-  ///The ID of the ORB this interceptor is registered with.
-  CORBA::String_var orb_id_;
-
-  /// Pseudo-reference to the ORB this interceptor is registered
-  /// with.
-  CORBA::ORB_var orb_;
-
-  /// The number of requests intercepted by this interceptor.
-  CORBA::ULong request_count_;
-
-  CORBA::String_var forward_str_;
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif  /* CLIENT_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp
deleted file mode 100644
index 3a0f5ad82ac..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
-#include "CrashPoint.h"
-
-short crash_point = 0;
diff --git a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h
deleted file mode 100644
index a3729431834..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
-#ifndef CRASH_POINT_H
-#define CRASH_POINT_H
-
-// Valid crash-point values:
-//
-// 0 no crash (default)
-//
-// 1 crash before logging the reply
-//
-// 2 crash after logging the reply but before replying to the client
-//
-
-extern short crash_point;
-
-#endif // CRASH_POINT_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Makefile.am b/TAO/tests/Portable_Interceptors/Redirection/Makefile.am
deleted file mode 100644
index 658dfa945ad..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/Makefile.am
+++ /dev/null
@@ -1,128 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Redirection_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Redirection_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Redirection_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  CrashPoint.cpp \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  CrashPoint.h \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc b/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc
deleted file mode 100644
index 2609cbc8946..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
-  after += *idl
-
-  Source_Files {
-    test_i.cpp
-    Server_ORBInitializer.cpp
-    Server_Request_Interceptor.cpp
-    CrashPoint.cpp
-    server.cpp
-  }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*Client): taoclient, valuetype, pi, pi_server, interceptors {
-  after += *idl
-
-  Source_Files {
-    testC.cpp
-    Client_ORBInitializer.cpp
-    Client_Request_Interceptor.cpp
-    client.cpp
-  }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
-}
-
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
deleted file mode 100644
index 822a351436d..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-
-#include "Server_ORBInitializer.h"
-
-ACE_RCSID (Redirection,
-           Server_ORBInitializer,
-           "$Id$")
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "Server_Request_Interceptor.h"
-#include "tao/ORB_Constants.h"
-
-Server_ORBInitializer::Server_ORBInitializer (void)
-{
-}
-
-void
-Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
-  ACE_NEW_THROW_EX (interceptor,
-                    Server_Request_Interceptor,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  info->add_server_request_interceptor (interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
deleted file mode 100644
index fffd3e7b89c..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef TAO_SERVER_ORB_INITIALIZER_H
-#define TAO_SERVER_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/PI.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#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)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-// Forward declaration.
-class Server_Request_Interceptor;
-
-/// Server side ORB initializer.
-class Server_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor.
-  Server_ORBInitializer (void);
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SERVER_ORB_INITIALIZER_H */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
deleted file mode 100644
index 9ab80aa7110..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-#include "Server_Request_Interceptor.h"
-#include "tao/ORB_Constants.h"
-#include "ace/Log_Msg.h"
-#include "CrashPoint.h"
-
-ACE_RCSID (Redirection,
-           Server_Request_Interceptor,
-           "$Id$")
-
-Server_Request_Interceptor::Server_Request_Interceptor (void)
-  : request_count_ (0)
-{
-}
-
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
-{
-}
-
-char *
-Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup ("Server_Request_Interceptor");
-}
-
-void
-Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  this->request_count_++;
-}
-
-void
-Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (crash_point == 1 && this->request_count_ == 2) ACE_OS::exit (1);
-}
-
-void
-Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
deleted file mode 100644
index 4dc535962a1..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef SERVER_REQUEST_INTERCEPTOR_H
-#define SERVER_REQUEST_INTERCEPTOR_H
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "testC.h"
-#include "tao/LocalObject.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/PI_Server/PI_Server.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class Server_Request_Interceptor
- */
-class Server_Request_Interceptor
-  : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor.
-  Server_Request_Interceptor (void);
-
-  /**
-   * @name Methods Required by the Server Request Interceptor
-   * Interface
-   *
-   * These are methods that must be implemented since they are pure
-   * virtual in the abstract base class.  They are the canonical
-   * methods required for all server request interceptors.
-   */
-  //@{
-  /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-  //@}
-
-protected:
-
-  /// Destructor.
-  ~Server_Request_Interceptor (void);
-
-private:
-
-  /// The number of requests intercepted by this interceptor.
-  CORBA::ULong request_count_;
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif  /* SERVER_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
deleted file mode 100644
index 8da1c03c45b..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Get_Opt.h"
-#include "testC.h"
-#include "Client_ORBInitializer.h"
-#include "tao/ORBInitializer_Registry.h"
-
-ACE_RCSID (Redirection,
-           client,
-           "$Id$")
-
-const char *ior1 = 0;
-const char *ior2 = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  if (argc != 5)  // foo -p IOR_1 -s IOR_2
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Wrong number of arguments.\n"),
-                      -1);
-
-  ACE_Get_Opt get_opts (argc, argv, "p:s:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'p':
-        ior1 = get_opts.opt_arg ();
-        break;
-      case 's':
-        ior2 = get_opts.opt_arg ();
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage:  %s "
-                           "-p IOR_1 -s IOR_2\n",
-                           argv[0]),
-                          -1);
-      }
-
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int status = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-#if TAO_HAS_INTERCEPTORS == 1
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      ACE_NEW_RETURN (temp_initializer,
-                      Client_ORBInitializer,
-                      -1);  // No exceptions yet!
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (::parse_args (argc, argv) != 0)
-        return -1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RedirectionTest::test_var server =
-        RedirectionTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior1),
-                            1);
-        }
-
-      CORBA::Short number = 0;
-      for (int i = 1; i <= 4; ++i)
-        {
-          ACE_DEBUG ((LM_INFO,
-                      "CLIENT: Issuing request %d.\n",
-                      i));
-
-          number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_INFO,
-                      "CLIENT: Request %d handled by object %d.\n",
-                      i,
-                      number));
-        }
-
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  if (status != -1)
-    ACE_DEBUG ((LM_INFO,
-                "PortableInterceptor::Redirection test passed.\n"));
-
-  return status;
-}
diff --git a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
deleted file mode 100755
index 024921a57cd..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
+++ /dev/null
@@ -1,75 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-#
-# $Id$
-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-
-$file1 = PerlACE::LocalFile ("test1.ior");
-$file2 = PerlACE::LocalFile ("test2.ior");
-
-unlink $file1;
-unlink $file2;
-
-$SV1 = new PerlACE::Process ("server", "-o $file1 -c 1 -n 1");
-$SV2 = new PerlACE::Process ("server", "-o $file2 -n 2");
-$CL = new PerlACE::Process ("client", "-p file://$file1 -s file://$file2");
-
-$status = 0;
-
-print STDERR "\n\n==== Running PortableInterceptor::Redirection test\n";
-
-$SV1->Spawn ();
-$SV2->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file1, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file1>\n";
-    $SV1->Kill ();
-    exit 1;
-}
-
-if (PerlACE::waitforfile_timed ($file2, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file2>\n";
-    $SV2->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server1 = $SV1->WaitKill (5);
-
-# The first server will crash by design and in such instance it will
-# return the magic number 1. The test must not interpret it as an
-# error.
-
-if ($server1 != 0) {
-    if ($server1 != 1) {
-        print STDERR "ERROR: server1 returned $server1\n";
-        $status = 1;
-    }
-    else {
-        print STDERR "INFO: server1 commited suicide as expected\n";
-    }
-}
-
-$server2 = $SV2->WaitKill (5);
-
-if ($server2 != 0) {
-    print STDERR "ERROR: server2 returned $server2\n";
-    $status = 1;
-}
-
-unlink $file1;
-unlink $file2;
-
-exit $status;
diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
deleted file mode 100644
index 6ea299edcb3..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Get_Opt.h"
-#include "test_i.h"
-#include "Server_ORBInitializer.h"
-#include "Server_Request_Interceptor.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "ace/OS_NS_stdio.h"
-#include "CrashPoint.h"
-
-ACE_RCSID (Redirection,
-           server,
-           "$Id$")
-
-const char *ior_file = 0;
-int number = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:c:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_file = get_opts.opt_arg ();
-        break;
-      case 'c':
-        crash_point = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'n':
-        number = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage:  %s "
-                           "-o <IOR> "
-                           "-c <CrashPoint> "
-                           "-n <server number> \n",
-                           argv[0]),
-                          -1);
-      }
-
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-#if TAO_HAS_INTERCEPTORS == 1
-      Server_ORBInitializer *temp_initializer = 0;
-      ACE_NEW_RETURN (temp_initializer,
-                      Server_ORBInitializer,
-                      -1);  // No exceptions yet!
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" 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;
-
-      test_i *test_impl;
-      ACE_NEW_RETURN (test_impl, test_i (number, orb.in ()), 1);
-      PortableServer::ServantBase_var owner_transfer (test_impl);
-
-      RedirectionTest::test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      FILE *output_file= ACE_OS::fopen (ior_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file <%s> for writing "
-                           "IOR: %s",
-                           ior.in ()),
-                          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;
-
-      // Run the ORB event loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test.idl b/TAO/tests/Portable_Interceptors/Redirection/test.idl
deleted file mode 100644
index 8a89326b9c9..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/test.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- IDL -*-
-// $Id$
-
-#include "tao/PI_Server/PI_Server_include.pidl"
-
-module RedirectionTest
-{
-  interface test
-  {
-    /// Return the number assigned to the current object.  For
-    /// example, object one will return "1," and object two will
-    /// return "2."
-    short number ();
-
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
deleted file mode 100644
index 631d5a349e1..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-
-#include "test_i.h"
-
-ACE_RCSID (Redirection,
-           test_i,
-           "$Id$")
-
-test_i::test_i (CORBA::Short num,
-                CORBA::ORB_ptr orb)
-  : number_ (num),
-    orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-test_i::~test_i (void)
-{
-}
-
-CORBA::Short
-test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->number_;
-}
-
-void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Server is shutting down via object %d.\n",
-              this->number_));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
deleted file mode 100644
index 643fb36e3c7..00000000000
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-
-#ifndef TEST_I_H
-#define TEST_I_H
-
-#include "testS.h"
-
-/**
- * @class test_i
- *
- * @brief Simple test class.
- *
- * This class implements the "test" interface used in this test.
- *
- * $Id$
- */
-class test_i : public virtual POA_RedirectionTest::test
-{
-public:
-
-  /// Constructor.
-  test_i (CORBA::Short num,
-          CORBA::ORB_ptr orb);
-
-  /// Destructor.
-  ~test_i (void);
-
-  /// Return the number assigned to this object.
-  virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  /// The number assigned to this object.
-  CORBA::Short number_;
-
-  /// Pseudo-reference to the ORB.
-  CORBA::ORB_var orb_;
-
-};
-
-#endif  /* TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Makefile.am b/TAO/tests/Portable_Interceptors/Register_Initial_References/Makefile.am
deleted file mode 100644
index 7df0c9c93ac..00000000000
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Register_ORBInitializer_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
index 87e209cd234..ccbc8aefdca 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
@@ -4,9 +4,8 @@
 //
 
 #include "Server_ORBInitializer.h"
-#include "test_i.h"
 #include "tao/ORBInitializer_Registry.h"
-#include "tao/ORB_Constants.h"
+#include "test_i.h"
 
 ACE_RCSID (Recursive_ORBInitializer,
            Server_ORBInitializer,
@@ -89,7 +88,7 @@ Server_ORBInitializer::pre_init (
     }
   ACE_CATCH (CORBA::BAD_PARAM , ex)
     {
-      if (ex.minor () == (CORBA::OMGVMCID | 27))
+      if ((ex.minor() & 0xFFFU) == 27)
         {
           invalid_object = true;
         }
@@ -101,7 +100,7 @@ Server_ORBInitializer::pre_init (
 
   if (!invalid_object)
     ACE_ERROR ((LM_ERROR, "ERROR: Registering with a nil object to ORBInitInfo "
-                          "doesn't throw bad param with OMG minor code 27\n"));
+                          "doesn't throw bad param with minor code 27\n"));
 }
 
 void
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.cvsignore b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am
deleted file mode 100644
index 16342607c04..00000000000
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am
+++ /dev/null
@@ -1,126 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Request_Interceptor_Flow_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Request_Interceptor_Flow_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Request_Interceptor.cpp \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Request_Interceptor.h \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Request_Interceptor_Flow_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  Request_Interceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h \
-  Request_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
index a93b7879472..ee81ede8553 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
@@ -1,16 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  idlflags -= -St
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, pi_server, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
     Server_ORBInitializer.cpp
@@ -18,26 +9,16 @@ project(*Server): taoserver, pi_server, interceptors {
     Request_Interceptor.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, pi, interceptors {
-  after += *idl
   after += *Server
   Source_Files {
+    testC.cpp
     Client_ORBInitializer.cpp
     Client_Request_Interceptor.cpp
     Request_Interceptor.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl
index b81cef5bf37..162acd63c17 100755
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 # $Id$
 
-use lib  "$ENV{ACE_ROOT}/bin";
+use lib  '../../../../bin';
 use PerlACE::Run_Test;
 
 $status = 0;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.cvsignore b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am
deleted file mode 100644
index bb542e1d16f..00000000000
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Svc_Context_Manip_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Svc_Context_Manip_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Svc_Context_Manip_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  client_interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
index 495f722563e..2e992878fcb 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -1,39 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, pi_server, interceptors {
-  after += *idl
   Source_Files {
     test_i.cpp
     Server_ORBInitializer.cpp
     server_interceptor.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, pi, interceptors {
   after += *Server
   Source_Files {
+    testC.cpp
     Client_ORBInitializer.cpp
     client_interceptor.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Portable_Interceptors/Slot/Makefile.am b/TAO/tests/Portable_Interceptors/Slot/Makefile.am
deleted file mode 100644
index 5e0d16c1a6d..00000000000
--- a/TAO/tests/Portable_Interceptors/Slot/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_Slot_Driver.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS = driver
-
-driver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-driver_SOURCES = \
-  driver.cpp
-
-driver_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/QtTests/.cvsignore b/TAO/tests/QtTests/.cvsignore
new file mode 100644
index 00000000000..51933fcff4f
--- /dev/null
+++ b/TAO/tests/QtTests/.cvsignore
@@ -0,0 +1,8 @@
+client
+client
+client_moc.cpp
+client_moc.cpp
+server
+server
+test_i_moc.cpp
+test_i_moc.cpp
diff --git a/TAO/tests/QtTests/Makefile.am b/TAO/tests/QtTests/Makefile.am
deleted file mode 100644
index cce58b2f718..00000000000
--- a/TAO/tests/QtTests/Makefile.am
+++ /dev/null
@@ -1,178 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.QtTests_Server.am
-
-if BUILD_ACE_QTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_QT
-if BUILD_TAO_QTRESOURCE
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  test_i_moc.cpp
-
-CLEANFILES += \
-  test_i_moc.cpp
-
-test_i_moc.cpp: $(srcdir)/test_i.h
-	$(QTDIR)/bin/moc  $(srcdir)/test_i.h -o test_i_moc.cpp
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_QT_CPPFLAGS)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i_moc.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-server_LDFLAGS = \
- $(ACE_QT_LDFLAGS)
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_QtResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_QT_LIBS)
-
-endif BUILD_TAO_QTRESOURCE
-endif BUILD_QT
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_QTREACTOR
-
-## Makefile.QtTests_Client.am
-
-if BUILD_ACE_QTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_QT
-if BUILD_TAO_QTRESOURCE
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  client_moc.cpp
-
-CLEANFILES += \
-  client_moc.cpp
-
-client_moc.cpp: $(srcdir)/client.h
-	$(QTDIR)/bin/moc  $(srcdir)/client.h -o client_moc.cpp
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_QT_CPPFLAGS)
-
-client_SOURCES = \
-  client.cpp \
-  client_moc.cpp \
-  testC.cpp \
-  client.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDFLAGS = \
- $(ACE_QT_LDFLAGS)
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_QtResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_QT_LIBS)
-
-endif BUILD_TAO_QTRESOURCE
-endif BUILD_QT
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_QTREACTOR
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 0139cdf6672..0139cdf6672 100644..100755
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index e4b50c40a70..e4b50c40a70 100644..100755
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 68ed428b4b6..68ed428b4b6 100644..100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
diff --git a/TAO/tests/QtTests/test.idl b/TAO/tests/QtTests/test.idl
index 1dc08b44be6..1dc08b44be6 100644..100755
--- a/TAO/tests/QtTests/test.idl
+++ b/TAO/tests/QtTests/test.idl
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 0d961989108..0d961989108 100644..100755
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index ac04d36afc9..ac04d36afc9 100644..100755
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
diff --git a/TAO/tests/Queued_Message_Test/.cvsignore b/TAO/tests/Queued_Message_Test/.cvsignore
new file mode 100644
index 00000000000..ef1558284ab
--- /dev/null
+++ b/TAO/tests/Queued_Message_Test/.cvsignore
@@ -0,0 +1 @@
+Queued_Message_Test
diff --git a/TAO/tests/Queued_Message_Test/Makefile.am b/TAO/tests/Queued_Message_Test/Makefile.am
deleted file mode 100644
index f7e4ca76e66..00000000000
--- a/TAO/tests/Queued_Message_Test/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Queued_Message_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Queued_Message_Test
-
-Queued_Message_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Queued_Message_Test_SOURCES = \
-  Queued_Message_Test.cpp
-
-Queued_Message_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.cvsignore b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.cvsignore
new file mode 100644
index 00000000000..9daeafb9864
--- /dev/null
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.cvsignore
@@ -0,0 +1 @@
+test
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am
deleted file mode 100644
index caf5740f1d4..00000000000
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.AO_Multiple_ORBs.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Banded_Connections/.cvsignore b/TAO/tests/RTCORBA/Banded_Connections/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Banded_Connections/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Banded_Connections/Makefile.am b/TAO/tests/RTCORBA/Banded_Connections/Makefile.am
deleted file mode 100644
index a6440b36851..00000000000
--- a/TAO/tests/RTCORBA/Banded_Connections/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Banded_Conn_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Banded_Conn_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Banded_Conn_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
index b0b7fbf765a..b62ff14a3d9 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
+++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): rt_server {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): rt_client {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/Client_Propagated/.cvsignore b/TAO/tests/RTCORBA/Client_Propagated/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Client_Propagated/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am b/TAO/tests/RTCORBA/Client_Propagated/Makefile.am
deleted file mode 100644
index 9502ecee8a8..00000000000
--- a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Client_Propagated_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Client_Propagated_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Client_ORBInitializer.h \
-  interceptors.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Client_Propagated_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  interceptors.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  interceptors.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
index 083f7252710..9f0ce92c6ea 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
+++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
@@ -1,21 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): rt_server {
-  after += *idl
   Source_Files {
     server.cpp
-    testS.cpp
-    testC.cpp
-  }
-  IDL_Files {
   }
 }
 
@@ -27,6 +15,5 @@ project(*Client): rt_client, interceptors {
     Client_ORBInitializer.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/RTCORBA/Client_Protocol/.cvsignore b/TAO/tests/RTCORBA/Client_Protocol/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Client_Protocol/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Client_Protocol/Makefile.am b/TAO/tests/RTCORBA/Client_Protocol/Makefile.am
deleted file mode 100644
index 3d0b9e87f71..00000000000
--- a/TAO/tests/RTCORBA/Client_Protocol/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Client_Protocol_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Client_Protocol_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Client_Protocol_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
index 768b49acf2f..e51a077e7fe 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): strategies, rt_server {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): strategies, rt_client {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/Collocation/.cvsignore b/TAO/tests/RTCORBA/Collocation/.cvsignore
new file mode 100644
index 00000000000..bee89094a99
--- /dev/null
+++ b/TAO/tests/RTCORBA/Collocation/.cvsignore
@@ -0,0 +1 @@
+Collocation
diff --git a/TAO/tests/RTCORBA/Collocation/Makefile.am b/TAO/tests/RTCORBA/Collocation/Makefile.am
deleted file mode 100644
index 2b6d3de3509..00000000000
--- a/TAO/tests/RTCORBA/Collocation/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTCORBA_Collocation_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocation
-
-Collocation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocation_SOURCES = \
-  Collocation.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Collocation_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/.cvsignore b/TAO/tests/RTCORBA/Destroy_Thread_Pool/.cvsignore
new file mode 100644
index 00000000000..507a06df4d9
--- /dev/null
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/.cvsignore
@@ -0,0 +1 @@
+Destroy_Thread_Pool
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am
deleted file mode 100644
index 0244903c9e5..00000000000
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTCORBA_Destroy_Thread_Pool_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = Destroy_Thread_Pool
-
-Destroy_Thread_Pool_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Destroy_Thread_Pool_SOURCES = \
-  Destroy_Thread_Pool.cpp
-
-Destroy_Thread_Pool_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Diffserv/.cvsignore b/TAO/tests/RTCORBA/Diffserv/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Diffserv/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Diffserv/Makefile.am b/TAO/tests/RTCORBA/Diffserv/Makefile.am
deleted file mode 100644
index 8f22594f947..00000000000
--- a/TAO/tests/RTCORBA/Diffserv/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Diffserv_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Diffserv_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Custom_Network_Priority_Mapping.cpp \
-  client.cpp \
-  testC.cpp \
-  Custom_Network_Priority_Mapping.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Diffserv_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Custom_Network_Priority_Mapping.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Custom_Network_Priority_Mapping.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
index 91b149ffd7a..85cadf3219a 100644
--- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -1,37 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*client) : taoexe, portableserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*client) : taoexe, portableserver, rtcorba, minimum_corba {
   source_files {
     client.cpp
     Custom_Network_Priority_Mapping.cpp
   }
-  source_files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*server) : taoexe, rtportableserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba {
   after += *client
   source_files {
     server.cpp
     Custom_Network_Priority_Mapping.cpp
   }
-  source_files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am
deleted file mode 100644
index c01d8f58cfb..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RT_Dynamic_Thread_Pool_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RT_Dynamic_Thread_Pool_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RT_Dynamic_Thread_Pool_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
index b5e0ed23f6d..ebf79370785 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): strategies, rt_server, minimum_corba {
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): strategies, rt_client, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/.cvsignore b/TAO/tests/RTCORBA/Explicit_Binding/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Explicit_Binding/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am b/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am
deleted file mode 100644
index e7b995445be..00000000000
--- a/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Explicit_Binding_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Explicit_Binding_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Explicit_Binding_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
index 9cd33a6af63..a77351b5090 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
+++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
@@ -1,36 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  Source_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): strategies, rt_server, minimum_corba {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): strategies, rt_client, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/RTCORBA/Linear_Priority/.cvsignore b/TAO/tests/RTCORBA/Linear_Priority/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Linear_Priority/Makefile.am b/TAO/tests/RTCORBA/Linear_Priority/Makefile.am
deleted file mode 100644
index 4f061caddbe..00000000000
--- a/TAO/tests/RTCORBA/Linear_Priority/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Linear_Priority_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Linear_Priority_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Linear_Priority_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index 1aa4e9117dd..87178218057 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): rt_server, minimum_corba {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): rt_client, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.cvsignore b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.cvsignore
new file mode 100644
index 00000000000..7f6ba2d23d8
--- /dev/null
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.cvsignore
@@ -0,0 +1,3 @@
+client
+server
+test_run.data
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am
deleted file mode 100644
index ab33bc2b948..00000000000
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_MT_Client_Proto_Prio_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_MT_Client_Proto_Prio_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_MT_Client_Proto_Prio_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/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 7c92380ae57..a77351b5090 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,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  Source_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): strategies, rt_server, minimum_corba {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): strategies, rt_client, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/Makefile.am b/TAO/tests/RTCORBA/Makefile.am
deleted file mode 100644
index 568e309829e..00000000000
--- a/TAO/tests/RTCORBA/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Activate_Object_Multiple_ORBs \
-        Banded_Connections \
-        Client_Propagated \
-        Client_Protocol \
-        Collocation \
-        Destroy_Thread_Pool \
-        Diffserv \
-        Dynamic_Thread_Pool \
-        Explicit_Binding \
-        Linear_Priority \
-        MT_Client_Protocol_Priority \
-        ORB_init \
-        Persistent_IOR \
-        Policies \
-        Policy_Combinations \
-        Priority_Inversion_With_Bands \
-        Private_Connection \
-        Profile_And_Endpoint_Selection \
-        RTMutex \
-        Server_Declared \
-        Server_Protocol \
-        Thread_Pool
-
diff --git a/TAO/tests/RTCORBA/ORB_init/.cvsignore b/TAO/tests/RTCORBA/ORB_init/.cvsignore
new file mode 100644
index 00000000000..c32f7b71039
--- /dev/null
+++ b/TAO/tests/RTCORBA/ORB_init/.cvsignore
@@ -0,0 +1 @@
+ORB_init
diff --git a/TAO/tests/RTCORBA/ORB_init/Makefile.am b/TAO/tests/RTCORBA/ORB_init/Makefile.am
deleted file mode 100644
index 3b87ae65eeb..00000000000
--- a/TAO/tests/RTCORBA/ORB_init/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ORB_init_RT.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = ORB_init
-
-ORB_init_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ORB_init_SOURCES = \
-  ORB_init.cpp
-
-ORB_init_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/.cvsignore b/TAO/tests/RTCORBA/Persistent_IOR/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am b/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am
deleted file mode 100644
index 900b459b6af..00000000000
--- a/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Persistent_IOR_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Persistent_IOR_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Persistent_IOR_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index 1aa4e9117dd..87178218057 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): rt_server, minimum_corba {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): rt_client, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/Policies/.cvsignore b/TAO/tests/RTCORBA/Policies/.cvsignore
new file mode 100644
index 00000000000..a5bf361f073
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policies/.cvsignore
@@ -0,0 +1 @@
+Policies
diff --git a/TAO/tests/RTCORBA/Policies/Makefile.am b/TAO/tests/RTCORBA/Policies/Makefile.am
deleted file mode 100644
index ab5b6b9cbb4..00000000000
--- a/TAO/tests/RTCORBA/Policies/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTCORBA_Policies_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = Policies
-
-Policies_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Policies_SOURCES = \
-  Policies.cpp
-
-Policies_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc
index 4daa7ba8db6..1e97eefaee4 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.mpc
+++ b/TAO/tests/RTCORBA/Policies/Policies.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTCORBA Policies Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(RTCORBA Policies Server): rt_server, minimum_corba {
 }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/.cvsignore b/TAO/tests/RTCORBA/Policy_Combinations/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am b/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am
deleted file mode 100644
index 974eddb7ca1..00000000000
--- a/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Policy_Combinations_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Policy_Combinations_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Policy_Combinations_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index 4ac469e8021..c7a5f0c3229 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): rt_server, minimum_corba {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): rt_client {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.cvsignore b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am
deleted file mode 100644
index edf7aa93fe0..00000000000
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Priority_Inversion_With_Bands_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Priority_Inversion_With_Bands_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Priority_Inversion_With_Bands_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/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 b5e0ed23f6d..ebf79370785 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,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): strategies, rt_server, minimum_corba {
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): strategies, rt_client, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/Private_Connection/.cvsignore b/TAO/tests/RTCORBA/Private_Connection/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Private_Connection/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Private_Connection/Makefile.am b/TAO/tests/RTCORBA/Private_Connection/Makefile.am
deleted file mode 100644
index 9793748bc8d..00000000000
--- a/TAO/tests/RTCORBA/Private_Connection/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Private_Connection_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Private_Connection_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Private_Connection_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index 21db1ec8e87..87178218057 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -1,36 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): rt_server, minimum_corba {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): rt_client, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.cvsignore b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am
deleted file mode 100644
index 1c41ae685cc..00000000000
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am
+++ /dev/null
@@ -1,117 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PaE_Selection_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PaE_Selection_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.PaE_Selection_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
index d467c773e74..4d9a96b12f0 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
@@ -1,33 +1,13 @@
 // $Id$
-
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-project(*Server): rt_server, strategies, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): rt_server, strategies, portableserver, minimum_corba {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): rt_client, strategies, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): rt_client, strategies, portableserver, minimum_corba {
   after += *Server
   Source_Files {
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/RTCORBA/RTMutex/.cvsignore b/TAO/tests/RTCORBA/RTMutex/.cvsignore
new file mode 100644
index 00000000000..254defddb53
--- /dev/null
+++ b/TAO/tests/RTCORBA/RTMutex/.cvsignore
@@ -0,0 +1 @@
+server
diff --git a/TAO/tests/RTCORBA/RTMutex/Makefile.am b/TAO/tests/RTCORBA/RTMutex/Makefile.am
deleted file mode 100644
index 1890acac35f..00000000000
--- a/TAO/tests/RTCORBA/RTMutex/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTCORBA_RTMutex_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Server_Declared/.cvsignore b/TAO/tests/RTCORBA/Server_Declared/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Server_Declared/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Server_Declared/Makefile.am b/TAO/tests/RTCORBA/Server_Declared/Makefile.am
deleted file mode 100644
index 575d097568d..00000000000
--- a/TAO/tests/RTCORBA/Server_Declared/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Server_Declared_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Server_Declared_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Server_Declared_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
index b0b7fbf765a..b62ff14a3d9 100644
--- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
+++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): rt_server {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): rt_client {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/Server_Protocol/.cvsignore b/TAO/tests/RTCORBA/Server_Protocol/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Server_Protocol/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Server_Protocol/Makefile.am b/TAO/tests/RTCORBA/Server_Protocol/Makefile.am
deleted file mode 100644
index 6a7e503310a..00000000000
--- a/TAO/tests/RTCORBA/Server_Protocol/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Server_Protocol_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Server_Protocol_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Server_Protocol_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index 276def8a366..a77351b5090 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only =1
-}
-
-project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): strategies, rt_server, minimum_corba {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): strategies, rt_client, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTCORBA/Thread_Pool/.cvsignore b/TAO/tests/RTCORBA/Thread_Pool/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Thread_Pool/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/RTCORBA/Thread_Pool/Makefile.am b/TAO/tests/RTCORBA/Thread_Pool/Makefile.am
deleted file mode 100644
index a34d2c779ef..00000000000
--- a/TAO/tests/RTCORBA/Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Thread_Pool_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Thread_Pool_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Thread_Pool_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index b5e0ed23f6d..ebf79370785 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Server): strategies, rt_server, minimum_corba {
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after += *idl
+project(*Client): strategies, rt_client, minimum_corba {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/RTScheduling/Current/.cvsignore b/TAO/tests/RTScheduling/Current/.cvsignore
new file mode 100644
index 00000000000..d8a2b853f2c
--- /dev/null
+++ b/TAO/tests/RTScheduling/Current/.cvsignore
@@ -0,0 +1 @@
+Current
diff --git a/TAO/tests/RTScheduling/Current/Makefile.am b/TAO/tests/RTScheduling/Current/Makefile.am
deleted file mode 100644
index adf84014b02..00000000000
--- a/TAO/tests/RTScheduling/Current/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Current.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = Current
-
-Current_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Current_SOURCES = \
-  ../Scheduler.cpp \
-  Thread_Task.cpp \
-  test.cpp \
-  ../Scheduler.h \
-  Thread_Task.h
-
-Current_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTScheduling/DT_Spawn/.cvsignore b/TAO/tests/RTScheduling/DT_Spawn/.cvsignore
new file mode 100644
index 00000000000..6d033fa4b68
--- /dev/null
+++ b/TAO/tests/RTScheduling/DT_Spawn/.cvsignore
@@ -0,0 +1 @@
+DT_Spawn
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Makefile.am b/TAO/tests/RTScheduling/DT_Spawn/Makefile.am
deleted file mode 100644
index d83080144ba..00000000000
--- a/TAO/tests/RTScheduling/DT_Spawn/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DT_Spawn.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = DT_Spawn
-
-DT_Spawn_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-DT_Spawn_SOURCES = \
-  ../Scheduler.cpp \
-  test.cpp \
-  ../Scheduler.h
-
-DT_Spawn_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTScheduling/Makefile.am b/TAO/tests/RTScheduling/Makefile.am
deleted file mode 100644
index 7e300b181e6..00000000000
--- a/TAO/tests/RTScheduling/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Current \
-        DT_Spawn \
-        Scheduling_Interceptor \
-        Thread_Cancel \
-        VoidData
-
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/.cvsignore b/TAO/tests/RTScheduling/Scheduling_Interceptor/.cvsignore
new file mode 100644
index 00000000000..641465098f5
--- /dev/null
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/.cvsignore
@@ -0,0 +1,2 @@
+Scheduler_Interceptor_Client
+Scheduler_Interceptor_Server
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am
deleted file mode 100644
index 0d5fcfb4440..00000000000
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Scheduler_Interceptor_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Scheduler_Interceptor_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += Scheduler_Interceptor_Server
-
-Scheduler_Interceptor_Server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Scheduler_Interceptor_Server_SOURCES = \
-  ../Scheduler.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_server.cpp \
-  ../Scheduler.h
-
-Scheduler_Interceptor_Server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Scheduler_Interceptor_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += Scheduler_Interceptor_Client
-
-Scheduler_Interceptor_Client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Scheduler_Interceptor_Client_SOURCES = \
-  ../Scheduler.cpp \
-  testC.cpp \
-  test_client.cpp \
-  ../Scheduler.h
-
-Scheduler_Interceptor_Client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
index 63e7ef77111..a9fce2cd532 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
@@ -1,40 +1,21 @@
 // $Id$
-
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): rtscheduling_server {
-  after += *idl
   Source_Files {
     ../Scheduler.cpp
     test_server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 
   exename = Scheduler_Interceptor_Server
 }
 
 project(*Client) : rtscheduling_client {
-  after += *idl
   after += *Server
   Source_Files {
     ../Scheduler.cpp
-    test_client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    test_client.cpp
   }
 
   exename = Scheduler_Interceptor_Client 
 }
+
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/.cvsignore b/TAO/tests/RTScheduling/Thread_Cancel/.cvsignore
new file mode 100644
index 00000000000..08071dd183b
--- /dev/null
+++ b/TAO/tests/RTScheduling/Thread_Cancel/.cvsignore
@@ -0,0 +1 @@
+Thread_Cancel
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Makefile.am b/TAO/tests/RTScheduling/Thread_Cancel/Makefile.am
deleted file mode 100644
index e1a77bdb23b..00000000000
--- a/TAO/tests/RTScheduling/Thread_Cancel/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Thread_Cancel.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = Thread_Cancel
-
-Thread_Cancel_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Thread_Cancel_SOURCES = \
-  ../Scheduler.cpp \
-  Thread_Task.cpp \
-  test.cpp \
-  ../Scheduler.h \
-  Thread_Task.h
-
-Thread_Cancel_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/RTScheduling/VoidData/.cvsignore b/TAO/tests/RTScheduling/VoidData/.cvsignore
new file mode 100644
index 00000000000..64bcca2ae7e
--- /dev/null
+++ b/TAO/tests/RTScheduling/VoidData/.cvsignore
@@ -0,0 +1 @@
+VoidData
diff --git a/TAO/tests/RTScheduling/VoidData/Makefile.am b/TAO/tests/RTScheduling/VoidData/Makefile.am
deleted file mode 100644
index 660b00ebf3a..00000000000
--- a/TAO/tests/RTScheduling/VoidData/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.VoidData.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = VoidData
-
-VoidData_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-VoidData_SOURCES = \
-  testC.cpp \
-  test_client.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-VoidData_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Reliable_Oneways/.cvsignore b/TAO/tests/Reliable_Oneways/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Reliable_Oneways/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Reliable_Oneways/Makefile.am b/TAO/tests/Reliable_Oneways/Makefile.am
deleted file mode 100644
index 748c5ed0957..00000000000
--- a/TAO/tests/Reliable_Oneways/Makefile.am
+++ /dev/null
@@ -1,120 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Reliable_Oneways_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Reliable_Oneways_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Oneway_Receiver.cpp \
-  Shutdown_Helper.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Oneway_Receiver.h \
-  Shutdown_Helper.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Reliable_Oneways_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
index ddd2850b59d..2141f3040f5 100644
--- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
+++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
@@ -1,43 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, messaging {
-  after += *idl
   Source_Files {
     Oneway_Receiver.cpp
     Shutdown_Helper.cpp
     server.cpp
   }
-  Header_Files {
-    Oneway_Receiver.h
-    Shutdown_Helper.h
-  }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): messaging, taoexe, portableserver {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Header_Files {
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Sequence_Unit_Tests/.cvsignore b/TAO/tests/Sequence_Unit_Tests/.cvsignore
new file mode 100644
index 00000000000..906e9b13aff
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/.cvsignore
@@ -0,0 +1,4 @@
+Bounded_Simple_Types
+Bounded_String
+Unbounded_Simple_Types
+Unbounded_String
diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
index 0b230c0558d..8f0bc9e45ef 100644
--- a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
@@ -8,11 +8,11 @@
  *
  * @author Carlos O'Ryan
  */
-#include "tao/Bounded_Basic_String_Sequence_T.h"
+#include "tao/Bounded_String_Sequence_T.h"
 #include "tao/CORBA_String.h"
 
 CORBA::ULong const MAXIMUM = 42;
-typedef TAO::bounded_basic_string_sequence<char, MAXIMUM> s_sequence;
+typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence;
 
 int main(int,char*[])
 {
diff --git a/TAO/tests/Sequence_Unit_Tests/Makefile.am b/TAO/tests/Sequence_Unit_Tests/Makefile.am
deleted file mode 100644
index fe4accdd028..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/Makefile.am
+++ /dev/null
@@ -1,694 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Sequence_Unit_Tests_B_Obj_Ref_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += bounded_object_reference_sequence_ut
-
-bounded_object_reference_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-bounded_object_reference_sequence_ut_SOURCES = \
-  bounded_object_reference_sequence_ut.cpp \
-  mock_reference.cpp \
-  mock_reference.hpp
-
-bounded_object_reference_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-bounded_object_reference_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_B_Sequence_CDR.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += bounded_sequence_cdr_ut
-
-bounded_sequence_cdr_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-bounded_sequence_cdr_ut_SOURCES = \
-  bounded_sequence_cdr_ut.cpp \
-  mock_reference.cpp \
-  mock_reference.hpp
-
-bounded_sequence_cdr_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-bounded_sequence_cdr_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_B_Simple_Types.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Bounded_Simple_Types
-
-Bounded_Simple_Types_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Bounded_Simple_Types_SOURCES = \
-  Bounded_Simple_Types.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Bounded_Simple_Types_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Sequence_Unit_Tests_B_String_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += bounded_string_sequence_ut
-
-bounded_string_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-bounded_string_sequence_ut_SOURCES = \
-  bounded_string_sequence_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-bounded_string_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-bounded_string_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_B_Value_Sequence.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += bounded_value_sequence_ut
-
-bounded_value_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-bounded_value_sequence_ut_SOURCES = \
-  bounded_value_sequence_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-bounded_value_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-bounded_value_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_Bounded_String.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Bounded_String
-
-Bounded_String_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Bounded_String_SOURCES = \
-  Bounded_String.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Bounded_String_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Sequence_Unit_Tests_Obj_Ref_Seq_Elem.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += object_reference_sequence_element_ut
-
-object_reference_sequence_element_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-object_reference_sequence_element_ut_SOURCES = \
-  mock_reference.cpp \
-  object_reference_sequence_element_ut.cpp \
-  mock_reference.hpp
-
-object_reference_sequence_element_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-object_reference_sequence_element_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_String_Seq_Elem.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += string_sequence_element_ut
-
-string_sequence_element_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-string_sequence_element_ut_SOURCES = \
-  string_sequence_element_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-string_sequence_element_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-string_sequence_element_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_Test_Alloc_Traits.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += testing_allocation_traits_ut
-
-testing_allocation_traits_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-testing_allocation_traits_ut_SOURCES = \
-  testing_allocation_traits_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-testing_allocation_traits_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-testing_allocation_traits_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Fwd_Ob_Ref_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_fwd_object_reference_sequence_ut
-
-unbounded_fwd_object_reference_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_fwd_object_reference_sequence_ut_SOURCES = \
-  fwd_mock_reference.cpp \
-  unbounded_fwd_object_reference_sequence_ut.cpp \
-  fwd_mock_reference.hpp
-
-unbounded_fwd_object_reference_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_fwd_object_reference_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Obj_Ref_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_object_reference_sequence_ut
-
-unbounded_object_reference_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_object_reference_sequence_ut_SOURCES = \
-  mock_reference.cpp \
-  unbounded_object_reference_sequence_ut.cpp \
-  mock_reference.hpp
-
-unbounded_object_reference_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_object_reference_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Oct_Seq_No_Cpy.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_octet_sequence_no_copy_ut
-
-unbounded_octet_sequence_no_copy_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_octet_sequence_no_copy_ut_SOURCES = \
-  mock_reference.cpp \
-  unbounded_octet_sequence_nocopy_ut.cpp \
-  mock_reference.hpp
-
-unbounded_octet_sequence_no_copy_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_octet_sequence_no_copy_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Octet_Sequence.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_octet_sequence_ut
-
-unbounded_octet_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_octet_sequence_ut_SOURCES = \
-  mock_reference.cpp \
-  unbounded_octet_sequence_ut.cpp \
-  mock_reference.hpp
-
-unbounded_octet_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_octet_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Sequence_CDR.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_sequence_cdr_ut
-
-unbounded_sequence_cdr_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_sequence_cdr_ut_SOURCES = \
-  mock_reference.cpp \
-  unbounded_sequence_cdr_ut.cpp \
-  mock_reference.hpp
-
-unbounded_sequence_cdr_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_sequence_cdr_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Simple_Types.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Unbounded_Simple_Types
-
-Unbounded_Simple_Types_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Unbounded_Simple_Types_SOURCES = \
-  Unbounded_Simple_Types.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Unbounded_Simple_Types_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Sequence_Unit_Tests_UB_String_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_string_sequence_ut
-
-unbounded_string_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_string_sequence_ut_SOURCES = \
-  unbounded_string_sequence_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-unbounded_string_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_string_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Value_Sequence.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_value_sequence_ut
-
-unbounded_value_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_value_sequence_ut_SOURCES = \
-  unbounded_value_sequence_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-unbounded_value_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_value_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_Unbounded_Octet.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Unbounded_Octet
-
-Unbounded_Octet_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Unbounded_Octet_SOURCES = \
-  Unbounded_Octet.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Unbounded_Octet_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Sequence_Unit_Tests_Unbounded_String.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Unbounded_String
-
-Unbounded_String_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Unbounded_String_SOURCES = \
-  Unbounded_String.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Unbounded_String_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp
index 02cccf4ba2a..246c46f7e85 100644
--- a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp
@@ -8,10 +8,10 @@
  *
  * @author Carlos O'Ryan
  */
-#include "tao/Unbounded_Basic_String_Sequence_T.h"
+#include "tao/Unbounded_String_Sequence_T.h"
 #include "tao/CORBA_String.h"
 
-typedef TAO::unbounded_basic_string_sequence<char> s_sequence;
+typedef TAO::unbounded_string_sequence s_sequence;
 
 int main(int,char*[])
 {
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
index 7a09816a5f2..3ac1584a6e4 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
@@ -16,7 +16,7 @@
 
 #include "tao/Bounded_Object_Reference_Sequence_T.h"
 #include "tao/Bounded_Value_Sequence_T.h"
-#include "tao/Bounded_Basic_String_Sequence_T.h"
+#include "tao/Bounded_String_Sequence_T.h"
 #include "tao/Bounded_Array_Sequence_T.h"
 #include "tao/Bounded_Sequence_CDR_T.h"
 #include "tao/CDR.h"
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
index f7a4a1d15df..e493adadce1 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
@@ -14,7 +14,8 @@
 #include "tao/String_Traits_T.h"
 #include "testing_allocation_traits.hpp"
 
-#include "tao/Bounded_Basic_String_Sequence_T.h"
+#include "tao/Bounded_String_Sequence_T.h"
+#include "tao/Bounded_Wstring_Sequence_T.h"
 #include "tao/CORBA_String.h"
 
 #include "string_sequence_tester.hpp"
@@ -96,7 +97,7 @@ struct Tester
     expected_calls f(tested_allocation_traits::freebuf_calls);
     expected_calls r(tested_element_traits::release_calls);
     {
-      tested_sequence a(4, buffer, false);
+      tested_sequence a(4, buffer);
       BOOST_CHECK_EQUAL(CORBA::ULong(MAXIMUM), a.maximum());
       BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
       BOOST_CHECK_EQUAL(buffer, a.get_buffer());
@@ -120,7 +121,7 @@ struct Tester
     expected_calls f(tested_allocation_traits::freebuf_calls);
     expected_calls r(tested_element_traits::release_calls);
     {
-      tested_sequence a(4, buffer, false);
+      tested_sequence a(4, buffer);
       BOOST_CHECK_EQUAL(CORBA::ULong(MAXIMUM), a.maximum());
       BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
       BOOST_CHECK_EQUAL(buffer, a.get_buffer());
@@ -374,14 +375,14 @@ init_unit_test_suite(int, char*[])
       BOOST_TEST_SUITE("bounded string sequence unit test");
 
   {
-    typedef TAO::bounded_basic_string_sequence<char, MAXIMUM> s_sequence;
+    typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence;
     typedef Tester<s_sequence> nTester;
     boost::shared_ptr<nTester> tester(nTester::allocate());
     tester->add_all(ts);
   }
 
   {
-    typedef TAO::bounded_basic_string_sequence<CORBA::WChar, MAXIMUM> w_sequence;
+    typedef TAO::bounded_wstring_sequence<MAXIMUM> w_sequence;
     typedef Tester<w_sequence> wTester;
     boost::shared_ptr<wTester> tester(wTester::allocate());
     tester->add_all(ts);
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
index 14790752df5..53c722247c6 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
@@ -16,7 +16,7 @@
 
 #include "tao/Unbounded_Value_Sequence_T.h"
 #include "tao/Unbounded_Object_Reference_Sequence_T.h"
-#include "tao/Unbounded_Basic_String_Sequence_T.h"
+#include "tao/Unbounded_String_Sequence_T.h"
 #include "tao/Unbounded_Sequence_CDR_T.h"
 #include "tao/CDR.h"
 
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
index 53f0941275c..0cbb69be858 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
@@ -12,7 +12,9 @@
 #include "testing_allocation_traits.hpp"
 #include "testing_range_checking.hpp"
 
-#include "tao/Unbounded_Basic_String_Sequence_T.h"
+#include "tao/Unbounded_String_Sequence_T.h"
+#include "tao/Unbounded_Wstring_Sequence_T.h"
+#include "tao/Unbounded_Wstring_Sequence_T.h"
 #include "tao/CORBA_String.h"
 
 #include "string_sequence_tester.hpp"
@@ -234,7 +236,7 @@ struct Tester
     expected_calls f(tested_allocation_traits::freebuf_calls);
     expected_calls r(tested_element_traits::release_calls);
     {
-      tested_sequence a(8, 4, buffer, false);
+      tested_sequence a(8, 4, buffer);
       BOOST_CHECK_EQUAL(CORBA::ULong(8), a.maximum());
       BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
       BOOST_CHECK_EQUAL(buffer, a.get_buffer());
@@ -419,7 +421,7 @@ struct Tester
     expected_calls f(tested_allocation_traits::freebuf_calls);
     expected_calls r(tested_element_traits::release_calls);
     {
-      tested_sequence a(8, 4, buffer, false);
+      tested_sequence a(8, 4, buffer);
       BOOST_CHECK_EQUAL(CORBA::ULong(8), a.maximum());
       BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
       BOOST_CHECK_EQUAL(buffer, a.get_buffer());
@@ -526,13 +528,13 @@ init_unit_test_suite(int, char*[])
       BOOST_TEST_SUITE("unbounded string sequence unit test");
 
   {
-    typedef Tester<unbounded_basic_string_sequence <char> > nTester;
+    typedef Tester<unbounded_string_sequence> nTester;
     boost::shared_ptr<nTester> tester(nTester::allocate());
     tester->add_all(ts);
   }
 
   {
-    typedef Tester<unbounded_basic_string_sequence <CORBA::WChar> > wTester;
+    typedef Tester<unbounded_wstring_sequence> wTester;
     boost::shared_ptr<wTester> tester(wTester::allocate());
     tester->add_all(ts);
   }
diff --git a/TAO/tests/Servant_To_Reference_Test/.cvsignore b/TAO/tests/Servant_To_Reference_Test/.cvsignore
new file mode 100644
index 00000000000..254defddb53
--- /dev/null
+++ b/TAO/tests/Servant_To_Reference_Test/.cvsignore
@@ -0,0 +1 @@
+server
diff --git a/TAO/tests/Servant_To_Reference_Test/Makefile.am b/TAO/tests/Servant_To_Reference_Test/Makefile.am
deleted file mode 100644
index afe2163e43b..00000000000
--- a/TAO/tests/Servant_To_Reference_Test/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Servant_To_Reference_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
index 981d22d2ab1..9c240b72452 100644
--- a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
+++ b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoexe, portableserver, minimum_corba {
   Source_Files {
     server.cpp
     Test_i.cpp
diff --git a/TAO/tests/Server_Connection_Purging/.cvsignore b/TAO/tests/Server_Connection_Purging/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Server_Connection_Purging/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Server_Connection_Purging/Makefile.am b/TAO/tests/Server_Connection_Purging/Makefile.am
deleted file mode 100644
index f877143fc9c..00000000000
--- a/TAO/tests/Server_Connection_Purging/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Server_Connection_Purging_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Server_Connection_Purging_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Server_Connection_Purging_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
index ccd43fa8b3a..a50eda03b14 100644
--- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only =1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     Test_i.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Server_Leaks/.cvsignore b/TAO/tests/Server_Leaks/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Server_Leaks/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Server_Leaks/Makefile.am b/TAO/tests/Server_Leaks/Makefile.am
deleted file mode 100644
index 280e3b90445..00000000000
--- a/TAO/tests/Server_Leaks/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Server_Leaks_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Server_Leaks_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Ping_Service.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Ping_Service.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Server_Leaks_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Ping_Service.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 53fb1e76d71..4517bde0f91 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     Ping_Service.cpp
     server.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     TestC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Server_Port_Zero/.cvsignore b/TAO/tests/Server_Port_Zero/.cvsignore
new file mode 100644
index 00000000000..254defddb53
--- /dev/null
+++ b/TAO/tests/Server_Port_Zero/.cvsignore
@@ -0,0 +1 @@
+server
diff --git a/TAO/tests/Server_Port_Zero/Makefile.am b/TAO/tests/Server_Port_Zero/Makefile.am
deleted file mode 100644
index 2c12f5f51a3..00000000000
--- a/TAO/tests/Server_Port_Zero/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Server_Port_Zero_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Single_Read/.cvsignore b/TAO/tests/Single_Read/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Single_Read/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Single_Read/Makefile.am b/TAO/tests/Single_Read/Makefile.am
deleted file mode 100644
index 56bc35ebd15..00000000000
--- a/TAO/tests/Single_Read/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Single_Read_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Single_Read_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Single_Read_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index 574cb13c894..bfb96e8b536 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Smart_Proxies/.cvsignore b/TAO/tests/Smart_Proxies/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Smart_Proxies/Benchmark/.cvsignore b/TAO/tests/Smart_Proxies/Benchmark/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Benchmark/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am b/TAO/tests/Smart_Proxies/Benchmark/Makefile.am
deleted file mode 100644
index 22d34bb9a70..00000000000
--- a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am
+++ /dev/null
@@ -1,111 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.SP_Benchmark_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Benchmark_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Benchmark_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
index 99fe5efed3b..ea8e6a3a0d7 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
+++ b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
@@ -1,36 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, smart_proxies {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, smart_proxies {
-  after += *idl
+project(*Server): taoexe, portableserver, smart_proxies {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, smart_proxies {
-  after += *idl
-  after += *Server
+project(*Client): taoexe, portableserver, smart_proxies {
   Source_Files {
     client.cpp
     Smart_Proxy_Impl.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Smart_Proxies/Collocation/.cvsignore b/TAO/tests/Smart_Proxies/Collocation/.cvsignore
new file mode 100644
index 00000000000..ba2906d0666
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Collocation/.cvsignore
@@ -0,0 +1 @@
+main
diff --git a/TAO/tests/Smart_Proxies/Collocation/Makefile.am b/TAO/tests/Smart_Proxies/Collocation/Makefile.am
deleted file mode 100644
index 18920bf27cb..00000000000
--- a/TAO/tests/Smart_Proxies/Collocation/Makefile.am
+++ /dev/null
@@ -1,133 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-noinst_HEADERS =
-
-## Makefile.SP_Collocation_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-CLEANFILES = \
-  Diamond-stamp \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp
-
-Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd $(srcdir)/Diamond.idl
-	@touch $@
-
-noinst_HEADERS += \
-  Diamond.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Collocation_TestStubsLib.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libColl_Test_Stubs.la
-
-libColl_Test_Stubs_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DMY_STUB_BUILD_DLL
-
-libColl_Test_Stubs_la_SOURCES = \
-  DiamondC.cpp \
-  Smart_Proxy_Impl.cpp
-
-noinst_HEADERS += \
-  Smart_Proxy_Impl.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Collocation_DiamondLib.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libDiamond.la
-
-libDiamond_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DDIAMOND_BUILD_DLL
-
-libDiamond_la_SOURCES = \
-  DiamondS.cpp \
-  Diamond_i.cpp
-
-noinst_HEADERS += \
-  Diamond_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Collocation_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = main
-
-main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-main_SOURCES = \
-  Coll_Tester.cpp \
-  main.cpp \
-  Coll_Tester.h
-
-main_LDADD = \
-  libColl_Test_Stubs.la \
-  libDiamond.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
index 765052118d0..f98a8de4eb9 100644
--- a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
+++ b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
@@ -1,54 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, smart_proxies {
-  idlflags     += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd
-
-  IDL_Files {
-    Diamond.idl
-  }
-  custom_only = 1
-}
-
 project(*TestStubsLib): taolib_with_idl, smart_proxies {
-  after        += *idl
-
   sharedname = Coll_Test_Stubs
   dynamicflags += MY_STUB_BUILD_DLL
-
+  idlflags     += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd
   Source_Files {
     DiamondC.cpp
     Smart_Proxy_Impl.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*DiamondLib) : taolib_with_idl, smart_proxies, portableserver {
-  after        += *idl
-  after        += *TestStubsLib
-
   sharedname   = Diamond
-  dynamicflags += DIAMOND_BUILD_DLL
-
+  after        += *TestStubsLib
   libs         += Coll_Test_Stubs
-
+  dynamicflags += DIAMOND_BUILD_DLL
+  idlflags     += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd
   Source_Files {
     Diamond_i.cpp
     DiamondS.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Test): taoexe, smart_proxies, portableserver, strategies {
-  after += *idl
   after += *TestStubsLib *DiamondLib
   libs  += Coll_Test_Stubs Diamond
   Source_Files {
     Coll_Tester.cpp
     main.cpp
   }
-  IDL_Files {
+  idl_files {
   }
 }
+
diff --git a/TAO/tests/Smart_Proxies/Makefile.am b/TAO/tests/Smart_Proxies/Makefile.am
deleted file mode 100644
index 1a5794d6175..00000000000
--- a/TAO/tests/Smart_Proxies/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        Benchmark \
-        Collocation \
-        On_Demand \
-        Policy \
-        dtor
-
-noinst_PROGRAMS =
-
-## Makefile.Smart_Proxies_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Smart_Proxies_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Smart_Proxies_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Smart_Proxies/On_Demand/.cvsignore b/TAO/tests/Smart_Proxies/On_Demand/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/On_Demand/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am b/TAO/tests/Smart_Proxies/On_Demand/Makefile.am
deleted file mode 100644
index 5f0141abcd9..00000000000
--- a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.SP_On_Demand_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_On_Demand_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h \
-  Smart_Test_Factory.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_On_Demand_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  Smart_Test_Factory.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h \
-  Smart_Test_Factory.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
index dfa4bfcc30c..d286b8421d7 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
+++ b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
@@ -1,37 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, smart_proxies {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, smart_proxies {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, smart_proxies {
-  after += *idl
-  after += *Server
+project(*Client): taoexe, portableserver, smart_proxies {
   Source_Files {
     client.cpp
     Smart_Proxy_Impl.cpp
     Smart_Test_Factory.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Smart_Proxies/Policy/.cvsignore b/TAO/tests/Smart_Proxies/Policy/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Policy/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Smart_Proxies/Policy/Makefile.am b/TAO/tests/Smart_Proxies/Policy/Makefile.am
deleted file mode 100644
index 0890285a505..00000000000
--- a/TAO/tests/Smart_Proxies/Policy/Makefile.am
+++ /dev/null
@@ -1,111 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.SP_Policy_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Policy_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Policy_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
index 99fe5efed3b..907dac72774 100644
--- a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
+++ b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
@@ -1,36 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, smart_proxies {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, smart_proxies {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, smart_proxies {
-  after += *idl
-  after += *Server
+project(*Client): taoclient, portableserver, smart_proxies {
   Source_Files {
     client.cpp
     Smart_Proxy_Impl.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
index bc4e7c42743..473bc9b4087 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
+++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, smart_proxies {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, smart_proxies {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, smart_proxies {
-  after += *idl
+project(*Client): taoclient, portableserver, smart_proxies {
   after += *Server
   Source_Files {
+    testC.cpp
     Smart_Proxy_Impl.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index b2bd94142ee..b49a86973b1 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -2,8 +2,6 @@
 
 #include "Smart_Proxy_Impl.h"
 
-ACE_CString Smart_Test_Proxy::fake_ior_ ("This_is_my_fake_ior");
-
 Smart_Test_Factory::Smart_Test_Factory (void)
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -29,22 +27,6 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 {
 }
 
-bool
-Smart_Test_Proxy::can_convert_to_ior (void) const
-{
-  // Even though a smart proxy is local, this one can be stringified
-  return true;
-}
-
-char*
-Smart_Test_Proxy::convert_to_ior (bool,
-                                  const char*) const
-{
-  // If this implementation wasn't provided, the ORB would provide
-  // a stringified representation of this object.
-  return CORBA::string_dup (fake_ior_.c_str ());
-}
-
 CORBA::Short
 Smart_Test_Proxy::method (CORBA::Short boo
                           ACE_ENV_ARG_DECL)
@@ -71,9 +53,3 @@ Smart_Test_Proxy::method (CORBA::Short boo
 
   return retval;
 }
-
-const ACE_CString&
-Smart_Test_Proxy::fake_ior (void)
-{
-  return fake_ior_;
-}
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index 76d38be6245..a61d96be76d 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "testC.h"
-#include "ace/SString.h"
 
 class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
 {
@@ -19,21 +18,12 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual bool can_convert_to_ior (void) const;
-
-  virtual char* convert_to_ior (bool use_omg_ior_format,       
-                                const char* ior_prefix) const;
-
   virtual CORBA::Short method (CORBA::Short boo
                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
 
-  static const ACE_CString& fake_ior (void);
-
   // Don't need to add any extra functionality into <shutdown>, hence
   // we don't define it.
-private:
-  static ACE_CString fake_ior_;
 };
diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp
index 2fc36491398..74b28effab2 100644
--- a/TAO/tests/Smart_Proxies/client.cpp
+++ b/TAO/tests/Smart_Proxies/client.cpp
@@ -54,7 +54,6 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  int status = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
@@ -97,26 +96,6 @@ main (int argc, char *argv[])
                            ior),
                           1);
 
-      try
-        {
-          CORBA::String_var sm_ior = orb->object_to_string (server.in ());
-          if (Smart_Test_Proxy::fake_ior () != sm_ior.in ())
-            {
-              status = 1;
-              ACE_ERROR ((LM_ERROR,
-                          "ERROR: The Smart Proxy IOR is:\n%s\n"
-                          "but should have been: %s\n",
-                          sm_ior.in (),
-                          Smart_Test_Proxy::fake_ior ().c_str ()));
-            }
-        }
-      catch (const CORBA::MARSHAL& ex)
-        {
-          status = 1;
-          ACE_PRINT_EXCEPTION (ex,
-                               "Unexpected MARSHAL exception:");
-        }
-
       server->method (0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -136,9 +115,9 @@ main (int argc, char *argv[])
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "Client-side exception:");
-      status = 1;
+      return 1;
     }
   ACE_ENDTRY;
 
-  return status;
+  return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/dtor/.cvsignore b/TAO/tests/Smart_Proxies/dtor/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/dtor/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Smart_Proxies/dtor/Makefile.am b/TAO/tests/Smart_Proxies/dtor/Makefile.am
deleted file mode 100644
index 8db55984659..00000000000
--- a/TAO/tests/Smart_Proxies/dtor/Makefile.am
+++ /dev/null
@@ -1,112 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.dtor_idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Dtor_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Dtor_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Smart_Proxies/dtor/dtor.mpc b/TAO/tests/Smart_Proxies/dtor/dtor.mpc
index 9feea5cd714..bfbcbe61031 100644
--- a/TAO/tests/Smart_Proxies/dtor/dtor.mpc
+++ b/TAO/tests/Smart_Proxies/dtor/dtor.mpc
@@ -1,35 +1,15 @@
 //$Id$
 
-project(*idl): taoidldefaults, smart_proxies {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver, smart_proxies {
-  after += *idl
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode, smart_proxies {
-  after += *idl
-  after += *Server
   Source_Files {
+    testC.cpp
     Smart_Proxy_Impl.cpp
     client.cpp
   }
-  Source_Files {
-    testC.cpp
-  }
-  IDL_Files {
-  }
 }
diff --git a/TAO/tests/Smart_Proxies/run_test.pl b/TAO/tests/Smart_Proxies/run_test.pl
index 6cc94538d96..83d5dba52cf 100755
--- a/TAO/tests/Smart_Proxies/run_test.pl
+++ b/TAO/tests/Smart_Proxies/run_test.pl
@@ -34,14 +34,14 @@ if (PerlACE::waitforfile_timed ($iorfile,
 
 $client = $CL->SpawnWaitKill (60);
 
-if ($client != 0) {
+if ($client == -1) {
     print STDERR "ERROR: client returned $client\n";
     $status = 1;
 }
 
 $server = $SV->WaitKill (10);
 
-if ($server != 0) {
+if ($server == -1) {
     print STDERR "ERROR: server returned $server\n";
     $status = 1;
 }
diff --git a/TAO/tests/Stack_Recursion/.cvsignore b/TAO/tests/Stack_Recursion/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Stack_Recursion/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Stack_Recursion/Makefile.am b/TAO/tests/Stack_Recursion/Makefile.am
deleted file mode 100644
index 92977a684e5..00000000000
--- a/TAO/tests/Stack_Recursion/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Stack_Recursion_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Stack_Recursion_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Sender.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Sender.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Stack_Recursion_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index 960ceb8a921..ce10971c433 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -1,39 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     server.cpp
     Server_Task.cpp
     Sender.cpp
   }
-  Source_Files {
-    TestC.cpp
-    TestS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
+    TestC.cpp
     client.cpp
     Client_Task.cpp
   }
-  Source_Files {
-    TestC.cpp
-  }
-  IDL_Files {
-  }
 }
 
diff --git a/TAO/tests/Strategies/.cvsignore b/TAO/tests/Strategies/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Strategies/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Strategies/Makefile.am b/TAO/tests/Strategies/Makefile.am
deleted file mode 100644
index b6589fb7ac6..00000000000
--- a/TAO/tests/Strategies/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Strategies_Idl.am
-
-BUILT_SOURCES = \
-  simple_testC.cpp \
-  simple_testC.h \
-  simple_testC.inl \
-  simple_testS.cpp \
-  simple_testS.h \
-  simple_testS.inl
-
-CLEANFILES = \
-  simple_test-stamp \
-  simple_testC.cpp \
-  simple_testC.h \
-  simple_testC.inl \
-  simple_testS.cpp \
-  simple_testS.h \
-  simple_testS.inl
-
-simple_testC.cpp simple_testC.h simple_testC.inl simple_testS.cpp simple_testS.h simple_testS.inl: simple_test-stamp
-
-simple_test-stamp: $(srcdir)/simple_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  simple_test.idl
-
-## Makefile.Strategies_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  simple_testC.cpp \
-  simple_testS.cpp \
-  simple_test_i.cpp \
-  simple_test_i.h \
-  simple_test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Strategies_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  simple_testC.cpp \
-  simple_test_i.h \
-  simple_test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc
index 86d4366c856..77ac8271640 100644
--- a/TAO/tests/Strategies/Strategies.mpc
+++ b/TAO/tests/Strategies/Strategies.mpc
@@ -1,36 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    simple_test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): strategies, messaging, taoserver {
-  after += *idl
   Source_Files {
     simple_test_i.cpp
     server.cpp
   }
-  Source_Files {
-    simple_testC.cpp
-    simple_testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): strategies, messaging, taoexe, portableserver {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     simple_testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Timed_Buffered_Oneways/.cvsignore b/TAO/tests/Timed_Buffered_Oneways/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Timed_Buffered_Oneways/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Timed_Buffered_Oneways/Makefile.am b/TAO/tests/Timed_Buffered_Oneways/Makefile.am
deleted file mode 100644
index 93cbe585f74..00000000000
--- a/TAO/tests/Timed_Buffered_Oneways/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Timed_Buffered_Oneways_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Timed_Buffered_Oneways_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Timed_Buffered_Oneways_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
index 7dbf0e839ef..1bd7978c70a 100644
--- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
+++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
@@ -1,37 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): messaging, taoexe, portableserver {
-  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): messaging, taoexe, portableserver {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/Timeout/.cvsignore b/TAO/tests/Timeout/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Timeout/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Timeout/Makefile.am b/TAO/tests/Timeout/Makefile.am
deleted file mode 100644
index 489c6a1350b..00000000000
--- a/TAO/tests/Timeout/Makefile.am
+++ /dev/null
@@ -1,113 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Timeout_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Timeout_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Timeout_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc
index e42705f179e..5826c607d6e 100644
--- a/TAO/tests/Timeout/Timeout.mpc
+++ b/TAO/tests/Timeout/Timeout.mpc
@@ -1,23 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     test_i.cpp
-    testS.cpp
-    testC.cpp
     server.cpp
   }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, messaging {
@@ -26,6 +14,5 @@ project(*Client): taoclient, messaging {
     testC.cpp
     client.cpp
   }
-  IDL_Files {
-  }
 }
+
diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
deleted file mode 100644
index 63ed4f9c5ef..00000000000
--- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/TransportCurrent/TCC.h"
-
-#include "Current_Test_Impl.h"
-
-ACE_RCSID (Transport_Current,
-           Current_Test_Impl,
-           "$Id$")
-
-  Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
-                                        PortableServer::POA_ptr poa,
-                                        int do_collocated_calls)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-    , poa_ (PortableServer::POA::_duplicate (poa))
-    , do_collocated_calls_ (do_collocated_calls)
-{
-}
-
-Current_Test_Impl::~Current_Test_Impl (void)
-{
-}
-
-::CORBA::Long
-Current_Test_Impl::self_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((::CORBA::SystemException))
-{
-  return 0;
-}
-
-void
-Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 2) {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) server - Testing access to Transport Current ...\n")));
-  }
-
-  CORBA::Object_var tcobject =
-    orb_->resolve_initial_references ("TAO::Transport::Current"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO::Transport::Current_var tc =
-    TAO::Transport::Current::_narrow (tcobject.in ()
-                                      ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
-
-  if (TAO_debug_level >= 1)
-    {
-      ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
-
-      ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
-
-      ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
-
-      ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
-
-      ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Current_Test_Impl (%P|%t) Transport [%q] - Sent/Received [bytes=%q/%q, messages=%q/%q]\n"),
-                  (ACE_UINT64)id,
-                  (ACE_UINT64)bs,
-                  (ACE_UINT64)br,
-                  (ACE_UINT64)rs,
-                  (ACE_UINT64)rr));
-    }
-
-  if (TAO_debug_level > 2) {
-    ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%P|%t) server - Successfully accessed Transport Current\n")));
-  }
-}
-
-void
-Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      this->invoked_by_client_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (TAO::Transport::NoContext, ex)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) server - Caught a Transport::NoContext exception\n")));
-    }
-  ACE_CATCH (CORBA::SystemException, ex1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) server - Caught a CORBA::SystemException exception\n")));
-    }
-  ACE_ENDTRY;
-}
-
-void
-Current_Test_Impl::invoked_by_client_i (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext))
-{
-  if (TAO_debug_level > 2) {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) server - Testing inside an upcall\n")));
-  }
-
-  this->test_transport_current (ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
-
-  if (this->do_collocated_calls_)
-    {
-      CORBA::Object_var selfobject =
-        poa_->servant_to_reference (this
-                                    ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
-
-      Test::Transport::CurrentTest_var self =
-        Test::Transport::CurrentTest::_narrow (selfobject.in ()
-                                               ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
-
-      if (TAO_debug_level >= 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) server - Testing a collocated call\n")));
-        }
-      self->invoked_during_upcall (ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  else
-    {
-      if (TAO_debug_level >= 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) server - Skipping the collocated call test\n")));
-        }
-    }
-}
-
-void
-Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 2) {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) server - Test method invoked ")
-                ACE_TEXT ("by the server during upcall.\n")));
-  }
-
-}
-
-void
-Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 2) {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) server - shutting down.\n")));
-  }
-
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/TransportCurrent/Framework/Framework.mpc b/TAO/tests/TransportCurrent/Framework/Framework.mpc
deleted file mode 100644
index aa3e0ce65d0..00000000000
--- a/TAO/tests/TransportCurrent/Framework/Framework.mpc
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, tc, pi_server {
-
-  after += Current_Test_Lib_Client Current_Test_Lib_Server
-
-  includes += . ../lib
-
-  libs += Current_Test_Lib_Client Current_Test_Lib_Server
-  libpaths += ../lib
-
-  Source_Files {
-    server.cpp
-    Current_Test_Impl.cpp
-    Tester.cpp
-    Server_Main.cpp
-  }
-
-  IDL_Files {
-  }
-}
-
-project(*Client): taoclient, tc, dynamicinterface {
-
-  after += *Server Current_Test_Lib_Client Current_Test_Lib_Server
-
-  includes += . ../lib
-
-  libs += Current_Test_Lib_Client Current_Test_Lib_Server
-  libpaths += ../lib
-
-  Source_Files {
-    client.cpp
-    Tester.cpp
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/TAO/tests/TransportCurrent/Framework/Makefile.am b/TAO/tests/TransportCurrent/Framework/Makefile.am
deleted file mode 100644
index 1e83dc49b65..00000000000
--- a/TAO/tests/TransportCurrent/Framework/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Framework_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I. \
-  -I../lib
-
-server_SOURCES = \
-  Current_Test_Impl.cpp \
-  Server_Main.cpp \
-  Tester.cpp \
-  server.cpp
-
-../lib:
-	mkdir -p ../lib
-
-
-server_DEPENDENCIES = \
- ../lib
-
-server_LDFLAGS = \
-  -L../lib
-
-server_LDADD = \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Framework_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I. \
-  -I../lib
-
-client_SOURCES = \
-  Tester.cpp \
-  client.cpp
-
-../lib:
-	mkdir -p ../lib
-
-
-client_DEPENDENCIES = \
- ../lib
-
-client_LDFLAGS = \
-  -L../lib
-
-client_LDADD = \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/TransportCurrent/Framework/README b/TAO/tests/TransportCurrent/Framework/README
deleted file mode 100644
index 4ca496c01a5..00000000000
--- a/TAO/tests/TransportCurrent/Framework/README
+++ /dev/null
@@ -1,22 +0,0 @@
-This test intents to show the usage and the expected behavior of the
-Transport Current framework. The topology is the same as in the basic
-Hello test: a client invokes a method on the server and then shuts it
-down and exits. The special features of the test is that it attempts
-to obtain Transport Traits information, using the Transport Current.
-
-There are four basic contexts in which a Transport information can be
-requested, by definition:
-
-  * on the client side, outside client-side interceptor;
-  * client side, inside an interceptor;
-  * server side, inside an up-call;
-  * server side, inside an interceptor;
-
-The test implements the client and the server side interceptors that
-simply call a test method when invoked. A simple interception count
-serves to validate the expected behavior.
-
-By default, the client and server will each have only one thread. Use
-"-t N" parameter to override that. The "-n N" client-side parameter
-determines how many times a particular client thread will call the
-server. The default is 1.
diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
deleted file mode 100644
index 21c1227fbf3..00000000000
--- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-#include "Server_Request_Interceptor.h"
-
-/// Prototype
-int server_main (int argc,
-                 ACE_TCHAR *argv[],
-                 Test::Server_Request_Interceptor *cri);
-
-int
-test_transport_current (CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL)  ACE_THROW_SPEC ((CORBA::SystemException,
-                                                            CORBA::UserException));
-
-int
-ACE_TMAIN (int argc,
-           ACE_TCHAR *argv[])
-{
-  Test::Server_Request_Interceptor cri ("test_orb", test_transport_current);
-  return server_main (argc, argv, &cri);
-}
diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp
deleted file mode 100644
index eef52de80fa..00000000000
--- a/TAO/tests/TransportCurrent/Framework/Tester.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-#include "tao/TransportCurrent/Transport_Current.h"
-
-using namespace TAO;
-
-
-/// Test referencing the TC data outside of the context of an upcall,
-/// or a client-side interceptor
-
-int
-test_transport_current (Transport::Current_ptr tc
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::UserException))
-{
-  CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Tester (%P|%t) Transport [%q] - Sent/Received [bytes=%q/%q, messages=%q/%q]\n"),
-              (ACE_UINT64)id,
-              (ACE_UINT64)bs,
-              (ACE_UINT64)br,
-              (ACE_UINT64)rs,
-              (ACE_UINT64)rr));
-
-  return 0;
-}
-
-int
-test_transport_current (CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::UserException))
-{
-  // Get the Current object.
-  CORBA::Object_var tcobject =
-    orb->resolve_initial_references ("TAO::Transport::Current"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  Transport::Current_var tc =
-    Transport::Current::_narrow (tcobject.in ()
-                                      ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
-
-  if (CORBA::is_nil (tc.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) client - ERROR: Could not resolve ")
-                  ACE_TEXT ("TAOTransportCurrent object.\n")));
-
-      ACE_TRY_THROW (CORBA::INTERNAL ());
-    }
-
-  return test_transport_current (tc.in ());
-}
diff --git a/TAO/tests/TransportCurrent/Framework/client-static.conf b/TAO/tests/TransportCurrent/Framework/client-static.conf
deleted file mode 100644
index 0f63cfe7965..00000000000
--- a/TAO/tests/TransportCurrent/Framework/client-static.conf
+++ /dev/null
@@ -1 +0,0 @@
-static TAO_Transport_Current_Loader ""
diff --git a/TAO/tests/TransportCurrent/Framework/client.conf b/TAO/tests/TransportCurrent/Framework/client.conf
deleted file mode 100644
index aecb1923f83..00000000000
--- a/TAO/tests/TransportCurrent/Framework/client.conf
+++ /dev/null
@@ -1 +0,0 @@
-dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() ""
diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp
deleted file mode 100644
index 12207234dd4..00000000000
--- a/TAO/tests/TransportCurrent/Framework/client.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-#include "tao/DynamicInterface/Request.h"
-#include "tao/ORBInitializer_Registry.h"
-
-#include "tao/TransportCurrent/Transport_Current.h"
-
-#include "Client_Request_Interceptor.h"
-#include "Current_TestC.h"
-
-#include "Client_ORBInitializer.h"
-
-ACE_RCSID (PICurrent,
-           client,
-           "$Id$")
-
-// Prototype
-
-int
-test_transport_current (CORBA::ORB_ptr
-                        ACE_ENV_ARG_DECL)  ACE_THROW_SPEC ((CORBA::SystemException,
-                                                            CORBA::UserException));
-
-using namespace TAO;
-
-const ACE_TCHAR* CLIENT_ORB_ID = ACE_TEXT ("client orb");
-const ACE_TCHAR* ior = "file://server.ior";
-
-int nthreads = 1;
-int niterations = 1;
-int use_dii = 1;
-
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "yt:n:k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'y':
-        use_dii = 0; // Do not use DII
-        break;
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-      case 't':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'n':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage: %s "
-                           "-k IOR "
-                           "-t threads "
-                           "-n iterations "
-                           "-y "
-                           "\n",
-                           argv[0]),
-                          -1);
-      }
-  return 0;
-}
-
-
-/// A helper class to encapsulate a task
-
-class Worker : public ACE_Task_Base
-{
-public:
-  Worker (Test::Transport::CurrentTest_ptr server, int niterations, int use_dii_too);
-  virtual int svc (void);
-
-private:
-  // The server.
-   Test::Transport::CurrentTest_var server_;
-
-  // The number of iterations on each client thread.
-  int niterations_;
-
-  // Whether to use DII in addition to SII
-  int use_dii_too_;
-};
-
-
-/// Ctor
-
-Worker::Worker (Test::Transport::CurrentTest_ptr server,
-                int niterations,
-                int use_dii_too)
-  :  server_ (Test::Transport::CurrentTest::_duplicate (server))
-  ,  niterations_ (niterations)
-  , use_dii_too_ (use_dii_too)
-{
-}
-
-
-/// Test referencing the TC data *inside* the context of a client-side
-/// interceptor
-
-int
-Worker::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-
-      for (int i = 0; i < this->niterations_; ++i)
-        {
-
-  // Minimum CORBA does not define Object::_request, so we're just
-  // skipping the DII part in those cases.
-#if (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0))
-
-          if (this->use_dii_too_)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via DII\n")));
-
-              CORBA::Request_var request =
-                this->server_->_request ("invoked_by_client"
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              request->set_return_type (CORBA::_tc_void);
-
-              request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-
-#endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */
-
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n")));
-
-          this->server_->invoked_by_client (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (TAO_debug_level > 0 && i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Iteration = %d\n"),
-                        i));
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-
-/// The main driver
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      Test::Client_Request_Interceptor cri (CLIENT_ORB_ID, test_transport_current);
-
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      ACE_NEW_RETURN (temp_initializer,
-                      Test::Client_ORBInitializer (&cri),
-                      -1);
-
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         CLIENT_ORB_ID
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Client (%P|%t) Failure to parse the command line.\n"),
-                           ior),
-                          -1);
-
-
-      ACE_TRY
-        {
-          test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("Client (%P|%t) ERROR: ")
-                             ACE_TEXT ("TC invocation, outside of ")
-                             ACE_TEXT ("interceptor context is undefined.")
-                             ACE_TEXT (" Expected exception was not thrown\n")),
-                            -1);
-        }
-      ACE_CATCH (Transport::NoContext, ex)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Client (%P|%t) Expected exception occured when trying ")
-                      ACE_TEXT ("to access traits outside the ")
-                      ACE_TEXT ("interceptor or upcall context.\n")));
-        }
-      ACE_ENDTRY;
-
-      // Resolve the target object
-      CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Transport::CurrentTest_var server =
-        Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Client (%P|%t) The server object reference <%s> is nil.\n"),
-                           ior),
-                          -1);
-
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Spawning %d threads\n"), nthreads));
-
-      // Spawn a number of clients doing the same thing for a
-      // predetermined number of times
-      Worker client (server.in (), niterations, use_dii);
-
-#if defined (ACE_HAS_THREADS)
-      if (client.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Client (%P|%t) Cannot activate %d client threads\n"),
-                           nthreads),
-                          -1);
-      client.thr_mgr ()->wait ();
-#else
-      if (nthreads > 1)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("Client (%P|%t) Cannot use threads other than ")
-                    ACE_TEXT ("the only one available.\n")));
-      client.svc ();
-#endif
-
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Collected any threads\n")));
-
-      CORBA::Long result = 0;
-
-      // Verify enough interception points have been triggered
-      if (cri.interceptions () != 2 *             // request & response
-                                  niterations *   // iterations
-                                  nthreads *      // threads
-                                  (2*use_dii))    // sii and dii, if needed
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Client (%P|%t) Expected %d client-side interceptions, but detected %d\n"),
-                      2 * niterations * nthreads * (2*use_dii),
-                      cri.interceptions ()));
-        }
-      else
-        {
-
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n")));
-
-          // Self-test the server side
-          result = server->self_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (result != 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("Client (%P|%t) Server self-test reported failure\n")));
-        }
-
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking oneway server->shutdown()\n")));
-
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_INFO,
-                  ACE_TEXT ("Client (%P|%t) Completed %s\n"),
-                  ((result == 0) ? ACE_TEXT ("successfuly") : ACE_TEXT ("with failure"))));
-      return result;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Client: Transport Current test (client-side) failed:"));
-      return -1;
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/tests/TransportCurrent/Framework/run_test.pl b/TAO/tests/TransportCurrent/Framework/run_test.pl
deleted file mode 100755
index c53fce33033..00000000000
--- a/TAO/tests/TransportCurrent/Framework/run_test.pl
+++ /dev/null
@@ -1,89 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use Config;
-use PerlACE::Run_Test;
-
-sub add_path {
-    my($name)  = shift;
-    my($value) = shift;
-    if (defined $ENV{$name}) {
-        $ENV{$name} .= $Config{'path_sep'} . $value
-        }
-    else {
-        $ENV{$name} = $value;
-    }
-}
-
-# Set the library path for the client to be able to load
-# the commom library.
-add_path('LD_LIBRARY_PATH', '../lib');
-add_path('LIBPATH', '../lib');
-add_path('SHLIB_PATH', '../lib');
-add_path('PATH', '../lib');
-add_path('DYLD_LIBRARY_PATH', '../lib');
-
-my $status = 0;
-my $confmod = "";
-
-my $mode = shift (@ARGV);
-if ( $mode =~ /-dynamic/) {
-}
-elsif  ( $mode =~ /-static/) {
-    $confmod = "-static";
-}
-else {
-    print STDERR "Unknown $mode. Specify -static or -dynamic\n";
-    exit 1;
-}
-
-my $iorfile = PerlACE::LocalFile ("server.ior");
-my $confserver = PerlACE::LocalFile ("server$confmod.conf");
-my $confclient = PerlACE::LocalFile ("client$confmod.conf");
-unlink $iorfile;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server",
-                                  "@ARGV -ORBSvcConf server.conf -o server.ior");
-}
-else {
-    $SV = new PerlACE::Process ("server",
-                                "@ARGV -ORBSvcConf $confserver -o $iorfile");
-}
-
-$CL = new PerlACE::Process ("client",
-                            "@ARGV -n 1 -ORBSvcConf $confclient -k file://$iorfile");
-
-print STDERR $SV->CommandLine()."\n";
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "$0: ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-print STDERR $CL->CommandLine()."\n";
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "$0: ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "$0: ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/TransportCurrent/Framework/server-static.conf b/TAO/tests/TransportCurrent/Framework/server-static.conf
deleted file mode 100644
index 0f63cfe7965..00000000000
--- a/TAO/tests/TransportCurrent/Framework/server-static.conf
+++ /dev/null
@@ -1 +0,0 @@
-static TAO_Transport_Current_Loader ""
diff --git a/TAO/tests/TransportCurrent/Framework/server.conf b/TAO/tests/TransportCurrent/Framework/server.conf
deleted file mode 100644
index aecb1923f83..00000000000
--- a/TAO/tests/TransportCurrent/Framework/server.conf
+++ /dev/null
@@ -1 +0,0 @@
-dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() ""
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
deleted file mode 100644
index 579f11d7726..00000000000
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/Task.h"
-
-#include "tao/ORBInitializer_Registry.h"
-
-#include "Current_Test_Impl.h"
-#include "Server_Request_Interceptor.h"
-#include "Server_ORBInitializer.h"
-
-
-ACE_RCSID (Transport_Current,
-           server,
-           "$Id$")
-
-const char *ior_output_file = "server.ior";
-int nthreads = 1;
-int use_collocated_call = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "t:o:n:c:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'c':
-        use_collocated_call = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-      case 't':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'n': // Does nothing. Added just for symetry with the client.
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage: %s "
-                           "-o <iorfile>"
-                           "-t threads "
-                           "-n n (ignored, if provided) "
-                           "-c make_collocated_calls "
-                           "\n",
-                           argv[0]),
-                          -1);
-      }
-
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-
-
-/// A helper class to encapsulate a task
-
-class Worker : public ACE_Task_Base
-{
-public:
-  Worker (CORBA::ORB_ptr);
-  virtual int svc (void);
-
-private:
-  // The ORB
-  CORBA::ORB_var orb_;
-};
-
-
-/// Ctor
-
-Worker::Worker (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-
-/// Test referencing the TC data *inside* the context of a client-side
-/// interceptor
-
-int
-Worker::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Server: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-
-
-/// Main driver
-
-int
-server_main (int argc,
-             ACE_TCHAR *argv[],
-             Test::Server_Request_Interceptor *cri)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      ACE_NEW_RETURN (temp_initializer,
-                      Test::Server_ORBInitializer (cri),
-                      -1);  // No exceptions yet!
-
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            ACE_TEXT ("test_orb")
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Server (%P|%t) Unable to obtain")
-                           ACE_TEXT (" RootPOA reference.\n")),
-                          -1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return -1;
-
-      Current_Test_Impl server_impl (orb.in (),
-                                     root_poa.in (),
-                                     use_collocated_call);
-
-      obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Transport::CurrentTest_var server =
-        Test::Transport::CurrentTest::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Server (%P|%t) Unable to obtain ")
-                           ACE_TEXT ("reference to CurrentTest object.\n")),
-                          -1);
-
-      CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the IOR to it.
-      if (ior_output_file != 0)
-        {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Server (%P|%t) Cannot write "
-                               "IOR: %s - %m",
-                               ior_output_file),
-                              -1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      // Spawn a number of clients doing the same thing for a
-      // predetermined number of times
-      Worker worker (orb.in ());
-
-#if defined (ACE_HAS_THREADS)
-      if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Server (%P|%t) Cannot activate %d threads\n"),
-                           nthreads),
-                          -1);
-      worker.thr_mgr ()->wait ();
-#else
-      if (nthreads > 1)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("Server (%P|%t) Cannot use threads other than ")
-                    ACE_TEXT ("the only one available.\n")));
-      worker.svc ();
-#endif
-
-      if (TAO_debug_level >= 1)
-        ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Event loop finished.\n")));
-
-      if (!cri->self_test ())
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n")));
-
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Server (%P|%t) ERROR: "));
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Completed successfuly.\n")));
-  return 0;
-}
diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp
deleted file mode 100644
index 2b945f788c1..00000000000
--- a/TAO/tests/TransportCurrent/Framework/simple.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/ORB.h"
-#include "tao/Object.h"
-
-#include "ace/Service_Config.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (Transport_Current,
-           simple,
-           "$Id$")
-
-int
-testCurrentORBInitializer (int argc, char *argv[])
-{
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-  if (orb.in () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to create orb\n")), -1);
-
-  CORBA::Object_var obj =
-    orb->resolve_initial_references ("TAO::Transport::Current"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (obj.in () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Unable to get the Transport Current\n")), -1);
-
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testCurrentORBInitializer: OK\n")));
-  return 0;
-}
-
-
-int
-testCurrentLoader (int, char *[])
-{
-
-  ACE_Service_Object *factory = 0;
-
-  factory = ACE_Dynamic_Service<ACE_Service_Object>::instance
-    (ACE_TEXT ("TAO_Transport_Current_Loader"));
-
-  int done =
-#if defined (TAO_AS_STATIC_LIBS)
-    true;
-#else
-  (factory != 0);
-#endif /* TAO_AS_STATIC_LIBS */
-
-  if (factory == 0)
-    {
-      if (done)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Unable to instantiate TAO::Transport::Current_Factory\n")),
-                          -1);
-      else
-        {
-
-#if !defined (TAO_AS_STATIC_LIBS)
-          int ret = ACE_Service_Config::process_directive
-            (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader",
-                                           "TAO_Transport_Current",
-                                           "_make_TAO_Transport_Current_Loader",
-                                           ""));
-          ACE_ASSERT (ret == 0);
-
-          factory = ACE_Dynamic_Service<ACE_Service_Object>::instance
-            (ACE_TEXT ("TAO_Transport_Current_Loader"));
-
-#endif /* !TAO_AS_STATIC_LIBS */
-        }
-    }
-
-  //  ACE_ASSERT (factory != 0);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testCurrentLoader: OK\n")));
-  return 0;
-
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  return testCurrentLoader (argc, argv)
-    || testCurrentORBInitializer (argc, argv);
-}
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
deleted file mode 100644
index 8687263dbc3..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/TransportCurrent/TC_IIOPC.h"
-#include "tao/TransportCurrent/TCC.h"
-
-#include "Current_Test_Impl.h"
-
-ACE_RCSID (Transport_Current,
-           Current_Test_Impl,
-           "$Id$")
-
-
-Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
-                                      PortableServer::POA_ptr poa,
-                                      int do_collocated_calls)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-    , poa_ (PortableServer::POA::_duplicate (poa))
-    , do_collocated_calls_ (do_collocated_calls)
-{
-}
-
-Current_Test_Impl::~Current_Test_Impl (void)
-{
-}
-
-::CORBA::Long
-Current_Test_Impl::self_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((::CORBA::SystemException))
-{
-  return 0;
-}
-
-void
-Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 2) {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) server - Testing access to IIOP Transport Current ...\n")));
-  }
-
-  CORBA::Object_var tcobject =
-    this->orb_->resolve_initial_references ("TAO::Transport::IIOP::Current"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO::Transport::IIOP::Current_var tc =
-    TAO::Transport::IIOP::Current::_narrow (tcobject.in ()
-                                            ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
-
-  if (CORBA::is_nil (tc.in()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Unable to narrow down to TAO::Transport::IIOP::Current\n")));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  CORBA::String_var rhost (tc->remote_host ());
-  CORBA::String_var lhost (tc->local_host ());
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%P|%t) server - [%s:%d] -> [%s:%d]\n"),
-              rhost.in (), tc->remote_port (),
-              lhost.in (), tc->local_port ()));
-
-  if (TAO_debug_level > 2) {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) server - Successfully accessed IIOP Transport Current\n")));
-  }
-}
-
-
-
-void
-Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level >= 1) {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) server - Test method invoked by client.\n")));
-  }
-
-  this->test_transport_current (ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
-
-  if (this->do_collocated_calls_)
-    {
-      CORBA::Object_var selfobject =
-        poa_->servant_to_reference (this
-                                    ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
-
-      Test::Transport::CurrentTest_var self =
-        Test::Transport::CurrentTest::_narrow (selfobject.in ()
-                                               ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
-
-      if (TAO_debug_level >= 1) {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) server - Making a collocated invocation to invoked_during_upcall().\n")));
-      }
-      self->invoked_during_upcall (ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  else
-    {
-      if (TAO_debug_level >= 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) server - skipping collocated calls\n")));
-        }
-
-    }
-
-}
-
-void
-Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 2) {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) server - Test method invoked ")
-                ACE_TEXT ("by the server during upcall.\n")));
-  }
-}
-
-void
-Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 2) {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) server - shutting down.\n")));
-  }
-
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
deleted file mode 100644
index 49b2d839f38..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, tc_iiop, pi_server {
-  after += Curren_Test_Lib_Client Current_Test_Lib_Server
-  libs  += Current_Test_Lib_Client Current_Test_Lib_Server
-
-  specific (automake) {
-    includes += $(srcdir) $(srcdir)/../lib
-    libpaths += $(srcdir)/../lib
-  } else {
-    includes += . ../lib
-    libpaths += ../lib
-  }
-
-  Source_Files {
-    server.cpp
-    Current_Test_Impl.cpp
-    IIOP_Server_Request_Interceptor.cpp
-    IIOP_Server_Main.cpp
-    IIOP_Tester.cpp
-  }
-
-  IDL_Files {
-  }
-}
-
-project(*Client): taoclient, tc_iiop, dynamicinterface {
-  after += *Server Current_Test_Lib_Client Current_Test_Lib_Server
-  libs  += Current_Test_Lib_Client Current_Test_Lib_Server
-
-  specific (automake) {
-    includes += $(srcdir) $(srcdir)/../lib
-    libpaths += $(srcdir)/../lib
-  } else {
-    includes += . ../lib
-    libpaths += ../lib
-  }
-
-  Source_Files {
-    client.cpp
-    IIOP_Tester.cpp
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
deleted file mode 100644
index cce444d8662..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-#include "IIOP_Server_Request_Interceptor.h"
-
-/// Prototype
-int server_main (int argc,
-                 ACE_TCHAR *argv[],
-                 Test::Server_Request_Interceptor *cri);
-
-int
-test_transport_current (CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL)  ACE_THROW_SPEC ((CORBA::SystemException,
-                                                            CORBA::UserException));
-
-int
-ACE_TMAIN (int argc,
-           ACE_TCHAR *argv[])
-{
-  Test::IIOP_Server_Request_Interceptor cri ("test_orb", test_transport_current);
-  return server_main (argc, argv, &cri);
-}
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
deleted file mode 100644
index f51936d5d35..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ /dev/null
@@ -1,352 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Constants.h"
-#include "tao/TransportCurrent/TC_IIOPC.h"
-
-ACE_RCSID (ForwardRequest,
-           Server_Request_Interceptor,
-           "$Id$")
-
-#include "IIOP_Server_Request_Interceptor.h"
-
-namespace Test {
-
-  using namespace TAO;
-
-  IIOP_Server_Request_Interceptor::IIOP_Server_Request_Interceptor (const char* orbid, TEST test)
-    : Server_Request_Interceptor (orbid, test)
-    , iiop_test_successful_ (true)
-    , mult_thr_test_successful_ (true)
-  {
-  }
-
-  IIOP_Server_Request_Interceptor::~IIOP_Server_Request_Interceptor (void)
-  {
-  }
-
-  char *
-  IIOP_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    return CORBA::string_dup ("II SRI");
-  }
-
-  ///
-  TAO::Transport::IIOP::Current_ptr
-  IIOP_Server_Request_Interceptor::resolve_iiop_transport_current (const char* orbid
-                                                                   ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CORBA::String_var name (this->name ());
-
-    int tmpargc = 0;
-    CORBA::ORB_var orb = CORBA::ORB_init (tmpargc,
-                                          0,
-                                          orbid
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    CORBA::Object_var tcobject =
-      orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current")
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    return TAO::Transport::IIOP::Current::_narrow (tcobject.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  }
-
-  /// On every request, a client-supplied (via the context) id is used
-  /// as index in an array, where we store the endpoint
-  void
-  IIOP_Server_Request_Interceptor::push_request_info (size_t requestID
-                                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CORBA::String_var name (this->name ());
-
-    TAO::Transport::IIOP::Current_var tc =
-      resolve_iiop_transport_current (this->orb_id_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-
-    CORBA::String_var host (tc->remote_host());
-    EndPoint ep (tc->remote_port(), host.in ());
-
-    if (requestID < sizeof (this->endPoints_) / sizeof (*this->endPoints_))
-      {
-        endPoints_[requestID] = ep;
-
-        if (TAO_debug_level > 1)
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("%s (%P|%t) ")
-                      ACE_TEXT ("push_request_info: %d ...\n"),
-                      name.in (),
-                      requestID));
-      }
-    else
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("%s (%P|%t) ")
-                  ACE_TEXT ("push_request_info: Can't track that many requests %d\n"),
-                  name.in (),
-                  requestID));
-
-  }
-
-  void
-  IIOP_Server_Request_Interceptor::pop_request_info (size_t requestID)
-  {
-    static EndPoint dummy;
-    CORBA::String_var name (this->name ());
-
-    if (TAO_debug_level > 1)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("%s (%P|%t) ")
-                  ACE_TEXT ("pop_request_info: %d ...\n"),
-                  name.in (),
-                  requestID));
-
-    if (requestID >= sizeof (this->endPoints_) / sizeof (*this->endPoints_))
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%s (%P|%t) ")
-                    ACE_TEXT ("pop_request_info: Can't track that many requests %d\n"),
-                    name.in (),
-                    requestID));
-        return;
-      }
-
-
-    ACE_TRY
-      {
-        TAO::Transport::IIOP::Current_var tc =
-          resolve_iiop_transport_current (this->orb_id_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-
-        CORBA::String_var host (tc->remote_host());
-        EndPoint ep (tc->remote_port(), host.in ());
-
-        if (ep != endPoints_[requestID])
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("%s (%P|%t) ")
-                        ACE_TEXT ("pop_request_info: The expected host and port don't match for request %d\n"),
-                        name.in (),
-                        requestID));
-            return;
-          }
-      }
-    ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
-      {
-        // Last reply after the orb has been shut down. Calling
-        // resolve_iiop_transport_current in this case will cause
-        // BAD_INV_ORDER, so instead we swallow the exception and bid
-        // goodbye.
-      }
-    ACE_ENDTRY;
-
-    endPoints_[requestID] = dummy;
-  }
-
-
-  /// Checks if all the endpoints, encountered on the way in have been
-  /// cleaned on the way out of the interception point
-  bool
-  IIOP_Server_Request_Interceptor::self_test (void)
-  {
-    CORBA::String_var name (this->name ());
-    bool has_remaining_endpoints = false;
-    for (size_t count = 0;
-         count < (sizeof (this->endPoints_) / sizeof (*this->endPoints_));
-         count ++)
-      {
-        if (endPoints_[count].port_ != 0)
-          {
-            has_remaining_endpoints = true;
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("%s (%P|%t) Endpoint at ")
-                        ACE_TEXT ("index=%d has not been removed yet\n"),
-                        name.in (),
-                        count));
-          }
-      }
-
-    return Server_Request_Interceptor::self_test ()
-      && iiop_test_successful_
-      && !has_remaining_endpoints;
-  }
-
-
-
-  void
-  IIOP_Server_Request_Interceptor::inbound_process_context  (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                         ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CORBA::String_var name (this->name ());
-    CORBA::String_var op (ri->operation(ACE_ENV_ARG_PARAMETER));
-    ACE_CHECK;
-
-    if (TAO_debug_level >=1)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("%s (%P|%t) Intercepted operation %s ()\n"),
-                  name.in (),
-                  op.in ()));
-
-    ACE_TRY
-      {
-        IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag;
-        IOP::ServiceContext_var sc =
-          ri->get_request_service_context (id
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        const char *buf =
-          reinterpret_cast <const char *> (sc->context_data.get_buffer ());
-
-        long requestID = ACE_OS::atoi (buf);
-
-        this->push_request_info (requestID);
-      }
-    ACE_CATCHANY
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("%s (%P|%t) Service context")
-                    ACE_TEXT (" is unavailable when invoking %s (). ")
-                    ACE_TEXT ("A colocated invocation would have ")
-                    ACE_TEXT ("no service context.\n"),
-                    name.in (),
-                    op.in ()));
-      }
-    ACE_ENDTRY;
-
-  }
-
-  void
-  IIOP_Server_Request_Interceptor::outbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                             ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag;
-
-    IOP::ServiceContext_var sc =
-      ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    const char *buf =
-      reinterpret_cast <const char *> (sc->context_data.get_buffer ());
-
-    this->pop_request_info (ACE_OS::atoi (buf));
-  }
-
-
-
-
-
-
-  void
-  IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
-  {
-    ACE_TRY
-      {
-        inbound_process_context (ri ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        CORBA::String_var name (this->name ());
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT("%s (%P|%t) Inbound_process_context failed in  ")
-                    ACE_TEXT(" receive_request_service_contexts.\n"),
-                    name.in ()));
-      }
-    ACE_ENDTRY;
-
-    Server_Request_Interceptor::receive_request_service_contexts (ri ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-  }
-
-
-  void
-  IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_TRY
-      {
-        outbound_process_context (ri ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        CORBA::String_var name (this->name ());
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT("%s (%P|%t) Outbound_process_context failed in  ")
-                    ACE_TEXT("send_reply.\n"),
-                    name.in ()));
-      }
-    ACE_ENDTRY;
-
-    Server_Request_Interceptor::send_reply (ri ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-  }
-
-  void
-  IIOP_Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                                               ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
-  {
-    ACE_TRY
-      {
-        outbound_process_context (ri ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-
-      }
-    ACE_CATCHANY
-      {
-        CORBA::String_var name (this->name ());
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT("%s (%P|%t) Outbound_process_context failed in  ")
-                    ACE_TEXT("send_exception.\n"),
-                    name.in ()));
-
-      }
-    ACE_ENDTRY;
-
-    Server_Request_Interceptor::send_exception (ri ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  void
-  IIOP_Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
-  {
-    ACE_TRY
-      {
-        outbound_process_context (ri ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        CORBA::String_var name (this->name ());
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT("%s (%P|%t) Outbound_process_context failed in  ")
-                    ACE_TEXT("send_other.\n"),
-                    name.in ()));
-      }
-    ACE_ENDTRY;
-
-    Server_Request_Interceptor::send_other (ri ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-}
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
deleted file mode 100644
index 00cd81bdb31..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ /dev/null
@@ -1,154 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file IIOP_Server_Request_Interceptor.h
- *
- * $Id$
- *
- * Implementation header for the server request interceptor for the
- * IIOP_Threading test.
- *
- * @author Iliyan Jeliazkov <iliyan@ociweb.com>
- * @author Ciju John <johnc@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ISERVER_REQUEST_INTERCEPTOR_H
-#define ISERVER_REQUEST_INTERCEPTOR_H
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TransportCurrent/IIOP_Transport_Current.h"
-
-#include "Server_Request_Interceptor.h"
-
-namespace Test
-{
-
-  class IIOP_Server_Request_Interceptor
-    : public virtual Test::Server_Request_Interceptor
-    , public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    /// Constructor.
-    IIOP_Server_Request_Interceptor (const char* orbid, TEST test);
-
-    /// Destructor.
-    virtual ~IIOP_Server_Request_Interceptor ();
-
-    /// queries the status of the test
-    virtual bool self_test ();
-
-    /**
-     * @name Methods Required by the Server Request Interceptor
-     * Interface
-     *
-     * These are methods that must be implemented since they are pure
-     * virtual in the abstract base class.  They are the canonical
-     * methods required for all server request interceptors.
-     */
-    //@{
-    /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// incomming interception point
-    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr
-                                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
-
-    /// outgoing interception point
-    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// outgoing interception point
-    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
-
-    /// outgoing interception point
-    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
-    //@}
-
-  protected:
-
-    /// process incomming requests context
-    void inbound_process_context
-    (PortableInterceptor::ServerRequestInfo_ptr ri
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// process outgoing requests context
-    void outbound_process_context
-    (PortableInterceptor::ServerRequestInfo_ptr ri
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// saves the incomming request info
-    void push_request_info (size_t requestID
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// clears the outgoing request info
-    void pop_request_info (size_t requestID);
-
-    TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid
-                                                                      ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-
-    /// transport ID dtata structure
-    typedef struct EP {
-      CORBA::UShort port_;
-      CORBA::String_var host_;
-
-      EP ()
-        : port_(0)
-        , host_ ()
-      {};
-
-      EP (CORBA::UShort port, const char* host)
-        : port_(port)
-        , host_ (host)
-      {};
-
-      bool operator== (const struct EP &ep) const
-      {
-        return (this->port_ == ep.port_) &&
-          (strcmp (this->host_.in (), ep.host_.in ()) == 0);
-      };
-      bool operator!= (const struct EP &ep) const
-      {
-        return !(this->operator== (ep));
-      };
-
-    } EndPoint;
-
-  private:
-
-    /// IIOPTraits test status
-    bool iiop_test_successful_;
-
-    /// Multi-threaded test status
-    bool mult_thr_test_successful_;
-
-    /// Endpoints hash table
-    EndPoint endPoints_[1001];
-  };
-
-} // namespace Test
-
-#endif  /* ISERVER_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
deleted file mode 100644
index 7e94ff502e5..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-#include "tao/TransportCurrent/IIOP_Transport_Current.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#include "tao/TransportCurrent/IIOP_Current_Loader.h"
-
-// Create an object that will insert the <Current_Loader> into the
-// list of statically linked services that the <ACE_Service_Config>
-// will initialize at run-time.
-ACE_STATIC_SVC_REQUIRE (TAO_Transport_Current_Loader)
-ACE_STATIC_SVC_REQUIRE (TAO_Transport_IIOP_Current_Loader)
-#endif /* TAO_AS_STATIC_LIBS */
-
-
-using namespace TAO;
-
-
-/// Test referencing the TC data outside of the context of an upcall,
-/// or a client-side interceptor
-
-int
-test_transport_current (CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::UserException))
-{
-  // Get the Current object.
-  CORBA::Object_var tcobject =
-    orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current")
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-
-  if (TAO_debug_level >= 1)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Tester (%P|%t) Resolved initial reference for IIOP::Current\n")));
-
-  Transport::IIOP::Current_var tc =
-    Transport::IIOP::Current::_narrow (tcobject.in ()
-                                       ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
-
-  if (TAO_debug_level >= 1)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Tester (%P|%t) Narowed the IIOP Transport Current\n")));
-
-  if (CORBA::is_nil (tc.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Tester (%P|%t) ERROR: Could not resolve ")
-                  ACE_TEXT ("TAO::Transport::IIOP::Current object.\n")));
-
-      ACE_TRY_THROW (CORBA::INTERNAL ());
-    }
-
-  ::CORBA::String_var rhost (tc->remote_host (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_TRY_CHECK;
-
-  ::CORBA::String_var lhost (tc->local_host (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_TRY_CHECK;
-
-  ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Tester (%P|%t) Transport [%q] [%s:%d -> %s:%d] ")
-              ACE_TEXT ("Sent/Received [bytes=%q/%q, messages=%q/%q]\n"),
-              (ACE_UINT64)id,
-              rhost.in (), tc->remote_port (ACE_ENV_SINGLE_ARG_PARAMETER),
-              lhost.in (), tc->local_port (ACE_ENV_SINGLE_ARG_PARAMETER),
-              (ACE_UINT64)bs,
-              (ACE_UINT64)br,
-              (ACE_UINT64)rs,
-              (ACE_UINT64)rr));
-  return 0;
-}
-
diff --git a/TAO/tests/TransportCurrent/IIOP/Makefile.am b/TAO/tests/TransportCurrent/IIOP/Makefile.am
deleted file mode 100644
index 52938e5c082..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/Makefile.am
+++ /dev/null
@@ -1,120 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IIOP_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir) \
-  -I$(srcdir)/../lib
-
-server_SOURCES = \
-  Current_Test_Impl.cpp \
-  IIOP_Server_Main.cpp \
-  IIOP_Server_Request_Interceptor.cpp \
-  IIOP_Tester.cpp \
-  server.cpp \
-  IIOP_Server_Request_Interceptor.h
-
-$(srcdir)/../lib:
-	mkdir -p $(srcdir)/../lib
-
-
-server_DEPENDENCIES = \
- $(srcdir)/../lib
-
-server_LDFLAGS = \
-  -L$(srcdir)/../lib
-
-server_LDADD = \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.IIOP_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir) \
-  -I$(srcdir)/../lib
-
-client_SOURCES = \
-  IIOP_Tester.cpp \
-  client.cpp \
-  IIOP_Server_Request_Interceptor.h
-
-
-client_DEPENDENCIES = \
- $(srcdir)/../lib
-
-client_LDFLAGS = \
-  -L$(srcdir)/../lib
-
-client_LDADD = \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/TransportCurrent/IIOP/README b/TAO/tests/TransportCurrent/IIOP/README
deleted file mode 100644
index b340cfcab02..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/README
+++ /dev/null
@@ -1,25 +0,0 @@
-This test has two parts, which run automatically:
-
-Part 1: 
-
-IIOP_Transport_Current test: Demonstrates how in the application the
-user can resolve the IIOP_Transport_Current and use it to obtain
-IIOP-related transport properties for the current Transport.
-
-Part 2:
-
-Multi threading test: In this test the server has a Thread Pool. Using
-Interceptors, the test tracks the transports that are used in the
-individual invocations at various stage of the up-call. This validates
-that the TC framework accurately tracks the correct transport for an
-invocation, no matter what stage of the up-call in a multi-threaded
-environment.
-
-We force creation of multiple transport by using the: static
-Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive"
-directive. While this isn't 100% guaranteed, having multiple client
-threads and making simultaneous invocations should trigger new transport
-creation (as it did in lab conditions).
-
-See ../Framework/README for more detail on how and what contexts are
-tested.
diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp
deleted file mode 100644
index 3cb8df90cc0..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/client.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-#include "tao/DynamicInterface/Request.h"
-#include "tao/ORBInitializer_Registry.h"
-
-#include "tao/TransportCurrent/Transport_Current.h"
-
-#include "Client_Request_Interceptor.h"
-#include "Current_TestC.h"
-
-#include "Client_ORBInitializer.h"
-
-ACE_RCSID (IIOP,
-           client,
-           "$Id$")
-
-// Prototype
-
-int
-test_transport_current (CORBA::ORB_ptr
-                        ACE_ENV_ARG_DECL)  ACE_THROW_SPEC ((CORBA::SystemException,
-                                                            CORBA::UserException));
-
-using namespace TAO;
-
-const ACE_TCHAR* CLIENT_ORB_ID = ACE_TEXT ("client orb");
-const ACE_TCHAR* ior = "file://server.ior";
-
-int nthreads = 1;
-int niterations = 1;
-int use_dii = 1;
-
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "yt:n:k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'y':
-        use_dii = 0; // Do not use DII
-        break;
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-      case 't':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'n':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage: %s "
-                           "-k IOR "
-                           "-t threads "
-                           "-n iterations "
-                           "-y "
-                           "\n",
-                           argv[0]),
-                          -1);
-      }
-  return 0;
-}
-
-
-/// A helper class to encapsulate a task
-
-class Worker : public ACE_Task_Base
-{
-public:
-  Worker (Test::Transport::CurrentTest_ptr server, int niterations, int use_dii_too);
-  virtual int svc (void);
-
-private:
-  // The server.
-   Test::Transport::CurrentTest_var server_;
-
-  // The number of iterations on each client thread.
-  int niterations_;
-
-  // Whether to use DII in addition to SII
-  int use_dii_too_;
-};
-
-
-/// Ctor
-
-Worker::Worker (Test::Transport::CurrentTest_ptr server,
-                int niterations,
-                int use_dii_too)
-  :  server_ (Test::Transport::CurrentTest::_duplicate (server))
-  ,  niterations_ (niterations)
-  , use_dii_too_ (use_dii_too)
-{
-}
-
-
-/// Test referencing the TC data *inside* the context of a client-side
-/// interceptor
-
-int
-Worker::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-
-      for (int i = 0; i < this->niterations_; ++i)
-        {
-
-  // Minimum CORBA does not define Object::_request, so we're just
-  // skipping the DII part in those cases.
-#if (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0))
-
-          if (this->use_dii_too_)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via DII\n")));
-
-              CORBA::Request_var request =
-                this->server_->_request ("invoked_by_client"
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              request->set_return_type (CORBA::_tc_void);
-
-              request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-
-#endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */
-
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n")));
-
-          this->server_->invoked_by_client (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (TAO_debug_level > 0 && i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Iteration = %d\n"),
-                        i));
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-
-/// The main driver
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      Test::Client_Request_Interceptor cri (CLIENT_ORB_ID, test_transport_current);
-
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      ACE_NEW_RETURN (temp_initializer,
-                      Test::Client_ORBInitializer (&cri),
-                      -1);
-
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         CLIENT_ORB_ID
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Client (%P|%t) Failure to parse the command line.\n"),
-                           ior),
-                          -1);
-
-
-      ACE_TRY
-        {
-          test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("Client (%P|%t) ERROR: ")
-                             ACE_TEXT ("TC invocation, outside of ")
-                             ACE_TEXT ("interceptor context is undefined.")
-                             ACE_TEXT (" Expected exception was not thrown\n")),
-                            -1);
-        }
-      ACE_CATCH (Transport::NoContext, ex)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Client (%P|%t) Expected exception occured when trying ")
-                      ACE_TEXT ("to access traits outside the ")
-                      ACE_TEXT ("interceptor or upcall context.\n")));
-        }
-      ACE_ENDTRY;
-
-      // Resolve the target object
-      CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Transport::CurrentTest_var server =
-        Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Client (%P|%t) The server object reference <%s> is nil.\n"),
-                           ior),
-                          -1);
-
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Spawning %d threads\n"), nthreads));
-
-      // Spawn a number of clients doing the same thing for a
-      // predetermined number of times
-      Worker client (server.in (), niterations, use_dii);
-
-#if defined (ACE_HAS_THREADS)
-      if (client.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Client (%P|%t) Cannot activate %d client threads\n"),
-                           nthreads),
-                          -1);
-      client.thr_mgr ()->wait ();
-#else
-      if (nthreads > 1)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("Client (%P|%t) Cannot use threads other than ")
-                    ACE_TEXT ("the only one available.\n")));
-      client.svc ();
-#endif
-
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Collected any threads\n")));
-
-      CORBA::Long result = 0;
-
-      // Verify enough interception points have been triggered
-      if (cri.interceptions () != 2 *             // request & response
-                                  niterations *   // iterations
-                                  nthreads *      // threads
-                                  (2*use_dii))    // sii and dii, if needed
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Client (%P|%t) Expected %d client-side interceptions, but detected %d\n"),
-                      2 * niterations * nthreads * (2*use_dii),
-                      cri.interceptions ()));
-        }
-      else
-        {
-
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n")));
-
-          // Self-test the server side
-          result = server->self_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (result != 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("Client (%P|%t) Server self-test reported failure\n")));
-        }
-
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking oneway server->shutdown()\n")));
-
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_INFO,
-                  ACE_TEXT ("Client (%P|%t) Completed %s\n"),
-                  ((result == 0) ? ACE_TEXT ("successfuly") : ACE_TEXT ("with failure"))));
-      return result;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Client: Transport Current test (client-side) failed:"));
-      return -1;
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/tests/TransportCurrent/IIOP/client_dynamic.conf b/TAO/tests/TransportCurrent/IIOP/client_dynamic.conf
deleted file mode 100644
index 56ff8d9c269..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/client_dynamic.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-static Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive"
-dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() ""
-dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() ""
diff --git a/TAO/tests/TransportCurrent/IIOP/client_static.conf b/TAO/tests/TransportCurrent/IIOP/client_static.conf
deleted file mode 100644
index 56e191b9257..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/client_static.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-static TAO_Transport_Current_Loader ""
-static TAO_Transport_IIOP_Current_Loader ""
-static Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive"
diff --git a/TAO/tests/TransportCurrent/IIOP/run_test.pl b/TAO/tests/TransportCurrent/IIOP/run_test.pl
deleted file mode 100755
index faf9b921687..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/run_test.pl
+++ /dev/null
@@ -1,91 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use Config;
-use PerlACE::Run_Test;
-
-sub add_path {
-    my($name)  = shift;
-    my($value) = shift;
-    if (defined $ENV{$name}) {
-        $ENV{$name} .= $Config{'path_sep'} . $value
-        }
-    else {
-        $ENV{$name} = $value;
-    }
-}
-
-# Set the library path for the client to be able to load
-# the common library library.
-add_path('LD_LIBRARY_PATH', '../lib');
-add_path('LIBPATH', '../lib');
-add_path('SHLIB_PATH', '../lib');
-add_path('PATH', '../lib');
-add_path('DYLD_LIBRARY_PATH', '../lib');
-
-$status = 0;
-
-$client = PerlACE::LocalFile ("client");
-
-$mode = shift (@ARGV);
-if ( $mode =~ /-dynamic/) {
-    $client_conf_file = PerlACE::LocalFile ("client_dynamic.conf");
-    $server_conf_file = PerlACE::LocalFile ("server_dynamic.conf");
-}
-elsif  ( $mode =~ /-static/) {
-    $client_conf_file = PerlACE::LocalFile ("client_static.conf");
-    $server_conf_file = PerlACE::LocalFile ("server_static.conf");
-}
-else {
-    print STDERR "Unknown $mode. Specify -static or -dynamic\n";
-    exit 1;
-}
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server",
-                                  "@ARGV -c 0 -ORBSvcConf $server_conf_file -o server.ior");
-}
-else {
-    $SV = new PerlACE::Process ("server",
-                                "@ARGV -c 0 -ORBSvcConf $server_conf_file -o $iorfile");
-}
-
-$CL = new PerlACE::Process ($client,
-                            "@ARGV -n 1 -ORBSvcConf $client_conf_file -k file://$iorfile");
-
-print STDERR $SV->CommandLine()."\n";
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "$0: ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-print STDERR $CL->CommandLine()."\n";
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "$0: ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "$0: ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp
deleted file mode 100644
index 579f11d7726..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/server.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/Task.h"
-
-#include "tao/ORBInitializer_Registry.h"
-
-#include "Current_Test_Impl.h"
-#include "Server_Request_Interceptor.h"
-#include "Server_ORBInitializer.h"
-
-
-ACE_RCSID (Transport_Current,
-           server,
-           "$Id$")
-
-const char *ior_output_file = "server.ior";
-int nthreads = 1;
-int use_collocated_call = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "t:o:n:c:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'c':
-        use_collocated_call = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-      case 't':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'n': // Does nothing. Added just for symetry with the client.
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage: %s "
-                           "-o <iorfile>"
-                           "-t threads "
-                           "-n n (ignored, if provided) "
-                           "-c make_collocated_calls "
-                           "\n",
-                           argv[0]),
-                          -1);
-      }
-
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-
-
-/// A helper class to encapsulate a task
-
-class Worker : public ACE_Task_Base
-{
-public:
-  Worker (CORBA::ORB_ptr);
-  virtual int svc (void);
-
-private:
-  // The ORB
-  CORBA::ORB_var orb_;
-};
-
-
-/// Ctor
-
-Worker::Worker (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-
-/// Test referencing the TC data *inside* the context of a client-side
-/// interceptor
-
-int
-Worker::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Server: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-
-
-/// Main driver
-
-int
-server_main (int argc,
-             ACE_TCHAR *argv[],
-             Test::Server_Request_Interceptor *cri)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      ACE_NEW_RETURN (temp_initializer,
-                      Test::Server_ORBInitializer (cri),
-                      -1);  // No exceptions yet!
-
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            ACE_TEXT ("test_orb")
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Server (%P|%t) Unable to obtain")
-                           ACE_TEXT (" RootPOA reference.\n")),
-                          -1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return -1;
-
-      Current_Test_Impl server_impl (orb.in (),
-                                     root_poa.in (),
-                                     use_collocated_call);
-
-      obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Transport::CurrentTest_var server =
-        Test::Transport::CurrentTest::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Server (%P|%t) Unable to obtain ")
-                           ACE_TEXT ("reference to CurrentTest object.\n")),
-                          -1);
-
-      CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the IOR to it.
-      if (ior_output_file != 0)
-        {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Server (%P|%t) Cannot write "
-                               "IOR: %s - %m",
-                               ior_output_file),
-                              -1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      // Spawn a number of clients doing the same thing for a
-      // predetermined number of times
-      Worker worker (orb.in ());
-
-#if defined (ACE_HAS_THREADS)
-      if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Server (%P|%t) Cannot activate %d threads\n"),
-                           nthreads),
-                          -1);
-      worker.thr_mgr ()->wait ();
-#else
-      if (nthreads > 1)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("Server (%P|%t) Cannot use threads other than ")
-                    ACE_TEXT ("the only one available.\n")));
-      worker.svc ();
-#endif
-
-      if (TAO_debug_level >= 1)
-        ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Event loop finished.\n")));
-
-      if (!cri->self_test ())
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n")));
-
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Server (%P|%t) ERROR: "));
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Completed successfuly.\n")));
-  return 0;
-}
diff --git a/TAO/tests/TransportCurrent/IIOP/server_dynamic.conf b/TAO/tests/TransportCurrent/IIOP/server_dynamic.conf
deleted file mode 100644
index df5758abd32..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/server_dynamic.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() ""
-dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() ""
diff --git a/TAO/tests/TransportCurrent/IIOP/server_static.conf b/TAO/tests/TransportCurrent/IIOP/server_static.conf
deleted file mode 100644
index a3bca724d53..00000000000
--- a/TAO/tests/TransportCurrent/IIOP/server_static.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-static TAO_Transport_Current_Loader ""
-static TAO_Transport_IIOP_Current_Loader ""
diff --git a/TAO/tests/TransportCurrent/Makefile.am b/TAO/tests/TransportCurrent/Makefile.am
deleted file mode 100644
index 31b17045a69..00000000000
--- a/TAO/tests/TransportCurrent/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        lib \
-        IIOP \
-        Framework
-
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
deleted file mode 100644
index 40112cc0b5a..00000000000
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (Current_Test_Lib,
-           Client_ORBInitializer,
-           "$Id$")
-
-#include "Client_Request_Interceptor.h"
-#include "Client_ORBInitializer.h"
-
-namespace Test
-{
-
-  Client_ORBInitializer::Client_ORBInitializer
-    (PortableInterceptor::ClientRequestInterceptor_ptr interceptor)
-      : interceptor_
-          (PortableInterceptor::ClientRequestInterceptor::_duplicate (interceptor))
-  {
-    /* no-op */
-  }
-
-  Client_ORBInitializer::~Client_ORBInitializer (void)
-  {
-    /* no-op */
-  }
-
-  void
-  Client_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*)
-    throw (CORBA::SystemException)
-  {
-    /* no-op */
-  }
-
-  // A specialization to handle client-side interceptors
-  void Client_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii)
-    throw (CORBA::SystemException)
-  {
-    oii->add_client_request_interceptor (this->interceptor_.in ());
-  }
-
-}
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
deleted file mode 100644
index dcafa6638f4..00000000000
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Client_ORBInitializer.h
- *
- * $Id$
- *
- * @author Iliyan jeliazkov <iliyan@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CLIENT_ORBINITIALIZER_T_H
-#define CLIENT_ORBINITIALIZER_T_H
-#include /**/ "ace/pre.h"
-#include /**/ "ace/config.h"
-
-#include /**/ "Current_Test_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI/PI.h"
-#include "tao/PortableInterceptorC.h"
-
-namespace Test
-{
-
-  class Current_Test_Export Client_ORBInitializer :
-    public PortableInterceptor::ORBInitializer
-  {
-  public:
-    Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
-    ~Client_ORBInitializer (void);
-
-    virtual void pre_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
-
-    virtual void post_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
-
-  private:
-    PortableInterceptor::ClientRequestInterceptor_var interceptor_;
-  };
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif  /* CLIENT_ORBINITIALIZER_T_H */
-
-
-
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
deleted file mode 100644
index f62ed6e1df1..00000000000
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (ForwardRequest,
-           Client_Request_Interceptor,
-           "$Id$")
-
-#include "Current_TestC.h"
-#include "Client_Request_Interceptor.h"
-#include "Client_ORBInitializer.h"
-
-namespace Test
-{
-
-  Client_Request_Interceptor::Client_Request_Interceptor (const char *orb_id,
-                                                          TEST test)
-    : orb_id_ (CORBA::string_dup (orb_id))
-    , request_count_ (0)
-    , requestID_ (1)
-    , test_ (test)
-  {
-  }
-
-  CORBA::Long
-  Client_Request_Interceptor::interceptions (void)
-  {
-    return this->request_count_;
-  }
-
-  char *
-  Client_Request_Interceptor::name (void)
-    throw (CORBA::SystemException)
-  {
-    return CORBA::string_dup ("Client_Request_Interceptor");
-  }
-
-  void
-  Client_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod)
-    throw (CORBA::SystemException, CORBA::UserException)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("CRI    (%P|%t) Test accessing Transport Current from %s\n"),
-                amethod));
-
-    ++this->request_count_;
-
-    int tmp = 0;
-    CORBA::ORB_var orb = CORBA::ORB_init (tmp,
-                                          0,
-                                          orb_id_.in ());
-
-    // Call the test function, which will throw an exception on
-    // failure
-    (*this->test_) (orb.in ());
-
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("CRI    (%P|%t) Successfully tested Transport Current from %s\n"),
-                amethod));
-  }
-
-  void
-  Client_Request_Interceptor::destroy (void)
-    throw (CORBA::SystemException)
-  {
-  }
-
-  void
-  Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
-  {
-    //Test TC
-    test_transport_current ("send_request");
-
-    CORBA::Boolean response_expected =
-      ri->response_expected ();
-
-    // Oneway?
-    if (response_expected)
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT("CRI    (%P|%t) Sending a two-way\n")));
-    else
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT("CRI    (%P|%t) Sending a one-way\n")));
-
-    // Make the context to send the context to the target
-    IOP::ServiceContext sc;
-    sc.context_id = Test::Transport::CurrentTest::ContextTag;
-
-    // How long can a number really get?
-    char temp[32];
-    {
-      ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
-
-      ACE_OS::sprintf (temp, "%d", this->requestID_);
-      this->requestID_++;
-    }
-
-    CORBA::ULong string_len = ACE_OS::strlen (temp) + 1;
-    CORBA::Octet *buf = CORBA::OctetSeq::allocbuf (string_len);
-    ACE_OS::strcpy (reinterpret_cast <char *> (buf), temp);
-
-    sc.context_data.replace (string_len, string_len, buf, 1);
-
-    // Add this context to the service context list.
-    ri->add_request_service_context (sc, 0);
-  }
-
-  void
-  Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    throw (CORBA::SystemException)
-  {
-    test_transport_current ("send_poll");
-  }
-
-  void
-  Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
-    throw (CORBA::SystemException)
-  {
-    test_transport_current ("receive_reply");
-  }
-
-  void
-  Client_Request_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
-  {
-    test_transport_current ("receive_exception");
-  }
-
-  void
-  Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
-  {
-    test_transport_current ("receive_other");
-  }
-
-}
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
deleted file mode 100644
index 8b9d16adcc9..00000000000
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Client_Request_Interceptor.h
- *
- * $Id$
- *
- * Implementation header for the client request interceptor for the
- * Transport::Current test.
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef CLIENT_REQUEST_INTERCEPTOR_H
-#define CLIENT_REQUEST_INTERCEPTOR_H
-
-#include /**/ "ace/config.h"
-#include /**/ "Current_Test_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI/PI.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-#include "tao/ORB.h"
-#include "tao/CORBA_String.h"
-
-namespace Test
-{
-
-  /// A metod doing the actual testing, so we could change it for the
-  /// different traits implementations
-  typedef int (*TEST) (CORBA::ORB_ptr);
-
-
-  /**
-   * @class Client_Request_Interceptor
-   *
-   * @brief Client request interceptor that exercises
-   * Transport::Current support.
-   *
-   * This client request interceptor forwards a request to a secondary
-   * object by throwing the PortableInterceptor::ForwardRequest
-   * exception from within the send_request() interception point.  It
-   * only forwards the initial request.  See the README file for
-   * details.
-   */
-  class Current_Test_Export Client_Request_Interceptor
-    : public virtual PortableInterceptor::ClientRequestInterceptor,
-      public virtual TAO_Local_RefCounted_Object
-  {
- public:
-
-    /// Constructor.
-    Client_Request_Interceptor (const char *orb_id,
-                                TEST test);
-    /**
-     * @name Methods Required by the Client Request Interceptor
-     * Interface
-     *
-     * These are methods that must be implemented since they are pure
-     * virtual in the abstract base class.  They are the canonical
-     * methods required for all client request interceptors.
-     */
-    //@{
-    /// Return the name of this ClientRequestinterceptor.
-    virtual char * name (void) throw (CORBA::SystemException);
-
-    virtual void destroy (void) throw (CORBA::SystemException);
-
-    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
-
-    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException);
-
-    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException);
-
-
-    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
-
-    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
-    //@}
-
-    // Number of interceptions
-    CORBA::Long interceptions (void);
-
-  private:
-    // Implementation method, every inteception point will have to
-    // call it, supplying a name.
-    void test_transport_current (const ACE_TCHAR* amethod)
-      throw (CORBA::SystemException, CORBA::UserException);
-
-  private:
-    ///The ID of the ORB this interceptor is registered with.
-    CORBA::String_var orb_id_;
-
-    /// Pseudo-reference to the ORB this interceptor is registered
-    /// with.
-    CORBA::ORB_var orb_;
-
-    /// The number of requests intercepted by this interceptor.
-    CORBA::ULong request_count_;
-
-    /// Stringified reference to the object the initial request will be
-    /// forwarded to by this interceptor.
-    CORBA::String_var forward_str_;
-
-    /// Synchronize internal state...
-    TAO_SYNCH_MUTEX lock_;
-
-    /// Unique request ID
-    unsigned long requestID_;
-
-    /// Test function
-    TEST test_;
-  };
-
-} // namespace Test
-
-#endif  /* CLIENT_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test.idl b/TAO/tests/TransportCurrent/lib/Current_Test.idl
deleted file mode 100644
index a7f00f7d29f..00000000000
--- a/TAO/tests/TransportCurrent/lib/Current_Test.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- * @file   Current_Test.idl
- *
- * $Id$
- *
- * Simple IDL file to test TAO::TranspotCurrent
- * support.
- *
- * @author  Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-//=============================================================================
-
-
-
-module Test
-{
-  module Transport
-  {
-    interface CurrentTest
-    {
-
-      const unsigned long ContextTag = 0xabcdef;
-
-      void invoked_by_client ();
-
-      void invoked_during_upcall ();
-
-      long self_test ();
-
-      oneway void shutdown ();
-    };
-  };
-};
-
-
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Export.h b/TAO/tests/TransportCurrent/lib/Current_Test_Export.h
deleted file mode 100644
index cfdf16fe60e..00000000000
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -d Current_Test
-// ------------------------------
-#ifndef CURRENT_TEST_EXPORT_H
-#define CURRENT_TEST_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CURRENT_TEST_HAS_DLL)
-#  define CURRENT_TEST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CURRENT_TEST_HAS_DLL */
-
-#if !defined (CURRENT_TEST_HAS_DLL)
-#  define CURRENT_TEST_HAS_DLL 1
-#endif /* ! CURRENT_TEST_HAS_DLL */
-
-#if defined (CURRENT_TEST_HAS_DLL) && (CURRENT_TEST_HAS_DLL == 1)
-#  if defined (CURRENT_TEST_BUILD_DLL)
-#    define Current_Test_Export ACE_Proper_Export_Flag
-#    define CURRENT_TEST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CURRENT_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CURRENT_TEST_BUILD_DLL */
-#    define Current_Test_Export ACE_Proper_Import_Flag
-#    define CURRENT_TEST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CURRENT_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CURRENT_TEST_BUILD_DLL */
-#else /* CURRENT_TEST_HAS_DLL == 1 */
-#  define Current_Test_Export
-#  define CURRENT_TEST_SINGLETON_DECLARATION(T)
-#  define CURRENT_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CURRENT_TEST_HAS_DLL == 1 */
-
-// Set CURRENT_TEST_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CURRENT_TEST_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CURRENT_TEST_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CURRENT_TEST_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CURRENT_TEST_NTRACE */
-
-#if (CURRENT_TEST_NTRACE == 1)
-#  define CURRENT_TEST_TRACE(X)
-#else /* (CURRENT_TEST_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CURRENT_TEST_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CURRENT_TEST_NTRACE == 1) */
-
-#endif /* CURRENT_TEST_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
deleted file mode 100644
index f8dfc3f3ef3..00000000000
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file    Current_Test_Impl.h
- *
- * $Id$
- *
- * Implementation header for the "test" IDL interface for the
- * TAO::TransportCurrent test.
- *
- * @author  Iliyan Jeliazkov <iliyan@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CURRENT_TEST_IMPL_H
-#define CURRENT_TEST_IMPL_H
-
-#include "Current_TestS.h"
-#include "tao/TransportCurrent/TCC.h"
-
-/**
- * @class Current_Test_Impl
- *
- * @brief Simple test class.
- *
- * This class implements the "test" interface used in this test.
- */
-class Current_Test_Impl : public virtual POA_Test::Transport::CurrentTest
-{
-public:
-
-  /// Constructor.
-  Current_Test_Impl (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, int do_collocated_calls = 1);
-
-  /// Destructor.
-  ~Current_Test_Impl (void);
-
-  /// Main servant test method.
-  virtual void invoked_by_client (void) throw (CORBA::SystemException);
-
-  /// No-op method used so that a client request interceptor will be
-  /// invoked when invoking this method from the above invoke_me()
-  /// method.  Say that 10 times fast. :-)
-  virtual void invoked_during_upcall (void)
-    throw (CORBA::SystemException);
-
-  /// Shutdown the ORB.
-  virtual void shutdown (void) throw (CORBA::SystemException);
-
-  // A self-test for coherency
-  virtual ::CORBA::Long self_test (void) throw (CORBA::SystemException);
-
-public:
-  /// Reports if unexpected errors have been encountered for the
-  /// lifetime of the instance
-  bool is_successful (void) const;
-
-private:
-  void test_transport_current (void) throw (CORBA::SystemException);
-
-  /// Main servant test method.
-  void invoked_by_client_i (void)
-    throw (CORBA::SystemException, TAO::Transport::NoContext);
-
-private:
-  /// Pseudo-reference to the ORB.
-  CORBA::ORB_var orb_;
-
-  /// Pseudo-reference to the POA (cache)
-  PortableServer::POA_var poa_;
-
-  /// To do or not to do ...
-  int do_collocated_calls_;
-};
-
-#endif  /* CURRENT_TEST_IMPL_H */
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc b/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
deleted file mode 100644
index 993ff326393..00000000000
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
-
-  dynamicflags += CURRENT_TEST_BUILD_DLL
-  idlflags += -Wb,export_include=Current_Test_Export.h \
-              -Wb,export_macro=Current_Test_Export
-
-  IDL_Files {
-    Current_Test.idl
-  }
-
-  custom_only = 1
-}
-
-project(*Client): tc {
-
-  after += *idl TAO_TC
-  includes += .
-  libout = .
-  dynamicflags += CURRENT_TEST_BUILD_DLL
-
-  Source_Files {
-    Client_Request_Interceptor.cpp
-    Client_ORBInitializer.cpp
-  }
-
-  Source_Files {
-    Current_TestC.cpp
-  }
-
-  IDL_Files {
-  }
-}
-
-project(*Server): tc, pi_server {
-
-  after += *Client
-  includes += .
-  libout = .
-  dynamicflags += CURRENT_TEST_BUILD_DLL
-
-  Source_Files {
-    Server_Request_Interceptor.cpp
-    Server_ORBInitializer.cpp
-  }
-
-  Source_Files {
-    Current_TestC.cpp
-    Current_TestS.cpp
-  }
-
-  IDL_Files {
-  }
-}
-
diff --git a/TAO/tests/TransportCurrent/lib/Makefile.am b/TAO/tests/TransportCurrent/lib/Makefile.am
deleted file mode 100644
index 8bd002e5a05..00000000000
--- a/TAO/tests/TransportCurrent/lib/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-
-## Makefile.Current_Test_Lib_Idl.am
-
-BUILT_SOURCES = \
-  Current_TestC.cpp \
-  Current_TestC.h \
-  Current_TestC.inl \
-  Current_TestS.cpp \
-  Current_TestS.h \
-  Current_TestS.inl
-
-CLEANFILES = \
-  Current_Test-stamp \
-  Current_TestC.cpp \
-  Current_TestC.h \
-  Current_TestC.inl \
-  Current_TestS.cpp \
-  Current_TestS.h \
-  Current_TestS.inl
-
-Current_TestC.cpp Current_TestC.h Current_TestC.inl Current_TestS.cpp Current_TestS.h Current_TestS.inl: Current_Test-stamp
-
-Current_Test-stamp: $(srcdir)/Current_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_include=Current_Test_Export.h -Wb,export_macro=Current_Test_Export $(srcdir)/Current_Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Current_Test.idl
-
-## Makefile.Current_Test_Lib_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libCurrent_Test_Lib_Client.la
-
-libCurrent_Test_Lib_Client_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I. \
-  -DCURRENT_TEST_BUILD_DLL
-
-libCurrent_Test_Lib_Client_la_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  Current_TestC.cpp
-
-noinst_HEADERS += \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Current_Test_Lib_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libCurrent_Test_Lib_Server.la
-
-libCurrent_Test_Lib_Server_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I. \
-  -DCURRENT_TEST_BUILD_DLL
-
-libCurrent_Test_Lib_Server_la_SOURCES = \
-  Current_TestC.cpp \
-  Current_TestS.cpp \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp
-
-noinst_HEADERS += \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
deleted file mode 100644
index 72cc1b34782..00000000000
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (Current_Test_Lib,
-           Server_ORBInitializer,
-           "$Id$")
-
-#include "Server_Request_Interceptor.h"
-#include "Server_ORBInitializer.h"
-
-namespace Test
-{
-
-  Server_ORBInitializer::Server_ORBInitializer
-    (PortableInterceptor::ServerRequestInterceptor_ptr interceptor)
-      : interceptor_
-          (PortableInterceptor::ServerRequestInterceptor::_duplicate (interceptor))
-  {
-    /* no-op */
-  }
-
-  Server_ORBInitializer::~Server_ORBInitializer (void)
-  {
-    /* no-op */
-  }
-
-  void
-  Server_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*)
-    throw (CORBA::SystemException)
-  {
-    /* no-op */
-  }
-
-  // A specialization to handle client-side interceptors
-  void Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii)
-    throw (CORBA::SystemException)
-  {
-    oii->add_server_request_interceptor (this->interceptor_.in ());
-  }
-
-}
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
deleted file mode 100644
index 6a00e61fca1..00000000000
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Server_ORBInitializer.h
- *
- * $Id$
- *
- * @author Iliyan jeliazkov <iliyan@ociweb.com>
- */
-//=============================================================================
-
-#ifndef SERVER_ORBINITIALIZER_T_H
-#define SERVER_ORBINITIALIZER_T_H
-#include /**/ "ace/pre.h"
-#include /**/ "ace/config.h"
-
-#include /**/ "Current_Test_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI/PI.h"
-#include "tao/PortableInterceptorC.h"
-
-namespace Test
-{
-
-  class Current_Test_Export Server_ORBInitializer :
-    public PortableInterceptor::ORBInitializer
-  {
-  public:
-    Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
-    ~Server_ORBInitializer (void);
-
-    virtual void pre_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
-
-    virtual void post_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
-
-  private:
-    PortableInterceptor::ServerRequestInterceptor_var interceptor_;
-  };
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif  /* SERVER_ORBINITIALIZER_T_H */
-
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
deleted file mode 100644
index 1f05e06e8ac..00000000000
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (Current_Test_Lib,
-           Server_Request_Interceptor,
-           "$Id$")
-
-#include "Server_Request_Interceptor.h"
-#include "Server_ORBInitializer.h"
-
-namespace Test
-{
-
-  Server_Request_Interceptor::Server_Request_Interceptor (const char* orbid, TEST test)
-    : request_count_ (0)
-    , orb_id_ (::CORBA::string_dup (orbid))
-    , test_ (test)
-  {
-  }
-
-  Server_Request_Interceptor::~Server_Request_Interceptor (void)
-  {
-  }
-
-  void
-  Server_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod)
-    throw (CORBA::SystemException)
-  {
-    CORBA::String_var name (this->name ());
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("%s (%P|%t) Test accessing Transport Current from %s\n"),
-                name.in (),
-                amethod));
-
-    ++this->request_count_;
-
-     if (TAO_debug_level >=1)
-       ACE_DEBUG ((LM_DEBUG,
-                   ACE_TEXT ("%s (%P|%t) Getting the ORB\n"),
-                   name.in ()));
-
-    int tmpargc = 0;
-    CORBA::ORB_var orb = CORBA::ORB_init (tmpargc,
-                                          0,
-                                          this->orb_id_.in ());
-    if (TAO_debug_level >=1)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("%s (%P|%t) Resolving the TC\n"),
-                  name.in ()));
-
-   CORBA::Object_var tcobject =
-     orb->resolve_initial_references ("TAO::Transport::Current");
-
-   // Run the test function
-   (*this->test_) (orb.in ());
-
-   ACE_DEBUG ((LM_DEBUG,
-               ACE_TEXT ("%s (%P|%t) Success - Transport Current from %s\n"),
-               name.in (),
-               amethod));
-  }
-
-  /// queries the status of the test
-  bool
-  Server_Request_Interceptor::self_test (void)
-  {
-    return true;
-  }
-
-
-  char *
-  Server_Request_Interceptor::name (void)
-    throw (CORBA::SystemException)
-  {
-    return CORBA::string_dup ("SRI   ");
-  }
-
-  void
-  Server_Request_Interceptor::destroy (void)
-    throw (CORBA::SystemException)
-  {
-  }
-
-  void
-  Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
-  {
-    test_transport_current ("receive_request_service_contexts");
-  }
-
-  void
-  Server_Request_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
-  {
-    test_transport_current ("receive_request");
-  }
-
-  void
-  Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException)
-  {
-    test_transport_current ("send_reply");
-  }
-
-  void
-  Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
-  {
-    test_transport_current ("send_exception");
-  }
-
-  void
-  Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
-  {
-    test_transport_current ("send_other");
-  }
-
-} /* namespace Test */
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
deleted file mode 100644
index f489156c2ae..00000000000
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Server_Request_Interceptor.h
- *
- * $Id$
- *
- * Implementation header for the server request interceptor for the
- * PortableInterceptor::ForwardRequest test.
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef SERVER_REQUEST_INTERCEPTOR_H
-#define SERVER_REQUEST_INTERCEPTOR_H
-
-#include /**/ "ace/config.h"
-#include /**/ "Current_Test_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Current_TestC.h"
-
-#include "tao/TransportCurrent/TCC.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-#include "tao/PI_Server/PI_Server.h"
-
-namespace Test
-{
-
-  /// A metod doing the actual testing, so we could change it for the
-  /// different traits implementations
-
-  typedef int (*TEST) (CORBA::ORB_ptr);
-
-  /**
-   * @class Server_Request_Interceptor
-   *
-   * @brief Simple concrete server request interceptor.
-   *
-   */
-  class Current_Test_Export Server_Request_Interceptor
-    : public virtual PortableInterceptor::ServerRequestInterceptor,
-      public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    /// Constructor.
-    Server_Request_Interceptor (const char*orb_id,
-                                TEST test);
-
-    /// Destructor.
-    virtual ~Server_Request_Interceptor (void);
-
-    virtual void test_transport_current (const char* amethod)
-      throw (CORBA::SystemException);
-
-    /// Coherency test
-    virtual bool self_test (void);
-
-    /**
-     * @name Methods Required by the Server Request Interceptor
-     * Interface
-     *
-     * These are methods that must be implemented since they are pure
-     * virtual in the abstract base class.  They are the canonical
-     * methods required for all server request interceptors.
-     */
-    //@{
-    /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void) throw (CORBA::SystemException);
-
-    virtual void destroy (void) throw (CORBA::SystemException);
-
-    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
-
-    virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
-
-    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException);
-
-    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
-
-    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
-    //@}
-
-  protected:
-
-    /// The number of requests intercepted by this interceptor.
-    CORBA::ULong request_count_;
-
-    CORBA::String_var orb_id_;
-
-    TEST test_;
-
-  };
-
-}
-
-#endif  /* SERVER_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/Two_Objects/.cvsignore b/TAO/tests/Two_Objects/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Two_Objects/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Two_Objects/Makefile.am b/TAO/tests/Two_Objects/Makefile.am
deleted file mode 100644
index aebb6f9ad12..00000000000
--- a/TAO/tests/Two_Objects/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Two_Objects_Idl.am
-
-BUILT_SOURCES = \
-  Two_ObjectsC.cpp \
-  Two_ObjectsC.h \
-  Two_ObjectsC.inl \
-  Two_ObjectsS.cpp \
-  Two_ObjectsS.h \
-  Two_ObjectsS.inl
-
-CLEANFILES = \
-  Two_Objects-stamp \
-  Two_ObjectsC.cpp \
-  Two_ObjectsC.h \
-  Two_ObjectsC.inl \
-  Two_ObjectsS.cpp \
-  Two_ObjectsS.h \
-  Two_ObjectsS.inl
-
-Two_ObjectsC.cpp Two_ObjectsC.h Two_ObjectsC.inl Two_ObjectsS.cpp Two_ObjectsS.h Two_ObjectsS.inl: Two_Objects-stamp
-
-Two_Objects-stamp: $(srcdir)/Two_Objects.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Two_Objects.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Two_Objects.idl
-
-## Makefile.Two_Objects_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  First_i.cpp \
-  Object_Factory_i.cpp \
-  Second_i.cpp \
-  Two_ObjectsC.cpp \
-  Two_ObjectsS.cpp \
-  server.cpp \
-  worker.cpp \
-  First_i.h \
-  Object_Factory_i.h \
-  Second_i.h \
-  worker.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Two_Objects_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Two_ObjectsC.cpp \
-  client.cpp \
-  First_i.h \
-  Object_Factory_i.h \
-  Second_i.h \
-  worker.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index 5df5e080f97..1dbe304222f 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -1,15 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Two_Objects.idl
-  }
-  custom_only = 1
-}
-
 project(*Server): taoserver {
-  after += *idl
   Source_Files {
     worker.cpp
     First_i.cpp
@@ -17,24 +9,13 @@ project(*Server): taoserver {
     Object_Factory_i.cpp
     server.cpp
   }
-  Source_Files {
-    Two_ObjectsC.cpp
-    Two_ObjectsS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *idl
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     Two_ObjectsC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
 
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 0e6d5a8e9f2..639cb344ab8 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(Test, server, "$Id$")
 int msglen = 100; //default length of reply message is 100 bytes
 int nthreads = 2;
 const char *ior_output_file = "test.ior";
-int orb_timeout = 30; //default timeout for ORB is 30 sec
+int timeout = 30; //default timeout for ORB is 30 sec
 
 
 int
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
         break;
 
       case 't':
-        orb_timeout = ACE_OS::atoi (get_opts.opt_arg ());
+        timeout = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case '?':
@@ -90,7 +90,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG(( LM_DEBUG, "ior file = %s\t#threads = %d\t"
                   "msglen = %d\tORB timeout = %d sec\n",
-                  ior_output_file, nthreads, msglen, orb_timeout ));
+                  ior_output_file, nthreads, msglen, timeout ));
 
       // Create the factory servant
       Object_Factory_i *factory_impl;
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Instantiate the specified # of worker threads
-      Worker worker (orb.in (), orb_timeout);
+      Worker worker (orb.in (), timeout);
 
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
                            nthreads) != 0)
diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp
index ae0889a419a..b1581d8baa9 100644
--- a/TAO/tests/Two_Objects/worker.cpp
+++ b/TAO/tests/Two_Objects/worker.cpp
@@ -6,7 +6,7 @@
 
 Worker::Worker (CORBA::ORB_ptr orb, int time)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     orb_timeout_(time)
+     timeout_(time)
 {
 }
 
@@ -17,9 +17,9 @@ Worker::svc (void)
 
   ACE_TRY
     {
-      ACE_Time_Value tv (orb_timeout_);
+      ACE_Time_Value tv (timeout_);
 
-      // orb times out after <timeout> seconds
+      ///orb times out after <timeout> seconds
       this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h
index 1e2a5a3b54e..42ed1fe0cb9 100644
--- a/TAO/tests/Two_Objects/worker.h
+++ b/TAO/tests/Two_Objects/worker.h
@@ -25,7 +25,7 @@ private:
   // The orb
   CORBA::ORB_var orb_;
 
-  int orb_timeout_;
+  int timeout_;
 };
 
 #endif  /* TAO_TWO_OBJECTS_WORKER_H */
diff --git a/TAO/tests/Typedef_String_Array/.cvsignore b/TAO/tests/Typedef_String_Array/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/Typedef_String_Array/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/Typedef_String_Array/Makefile.am b/TAO/tests/Typedef_String_Array/Makefile.am
deleted file mode 100644
index ac0a0b5aa7c..00000000000
--- a/TAO/tests/Typedef_String_Array/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.typedef_string_array_idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.typedef_string_array_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testImpl.cpp \
-  testS.cpp \
-  testImpl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.typedef_string_array_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testImpl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
index c01bab7197e..a28ade36239 100644
--- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
+++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
@@ -1,36 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
 project(*server): taoserver {
-  after += *idl
   Source_Files {
     server.cpp
     testImpl.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
 project(*client): taoclient, anytypecode {
-  after += *idl
   after += *server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
diff --git a/TAO/tests/UNKNOWN_Exception/.cvsignore b/TAO/tests/UNKNOWN_Exception/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/UNKNOWN_Exception/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/UNKNOWN_Exception/Makefile.am b/TAO/tests/UNKNOWN_Exception/Makefile.am
deleted file mode 100644
index 087f9441d42..00000000000
--- a/TAO/tests/UNKNOWN_Exception/Makefile.am
+++ /dev/null
@@ -1,103 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.UNKNOWN_Exception_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.UNKNOWN_Exception_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.UNKNOWN_Exception_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
index 875eebbdd8f..0fe69a4a621 100644
--- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
+++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
@@ -1,35 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver {
-  after += *idl
+project(*Server): taoserver, exceptions {
   Source_Files {
     server.cpp
   }
-  Source_Files {
-    testC.cpp
-    testS.cpp
-  }
-  IDL_Files {
-  }
 }
 
-project(*Client): taoclient, anytypecode {
-  after += *idl
+project(*Client): taoclient, anytypecode, exceptions {
   after += *Server
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
-  }
-  IDL_Files {
+    client.cpp
   }
 }
+
diff --git a/TAO/tests/Xt_Stopwatch/.cvsignore b/TAO/tests/Xt_Stopwatch/.cvsignore
new file mode 100644
index 00000000000..955ffdc75d5
--- /dev/null
+++ b/TAO/tests/Xt_Stopwatch/.cvsignore
@@ -0,0 +1,4 @@
+client
+client
+server
+server
diff --git a/TAO/tests/Xt_Stopwatch/Makefile.am b/TAO/tests/Xt_Stopwatch/Makefile.am
deleted file mode 100644
index a184bef15a8..00000000000
--- a/TAO/tests/Xt_Stopwatch/Makefile.am
+++ /dev/null
@@ -1,176 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Xt_Stopwatch_Server.am
-
-if BUILD_ACE_XTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_MOTIF
-if BUILD_TAO_XTRESOURCE
-if BUILD_X11
-if BUILD_XT
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_X11_CPPFLAGS) \
-  $(ACE_XT_CPPFLAGS)
-
-server_SOURCES = \
-  Stopwatch_display.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  timer.cpp \
-  Stopwatch_display.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h \
-  timer.h
-
-server_LDFLAGS = \
- $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_XtResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -lXm \
-  $(ACE_XT_LIBS) \
-  $(ACE_X11_LIBS)
-
-endif BUILD_XT
-endif BUILD_X11
-endif BUILD_TAO_XTRESOURCE
-endif BUILD_MOTIF
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_XTREACTOR
-
-## Makefile.Xt_Stopwatch_Client.am
-
-if BUILD_ACE_XTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_MOTIF
-if BUILD_TAO_XTRESOURCE
-if BUILD_X11
-if BUILD_XT
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_X11_CPPFLAGS) \
-  $(ACE_XT_CPPFLAGS)
-
-client_SOURCES = \
-  Control.cpp \
-  client.cpp \
-  testC.cpp \
-  Control.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDFLAGS = \
- $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_XtResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -lXm \
-  $(ACE_XT_LIBS) \
-  $(ACE_X11_LIBS)
-
-endif BUILD_XT
-endif BUILD_X11
-endif BUILD_TAO_XTRESOURCE
-endif BUILD_MOTIF
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_XTREACTOR
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/utils/NamingViewer/NamingViewer.mpc b/TAO/utils/NamingViewer/NamingViewer.mpc
index 51dd9b64af9..a617d344245 100644
--- a/TAO/utils/NamingViewer/NamingViewer.mpc
+++ b/TAO/utils/NamingViewer/NamingViewer.mpc
@@ -3,6 +3,7 @@
 
 project : namingexe, ace_mfc {
   exename    = NamingViewer
+  requires  += exceptions
   install    = $(ACE_ROOT)/bin
   pch_header = StdAfx.h
   pch_source = StdAfx.cpp
diff --git a/TAO/utils/catior/.cvsignore b/TAO/utils/catior/.cvsignore
new file mode 100644
index 00000000000..cde3a278f0a
--- /dev/null
+++ b/TAO/utils/catior/.cvsignore
@@ -0,0 +1 @@
+catior
diff --git a/TAO/utils/catior/Makefile.am b/TAO/utils/catior/Makefile.am
index f62474752e6..bffde7b7ddc 100644
--- a/TAO/utils/catior/Makefile.am
+++ b/TAO/utils/catior/Makefile.am
@@ -16,8 +16,6 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.catior.am
 
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 if BUILD_RT_CORBA
 
 bin_PROGRAMS = catior
@@ -34,9 +32,6 @@ catior_SOURCES = \
   catior.cpp
 
 catior_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
@@ -46,8 +41,6 @@ catior_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/utils/catior/catior.mpc b/TAO/utils/catior/catior.mpc
index 15f52f53376..00b99c13e65 100644
--- a/TAO/utils/catior/catior.mpc
+++ b/TAO/utils/catior/catior.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project : namingexe, rtcorba, install, messaging {
+project : namingexe, rtcorba, core, messaging {
   exename   = catior
   install   = $(ACE_ROOT)/bin
 }
diff --git a/TAO/utils/nslist/.cvsignore b/TAO/utils/nslist/.cvsignore
new file mode 100644
index 00000000000..3acf671e95c
--- /dev/null
+++ b/TAO/utils/nslist/.cvsignore
@@ -0,0 +1,3 @@
+nsadd
+nsdel
+nslist
diff --git a/TAO/utils/nslist/Makefile.am b/TAO/utils/nslist/Makefile.am
index f5205a0fdaa..571aa4c400b 100644
--- a/TAO/utils/nslist/Makefile.am
+++ b/TAO/utils/nslist/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-bin_PROGRAMS =
-
 ## Makefile.nsadd.am
 
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += nsadd
+bin_PROGRAMS = nsadd
 
 nsadd_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -38,12 +34,8 @@ nsadd_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.nsdel.am
 
-if BUILD_EXCEPTIONS
-
 bin_PROGRAMS += nsdel
 
 nsdel_CPPFLAGS = \
@@ -63,12 +55,8 @@ nsdel_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Makefile.nslist.am
 
-if BUILD_EXCEPTIONS
-
 bin_PROGRAMS += nslist
 
 nslist_CPPFLAGS = \
@@ -88,8 +76,6 @@ nslist_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/utils/nslist/nslist.mpc b/TAO/utils/nslist/nslist.mpc
index bbb9c941686..7d704eb9b95 100644
--- a/TAO/utils/nslist/nslist.mpc
+++ b/TAO/utils/nslist/nslist.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(nsadd): namingexe, install {
+project(nsadd): namingexe, core {
   install = $(ACE_ROOT)/bin
   exename = nsadd
   Source_Files {
@@ -9,7 +9,7 @@ project(nsadd): namingexe, install {
   }
 }
 
-project(nsdel): namingexe, install {
+project(nsdel): namingexe, core {
   install = $(ACE_ROOT)/bin
   exename = nsdel
   Source_Files {
@@ -17,7 +17,7 @@ project(nsdel): namingexe, install {
   }
 }
 
-project(nslist): namingexe, install {
+project(nslist): namingexe, core {
   install = $(ACE_ROOT)/bin
   exename = nslist
   Source_Files {
diff --git a/TAO/utils/nslist/run_test.pl b/TAO/utils/nslist/run_test.pl
index 3ba82bb4616..26c0297ce87 100755
--- a/TAO/utils/nslist/run_test.pl
+++ b/TAO/utils/nslist/run_test.pl
@@ -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 ("$ENV{ACE_ROOT}/bin/nslist");
-my $AD = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/nsadd");
+my $LS = new PerlACE::Process ("../../../bin/nslist");
+my $AD = new PerlACE::Process ("../../../bin/nsadd");
 my $status = 0;
 
 # We want the nslist and nsadd executables to be found exactly in the path
diff --git a/TAO/utils/wxNamingViewer/Makefile.am b/TAO/utils/wxNamingViewer/Makefile.am
index 14abba3d97b..89dde61aa05 100644
--- a/TAO/utils/wxNamingViewer/Makefile.am
+++ b/TAO/utils/wxNamingViewer/Makefile.am
@@ -16,7 +16,6 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.wxNamingViewer.am
 
-if BUILD_EXCEPTIONS
 if BUILD_WXWINDOWS
 
 noinst_PROGRAMS = wxNamingViewer
@@ -64,7 +63,6 @@ wxNamingViewer_LDADD = \
   $(ACE_WX_LIBS)
 
 endif BUILD_WXWINDOWS
-endif BUILD_EXCEPTIONS
 
 EXTRA_DIST = \
   wxNamingViewer.rc